[60660] trunk/dports/net/netatalk
dluke at macports.org
dluke at macports.org
Thu Nov 19 07:03:27 PST 2009
Revision: 60660
http://trac.macports.org/changeset/60660
Author: dluke at macports.org
Date: 2009-11-19 07:03:25 -0800 (Thu, 19 Nov 2009)
Log Message:
-----------
Commit patch from #22529, give maintainership to reporter (per mailing list post)
Modified Paths:
--------------
trunk/dports/net/netatalk/Portfile
trunk/dports/net/netatalk/files/patch-configure
trunk/dports/net/netatalk/files/patch-uams_randnum.c
Added Paths:
-----------
trunk/dports/net/netatalk/files/initscript
trunk/dports/net/netatalk/files/patch-adv1tov2.c
trunk/dports/net/netatalk/files/patch-usockfd.c
Modified: trunk/dports/net/netatalk/Portfile
===================================================================
--- trunk/dports/net/netatalk/Portfile 2009-11-19 13:54:54 UTC (rev 60659)
+++ trunk/dports/net/netatalk/Portfile 2009-11-19 15:03:25 UTC (rev 60660)
@@ -3,11 +3,11 @@
PortSystem 1.0
name netatalk
-version 2.0.3
-revision 1
+version 2.0.5
+revision 2
categories net
platforms darwin
-maintainers nomaintainer
+maintainers rsrc.de:ralph
description file and printer server for Apple Macintosh clients
long_description netatalk is a daemon which provides POSIX-compliant \
Unix/BSD systems with the ability to share files and \
@@ -15,54 +15,63 @@
homepage http://netatalk.sourceforge.net/
master_sites sourceforge
-checksums md5 28092763085783805dc2f00aa2127a3e
+checksums md5 3bd8f4780abc373e0539ab7cd1f9950f
use_bzip2 yes
-patchfiles patch-configure.in \
- patch-configure \
- patch-bin-Makefile.am \
- patch-bin-Makefile.in \
- patch-bin-cnid-cnid_index.c \
- patch-etc-cnid_dbd-dbif.c \
- patch-afppasswd.c \
+startupitem.create yes
+startupitem.start "${prefix}/etc/netatalk/initscript start"
+startupitem.stop "${prefix}/etc/netatalk/initscript stop"
+startupitem.restart "${prefix}/etc/netatalk/initscript restart"
+
+patchfiles patch-afppasswd.c \
patch-paths.h \
- patch-uams_randnum.c
+ patch-uams_randnum.c \
+ patch-adv1tov2.c \
+ patch-usockfd.c
-
-depends_lib port:db44 \
+depends_lib port:db47 \
port:openssl \
path:bin/perl:perl5 \
- port:cracklib \
port:libiconv
+variant noat description {Disable Appletalk support} {
+ patchfiles-append patch-configure
+ configure.args-append --disable-ddp
+}
+
+platform darwin 10 {
+ pre-patch {
+ # Only used on Mac OS X 10.6.
+ puts "AppleTalk has been removed from Mac OS X 10.6+."
+ puts "Building without AppleTalk support."
+ patchfiles-append patch-configure
+ configure.args-append --disable-ddp
+ }
+}
+
post-patch {
reinplace "s|__PREFIX__|${prefix}|g" \
${worksrcpath}/include/atalk/paths.h
}
-configure.args --with-bdb=${prefix}/include/db44 \
+configure.args --with-bdb=${prefix} \
--mandir=${prefix}/share/man \
--with-logfile=${prefix}/var/log/netatalk.log \
--with-spooldir=${prefix}/var/spool/netatalk \
- --with-cracklib=${prefix}/lib/cracklib/pw_dict.pwd \
- --enable-a2boot \
--with-ssl-dir=${prefix} \
--with-libiconv=${prefix}
-configure.cppflags-append -I${prefix}/include/db44
-configure.ldflags-append -L${prefix}/lib/db44
+configure.cppflags-append -I${prefix}/include/db47
+configure.ldflags-append -L${prefix}/lib/db47
+
post-destroot {
file delete -force ${destroot}${prefix}/sbin/atalkd \
${destroot}${prefix}/share/netatalk ${destroot}/etc
xinstall -m 755 -d ${destroot}${prefix}/var/log/ \
${destroot}${prefix}/var/run/netatalk \
${destroot}${prefix}/var/spool/netatalk
+ xinstall -m 755 ${filespath}/initscript ${destroot}${prefix}/etc/netatalk/
+ reinplace "s|MACPORTS_PREFIX|${prefix}|" ${destroot}${prefix}/etc/netatalk/initscript
system "touch ${destroot}${prefix}/var/log/netatalk.log"
system "touch ${destroot}${prefix}/var/run/netatalk/afpd"
destroot.keepdirs ${destroot}${prefix}/var/spool/netatalk
}
-
-if {${os.platform} == "darwin" && ${os.major} >= 10} {
- pre-configure {
- return -code error "AppleTalk has been removed from Mac OS X 10.6+"
- }
-}
Added: trunk/dports/net/netatalk/files/initscript
===================================================================
--- trunk/dports/net/netatalk/files/initscript (rev 0)
+++ trunk/dports/net/netatalk/files/initscript 2009-11-19 15:03:25 UTC (rev 60660)
@@ -0,0 +1,76 @@
+#!/bin/sh
+set -e
+
+PREFIX="MACPORTS_PREFIX"
+
+NAME=netatalk
+SCRIPTNAME=/etc/init.d/$netatalk
+
+# Set defaults. Please change these options in netatalk.conf.
+AFPD_UAMLIST="-U uams_dhx.so"
+AFPD_GUEST=nobody
+AFPD_MAX_CLIENTS=50
+CNID_METAD_RUN=yes
+CNID_METAD_ARGS="-h 127.0.0.1 -p 4700"
+ATALK_MAC_CHARSET='MAC_ROMAN'
+ATALK_UNIX_CHARSET='LOCALE'
+ATALK_BGROUND=no
+
+# Read in netatalk configuration.
+if [ -f "$PREFIX/etc/netatalk/netatalk.conf" ]; then
+ . "$PREFIX/etc/netatalk/netatalk.conf"
+fi
+
+# Start Netatalk servers.
+atalk_startup() {
+ # prepare startup of file services
+ if [ "x${CNID_METAD_RUN}" = "xyes" -a -x "$PREFIX/sbin/cnid_metad" ] ; then
+ printf " cnid_metad ..."
+ "$PREFIX/sbin/cnid_metad" $CNID_METAD_ARGS
+ printf " Done.\n"
+ fi
+
+ if [ "x$AFPD_RUN" = "xyes" ]; then
+ printf " afpd ..."
+ "$PREFIX/sbin/afpd" $AFPD_UAMLIST -g $AFPD_GUEST -c $AFPD_MAX_CLIENTS
+ printf " Done.\n"
+ fi
+}
+
+case "$1" in
+ start)
+ if test "x${ATALK_BGROUND}" = "xyes"; then
+ atalk_startup >/dev/null &
+ else
+ echo "Starting Netatalk services..."
+ atalk_startup
+ echo "Done."
+ fi
+ ;;
+
+ stop)
+ AFP_PID=`ps aux | grep -v awk | awk '/^root.*afpd/ {print $2}'`
+ if [ "x$AFP_PID" != "x" ] ; then
+ kill $AFP_PID
+ fi
+ CNID_PID=`ps aux | grep -v awk | awk '/^root.*cnid_metad/ {print $2}'`
+ if [ "x$CNID_PID" != "x" ] ; then
+ kill $CNID_PID
+ fi
+ ;;
+
+ restart)
+ $0 force-reload
+ ;;
+
+ force-reload)
+ $0 stop
+ sleep 2
+ $0 start
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
Property changes on: trunk/dports/net/netatalk/files/initscript
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dports/net/netatalk/files/patch-adv1tov2.c
===================================================================
--- trunk/dports/net/netatalk/files/patch-adv1tov2.c (rev 0)
+++ trunk/dports/net/netatalk/files/patch-adv1tov2.c 2009-11-19 15:03:25 UTC (rev 60660)
@@ -0,0 +1,31 @@
+--- bin/adv1tov2/adv1tov2.c~ 2009-03-29 09:23:20.000000000 +0200
++++ bin/adv1tov2/adv1tov2.c 2009-11-10 18:36:50.000000000 +0100
+@@ -8,16 +8,16 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+
+-#include <atalk/adouble.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif /* HAVE_UNISTD_H */
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <dirent.h>
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif /* HAVE_FCNTL_H */
+-#ifdef HAVE_UNISTD_H
+-#include <unistd.h>
+-#endif /* HAVE_UNISTD_H */
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <string.h>
+
++#include <atalk/adouble.h>
+ #include <atalk/util.h>
+
+ #if AD_VERSION == AD_VERSION2
Modified: trunk/dports/net/netatalk/files/patch-configure
===================================================================
--- trunk/dports/net/netatalk/files/patch-configure 2009-11-19 13:54:54 UTC (rev 60659)
+++ trunk/dports/net/netatalk/files/patch-configure 2009-11-19 15:03:25 UTC (rev 60660)
@@ -1,19 +1,12 @@
---- configure.org 2005-01-03 08:05:06.000000000 -0800
-+++ configure 2006-05-29 01:42:26.000000000 -0700
-@@ -19803,7 +19803,7 @@
+--- configure~ 2009-10-05 10:27:29.000000000 +0200
++++ configure 2009-11-14 16:34:56.000000000 +0100
+@@ -30116,9 +30116,6 @@
+ _ACEOF
+-cat >>confdefs.h <<\_ACEOF
+-#define MACOSX_SERVER 1
+-_ACEOF
-- ac_config_files="$ac_config_files Makefile bin/Makefile bin/adv1tov2/Makefile bin/aecho/Makefile bin/afile/Makefile bin/afppasswd/Makefile bin/cnid/Makefile bin/cnid/cnid_maint bin/cnid/cnid2_create bin/getzones/Makefile bin/megatron/Makefile bin/nbp/Makefile bin/pap/Makefile bin/psorder/Makefile bin/uniconv/Makefile config/Makefile contrib/Makefile contrib/macusers/Makefile contrib/macusers/macusers contrib/nu/Makefile contrib/nu/nu contrib/printing/Makefile contrib/shell_utils/Makefile contrib/shell_utils/afpd-mtab.pl contrib/shell_utils/apple_cp contrib/shell_utils/apple_mv contrib/shell_utils/apple_rm contrib/shell_utils/asip-status.pl contrib/shell_utils/cleanappledouble.pl contrib/timelord/Makefile contrib/a2boot/Makefile distrib/Makefile distrib/config/Makefile distrib/config/netatalk-config distrib/initscripts/Makefile distrib/m4/Makefile doc/Makefile etc/Makefile etc/afpd/Makefile etc/atalkd/Makefile etc/cnid_dbd/Makefile etc/uams/Makefile etc/uams/uams_krb4/Makefile etc/papd/Makefile etc/psf/Makefile include/Makefile include/atalk/Makefile libatalk/Makefile libatalk/adouble/Makefile libatalk/asp/Makefile libatalk/atp/Makefile libatalk/cnid/Makefile libatalk/cnid/db3/Makefile libatalk/cnid/cdb/Makefile libatalk/cnid/last/Makefile libatalk/cnid/mtab/Makefile libatalk/cnid/dbd/Makefile libatalk/cnid/hash/Makefile libatalk/cnid/tdb/Makefile libatalk/compat/Makefile libatalk/dsi/Makefile libatalk/nbp/Makefile libatalk/netddp/Makefile libatalk/util/Makefile libatalk/tdb/Makefile libatalk/unicode/Makefile libatalk/unicode/charsets/Makefile macros/Makefile man/Makefile man/man1/Makefile man/man3/Makefile man/man4/Makefile man/man5/Makefile man/man8/Makefile sys/Makefile sys/generic/Makefile sys/generic/sys/Makefile sys/netatalk/Makefile sys/netbsd/Makefile sys/netbsd/netatalk/Makefile sys/solaris/Makefile sys/sunos/Makefile sys/ultrix/Makefile"
-+ ac_config_files="$ac_config_files Makefile bin/Makefile bin/aecho/Makefile bin/afile/Makefile bin/afppasswd/Makefile bin/cnid/Makefile bin/cnid/cnid_maint bin/cnid/cnid2_create bin/getzones/Makefile bin/megatron/Makefile bin/nbp/Makefile bin/pap/Makefile bin/psorder/Makefile bin/uniconv/Makefile config/Makefile contrib/Makefile contrib/macusers/Makefile contrib/macusers/macusers contrib/nu/Makefile contrib/nu/nu contrib/printing/Makefile contrib/shell_utils/Makefile contrib/shell_utils/afpd-mtab.pl contrib/shell_utils/apple_cp contrib/shell_utils/apple_mv contrib/shell_utils/apple_rm contrib/shell_utils/asip-status.pl contrib/shell_utils/cleanappledouble.pl contrib/timelord/Makefile contrib/a2boot/Makefile distrib/Makefile distrib/config/Makefile distrib/config/netatalk-config distrib/initscripts/Makefile distrib/m4/Makefile doc/Makefile etc/Makefile etc/afpd/Makefile etc/atalkd/Makefile etc/cnid_dbd/Makefile etc/uams/Makefile etc/uams/uams_krb4/Makefile etc/papd/Makefile etc/psf/Makefile include/Makefile include/atalk/Makefile libatalk/Makefile libatalk/adouble/Makefile libatalk/asp/Makefile libatalk/atp/Makefile libatalk/cnid/Makefile libatalk/cnid/db3/Makefile libatalk/cnid/cdb/Makefile libatalk/cnid/last/Makefile libatalk/cnid/mtab/Makefile libatalk/cnid/dbd/Makefile libatalk/cnid/hash/Makefile libatalk/cnid/tdb/Makefile libatalk/compat/Makefile libatalk/dsi/Makefile libatalk/nbp/Makefile libatalk/netddp/Makefile libatalk/util/Makefile libatalk/tdb/Makefile libatalk/unicode/Makefile libatalk/unicode/charsets/Makefile macros/Makefile man/Makefile man/man1/Makefile man/man3/Makefile man/man4/Makefile man/man5/Makefile man/man8/Makefile sys/Makefile sys/generic/Makefile sys/generic/sys/Makefile sys/netatalk/Makefile sys/netbsd/Makefile sys/netbsd/netatalk/Makefile sys/solaris/Makefile sys/sunos/Makefile sys/ultrix/Makefile"
- ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -20509,7 +20509,6 @@
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "bin/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
-- "bin/adv1tov2/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/adv1tov2/Makefile" ;;
- "bin/aecho/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/aecho/Makefile" ;;
- "bin/afile/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/afile/Makefile" ;;
- "bin/afppasswd/Makefile" ) CONFIG_FILES="$CONFIG_FILES bin/afppasswd/Makefile" ;;
+ fi
+
Modified: trunk/dports/net/netatalk/files/patch-uams_randnum.c
===================================================================
--- trunk/dports/net/netatalk/files/patch-uams_randnum.c 2009-11-19 13:54:54 UTC (rev 60659)
+++ trunk/dports/net/netatalk/files/patch-uams_randnum.c 2009-11-19 15:03:25 UTC (rev 60660)
@@ -1,5 +1,5 @@
---- etc/uams/uams_randnum.c Thu Oct 28 17:28:54 2004
-+++ etc/uams/uams_randnum.c.new Thu Oct 28 17:28:43 2004
+--- etc/uams/uams_randnum.c~ 2009-03-29 09:23:23.000000000 +0200
++++ etc/uams/uams_randnum.c 2009-11-14 16:33:14.000000000 +0100
@@ -50,7 +50,7 @@
#include <des.h>
@@ -8,4 +8,4 @@
+#include <packer.h>
#endif /* USE_CRACKLIB */
- #ifndef __inline__
+ #define PASSWDLEN 8
Added: trunk/dports/net/netatalk/files/patch-usockfd.c
===================================================================
--- trunk/dports/net/netatalk/files/patch-usockfd.c (rev 0)
+++ trunk/dports/net/netatalk/files/patch-usockfd.c 2009-11-19 15:03:25 UTC (rev 60660)
@@ -0,0 +1,11 @@
+--- etc/cnid_dbd/usockfd.c~ 2009-03-29 09:23:23.000000000 +0200
++++ etc/cnid_dbd/usockfd.c 2009-11-14 11:11:53.000000000 +0100
+@@ -82,7 +82,7 @@
+ int tsockfd_create(char *host, u_int16_t ipport, int backlog)
+ {
+ int sockfd;
+- struct sockaddr_in server;
++ struct sockaddr_in server = { 0 };
+ struct hostent *hp;
+ int port;
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091119/d1e0367b/attachment.html>
More information about the macports-changes
mailing list