ports/135319: [patch] net/netatalk port update from 2.0.3_5, 1 to 2.0.4
Wang Lam
wlam+fbd at blanksquare.net
Sun Jun 7 06:40:02 UTC 2009
>Number: 135319
>Category: ports
>Synopsis: [patch] net/netatalk port update from 2.0.3_5,1 to 2.0.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 07 06:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Wang Lam
>Release: FreeBSD 6.4 (i386)
>Organization:
>Environment:
>Description:
This PR is a request to update the FreeBSD port of net/netatalk to the current release, version 2.0.4 (29 May 2009). In the attached (works-for-me) patch, I tried to keep changes to the existing port modest.
NB: Several net/netatalk/files/ patches appear to be superseded by (i.e., already applied in) the newer source code, but the attached patch does not try to explicitly vacate them:
> grep Only netatalk.patch.txt
Only in netatalk-old/files: patch-CVE-2008-5718
Only in netatalk-old/files: patch-bin_cnid_cnid_index.c
Only in netatalk-old/files: patch-etc_cnid_dbd_dbif.c
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ur netatalk-old/Makefile netatalk/Makefile
--- netatalk-old/Makefile 2009-03-22 19:44:35.000000000 -0700
+++ netatalk/Makefile 2009-06-06 17:17:12.000000000 -0700
@@ -6,8 +6,7 @@
#
PORTNAME= netatalk
-PORTVERSION= 2.0.3
-PORTREVISION= 5
+PORTVERSION= 2.0.4
PORTEPOCH= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -16,6 +15,8 @@
MAINTAINER= marcus at FreeBSD.org
COMMENT= File and print server for AppleTalk networks
+LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt
+
.if defined(WITH_SRVLOC)
LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp
.endif
@@ -27,7 +28,8 @@
USE_RC_SUBR= netatalk
CONFIGURE_ARGS+= --with-tcp-wrappers \
--with-pkgconfdir=${PREFIX}/etc \
- --with-libiconv=${LOCALBASE}
+ --with-libiconv=${LOCALBASE} \
+ --with-libgcrypt-prefix=${LOCALBASE} \
.if defined(WITH_KRB5)
CONFIGURE_ARGS+= --enable-krbV-uam
@@ -66,8 +68,8 @@
megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \
nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \
single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \
- netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \
- apple_rm.1 uniconv.1 asip-status.pl.1 cnid_index.1
+ netatalk-config.1 apple_cp.1 apple_mv.1 apple_rm.1 \
+ uniconv.1 asip-status.pl.1 cnid_index.1
MAN3= atalk_aton.3 nbp_name.3
MAN4= atalk.4
MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
diff -ur netatalk-old/distinfo netatalk/distinfo
--- netatalk-old/distinfo 2006-01-29 19:57:41.000000000 -0800
+++ netatalk/distinfo 2009-06-05 00:24:34.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (netatalk-2.0.3.tar.bz2) = 28092763085783805dc2f00aa2127a3e
-SHA256 (netatalk-2.0.3.tar.bz2) = 25e004732f471de0dd9a21ab129ee799da018fce3b313d4ab5e6f52e6e9e3998
-SIZE (netatalk-2.0.3.tar.bz2) = 1471804
+MD5 (netatalk-2.0.4.tar.bz2) = 6f2f40b51ab9268836ef89a7dffaccb0
+SHA256 (netatalk-2.0.4.tar.bz2) = c0d522ea2f63bf3469901c1ce3059d56d957b0f040a3ae8ab26abeea1a6aba16
+SIZE (netatalk-2.0.4.tar.bz2) = 964106
Only in netatalk-old/files: patch-CVE-2008-5718
Only in netatalk-old/files: patch-bin_cnid_cnid_index.c
diff -ur netatalk-old/files/patch-config_Makefile.in netatalk/files/patch-config_Makefile.in
--- netatalk-old/files/patch-config_Makefile.in 2004-10-22 19:13:29.000000000 -0700
+++ netatalk/files/patch-config_Makefile.in 2009-06-06 00:17:13.000000000 -0700
@@ -1,5 +1,5 @@
---- config/Makefile.in.orig Mon Mar 22 19:22:45 2004
-+++ config/Makefile.in Sat Jun 5 22:08:04 2004
+--- config/Makefile.in.orig 2009-04-24 09:46:56.000000000 -0700
++++ config/Makefile.in 2009-06-06 00:14:08.000000000 -0700
@@ -386,22 +386,11 @@
install-config-files: $(CONFFILES) $(GENFILES)
$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
@@ -23,5 +23,5 @@
- at USE_PAM_TRUE@ echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
- at USE_PAM_TRUE@ fi;
- @USE_PAM_FALSE at install-data-local: install-config-files
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ @USE_PAM_TRUE at uninstall-local:
+ @USE_PAM_TRUE@ echo rm -f $(DESTDIR)$(pamdir)/netatalk; \
diff -ur netatalk-old/files/patch-config_netatalk.conf netatalk/files/patch-config_netatalk.conf
--- netatalk-old/files/patch-config_netatalk.conf 2007-04-02 21:10:14.000000000 -0700
+++ netatalk/files/patch-config_netatalk.conf 2009-06-06 00:18:30.000000000 -0700
@@ -1,5 +1,5 @@
---- config/netatalk.conf.org Sun Apr 1 07:26:37 2007
-+++ config/netatalk.conf Sun Apr 1 07:31:49 2007
+--- config/netatalk.conf.orig 2009-04-30 02:30:13.000000000 -0700
++++ config/netatalk.conf 2009-06-05 23:49:17.000000000 -0700
@@ -1,4 +1,5 @@
-# Appletalk configuration
+# netatalk configuration
@@ -24,8 +24,8 @@
-ATALK_UNIX_CHARSET='LOCALE'
+ATALK_NAME=`/bin/hostname -s`
- # specify this if you don't want guest, clrtxt, and dhx
- # available options: uams_guest.so, uams_clrtxt.so, uams_dhx.so,
+ # specify this if you don't want dhx and dhx2
+ # available options: uams_guest.so, uams_clrtxt.so,
@@ -27,18 +19,3 @@
# Change this to set the id of the guest user
@@ -33,7 +33,7 @@
-
-# Set which daemons to run (papd is dependent upon atalkd):
-ATALKD_RUN=yes
--PAPD_RUN=yes
+-PAPD_RUN=no
-CNID_METAD_RUN=yes
-AFPD_RUN=yes
-TIMELORD_RUN=no
diff -ur netatalk-old/files/patch-configure netatalk/files/patch-configure
--- netatalk-old/files/patch-configure 2006-10-14 14:55:49.000000000 -0700
+++ netatalk/files/patch-configure 2009-06-06 15:31:27.000000000 -0700
@@ -1,78 +1,20 @@
---- configure.orig Tue May 17 18:14:29 2005
-+++ configure Sun Oct 8 14:47:02 2006
-@@ -15057,7 +15057,7 @@ if test "x$bdb_required" = "xyes"; then
- trybdbdir=""
- dobdbsearch=yes
- bdb_search_dirs="/usr/local/include /usr/include"
-- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"
-+ search_subdirs="/%%DB_NAME%% /db4.2 /db42 /db4.1 /db41 /db4 /"
+--- configure 2009-06-06 15:26:10.000000000 -0700
++++ configure.orig 2009-03-29 00:24:33.000000000 -0700
+@@ -30193,7 +30193,7 @@
+ trybdbdir=""
+ dobdbsearch=yes
+ bdb_search_dirs="/usr/local /usr"
+- search_subdirs="/ /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4"
++ search_subdirs="/%%DB_NAME%% / /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4"
- DB_MAJOR_REQ=4
- DB_MINOR_REQ=1
-@@ -15198,6 +15198,66 @@ echo "${ECHO_T}yes" >&6
- LDFLAGS="-L$bdblibdir $LDFLAGS"
+ DB_MAJOR_REQ=4
+ DB_MINOR_REQ=1
+@@ -30286,7 +30286,7 @@
+ 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="%%DB_LIB%% -ldb$maj$min -ldb$maj.$min -ldb-$maj$min -ldb-$maj.$min"
- atalk_cv_lib_db=no
-+if test $atalk_cv_lib_db = no ; then
-+ echo "$as_me:$LINENO: checking for Berkeley DB link (%%DB_LIB%%)" >&5
-+echo $ECHO_N "checking for Berkeley DB link (%%DB_LIB%%)... $ECHO_C" >&6
-+ atalk_DB_LIB=%%DB_LIB%%
-+ atalk_LIBS=$LIBS
-+ LIBS="$atalk_DB_LIB $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. */
-+
-+#include <db.h>
-+
-+int
-+main ()
-+{
-+
-+ char *version;
-+ int major, minor, patch;
-+
-+ version = db_version( &major, &minor, &patch );
-+ return (0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 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=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ atalk_cv_db_db_lib=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+atalk_cv_db_db_lib=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+
-+ echo "$as_me:$LINENO: result: $atalk_cv_db_db_lib" >&5
-+echo "${ECHO_T}$atalk_cv_db_db_lib" >&6
-+ LIBS="$atalk_LIBS"
-+ if test $atalk_cv_db_db_lib = yes ; then
-+ atalk_cv_lib_db=%%DB_LIB%%
-+ fi
-+fi
-+
- if test $atalk_cv_lib_db = no ; then
- echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5
- echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6
+ for lib in $atalk_cv_bdb_try_libs ; do
+ LIBS="$lib $savedlibs"
Only in netatalk-old/files: patch-etc_cnid_dbd_dbif.c
diff -ur netatalk-old/pkg-plist netatalk/pkg-plist
--- netatalk-old/pkg-plist 2008-03-01 00:18:52.000000000 -0800
+++ netatalk/pkg-plist 2009-06-06 17:28:43.000000000 -0700
@@ -39,7 +39,6 @@
bin/papstatus
bin/psorder
bin/showppd
-bin/timeout
bin/uniconv
@unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
etc/AppleVolumes.default.dist
@@ -67,6 +66,13 @@
etc/uams/uams_dhx_passwd.a
etc/uams/uams_dhx_passwd.la
etc/uams/uams_dhx_passwd.so
+etc/uams/uams_dhx2.so
+%%NETATALKPAM%%etc/uams/uams_dhx2_pam.a
+%%NETATALKPAM%%etc/uams/uams_dhx2_pam.la
+%%NETATALKPAM%%etc/uams/uams_dhx2_pam.so
+etc/uams/uams_dhx2_passwd.a
+etc/uams/uams_dhx2_passwd.la
+etc/uams/uams_dhx2_passwd.so
%%NETATALKKRB5%%etc/uams/uams_gss.a
%%NETATALKKRB5%%etc/uams/uams_gss.la
%%NETATALKKRB5%%etc/uams/uams_gss.so
@@ -100,10 +106,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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list