Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2008-02-26 17:39:47 +0000
committerRaúl Porcel <armin76@gentoo.org>2008-02-26 17:39:47 +0000
commitbc7c964be1034d17cfa413f8f9af666377d83630 (patch)
treed4a19b447823acc8da6b8301bb2de87819dd01fc /net-ftp
parentDuplicate license file (see bug #211534) (diff)
downloadhistorical-bc7c964be1034d17cfa413f8f9af666377d83630.tar.gz
historical-bc7c964be1034d17cfa413f8f9af666377d83630.tar.bz2
historical-bc7c964be1034d17cfa413f8f9af666377d83630.zip
Finally fix the libcap mess, bug #210478
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/vsftpd/ChangeLog8
-rw-r--r--net-ftp/vsftpd/Manifest9
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch (renamed from net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch)19
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch22
-rw-r--r--net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild5
-rw-r--r--net-ftp/vsftpd/vsftpd-2.0.6.ebuild5
6 files changed, 40 insertions, 28 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 48c2c03998a3..211a7d8b1efc 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-ftp/vsftpd
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.91 2008/02/21 17:28:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.92 2008/02/26 17:39:46 armin76 Exp $
+
+ 26 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+ -files/vsftpd-2.0.5-caps.patch, +files/vsftpd-2.0.6-caps.patch,
+ +files/vsftpd-2.0.6-libcap1.patch, vsftpd-2.0.5-r3.ebuild,
+ vsftpd-2.0.6.ebuild:
+ Finally fix the libcap mess, bug #210478
21 Feb 2008; Raúl Porcel <armin76@gentoo.org> vsftpd-2.0.5-r3.ebuild,
vsftpd-2.0.6.ebuild:
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 863086447fd3..fa6c3293d808 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,13 +1,14 @@
AUX vsftpd-2.0.3-gentoo.patch 7128 RMD160 99ef0aee94847405e6185cc95acbc72cba0df0e0 SHA1 4608e2656d83cc17fcef229a8f4b66c803b899d8 SHA256 8f3215d43948364d431312dd4109af09e9a83ebbafb7a1c388f2aefea4df9154
AUX vsftpd-2.0.5-anon-upload-umask.patch 818 RMD160 2c8a64226056df2b7451d434d0a5ec8302abfda3 SHA1 178e2d0a7f7862fefcd8dd6f36ae36583aee91ab SHA256 9875216bc2b1396e11a634e2a3ddf8ede6af0e0be797d9809b04d73e45aedc01
-AUX vsftpd-2.0.5-caps.patch 1028 RMD160 258d8ac081d587738e198d4778f23b282c684f02 SHA1 dc375c1873be5cf26e11765a339781c37aa00af7 SHA256 43c6bd0e2fde1b28e6733162d6570c3bf22109a1edd4597057a164e49e57bd90
+AUX vsftpd-2.0.6-caps.patch 649 RMD160 161b4610fdedcc3b1173055e534682fc5450b1d7 SHA1 cf63310bcee83e68079377c1da55e2b0d0111ebf SHA256 1435d0bc4e0d0e5f4a86ba2c42e77663be10d494cc9bc3af782c104a062e2778
+AUX vsftpd-2.0.6-libcap1.patch 582 RMD160 239fa2c23770e81a0b45f8df154a52b42af1f542 SHA1 d3fb0ae32f445092e9ab5af2209ac16af2ac0a5d SHA256 8c72a4f34ca8f4f3fb2da49d4cfde288c346d29bac3036f25b64c51f1543a51c
AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0
AUX vsftpd.init 1735 RMD160 1c1487ac281d341420ad741ee35e23807766a2fe SHA1 d5fe1307ed792e7580de9709e6c6ca6680fad430 SHA256 1651712a71c8f06cc5c12c903b5181ba60d01b1ee44833bb0c219ada770b034f
AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
DIST vsftpd-2.0.5.tar.gz 155985 RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 SHA1 9b6a079699aaeb01219665acf203c093f94faef0 SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
DIST vsftpd-2.0.6.tar.gz 158516 RMD160 33e9782e2c99986c2c8b60fc29880cedad7ba1fa SHA1 23fcc21996cd1404f6957d83bfb2e8004401a858 SHA256 8e35c3962477c5c539d9be489d0d3794840f5eda15690e492a6f1f256398ce30
-EBUILD vsftpd-2.0.5-r3.ebuild 3078 RMD160 93e1d5c532798d0181d2f95344b9de1cac1ec0c6 SHA1 d3fc431a484ad5bf5ca33e46cbfc9574de2b2eda SHA256 e8763354d240fc4d058b741a5174c29c7cdcfd7f1e5b8e68c0373f1568b81a6f
-EBUILD vsftpd-2.0.6.ebuild 3004 RMD160 f9be9c003857930b3e7d47378a37c760bbafe69c SHA1 6a273fee16c444efc6ca823c500ef6f04c6111f8 SHA256 a118940d76304ecc94d273aab82b7a39514cb1225cb7ae7fcb34b02c4879446b
-MISC ChangeLog 12769 RMD160 4cc3de1dd1c099b0f5ecfe0d021bc28989aab9fa SHA1 4be8caff899712e57261eb80e0150b15b2f9d641 SHA256 ab904f432f786c717b10b716ee6cfa74907f1ae9abaace7a91ae7ccaa52153cb
+EBUILD vsftpd-2.0.5-r3.ebuild 3155 RMD160 0d537c0c70a1df0ab9aaab585f5a2f9c72f6c27d SHA1 9eb9361f7677cde6dfc89d22d8ed0a2329126fe0 SHA256 6199559d9e03aa846f51cc33db1a65953b134432066c141086f93fd4ca6b68c0
+EBUILD vsftpd-2.0.6.ebuild 3074 RMD160 a986d5333798d376368686133a507ba9c407db66 SHA1 f493731561e72f31b0a8f96ccabfe0bf9dd1d2de SHA256 b8ad7f617e42c90b94028a250025014c84e09c249cbca74a94a21cbd7016a7de
+MISC ChangeLog 13012 RMD160 c95f79e9e77a1e12f56073088e1b73a421acb5e6 SHA1 11618a55d549a9eecc391af9e160453c4e31706b SHA256 e1fc13abc311bb00e1062359a115a2151be7b3786723f1f73b03d10bebdedc7b
MISC metadata.xml 358 RMD160 f8ffc0942c689c54a62b078a9a5bcd44702a5e68 SHA1 a252bf60d812dad06cbe00c324671cfba7b4e991 SHA256 cdc354a30f912a068432b3de197b3886ac05661869e7a0f67ac29f1da04b3b0d
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch
index 7eb76cc338d7..fed9f8a3809b 100644
--- a/net-ftp/vsftpd/files/vsftpd-2.0.5-caps.patch
+++ b/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch
@@ -14,22 +14,3 @@ diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
/* Gross HACK to avoid warnings - linux headers overlap glibc headers */
#undef __NFDBITS
#undef __FDMASK
-@@ -508,6 +505,18 @@
- }
-
- #ifndef VSF_SYSDEP_HAVE_LIBCAP
-+
-+static int
-+capset(struct __user_cap_header_struct *header,
-+ const struct __user_cap_data_struct *data);
-+
-+static int
-+capset(struct __user_cap_header_struct *header,
-+ const struct __user_cap_data_struct *data)
-+{
-+ return syscall(__NR_capset, header, data);
-+}
-+
- static int
- do_checkcap(void)
- {
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch
new file mode 100644
index 000000000000..467a7fb01220
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch
@@ -0,0 +1,22 @@
+diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
+--- vsftpd-2.0.5.orig/sysdeputil.c 2007-01-05 17:58:28.000000000 +0000
++++ vsftpd-2.0.5/sysdeputil.c 2007-01-05 17:55:30.000000000 +0000
+@@ -508,6 +505,18 @@
+ }
+
+ #ifndef VSF_SYSDEP_HAVE_LIBCAP
++
++static int
++capset(struct __user_cap_header_struct *header,
++ const struct __user_cap_data_struct *data);
++
++static int
++capset(struct __user_cap_header_struct *header,
++ const struct __user_cap_data_struct *data)
++{
++ return syscall(__NR_capset, header, data);
++}
++
+ static int
+ do_checkcap(void)
+ {
diff --git a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
index 53e23d1f6e4e..87c22c0c0591 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.5-r3.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/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.3 2008/02/21 17:28:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.4 2008/02/26 17:39:46 armin76 Exp $
inherit eutils toolchain-funcs
@@ -31,7 +31,8 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
# Fix building without the libcap
- ! use caps && epatch "${FILESDIR}/${P}-caps.patch"
+ epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
+ has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
# Fix anon umask uploads, #183213.
epatch "${FILESDIR}/${P}-anon-upload-umask.patch"
diff --git a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild b/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
index 198bf1ae0d21..da7a495b4427 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.6.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/vsftpd/vsftpd-2.0.6.ebuild,v 1.2 2008/02/21 17:28:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.6.ebuild,v 1.3 2008/02/26 17:39:46 armin76 Exp $
inherit eutils toolchain-funcs
@@ -31,7 +31,8 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
# Fix building without the libcap
- ! use caps && epatch "${FILESDIR}/${PN}-2.0.5-caps.patch"
+ epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
+ has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
# Configure vsftpd build defaults
use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h