From be3ce4cfc184e467dcfea46e93dc3b256971af7a Mon Sep 17 00:00:00 2001 From: schwarz Date: Tue, 17 Oct 2006 20:28:01 +0000 Subject: [PATCH] upgraded nntpcache to 3.0.2 (bug fix release) and added patches to support Darwin --- doc/CHANGES-2006 | 3 ++- news/nntpcache/Makefile | 6 +++--- news/nntpcache/distinfo | 16 +++++++++------- news/nntpcache/patches/patch-aa | 12 ++++++------ news/nntpcache/patches/patch-ab | 18 +++++++++--------- news/nntpcache/patches/patch-ac | 14 +++++++------- news/nntpcache/patches/patch-ae | 15 +++++++++++++++ news/nntpcache/patches/patch-af | 17 +++++++++++++++++ 8 files changed, 68 insertions(+), 33 deletions(-) create mode 100644 news/nntpcache/patches/patch-ae create mode 100644 news/nntpcache/patches/patch-af diff --git a/doc/CHANGES-2006 b/doc/CHANGES-2006 index 79b259750fa2..7b78ec69c559 100644 --- a/doc/CHANGES-2006 +++ b/doc/CHANGES-2006 @@ -1,4 +1,4 @@ ->$NetBSD: CHANGES-2006,v 1.1544 2006/10/17 18:32:49 martti Exp $ +>$NetBSD: CHANGES-2006,v 1.1545 2006/10/17 20:28:02 schwarz Exp $ Changes to the packages collection and infrastructure in 2006: @@ -4831,3 +4831,4 @@ Changes to the packages collection and infrastructure in 2006: Updated graphics/gqview to 2.0.2 [gdt 2006-10-17] Updated security/p5-Authen-SASL to 2.10 [obache 2006-07-19] Updated editors/vim-share to 7.0.144 [martti 2006-07-19] + Updated news/nntpcache to 3.0.2 [schwarz 2006-10-17] diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile index f2123a2fc537..573acb0654d0 100644 --- a/news/nntpcache/Makefile +++ b/news/nntpcache/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2006/03/14 12:43:10 kleink Exp $ +# $NetBSD: Makefile,v 1.28 2006/10/17 20:28:01 schwarz Exp $ -DISTNAME= nntpcache-3.0.1 -PKGREVISION= 1 +DISTNAME= nntpcache-3.0.2 CATEGORIES= news MASTER_SITES= http://www.nntpcache.com/pub/nntpcache/ \ ftp://ftp.cs.tu-berlin.de/pub/net/news/nntpcache/ \ @@ -28,6 +27,7 @@ post-configure: ${FILESDIR}/nntpcached.rc > ${WRKSRC}/nntpcached.sh post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/etc/rc.d ${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh ${PREFIX}/etc/rc.d/nntpcached ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nntpcache cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL FAQ FAQ.html LICENSING \ diff --git a/news/nntpcache/distinfo b/news/nntpcache/distinfo index e09731ee5ea3..a5655e54664a 100644 --- a/news/nntpcache/distinfo +++ b/news/nntpcache/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.5 2005/03/07 12:04:41 tv Exp $ +$NetBSD: distinfo,v 1.6 2006/10/17 20:28:01 schwarz Exp $ -SHA1 (nntpcache-3.0.1.tar.gz) = 68ced9471a1e2a2dd7d1bf37477690a5b80bcf7d -RMD160 (nntpcache-3.0.1.tar.gz) = 3ca0fc079532bae0eb4c6f903286d604e266a985 -Size (nntpcache-3.0.1.tar.gz) = 1085258 bytes -SHA1 (patch-aa) = f397f4fe5ec2b1eec62981fba9b9a9922b14ef76 -SHA1 (patch-ab) = 4789544bba3f246713b1f8f74c0450811516edf9 -SHA1 (patch-ac) = aab64da73cce565642aeb4eb3024e57f388c5a19 +SHA1 (nntpcache-3.0.2.tar.gz) = f4c9916040422e7232971a0098d0b29fe947ac14 +RMD160 (nntpcache-3.0.2.tar.gz) = 03c191fbedd9325c12033493d57e01b5c5ecd5a9 +Size (nntpcache-3.0.2.tar.gz) = 1077641 bytes +SHA1 (patch-aa) = 0cb955759a116c1695d2ff38e26fce8e7cda3610 +SHA1 (patch-ab) = 50115636a2d3266b41090a509167c35a4985c9c4 +SHA1 (patch-ac) = 74f4e3ec58342e9d689768baf31e251e568f2db6 SHA1 (patch-ad) = 060112715712bcdbcd052cd9d7557a558518c305 +SHA1 (patch-ae) = 18e60bc8822be64f76348d9fbee7bd406eae5106 +SHA1 (patch-af) = 12e1d4d4344c71391784417e830b2037f69e1af8 diff --git a/news/nntpcache/patches/patch-aa b/news/nntpcache/patches/patch-aa index d6b2554fc9be..3f99b5b6b1d2 100644 --- a/news/nntpcache/patches/patch-aa +++ b/news/nntpcache/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.6 2005/03/07 12:04:41 tv Exp $ +$NetBSD: patch-aa,v 1.7 2006/10/17 20:28:01 schwarz Exp $ ---- configure.in.orig 2002-04-05 11:53:09.000000000 -0500 -+++ configure.in -@@ -206,7 +206,7 @@ AC_CHECK_LIB(crypt, crypt) +--- configure.in.orig 2006-03-05 22:47:08.000000000 +0100 ++++ configure.in 2006-10-17 21:21:46.000000000 +0200 +@@ -206,7 +206,7 @@ AC_CHECK_LIB(wrap, request_init) dnl aix AC_CHECK_LIB(flock, bsd) --AC_CHECK_FUNCS(getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp) -+AC_CHECK_FUNCS(getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp sync) +-AC_CHECK_FUNCS(getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp strncasecmp) ++AC_CHECK_FUNCS(getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp strncasecmp sync) AC_MSG_CHECKING(for passwd authinfo support) AC_ARG_WITH(authinfo-passwd, diff --git a/news/nntpcache/patches/patch-ab b/news/nntpcache/patches/patch-ab index bd41d7b29cc2..88b756ba1a78 100644 --- a/news/nntpcache/patches/patch-ab +++ b/news/nntpcache/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2005/03/07 12:04:41 tv Exp $ +$NetBSD: patch-ab,v 1.2 2006/10/17 20:28:01 schwarz Exp $ ---- configure.orig 2002-04-05 13:26:27.000000000 -0500 -+++ configure -@@ -7795,7 +7795,7 @@ EOF - +--- configure.orig 2006-03-05 22:48:54.000000000 +0100 ++++ configure 2006-10-17 21:22:49.000000000 +0200 +@@ -3372,7 +3372,7 @@ + echo "$ac_t""no" 1>&6 fi --for ac_func in getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp -+for ac_func in getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp sync +-for ac_func in getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp strncasecmp ++for ac_func in getdtablesize usleep utime waitpid wait3 chroot strdup vsnprintf daemon setenv putenv mmap getpagesize setproctitle snprintf strerror setpriority getspnam statfs statvfs strcasecmp strncasecmp sync do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - echo "$as_me:7801: checking for $ac_func" >&5 + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 + echo "configure:3379: checking for $ac_func" >&5 diff --git a/news/nntpcache/patches/patch-ac b/news/nntpcache/patches/patch-ac index 9619454e0f8a..8bc83745f13e 100644 --- a/news/nntpcache/patches/patch-ac +++ b/news/nntpcache/patches/patch-ac @@ -1,14 +1,14 @@ -$NetBSD: patch-ac,v 1.1 2005/03/07 12:04:41 tv Exp $ +$NetBSD: patch-ac,v 1.2 2006/10/17 20:28:01 schwarz Exp $ ---- config.h.in.orig 2002-04-05 10:22:45.000000000 -0500 -+++ config.h.in -@@ -164,6 +164,9 @@ - /* Define if you have the header file. */ - #undef HAVE_STRING_H +--- config.h.in.orig 2006-03-05 20:30:04.000000000 +0100 ++++ config.h.in 2006-10-17 21:24:16.000000000 +0200 +@@ -246,6 +246,9 @@ + /* Define if you have the header file. */ + #undef HAVE_SYS_VFS_H +/* Define if you have the `sync' function. */ +#undef HAVE_SYNC + - /* Define if you have the header file. */ + /* Define if you have the header file. */ #undef HAVE_SYSLOG_H diff --git a/news/nntpcache/patches/patch-ae b/news/nntpcache/patches/patch-ae new file mode 100644 index 000000000000..9557239d774c --- /dev/null +++ b/news/nntpcache/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 2006/10/17 20:28:01 schwarz Exp $ + +--- libproff/setproctitle.c.orig 2006-10-17 21:32:47.000000000 +0200 ++++ libproff/setproctitle.c 2006-10-17 21:33:19.000000000 +0200 +@@ -239,7 +239,9 @@ + # endif + # if SPT_TYPE == SPT_PSSTRINGS + # include +-# include ++# ifndef __APPLE__ ++# include ++# endif + # ifndef PS_STRINGS /* hmmmm.... apparently not available after all */ + # undef SPT_TYPE + # define SPT_TYPE SPT_REUSEARGV diff --git a/news/nntpcache/patches/patch-af b/news/nntpcache/patches/patch-af new file mode 100644 index 000000000000..a481a8371ebc --- /dev/null +++ b/news/nntpcache/patches/patch-af @@ -0,0 +1,17 @@ +$NetBSD: patch-af,v 1.1 2006/10/17 20:28:01 schwarz Exp $ + +--- src/authinfo_pam.c.orig 2006-10-17 21:35:15.000000000 +0200 ++++ src/authinfo_pam.c 2006-10-17 21:35:57.000000000 +0200 +@@ -15,7 +15,11 @@ + #include "authinfo.h" + #include "authinfo_pam.h" + +-#include ++#ifdef __APPLE__ ++# include ++#else ++# include ++#endif + #ifdef __Linux__ + # include + #endif