net-fs/netatalk: Version Bump

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 258 insertions, 13 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index e650ee45be3e..e2b0391a8362 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.81 2012/04/24 12:43:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.82 2012/05/02 17:13:24 jlec Exp $
+
+*netatalk-2.2.2 (02 May 2012)
+
+  02 May 2012; Justin Lecher <jlec@gentoo.org> +netatalk-2.2.2.ebuild,
+  +files/netatalk-2.2.2-gentoo.patch, metadata.xml:
+  Version Bump
 
   24 Apr 2012; Agostino Sarubbo <ago@gentoo.org> netatalk-2.2.1-r3.ebuild:
   Stable for amd64, wrt bug #411291
diff --git a/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch b/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch
new file mode 100644
index 000000000000..6939c127d6c6
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.2.2-gentoo.patch
@@ -0,0 +1,86 @@
+ etc/afpd/afp_avahi.c     |    2 +-
+ etc/uams/Makefile.am     |   20 ++++++++++----------
+ libatalk/Makefile.am     |    2 --
+ libatalk/dsi/Makefile.am |    1 +
+ libatalk/vfs/Makefile.am |    1 +
+ 5 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
+index 351e001..6ed695f 100644
+--- a/etc/afpd/afp_avahi.c
++++ b/etc/afpd/afp_avahi.c
+@@ -177,8 +177,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 */
+diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
+index dbe304a..8570a46 100644
+--- a/etc/uams/Makefile.am
++++ b/etc/uams/Makefile.am
+@@ -97,16 +97,16 @@ uams_dhx_pam_la_CFLAGS     = @SSL_CFLAGS@ @PAM_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
+diff --git a/libatalk/Makefile.am b/libatalk/Makefile.am
+index a241d94..513d5f6 100644
+--- a/libatalk/Makefile.am
++++ b/libatalk/Makefile.am
+@@ -29,8 +29,6 @@ libatalk_la_DEPENDENCIES = \
+ 	unicode/libunicode.la \
+ 	vfs/libvfs.la
+ 
+-libatalk_la_LDFLAGS = -static
+-
+ if USE_APPLETALK
+ SUBDIRS +=  asp atp nbp netddp
+ libatalk_la_LIBADD += \
+diff --git a/libatalk/dsi/Makefile.am b/libatalk/dsi/Makefile.am
+index d64cbed..5a07c94 100644
+--- a/libatalk/dsi/Makefile.am
++++ b/libatalk/dsi/Makefile.am
+@@ -7,5 +7,6 @@ LIBS = @LIBS@
+ noinst_LTLIBRARIES = libdsi.la
+ 
+ libdsi_la_SOURCES = dsi_attn.c dsi_close.c dsi_cmdreply.c dsi_getsess.c dsi_getstat.c dsi_init.c dsi_opensess.c dsi_read.c dsi_tcp.c dsi_tickle.c dsi_write.c dsi_stream.c
++libdsi_la_LIBADD = $(WRAP_LIBS)
+ 
+ noinst_HEADERS = dsi_private.h
+diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
+index 9b8d143..1cc83ec 100644
+--- a/libatalk/vfs/Makefile.am
++++ b/libatalk/vfs/Makefile.am
+@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea.c sys_ea.c ea_sys.c
+ 
+ if HAVE_ACLS
+ libvfs_la_SOURCES += acl.c
++libvfs_la_LIBADD = $(ACL_LIBS)
+ endif
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index 1ed760601ea7..ad276f9f2b14 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/metadata.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-fs</herd>
-  <maintainer restrict="&gt;=net-fs/netatalk-2.2.1-r1">
-    <email>flameeyes@gentoo.org</email>
-    <description>
+	<herd>net-fs</herd>
+	<maintainer restrict="&gt;=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'>
+	</maintainer>
+	<use>
+		<flag name="appletalk">
       Build support for Apple's AppleTalk (DDP) protocol and its
       utilities (atalkd, timelord, papd).
     </flag>
-    <flag name='cups'>
+		<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'>
+		<flag name="quota">
       Add support for user quota on various filesystems.
     </flag>
-    <flag name='ssl'>
+		<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>
+		<flag name="xfs">Enable support for XFS Quota</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-fs/netatalk/netatalk-2.2.2.ebuild b/net-fs/netatalk/netatalk-2.2.2.ebuild
new file mode 100644
index 000000000000..fef148e46f42
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.2.2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.2.2.ebuild,v 1.1 2012/05/02 17:13:24 jlec 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}"
+RDEPEND="sys-apps/openrc"
+
+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.3 afpd
+	newinitd "${FILESDIR}"/cnid_metad.init.2 cnid_metad
+
+	if use appletalk; then
+		newinitd "${FILESDIR}"/atalkd.init atalkd
+		newinitd "${FILESDIR}"/atalk_service.init.2 timelord
+		newinitd "${FILESDIR}"/atalk_service.init.2 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."
+}