[pkgsrc/trunk]: pkgsrc/net/netatalk Update netatalk package to 2.0.4.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/net/netatalk Update netatalk package to 2.0.4.
From: taca <taca%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 07:52:18 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7879351781cf
branches:  trunk
changeset: 560244:7879351781cf
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Jun 09 13:57:56 2009 +0000

description:
Update netatalk package to 2.0.4.

pkgsrc changs:

* Add LICENSE.
* Fix some pkglint warnings.
* cjk patch was incorporated and cjk PKG_OPTION was removed.


Changes in 2.0.4
================

* REM: remove timeout
* NEW: afpd: DHX2 uams using GNU libgcrypt.
* NEW: afpd: volume options 'illegalseq', 'perm' and 'invisibledots'
       'ilegalseq'  encode illegal sequence in filename asis, ex "\217-", which is not
       a valid SHIFT-JIS char, is encoded  as U\217 -.
       'perm' value OR with the client requested permissions. (help with OSX 10.5
       strange permissions).
       Make dot files visible by default with 'usedots', use 'invisibledots'
       for keeping the old behavior, ie for OS9 (OSX hide dot files on its
       own).
* NEW: afpd: volume options allow_hosts/denied hosts
* NEW: afpd: volume options dperm/fperm default directory and file
       permissions or with server requests.
* NEW: afpd: afpd.conf, allow line continuation with \
* NEW: afpd: AppleVolumes.default allow line continuation with \
* NEW: afpd: Mac greek encoding.
* NEW: afpd: CJK encoding.
* UPD: afpd: Default UAMs: DHX + DHX2
* FIX: afpd: return the right error in createfile and copyfile if the disk
       is full.
* FIX: afpd: resolveid return the same error code than OSX if it's a directory
* FIX: afpd: server name check, test for the whole loopback subnet
       not only 127.0.0.1.
* UPD: afpd: limit comments size to 128 bytes, (workaround for Adobe CS2 bug).
* UPD: afpd: no more daemon icon.
* UPD: usedots, return an invalide name only for .Applexxx files used by netatalk not
       all files starting with .apple.
* UPD: cnid: increase the number of cnid_dbd slots to 512.
* FIX: cnid: dbd detach the daemon from the control terminal.
* UPD: cnid: never ending Berkeley API changes...
* UPD: cnid: dbd add a timeout when reading data from afpd client.
* UPD: cnid: Don't wait five second after the first error when speaking to the dbd
       backend.
* FIX: papd: vars use % not $
* FIX: papd: quote chars in popen variables expansion. security fix.
* FIX: papd: papd -d didn't write to stderr.
* FIX: papd: ps comments don't always use ()
* FIX: many compilation errors (solaris, AFS, Tru64, xfs quota...).

diffstat:

 net/netatalk/Makefile         |  10 ++--
 net/netatalk/PLIST            |   8 +-
 net/netatalk/distinfo         |  30 +++++-------
 net/netatalk/options.mk       |  14 +-----
 net/netatalk/patches/patch-aa |  58 ++++++++++++++++--------
 net/netatalk/patches/patch-ab |   7 +-
 net/netatalk/patches/patch-ac |   6 +-
 net/netatalk/patches/patch-ae |   8 +-
 net/netatalk/patches/patch-af |   8 +-
 net/netatalk/patches/patch-ag |  13 +----
 net/netatalk/patches/patch-ah |  21 +++++++-
 net/netatalk/patches/patch-ak |  16 -------
 net/netatalk/patches/patch-al |  16 -------
 net/netatalk/patches/patch-ap |  97 -------------------------------------------
 net/netatalk/patches/patch-bj |  24 +++++-----
 15 files changed, 108 insertions(+), 228 deletions(-)

diffs (truncated from 584 to 300 lines):

diff -r 372eb4973e3c -r 7879351781cf net/netatalk/Makefile
--- a/net/netatalk/Makefile     Tue Jun 09 13:52:09 2009 +0000
+++ b/net/netatalk/Makefile     Tue Jun 09 13:57:56 2009 +0000
@@ -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 @@
 MAINTAINER=    markd%NetBSD.org@localhost
 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 @@
                        --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 @@
 
 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 -r 372eb4973e3c -r 7879351781cf net/netatalk/PLIST
--- a/net/netatalk/PLIST        Tue Jun 09 13:52:09 2009 +0000
+++ b/net/netatalk/PLIST        Tue Jun 09 13:57:56 2009 +0000
@@ -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/psorder
 bin/showppd
 bin/single2bin
-bin/timeout
 bin/unbin
 bin/unhex
 bin/uniconv
@@ -55,10 +54,12 @@
 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/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/afpd.conf
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/netatalk.conf
+${PLIST.pam}share/examples/netatalk/netatalk.pamd
 share/examples/netatalk/papd.conf
-${PLIST.pam}share/examples/netatalk/netatalk.pamd
 share/examples/rc.d/afpd
 share/examples/rc.d/atalkd
 share/examples/rc.d/cnid_metad
diff -r 372eb4973e3c -r 7879351781cf net/netatalk/distinfo
--- a/net/netatalk/distinfo     Tue Jun 09 13:52:09 2009 +0000
+++ b/net/netatalk/distinfo     Tue Jun 09 13:57:56 2009 +0000
@@ -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 -r 372eb4973e3c -r 7879351781cf net/netatalk/options.mk
--- a/net/netatalk/options.mk   Tue Jun 09 13:52:09 2009 +0000
+++ b/net/netatalk/options.mk   Tue Jun 09 13:57:56 2009 +0000
@@ -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 -r 372eb4973e3c -r 7879351781cf net/netatalk/patches/patch-aa
--- a/net/netatalk/patches/patch-aa     Tue Jun 09 13:52:09 2009 +0000
+++ b/net/netatalk/patches/patch-aa     Tue Jun 09 13:57:56 2009 +0000
@@ -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 @@
 +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 @@
        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 @@
                               { { 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 @@
        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 -r 372eb4973e3c -r 7879351781cf net/netatalk/patches/patch-ab
--- a/net/netatalk/patches/patch-ab     Tue Jun 09 13:52:09 2009 +0000
+++ b/net/netatalk/patches/patch-ab     Tue Jun 09 13:57:56 2009 +0000
@@ -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 @@
        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 -r 372eb4973e3c -r 7879351781cf net/netatalk/patches/patch-ac
--- a/net/netatalk/patches/patch-ac     Tue Jun 09 13:52:09 2009 +0000
+++ b/net/netatalk/patches/patch-ac     Tue Jun 09 13:57:56 2009 +0000
@@ -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 @@
     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 -r 372eb4973e3c -r 7879351781cf net/netatalk/patches/patch-ae
--- a/net/netatalk/patches/patch-ae     Tue Jun 09 13:52:09 2009 +0000
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of net/netatalk package to 2.0.4.
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/eina Make it build on DragonFly.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of net/netatalk package to 2.0.4.
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/eina Make it build on DragonFly.
Indexes:
Home | Main Index | Thread Index | Old Index