Fix bug #208840. Remove mod_gzipfs, too old, breaks compile.

Package-Manager: portage-2.1.5_rc4

4 files changed, 50 insertions, 17 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 7915cb3c9b56..d71f60d63912 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.167 2008/04/17 07:57:56 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.168 2008/04/17 09:32:05 chtekk Exp $
+
+  17 Apr 2008; Luca Longinotti <chtekk@gentoo.org>
+  +files/proftpd-1.3.1-bug208840.patch, proftpd-1.3.1.ebuild:
+  Fix bug #208840. Remove mod_gzipfs, too old, breaks compile.
 
 *proftpd-1.3.1 (17 Apr 2008)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 52666056730e..98179c903bba 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,3 +1,4 @@
+AUX proftpd-1.3.1-bug208840.patch 1000 RMD160 f8cc6aadf4496c3d88a2968d18479f021d40abb8 SHA1 4de215408ec6be835133c41db3015f4dd24a7774 SHA256 b0c0d16ffaeb12e118c929e535e5d8297b8265894ee80b4c8ea32c8c0f0fbb5e
 AUX proftpd-1.3.1_rc2-bug164612.patch 779 RMD160 3bb73beff421ff27d153a6051299ada6bc532330 SHA1 cbf74c1c6a2ed794b1558e39cc85a41650bac21d SHA256 68b0bb47c3f46b931ff1887f299028803a15888641dfaad47865615bb0d6952c
 AUX proftpd-1.3.1_rc2-bug167003.patch 316 RMD160 7fcade6de378727081d0a14775b2e240f2a5aa31 SHA1 14439ace9c84932c460df3baace3fcbb10968c03 SHA256 55b87a0da8df2c4f257cbeb090d7a6fafda142a9db88c97728281358ac4792ff
 AUX proftpd-1.3.1_rc2-bug175082.patch 9671 RMD160 ab5144464b0b0c618ed51d1907694a56f2f72f5c SHA1 65ea3a861dc493439a8b2e2d3271dba57825bbac SHA256 018077db323cb370dd68fb30c284090316a041f53e02e07478cb1e07e22f30dc
@@ -13,11 +14,10 @@ DIST proftpd-1.3.1.tar.bz2 2243888 RMD160 ed47f7a7c446b01c3d00d2d25d89573c787da9
 DIST proftpd-1.3.1rc2.tar.bz2 1516464 RMD160 aa928315880cf1e9d1980850ce2bb07193d2ac46 SHA1 7db6435707983fe8e865064661cedb159ebc1cf6 SHA256 7494ea061ef28efc7afa63ffe0a80d598a55909d06dede9254e955c67e6440da
 DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c
 DIST proftpd-mod-deflate-0.3.tar.gz 7704 RMD160 dd51a966942642b2a5ae1cd1c3b3b6f47721637c SHA1 9d08a32da1c1e7e8b126e1fdbc172aa6889bccbc SHA256 dd6650e1cb69ee118319c19bbaa9dbe277b92675ab26e9c70a93e1e93f724adb
-DIST proftpd-mod-gzipfs-0.9rc4.tar.gz 8424 RMD160 1d0debe32557ce0a236b1b47a7ce0ae53dcd768c SHA1 c156fe85a2f6407c402ddf72c26d328db154a753 SHA256 41770fc92842986652872d8b49767d19c0b7eb190bf76a0eb6df5b61cafccaae
 DIST proftpd-mod-shaper-0.6.2.tar.gz 19002 RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 SHA1 930d6dc6b8785da48dc7102db5f1eb20546ccd75 SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e
 DIST proftpd-mod-shaper-0.6.3.tar.gz 19040 RMD160 9978fda37d0099c48d755e53132482506c948c05 SHA1 a5c9a1889c441b9290f2c571ad7fc06bebaf9326 SHA256 a6947836461872adca53dab2708b1e140fa6ce7a8b93ccbe2dafbc3ca63fde67
 DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a
-EBUILD proftpd-1.3.1.ebuild 7149 RMD160 cf9fbd8e12c1c62f327cfcdf8bf24961268a532c SHA1 b51ddb4081c53b7130234ffb6106f6deda7efe17 SHA256 2270403c5addba7fcff1b9712ad151babfeb3b28dbcefc8e3cdbab15d322182b
+EBUILD proftpd-1.3.1.ebuild 6887 RMD160 fc5f9a852511621607f7ec594846d53550edbc13 SHA1 0ebae0110cc9e3507a6498afbebda94f9e03e330 SHA256 deea88acc377fd1e40b010d68a5768309277d7c8a203d63e0a88c4aaadfaac2b
 EBUILD proftpd-1.3.1_rc2-r3.ebuild 6340 RMD160 f199bb8c2b239237e50020d6c06b9f55b48b1105 SHA1 7f387d202c3d7cfcf4abaaf3a0594b1fdf41e498 SHA256 3caf1efa45d4a4de7006bb369a5cff0607387dc256eecc79bcee30d843314e2f
-MISC ChangeLog 27601 RMD160 5a9d287700c72c7a2f306849e7b4617f79383665 SHA1 75103aea569874ab6ec620d24b3fad6417486002 SHA256 060df642a568eb3e1460e4eb17e648a5eed3b4cf3466872260ca0bf6e7b5d9ea
+MISC ChangeLog 27778 RMD160 15f760eede999e43fc380c810481b814a2a1c212 SHA1 d008aff0e44bd40619acf4c63458ddc853d20cd5 SHA256 4f6bfaab41840699144c732fd448920d6041ed818c125170af7579963a1e9916
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
diff --git a/net-ftp/proftpd/files/proftpd-1.3.1-bug208840.patch b/net-ftp/proftpd/files/proftpd-1.3.1-bug208840.patch
new file mode 100644
index 000000000000..90931f99f50f
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.1-bug208840.patch
@@ -0,0 +1,35 @@
+--- acconfig.h	2002/12/15 18:05:09	1.15
++++ acconfig.h	2007/10/15 17:27:25	1.16
+@@ -12,9 +12,6 @@
+ /* Define to `int' if <sys/types.h> doesn't define. */
+ #undef ino_t
+ 
+-/* Define to `mode_t' if <sys/types.h> doesn't define. */
+-#undef umode_t
+-
+ /* Define to `int' if <sys/socket.h> doesn't define. */
+ #undef socklen_t
+ 
+--- config.h.in	2007/10/13 03:05:27	1.118
++++ config.h.in	2007/10/15 17:27:25	1.119
+@@ -37,9 +37,6 @@
+ /* Define to `int' if <sys/socket.h> doesn't define. */
+ #undef socklen_t
+ 
+-/* Define to `mode_t' if <sys/types.h> doesn't define. */
+-#undef umode_t
+-
+ /* Define if you have AIX send_file() semantics. */
+ #undef HAVE_AIX_SENDFILE
+ 
+--- configure.in	2007/10/13 03:05:27	1.261
++++ configure.in	2007/10/15 17:27:25	1.262
+@@ -1119,7 +1119,7 @@
+ AC_CHECK_SIZEOF(time_t, 0)
+ 
+ dnl Check for generic typedefs
+-AC_CHECK_TYPE(umode_t, mode_t)
++AC_CHECK_TYPE(mode_t, mode_t)
+ AC_CHECK_TYPE(ino_t, ino_t)
+ AC_CHECK_TYPE(intptr_t, AC_DEFINE(HAVE_INTPTR_T),, [
+   #if HAVE_INTTYPES_H
diff --git a/net-ftp/proftpd/proftpd-1.3.1.ebuild b/net-ftp/proftpd/proftpd-1.3.1.ebuild
index 1450ac92021a..9de5a79d7996 100644
--- a/net-ftp/proftpd/proftpd-1.3.1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.1 2008/04/17 07:57:56 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.2 2008/04/17 09:32:05 chtekk Exp $
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs autotools
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="acl authfile ban case clamav deflate gzipfs hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
 
 CASE_VER="0.3"
 CLAMAV_VER="0.7"
 DEFLATE_VER="0.3"
-GZIPFS_VER="0.9rc4"
 SHAPER_VER="0.6.3"
 VROOT_VER="0.7.2"
 
@@ -21,7 +20,6 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
 		case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
 		clamav? ( http://www.thrallingpenguin.com/resources/mod_clamav-${CLAMAV_VER}.tar.gz )
 		deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-		gzipfs? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-gzipfs-${GZIPFS_VER}.tar.gz )
 		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
 		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
 
@@ -34,7 +32,6 @@ LICENSE="GPL-2"
 
 DEPEND="acl? ( sys-apps/acl sys-apps/attr )
 		clamav? ( app-antivirus/clamav )
-		gzipfs? ( sys-libs/zlib )
 		ldap? ( >=net-nds/openldap-1.2.11 )
 		mysql? ( virtual/mysql )
 		ncurses? ( sys-libs/ncurses )
@@ -84,12 +81,6 @@ src_unpack() {
 		cp -f mod_deflate/mod_deflate.html doc/
 	fi
 
-	if use gzipfs ; then
-		unpack ${PN}-mod-gzipfs-${GZIPFS_VER}.tar.gz
-		cp -f mod_gzipfs/mod_gzipfs.c contrib/
-		cp -f mod_gzipfs/mod_gzipfs.html doc/
-	fi
-
 	if use shaper ; then
 		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
 		cp -f mod_shaper/mod_shaper.c contrib/
@@ -101,6 +92,10 @@ src_unpack() {
 		cp -f mod_vroot/mod_vroot.c contrib/
 		cp -f mod_vroot/mod_vroot.html doc/
 	fi
+
+	# Fix bug #208840
+	epatch "${FILESDIR}/${P}-bug208840.patch"
+	eautoreconf
 }
 
 src_compile() {
@@ -113,7 +108,6 @@ src_compile() {
 	use case && modules="${modules}:mod_case"
 	use clamav && modules="${modules}:mod_clamav"
 	use deflate && modules="${modules}:mod_deflate"
-	use gzipfs && modules="${modules}:mod_gzipfs"
 	use pam && modules="${modules}:mod_auth_pam"
 	use radius && modules="${modules}:mod_radius"
 	use rewrite && modules="${modules}:mod_rewrite"