diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch')
-rw-r--r-- | net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch b/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch new file mode 100644 index 000000000000..2401f37c7e88 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch @@ -0,0 +1,57 @@ +https://bugs.gentoo.org/show_bug.cgi?id=450536 +Patch by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se> + +Probe the preferred version +--- vsftpd-3.0.2/sysdeputil.c.org 2013-01-05 18:32:13.241288839 +0100 ++++ vsftpd-3.0.2/sysdeputil.c 2013-01-05 19:41:53.038148078 +0100 +@@ -561,11 +561,17 @@ + } + + #ifndef VSF_SYSDEP_HAVE_LIBCAP ++static struct __user_cap_header_struct sys_cap_head; + static int + do_checkcap(void) + { ++ int retval; ++ ++ /* Store preferred version in sys_cap_head */ ++ vsf_sysutil_memclr(&sys_cap_head, sizeof(sys_cap_head)); + /* EFAULT (EINVAL if page 0 mapped) vs. ENOSYS */ +- int retval = capset(0, 0); ++ retval = capset(&sys_cap_head, 0); ++ + if (!vsf_sysutil_retval_is_error(retval) || + vsf_sysutil_get_error() != kVSFSysUtilErrNOSYS) + { +@@ -579,17 +585,13 @@ + { + /* n.b. yes I know I should be using libcap!! */ + int retval; +- struct __user_cap_header_struct cap_head; +- struct __user_cap_data_struct cap_data; ++ struct __user_cap_data_struct cap_data[2]; + __u32 cap_mask = 0; + if (!caps) + { + bug("asked to adopt no capabilities"); + } +- vsf_sysutil_memclr(&cap_head, sizeof(cap_head)); + vsf_sysutil_memclr(&cap_data, sizeof(cap_data)); +- cap_head.version = _LINUX_CAPABILITY_VERSION; +- cap_head.pid = 0; + if (caps & kCapabilityCAP_CHOWN) + { + cap_mask |= (1 << CAP_CHOWN); +@@ -598,9 +600,9 @@ + { + cap_mask |= (1 << CAP_NET_BIND_SERVICE); + } +- cap_data.effective = cap_data.permitted = cap_mask; +- cap_data.inheritable = 0; +- retval = capset(&cap_head, &cap_data); ++ cap_data[0].effective = cap_data[0].permitted = cap_mask; ++ cap_data[0].inheritable = 0; ++ retval = capset(&sys_cap_head, &cap_data[0]); + if (retval != 0) + { + die("capset"); |