Re: Bug #39678; apply patch to correct race condition for paralell build.

4 files changed, 155 insertions, 8 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 8afdc44ec0eb..ff274809fea2 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.50 2004/01/31 14:26:46 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.51 2004/02/12 19:14:14 blkdeath Exp $
+
+*proftpd-1.2.9-r1 (12 Feb 2004)
+
+  12 Feb 2004; Stewart Honsberger <blkdeath@gentoo.org>
+  proftpd-1.2.9-r1.ebuild, files/proftpd-1.2.9-makefile.patch:
+  Re: Bug #39678; apply patch to correct race condition for paralell build.
 
   31 Jan 2004; Christian Birchinger <joker@gentoo.org> proftpd-1.2.9.ebuild:
   Added sparc stable keyword
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index e5ca95745e5f..8764b5c71818 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,24 +1,26 @@
-MD5 37ffba6a015237c1a10e9284278c32aa ChangeLog 7871
+MD5 20e2a817d925b43799a0c0bb4104f9db ChangeLog 8103
+MD5 63bd6e87942a25d48bd5365edd8246c0 metadata.xml 268
 MD5 af980038dfeb68c33f10ce7f7a8664bd proftpd-1.2.5-r1.ebuild 2484
 MD5 8403cc3447fabc18a92eeb5dc891ed26 proftpd-1.2.7.ebuild 3668
 MD5 9fc268673f01fb44ccbeb1ba9b03fe10 proftpd-1.2.8.ebuild 2735
 MD5 f29eb6e755937b7bd540ae7a64309a49 proftpd-1.2.9_rc1.ebuild 2908
-MD5 3bc8ce3f5baacf0756ccc0a5d7d08ce9 proftpd-1.2.9_rc2.ebuild 3036
 MD5 4f9ff456a1e0bc583b44fff8c2392e40 proftpd-1.2.9_rc2-r1.ebuild 3160
-MD5 63bd6e87942a25d48bd5365edd8246c0 metadata.xml 268
+MD5 3bc8ce3f5baacf0756ccc0a5d7d08ce9 proftpd-1.2.9_rc2.ebuild 3036
 MD5 8b61bc1b4a71805531b36c33915858dd proftpd-1.2.9_rc3.ebuild 3123
 MD5 9e47bcea764c8c0102b1f209f7ea8cb9 proftpd-1.2.9.ebuild 3018
+MD5 ceae0e2b800c4e2cb2bef5184bc928c9 proftpd-1.2.9-r1.ebuild 3117
 MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66
 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
 MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
 MD5 2cb8d1fb115bf19c162c4b6510f98bca files/digest-proftpd-1.2.9_rc1 69
 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
-MD5 7ce232be10244976221ed99e6a460805 files/proftpd.rc6 750
-MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
 MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2 70
+MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2-r1 70
-MD5 2cb235867cee126fe540c911c3b5ad5b files/proftpd-1.2.9_rc2-dirtree-r118.patch 474
 MD5 3db5027a53a7d9d889c5a75df90d77b0 files/digest-proftpd-1.2.9_rc3 69
-MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
+MD5 2cb235867cee126fe540c911c3b5ad5b files/proftpd-1.2.9_rc2-dirtree-r118.patch 474
 MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9 66
+MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
+MD5 7ce232be10244976221ed99e6a460805 files/proftpd.rc6 750
+MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
diff --git a/net-ftp/proftpd/files/proftpd-1.2.9-makefile.patch b/net-ftp/proftpd/files/proftpd-1.2.9-makefile.patch
new file mode 100644
index 000000000000..6fba7dbc4320
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.2.9-makefile.patch
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2004-01-28 19:11:27.400918368 +0000
++++ Makefile.in	2004-01-28 19:11:33.818942680 +0000
+@@ -58,10 +58,10 @@
+ ftpshut$(EXEEXT): utils
+ 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS)
+ 
+-ftptop$(EXEEXT): utils
++ftptop$(EXEEXT): utils lib
+ 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPTOP_OBJS) $(CURSES_LIBS) -lsupp
+ 
+-ftpwho$(EXEEXT): utils
++ftpwho$(EXEEXT): utils lib
+ 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPWHO_OBJS) -lsupp
+ 
+ 
diff --git a/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..5e19028346f9
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9-r1.ebuild,v 1.1 2004/02/12 19:14:14 blkdeath Exp $
+
+inherit flag-o-matic
+
+IUSE="ldap pam postgres mysql ssl tcpd ipv6"
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An advanced and very configurable FTP server"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.proftpd.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips"
+
+DEPEND="pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6f )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/proftpd-1.2.9-makefile.patch
+}
+
+src_compile() {
+	local modules myconf
+
+	modules="mod_ratio:mod_readme"
+	use pam && modules="${modules}:mod_auth_pam"
+	use tcpd && modules="${modules}:mod_wrap"
+
+	if use ldap; then
+		einfo ldap
+		modules="${modules}:mod_ldap"
+		append-ldflags "-lresolv"
+	fi
+
+	if use ssl; then
+		einfo ssl
+		# enable mod_tls
+		modules="${modules}:mod_tls"
+	fi
+
+	if use mysql; then
+		modules="${modules}:mod_sql:mod_sql_mysql"
+		myconf="--with-includes=/usr/include/mysql"
+	elif use postgres; then
+		modules="${modules}:mod_sql:mod_sql_postgres"
+		myconf="--with-includes=/usr/include/postgresql"
+	fi
+
+	# New modules for 1.2.9
+	# Not sure how these should be enabled yet as no use variables
+	# apply currently.  Uncomment if you want to use them though.
+	# -raker 06/16/2003
+	#
+	# modules="${modules}:mod_ifsession"
+	# modules="${modules}:mod_radius"
+	# modules="${modules}:mod_rewrite"
+
+	# bug #30359
+	has_version sys-devel/hardened-gcc && echo > lib/libcap/cap_sys.c
+	is-flag -fPIC && echo > lib/libcap/cap_sys.c
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--disable-sendfile \
+		--enable-autoshadow \
+		--with-modules=${modules} \
+		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	# Note rundir needs to be specified to avoid sandbox violation
+	# on initial install. See Make.rules
+	make DESTDIR=${D} install || die
+
+	keepdir /home/ftp
+	keepdir /var/run/proftpd
+
+	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/{license.txt,GetConf}
+	dohtml doc/*.html
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
+
+	insinto /etc/proftpd
+	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
+
+	if use pam; then
+		insinto /etc/pam.d
+		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
+	fi
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/proftpd.xinetd proftpd
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
+}
+
+pkg_postinst() {
+	groupadd proftpd &>/dev/null
+	id proftpd &>/dev/null || \
+		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
+	einfo
+	einfo 'You can find the config files in /etc/proftpd'
+	einfo
+}