pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/netatalk Update netatalk to 2.0.1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2bba65b3545
branches:  trunk
changeset: 482731:c2bba65b3545
user:      markd <markd%pkgsrc.org@localhost>
date:      Tue Nov 02 11:26:28 2004 +0000

description:
Update netatalk to 2.0.1

Changes:
     * Netatalk's file server, afpd, now speaking AFP 3.1 allows long
       filenames, UTF-8 names, large file support and full MacOS X
       compatibility
     * The print server task, papd, can directly interact with CUPS,
       automagically sharing all CUPS queues
     * Kerberos V support, allowing true "Single Sign On"
     * Whole rework of the CNID subsystem, providing reliable and
       persistant storage of file and directory IDs
     * Huge improvements regarding product documentation making
       Netatalk's features accessible more easily
     * Tons of bugs fixed compared to all previous versions

diffstat:

 net/netatalk/DESCR            |   20 +---
 net/netatalk/INSTALL          |   25 ------
 net/netatalk/Makefile         |   57 +++++++------
 net/netatalk/PLIST            |   26 +++--
 net/netatalk/buildlink3.mk    |   12 +-
 net/netatalk/distinfo         |   14 ++-
 net/netatalk/patches/patch-aa |  165 ++---------------------------------------
 net/netatalk/patches/patch-ab |   28 ++----
 net/netatalk/patches/patch-ae |   19 ----
 net/netatalk/patches/patch-ag |   13 +++
 net/netatalk/patches/patch-ah |   22 +++++
 net/netatalk/patches/patch-ai |   21 +++++
 12 files changed, 141 insertions(+), 281 deletions(-)

diffs (truncated from 610 to 300 lines):

diff -r 3a64351efc0b -r c2bba65b3545 net/netatalk/DESCR
--- a/net/netatalk/DESCR        Tue Nov 02 11:20:10 2004 +0000
+++ b/net/netatalk/DESCR        Tue Nov 02 11:26:28 2004 +0000
@@ -1,14 +1,6 @@
-netatalk is an implementation of the AppleTalk Protocol Suite for
-Unix systems. The current release contains support for EtherTalk
-Phase I and II, DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, and AFP.
-
-DDP is in the kernel. atalkd implements RTMP, NBP, ZIP, and AEP.
-It is the AppleTalk equivalent of Unix routed and ifconfig. There
-is also a client-stub library for NBP. ATP and ASP are implemented
-as libraries. papd allows Macs to spool to lpd or a pipe, and pap
-allows Unix machines to print to AppleTalk connected printers. psf
-is a PostScript printer filter for lpd, designed to use pap. psorder
-is a PostScript reverser, called by psf to reverse pages printed
-to face-up stacking printers. afpd provides Macs with an interface
-to the Unix file system. Refer to the appropriate man pages for
-operational information.
+Netatalk is a freely-available, kernel level implementation of the AppleTalk
+Protocol Suite, originally for BSD-derived systems. A *NIX/*BSD system
+running netatalk is capable of serving many macintosh clients simultaneously
+as an AppleTalk router, AppleShare file server (AFP), *NIX/*BSD print server,
+and for accessing AppleTalk printers via Printer Access Protocol (PAP).
+Included are a number of minor printing and debugging utilities.
diff -r 3a64351efc0b -r c2bba65b3545 net/netatalk/INSTALL
--- a/net/netatalk/INSTALL      Tue Nov 02 11:20:10 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: INSTALL,v 1.5 2003/08/30 20:22:59 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-       ETCDIR=@PKG_SYSCONFDIR@/netatalk
-
-       ${MKDIR} -p ${ETCDIR}
-
-       ${ECHO} "Installing configuration files:"
-       for file in \
-               AppleVolumes.default AppleVolumes.system afpd.conf \
-               atalkd.conf netatalk.conf papd.conf
-       do
-               if [ -f ${ETCDIR}/${file} ]; then
-                       ${ECHO} "  ${ETCDIR}/${file} already exists"
-               else
-                       ${ECHO} "  ${ETCDIR}/${file}"
-                       ${CP} ${PKG_PREFIX}/share/examples/netatalk/${file} \
-                               ${ETCDIR}/${file}
-                       ${CHMOD} 644 ${ETCDIR}/${file}
-               fi
-       done
-       ${ECHO} "done."
-       ;;
-esac
diff -r 3a64351efc0b -r c2bba65b3545 net/netatalk/Makefile
--- a/net/netatalk/Makefile     Tue Nov 02 11:20:10 2004 +0000
+++ b/net/netatalk/Makefile     Tue Nov 02 11:26:28 2004 +0000
@@ -1,23 +1,29 @@
-# $NetBSD: Makefile,v 1.31 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: Makefile,v 1.32 2004/11/02 11:26:28 markd Exp $
 
-DISTNAME=      netatalk-1.6.2
-PKGREVISION=   1
+DISTNAME=      netatalk-2.0.1
 CATEGORIES=    net print
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/} \
-               http://me.in-berlin.de/~jroger/netatalk/
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    markd%NetBSD.org@localhost
-HOMEPAGE=      http://sourceforge.net/projects/netatalk/
+HOMEPAGE=      http://netatalk.sourceforge.net/
 COMMENT=       Netatalk appletalk file and print services
 
 GNU_CONFIGURE= YES
 USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 USE_PERL5=     YES
-USE_LIBTOOL=           YES
+USE_LIBTOOL=   YES
 
-USE_PKGINSTALL=                YES
-INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
+USE_PKGINSTALL=        YES
+PKG_SYSCONFSUBDIR=     netatalk
+EG_DIR=                ${PREFIX}/share/examples/netatalk
+CONF_FILES=    ${EG_DIR}/AppleVolumes.default ${PKG_SYSCONFDIR}/AppleVolumes.default \
+               ${EG_DIR}/AppleVolumes.system ${PKG_SYSCONFDIR}/AppleVolumes.system \
+               ${EG_DIR}/afpd.conf ${PKG_SYSCONFDIR}/afpd.conf \
+               ${EG_DIR}/atalkd.conf ${PKG_SYSCONFDIR}/atalkd.conf \
+               ${EG_DIR}/netatalk.conf ${PKG_SYSCONFDIR}/netatalk.conf \
+               ${EG_DIR}/papd.conf ${PKG_SYSCONFDIR}/papd.conf
 
 CONFLICTS=     netatalk-asun-[0-9]* netatalk-umich-[0-9]*
 
@@ -26,17 +32,18 @@
 .include "../../mk/bsd.prefs.mk"
 
 CONFIGURE_ARGS+=       --enable-netbsd \
+                       --enable-overwrite \
+                       --enable-srvloc \
                        --enable-timelord \
-                       --with-did=last \
-                       --with-tcp-wrappers \
+                       --libexecdir=${PREFIX}/libexec/netatalk \
                        --sbindir=${PREFIX}/libexec/netatalk \
-                       --sysconfdir=${PKG_SYSCONFDIR} \
-                       --localstatedir=/var/netatalk \
-                       --with-nls-dir=${PREFIX}/share/netatalk/nls \
-                       --with-uams-path=${PREFIX}/libexec/netatalk/uams
-
-#CONFIGURE_ARGS+=      --with-flock-locks      # broken
-#CONFIGURE_ARGS+=      --with-bdb=${PREFIX}    # still some known issues
+                       --with-pkgconfdir=${PKG_SYSCONFDIR} \
+                       --localstatedir=${VARBASE}/netatalk \
+                       --with-uams-path=${PREFIX}/libexec/netatalk/uams \
+                       --with-bdb=${BUILDLINK_PREFIX.db4} \
+                       --with-gssapi --enable-krbV-uam
+CONFIGURE_ENV+=        GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
+LIBS+=-ldes
 
 post-patch:
        mv ${WRKSRC}/etc/psf/etc2ps.sh ${WRKSRC}/etc/psf/etc2ps.sh.tmp
@@ -45,15 +52,11 @@
 
 pre-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/libexec/psffilters
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/netatalk
-.for FILE in atalkd.conf netatalk.conf papd.conf AppleVolumes.default \
-               AppleVolumes.system afpd.conf
-       @-( cd ${WRKSRC}/config; ${MAKE_PROGRAM} ${FILE} )
-       ${INSTALL_DATA} ${WRKSRC}/config/${FILE} \
-                                       ${PREFIX}/share/examples/netatalk/
-.endfor
 
-#.include "../../databases/db3/buildlink3.mk"
-.include "../../devel/rx/buildlink3.mk"
+.include "../../databases/db4/buildlink3.mk"
+.include "../../net/openslp/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/krb5.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 3a64351efc0b -r c2bba65b3545 net/netatalk/PLIST
--- a/net/netatalk/PLIST        Tue Nov 02 11:20:10 2004 +0000
+++ b/net/netatalk/PLIST        Tue Nov 02 11:26:28 2004 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2004/09/22 08:09:48 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/11/02 11:26:28 markd Exp $
 bin/achfile
 bin/acleandir.rc
-bin/add_netatalk_printer
 bin/adv1tov2
 bin/aecho
 bin/afile
@@ -10,15 +9,16 @@
 bin/apple_cp
 bin/apple_mv
 bin/apple_rm
+bin/asip-status.pl
 bin/binheader
 bin/cleanappledouble.pl
-@comment bin/cnid_maint
+bin/cnid2_create
+bin/cnid_maint
 bin/getzones
 bin/hqx2bin
 bin/lp2pap.sh
 bin/macbinary
 bin/macusers
-bin/makecode
 bin/megatron
 bin/nadheader
 bin/nbplkup
@@ -29,12 +29,13 @@
 bin/nu
 bin/pap
 bin/papstatus
-bin/parsecode
 bin/psorder
+bin/showppd
 bin/single2bin
 bin/timeout
 bin/unbin
 bin/unhex
+bin/uniconv
 bin/unsingle
 include/atalk/adouble.h
 include/atalk/aep.h
@@ -46,6 +47,7 @@
 include/atalk/compat.h
 include/atalk/ddp.h
 include/atalk/dsi.h
+include/atalk/list.h
 include/atalk/logger.h
 include/atalk/nbp.h
 include/atalk/netddp.h
@@ -53,6 +55,7 @@
 include/atalk/paths.h
 include/atalk/rtmp.h
 include/atalk/server_child.h
+include/atalk/tdb.h
 include/atalk/uam.h
 include/atalk/util.h
 include/atalk/zip.h
@@ -72,6 +75,8 @@
 lib/libatalk.la
 libexec/netatalk/afpd
 libexec/netatalk/atalkd
+libexec/netatalk/cnid_dbd
+libexec/netatalk/cnid_metad
 libexec/netatalk/etc2ps.sh
 libexec/netatalk/ifmpap
 libexec/netatalk/ifmpaprev
@@ -100,6 +105,7 @@
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx_passwd.la
+libexec/netatalk/uams/uams_gss.la
 libexec/netatalk/uams/uams_guest.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
@@ -111,6 +117,7 @@
 man/man1/apple_cp.1
 man/man1/apple_mv.1
 man/man1/apple_rm.1
+man/man1/asip-status.pl.1
 man/man1/getzones.1
 man/man1/hqx2bin.1
 man/man1/macbinary.1
@@ -127,6 +134,7 @@
 man/man1/timeout.1
 man/man1/unbin.1
 man/man1/unhex.1
+man/man1/uniconv.1
 man/man1/unsingle.1
 man/man3/atalk_aton.3
 man/man3/nbp_name.3
@@ -138,6 +146,8 @@
 man/man5/papd.conf.5
 man/man8/afpd.8
 man/man8/atalkd.8
+man/man8/cnid_dbd.8
+man/man8/cnid_metad.8
 man/man8/papd.8
 man/man8/papstatus.8
 man/man8/psf.8
@@ -149,13 +159,7 @@
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/netatalk.conf
 share/examples/netatalk/papd.conf
-share/netatalk/nls/maccode.437
-share/netatalk/nls/maccode.850
-share/netatalk/nls/maccode.iso8859-1
-share/netatalk/nls/maccode.iso8859-1.adapted
-share/netatalk/nls/maccode.koi8-r
 share/netatalk/pagecount.ps
-@dirrm share/netatalk/nls
 @dirrm share/netatalk
 @dirrm share/examples/netatalk
 @exec ${MKDIR} %D/libexec/psffilters
diff -r 3a64351efc0b -r c2bba65b3545 net/netatalk/buildlink3.mk
--- a/net/netatalk/buildlink3.mk        Tue Nov 02 11:20:10 2004 +0000
+++ b/net/netatalk/buildlink3.mk        Tue Nov 02 11:26:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/11/02 11:26:28 markd Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 NETATALK_BUILDLINK3_MK:=       ${NETATALK_BUILDLINK3_MK}+
@@ -7,15 +7,13 @@
 BUILDLINK_DEPENDS+=    netatalk
 .endif
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGESNnetatalk}
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nnetatalk}
 BUILDLINK_PACKAGES+=   netatalk
 
 .if !empty(NETATALK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.netatalk+=   netatalk>=1.6.2
-BUILDLINK_RECOMMENDED.netatalk+=       netatalk>=1.6.2nb1
-BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk
+BUILDLINK_DEPENDS.netatalk+=   netatalk>=2.0.1
+BUILDLINK_PKGSRCDIR.netatalk?= ../../mcs/netatalk
+BUILDLINK_DEPMETHOD.netatalk?= build
 .endif # NETATALK_BUILDLINK3_MK
 
-.include "../../devel/rx/buildlink3.mk"
-
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 3a64351efc0b -r c2bba65b3545 net/netatalk/distinfo
--- a/net/netatalk/distinfo     Tue Nov 02 11:20:10 2004 +0000
+++ b/net/netatalk/distinfo     Tue Nov 02 11:26:28 2004 +0000
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.11 2003/04/28 04:07:45 fredb Exp $
+$NetBSD: distinfo,v 1.12 2004/11/02 11:26:28 markd Exp $
 
-SHA1 (netatalk-1.6.2.tar.gz) = b3e451b2c40c70feda4f81d92162d08fa063fc48
-Size (netatalk-1.6.2.tar.gz) = 855933 bytes



Home | Main Index | Thread Index | Old Index