Update netatalk1 package to 1.6.4a.

pkgsrc change

- Take matainer ship by me.
- Introduce options.mk for PAM configure option.
- Minor clean up of Makefile.
- Added quick changes to avoid using <openssl/des.h>.

netatalk changes

Changes in 1.6.4a
=================

* FIX: insecure tempfile handling bug in etc2ps.sh, found by Trustix, CAN-2004-0974.

Changes in 1.6.4
================

* NEW: afpd: Using the mswindows option now implicitly specifies usedots.
  [Sam Noble]
* UPD: afpd.8: Updated the option documentation.
  [Thomas Kaiser, Sebastian Rittau]
* FIX: configure: Removed broken --with-flock-locks option. [Bj\M-C\M-6rn Fernhomberg]
* FIX: libatalk: Do not log network probe (OSX 10.3). [Didier Gautheron]
* FIX: libatalk: Deadlock in signal handlers. [Didier]
* FIX: libatalk: Compilation with Linux kernel 2.6 fixed. [Sebastian, Bj\M-C\M-6rn]
* FIX: afpd: Solaris compile issues. [Bj\M-C\M-6rn]
* FIX: afpd: If connection broke in dsi_tickle the child did never die. [Bj\M-C\M-6rn]
* FIX: afpd: Catsearch, fixes a possible segmentation fault. [Bj\M-C\M-6rn]
* FIX: afpd: Compilation issues. [Olaf Hering, Sebastian]
* FIX: cnid: Fix compile problems on Tru64. [Burkhard Schmidt]
* FIX: megatron: Fixed an uninitialized variable. [Olaf]
* FIX: installation: Don't overwrite PAM file if --enable-overwrite configure
       option is not set. [Sam, Ryan Cleary]
* FIX: installation: Fixed BSD installation. [Toru TAKAMIZU]
* FIX: docs: Removed ssl-dir/ssl-dirs confusion from doc/INSTALL. [Bj\M-C\M-6rn]

Changes in 1.6.3
================

* UPD: afpd: Infrastructural support for an upcoming Kerberos 5 UAM.
       [Sam Noble]
* UPD: uams_dhx_passwd: Better random seed in Tru64. [Burkhard Schmidt]
* FIX: afpd: Bug in AFP connection negotiation stage. [Sam]
* FIX: afpd: Catsearch, when Mac and unix name differ, search on attributes.
* FIX: afpd: Files could be opened for writing on read-only filesystems.
* FIX: afpd: Debugging using SIGUSR1 was broken. [Stefan Muenkner]
* FIX: afpd: Segfault after login. [Robby Griffin, Sean Bolton]
* FIX: psf: Correct path to etc2ps.sh.
* FIX: shell_utils: Don't distribute generated files.
* FIX: aecho: -A option didn't work. [Chris Shiels]
* FIX: configure: Berkeley DB path detection could be wrong. [Stefan]
* FIX: Automake build fixes.

10 files changed, 132 insertions, 66 deletions

diff --git a/net/netatalk1/Makefile b/net/netatalk1/Makefile
index 7e7751844a9..c4fb021a152 100644
--- a/net/netatalk1/Makefile
+++ b/net/netatalk1/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:25 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/05 23:40:56 taca Exp $
 
-DISTNAME=	netatalk-1.6.2
-PKGREVISION=	2
+DISTNAME=	netatalk-1.6.4a
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/} \
 		http://me.in-berlin.de/~jroger/netatalk/
 
-MAINTAINER=	markd@NetBSD.org
+MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/netatalk/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-USE_PERL5=	YES
+USE_TOOLS+=	gmake perl
 USE_LIBTOOL=		YES
 
 USE_PKGINSTALL=		YES
@@ -37,8 +35,10 @@ CONFIGURE_ARGS+=	--enable-netbsd \
 #CONFIGURE_ARGS+=	--with-flock-locks	# broken
 #CONFIGURE_ARGS+=	--with-bdb=${PREFIX}	# still some known issues
 
+.include "options.mk"
+
 post-patch:
-	mv ${WRKSRC}/etc/psf/etc2ps.sh ${WRKSRC}/etc/psf/etc2ps.sh.tmp
+	${MV} ${WRKSRC}/etc/psf/etc2ps.sh ${WRKSRC}/etc/psf/etc2ps.sh.tmp
 	${SED} -e "s,^\(DVIPS=\)\(/usr/local/tex\)\(/bin\),\1${PREFIX}\3," \
 		< ${WRKSRC}/etc/psf/etc2ps.sh.tmp > ${WRKSRC}/etc/psf/etc2ps.sh
 
diff --git a/net/netatalk1/PLIST b/net/netatalk1/PLIST
index a1a3dc8ceed..dba67b49804 100644
--- a/net/netatalk1/PLIST
+++ b/net/netatalk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/03 15:43:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/06/05 23:40:56 taca Exp $
 bin/achfile
 bin/acleandir.rc
 bin/add_netatalk_printer
@@ -100,6 +100,8 @@ libexec/netatalk/timelord
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx_passwd.la
+${PAM}libexec/netatalk/uams/uams_dhx_pam.la
+${PAM}libexec/netatalk/uams/uams_pam.la
 libexec/netatalk/uams/uams_guest.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
diff --git a/net/netatalk1/distinfo b/net/netatalk1/distinfo
index 1d16cdd90be..72ddb2d35b3 100644
--- a/net/netatalk1/distinfo
+++ b/net/netatalk1/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:54 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/06/05 23:40:56 taca Exp $
 
-SHA1 (netatalk-1.6.2.tar.gz) = b3e451b2c40c70feda4f81d92162d08fa063fc48
-RMD160 (netatalk-1.6.2.tar.gz) = bba525a913aafbf201a4553a035def147f75629c
-Size (netatalk-1.6.2.tar.gz) = 855933 bytes
-SHA1 (patch-aa) = 0e7dc8d0524376e162f7d8d243720e12f8cbb5fb
-SHA1 (patch-ab) = 7d6e25c03c8ef365557d89da02070c50208c1899
-SHA1 (patch-ac) = 18d3bff990ddb78146d1e1d2f9e07d6826a7bfd2
+SHA1 (netatalk-1.6.4a.tar.gz) = c3dec6d29524e316967bfdc7cab35cd95e53ec90
+RMD160 (netatalk-1.6.4a.tar.gz) = b34429f5ad0b83a72e343420aabfe8d8c1fe1ecc
+Size (netatalk-1.6.4a.tar.gz) = 1026531 bytes
+SHA1 (patch-aa) = d0d3c647d5956a570a70a755c0b69d7cd2a00694
+SHA1 (patch-ab) = e05e4c59d4be48be53a2597e38c6ab638587a831
+SHA1 (patch-ac) = 81feb8c1fae68a661afd23a06825334bc6544677
 SHA1 (patch-ad) = 311d00d165688d4baa1365ba6c4147bd6293f3d8
 SHA1 (patch-ae) = 9bae8aef01e7b23fb26c9deddc53386b294d1e1c
-SHA1 (patch-af) = 997909d7cf444a2481693069864da9134ce413d4
+SHA1 (patch-af) = 386f493052a0325063b7ffe15879c09438eef8c4
+SHA1 (patch-ag) = 063b11af899f35b7030ad7c838866b68050c3b70
+SHA1 (patch-ah) = a36b7b32039b9fde4bcf395ce223c2bee2bd7b84
diff --git a/net/netatalk1/options.mk b/net/netatalk1/options.mk
new file mode 100644
index 00000000000..3924a571dda
--- /dev/null
+++ b/net/netatalk1/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2005/06/05 23:40:56 taca Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk1
+PKG_SUPPORTED_OPTIONS=	pam
+.include "../../mk/bsd.options.mk"
+
+###
+### Support PAM authentication and build smbpass and winbind PAM modules.
+###
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../security/PAM/module.mk"
+CONFIGURE_ARGS+=	--with-pam
+PLIST_SUBST+=           PAM=
+.else
+CONFIGURE_ARGS+=	--without-pam
+PLIST_SUBST+=           PAM="@comment "
+.endif
diff --git a/net/netatalk1/patches/patch-aa b/net/netatalk1/patches/patch-aa
index 98ded5ba144..61c537939ab 100644
--- a/net/netatalk1/patches/patch-aa
+++ b/net/netatalk1/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+$NetBSD: patch-aa,v 1.2 2005/06/05 23:40:56 taca Exp $
 
---- configure.orig	Sun Feb 16 12:46:32 2003
-+++ configure	Sun Feb 23 16:55:12 2003
-@@ -8084,64 +8084,6 @@
+--- configure.orig	2003-12-03 05:16:21.000000000 +0900
++++ configure
+@@ -19582,73 +19582,6 @@ _ACEOF
  fi
  
  
@@ -14,7 +14,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lcrypt  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -32,11 +31,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-  (eval $ac_link) 2>conftest.er1
 -  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
@@ -49,7 +57,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 -
 -ac_cv_lib_crypt_main=no
 -fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
@@ -67,7 +76,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd 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
-@@ -13066,13 +13008,13 @@
+@@ -25066,13 +24999,13 @@ fi;
  			savedldflags="$LDFLAGS"
  			CFLAGS="$CFLAGS -I$bdbdir"
  			LDFLAGS="-L$bdblibdir $LDFLAGS"
@@ -82,18 +91,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 -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"
+ _ACEOF
+@@ -25132,7 +25065,7 @@ if test $ac_cv_lib_db_main = yes; then
+ 				if test "$bdblibdir" != "/usr/lib"; then
+ 				    BDB_LIBS="-L$bdblibdir"
+ 				fi
+-				BDB_LIBS="$BDB_LIBS -ldb"
++				BDB_LIBS="$BDB_LIBS -ldb3"
  				BDB_BIN=$bdbbindir
  				BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
- 
-@@ -14552,7 +14494,62 @@
+ 				BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`"
+@@ -26702,7 +26635,71 @@ echo "${ECHO_T}no" >&6
  	fi
  
  
@@ -105,14 +114,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lcrypt  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
-+#line $LINENO "configure"
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +
-+
+ 
 +int
 +main ()
 +{
@@ -123,11 +131,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 +_ACEOF
 +rm -f conftest.$ac_objext conftest$ac_exeext
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
++  (eval $ac_link) 2>conftest.er1
 +  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
 +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 +  (eval $ac_try) 2>&5
 +  ac_status=$?
@@ -140,7 +157,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 +
 +ac_cv_lib_crypt_main=no
 +fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
 +echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
@@ -151,7 +169,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
 +_ACEOF
 +
 +  LIBS="-lcrypt $LIBS"
- 
++
 +fi
  
  
diff --git a/net/netatalk1/patches/patch-ab b/net/netatalk1/patches/patch-ab
index 5711709939b..87be14f8dee 100644
--- a/net/netatalk1/patches/patch-ab
+++ b/net/netatalk1/patches/patch-ab
@@ -1,19 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2005/01/04 13:07:15 markd Exp $
+$NetBSD: patch-ab,v 1.3 2005/06/05 23:40:56 taca Exp $
 
---- 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
+--- distrib/initscripts/Makefile.in.orig	2003-12-03 05:20:36.000000000 +0900
++++ distrib/initscripts/Makefile.in
+@@ -214,7 +214,7 @@ EXTRA_DIST = $(TEMPLATES) rc.atalk.cobal
+ #
+ # checking for NetBSD init scripts
+ #
 -@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
 +@USE_NETBSD_TRUE@sysvdir = ${prefix}/share/examples/rc.d#	pkgsrc *only*!
- @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
- @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
- @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
- @USE_TRU64_TRUE@sysv_SCRIPTS = atalk
--@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
-+@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
+ 
+ 
+ #
diff --git a/net/netatalk1/patches/patch-ac b/net/netatalk1/patches/patch-ac
index bef1bbe7c91..abf67c8d0b0 100644
--- a/net/netatalk1/patches/patch-ac
+++ b/net/netatalk1/patches/patch-ac
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.2 2005/06/05 23:40:56 taca Exp $
+
 The original commit message for this patch:
 
     http://mail-index.netbsd.org/source-changes/1999/09/17/0023.html
@@ -27,8 +29,6 @@ and finally, the discussion referred to in the above change:
     http://mail-index.netbsd.org/tech-net/1999/07/03/0004.html
 
 
-$NetBSD: patch-ac,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
-
 --- etc/atalkd/main.c.orig	Sat Oct  5 08:20:13 2002
 +++ etc/atalkd/main.c
 @@ -278,12 +278,12 @@ static void as_timer(int sig)
diff --git a/net/netatalk1/patches/patch-af b/net/netatalk1/patches/patch-af
index c803595fadf..aeaf4efd1df 100644
--- a/net/netatalk1/patches/patch-af
+++ b/net/netatalk1/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+$NetBSD: patch-af,v 1.2 2005/06/05 23:40: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	2004-10-28 07:54:53.000000000 +0900
++++ etc/psf/etc2ps.sh
 @@ -9,15 +9,12 @@
  # tag in the case.
  #
@@ -19,12 +19,19 @@ $NetBSD: patch-af,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
  case $1 in
  
  #
-@@ -39,7 +36,7 @@
+@@ -40,12 +37,9 @@ df*)
  # troff2ps is from psroff by Chris Lewis.
  #
  tf*)
 -    if [ -x "$TROFF2PS" ]; then
-+    if [ -x "/usr/bin/groff" ]; then
- 	exec $TROFF2PS $TROFF2PSARGS
-     else
- 	echo "$0: filter troff2ps uninstalled" 1>&2
+-	exec $TROFF2PS $TROFF2PSARGS
+-    else
+-	echo "$0: filter troff2ps uninstalled" 1>&2
+-	exit 2
+-    fi
++    exec $TROFF2PS $TROFF2PSARGS
++    echo "$0: filter troff2ps failed" 1>&2
++    exit 2
+     ;;
+ 
+ *)
diff --git a/net/netatalk1/patches/patch-ag b/net/netatalk1/patches/patch-ag
new file mode 100644
index 00000000000..06e466b01ad
--- /dev/null
+++ b/net/netatalk1/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/06/05 23:40:56 taca Exp $
+
+--- bin/afppasswd/Makefile.in.orig	2003-12-03 05:18:37.000000000 +0900
++++ bin/afppasswd/Makefile.in
+@@ -201,7 +201,7 @@ pkgconfdir = @PKGCONFDIR@
+ afppasswd_SOURCES = afppasswd.c
+ afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys @SSL_CFLAGS@ \
++CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \
+ 	-D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
+ 
+ subdir = bin/afppasswd
diff --git a/net/netatalk1/patches/patch-ah b/net/netatalk1/patches/patch-ah
new file mode 100644
index 00000000000..3fd0ec5cee2
--- /dev/null
+++ b/net/netatalk1/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/06/05 23:40:56 taca Exp $
+
+--- etc/uams/Makefile.in.orig	2003-12-03 05:19:36.000000000 +0900
++++ etc/uams/Makefile.in
+@@ -230,7 +230,7 @@ uams_dhx_pam_la_SOURCES = uams_dhx_pam.c
+ #
+ # flags
+ #
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys @SSL_CFLAGS@
++CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys
+ 
+ uams_guest_la_CFLAGS = @CFLAGS@
+ uams_randnum_la_CFLAGS = @CFLAGS@ @SSL_CFLAGS@