Attachment #96667 for bug #135319

View | Details | Raw Unified | Return to bug 135319
Collapse All | Expand All




#

PORTNAME=	netatalk
PORTVERSION=	2.0.4
PORTREVISION=	5
PORTEPOCH=	1
CATEGORIES=	net print
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}

MAINTAINER=	marcus@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

USE_RC_SUBR=	netatalk
CONFIGURE_ARGS+=	--with-tcp-wrappers \
			--with-pkgconfdir=${PREFIX}/etc \
			--with-libiconv=${LOCALBASE} \
			--with-libgcrypt-prefix=${LOCALBASE} \

.if defined(WITH_KRB5)
CONFIGURE_ARGS+=	--enable-krbV-uam

		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 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 \

Lines 1-3 Link Here

(-)netatalk/distinfo (-3 / +3 lines)
1	MD5 (netatalk-2.0.3.tar.bz2) = 28092763085783805dc2f00aa2127a3e	1	MD5 (netatalk-2.0.4.tar.bz2) = 6f2f40b51ab9268836ef89a7dffaccb0
2	SHA256 (netatalk-2.0.3.tar.bz2) = 25e004732f471de0dd9a21ab129ee799da018fce3b313d4ab5e6f52e6e9e3998	2	SHA256 (netatalk-2.0.4.tar.bz2) = c0d522ea2f63bf3469901c1ce3059d56d957b0f040a3ae8ab26abeea1a6aba16
3	SIZE (netatalk-2.0.3.tar.bz2) = 1471804	3	SIZE (netatalk-2.0.4.tar.bz2) = 964106

Lines 1-5 Link Here

(-)netatalk/files/patch-config_Makefile.in (-4 / +4 lines)
1	--- config/Makefile.in.orig Mon Mar 22 19:22:45 2004	1	--- config/Makefile.in.orig 2009-04-24 09:46:56.000000000 -0700
2	+++ config/Makefile.in Sat Jun 5 22:08:04 2004	2	+++ config/Makefile.in 2009-06-06 00:14:08.000000000 -0700
3	@@ -386,22 +386,11 @@	3	@@ -386,22 +386,11 @@
4	install-config-files: $(CONFFILES) $(GENFILES)	4	install-config-files: $(CONFFILES) $(GENFILES)
5	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)	5	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
Lines 23-27 Link Here
23	-@USE_PAM_TRUE@ echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \	23	-@USE_PAM_TRUE@ echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
24	-@USE_PAM_TRUE@ fi;	24	-@USE_PAM_TRUE@ fi;
25		25
26	@USE_PAM_FALSE@install-data-local: install-config-files	26	@USE_PAM_TRUE@uninstall-local:
27	# Tell versions [3.59,3.63) of GNU make to not export all variables.	27	@USE_PAM_TRUE@ echo rm -f $(DESTDIR)$(pamdir)/netatalk; \




--- 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

-ATALK_UNIX_CHARSET='LOCALE'
+ATALK_NAME=`/bin/hostname -s`
 
 # 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

-
-# Set which daemons to run (papd is dependent upon atalkd):
-ATALKD_RUN=yes
-PAPD_RUN=no
-CNID_METAD_RUN=yes
-AFPD_RUN=yes
-TIMELORD_RUN=no




--- 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
@@ -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"
 
     for lib in $atalk_cv_bdb_try_libs ; do
         LIBS="$lib $savedlibs"
+	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




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

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

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

Return to bug 135319

Lines 6-13 Link Here

(-)netatalk/Makefile (-5 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= netatalk	8	PORTNAME= netatalk
9	PORTVERSION= 2.0.3	9	PORTVERSION= 2.0.4
10	PORTREVISION= 5
11	PORTEPOCH= 1	10	PORTEPOCH= 1
12	CATEGORIES= net print	11	CATEGORIES= net print
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 16-21 Link Here
16	MAINTAINER= marcus@FreeBSD.org	15	MAINTAINER= marcus@FreeBSD.org
17	COMMENT= File and print server for AppleTalk networks	16	COMMENT= File and print server for AppleTalk networks
18		17
		18	LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt
		19
19	.if defined(WITH_SRVLOC)	20	.if defined(WITH_SRVLOC)
20	LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp	21	LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp
21	.endif	22	.endif
Lines 27-33 Link Here
27	USE_RC_SUBR= netatalk	28	USE_RC_SUBR= netatalk
28	CONFIGURE_ARGS+= --with-tcp-wrappers \	29	CONFIGURE_ARGS+= --with-tcp-wrappers \
29	--with-pkgconfdir=${PREFIX}/etc \	30	--with-pkgconfdir=${PREFIX}/etc \
30	--with-libiconv=${LOCALBASE}	31	--with-libiconv=${LOCALBASE} \
		32	--with-libgcrypt-prefix=${LOCALBASE} \
31		33
32	.if defined(WITH_KRB5)	34	.if defined(WITH_KRB5)
33	CONFIGURE_ARGS+= --enable-krbV-uam	35	CONFIGURE_ARGS+= --enable-krbV-uam
Lines 66-73 Link Here
66	megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \	68	megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \
67	nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \	69	nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \
68	single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \	70	single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \
69	netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \	71	netatalk-config.1 apple_cp.1 apple_mv.1 apple_rm.1 \
70	apple_rm.1 uniconv.1 asip-status.pl.1 cnid_index.1	72	uniconv.1 asip-status.pl.1 cnid_index.1
71	MAN3= atalk_aton.3 nbp_name.3	73	MAN3= atalk_aton.3 nbp_name.3
72	MAN4= atalk.4	74	MAN4= atalk.4
73	MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \	75	MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \

Lines 1-5 Link Here

(-)netatalk/files/patch-config_netatalk.conf (-5 / +5 lines)
1	--- config/netatalk.conf.org Sun Apr 1 07:26:37 2007	1	--- config/netatalk.conf.orig 2009-04-30 02:30:13.000000000 -0700
2	+++ config/netatalk.conf Sun Apr 1 07:31:49 2007	2	+++ config/netatalk.conf 2009-06-05 23:49:17.000000000 -0700
3	@@ -1,4 +1,5 @@	3	@@ -1,4 +1,5 @@
4	-# Appletalk configuration	4	-# Appletalk configuration
5	+# netatalk configuration	5	+# netatalk configuration
Lines 24-31 Link Here
24	-ATALK_UNIX_CHARSET='LOCALE'	24	-ATALK_UNIX_CHARSET='LOCALE'
25	+ATALK_NAME=`/bin/hostname -s`	25	+ATALK_NAME=`/bin/hostname -s`
26		26
27	# specify this if you don't want guest, clrtxt, and dhx	27	# specify this if you don't want dhx and dhx2
28	# available options: uams_guest.so, uams_clrtxt.so, uams_dhx.so,	28	# available options: uams_guest.so, uams_clrtxt.so,
29	@@ -27,18 +19,3 @@	29	@@ -27,18 +19,3 @@
30		30
31	# Change this to set the id of the guest user	31	# Change this to set the id of the guest user
Lines 33-39 Link Here
33	-	33	-
34	-# Set which daemons to run (papd is dependent upon atalkd):	34	-# Set which daemons to run (papd is dependent upon atalkd):
35	-ATALKD_RUN=yes	35	-ATALKD_RUN=yes
36	-PAPD_RUN=yes	36	-PAPD_RUN=no
37	-CNID_METAD_RUN=yes	37	-CNID_METAD_RUN=yes
38	-AFPD_RUN=yes	38	-AFPD_RUN=yes
39	-TIMELORD_RUN=no	39	-TIMELORD_RUN=no

Lines 1-78 Link Here

(-)netatalk/files/patch-configure (-76 / +18 lines)
1	--- configure.orig Tue May 17 18:14:29 2005	1	--- configure 2009-06-06 15:26:10.000000000 -0700
2	+++ configure Sun Oct 8 14:47:02 2006	2	+++ configure.orig 2009-03-29 00:24:33.000000000 -0700
3	@@ -15057,7 +15057,7 @@ if test "x$bdb_required" = "xyes"; then	3	@@ -30193,7 +30193,7 @@
4	trybdbdir=""	4	trybdbdir=""
5	dobdbsearch=yes	5	dobdbsearch=yes
6	bdb_search_dirs="/usr/local/include /usr/include"	6	bdb_search_dirs="/usr/local /usr"
7	- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /"	7	- search_subdirs="/ /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4"
8	+ search_subdirs="/%%DB_NAME%% /db4.2 /db42 /db4.1 /db41 /db4 /"	8	+ 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"
9		9
10	DB_MAJOR_REQ=4	10	DB_MAJOR_REQ=4
11	DB_MINOR_REQ=1	11	DB_MINOR_REQ=1
12	@@ -15198,6 +15198,66 @@ echo "${ECHO_T}yes" >&6	12	@@ -30286,7 +30286,7 @@
13	LDFLAGS="-L$bdblibdir $LDFLAGS"	13	atalk_cv_bdb_version=no
		14	maj=$atalk_cv_bdb_MAJOR
		15	min=$atalk_cv_bdb_MINOR
		16	- atalk_cv_bdb_try_libs="-ldb$maj$min -ldb$maj.$min -ldb-$maj$min -ldb-$maj.$min"
		17	+ atalk_cv_bdb_try_libs="%%DB_LIB%% -ldb$maj$min -ldb$maj.$min -ldb-$maj$min -ldb-$maj.$min"
14		18
15	atalk_cv_lib_db=no	19	for lib in $atalk_cv_bdb_try_libs ; do
16	+if test $atalk_cv_lib_db = no ; then	20	LIBS="$lib $savedlibs"
17	+ echo "$as_me:$LINENO: checking for Berkeley DB link (%%DB_LIB%%)" >&5
18	+echo $ECHO_N "checking for Berkeley DB link (%%DB_LIB%%)... $ECHO_C" >&6
19	+ atalk_DB_LIB=%%DB_LIB%%
20	+ atalk_LIBS=$LIBS
21	+ LIBS="$atalk_DB_LIB $LIBS"
22	+
23	+ cat >conftest.$ac_ext <<_ACEOF
24	+#line $LINENO "configure"
25	+/* confdefs.h. */
26	+_ACEOF
27	+cat confdefs.h >>conftest.$ac_ext
28	+cat >>conftest.$ac_ext <<_ACEOF
29	+/* end confdefs.h. */
30	+
31	+#include <db.h>
32	+
33	+int
34	+main ()
35	+{
36	+
37	+ char *version;
38	+ int major, minor, patch;
39	+
40	+ version = db_version( &major, &minor, &patch );
41	+ return (0);
42	+
43	+ ;
44	+ return 0;
45	+}
46	+_ACEOF
47	+rm -f conftest.$ac_objext conftest$ac_exeext
48	+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
49	+ (eval $ac_link) 2>&5
50	+ ac_status=$?
51	+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
52	+ (exit $ac_status); } &&
53	+ { ac_try='test -s conftest$ac_exeext'
54	+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
55	+ (eval $ac_try) 2>&5
56	+ ac_status=$?
57	+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
58	+ (exit $ac_status); }; }; then
59	+ atalk_cv_db_db_lib=yes
60	+else
61	+ echo "$as_me: failed program was:" >&5
62	+sed 's/^/\| /' conftest.$ac_ext >&5
63	+
64	+atalk_cv_db_db_lib=no
65	+fi
66	+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
67	+
68	+ echo "$as_me:$LINENO: result: $atalk_cv_db_db_lib" >&5
69	+echo "${ECHO_T}$atalk_cv_db_db_lib" >&6
70	+ LIBS="$atalk_LIBS"
71	+ if test $atalk_cv_db_db_lib = yes ; then
72	+ atalk_cv_lib_db=%%DB_LIB%%
73	+ fi
74	+fi
75	+
76	if test $atalk_cv_lib_db = no ; then
77	echo "$as_me:$LINENO: checking for Berkeley DB link (-ldb-4.2)" >&5
78	echo $ECHO_N "checking for Berkeley DB link (-ldb-4.2)... $ECHO_C" >&6

Lines 39-45 Link Here

(-)netatalk/pkg-plist (-1 / +9 lines)
39	bin/papstatus	39	bin/papstatus
40	bin/psorder	40	bin/psorder
41	bin/showppd	41	bin/showppd
42	bin/timeout
43	bin/uniconv	42	bin/uniconv
44	@unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi	43	@unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
45	etc/AppleVolumes.default.dist	44	etc/AppleVolumes.default.dist
Lines 67-72 Link Here
67	etc/uams/uams_dhx_passwd.a	66	etc/uams/uams_dhx_passwd.a
68	etc/uams/uams_dhx_passwd.la	67	etc/uams/uams_dhx_passwd.la
69	etc/uams/uams_dhx_passwd.so	68	etc/uams/uams_dhx_passwd.so
		69	etc/uams/uams_dhx2.so
		70	%%NETATALKPAM%%etc/uams/uams_dhx2_pam.a
		71	%%NETATALKPAM%%etc/uams/uams_dhx2_pam.la
		72	%%NETATALKPAM%%etc/uams/uams_dhx2_pam.so
		73	etc/uams/uams_dhx2_passwd.a
		74	etc/uams/uams_dhx2_passwd.la
		75	etc/uams/uams_dhx2_passwd.so
70	%%NETATALKKRB5%%etc/uams/uams_gss.a	76	%%NETATALKKRB5%%etc/uams/uams_gss.a
71	%%NETATALKKRB5%%etc/uams/uams_gss.la	77	%%NETATALKKRB5%%etc/uams/uams_gss.la
72	%%NETATALKKRB5%%etc/uams/uams_gss.so	78	%%NETATALKKRB5%%etc/uams/uams_gss.so
Lines 100-109 Link Here
100	include/atalk/paths.h	106	include/atalk/paths.h
101	include/atalk/rtmp.h	107	include/atalk/rtmp.h
102	include/atalk/server_child.h	108	include/atalk/server_child.h
		109	include/atalk/server_ipc.h
103	include/atalk/tdb.h	110	include/atalk/tdb.h
104	include/atalk/uam.h	111	include/atalk/uam.h
105	include/atalk/unicode.h	112	include/atalk/unicode.h
106	include/atalk/util.h	113	include/atalk/util.h
		114	include/atalk/volinfo.h
107	include/atalk/zip.h	115	include/atalk/zip.h
108	include/netatalk/aarp.h	116	include/netatalk/aarp.h
109	include/netatalk/at.h	117	include/netatalk/at.h