summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/netatalk/Makefile10
-rw-r--r--net/netatalk/PLIST8
-rw-r--r--net/netatalk/distinfo30
-rw-r--r--net/netatalk/options.mk14
-rw-r--r--net/netatalk/patches/patch-aa58
-rw-r--r--net/netatalk/patches/patch-ab7
-rw-r--r--net/netatalk/patches/patch-ac6
-rw-r--r--net/netatalk/patches/patch-ae8
-rw-r--r--net/netatalk/patches/patch-af8
-rw-r--r--net/netatalk/patches/patch-ag13
-rw-r--r--net/netatalk/patches/patch-ah21
-rw-r--r--net/netatalk/patches/patch-ak16
-rw-r--r--net/netatalk/patches/patch-al16
-rw-r--r--net/netatalk/patches/patch-ap97
-rw-r--r--net/netatalk/patches/patch-bj24
15 files changed, 108 insertions, 228 deletions
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 4f5e8429e45..f5000996757 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2009/02/22 07:35:16 taca Exp $
+# $NetBSD: Makefile,v 1.64 2009/06/09 13:57:56 taca Exp $
-DISTNAME= netatalk-2.0.3
-PKGREVISION= 13
+DISTNAME= netatalk-2.0.4
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
@@ -9,6 +8,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://netatalk.sourceforge.net/
COMMENT= Netatalk appletalk file and print services
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --enable-netbsd \
--enable-timelord \
--libexecdir=${PREFIX}/libexec/netatalk \
--sbindir=${PREFIX}/libexec/netatalk \
- --with-pkgconfdir=${PKG_SYSCONFDIR:Q} \
+ --with-pkgconfdir=${PKG_SYSCONFDIR} \
--with-message-dir=${PKG_SYSCONFDIR}/msg \
--localstatedir=${VARBASE}/netatalk \
--with-uams-path=${PREFIX}/libexec/netatalk/uams \
@@ -68,7 +68,7 @@ RCD_SCRIPT_SRC.${f}= ${WRKSRC}/distrib/initscripts/${f}
SUBST_CLASSES+= rc
SUBST_FILES.rc= ${WRKSRC}/bin/afile/acleandir.rc
-SUBST_SED.rc+= -e 's,@PREFIX@,${PREFIX:Q},g'
+SUBST_SED.rc+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_STAGE.rc= pre-configure
.include "options.mk"
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index 903954aa492..3868be57471 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:43:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/06/09 13:57:56 taca Exp $
bin/achfile
bin/acleandir.rc
bin/adv1tov2
@@ -32,7 +32,6 @@ bin/papstatus
bin/psorder
bin/showppd
bin/single2bin
-bin/timeout
bin/unbin
bin/unhex
bin/uniconv
@@ -55,10 +54,12 @@ include/atalk/pap.h
include/atalk/paths.h
include/atalk/rtmp.h
include/atalk/server_child.h
+include/atalk/server_ipc.h
include/atalk/tdb.h
include/atalk/uam.h
include/atalk/unicode.h
include/atalk/util.h
+include/atalk/volinfo.h
include/atalk/zip.h
include/netatalk/aarp.h
include/netatalk/at.h
@@ -129,7 +130,6 @@ man/man1/pap.1
man/man1/papstatus.1
man/man1/psorder.1
man/man1/single2bin.1
-man/man1/timeout.1
man/man1/unbin.1
man/man1/unhex.1
man/man1/uniconv.1
@@ -156,8 +156,8 @@ share/examples/netatalk/AppleVolumes.system
share/examples/netatalk/afpd.conf
share/examples/netatalk/atalkd.conf
share/examples/netatalk/netatalk.conf
-share/examples/netatalk/papd.conf
${PLIST.pam}share/examples/netatalk/netatalk.pamd
+share/examples/netatalk/papd.conf
share/examples/rc.d/afpd
share/examples/rc.d/atalkd
share/examples/rc.d/cnid_metad
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 986049bd05f..2112d4c8186 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,25 +1,19 @@
-$NetBSD: distinfo,v 1.29 2009/02/22 07:35:16 taca Exp $
+$NetBSD: distinfo,v 1.30 2009/06/09 13:57:56 taca Exp $
-SHA1 (netatalk-2.0.3-cjk-2b.patch.gz) = 0c303a9d20ca7277b2914acc2cd5b12b24857629
-RMD160 (netatalk-2.0.3-cjk-2b.patch.gz) = 58b2710261e7f37e465f39f716c387447927fc69
-Size (netatalk-2.0.3-cjk-2b.patch.gz) = 25545 bytes
-SHA1 (netatalk-2.0.3.tar.bz2) = ce2d5dd123467ccae72fc62ca4ee3738019455f2
-RMD160 (netatalk-2.0.3.tar.bz2) = 29b763400a45797ac4a8e499d5328aa91a091c91
-Size (netatalk-2.0.3.tar.bz2) = 1471804 bytes
-SHA1 (patch-aa) = 0c5176e46b33667efd175c668617527aee33a05f
-SHA1 (patch-ab) = 10bf2fdd900a6c2189376757e921bb6228e0f19c
-SHA1 (patch-ac) = ba559d1b957172e77ec8eb9cc5c60d2f88044ffa
+SHA1 (netatalk-2.0.4.tar.bz2) = e4ee42849844137ed0ce1e01a77419c8dc6ae0b7
+RMD160 (netatalk-2.0.4.tar.bz2) = 4f9b009857319116b7a4dfa6ab4910533afc35e5
+Size (netatalk-2.0.4.tar.bz2) = 964106 bytes
+SHA1 (patch-aa) = 5bd27e8782527d79635df82d4e5c85633a285adb
+SHA1 (patch-ab) = 59373428e7485b88d6e9e7474bbeef9687ed1084
+SHA1 (patch-ac) = 5511ff25a2ae7e4148fb865b31f0492b0a4b79af
SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
-SHA1 (patch-ae) = da46ec82296aa538c0c4ed67829dafe4454935e9
-SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
-SHA1 (patch-ag) = 1785045e56d93ea0747e264a1d1a8c743e7c798d
-SHA1 (patch-ah) = 318626f5c6d21f025ae5e08c9da76bd4c493f7e6
+SHA1 (patch-ae) = 8d26d0c91009c3147363e4efe05d89e13fcef987
+SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
+SHA1 (patch-ag) = 517689746d79f3f1b7c55aa6c25bf57fb184c4d9
+SHA1 (patch-ah) = 28d68c4755b1d3363fbd070eb679c6e353efc10a
SHA1 (patch-ai) = e8f453569db891100221f27bf579c66a18a650b7
-SHA1 (patch-ak) = ee205781dffb02b558353e95a07f7f66e143614a
-SHA1 (patch-al) = df56d837eeb5698b0247fc0233448d254392fe43
SHA1 (patch-am) = a01ab55a793c5249cc6fa0a4d98d61e43f173021
SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
-SHA1 (patch-ap) = 1b208e1dca1c62b08e39dabbf962fdcf2ff91584
SHA1 (patch-bi) = b592d058a1d61322c03d1c3d44e39b48f2ddf7c3
-SHA1 (patch-bj) = 578f4ac2fbe3e4f5d85a4ac24a778ce9d2e75045
+SHA1 (patch-bj) = 28f71df2619b6188806e187b588fc6ca9d1e14cb
diff --git a/net/netatalk/options.mk b/net/netatalk/options.mk
index 924c4af5406..10b0f9db442 100644
--- a/net/netatalk/options.mk
+++ b/net/netatalk/options.mk
@@ -1,20 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2009/02/22 07:35:16 taca Exp $
+# $NetBSD: options.mk,v 1.2 2009/06/09 13:57:56 taca Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk
-PKG_SUPPORTED_OPTIONS= cjk cups kerberos pam slp
+PKG_SUPPORTED_OPTIONS= cups kerberos pam slp
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mcjk)
-# CJK(Chinese/Japanese/Korean) patch.
-#
-# http://www003.upp.so-net.ne.jp/hat/netatalk/cjk.html
-#
-PATCHFILES+= netatalk-2.0.3-cjk-2b.patch.gz
-PATCH_SITES+= http://www003.upp.so-net.ne.jp/hat/files/
-PATCH_DIST_STRIP.netatalk-2.0.3-cjk-2b.patch.gz= -p1
-.endif
-
.if !empty(PKG_OPTIONS:Mcups)
.include "../../print/cups/buildlink3.mk"
CONFIGURE_ARGS+= --enable-cups
diff --git a/net/netatalk/patches/patch-aa b/net/netatalk/patches/patch-aa
index c07d8992412..7c8e229db22 100644
--- a/net/netatalk/patches/patch-aa
+++ b/net/netatalk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.17 2009/02/22 07:35:16 taca Exp $
+$NetBSD: patch-aa,v 1.18 2009/06/09 13:57:56 taca Exp $
---- configure.orig 2005-05-17 18:14:29.000000000 -0400
-+++ configure 2008-04-05 21:15:47.000000000 -0400
-@@ -12464,7 +12464,7 @@
+--- configure.orig 2009-03-29 16:24:33.000000000 +0900
++++ configure
+@@ -24445,7 +24445,7 @@ done
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.17 2009/02/22 07:35:16 taca Exp $
+for ac_func in strlcpy strlcat getifaddrs
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -16704,7 +16704,7 @@
+ { echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -27933,7 +27933,7 @@ fi
LIBS="$savedLIBS"
fi
@@ -20,8 +20,8 @@ $NetBSD: patch-aa,v 1.17 2009/02/22 07:35:16 taca 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;}
-@@ -17304,7 +17304,7 @@
-
+@@ -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
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.17 2009/02/22 07:35:16 taca Exp $
{ { 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; }; }
-@@ -18190,7 +18190,7 @@
+@@ -29496,7 +29496,7 @@ cat >>confdefs.h <<\_ACEOF
#define NETBSD 1
_ACEOF
@@ -38,21 +38,39 @@ $NetBSD: patch-aa,v 1.17 2009/02/22 07:35:16 taca Exp $
need_dash_r=yes
-@@ -18961,7 +18961,7 @@
+@@ -29839,7 +29839,7 @@ IFS=$as_save_IFS
+ ;;
+ esac
+ fi
+-LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
++LIBGCRYPT_CONFIG=no
+ if test -n "$LIBGCRYPT_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $LIBGCRYPT_CONFIG" >&5
+ echo "${ECHO_T}$LIBGCRYPT_CONFIG" >&6; }
+@@ -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;
if test x"$enableval" = x"yes"; then
FOUND_GSSAPI=no
- GSSAPI_LIBS=""
-+ #GSSAPI_LIBS=""
++# GSSAPI_LIBS=""
GSSAPI_CFLAGS=""
-@@ -19176,7 +19176,7 @@
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
diff --git a/net/netatalk/patches/patch-ab b/net/netatalk/patches/patch-ab
index 8296330b915..e314798ec17 100644
--- a/net/netatalk/patches/patch-ab
+++ b/net/netatalk/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.11 2006/06/05 17:23:38 joerg Exp $
+$NetBSD: patch-ab,v 1.12 2009/06/09 13:57:56 taca Exp $
---- bin/psorder/psorder.c.orig 2006-06-05 16:54:26.000000000 +0000
+--- 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>
@@ -26,10 +26,11 @@ $NetBSD: patch-ab,v 1.11 2006/06/05 17:23:38 joerg Exp $
make temporary file
*/
+- strncpy( tfile, template, MAXNAMLEN );
+#if defined(NAME_MAX)
+ (void *)strncpy( tfile, template, NAME_MAX );
+#else
- (void *)strncpy( tfile, template, MAXNAMLEN );
++ (void *)strncpy( tfile, template, MAXNAMLEN );
+#endif
if (( *tfd = mkstemp( tfile )) == -1 ) {
fprintf( stderr, "can't create temporary file %s\n", tfile );
diff --git a/net/netatalk/patches/patch-ac b/net/netatalk/patches/patch-ac
index c6c52900490..a9192762739 100644
--- a/net/netatalk/patches/patch-ac
+++ b/net/netatalk/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2005/10/07 12:18:19 rillig Exp $
+$NetBSD: patch-ac,v 1.9 2009/06/09 13:57:56 taca Exp $
The original commit message for this patch:
@@ -28,9 +28,9 @@ 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 Sat Oct 5 08:20:13 2002
+--- etc/atalkd/main.c.orig 2009-03-29 16:23:22.000000000 +0900
+++ etc/atalkd/main.c
-@@ -278,12 +278,12 @@ static void as_timer(int sig)
+@@ -280,12 +280,12 @@ static void as_timer(int sig _U_)
LOG(log_info, logtype_atalkd, "config for no router" );
if ( iface->i_flags & IFACE_PHASE2 ) {
diff --git a/net/netatalk/patches/patch-ae b/net/netatalk/patches/patch-ae
index 9fa3971562c..88d5be1abaa 100644
--- a/net/netatalk/patches/patch-ae
+++ b/net/netatalk/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2008/04/06 20:21:18 christos Exp $
+$NetBSD: patch-ae,v 1.8 2009/06/09 13:57:56 taca Exp $
---- config.h.in.orig 2008-04-05 21:15:49.000000000 -0400
-+++ config.h.in 2008-04-05 21:17:55.000000000 -0400
-@@ -185,8 +185,8 @@
+--- config.h.in.orig 2009-03-29 16:23:57.000000000 +0900
++++ config.h.in
+@@ -188,8 +188,8 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
diff --git a/net/netatalk/patches/patch-af b/net/netatalk/patches/patch-af
index 74630a0402f..212b7d7fd15 100644
--- a/net/netatalk/patches/patch-af
+++ b/net/netatalk/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2003/04/28 04:07:46 fredb Exp $
+$NetBSD: patch-af,v 1.7 2009/06/09 13:57:56 taca Exp $
---- etc/psf/etc2ps.sh.orig Sun Apr 27 15:00:44 2003
-+++ etc/psf/etc2ps.sh Sun Apr 27 19:51:31 2003
+--- etc/psf/etc2ps.sh.orig 2009-03-29 16:23:23.000000000 +0900
++++ etc/psf/etc2ps.sh
@@ -9,15 +9,12 @@
# tag in the case.
#
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.6 2003/04/28 04:07:46 fredb Exp $
case $1 in
#
-@@ -39,7 +36,7 @@
+@@ -40,7 +37,7 @@ df*)
# troff2ps is from psroff by Chris Lewis.
#
tf*)
diff --git a/net/netatalk/patches/patch-ag b/net/netatalk/patches/patch-ag
index 36b1254197a..5d2c0531efa 100644
--- a/net/netatalk/patches/patch-ag
+++ b/net/netatalk/patches/patch-ag
@@ -1,16 +1,7 @@
-$NetBSD: patch-ag,v 1.7 2006/12/06 17:15:22 joerg Exp $
+$NetBSD: patch-ag,v 1.8 2009/06/09 13:57:56 taca Exp $
---- etc/afpd/unix.h.orig 2005-01-31 17:01:00.000000000 +0000
+--- etc/afpd/unix.h.orig 2009-03-29 16:23:22.000000000 +0900
+++ etc/afpd/unix.h
-@@ -32,7 +32,7 @@ typedef int mode_t;
- #define f_frsize f_fsize
- #else /* TRU64 */
- /* temp fix, was: defined(HAVE_SYS_STATVFS) || defined(__svr4__) */
--#if defined(__svr4__)
-+#if defined(__svr4__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900))
- #include <sys/statvfs.h>
- #define statfs statvfs
- #else /* HAVE_SYS_STATVFS || __svr4__ */
@@ -44,7 +44,9 @@ typedef int mode_t;
#include <sys/mnttab.h>
#endif /* __svr4__ || HAVE_SYS_MNTTAB_H */
diff --git a/net/netatalk/patches/patch-ah b/net/netatalk/patches/patch-ah
index 1a149c3b069..ab4c007fa54 100644
--- a/net/netatalk/patches/patch-ah
+++ b/net/netatalk/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2004/11/02 11:26:28 markd Exp $
+$NetBSD: patch-ah,v 1.5 2009/06/09 13:57:56 taca Exp $
---- config/Makefile.in.orig 2004-10-28 03:41:56.000000000 +1300
+--- config/Makefile.in.orig 2009-04-25 01:46:56.000000000 +0900
+++ config/Makefile.in
-@@ -392,13 +392,14 @@ uninstall-am: uninstall-info-am
+@@ -413,13 +413,14 @@ uninstall-am: uninstall-local
#
# install configuration files
#
@@ -20,3 +20,18 @@ $NetBSD: patch-ah,v 1.4 2004/11/02 11:26:28 markd Exp $
else \
echo "not overwriting $$f"; \
fi; \
+@@ -445,10 +446,10 @@ install-config-files: $(CONFFILES) $(GEN
+ @USE_PAM_FALSE@install-data-local: install-config-files
+
+ @USE_PAM_FALSE@uninstall-local:
+-@USE_PAM_FALSE@ for f in $(CONFFILES) $(GENFILES); do \
+-@USE_PAM_FALSE@ echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+-@USE_PAM_FALSE@ rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+-@USE_PAM_FALSE@ done
++@USE_PAM_FALSE@ for f in $(CONFFILES) $(GENFILES); do \
++@USE_PAM_FALSE@ echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
++@USE_PAM_FALSE@ rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
++@USE_PAM_FALSE@ done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net/netatalk/patches/patch-ak b/net/netatalk/patches/patch-ak
deleted file mode 100644
index d737025d78f..00000000000
--- a/net/netatalk/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2005/01/04 12:57:03 markd Exp $
-
---- bin/cnid/cnid_index.c.orig 2005-01-04 02:49:55.000000000 +1300
-+++ bin/cnid/cnid_index.c
-@@ -274,7 +274,11 @@ static int dbif_count(const int dbi, u_i
- DB_BTREE_STAT *sp;
- DB *db = db_table[dbi].db;
-
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
-+ ret = db->stat(db, NULL, &sp, 0);
-+#else
- ret = db->stat(db, &sp, 0);
-+#endif
-
- if (ret) {
- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
diff --git a/net/netatalk/patches/patch-al b/net/netatalk/patches/patch-al
deleted file mode 100644
index c3eaa5bded9..00000000000
--- a/net/netatalk/patches/patch-al
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.4 2005/01/04 12:57:03 markd Exp $
-
---- etc/cnid_dbd/dbif.c.orig 2004-12-22 02:36:12.000000000 +1300
-+++ etc/cnid_dbd/dbif.c
-@@ -514,7 +514,11 @@ int dbif_count(const int dbi, u_int32_t
- DB_BTREE_STAT *sp;
- DB *db = db_table[dbi].db;
-
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
-+ ret = db->stat(db, NULL, &sp, 0);
-+#else
- ret = db->stat(db, &sp, 0);
-+#endif
-
- if (ret) {
- LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
diff --git a/net/netatalk/patches/patch-ap b/net/netatalk/patches/patch-ap
deleted file mode 100644
index 905dab34dd1..00000000000
--- a/net/netatalk/patches/patch-ap
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2008/12/29 08:48:46 markd Exp $
-
-quote chars in popen variables expansion - from 2.0.4beta2
-
---- etc/papd/lp.c.orig 2004-06-09 14:24:47.000000000 +1200
-+++ etc/papd/lp.c
-@@ -212,10 +212,37 @@ static void lp_setup_comments (charset_t
-
- #define is_var(a, b) (strncmp((a), (b), 2) == 0)
-
-+static size_t quote(char *dest, char *src, const size_t bsize, size_t len)
-+{
-+size_t used = 0;
-+
-+ while (len && used < bsize ) {
-+ switch (*src) {
-+ case '$':
-+ case '\\':
-+ case '"':
-+ case '`':
-+ if (used + 2 > bsize )
-+ return used;
-+ *dest = '\\';
-+ dest++;
-+ used++;
-+ break;
-+ }
-+ *dest = *src;
-+ src++;
-+ dest++;
-+ len--;
-+ used++;
-+ }
-+ return used;
-+}
-+
-+
- static char* pipexlate(char *src)
- {
- char *p, *q, *dest;
-- static char destbuf[MAXPATHLEN];
-+ static char destbuf[MAXPATHLEN +1];
- size_t destlen = MAXPATHLEN;
- int len = 0;
-
-@@ -224,13 +251,15 @@ static char* pipexlate(char *src)
- if (!src)
- return NULL;
-
-- strncpy(dest, src, MAXPATHLEN);
-- if ((p = strchr(src, '%')) == NULL) /* nothing to do */
-+ memset(dest, 0, MAXPATHLEN +1);
-+ if ((p = strchr(src, '%')) == NULL) { /* nothing to do */
-+ strncpy(dest, src, MAXPATHLEN);
- return destbuf;
--
-- /* first part of the path. just forward to the next variable. */
-+ }
-+ /* first part of the path. copy and forward to the next variable. */
- len = MIN((size_t)(p - src), destlen);
- if (len > 0) {
-+ strncpy(dest, src, len);
- destlen -= len;
- dest += len;
- }
-@@ -246,21 +275,24 @@ static char* pipexlate(char *src)
- q = lp.lp_created_for;
- } else if (is_var(p, "%%")) {
- q = "%";
-- } else
-- q = p;
-+ }
-
- /* copy the stuff over. if we don't understand something that we
- * should, just skip it over. */
- if (q) {
-- len = MIN(p == q ? 2 : strlen(q), destlen);
-+ len = MIN(strlen(q), destlen);
-+ len = quote(dest, q, destlen, len);
-+ }
-+ else {
-+ len = MIN(2, destlen);
- strncpy(dest, q, len);
-- dest += len;
-- destlen -= len;
- }
-+ dest += len;
-+ destlen -= len;
-
-- /* stuff up to next $ */
-+ /* stuff up to next % */
- src = p + 2;
-- p = strchr(src, '$');
-+ p = strchr(src, '%');
- len = p ? MIN((size_t)(p - src), destlen) : destlen;
- if (len > 0) {
- strncpy(dest, src, len);
diff --git a/net/netatalk/patches/patch-bj b/net/netatalk/patches/patch-bj
index 3a790ba3bfb..3df089375f3 100644
--- a/net/netatalk/patches/patch-bj
+++ b/net/netatalk/patches/patch-bj
@@ -1,26 +1,26 @@
-$NetBSD: patch-bj,v 1.1 2008/03/22 04:40:45 taca Exp $
+$NetBSD: patch-bj,v 1.2 2009/06/09 13:57:56 taca Exp $
---- distrib/initscripts/Makefile.in.orig 2008-03-18 00:13:18.000000000 +0900
+--- distrib/initscripts/Makefile.in.orig 2009-04-23 17:03:29.000000000 +0900
+++ distrib/initscripts/Makefile.in
-@@ -243,7 +243,7 @@ TEMPLATES = \
+@@ -248,7 +248,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
-
-@@ -293,7 +293,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
- # checking for Solaris init scripts
#
- @USE_SOLARIS_TRUE@sysvdir = /etc/init.d
+@@ -293,7 +293,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_SUSE_TRUE@sysv_SCRIPTS = atalk
- @USE_GENTOO_TRUE@sysv_SCRIPTS = atalk
@USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
-@@ -536,6 +536,7 @@ uninstall: uninstall-startup
+ @USE_SOLARIS_TRUE@sysv_SCRIPTS = atalk
+ @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
+@@ -556,6 +556,7 @@ uninstall: uninstall-startup
@USE_NETBSD_TRUE@afpd: rc.afpd.netbsd
@USE_NETBSD_TRUE@ cp -f $< $@
@@ -28,7 +28,7 @@ $NetBSD: patch-bj,v 1.1 2008/03/22 04:40:45 taca Exp $
@USE_NETBSD_TRUE@atalkd: rc.atalkd.netbsd
@USE_NETBSD_TRUE@ cp -f $< $@
-@@ -549,6 +550,10 @@ uninstall: uninstall-startup
+@@ -569,6 +570,10 @@ uninstall: uninstall-startup
@USE_NETBSD_TRUE@ cp -f $< $@
@USE_NETBSD_TRUE@ chmod a+x $@
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 10:28:24 +0000