# ChangeLog for net-fs/netatalk
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.70 2011/09/09 21:19:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.71 2011/09/29 16:55:00 flameeyes Exp $
+
+*netatalk-2.2.1-r1 (29 Sep 2011)
+
+ 29 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+ +netatalk-2.2.1-r1.ebuild, +files/netatalk-2.2.1-gentoo.patch,
+ +files/afpd.init, +files/atalk_service.init, +files/atalkd.init,
+ +files/cnid_metad.init, metadata.xml:
+ Add new revision (that I'll maintain); this version includes a number of
+ improvements on USE flags and dependencies, replacing xfs with quota,
+ dropping the extra dependency over xfsprogs, adding proper ldap dependencies
+ rather than leaving it automagic, adding an USE flag to enable or disable
+ appletalk-based utilities, and replacing the upstream-provided init script
+ with two (or five, if using appletalk proper) services that can be started
+ standalone and properly depend on Avahi. Also describe USE flags according to
+ what they actually do.
*netatalk-2.2.1 (09 Sep 2011)
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX afpd.init 837 RMD160 84c462220fa1b8f407c235ff5a4f57b3e3c03b09 SHA1 05759fb8d8ae319ff2bc046dd05b3b52ab793be7 SHA256 bdf35742085d8d2627f3eaccb679a83d2979a5ccf18fe00c967d6321ff3d3afa
+AUX atalk_service.init 524 RMD160 7eb489b743d5406184d4ccf0d28ef5b2cb0b7282 SHA1 c392350057d118d4f98aedeca6ef5e3713ee7094 SHA256 69e907b5b4bff01b30fe9d5ceb378da23ec60063f78e83fe0d47e99d9e19e090
+AUX atalkd.init 947 RMD160 390b0da96fbe2ff829485760b4a9249f0348992d SHA1 9077f80ef9f232e90482db1c1ca6a7386814f8f5 SHA256 bb91f2a6455ff515a3cc4a10932fd3f1526df78e8876be7553aff0dec3da9877
+AUX cnid_metad.init 632 RMD160 19fac61ff9092b547d4ec4003a38f5fe534b77fa SHA1 accd7e6b088af384a1c917b238c42f0cfda8a05c SHA256 d0ec9dd86336b13d5589c8bc4627d6134eb69425ae4e72522eaf7a99fc164b9b
AUX netatalk-2.0.5-control-pam.patch 997 RMD160 a7b11647dd7827288517fa3c7696a37182ec219e SHA1 113f318c15870c6638da6a8a76033d954ca6b41a SHA256 4cf74450782f9f6395436d1d433d4d4662ea63fad48961dacec76adafdd35f47
AUX netatalk-2.2.0-path_afp_ipc.patch 546 RMD160 d033e1dfe1db461116ac4cdffc687378a1f145a0 SHA1 3bef900e9d6b070b4266b495cdad3c44fb11d7ef SHA256 469b5b4c928a453f7d50489dcb7cf5855a848d3fa09b86fe5796df929de89857
+AUX netatalk-2.2.1-gentoo.patch 2965 RMD160 e36cc53d6d1a02ba13012b80b00a5f54b29aa4cb SHA1 ab936d47bfefa0e95e60225671fb0d5be51b24b1 SHA256 234ba2ab73270887b12cb02a2099727ccf1bf5706135b52b70918c32eae2df16
DIST netatalk-2.0.5.tar.bz2 993882 RMD160 47247d376bf421652d9f9897c75853424215ae0a SHA1 a38f98abc123b02d26628543e393a4de04481e4f SHA256 aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37
DIST netatalk-2.1.3.tar.bz2 1122920 RMD160 de9810c014549099e412bbc52fb3bb5e780b30e5 SHA1 a1a3fa649ecb454c4ed2e476e27877ba06a338d9 SHA256 472f283c495c6c39020eeedea0b71610aa10008812f491a80617555f999216b4
DIST netatalk-2.1.5.tar.bz2 1125946 RMD160 9265b34f303a21b89c78401c24ed464c61041ff3 SHA1 689856ed96ccf34f2f7b83d70c97d30213638a70 SHA256 11fcce36cc5179de60c5c0b10032ff9e042ed8b8c6e0b99d2d7200c8d0749038
EBUILD netatalk-2.1.6.ebuild 2852 RMD160 958e78ccf8a29df324f7c18ab5ef0cf3d8948bfd SHA1 d6cd0bcdd679e28bbd243849fa9c77d4e129f47d SHA256 fcad578f1e6a2e4399b9ecbef9e6a88ec526d40c3f1f67242801973487b09c91
EBUILD netatalk-2.1.ebuild 2909 RMD160 0f17ff6ee31309903073daf11deab411ff852c76 SHA1 447658644d1abb1f2ecc54f10804723467dc6fd3 SHA256 6466888f3073c4ee72c5352f8d831b9ce153ffc4270e5bb2dd9eaedd21bc6e09
EBUILD netatalk-2.2.0.ebuild 3028 RMD160 a69d37d84a7be3a5ed5c3f4e1ee40899079231dd SHA1 1513fce1407571607c6c64139f9c11db15a40965 SHA256 e1a1cbda0c4e7a7453a63b9b24c02e48689d3fa72eb3836b4b742b6d859f2d22
+EBUILD netatalk-2.2.1-r1.ebuild 4374 RMD160 89c3d3a4fc64a0c25d565a3d3d0840656f5ff857 SHA1 9c67463eaf4f3993e4143ba67b9bf3d64f886626 SHA256 f5790e9e765136fb444edf9c728cb1f78b5c8ba4b904f8097766053b9970bb35
EBUILD netatalk-2.2.1.ebuild 2959 RMD160 1a6e7e672c8d06466f726c52ce04dafc857a4849 SHA1 928aef4ec42342dae025a370b76e365d839e9a43 SHA256 39f93a8c8a8f62c6bb6872a124134bebe8e6e71139c2a1b4931a5511fb48cc56
-MISC ChangeLog 11187 RMD160 4a907ff0f0f8f8eb66e0b71a839d8de1268e7b3e SHA1 0adf86e1abdfa13fbfd07aced6f39656c44737bf SHA256 50053787ae33f31b14adbb69bc842dda6cde45249bf81b9eaff199a67bdffd84
-MISC metadata.xml 321 RMD160 4cf5a812670dc659b0325e35aa5813f24a8e7499 SHA1 bc376e37383b2f1876644258113fc0e954f8b5f0 SHA256 1f2660dd2dd2f8a210ed6df840e16e23bc9a19d5777a3776cbaecad689bcdeee
+MISC ChangeLog 12013 RMD160 1fdb4e6ee481b9970ac3df08da66d46c1801ca97 SHA1 4f2e471461bc01461508b4c184e90faaa3278a20 SHA256 5937493150183224cc52dacca322e2d2dc39e18da0d80d4aab716d48babdb8e7
+MISC metadata.xml 1193 RMD160 6304fb244d9b7c84f8cb205271d39cd76870374d SHA1 f7a1f8c01d001ec1f35e2a8d760dfb21f33090b4 SHA256 fd546310c3a5e7267926e3a90cc7a6392d642c9178bf68d7f8a620deed27dc25
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk6EotMACgkQAiZjviIA2XgoSACff1NS8i2NlkiqTBhd3/9yv/jg
+r9EAnjweWFSkOKzgLB67MLEdbVb42v+m
+=YaVA
+-----END PGP SIGNATURE-----
--- /dev/null
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/afpd.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
+
+depend() {
+ need net cnid_metad
+ use logger dns atalkd
+
+ if [ ${EXTRA_CONF/-D/} != ${EXTRA_CONF} ]; then
+ need atalkd
+ else
+ config /etc/netatalk/afpd.conf
+
+ sed -e 's:#.*::' /etc/netatalk/afpd.conf | fgrep -q -e -ddp \
+ && need atalkd
+ fi
+
+ need avahi-daemon
+ need slpd
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon \
+ --start --pidfile "/var/run/${SVCNAME}.pid" \
+ --exec /usr/sbin/${SVCNAME} -- \
+ ${EXTRA_CONF}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon \
+ --stop --pidfile "/var/run/${SVCNAME}.pid" \
+ --exec /usr/sbin/${SVCNAME}
+ eend $?
+}
--- /dev/null
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/atalk_service.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
+
+depend() {
+ need net atalkd
+ use logger dns
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon \
+ --start \
+ --exec /usr/sbin/${SVCNAME} --
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon \
+ --stop \
+ --exec /usr/sbin/${SVCNAME}
+ eend $?
+}
--- /dev/null
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/atalkd.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
+
+: ${ATALK_NAME:=$(hostname -s)}
+: ${ATALK_UNIX_CHARSET:=LOCALE}
+: ${ATALK_MAC_CHARSET:=MAC_ROMAN}
+
+depend() {
+ need net
+ use logger dns
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon \
+ --start \
+ --exec /usr/sbin/${SVCNAME} --
+ eend $?
+
+ for reg in \
+ "${ATALK_NAME}:Workstation${ATALK_ZONE}" \
+ "${ATALK_NAME}:netatalk${ATALK_ZONE}"
+ do
+ ebegin " Registering $reg"
+ nbprgstr "$reg"
+ eend $?
+ done
+}
+
+stop() {
+ for reg in \
+ "${ATALK_NAME}:Workstation${ATALK_ZONE}" \
+ "${ATALK_NAME}:netatalk${ATALK_ZONE}"
+ do
+ ebegin " Registering $reg"
+ nbpunrgstr "$reg"
+ eend $?
+ done
+
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon \
+ --stop \
+ --exec /usr/sbin/${SVCNAME}
+ eend $?
+}
--- /dev/null
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/files/cnid_metad.init,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
+
+: ${CNID_CONFIG:=-l log_note}
+
+depend() {
+ need net
+ use logger
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon \
+ --start --pidfile "/var/run/${SVCNAME}.pid" \
+ --exec /usr/sbin/${SVCNAME} -- \
+ ${CNID_CONFIG}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon \
+ --stop --pidfile "/var/run/${SVCNAME}.pid" \
+ --exec /usr/sbin/${SVCNAME}
+ eend $?
+}
--- /dev/null
+Index: netatalk-2.2.1/etc/afpd/afp_avahi.c
+===================================================================
+--- netatalk-2.2.1.orig/etc/afpd/afp_avahi.c
++++ netatalk-2.2.1/etc/afpd/afp_avahi.c
+@@ -176,8 +176,8 @@ static void register_stuff(void) {
+ return;
+
+ fail:
+- time(NULL);
+ // avahi_threaded_poll_quit(ctx->threaded_poll);
++ return;
+ }
+
+ /* Called when publishing of service data completes */
+Index: netatalk-2.2.1/etc/uams/Makefile.am
+===================================================================
+--- netatalk-2.2.1.orig/etc/uams/Makefile.am
++++ netatalk-2.2.1/etc/uams/Makefile.am
+@@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS = @SSL_CFLAGS
+ uams_dhx2_pam_la_CFLAGS = @LIBGCRYPT_CFLAGS@ @PAM_CFLAGS@
+ uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@
+
+-uams_guest_la_LDFLAGS = -module -avoid-version
+-uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
+-uams_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@
+-uams_pam_la_LDFLAGS = -module -avoid-version @PAM_LIBS@
+-uams_pgp_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
+-uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
+-uams_dhx_pam_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
+-uams_dhx2_passwd_la_LDFLAGS = -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
+-uams_dhx2_pam_la_LDFLAGS = -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
+-uams_gss_la_LDFLAGS = -module -avoid-version @GSSAPI_LIBS@
++uams_guest_la_LDFLAGS = -shared -module -avoid-version
++uams_randnum_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
++uams_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@
++uams_pam_la_LDFLAGS = -shared -module -avoid-version @PAM_LIBS@
++uams_pgp_la_LDFLAGS = -shared -module -avoid-version @SSL_LIBS@
++uams_dhx_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@
++uams_dhx_pam_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @SSL_LIBS@ @PAM_LIBS@
++uams_dhx2_passwd_la_LDFLAGS = -shared -module -avoid-version @CRYPT_LIBS@ @LIBGCRYPT_LIBS@
++uams_dhx2_pam_la_LDFLAGS = -shared -module -avoid-version @LIBGCRYPT_LIBS@ @PAM_LIBS@
++uams_gss_la_LDFLAGS = -shared -module -avoid-version @GSSAPI_LIBS@
+
+ #
+ # module compilation
+Index: netatalk-2.2.1/libatalk/Makefile.am
+===================================================================
+--- netatalk-2.2.1.orig/libatalk/Makefile.am
++++ netatalk-2.2.1/libatalk/Makefile.am
+@@ -37,5 +37,3 @@ libatalk_la_DEPENDENCIES = \
+ unicode/libunicode.la \
+ vfs/libvfs.la
+
+-libatalk_la_LDFLAGS = -static
+-
+Index: netatalk-2.2.1/libatalk/vfs/Makefile.am
+===================================================================
+--- netatalk-2.2.1.orig/libatalk/vfs/Makefile.am
++++ netatalk-2.2.1/libatalk/vfs/Makefile.am
+@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sy
+
+ if HAVE_ACLS
+ libvfs_la_SOURCES += acl.c
++libvfs_la_LIBADD = $(ACL_LIBS)
+ endif
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-fs</herd>
-<longdescription>kernel level implementation of the AppleTalk protocol suite</longdescription>
-<use>
- <flag name='xfs'>Enable support for XFS Quota</flag>
-</use>
+ <herd>net-fs</herd>
+ <maintainer restrict=">=net-fs/netatalk-2.2.1-r1">
+ <email>flameeyes@gentoo.org</email>
+ <description>
+ CC me on the bugs so I can take a look at them. I actually use
+ this software and I know how it is supposed to work, at least
+ partially.
+ </description>
+ </maintainer>
+ <use>
+ <flag name='appletalk'>
+ Build support for Apple's AppleTalk (DDP) protocol and its
+ utilities (atalkd, timelord, papd).
+ </flag>
+ <flag name='cups'>
+ Add support for <pkg>net-print/cups</pkg> printers in papd. This
+ flag is only considered if appletalk USE flag is enabled, and is
+ otherwise ignored.
+ </flag>
+ <flag name='quota'>
+ Add support for user quota on various filesystems.
+ </flag>
+ <flag name='ssl'>
+ Use <pkg>dev-libs/openssl</pkg> to provide DHX User Access
+ Modules. These are not used with most recent versions of OS X
+ and can be kept disabled without risks.
+ </flag>
+ <flag name='xfs'>Enable support for XFS Quota</flag>
+ </use>
</pkgmetadata>
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.1-r1.ebuild,v 1.1 2011/09/29 16:55:00 flameeyes Exp $
+
+EAPI="4"
+
+inherit pam flag-o-matic multilib autotools
+
+RESTRICT="test"
+DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl appletalk avahi cracklib cups debug kerberos ldap pam quota slp ssl static-libs tcpd"
+
+RDEPEND=">=sys-libs/db-4.2.52
+ avahi? ( net-dns/avahi[dbus] )
+ cracklib? ( sys-libs/cracklib )
+ pam? ( virtual/pam )
+ ssl? ( dev-libs/openssl )
+ tcpd? ( sys-apps/tcp-wrappers )
+ slp? ( net-libs/openslp )
+ kerberos? ( virtual/krb5 )
+ >=sys-apps/coreutils-7.1
+ !app-text/yudit
+ dev-libs/libgcrypt
+ appletalk? (
+ cups? ( net-print/cups )
+ )
+ acl? (
+ sys-apps/attr
+ sys-apps/acl
+ )
+ ldap? (
+ net-nds/openldap
+ )
+ "
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/README.AppleTalk )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+
+ if use appletalk; then
+ myconf+=" --enable-ddp --enable-timelord $(use_enable cups)"
+ else
+ myconf+=" --disable-ddp --disable-timelord --disable-cups"
+ fi
+
+ if use acl; then
+ myconf+=" --with-acls $(use_with ldap)"
+ else
+ myconf+=" --without-acls --without-ldap"
+ fi
+
+ append-flags -fno-strict-aliasing
+
+ # Ignore --enable-gentoo, we install the init.d by hand and we avoid having
+ # to sed the Makefiles to not do rc-update.
+ econf \
+ $(use_enable avahi zeroconf) \
+ $(use_enable debug) \
+ $(use_enable kerberos krbV-uam) \
+ $(use_enable quota) \
+ $(use_enable slp srvloc) \
+ $(use_enable static-libs static) \
+ $(use_enable tcpd tcp-wrappers) \
+ $(use_with cracklib) \
+ $(use_with pam) \
+ $(use_with ssl ssl-dir) \
+ --disable-krb4-uam \
+ --disable-afs \
+ --enable-fhs \
+ --with-bdb=/usr \
+ ${myconf}
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/afpd.init afpd
+ newinitd "${FILESDIR}"/cnid_metad.init cnid_metad
+
+ if use appletalk; then
+ newinitd "${FILESDIR}"/atalkd.init atalkd
+ newinitd "${FILESDIR}"/atalk_service.init timelord
+ newinitd "${FILESDIR}"/atalk_service.init papd
+ fi
+
+ use avahi || sed -i -e '/need avahi-daemon/d' "${D}"/etc/init.d/afpd
+ use slp || sed -i -e '/need slpd/d' "${D}"/etc/init.d/afpd
+
+ use ldap || rm "${D}"/etc/netatalk/afp_ldap.conf
+
+ rm "${D}"/etc/netatalk/netatalk.conf
+
+ # The pamd file isn't what we need, use pamd_mimic_system
+ rm -rf "${D}/etc/pam.d"
+ pamd_mimic_system netatalk auth account password session
+
+ # Move /usr/include/netatalk to /usr/include/netatalk2 to avoid collisions
+ # with /usr/include/netatalk/at.h provided by glibc (strange, uh?)
+ # Packages that wants to link to netatalk should then probably change the
+ # includepath then, but right now, nothing uses netatalk.
+ # On a side note, it also solves collisions with freebsd-lib and other libcs
+ mv "${D}"/usr/include/netatalk{,2} || die
+ sed -i \
+ -e 's/include <netatalk/include <netatalk2/g' \
+ "${D}"usr/include/{netatalk2,atalk}/* || die
+
+ # These are not used at all, as the uams are loaded with their .so
+ # extension.
+ rm "${D}"/usr/$(get_libdir)/netatalk/*.la
+
+ use static-libs || rm "${D}"/usr/$(get_libdir)/*.la
+}
+
+pkg_postinst() {
+ elog "Starting from version 2.2.1-r1 the netatalk init script has been split"
+ elog "into different services depending on what you need to start."
+ elog "This was done to make sure that all services are started and reported"
+ elog "properly."
+ elog ""
+ elog "The new services are:"
+ elog " cnid_metad"
+ elog " afpd"
+ if use appletalk; then
+ elog " atalkd"
+ elog " timelord"
+ elog " papd"
+ fi
+ elog ""
+ elog "Dependencies should be resolved automatically depending on settings"
+ elog "but please report issues with this on https://bugs.gentoo.org/ if"
+ elog "you find any."
+ elog ""
+ elog "The old configuration file /etc/netatalk/netatalk.conf is no longer"
+ elog "installed, and will be ignored. The new configuration is supposed"
+ elog "to be done through individual /etc/conf.d files, for everything that"
+ elog "cannot be set already through their respective configuration files."
+}
projects / gentoo.git / commitdiff