summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-09-04 15:03:10 +0000
committerPeter Volkov <pva@gentoo.org>2009-09-04 15:03:10 +0000
commitc1e10cf4249ea3ee36d4f7132ec631f21541f686 (patch)
tree2ab4a9f8d24fddb2a01257276ad55ac9bd099d8d
parentnet-misc/moblock: Fixes and Enhancements (diff)
downloadsunrise-c1e10cf4249ea3ee36d4f7132ec631f21541f686.tar.gz
sunrise-c1e10cf4249ea3ee36d4f7132ec631f21541f686.tar.bz2
sunrise-c1e10cf4249ea3ee36d4f7132ec631f21541f686.zip
net-ftp/vsftpd-devnet: Updated patch to make it appliable, bug #283110 reported by skobkin.
svn path=/sunrise/; revision=9163
-rw-r--r--net-ftp/vsftpd-devnet/ChangeLog4
-rw-r--r--net-ftp/vsftpd-devnet/Manifest4
-rw-r--r--net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch35
3 files changed, 18 insertions, 25 deletions
diff --git a/net-ftp/vsftpd-devnet/ChangeLog b/net-ftp/vsftpd-devnet/ChangeLog
index 7445d963a..183862494 100644
--- a/net-ftp/vsftpd-devnet/ChangeLog
+++ b/net-ftp/vsftpd-devnet/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Sep 2009; Peter Volkov <pva@gentoo.org>
+ files/vsftpd-devnet-2.1.0-dont-link-caps.patch:
+ Updated patch to make it appliable, bug #283110 reported by skobkin.
+
01 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
-vsftpd-devnet-2.1.0_p1.ebuild:
Drop old version
diff --git a/net-ftp/vsftpd-devnet/Manifest b/net-ftp/vsftpd-devnet/Manifest
index 153fe929f..fd0bc8657 100644
--- a/net-ftp/vsftpd-devnet/Manifest
+++ b/net-ftp/vsftpd-devnet/Manifest
@@ -1,4 +1,4 @@
-AUX vsftpd-devnet-2.1.0-dont-link-caps.patch 1087 RMD160 28fa4a1404132fddc01d7ff639966832a1d47848 SHA1 a36b97670b319b80b0bb25ec4e8aec2775b1c1ce SHA256 c104226c9cdf1c7aaa2beeafff1aca0f3433ffee6961f6d1ecbd76880640c300
+AUX vsftpd-devnet-2.1.0-dont-link-caps.patch 641 RMD160 8cd1fe670445c1b64d97a3ae16514f8c4e81474c SHA1 fc04d626d054a40f7f73a755103eb37c2a845d53 SHA256 31517459b4c7e2e242bc9a1f5731a030bf3b400801cade5b77c4bdd68cbf83b8
AUX vsftpd-devnet-2.1.0-gentoo.patch 3175 RMD160 479c816957c145aa280b6a53646de7328d4a714e SHA1 1b75f7cb4853601e0441c841f172563bfc5f1847 SHA256 c28fa633410f548ec710518699f38d8b510f2ff625179ceca5919e0a75d97036
AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0
AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f4925e941e21075be678387076e57246b3d SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2
@@ -6,5 +6,5 @@ AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf1
AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
DIST vsftpd-2.1.2-ext1.tgz 201357 RMD160 3fb5d5efe7738e22014648427a6f31bb8f2f72a3 SHA1 b604a70cba29fec2fa7f9ff5221c3d4f7b60cfb6 SHA256 7b358dcbf3fcabcfab24b7690b37036e07a02e675b2354c9610f048c184218c2
EBUILD vsftpd-devnet-2.1.2_p1.ebuild 2879 RMD160 4c24521633edacf7bb5332a08d5c1086c7cb981f SHA1 b82f31340af3b44134b3dde1e94ad384578e9732 SHA256 6854589078dcd32198be7e25e1394bd59d88631ed81fad828b80e6dd55c96578
-MISC ChangeLog 945 RMD160 bdefe6ce944ee62cade3199683522cba030c7df6 SHA1 cb997db5b9785ff256ade184d69b31cdecd7368d SHA256 5bc721a5aaf96d8263e123ae699b2594ee5782d30aa0656636052acdf267f8f2
+MISC ChangeLog 1112 RMD160 bd25c0bbf170a5ff0ae18db027175bf84b27adce SHA1 a3d57cc7bc0f2e4e3c7748c429489f0a8f01fa96 SHA256 ca860bb8886ca92fb06a4ff4165e9f49a687f2215e031e8e04a1f9c37d14e248
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch b/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch
index 2d046dbf3..4d907db6e 100644
--- a/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch
+++ b/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch
@@ -1,31 +1,20 @@
-diff -ur vsf_findlibs.sh.orig vsf_findlibs.sh
---- vsf_findlibs.sh.orig 2009-03-02 23:29:22.417771616 +0200
-+++ vsf_findlibs.sh 2009-03-02 23:29:36.893762969 +0200
-@@ -48,14 +48,6 @@
+--- vsf_findlibs.sh 2009-09-04 14:50:18 +0000
++++ vsf_findlibs.sh 2009-09-04 14:57:26 +0000
+@@ -48,16 +48,6 @@
# For older HP-UX...
- locate_library "/usr/$lib/libsec.sl" && echo "-lsec";
+ locate_library /usr/$lib/libsec.sl && echo "-lsec";
-# Look for libcap (capabilities)
--if locate_library "/$lib/libcap.so.1"; then
+-if locate_library /$lib/libcap.so.1; then
- echo "/$lib/libcap.so.1";
+-elif locate_library /$lib/libcap.so.2; then
+- echo "/$lib/libcap.so.2";
-else
-- locate_library "/usr/$lib/libcap.so" && echo "-lcap";
-- locate_library "/$lib/libcap.so" && echo "-lcap";
+- locate_library /usr/$lib/libcap.so && echo "-lcap";
+- locate_library /$lib/libcap.so && echo "-lcap";
-fi
-
# Solaris needs this for nanosleep()..
- locate_library "/$lib/libposix4.so" && echo "-lposix4";
- locate_library "/usr/$lib/libposix4.so" && echo "-lposix4";
-diff -ur sysdeputil.c.orig sysdeputil.c
---- sysdeputil.c.orig 2009-03-03 01:59:22.726752967 +0200
-+++ sysdeputil.c 2009-03-03 01:59:34.383753897 +0200
-@@ -160,9 +160,6 @@
- #include <crypt.h>
- #endif
-
--/* Prefer libcap based capabilities over raw syscall capabilities */
--#include <sys/capability.h>
--
- #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)
- #include <linux/capability.h>
- #include <sys/syscall.h>
+ locate_library /$lib/libposix4.so && echo "-lposix4";
+ locate_library /usr/$lib/libposix4.so && echo "-lposix4";
+