aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/netatalk-devel/Makefile24
-rw-r--r--net/netatalk-devel/distinfo2
-rw-r--r--net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c11
-rw-r--r--net/netatalk-devel/files/patch-configure37
-rw-r--r--net/netatalk-devel/files/patch-etc_uams_uams_randnum.c47
-rw-r--r--net/netatalk-devel/pkg-comment1
-rw-r--r--net/netatalk-devel/pkg-plist1
-rw-r--r--net/netatalk/Makefile24
-rw-r--r--net/netatalk/distinfo2
-rw-r--r--net/netatalk/files/patch-bin_afppasswd_afppasswd.c11
-rw-r--r--net/netatalk/files/patch-configure37
-rw-r--r--net/netatalk/files/patch-etc_uams_uams_randnum.c47
-rw-r--r--net/netatalk/pkg-comment1
-rw-r--r--net/netatalk/pkg-plist1
14 files changed, 70 insertions, 176 deletions
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 63a5cd6719f9..e293d8c59604 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= netatalk
-PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTVERSION= 1.6.1
PORTEPOCH= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= netatalk
MAINTAINER= marcus@FreeBSD.org
+COMMENT= File and print server for AppleTalk networks
.if !defined(WITHOUT_CNID)
LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
@@ -47,7 +47,7 @@ PLIST_SUB+= NETATALKCNID="@comment "
# This method of DID calculation is not persistent, but has been tested to
# work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2.
CONFIGURE_ARGS+= --with-did=cnid \
- --with-db3=${LOCALBASE}
+ --with-bdb=${LOCALBASE}
PLIST_SUB+= NETATALKCNID=""
.endif
.if defined (WITH_TIMELORD)
@@ -56,8 +56,12 @@ PLIST_SUB+= TIMELORD=""
.else
PLIST_SUB+= TIMELORD="@comment "
.endif
+.if defined (WITH_MANGLING) && !defined (WITHOUT_CNID)
+# Enable long file name mangling support (requires CNID).
+CONFIGURE_ARGS+= --with-mangling
+.endif
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_PERL5= yes
FILES= AppleVolumes.default AppleVolumes.system afpd.conf \
@@ -76,6 +80,18 @@ MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
netatalk.conf.5 papd.conf.5
MAN8= afpd.8 atalkd.8 papd.8 papstatus.8 psf.8 timelord.8
+pre-everything::
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Netatalk has the following tunable options:"
+ @${ECHO_MSG} " WITHOUT_CNID=yes Turns off CNID persistent DID support"
+ @${ECHO_MSG} " WITH_SRVLOC=yes Enable Service Location Protocol support"
+ @${ECHO_MSG} " WITH_PAM=yes Enable PAM support"
+ @${ECHO_MSG} " WITH_TIMELOARD=yes Enable Timelord network time service"
+ @${ECHO_MSG} " WITH_MANGLING=yes Enable long file name mangling support (requires CNID)"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "See Netatalk's Makefile for more details on some of these options."
+ @${ECHO_MSG} ""
+
post-extract:
@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
> ${WRKSRC}/netatalk.sh
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
index 1a0144607539..cb96672dbe2b 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.6.0.tar.bz2) = c141aa6712fed7a51b989b0aa80977c7
+MD5 (netatalk-1.6.1.tar.bz2) = fa3764f1a878c63f91e0b640ee60aa59
diff --git a/net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c b/net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c
deleted file mode 100644
index 8d5838b9a6a0..000000000000
--- a/net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/afppasswd/afppasswd.c.orig Thu Feb 20 00:04:51 2003
-+++ bin/afppasswd/afppasswd.c Thu Feb 20 00:04:57 2003
-@@ -114,7 +114,7 @@
- /* decrypt the password */
- ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
- }
-- memset(schedule, 0, sizeof(schedule));
-+ memset(&schedule, 0, sizeof(schedule));
- }
-
- if (newpwd) {
diff --git a/net/netatalk-devel/files/patch-configure b/net/netatalk-devel/files/patch-configure
index cf6c1bd81c04..55fbe6184a07 100644
--- a/net/netatalk-devel/files/patch-configure
+++ b/net/netatalk-devel/files/patch-configure
@@ -1,20 +1,9 @@
---- configure.orig Mon Nov 25 22:08:45 2002
-+++ configure Sun Dec 15 16:59:28 2002
-@@ -1543,10 +1543,6 @@
-
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--test -n "$target_alias" &&
-- test "$program_prefix$program_suffix$program_transform_name" = \
-- NONENONEs,x,x, &&
-- program_prefix=${target_alias}-
- am__api_version="1.4"
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -12252,13 +12248,13 @@
+--- configure.orig Sun Feb 23 00:39:17 2003
++++ configure Sun Feb 23 00:39:38 2003
+@@ -13066,13 +13066,13 @@
savedldflags="$LDFLAGS"
- CFLAGS="$CFLAGS -I$db3dir"
- LDFLAGS="-L$db3libdir $LDFLAGS"
+ CFLAGS="$CFLAGS -I$bdbdir"
+ LDFLAGS="-L$bdblibdir $LDFLAGS"
- echo "$as_me:$LINENO: checking for main in -ldb" >&5
-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for main in -ldb3" >&5
@@ -27,13 +16,13 @@
+LIBS="-ldb3 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
- #include "confdefs.h"
-@@ -12299,7 +12295,7 @@
+ /* confdefs.h. */
+@@ -13118,7 +13118,7 @@
- db3found=yes
- DB3_CFLAGS="-I$db3dir"
-- DB3_LIBS="-L$db3libdir -ldb"
-+ DB3_LIBS="-L$db3libdir -ldb3"
- DB3_PATH="`echo $db3dir | sed 's,include/db3$,,'`"
+ bdbfound=yes
+ BDB_CFLAGS="-I$bdbdir"
+- BDB_LIBS="-L$bdblibdir -ldb"
++ BDB_LIBS="-L$bdblibdir -ldb3"
+ BDB_BIN=$bdbbindir
+ BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
- fi
diff --git a/net/netatalk-devel/files/patch-etc_uams_uams_randnum.c b/net/netatalk-devel/files/patch-etc_uams_uams_randnum.c
deleted file mode 100644
index b7c5648127e3..000000000000
--- a/net/netatalk-devel/files/patch-etc_uams_uams_randnum.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- etc/uams/uams_randnum.c.orig Thu Feb 20 00:05:48 2003
-+++ etc/uams/uams_randnum.c Thu Feb 20 00:07:56 2003
-@@ -217,7 +217,7 @@
- /* decrypt the password */
- ecb_encrypt((C_Block *) p, (C_Block *) p, schedule, DES_DECRYPT);
- }
-- memset(schedule, 0, sizeof(schedule));
-+ memset(&schedule, 0, sizeof(schedule));
- }
-
- if (set) {
-@@ -383,7 +383,7 @@
- memset(seskey, 0, sizeof(seskey));
- ecb_encrypt((C_Block *) randbuf, (C_Block *) randbuf,
- seskeysched, DES_ENCRYPT);
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
-
- /* test against what the client sent */
- if (memcmp( randbuf, ibuf, sizeof(randbuf) )) { /* != */
-@@ -431,7 +431,7 @@
- /* test against client's reply */
- if (memcmp(randbuf, ibuf, sizeof(randbuf))) { /* != */
- memset(randbuf, 0, sizeof(randbuf));
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
- return AFPERR_NOTAUTH;
- }
- ibuf += sizeof(randbuf);
-@@ -440,7 +440,7 @@
- /* encrypt client's challenge and send back */
- ecb_encrypt( (C_Block *) ibuf, (C_Block *) rbuf,
- seskeysched, DES_ENCRYPT);
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
- *rbuflen = sizeof(randbuf);
-
- *uam_pwd = randpwd;
-@@ -495,7 +495,7 @@
- err = randpass(pwd, passwdfile, ibuf + PASSWDLEN, sizeof(seskey), 1);
-
- /* zero out some fields */
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
- memset(seskey, 0, sizeof(seskey));
- memset(ibuf, 0, sizeof(seskey)); /* old passwd */
- memset(ibuf + PASSWDLEN, 0, sizeof(seskey)); /* new passwd */
diff --git a/net/netatalk-devel/pkg-comment b/net/netatalk-devel/pkg-comment
deleted file mode 100644
index 4eb541bac506..000000000000
--- a/net/netatalk-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File and print server for AppleTalk networks
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
index 2e51857c560f..75a79c3d433e 100644
--- a/net/netatalk-devel/pkg-plist
+++ b/net/netatalk-devel/pkg-plist
@@ -85,6 +85,7 @@ etc/nls/maccode.437
etc/nls/maccode.850
etc/nls/maccode.iso8859-1
etc/nls/maccode.iso8859-1.adapted
+etc/nls/maccode.koi8-r
etc/rc.d/netatalk.sh.sample
etc/uams/uams_clrtxt.so
etc/uams/uams_dhx.so
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 63a5cd6719f9..e293d8c59604 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= netatalk
-PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTVERSION= 1.6.1
PORTEPOCH= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= netatalk
MAINTAINER= marcus@FreeBSD.org
+COMMENT= File and print server for AppleTalk networks
.if !defined(WITHOUT_CNID)
LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
@@ -47,7 +47,7 @@ PLIST_SUB+= NETATALKCNID="@comment "
# This method of DID calculation is not persistent, but has been tested to
# work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2.
CONFIGURE_ARGS+= --with-did=cnid \
- --with-db3=${LOCALBASE}
+ --with-bdb=${LOCALBASE}
PLIST_SUB+= NETATALKCNID=""
.endif
.if defined (WITH_TIMELORD)
@@ -56,8 +56,12 @@ PLIST_SUB+= TIMELORD=""
.else
PLIST_SUB+= TIMELORD="@comment "
.endif
+.if defined (WITH_MANGLING) && !defined (WITHOUT_CNID)
+# Enable long file name mangling support (requires CNID).
+CONFIGURE_ARGS+= --with-mangling
+.endif
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GMAKE= yes
USE_PERL5= yes
FILES= AppleVolumes.default AppleVolumes.system afpd.conf \
@@ -76,6 +80,18 @@ MAN5= AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
netatalk.conf.5 papd.conf.5
MAN8= afpd.8 atalkd.8 papd.8 papstatus.8 psf.8 timelord.8
+pre-everything::
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Netatalk has the following tunable options:"
+ @${ECHO_MSG} " WITHOUT_CNID=yes Turns off CNID persistent DID support"
+ @${ECHO_MSG} " WITH_SRVLOC=yes Enable Service Location Protocol support"
+ @${ECHO_MSG} " WITH_PAM=yes Enable PAM support"
+ @${ECHO_MSG} " WITH_TIMELOARD=yes Enable Timelord network time service"
+ @${ECHO_MSG} " WITH_MANGLING=yes Enable long file name mangling support (requires CNID)"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "See Netatalk's Makefile for more details on some of these options."
+ @${ECHO_MSG} ""
+
post-extract:
@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
> ${WRKSRC}/netatalk.sh
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 1a0144607539..cb96672dbe2b 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.6.0.tar.bz2) = c141aa6712fed7a51b989b0aa80977c7
+MD5 (netatalk-1.6.1.tar.bz2) = fa3764f1a878c63f91e0b640ee60aa59
diff --git a/net/netatalk/files/patch-bin_afppasswd_afppasswd.c b/net/netatalk/files/patch-bin_afppasswd_afppasswd.c
deleted file mode 100644
index 8d5838b9a6a0..000000000000
--- a/net/netatalk/files/patch-bin_afppasswd_afppasswd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/afppasswd/afppasswd.c.orig Thu Feb 20 00:04:51 2003
-+++ bin/afppasswd/afppasswd.c Thu Feb 20 00:04:57 2003
-@@ -114,7 +114,7 @@
- /* decrypt the password */
- ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
- }
-- memset(schedule, 0, sizeof(schedule));
-+ memset(&schedule, 0, sizeof(schedule));
- }
-
- if (newpwd) {
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index cf6c1bd81c04..55fbe6184a07 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,20 +1,9 @@
---- configure.orig Mon Nov 25 22:08:45 2002
-+++ configure Sun Dec 15 16:59:28 2002
-@@ -1543,10 +1543,6 @@
-
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--test -n "$target_alias" &&
-- test "$program_prefix$program_suffix$program_transform_name" = \
-- NONENONEs,x,x, &&
-- program_prefix=${target_alias}-
- am__api_version="1.4"
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
-@@ -12252,13 +12248,13 @@
+--- configure.orig Sun Feb 23 00:39:17 2003
++++ configure Sun Feb 23 00:39:38 2003
+@@ -13066,13 +13066,13 @@
savedldflags="$LDFLAGS"
- CFLAGS="$CFLAGS -I$db3dir"
- LDFLAGS="-L$db3libdir $LDFLAGS"
+ CFLAGS="$CFLAGS -I$bdbdir"
+ LDFLAGS="-L$bdblibdir $LDFLAGS"
- echo "$as_me:$LINENO: checking for main in -ldb" >&5
-echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for main in -ldb3" >&5
@@ -27,13 +16,13 @@
+LIBS="-ldb3 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
- #include "confdefs.h"
-@@ -12299,7 +12295,7 @@
+ /* confdefs.h. */
+@@ -13118,7 +13118,7 @@
- db3found=yes
- DB3_CFLAGS="-I$db3dir"
-- DB3_LIBS="-L$db3libdir -ldb"
-+ DB3_LIBS="-L$db3libdir -ldb3"
- DB3_PATH="`echo $db3dir | sed 's,include/db3$,,'`"
+ bdbfound=yes
+ BDB_CFLAGS="-I$bdbdir"
+- BDB_LIBS="-L$bdblibdir -ldb"
++ BDB_LIBS="-L$bdblibdir -ldb3"
+ BDB_BIN=$bdbbindir
+ BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
- fi
diff --git a/net/netatalk/files/patch-etc_uams_uams_randnum.c b/net/netatalk/files/patch-etc_uams_uams_randnum.c
deleted file mode 100644
index b7c5648127e3..000000000000
--- a/net/netatalk/files/patch-etc_uams_uams_randnum.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- etc/uams/uams_randnum.c.orig Thu Feb 20 00:05:48 2003
-+++ etc/uams/uams_randnum.c Thu Feb 20 00:07:56 2003
-@@ -217,7 +217,7 @@
- /* decrypt the password */
- ecb_encrypt((C_Block *) p, (C_Block *) p, schedule, DES_DECRYPT);
- }
-- memset(schedule, 0, sizeof(schedule));
-+ memset(&schedule, 0, sizeof(schedule));
- }
-
- if (set) {
-@@ -383,7 +383,7 @@
- memset(seskey, 0, sizeof(seskey));
- ecb_encrypt((C_Block *) randbuf, (C_Block *) randbuf,
- seskeysched, DES_ENCRYPT);
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
-
- /* test against what the client sent */
- if (memcmp( randbuf, ibuf, sizeof(randbuf) )) { /* != */
-@@ -431,7 +431,7 @@
- /* test against client's reply */
- if (memcmp(randbuf, ibuf, sizeof(randbuf))) { /* != */
- memset(randbuf, 0, sizeof(randbuf));
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
- return AFPERR_NOTAUTH;
- }
- ibuf += sizeof(randbuf);
-@@ -440,7 +440,7 @@
- /* encrypt client's challenge and send back */
- ecb_encrypt( (C_Block *) ibuf, (C_Block *) rbuf,
- seskeysched, DES_ENCRYPT);
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
- *rbuflen = sizeof(randbuf);
-
- *uam_pwd = randpwd;
-@@ -495,7 +495,7 @@
- err = randpass(pwd, passwdfile, ibuf + PASSWDLEN, sizeof(seskey), 1);
-
- /* zero out some fields */
-- memset(seskeysched, 0, sizeof(seskeysched));
-+ memset(&seskeysched, 0, sizeof(seskeysched));
- memset(seskey, 0, sizeof(seskey));
- memset(ibuf, 0, sizeof(seskey)); /* old passwd */
- memset(ibuf + PASSWDLEN, 0, sizeof(seskey)); /* new passwd */
diff --git a/net/netatalk/pkg-comment b/net/netatalk/pkg-comment
deleted file mode 100644
index 4eb541bac506..000000000000
--- a/net/netatalk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File and print server for AppleTalk networks
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index 2e51857c560f..75a79c3d433e 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -85,6 +85,7 @@ etc/nls/maccode.437
etc/nls/maccode.850
etc/nls/maccode.iso8859-1
etc/nls/maccode.iso8859-1.adapted
+etc/nls/maccode.koi8-r
etc/rc.d/netatalk.sh.sample
etc/uams/uams_clrtxt.so
etc/uams/uams_dhx.so
generated by cgit (git 2.34.1) at 2024-12-16 18:16:24 +0800