diff options
author | fredb <fredb> | 2003-02-23 19:18:51 +0000 |
---|---|---|
committer | fredb <fredb> | 2003-02-23 19:18:51 +0000 |
commit | 7767fe898746466826825c7665a5c7e28cede5fb (patch) | |
tree | 66c9e0d618dfdda5bb0934b0d26b205a24d1b162 /net | |
parent | 74ddc97e580ba38126026fedfa874abbd27d818a (diff) | |
download | pkgsrc-7767fe898746466826825c7665a5c7e28cede5fb.tar.gz |
Update netatalk to 1.6.1, using patches submitted by Toru TAKAMIZU in
PR pkg/20471:
Changes in 1.6.1
================
* UPD: Improve --enable-fhs. [Olaf Hering]
* UPD: Add BDB 4.1.x support.
* UPD: Add more documentation on CNID, as well as list which versions
of Berkeley DB are supported.
* FIX: Codepage file maccode.koi8-r is now correctly cleaned.
* FIX: Fix init script location on SuSE. [Olaf]
* FIX: Build fixes. [Olaf, Steven N. Hirsch]
* FIX: Various bugs when a user doesn't have access permission to a folder.
(Fixes an OSX kernel panic.)
* FIX: CNID, folders' DID handling with concurrent access or symlinks.
(Fixes an endless loop in afpd.)
Diffstat (limited to 'net')
-rw-r--r-- | net/netatalk/Makefile | 11 | ||||
-rw-r--r-- | net/netatalk/PLIST | 4 | ||||
-rw-r--r-- | net/netatalk/distinfo | 10 | ||||
-rw-r--r-- | net/netatalk/patches/patch-aa | 58 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ab | 10 |
5 files changed, 68 insertions, 25 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index b31c9252fbb..2b554cf98b8 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2003/02/15 20:01:06 fredb Exp $ +# $NetBSD: Makefile,v 1.22 2003/02/23 19:18:51 fredb Exp $ -DISTNAME= netatalk-1.6.0 +DISTNAME= netatalk-1.6.1 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} \ http://me.in-berlin.de/~jroger/netatalk/ @@ -11,7 +11,6 @@ COMMENT= Netatalk appletalk file and print services GNU_CONFIGURE= YES USE_BUILDLINK2= YES -USE_PKGINSTALL= YES USE_GMAKE= YES USE_PERL5= YES USE_LIBTOOL= YES @@ -33,6 +32,9 @@ CONFIGURE_ARGS+= --enable-netbsd \ --with-nls-dir=${PREFIX}/share/netatalk/nls \ --with-uams-path=${PREFIX}/libexec/netatalk/uams +#CONFIGURE_ARGS+= --with-flock-locks # broken +#CONFIGURE_ARGS+= --with-bdb=${PREFIX} # still some known issues + pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/netatalk @@ -43,5 +45,8 @@ pre-install: ${PREFIX}/share/examples/netatalk/ .endfor +#.include "../../databases/db3/buildlink2.mk" .include "../../devel/rx/buildlink2.mk" + +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST index b10997f12da..211cfec7698 100644 --- a/net/netatalk/PLIST +++ b/net/netatalk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/02/15 20:01:06 fredb Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/02/23 19:18:51 fredb Exp $ bin/achfile bin/acleandir.rc bin/add_netatalk_printer @@ -12,6 +12,7 @@ bin/apple_mv bin/apple_rm bin/binheader bin/cleanappledouble.pl +@comment bin/cnid_maint bin/getzones bin/hqx2bin bin/lp2pap.sh @@ -164,6 +165,7 @@ share/netatalk/nls/maccode.437 share/netatalk/nls/maccode.850 share/netatalk/nls/maccode.iso8859-1 share/netatalk/nls/maccode.iso8859-1.adapted +share/netatalk/nls/maccode.koi8-r share/netatalk/pagecount.ps @dirrm share/netatalk/nls @dirrm share/netatalk diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo index 537d17732a6..70ca8955b05 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2003/02/18 04:40:04 fredb Exp $ +$NetBSD: distinfo,v 1.10 2003/02/23 19:18:51 fredb Exp $ -SHA1 (netatalk-1.6.0.tar.gz) = f3be966dd1bcf2f1f66501f59e3a2743558c58ac -Size (netatalk-1.6.0.tar.gz) = 827737 bytes -SHA1 (patch-aa) = 0b3264847c47de30fe6d79b65c9ddcd8fac631f5 -SHA1 (patch-ab) = b54f506b2db7fd53393cffb9d05cd688e63a50c3 +SHA1 (netatalk-1.6.1.tar.gz) = c8710bbe720e7e22d2b5e743c1779b68c6b15295 +Size (netatalk-1.6.1.tar.gz) = 849252 bytes +SHA1 (patch-aa) = 0e7dc8d0524376e162f7d8d243720e12f8cbb5fb +SHA1 (patch-ab) = 609bc6f137bb13ece41408277634e9f09c746e61 SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8 SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa index 82d7f533450..94917bddfeb 100644 --- a/net/netatalk/patches/patch-aa +++ b/net/netatalk/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $ +$NetBSD: patch-aa,v 1.10 2003/02/23 19:18:51 fredb Exp $ ---- configure.orig Mon Nov 25 21:08:45 2002 -+++ configure -@@ -7792,59 +7792,6 @@ _ACEOF +--- configure.orig Sun Feb 16 12:46:32 2003 ++++ configure Sun Feb 23 16:55:12 2003 +@@ -8084,64 +8084,6 @@ fi @@ -15,7 +15,11 @@ $NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $ -LIBS="-lcrypt $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" --#include "confdefs.h" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ - - -int @@ -41,7 +45,8 @@ $NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $ - ac_cv_lib_crypt_main=yes -else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- -ac_cv_lib_crypt_main=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -62,7 +67,33 @@ $NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $ echo "$as_me:$LINENO: checking for main in -ld" >&5 echo $ECHO_N "checking for main in -ld... $ECHO_C" >&6 if test "${ac_cv_lib_d_main+set}" = set; then -@@ -13619,7 +13566,57 @@ echo "${ECHO_T}no" >&6 +@@ -13066,13 +13008,13 @@ + savedldflags="$LDFLAGS" + CFLAGS="$CFLAGS -I$bdbdir" + LDFLAGS="-L$bdblibdir $LDFLAGS" +- echo "$as_me:$LINENO: checking for main in -ldb" >&5 +-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for main in -ldb3" >&5 ++echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6 + if test "${ac_cv_lib_db_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldb $LIBS" ++LIBS="-ldb3 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -13118,7 +13060,7 @@ + + bdbfound=yes + BDB_CFLAGS="-I$bdbdir" +- BDB_LIBS="-L$bdblibdir -ldb" ++ BDB_LIBS="-L$bdblibdir -ldb3" + BDB_BIN=$bdbbindir + BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`" + +@@ -14552,7 +14494,62 @@ fi @@ -75,9 +106,13 @@ $NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $ +LIBS="-lcrypt $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" -+#include "confdefs.h" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ + - +int +main () +{ @@ -101,7 +136,8 @@ $NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $ + ac_cv_lib_crypt_main=yes +else + echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ +ac_cv_lib_crypt_main=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext @@ -115,7 +151,7 @@ $NetBSD: patch-aa,v 1.9 2003/02/18 04:40:04 fredb Exp $ +_ACEOF + + LIBS="-lcrypt $LIBS" -+ + +fi diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab index d7b3a8cfaeb..abbe7eb15a7 100644 --- a/net/netatalk/patches/patch-ab +++ b/net/netatalk/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.6 2003/02/15 20:01:07 fredb Exp $ +$NetBSD: patch-ab,v 1.7 2003/02/23 19:18:52 fredb Exp $ ---- distrib/initscripts/Makefile.in.orig Mon Nov 25 21:15:15 2002 -+++ distrib/initscripts/Makefile.in -@@ -124,12 +124,12 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal - @USE_SUSE_TRUE@sysvdir = /etc/rc.d +--- distrib/initscripts/Makefile.in.orig Sun Feb 16 12:50:01 2003 ++++ distrib/initscripts/Makefile.in Sun Feb 23 13:18:29 2003 +@@ -125,12 +125,12 @@ + @USE_SUSE_TRUE@sysvdir = /etc/init.d @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d @USE_TRU64_TRUE@sysvdir = /sbin/init.d -@USE_NETBSD_TRUE@sysvdir = /etc/rc.d |