diff options
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.1-bug218850.patch | 12 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.1.ebuild | 6 |
3 files changed, 22 insertions, 2 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index bf90e881251b..053533c4c6ba 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.169 2008/04/21 09:48:27 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.170 2008/04/24 18:04:56 chtekk Exp $ + + 24 Apr 2008; Luca Longinotti <chtekk@gentoo.org> + +files/proftpd-1.3.1-bug218850.patch, proftpd-1.3.1.ebuild: + Fix bug #218850. 21 Apr 2008; Luca Longinotti <chtekk@gentoo.org> metadata.xml: Metadata update. diff --git a/net-ftp/proftpd/files/proftpd-1.3.1-bug218850.patch b/net-ftp/proftpd/files/proftpd-1.3.1-bug218850.patch new file mode 100644 index 000000000000..3e2adf34ea5c --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.1-bug218850.patch @@ -0,0 +1,12 @@ +--- lib/libcap/libcap.h 2008-04-24 19:46:29.475883739 +0200 ++++ lib/libcap/libcap.h 2008-04-24 19:48:31.116088563 +0200 +@@ -52,7 +52,8 @@ + */ + + #if !defined(_LINUX_CAPABILITY_VERSION) || \ +- (_LINUX_CAPABILITY_VERSION != 0x19980330) ++ ((_LINUX_CAPABILITY_VERSION != 0x19980330) && \ ++ (_LINUX_CAPABILITY_VERSION != 0x20071026)) + + # error "Kernel <linux/capability.h> does not match library" + # error "file "libcap.h" --> fix and recompile libcap" diff --git a/net-ftp/proftpd/proftpd-1.3.1.ebuild b/net-ftp/proftpd/proftpd-1.3.1.ebuild index 9de5a79d7996..b8faf7d85d01 100644 --- a/net-ftp/proftpd/proftpd-1.3.1.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.1.ebuild @@ -1,6 +1,6 @@ # 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.2 2008/04/17 09:32:05 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.1.ebuild,v 1.3 2008/04/24 18:04:56 chtekk Exp $ inherit eutils flag-o-matic toolchain-funcs autotools @@ -93,8 +93,12 @@ src_unpack() { cp -f mod_vroot/mod_vroot.html doc/ fi + # Fix bug #218850 + epatch "${FILESDIR}/${P}-bug218850.patch" + # Fix bug #208840 epatch "${FILESDIR}/${P}-bug208840.patch" + eautoreconf } |