Moved here patch from Gentoo/ALT overlay to get the right bindnow flags for the current used linker.

(Portage version: 2.0.53_rc6)

5 files changed, 111 insertions, 11 deletions

diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog
index c90a8d4c3347..1ab03c096bcb 100644
--- a/net-fs/netatalk/ChangeLog
+++ b/net-fs/netatalk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/netatalk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.30 2005/10/25 05:40:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.31 2005/10/25 05:55:56 flameeyes Exp $
+
+*netatalk-2.0.3-r1 (25 Oct 2005)
+
+  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netatalk-2.0.3-setXid.patch, +netatalk-2.0.3-r1.ebuild:
+  Moved here patch from Gentoo/ALT overlay to get the right bindnow flags for
+  the current used linker.
 
   25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Fix my name on the changelog.
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 2c5c57a10bc1..00cf314146c8 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 10e93665dd3f22ecd28044e38b7701cf ChangeLog 5014
 MD5 bd4410c61e921e87c00183817b6e29b9 files/atalknew-rc6 1703
 MD5 6dd0a76546b70cf567b7926c0881c9b5 files/digest-netatalk-1.6.4-r1 67
 MD5 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3 68
+MD5 9ee0857567bda5d9ffabf5d04095e90b files/digest-netatalk-2.0.3-r1 68
 MD5 9eeca2a8610190fcd373ff619d56a298 files/netatalk-1.6.4-tempfile.patch 557
 MD5 43c6b606d88eab1f3467634846a77491 metadata.xml 347
 MD5 725e95b5d90ddc8ad32795170e447286 netatalk-1.6.4-r1.ebuild 1277
+MD5 ee82d851e4691fc55b3c36199451178f netatalk-2.0.3-r1.ebuild 2488
 MD5 196c7cfd516abb078bcad7b9d29ab5fa netatalk-2.0.3.ebuild 2434
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDXcVmj5H05b2HAEkRAvsUAJ9tfBIHbobo8XiBAyxU8yhZJ+HiowCgjk7X
-SXQO5VHN/gIYo8VJnesSJrQ=
-=pEpN
------END PGP SIGNATURE-----
diff --git a/net-fs/netatalk/files/digest-netatalk-2.0.3-r1 b/net-fs/netatalk/files/digest-netatalk-2.0.3-r1
new file mode 100644
index 000000000000..1f207b35e1d9
--- /dev/null
+++ b/net-fs/netatalk/files/digest-netatalk-2.0.3-r1
@@ -0,0 +1 @@
+MD5 28092763085783805dc2f00aa2127a3e netatalk-2.0.3.tar.bz2 1471804
diff --git a/net-fs/netatalk/files/netatalk-2.0.3-setXid.patch b/net-fs/netatalk/files/netatalk-2.0.3-setXid.patch
new file mode 100644
index 000000000000..70170c134d2c
--- /dev/null
+++ b/net-fs/netatalk/files/netatalk-2.0.3-setXid.patch
@@ -0,0 +1,14 @@
+Index: netatalk-2.0.3/bin/afppasswd/Makefile.am
+===================================================================
+--- netatalk-2.0.3.orig/bin/afppasswd/Makefile.am
++++ netatalk-2.0.3/bin/afppasswd/Makefile.am
+@@ -12,7 +12,8 @@ afppasswd_SOURCES = afppasswd.c
+ afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
+ 
+ CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \
+-    -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
++    -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
++    @BINDNOW_FLAGS@
+ 
+ install-exec-hook:
+ if USE_DHX
diff --git a/net-fs/netatalk/netatalk-2.0.3-r1.ebuild b/net-fs/netatalk/netatalk-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..0238edefc2cc
--- /dev/null
+++ b/net-fs/netatalk/netatalk-2.0.3-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r1.ebuild,v 1.1 2005/10/25 05:55:56 flameeyes Exp $
+
+inherit eutils pam flag-o-matic autotools
+IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib"
+
+DESCRIPTION="Kernel level implementation of the AppleTalk Protocol Suite"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://netatalk.sourceforge.net"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+RDEPEND=">=sys-libs/db-4.2.52
+	cracklib? ( sys-libs/cracklib )
+	pam? ( virtual/pam )
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	slp? ( net-libs/openslp )
+	cups? ( net-print/cups )
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	sys-devel/automake"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# until someone that understands their config script build
+	# system gets a patch pushed upstream to make
+	# --enable-srvloc passed to configure also add slpd to the
+	# use line on the initscript, we'll need to do it this way
+	if use slp; then
+		myconf="${myconf} --enable-srvloc"
+		sed -i -e 's/^\([[:space:]]*use[[:space:][:alnum:]]*\)$/\1 slpd/' \
+			${S}/distrib/initscripts/rc.atalk.gentoo.tmpl
+	fi
+
+	epatch ${FILESDIR}/${P}-setXid.patch
+	AT_M4DIR="macros" eautoreconf
+}
+
+src_compile() {
+	# 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_with pam) \
+		$(use_enable cups) \
+		$(use_enable ssl) \
+		$(use_enable debug) \
+		$(use_enable tcpd tcp-wrappers) \
+		$(use_enable kerberos krbV-uam) \
+		$(use_enable krb4 krb4-uam) \
+		$(use_enable slp srvloc) \
+		$(use_with cracklib) \
+		$(use_with elibc_glibc shadow) \
+		--disable-afs \
+		--enable-fhs \
+		--with-bdb=/usr \
+		${myconf} || die "netatalk configure failed"
+
+	sed -i -e "s:@BINDNOW_FLAGS@:$(bindnow_flags):" bin/afppasswd/Makefile
+
+	emake || die "netatalk emake failed"
+
+	# Create the init script manually (it's more messy to --enable-gentoo)
+	cd ${S}/distrib/initscripts
+	emake rc.atalk.gentoo
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "netatalk make install failed"
+
+	dodoc CONTRIBUTORS NEWS README TODO VERSION
+
+	newinitd ${S}/distrib/initscripts/rc.atalk.gentoo atalk
+
+	# 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
+}