net-fs/netatalk: Version Bump, #436908

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

4 files changed, 292 insertions, 3 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index 6aa01fe34549..d0a47b629529 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.88 2012/09/12 06:33:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.89 2012/10/06 12:41:07 jlec Exp $
+
+*netatalk-3.0.1 (06 Oct 2012)
+
+  06 Oct 2012; Justin Lecher <jlec@gentoo.org> netatalk-3.0.ebuild,
+  +netatalk-3.0.1.ebuild, +files/netatalk-3.0.1-gentoo.patch:
+  Version Bump, #436908
 
   12 Sep 2012; Justin Lecher <jlec@gentoo.org> netatalk-3.0.ebuild:
   Add missing DEP on dev-libs/libevent, #434758
diff --git a/net-fs/netatalk/files/netatalk-3.0.1-gentoo.patch b/net-fs/netatalk/files/netatalk-3.0.1-gentoo.patch
new file mode 100644
index 000000000000..6a416786888a
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-3.0.1-gentoo.patch
@@ -0,0 +1,140 @@
+ Makefile.am              |  6 ------
+ bin/uniconv/Makefile.am  |  2 +-
+ etc/afpd/afp_avahi.c     |  2 +-
+ etc/netatalk/Makefile.am |  5 +++--
+ etc/uams/Makefile.am     | 20 ++++++++++----------
+ libatalk/dsi/Makefile.am |  3 ++-
+ libatalk/vfs/Makefile.am |  1 +
+ macros/netatalk.m4       |  1 -
+ 8 files changed, 18 insertions(+), 22 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0100598..a7b6c22 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,9 +11,3 @@ EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION
+ ACLOCAL_AMFLAGS = -I macros
+ AUTOMAKE_OPTIONS = foreign
+ 
+-if RUN_LDCONFIG
+-install-exec-hook:
+-	@printf "Running ldconfig to ensure libraries installed in system library directories are added to the dynamic linker cache ... "
+-	@-@NETA_LDCONFIG@
+-	@printf "done\n"
+-endif
+diff --git a/bin/uniconv/Makefile.am b/bin/uniconv/Makefile.am
+index 202e722..2be527e 100644
+--- a/bin/uniconv/Makefile.am
++++ b/bin/uniconv/Makefile.am
+@@ -1,6 +1,6 @@
+ # Makefile.am for bin/aecho/
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+ 
+ bin_PROGRAMS = uniconv
+ 
+diff --git a/etc/afpd/afp_avahi.c b/etc/afpd/afp_avahi.c
+index 5218d51..b68c266 100644
+--- a/etc/afpd/afp_avahi.c
++++ b/etc/afpd/afp_avahi.c
+@@ -174,8 +174,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/netatalk/Makefile.am b/etc/netatalk/Makefile.am
+index 06e5a8c..2d4ef20 100644
+--- a/etc/netatalk/Makefile.am
++++ b/etc/netatalk/Makefile.am
+@@ -14,6 +14,7 @@ netatalk_LDADD = \
+ 	$(top_builddir)/libatalk/libatalk.la
+ 
+ netatalk_LDFLAGS =
++netatalk_CPPFLAGS =
+ 
+ if USE_BUILTIN_LIBEVENT
+ netatalk_CFLAGS += \
+@@ -23,6 +24,6 @@ netatalk_CFLAGS += \
+ netatalk_LDADD += \
+ 	$(top_builddir)/libevent/libevent.la
+ else
+-netatalk_CFLAGS += @LIBEVENT_CFLAGS@
+-netatalk_LDFLAGS += @LIBEVENT_LDFLAGS@ -levent
++netatalk_CPPFLAGS += @LIBEVENT_CFLAGS@
++netatalk_LDADD += @LIBEVENT_LDFLAGS@ -levent
+ endif
+diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
+index 3a02b83..70a2f76 100644
+--- a/etc/uams/Makefile.am
++++ b/etc/uams/Makefile.am
+@@ -95,16 +95,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/dsi/Makefile.am b/libatalk/dsi/Makefile.am
+index 34fa76e..dbde336 100644
+--- a/libatalk/dsi/Makefile.am
++++ b/libatalk/dsi/Makefile.am
+@@ -1,9 +1,10 @@
+ # Makefile.am for libatalk/dsi/
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys
+ 
+ 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)
+diff --git a/libatalk/vfs/Makefile.am b/libatalk/vfs/Makefile.am
+index aa62aeb..8ac2045 100644
+--- a/libatalk/vfs/Makefile.am
++++ b/libatalk/vfs/Makefile.am
+@@ -6,4 +6,5 @@ libvfs_la_SOURCES = vfs.c unix.c ea_ad.c ea_sys.c extattr.c
+ 
+ if HAVE_ACLS
+ libvfs_la_SOURCES += acl.c
++libvfs_la_LIBADD = $(ACL_LIBS)
+ endif
+diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
+index 7040eb0..5b63285 100644
+--- a/macros/netatalk.m4
++++ b/macros/netatalk.m4
+@@ -613,7 +613,6 @@ save_CFLAGS="$CFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ save_LIBS="$LIBS"
+ CFLAGS=""
+-LDFLAGS=""
+ LIBS=""
+ LDAP_CFLAGS=""
+ LDAP_LDFLAGS=""
diff --git a/net-fs/netatalk/netatalk-3.0.1.ebuild b/net-fs/netatalk/netatalk-3.0.1.ebuild
new file mode 100644
index 000000000000..542a2bf0a190
--- /dev/null
+++ b/net-fs/netatalk/netatalk-3.0.1.ebuild
@@ -0,0 +1,143 @@
+# 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-3.0.1.ebuild,v 1.1 2012/10/06 12:41:07 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils flag-o-matic multilib pam
+
+DESCRIPTION="Open Source AFP server"
+HOMEPAGE="http://netatalk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl avahi cracklib debug pgp kerberos ldap pam quota samba +shadow ssl static-libs tcpd"
+
+RDEPEND="
+	!app-text/yudit
+	dev-libs/libevent
+	dev-libs/libgcrypt
+	sys-apps/coreutils
+	>=sys-libs/db-4.2.52
+	acl? (
+		sys-apps/attr
+		sys-apps/acl
+	)
+	avahi? ( net-dns/avahi[dbus] )
+	cracklib? ( sys-libs/cracklib )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	"
+DEPEND="${RDEPEND}"
+PDEPEND="sys-apps/openrc"
+
+RESTRICT="test"
+
+REQUIRED_USE="ldap? ( acl )"
+
+DOCS=( CONTRIBUTORS NEWS VERSION AUTHORS doc/DEVELOPER )
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	local myeconfargs=()
+
+	append-flags -fno-strict-aliasing
+
+	if use acl; then
+		myconf+=( --with-acls $(use_with ldap) )
+	else
+		myconf+=( --without-acls --without-ldap )
+	fi
+
+	# Ignore --with-init-style=gentoo, we install the init.d by hand and we avoid having
+	# to sed the Makefiles to not do rc-update.
+	# TODO:
+	# systemd : --with-init-style=systemd
+	myeconfargs+=(
+		--disable-silent-rules
+		$(use_enable avahi zeroconf)
+		$(use_enable debug)
+		$(use_enable debug debugging)
+		$(use_enable pgp pgp-uam)
+		$(use_enable kerberos)
+		$(use_enable kerberos krbV-uam)
+		$(use_enable quota)
+		$(use_enable tcpd tcp-wrappers)
+		$(use_with cracklib)
+		$(use_with pam)
+		$(use_with samba smbsharemodes)
+		$(use_with shadow)
+		$(use_with ssl ssl-dir)
+		--enable-overwrite
+		--disable-krb4-uam
+		--disable-afs
+		--with-libevent-header=/usr/include
+		--with-libevent-lib=/usr/$(get_libdir)
+		--with-bdb=/usr
+		--with-uams-path=/usr/$(get_libdir)/${PN}
+		--disable-silent-rules
+		--with-init-style=gentoo
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use avahi; then
+		sed -i -e '/avahi-daemon/s:use:need:g' "${D}"/etc/init.d/${PN} || die
+	else
+		sed -i -e '/avahi-daemon/d' "${D}"/etc/init.d/${PN} || die
+	fi
+
+	# 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
+}
+
+pkg_postinst() {
+	local fle
+	if [[ ${REPLACING_VERSIONS} < 3 ]]; then
+		for fle in afp_signature.conf afp_voluuid.conf; do
+			if [[ -f "${ROOT}"etc/netatalk/${fle} ]]; then
+				if [[ ! -f "${ROOT}"var/lib/netatalk/${fle} ]]; then
+					mv \
+						"${ROOT}"etc/netatalk/${fle} \
+						"${ROOT}"var/lib/netatalk/
+				fi
+			fi
+		done
+
+		echo ""
+		elog "Starting from version 3.0 only uses a single init script again"
+		elog "Please update your runlevels accordingly"
+		echo ""
+		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."
+		echo ""
+		elog "Following config files are obsolete now:"
+		elog "afpd.conf, netatalk.conf, AppleVolumes.default and afp_ldap.conf"
+		elog "in favour of"
+		elog "/etc/afp.conf"
+		echo ""
+		elog "Please convert your existing configs before you restart your daemon"
+		echo ""
+		elog "The new AppleDouble default backend is appledouble = ea"
+		elog "Existing entries will be updated on access, but can do an offline"
+		elog "conversion with"
+		elog "dbd -ruve /path/to/Volume"
+		echo ""
+		elog "For general notes on the upgrade, please visit"
+		elog "http://netatalk.sourceforge.net/3.0/htmldocs/upgrade.html"
+		echo ""
+	fi
+}
diff --git a/net-fs/netatalk/netatalk-3.0.ebuild b/net-fs/netatalk/netatalk-3.0.ebuild
index 5b478142e579..e00e6c0f6d31 100644
--- a/net-fs/netatalk/netatalk-3.0.ebuild
+++ b/net-fs/netatalk/netatalk-3.0.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.ebuild,v 1.2 2012/09/12 06:33:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-3.0.ebuild,v 1.3 2012/10/06 12:41:07 jlec Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils flag-o-matic multilib pam
 
-DESCRIPTION="Open Source AFP server and other AppleTalk-related utilities"
+DESCRIPTION="Open Source AFP server"
 HOMEPAGE="http://netatalk.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"