diff options
author | markd <markd@pkgsrc.org> | 2010-07-19 21:21:25 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2010-07-19 21:21:25 +0000 |
commit | 879453c4adeb38343e4bc588d8fc746797d37782 (patch) | |
tree | 82a12c3d58ddda8ec8a3d8ef9544cb25f1370f1a /net/netatalk | |
parent | a9286ad5d24af5deba297b25356e68716a3ce552 (diff) | |
download | pkgsrc-879453c4adeb38343e4bc588d8fc746797d37782.tar.gz |
Update to netatalk 2.1.3
Changes in 2.1.3
================
* FIX: afpd: fix a serious error in networking IO code
* FIX: afpd: Solaris 10 compatibilty fix: don't use SO_SNDTIMEO, use
non-blocking IO and select instead for writing/sending data.
* UPD: Support for BerkeleyDB 5.0.
Changes in 2.1.2
================
* FIX: afpd: fix for possible crash in case more then one server is
configured in afpd.conf.
* FIX: afpd: ExtendedAttributes in FreeBSD
* FIX: afpd: sharing home folders corrupted the per volume umask.
* UPD: afpd: umask for home folders is no longer taken from startup umask.
* UPD: afpd: dont and permissions with parent folder when creating new
directories on "upriv" volumes.
* UPD: afpd: use 'afpserver@fqdn' instead of 'afpserver/fqdn@realm'.
Prevents a crash in older GNU GSSAPI libs on eg. CentOS 5.x.
Changes in 2.1.1
================
* UPD: fallback to a temporary in memory tdb CNID database if the volume
database can't be opened now works with the default backend "dbd" too.
* FIX: afpd: afp_ldap.conf was missing from tarball. This only effected
[Open]Solaris.
* FIX: afpd: Check if options->server is set in set_signature, preventing
SIGSEGV.
* FIX: afpd: server signature wasn't initialized in some cases
* FIX: DESTDIR support: DESTDIR was expanded twice
* FIX: Fix for compilation error if header files of an older Netatalk
version are installed.
Changes in 2.1-release
======================
* NEW: afpd: new volume option "volsizelimit" for limitting reported volume
size. Useful for limitting TM backup size.
* UPD: dbd: -c option for rebuilding volumes which prevents the creation
of .AppleDouble stuff, only removes orphaned files.
Changes in 2.1-beta2
====================
* NEW: afpd: static generated AFP signature stored in afp_signature.conf,
cf man 5 afp_signature.conf
* NEW: afpd: clustering support: new per volume option "cnidserver".
* UPD: afpd: set volume defaults options "upriv" and "usedots" in the
volume config file AppleVolumes.default. This will only affect
new installations, but not upgrades.
* FIX: afpd: prevent security attack guessing valid server accounts. afpd
now returns error -5023 for unknown users, as does AppleFileServer.
Changes in 2.1-beta1
====================
* NEW: afpd: AFP 3.2 support
* NEW: afpd: Extended Attributes support using native attributes or
using files inside .AppleDouble directories.
* NEW: afpd: ACL support with ZFS
* NEW: cnid_metad: options -l and -f to configure logging
* NEW: IPv6 support
* NEW: AppleDouble compatible UNIX files utility suite `ad ...`.
With 2.1 only `ad ls`.
* NEW: CNID database maintanance utility dbd
* NEW: support BerkeleyDB upgrade. Starting with the next release
after 2.1 in case of BerkeleyDB library updates, Netatalk
will be able to upgrade the CNID databases.
* NEW: afpd: store and read CNIDs to/from AppleDouble files by default.
This is used as a cache and as a backup in case the database
is deleted or corrupted. It can be disabled with a new volume
option "nocnidcache".
* NEW: afpd: sending SIGINT to a child afpd process enables debug logging
to /tmp/afpd.PID.XXXXXX.
* NEW: configure args to download and install a "private" Webmin instance
including only basic Webmin modules plus our netatalk.wbm.
* NEW: fallback to a temporary in memory tdb CNID database if the volume
database can't be opened.
* NEW: support for Unicode characters in the range above U+010000 using
internal surrogate pairs
* NEW: apple_dump: utility to dump AppleSingle and AppleDouble files
* NEW: afpldaptest: utility to check afp_ldap.conf.
* UPD: atalkd and papd are now disabled by default. AppleTalk is legacy.
* UPD: slp advertisement is now disabled by default. server option -slp
SRVLOC is legacy.
* UPD: cdb/dbd CNID backend requires BerkeleyDB >= 4.6
* UPD: afpd: default CNID backend is "dbd"
* UPD: afpd: try to install PAM config that pulls in system|common auth
* UPD: afpd: symlink handling: never followed server side, client resolves
them, so it's safe to use them now.
* UPD: afpd: Comment out all extension->type/creator mappings in
AppleVolumes.system. They're unmaintained, possibly wrong and
do not fit for OS X.
* FIX: rewritten logger
* FIX: afpd: UNIX permissions handling
* FIX: cnid_dbd: always use BerkeleyDB transactions
* FIX: initscripts installation now correctly uses autoconf paths,
ie they're installed to --sysconfdir.
* FIX: UTF-8 volume name length
* FIX: atalkd: workaround for broken Linux 2.6 AT kernel module:
Linux 2.6 sends broadcast queries to the first available socket
which is in our case the last configured one. atalkd now tries to
find the right one.
Note: now a misconfigured or plugged router can broadcast a wrong route !
* REM: afpd: removed CNID backends "db3", "hash" and "mtab"
* REM: cnid_maint: use dbd
* REM: cleanappledouble.pl: use dbd
* REM: nu: use `macusers` instead
Diffstat (limited to 'net/netatalk')
-rw-r--r-- | net/netatalk/Makefile | 13 | ||||
-rw-r--r-- | net/netatalk/PLIST | 34 | ||||
-rw-r--r-- | net/netatalk/distinfo | 24 | ||||
-rw-r--r-- | net/netatalk/patches/patch-aa | 50 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ab | 37 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ac | 12 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ad | 40 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ae | 10 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ag | 15 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ah | 14 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ai | 21 | ||||
-rw-r--r-- | net/netatalk/patches/patch-ap | 2 | ||||
-rw-r--r-- | net/netatalk/patches/patch-aq | 15 | ||||
-rw-r--r-- | net/netatalk/patches/patch-bi | 10 | ||||
-rw-r--r-- | net/netatalk/patches/patch-bj | 45 |
15 files changed, 83 insertions, 259 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 25104ba06e1..a09090c3346 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.69 2010/05/05 12:15:30 markd Exp $ +# $NetBSD: Makefile,v 1.70 2010/07/19 21:21:25 markd Exp $ -DISTNAME= netatalk-2.0.5 -PKGREVISION= 2 +DISTNAME= netatalk-2.1.3 CATEGORIES= net print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} EXTRACT_SUFX= .tar.bz2 @@ -39,6 +38,7 @@ CONFLICTS= netatalk-asun-[0-9]* netatalk-umich-[0-9]* BUILD_DEFS+= VARBASE CONFIGURE_ARGS+= --enable-netbsd \ + --enable-debug \ --enable-overwrite \ --enable-timelord \ --libexecdir=${PREFIX}/libexec/netatalk \ @@ -63,18 +63,13 @@ RCD_SCRIPTS= afpd atalkd papd timelord cnid_metad RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f} .endfor -SUBST_CLASSES+= rc -SUBST_FILES.rc= ${WRKSRC}/bin/afile/acleandir.rc -SUBST_SED.rc+= -e 's,@PREFIX@,${PREFIX},g' -SUBST_STAGE.rc= pre-configure - .include "options.mk" INSTALLATION_DIRS= libexec/psffilters .if !empty(PKG_OPTIONS:Mpam) post-install: - ${INSTALL_DATA} ${WRKSRC}/config/netatalk.pamd ${DESTDIR}${EG_DIR} + ${INSTALL_DATA} ${WRKSRC}/config/pam/netatalk.pam ${DESTDIR}${EG_DIR} .endif .include "../../databases/db4/buildlink3.mk" diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST index c2a5608e4a2..db5b6edfbc9 100644 --- a/net/netatalk/PLIST +++ b/net/netatalk/PLIST @@ -1,22 +1,23 @@ -@comment $NetBSD: PLIST,v 1.20 2010/01/17 11:48:03 markd Exp $ +@comment $NetBSD: PLIST,v 1.21 2010/07/19 21:21:25 markd Exp $ bin/achfile -bin/acleandir.rc +bin/ad +bin/add_netatalk_printer bin/adv1tov2 bin/aecho bin/afile bin/afpd-mtab.pl bin/afppasswd bin/apple_cp +bin/apple_dump bin/apple_mv bin/apple_rm bin/asip-status.pl bin/binheader -bin/cleanappledouble.pl bin/cnid2_create -bin/cnid_index -bin/cnid_maint +bin/dbd bin/getzones bin/hqx2bin +bin/logger_test bin/lp2pap.sh bin/macbinary bin/macusers @@ -25,8 +26,8 @@ bin/nadheader bin/nbplkup bin/nbprgstr bin/nbpunrgstr +bin/netacnv bin/netatalk-config -bin/nu bin/pap bin/papstatus bin/psorder @@ -36,6 +37,7 @@ bin/unbin bin/unhex bin/uniconv bin/unsingle +include/atalk/acl.h include/atalk/adouble.h include/atalk/aep.h include/atalk/afp.h @@ -45,7 +47,11 @@ include/atalk/boolean.h include/atalk/cnid.h include/atalk/compat.h include/atalk/ddp.h +include/atalk/directory.h include/atalk/dsi.h +include/atalk/ea.h +include/atalk/hash.h +include/atalk/ldapconfig.h include/atalk/list.h include/atalk/logger.h include/atalk/nbp.h @@ -58,8 +64,12 @@ include/atalk/server_ipc.h include/atalk/tdb.h include/atalk/uam.h include/atalk/unicode.h +include/atalk/unix.h include/atalk/util.h +include/atalk/uuid.h +include/atalk/vfs.h include/atalk/volinfo.h +include/atalk/volume.h include/atalk/zip.h include/netatalk/aarp.h include/netatalk/at.h @@ -111,15 +121,16 @@ ${PLIST.pam}libexec/netatalk/uams/uams_pam.la libexec/netatalk/uams/uams_passwd.la libexec/netatalk/uams/uams_randnum.la man/man1/achfile.1 -man/man1/acleandir.1 +man/man1/ad.1 man/man1/aecho.1 man/man1/afile.1 man/man1/afppasswd.1 man/man1/apple_cp.1 +man/man1/apple_dump.1 man/man1/apple_mv.1 man/man1/apple_rm.1 man/man1/asip-status.pl.1 -man/man1/cnid_index.1 +man/man1/dbd.1 man/man1/getzones.1 man/man1/hqx2bin.1 man/man1/macbinary.1 @@ -140,11 +151,16 @@ man/man1/unsingle.1 man/man3/atalk_aton.3 man/man3/nbp_name.3 man/man4/atalk.4 +man/man5/AppleVolumes.5 man/man5/AppleVolumes.default.5 +man/man5/AppleVolumes.system.5 +man/man5/afp_ldap.conf.5 +man/man5/afp_signature.conf.5 man/man5/afpd.conf.5 man/man5/atalkd.conf.5 man/man5/netatalk.conf.5 man/man5/papd.conf.5 +man/man8/afp_acls.8 man/man8/afpd.8 man/man8/atalkd.8 man/man8/cnid_dbd.8 @@ -159,7 +175,7 @@ share/examples/netatalk/AppleVolumes.system share/examples/netatalk/afpd.conf share/examples/netatalk/atalkd.conf share/examples/netatalk/netatalk.conf -${PLIST.pam}share/examples/netatalk/netatalk.pamd +${PLIST.pam}share/examples/netatalk/netatalk.pam share/examples/netatalk/papd.conf share/examples/rc.d/afpd share/examples/rc.d/atalkd diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo index e4e02fc92d9..003bbdd9e40 100644 --- a/net/netatalk/distinfo +++ b/net/netatalk/distinfo @@ -1,23 +1,19 @@ -$NetBSD: distinfo,v 1.33 2010/05/05 12:15:30 markd Exp $ +$NetBSD: distinfo,v 1.34 2010/07/19 21:21:25 markd Exp $ -SHA1 (netatalk-2.0.5.tar.bz2) = a38f98abc123b02d26628543e393a4de04481e4f -RMD160 (netatalk-2.0.5.tar.bz2) = 47247d376bf421652d9f9897c75853424215ae0a -Size (netatalk-2.0.5.tar.bz2) = 993882 bytes +SHA1 (netatalk-2.1.3.tar.bz2) = a1a3fa649ecb454c4ed2e476e27877ba06a338d9 +RMD160 (netatalk-2.1.3.tar.bz2) = de9810c014549099e412bbc52fb3bb5e780b30e5 +Size (netatalk-2.1.3.tar.bz2) = 1122920 bytes SHA1 (patch-adv1tov2.c) = f72a55c65a1f5f60ad49e6bd52696103d3993bbf RMD160 (patch-adv1tov2.c) = 7fed71cba8494afb2dafdde3f392103ccbdf2e93 Size (patch-adv1tov2.c) = 714 bytes -SHA1 (patch-aa) = 4aeb5ca2cb82f8bfa92c26db6ba63b291510badb -SHA1 (patch-ab) = 59373428e7485b88d6e9e7474bbeef9687ed1084 -SHA1 (patch-ac) = 5511ff25a2ae7e4148fb865b31f0492b0a4b79af -SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8 -SHA1 (patch-ae) = 8d26d0c91009c3147363e4efe05d89e13fcef987 +SHA1 (patch-aa) = 53a73a0e6b064606e3ffa6970fb5970c7747866e +SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97 +SHA1 (patch-ae) = 925dc745303f9d21a5ea9f52593734700d07bbb5 SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2 -SHA1 (patch-ag) = 517689746d79f3f1b7c55aa6c25bf57fb184c4d9 -SHA1 (patch-ah) = 8fbd57102e001967c29537102ca792eaa837b911 -SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7 +SHA1 (patch-ah) = bb98cf49d9ac1d602414296c329fb5118c94d17a SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021 SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4 SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9 SHA1 (patch-ap) = 642051a6b4ab5336c334ef00b19d1e0091e33f06 -SHA1 (patch-bi) = b592d058a1d61322c03d1c3d44e39b48f2ddf7c3 -SHA1 (patch-bj) = 28f50f333d73b4a219d69412a1563ec11c4b63a2 +SHA1 (patch-aq) = 15eea1ce4d9721cfa29959990ee014f623f816a0 +SHA1 (patch-bj) = e1e0fc2be101554a2e0d53c24d113b593556eb41 diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa index a16441f6f7b..41d28878326 100644 --- a/net/netatalk/patches/patch-aa +++ b/net/netatalk/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.19 2010/01/17 11:48:03 markd Exp $ +$NetBSD: patch-aa,v 1.20 2010/07/19 21:21:25 markd Exp $ ---- configure.orig 2009-03-29 16:24:33.000000000 +0900 +--- configure.orig 2010-04-22 07:59:58.000000000 +0000 +++ configure -@@ -24445,7 +24445,7 @@ done +@@ -25143,7 +25143,7 @@ done --for ac_func in strlcpy strlcat -+for ac_func in strlcpy strlcat getifaddrs +-for ac_func in backtrace_symbols setlocale nl_langinfo strlcpy strlcat setlinebuf dirfd pselect ++for ac_func in backtrace_symbols setlocale nl_langinfo strlcpy strlcat setlinebuf dirfd pselect getifaddrs do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -27933,7 +27933,7 @@ fi +@@ -28605,7 +28605,7 @@ fi LIBS="$savedLIBS" fi @@ -20,43 +20,7 @@ $NetBSD: patch-aa,v 1.19 2010/01/17 11:48:03 markd Exp $ if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE"; then { echo "$as_me:$LINENO: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&5 echo "$as_me: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&2;} -@@ -28583,7 +28583,7 @@ if test "${with_spooldir+set}" = set; th - withval=$with_spooldir; - - if test "$withval" = "no"; then -- if test x"$spool_required" == x"yes"; then -+ if test x"$spool_required" = x"yes"; then - { { echo "$as_me:$LINENO: error: *** CUPS support requires a spooldir ***" >&5 - echo "$as_me: error: *** CUPS support requires a spooldir ***" >&2;} - { (exit 1); exit 1; }; } -@@ -29496,7 +29496,7 @@ cat >>confdefs.h <<\_ACEOF - #define NETBSD 1 - _ACEOF - -- CFLAGS="-I\$(top_srcdir)/sys/netbsd -I/usr/include/kerberosIV $CFLAGS" -+ CFLAGS="-I\$(top_srcdir)/sys/netbsd $CFLAGS" - need_dash_r=yes - - -@@ -30286,7 +30286,7 @@ echo "${ECHO_T}yes" >&6; } - atalk_cv_bdb_version=no - maj=$atalk_cv_bdb_MAJOR - min=$atalk_cv_bdb_MINOR -- atalk_cv_bdb_try_libs="-ldb$maj$min -ldb$maj.$min -ldb-$maj$min -ldb-$maj.$min" -+ atalk_cv_bdb_try_libs="-ldb$maj$min -ldb$maj.$min -ldb-$maj$min -ldb-$maj.$min -ldb$maj-$maj.$min" - - for lib in $atalk_cv_bdb_try_libs ; do - LIBS="$lib $savedlibs" -@@ -30527,7 +30527,7 @@ case "(($ac_try" in - *) ac_try_echo=$ac_try;; - esac - eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ (eval "$ac_cpp $ac_env_CPPFLAGS_value conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 -@@ -30735,7 +30735,7 @@ if test "${enable_krbV_uam+set}" = set; +@@ -31515,7 +31515,7 @@ if test "${enable_krbV_uam+set}" = set; if test x"$enableval" = x"yes"; then FOUND_GSSAPI=no diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab deleted file mode 100644 index e314798ec17..00000000000 --- a/net/netatalk/patches/patch-ab +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2009/06/09 13:57:56 taca Exp $ - ---- bin/psorder/psorder.c.orig 2009-03-29 16:23:21.000000000 +0900 -+++ bin/psorder/psorder.c -@@ -35,6 +35,7 @@ - #include <sys/uio.h> - #include <sys/file.h> - #include <ctype.h> -+#include <limits.h> - #ifdef HAVE_FCNTL_H - #include <fcntl.h> - #endif /* HAVE_FCNTL_H */ -@@ -102,7 +103,11 @@ psorder( path ) - { - int tempfd; - int inputfd; -+#if defined(NAME_MAX) -+ char tempfile[NAME_MAX]; -+#else - char tempfile[MAXNAMLEN]; -+#endif - - filesetup( path, &inputfd, tempfile, &tempfd ); - readps( inputfd, tempfd, tempfile ); -@@ -151,7 +156,11 @@ filesetup( inputfile, infd, tfile, tfd ) - make temporary file - */ - -- strncpy( tfile, template, MAXNAMLEN ); -+#if defined(NAME_MAX) -+ (void *)strncpy( tfile, template, NAME_MAX ); -+#else -+ (void *)strncpy( tfile, template, MAXNAMLEN ); -+#endif - if (( *tfd = mkstemp( tfile )) == -1 ) { - fprintf( stderr, "can't create temporary file %s\n", tfile ); - filecleanup( -1, -1, "" ); diff --git a/net/netatalk/patches/patch-ac b/net/netatalk/patches/patch-ac index a9192762739..ddb0b3535b9 100644 --- a/net/netatalk/patches/patch-ac +++ b/net/netatalk/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.9 2009/06/09 13:57:56 taca Exp $ +$NetBSD: patch-ac,v 1.10 2010/07/19 21:21:25 markd Exp $ The original commit message for this patch: @@ -28,20 +28,18 @@ and finally, the discussion referred to in the above change: http://mail-index.netbsd.org/tech-net/1999/07/02/0022.html http://mail-index.netbsd.org/tech-net/1999/07/03/0004.html ---- etc/atalkd/main.c.orig 2009-03-29 16:23:22.000000000 +0900 +--- etc/atalkd/main.c.orig 2009-12-13 02:21:47.000000000 +0000 +++ etc/atalkd/main.c -@@ -280,12 +280,12 @@ static void as_timer(int sig _U_) +@@ -296,10 +296,10 @@ static void as_timer(int sig _U_) LOG(log_info, logtype_atalkd, "config for no router" ); if ( iface->i_flags & IFACE_PHASE2 ) { - iface->i_rt->rt_firstnet = 0; + iface->i_rt->rt_firstnet = htons(1); iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET ); - setaddr( iface, IFACE_PHASE2, - iface->i_addr.sat_addr.s_net, - iface->i_addr.sat_addr.s_node, + setaddr( iface, IFACE_PHASE2, iface->i_addr.sat_addr.s_net, iface->i_addr.sat_addr.s_node, - 0, htons( STARTUP_LASTNET )); + htons(1), htons( STARTUP_LASTNET )); } if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */ - LOG(log_error, logtype_atalkd, + LOG(log_error, logtype_atalkd, "as_timer: can't route %u.%u to loopback: %s", diff --git a/net/netatalk/patches/patch-ad b/net/netatalk/patches/patch-ad deleted file mode 100644 index d75ba69f37b..00000000000 --- a/net/netatalk/patches/patch-ad +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2002/09/30 09:25:24 abs Exp $ - ---- include/atalk/paths.h.orig Wed Sep 25 18:36:24 2002 -+++ include/atalk/paths.h -@@ -16,7 +16,7 @@ - - /* lock file path. this should be re-organized a bit. */ - #if ! defined (_PATH_LOCKDIR) --# if defined (FHS_COMPATIBILITY) -+# if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) - # define _PATH_LOCKDIR "/var/run/" - # elif defined (BSD4_4) - # ifdef MACOSX_SERVER -@@ -51,7 +51,7 @@ - */ - #define _PATH_ATALKDEBUG "/tmp/atalkd.debug" - #define _PATH_ATALKDTMP "atalkd.tmp" --#ifdef FHS_COMPATIBILITY -+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) - # define _PATH_ATALKDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid") - #else - # define _PATH_ATALKDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"atalkd") -@@ -61,7 +61,7 @@ - * psorder paths - */ - #define _PATH_TMPPAGEORDER "/tmp/psorderXXXXXX" --#ifdef FHS_COMPATIBILITY -+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) - # define _PATH_PAPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid") - #else - # define _PATH_PAPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"papd") -@@ -71,7 +71,7 @@ - * afpd paths - */ - #define _PATH_AFPTKT "/tmp/AFPtktXXXXXX" --#ifdef FHS_COMPATIBILITY -+#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__) - # define _PATH_AFPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid") - #else - # define _PATH_AFPDLOCK ATALKPATHCAT(_PATH_LOCKDIR,"afpd") diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae index 88d5be1abaa..f3f5b38ea40 100644 --- a/net/netatalk/patches/patch-ae +++ b/net/netatalk/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.8 2009/06/09 13:57:56 taca Exp $ +$NetBSD: patch-ae,v 1.9 2010/07/19 21:21:25 markd Exp $ ---- config.h.in.orig 2009-03-29 16:23:57.000000000 +0900 +--- config.h.in.orig 2010-02-07 18:57:15.000000000 +0000 +++ config.h.in -@@ -188,8 +188,8 @@ +@@ -300,8 +300,8 @@ /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -11,5 +11,5 @@ $NetBSD: patch-ae,v 1.8 2009/06/09 13:57:56 taca Exp $ +/* Define to 1 if you have the `getifaddrs' function. */ +#undef HAVE_GETIFADDRS - /* Whether to enable GSSAPI support */ - #undef HAVE_GSSAPI + /* Define to 1 if you have the `getxattr' function. */ + #undef HAVE_GETXATTR diff --git a/net/netatalk/patches/patch-ag b/net/netatalk/patches/patch-ag deleted file mode 100644 index 5d2c0531efa..00000000000 --- a/net/netatalk/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.8 2009/06/09 13:57:56 taca Exp $ - ---- etc/afpd/unix.h.orig 2009-03-29 16:23:22.000000000 +0900 -+++ etc/afpd/unix.h -@@ -44,7 +44,9 @@ typedef int mode_t; - #include <sys/mnttab.h> - #endif /* __svr4__ || HAVE_SYS_MNTTAB_H */ - -- -+#if defined(__DragonFly__) -+#define dqblk ufs_dqblk -+#endif - - #if defined(HAVE_SYS_MOUNT_H) || defined(BSD4_4) || \ - defined(linux) || defined(ultrix) diff --git a/net/netatalk/patches/patch-ah b/net/netatalk/patches/patch-ah index baeba10d2ea..a7e5fb846d3 100644 --- a/net/netatalk/patches/patch-ah +++ b/net/netatalk/patches/patch-ah @@ -1,13 +1,13 @@ -$NetBSD: patch-ah,v 1.6 2010/01/17 11:48:03 markd Exp $ +$NetBSD: patch-ah,v 1.7 2010/07/19 21:21:25 markd Exp $ ---- config/Makefile.in.orig 2009-04-25 01:46:56.000000000 +0900 +--- config/Makefile.in.orig 2010-02-07 18:59:32.000000000 +0000 +++ config/Makefile.in -@@ -413,13 +413,14 @@ uninstall-am: uninstall-local - # - # install configuration files - # -+egconfdir = @prefix@/share/examples/netatalk +@@ -668,12 +668,14 @@ uninstall-local: + rm -f $(DESTDIR)$(pkgconfdir)/$$f; \ + done ++egconfdir = @prefix@/share/examples/netatalk ++ install-config-files: $(CONFFILES) $(GENFILES) - $(mkinstalldirs) $(DESTDIR)$(pkgconfdir) + $(mkinstalldirs) $(DESTDIR)$(egconfdir) diff --git a/net/netatalk/patches/patch-ai b/net/netatalk/patches/patch-ai deleted file mode 100644 index 9da6b4f6872..00000000000 --- a/net/netatalk/patches/patch-ai +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2004/11/02 11:26:28 markd Exp $ - ---- distrib/initscripts/rc.afpd.netbsd.tmpl.orig 2002-01-17 19:04:35.000000000 +1300 -+++ distrib/initscripts/rc.afpd.netbsd.tmpl -@@ -2,6 +2,7 @@ - # - # PROVIDE: afpd - # REQUIRE: atalkd -+# KEYWORD: shutdown - # - # AppleTalk daemons. Make sure not to start atalkd in the background: - # its data structures must have time to stablize before running the -@@ -15,7 +16,7 @@ rcvar=$name - command=":SBINDIR:/afpd" - etcdir=":ETCDIR:" - pidfile="/var/run/${name}.pid" --required_files="$etcdir/papd.conf $etcdir/AppleVolumes.default $etcdir/AppleVolumes.system" -+required_files="$etcdir/afpd.conf $etcdir/AppleVolumes.default $etcdir/AppleVolumes.system" - - load_rc_config $name - run_rc_command "$1" diff --git a/net/netatalk/patches/patch-ap b/net/netatalk/patches/patch-ap index 538fbd2cb09..434005eec93 100644 --- a/net/netatalk/patches/patch-ap +++ b/net/netatalk/patches/patch-ap @@ -1,4 +1,4 @@ -$NetBSD: patch-ap,v 1.6 2010/05/05 12:15:30 markd Exp $ +$NetBSD: patch-ap,v 1.7 2010/07/19 21:21:25 markd Exp $ Fixes loading of pam modules on older versions on NetBSD, where the dependency of the module on libpam was not explicit. diff --git a/net/netatalk/patches/patch-aq b/net/netatalk/patches/patch-aq new file mode 100644 index 00000000000..4cc54a45287 --- /dev/null +++ b/net/netatalk/patches/patch-aq @@ -0,0 +1,15 @@ +$NetBSD: patch-aq,v 1.4 2010/07/19 21:21:25 markd Exp $ + +PR kern/43625 + +--- etc/cnid_dbd/cnid_metad.c.orig 2010-04-29 09:17:50.000000000 +0000 ++++ etc/cnid_dbd/cnid_metad.c +@@ -541,7 +541,7 @@ int main(int argc, char *argv[]) + while (1) { + rqstfd = usockfd_check(srvfd, &set); + /* Collect zombie processes and log what happened to them */ +- if (sigchild) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { ++ while ((pid = waitpid(-1, &status, WNOHANG)) > 0) { + for (i = 0; i < MAXVOLS; i++) { + if (srv[i].pid == pid) { + srv[i].pid = 0; diff --git a/net/netatalk/patches/patch-bi b/net/netatalk/patches/patch-bi deleted file mode 100644 index 67609d1f1c3..00000000000 --- a/net/netatalk/patches/patch-bi +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2007/12/31 09:22:07 taca Exp $ - ---- bin/afile/acleandir.rc.orig 2000-08-09 00:46:33.000000000 +0900 -+++ bin/afile/acleandir.rc -@@ -1,4 +1,4 @@ --#! /usr/bin/rc -+#! @PREFIX@/bin/rc - # - # acleandir [-rvnid] dir - # diff --git a/net/netatalk/patches/patch-bj b/net/netatalk/patches/patch-bj index 4dfcbda17ea..15484dc4acb 100644 --- a/net/netatalk/patches/patch-bj +++ b/net/netatalk/patches/patch-bj @@ -1,50 +1,13 @@ -$NetBSD: patch-bj,v 1.3 2010/01/17 11:48:03 markd Exp $ +$NetBSD: patch-bj,v 1.4 2010/07/19 21:21:25 markd Exp $ ---- distrib/initscripts/Makefile.in.orig 2009-11-10 13:11:12.000000000 +0000 +--- distrib/initscripts/Makefile.in.orig 2010-02-14 17:47:12.000000000 +0000 +++ distrib/initscripts/Makefile.in -@@ -251,7 +251,7 @@ TEMPLATES = \ - rc.atalk.gentoo.tmpl \ - rc.atalk.debian.tmpl - --CLEANFILES = $(GENERATED_FILES) atalk afpd atalkd papd timelord -+CLEANFILES = $(GENERATED_FILES) atalk afpd atalkd papd timelord cnid_metad - EXTRA_DIST = $(TEMPLATES) rc.atalk.cobalt - - # -@@ -296,7 +296,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal - @USE_COBALT_TRUE@sysv_SCRIPTS = atalk - @USE_DEBIAN_TRUE@sysv_SCRIPTS = atalk - @USE_GENTOO_TRUE@sysv_SCRIPTS = atalk --@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord -+@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord cnid_metad - @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk - @USE_SOLARIS_TRUE@sysv_SCRIPTS = atalk - @USE_SUSE_TRUE@sysv_SCRIPTS = atalk -@@ -443,7 +443,7 @@ info: info-am +@@ -455,7 +455,7 @@ info: info-am info-am: -install-data-am: install-sysvSCRIPTS -+install-data-am: ++install-data-am: @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook -@@ -559,6 +559,7 @@ uninstall: uninstall-startup - - @USE_NETBSD_TRUE@afpd: rc.afpd.netbsd - @USE_NETBSD_TRUE@ cp -f $< $@ -+@USE_NETBSD_TRUE@ chmod a+x $@ - - @USE_NETBSD_TRUE@atalkd: rc.atalkd.netbsd - @USE_NETBSD_TRUE@ cp -f $< $@ -@@ -572,6 +573,10 @@ uninstall: uninstall-startup - @USE_NETBSD_TRUE@ cp -f $< $@ - @USE_NETBSD_TRUE@ chmod a+x $@ - -+@USE_NETBSD_TRUE@cnid_metad: rc.cnid_metad.netbsd -+@USE_NETBSD_TRUE@ cp -f $< $@ -+@USE_NETBSD_TRUE@ chmod a+x $@ -+ - @USE_NETBSD_TRUE@install-data-hook: - - @USE_NETBSD_TRUE@uninstall-hook: |