[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/files/, sys-libs/libselinux/

2016-10-05 Thread Jason Zaman 
commit: 6f24947db6463e9a29b11a164ea538c7477de268
Author: Jason Zaman  gentoo  org>
AuthorDate: Wed Oct  5 16:28:56 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Wed Oct  5 16:43:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f24947d

sys-libs/libselinux: fix selinux_restorecon realpath logic

Package-Manager: portage-2.3.0

 ...nux-selinux_restorecon-fix-realpath-logic.patch | 76 ++
 ...2.6_rc1.ebuild => libselinux-2.6_rc1-r1.ebuild} |  1 +
 2 files changed, 77 insertions(+)

diff --git 
a/sys-libs/libselinux/files/libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch
 
b/sys-libs/libselinux/files/libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch
new file mode 100644
index ..3a0d7fb
--- /dev/null
+++ 
b/sys-libs/libselinux/files/libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch
@@ -0,0 +1,76 @@
+From aa0c824bb2eeb8960ba02133faade72c837ea951 Mon Sep 17 00:00:00 2001
+From: Stephen Smalley 
+Date: Wed, 5 Oct 2016 10:45:35 -0400
+Subject: [PATCH] libselinux: selinux_restorecon: fix realpath logic
+
+The realpath logic in selinux_restorecon() was taken from the
+Android libselinux fork.  However, bionic dirname() and basename()
+do not modify their argument and therefore are safe to call on a
+const string.  POSIX dirname() and basename() can modify their argument.
+There is a GNU basename() that does not modify its argument, but not
+for dirname().
+For portability, create copies of the original pathname for each call
+and keep them around until finished using the result.
+
+Fixes "restorecon -r goes up the tree?" bug reported by Jason Zaman.
+
+Reported-by: Jason Zaman 
+Signed-off-by: Stephen Smalley 
+---
+ libselinux/src/selinux_restorecon.c | 26 +-
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/libselinux/src/selinux_restorecon.c 
b/libselinux/src/selinux_restorecon.c
+index 0945138..e38d1d0 100644
+--- libselinux/src/selinux_restorecon.c
 libselinux/src/selinux_restorecon.c
+@@ -797,25 +797,41 @@ int selinux_restorecon(const char *pathname_orig,
+* realpath of containing dir, then appending last component name.
+*/
+   if (flags.userealpath) {
+-  pathbname = basename((char *)pathname_orig);
++  char *basename_cpy = strdup(pathname_orig);
++  if (!basename_cpy)
++  goto realpatherr;
++  pathbname = basename(basename_cpy);
+   if (!strcmp(pathbname, "/") || !strcmp(pathbname, ".") ||
+   !strcmp(pathbname, "..")) {
+   pathname = realpath(pathname_orig, NULL);
+-  if (!pathname)
++  if (!pathname) {
++  free(basename_cpy);
+   goto realpatherr;
++  }
+   } else {
+-  pathdname = dirname((char *)pathname_orig);
++  char *dirname_cpy = strdup(pathname_orig);
++  if (!dirname_cpy) {
++  free(basename_cpy);
++  goto realpatherr;
++  }
++  pathdname = dirname(dirname_cpy);
+   pathdnamer = realpath(pathdname, NULL);
+-  if (!pathdnamer)
++  free(dirname_cpy);
++  if (!pathdnamer) {
++  free(basename_cpy);
+   goto realpatherr;
++  }
+   if (!strcmp(pathdnamer, "/"))
+   error = asprintf(, "/%s", pathbname);
+   else
+   error = asprintf(, "%s/%s",
+   pathdnamer, pathbname);
+-  if (error < 0)
++  if (error < 0) {
++  free(basename_cpy);
+   goto oom;
++  }
+   }
++  free(basename_cpy);
+   } else {
+   pathname = strdup(pathname_orig);
+   if (!pathname)
+-- 
+2.7.3
+

diff --git a/sys-libs/libselinux/libselinux-2.6_rc1.ebuild 
b/sys-libs/libselinux/libselinux-2.6_rc1-r1.ebuild
similarity index 97%
rename from sys-libs/libselinux/libselinux-2.6_rc1.ebuild
rename to sys-libs/libselinux/libselinux-2.6_rc1-r1.ebuild
index 84092cb..fe8c78b 100644
--- a/sys-libs/libselinux/libselinux-2.6_rc1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6_rc1-r1.ebuild
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
if [[ ${PV} !=  ]] ; then
# If needed for live builds, place them in /etc/portage/patches
+   eapply

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/files/, sys-libs/libselinux/

2016-10-03 Thread Jason Zaman 
commit: d2e6a0825a951d92abe34fa7703ba89057eae912
Author: Jason Zaman  gentoo  org>
AuthorDate: Sat Oct  1 03:26:58 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Mon Oct  3 07:02:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e6a082

sys-libs/libselinux: bump to 2.6-rc1

Package-Manager: portage-2.3.0

 sys-libs/libselinux/Manifest   |  1 +
 ...2.6-0005-use-ruby-include-with-rubylibver.patch | 39 ++
 ...x-2.6-0007-build-related-fixes-bug-500674.patch | 91 ++
 ...linux-.ebuild => libselinux-2.6_rc1.ebuild} | 45 +--
 sys-libs/libselinux/libselinux-.ebuild | 45 +--
 sys-libs/libselinux/metadata.xml   |  3 +
 6 files changed, 180 insertions(+), 44 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 81ff468..c2a779e 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1 +1,2 @@
 DIST libselinux-2.5.tar.gz 189019 SHA256 
94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f SHA512 
1c6718aa6fa05c8635427cd6f5a89ce47fb6bb9bd2fec417293122826695d1ebb0e0b86e83711abb5c4fe71c67dce6f2e18745592833d1711f0ab2d01246b8c7
 WHIRLPOOL 
96192b856d32a82b9b4413137085e69ad52cbf2e0d274603a90d904e9a318a80c83f337aef26f54c685a689972432955f0f9de67949e0bb4f844611df22d3589
+DIST libselinux-2.6-rc1.tar.gz 203034 SHA256 
4ef2bbb1bdb1d0c43ed14b237066364b07bd1d2ae0a16dcd475bbf7793723928 SHA512 
72a8a1d244fea3902cecff69fda48c1bc8d7ce1789902126565272782105bd43205e517af8a4cac5cc5cab47c48f0cd3b287c42a408ae3889b51b19b0b38632b
 WHIRLPOOL 
b9012b74a3f073e25b63d83003194f23f7177cdd0e33443de87ff7491e0ecffa72eea07be04247cafd3045773427dbf98f592e02346c8fa32bc161be624cc2b4

diff --git 
a/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch
 
b/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch
new file mode 100644
index ..a2f704d
--- /dev/null
+++ 
b/sys-libs/libselinux/files/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch
@@ -0,0 +1,39 @@
+From 024a8628e698e8c90f7876a35c820f30c6957031 Mon Sep 17 00:00:00 2001
+From: Jason Zaman 
+Date: Sun, 2 Oct 2016 02:06:35 +0800
+Subject: [PATCH] libselinux: versioned ruby pkg-config and query vendorarchdir
+ properly
+
+Gentoo and Arch have pkg-config entries for "ruby-$(RUBYLIBVER)" but not
+for "ruby". Check if that exists first then fall back to plain ruby if
+it does not.
+
+The ruby install paths were incorrect. Fedora 20 installed to
+/usr/lib64/ruby/vendor_ruby/, Arch needs it to be vendor_ruby as well,
+site_ruby does not work. Thanks to Nicolas Iooss for the correct way to
+query for the path.
+
+Signed-off-by: Jason Zaman 
+---
+ libselinux/src/Makefile | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
+index 7169230..f9e3de1 100644
+--- libselinux/src/Makefile
 libselinux/src/Makefile
+@@ -16,9 +16,8 @@ PYLIBVER ?= $(shell $(PYTHON) -c 'import 
sys;print("python%d.%d" % sys.version_i
+ PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX))
+ PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
+ RUBYLIBVER ?= $(shell $(RUBY) -e 'print 
RUBY_VERSION.split(".")[0..1].join(".")')
+-RUBYPLATFORM ?= $(shell $(RUBY) -e 'print RUBY_PLATFORM')
+-RUBYINC ?= $(shell $(PKG_CONFIG) --cflags ruby)
+-RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
++RUBYINC ?= $(shell $(PKG_CONFIG) --exists ruby-$(RUBYLIBVER) && $(PKG_CONFIG) 
--cflags ruby-$(RUBYLIBVER) || $(PKG_CONFIG) --cflags ruby)
++RUBYINSTALL ?= $(DESTDIR)$(shell $(RUBY) -e 'puts 
RbConfig::CONFIG["vendorarchdir"]')
+ LIBBASE ?= $(shell basename $(LIBDIR))
+ 
+ VERSION = $(shell cat ../VERSION)
+-- 
+2.7.3
+

diff --git 
a/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch
 
b/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch
new file mode 100644
index ..83596e8
--- /dev/null
+++ 
b/sys-libs/libselinux/files/libselinux-2.6-0007-build-related-fixes-bug-500674.patch
@@ -0,0 +1,91 @@
+https://bugs.gentoo.org/500674
+
+random fixes:
+- make sure PCRE_CFLAGS get used
+- use PCRE_LIBS via pkg-config
+- move LDFLAGS to before objects, not after
+- do not hardcode -L$(LIBDIR) (let the toolchain handle it)
+- do not hardcode -I$(INCLUDEDIR) (let the toolchain handle it)
+
+diff --git a/libselinux/Makefile b/libselinux/Makefile
+index baa0db3..4dc5aa0 100644
+--- libselinux/Makefile
 libselinux/Makefile
+@@ -1,5 +1,6 @@
+ SUBDIRS = src include utils man
+ 
++PKG_CONFIG ?= pkg-config
+ DISABLE_SETRANS ?= n
+ DISABLE_RPM ?= n
+ ANDROID_HOST ?= n
+@@ -20,10 +21,11 @@ export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS 
ANDROID_HOST
+ 
+ USE_PCRE2 ?= n
+ ifeq ($(USE_PCRE2),y)
+-  PCRE_CFLAGS := -DUSE_PCRE2 -DPCRE2_CODE_UNIT_WIDTH=8
+-  PCRE_LDFLAGS := -lpcre2-8
++

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/files/, sys-libs/libselinux/

2016-09-15 Thread Jason Zaman 
commit: 51e0f47c21ea17e9dd93961e4bc1aa560927865a
Author: Jason Zaman  gentoo  org>
AuthorDate: Thu Sep 15 09:30:39 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Thu Sep 15 09:45:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e0f47c

sys-libs/libselinux: backport patches to 2.5-r1

Avoid mounting /proc outside of selinux_init_load_policy()

Fix compat issue with swig 3.0.10
https://bugs.gentoo.org/587712

Package-Manager: portage-2.2.28

 ...nux-2.5-0001-only-mount-proc-if-necessary.patch |  54 +
 ...ing-proc-outside-of-selinux_init_load_pol.patch | 129 +
 ...5-0003-Change-the-location-of-_selinux.so.patch |  44 +++
 ...elinux-.ebuild => libselinux-2.5-r1.ebuild} |   6 +-
 sys-libs/libselinux/libselinux-.ebuild |   2 +-
 5 files changed, 233 insertions(+), 2 deletions(-)

diff --git 
a/sys-libs/libselinux/files/libselinux-2.5-0001-only-mount-proc-if-necessary.patch
 
b/sys-libs/libselinux/files/libselinux-2.5-0001-only-mount-proc-if-necessary.patch
new file mode 100644
index ..dfa6a0f
--- /dev/null
+++ 
b/sys-libs/libselinux/files/libselinux-2.5-0001-only-mount-proc-if-necessary.patch
@@ -0,0 +1,54 @@
+From 5a8d8c499b2ef80eaa7b5abe2ec68d7101e613bf Mon Sep 17 00:00:00 2001
+From: Stephen Smalley 
+Date: Mon, 29 Feb 2016 10:10:55 -0500
+Subject: [PATCH] libselinux: only mount /proc if necessary
+
+Commit 9df498884665d ("libselinux: Mount procfs before checking
+/proc/filesystems") changed selinuxfs_exists() to always try
+mounting /proc before reading /proc/filesystems.  However, this is
+unnecessary if /proc is already mounted and can produce avc denials
+if the process is not allowed to perform the mount.  Check first
+to see if /proc is already present and only try the mount if it is not.
+
+Signed-off-by: Stephen Smalley 
+---
+ libselinux/src/init.c | 11 +--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/libselinux/src/init.c b/libselinux/src/init.c
+index 3db4de0..3530594 100644
+--- libselinux/src/init.c
 libselinux/src/init.c
+@@ -12,6 +12,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "dso.h"
+ #include "policy.h"
+@@ -57,13 +58,19 @@ static int verify_selinuxmnt(const char *mnt)
+ 
+ int selinuxfs_exists(void)
+ {
+-  int exists = 0, mnt_rc = 0;
++  int exists = 0, mnt_rc = -1, rc;
++  struct statfs sb;
+   FILE *fp = NULL;
+   char *buf = NULL;
+   size_t len;
+   ssize_t num;
+ 
+-  mnt_rc = mount("proc", "/proc", "proc", 0, 0);
++  do {
++  rc = statfs("/proc", );
++  } while (rc < 0 && errno == EINTR);
++
++  if (rc == 0 && ((uint32_t)sb.f_type != (uint32_t)PROC_SUPER_MAGIC))
++  mnt_rc = mount("proc", "/proc", "proc", 0, 0);
+ 
+   fp = fopen("/proc/filesystems", "r");
+   if (!fp) {
+-- 
+2.7.3
+

diff --git 
a/sys-libs/libselinux/files/libselinux-2.5-0002-Avoid-mounting-proc-outside-of-selinux_init_load_pol.patch
 
b/sys-libs/libselinux/files/libselinux-2.5-0002-Avoid-mounting-proc-outside-of-selinux_init_load_pol.patch
new file mode 100644
index ..c811450
--- /dev/null
+++ 
b/sys-libs/libselinux/files/libselinux-2.5-0002-Avoid-mounting-proc-outside-of-selinux_init_load_pol.patch
@@ -0,0 +1,129 @@
+From 32773a99b1f0cf2b61b5f5a33359684b18aab1ed Mon Sep 17 00:00:00 2001
+From: Stephen Smalley 
+Date: Fri, 13 May 2016 11:59:47 -0400
+Subject: [PATCH] Avoid mounting /proc outside of selinux_init_load_policy().
+
+Temporarily mounting /proc within selinuxfs_exists() can cause
+problems since it can be called by a libselinux constructor and
+therefore may be invoked by every program linked with libselinux.
+Since this was only motivated originally by a situation where
+selinuxfs_exists() was called from selinux_init_load_policy()
+before /proc was mounted, fix it in selinux_init_load_policy() instead.
+
+This reverts commit 5a8d8c499b2ef80eaa7b5abe2ec68d7101e613bf
+("libselinux: only mount /proc if necessary") and
+commit 9df498884665d79474b79f0f30d1cd67df11bd3e
+("libselinux: Mount procfs before checking /proc/filesystems").
+
+Signed-off-by: Stephen Smalley 
+---
+ libselinux/src/init.c| 27 +++
+ libselinux/src/load_policy.c | 15 ++-
+ 2 files changed, 13 insertions(+), 29 deletions(-)
+
+diff --git a/libselinux/src/init.c b/libselinux/src/init.c
+index 3530594..3c687a2 100644
+--- libselinux/src/init.c
 libselinux/src/init.c
+@@ -11,8 +11,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+-#include 
+ 
+ #include "dso.h"
+ #include "policy.h"
+@@ -58,26 +56,15 @@ static int verify_selinuxmnt(const char *mnt)
+ 
+ int selinuxfs_exists(void)
+ {
+-  int exists = 0, mnt_rc = -1, rc;
+-  struct statfs sb;
++  int exists = 0;
+   FILE *fp = NULL;
+   char *buf = NULL;
+   size_t len;
+   ssize_t num;

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/files/, sys-libs/libselinux/

2016-09-01 Thread Jason Zaman 
commit: e5c183da286b54e8c6d6f7446821972be7a7831c
Author: Jason Zaman  gentoo  org>
AuthorDate: Thu Sep  1 15:59:35 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Thu Sep  1 16:28:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c183da

sys-libs/libselinux: Drop old

Package-Manager: portage-2.2.28

 sys-libs/libselinux/Manifest   |   5 -
 .../0006-build-related-fixes-bug-500674.patch  |  67 --
 sys-libs/libselinux/libselinux-2.2.2-r5.ebuild |  95 --
 sys-libs/libselinux/libselinux-2.3-r2.ebuild   | 145 -
 sys-libs/libselinux/libselinux-2.4.ebuild  | 145 -
 5 files changed, 457 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 6cfaca0..81ff468 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,6 +1 @@
-DIST libselinux-2.2.2.tar.gz 171013 SHA256 
30ab363416806da907b86b97f1d31c252473e3200358bb1570f563c8312b5a3e SHA512 
1270cba11ec0795a2cea3706ac5547655d0e65dcd2141932000526f3d0c781b6ae114051b2bb53950b8ef207a318335329280b9fc9fd81796e8e4a27cf6ae841
 WHIRLPOOL 
a444e44225ced35b126bbd2e8924aaf5c9f4da7abb9663d20a32b97babe750245c22d75e2238de0958b73295cf582b8aec39e23312886b96417120c600ed37dc
-DIST libselinux-2.3.tar.gz 171254 SHA256 
0b1e0b43ecd84a812713d09564019b08e7c205d89072b5cbcd07b052cd8e77b2 SHA512 
8cfcd20ab0b43ffbb32389e0498b21e43cde643dcdf471a2354f1ca557f11641d250871ed5e71b9dde4c5f47ac1048746fe514f8f6cfad668fa179ed5136e802
 WHIRLPOOL 
e975a391559aca3f8b251d2aa484cf8e344d09caa43ff56dd929e75a0ad195cf8d9a88b950679f589f4deb74aea0d22be4e7ad00b11eacc080288df0b5ac7ccb
-DIST libselinux-2.4.tar.gz 165931 SHA256 
46043091f4c5ba4f43e8d3715f30d665a2d571c9126c1f03945c9ea4ed380f7b SHA512 
f7c7ceabcc6ca7bb5cb24fd04b8ea4771af7e509a11ce601fb50d52bd14b291ab6136b7f5193912d02b61b132a2fdd1666f229478598d0b20b99bdea0f5e69d6
 WHIRLPOOL 
d1499818fc885c3bd07785d41466b4ea4bcf56fafe8cbc9bd1a517fe0d2d528b10911fa6df08756ca63aebc411fd69c7f01283685c8a858a81301e203dfd3ec2
 DIST libselinux-2.5.tar.gz 189019 SHA256 
94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f SHA512 
1c6718aa6fa05c8635427cd6f5a89ce47fb6bb9bd2fec417293122826695d1ebb0e0b86e83711abb5c4fe71c67dce6f2e18745592833d1711f0ab2d01246b8c7
 WHIRLPOOL 
96192b856d32a82b9b4413137085e69ad52cbf2e0d274603a90d904e9a318a80c83f337aef26f54c685a689972432955f0f9de67949e0bb4f844611df22d3589
-DIST patchbundle-libselinux-2.2.2-r5.tar.gz 2304 SHA256 
ad77f499c05ec3b5707cb9db518a891dd9c84ccb77db07e686c87e5799e1802c SHA512 
a01db39a7aade27b0127dd0e2f3185587ff4d913b7b1be7beac36dc2d3e1007de5e6bae8a11bc84567385420fff064ba54892d8e113c8fd54ad3c598dde7648d
 WHIRLPOOL 
5886d9de6fcf073d54ca5e0eac3f8b4754c44382e7044debb223f94ecc81ea0e26b7638037eef17eb6f8ce4cc5046a4bb9f93b9b7767480908ee5b2ced0413ac
-DIST patchbundle-libselinux-4.tar.gz 2631 SHA256 
91bf43c84ce3d3178c8d21fdcf97380a635fa2465d1611fe4e0e3838a586c78c SHA512 
bd2f9762f095e3dbc67e77ee04968cb8e87d460fdf10feff91cb1ce6027e19a660bb57617887e44608d39720e8f95500c451c4b284d58c0a756a04b08fa305c2
 WHIRLPOOL 
07a6a69d33c46c443907aae2ae4f3646a0360565e28d0a50cbcf81f8b5d8c259812d3e086841fc21c2a8104ce9863fc6c9c1d32e28ea08ebc7baf2d45af3509f

diff --git 
a/sys-libs/libselinux/files/0006-build-related-fixes-bug-500674.patch 
b/sys-libs/libselinux/files/0006-build-related-fixes-bug-500674.patch
deleted file mode 100644
index cec91b1..
--- a/sys-libs/libselinux/files/0006-build-related-fixes-bug-500674.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://bugs.gentoo.org/500674
-
-random fixes:
- - make sure PCRE_CFLAGS get used
- - use PCRE_LIBS via pkg-config
- - move LDFLAGS to before objects, not after
- - do not hardcode -L$(LIBDIR) (let the toolchain handle it)
- - do not hardcode -I$(INCLUDEDIR) (let the toolchain handle it)
-
 a/src/Makefile
-+++ b/src/Makefile
-@@ -75,7 +75,7 @@ CFLAGS ?= -O -Wall -W -Wundef -Wformat-y2k -Wformat-security 
-Winit-self -Wmissi
-   -fipa-pure-const -Wno-suggest-attribute=pure 
-Wno-suggest-attribute=const \
-   -Werror -Wno-aggregate-return -Wno-redundant-decls
- 
--override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE 
-D_FILE_OFFSET_BITS=64 $(EMFLAGS)
-+override CFLAGS += -I../include $(PCRE_CFLAGS) -D_GNU_SOURCE 
-D_FILE_OFFSET_BITS=64 $(EMFLAGS)
- 
- SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable 
-Wno-unused-parameter \
-   -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes 
-Wno-missing-declarations
-@@ -104,17 +104,17 @@ $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT)
-   $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
- 
- $(SWIGSO): $(SWIGLOBJ)
--  $(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
-+  $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux
- 
- $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
--  $(CC) $(CFLAGS) -shared -o $@ $^ -L. -lselinux $(LDFLAGS) -L$(LIBDIR)

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/files/, sys-libs/libselinux/

2016-03-13 Thread Sven Vermeulen 
commit: ec7c7fbaca366eb86eec892b5dec1bd80e9bc647
Author: Sven Vermeulen  gentoo  org>
AuthorDate: Sun Mar 13 17:12:49 2016 +
Commit: Sven Vermeulen  gentoo  org>
CommitDate: Sun Mar 13 19:46:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7c7fba

sys-libs/libselinux: Bump to 2.5 release

Package-Manager: portage-2.2.26

 sys-libs/libselinux/Manifest   |  1 +
 ...07-build-related-fixes-bug-500674-for-2.5.patch | 69 ++
 ...ibselinux-.ebuild => libselinux-2.5.ebuild} | 32 --
 sys-libs/libselinux/libselinux-.ebuild | 12 ++--
 4 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index f9ea8da..6cfaca0 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -1,5 +1,6 @@
 DIST libselinux-2.2.2.tar.gz 171013 SHA256 
30ab363416806da907b86b97f1d31c252473e3200358bb1570f563c8312b5a3e SHA512 
1270cba11ec0795a2cea3706ac5547655d0e65dcd2141932000526f3d0c781b6ae114051b2bb53950b8ef207a318335329280b9fc9fd81796e8e4a27cf6ae841
 WHIRLPOOL 
a444e44225ced35b126bbd2e8924aaf5c9f4da7abb9663d20a32b97babe750245c22d75e2238de0958b73295cf582b8aec39e23312886b96417120c600ed37dc
 DIST libselinux-2.3.tar.gz 171254 SHA256 
0b1e0b43ecd84a812713d09564019b08e7c205d89072b5cbcd07b052cd8e77b2 SHA512 
8cfcd20ab0b43ffbb32389e0498b21e43cde643dcdf471a2354f1ca557f11641d250871ed5e71b9dde4c5f47ac1048746fe514f8f6cfad668fa179ed5136e802
 WHIRLPOOL 
e975a391559aca3f8b251d2aa484cf8e344d09caa43ff56dd929e75a0ad195cf8d9a88b950679f589f4deb74aea0d22be4e7ad00b11eacc080288df0b5ac7ccb
 DIST libselinux-2.4.tar.gz 165931 SHA256 
46043091f4c5ba4f43e8d3715f30d665a2d571c9126c1f03945c9ea4ed380f7b SHA512 
f7c7ceabcc6ca7bb5cb24fd04b8ea4771af7e509a11ce601fb50d52bd14b291ab6136b7f5193912d02b61b132a2fdd1666f229478598d0b20b99bdea0f5e69d6
 WHIRLPOOL 
d1499818fc885c3bd07785d41466b4ea4bcf56fafe8cbc9bd1a517fe0d2d528b10911fa6df08756ca63aebc411fd69c7f01283685c8a858a81301e203dfd3ec2
+DIST libselinux-2.5.tar.gz 189019 SHA256 
94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f SHA512 
1c6718aa6fa05c8635427cd6f5a89ce47fb6bb9bd2fec417293122826695d1ebb0e0b86e83711abb5c4fe71c67dce6f2e18745592833d1711f0ab2d01246b8c7
 WHIRLPOOL 
96192b856d32a82b9b4413137085e69ad52cbf2e0d274603a90d904e9a318a80c83f337aef26f54c685a689972432955f0f9de67949e0bb4f844611df22d3589
 DIST patchbundle-libselinux-2.2.2-r5.tar.gz 2304 SHA256 
ad77f499c05ec3b5707cb9db518a891dd9c84ccb77db07e686c87e5799e1802c SHA512 
a01db39a7aade27b0127dd0e2f3185587ff4d913b7b1be7beac36dc2d3e1007de5e6bae8a11bc84567385420fff064ba54892d8e113c8fd54ad3c598dde7648d
 WHIRLPOOL 
5886d9de6fcf073d54ca5e0eac3f8b4754c44382e7044debb223f94ecc81ea0e26b7638037eef17eb6f8ce4cc5046a4bb9f93b9b7767480908ee5b2ced0413ac
 DIST patchbundle-libselinux-4.tar.gz 2631 SHA256 
91bf43c84ce3d3178c8d21fdcf97380a635fa2465d1611fe4e0e3838a586c78c SHA512 
bd2f9762f095e3dbc67e77ee04968cb8e87d460fdf10feff91cb1ce6027e19a660bb57617887e44608d39720e8f95500c451c4b284d58c0a756a04b08fa305c2
 WHIRLPOOL 
07a6a69d33c46c443907aae2ae4f3646a0360565e28d0a50cbcf81f8b5d8c259812d3e086841fc21c2a8104ce9863fc6c9c1d32e28ea08ebc7baf2d45af3509f

diff --git 
a/sys-libs/libselinux/files/0007-build-related-fixes-bug-500674-for-2.5.patch 
b/sys-libs/libselinux/files/0007-build-related-fixes-bug-500674-for-2.5.patch
new file mode 100644
index 000..67e47ad
--- /dev/null
+++ 
b/sys-libs/libselinux/files/0007-build-related-fixes-bug-500674-for-2.5.patch
@@ -0,0 +1,69 @@
+https://bugs.gentoo.org/500674
+
+random fixes:
+- make sure PCRE_CFLAGS get used
+- use PCRE_LIBS via pkg-config
+- move LDFLAGS to before objects, not after
+- do not hardcode -L$(LIBDIR) (let the toolchain handle it)
+- do not hardcode -I$(INCLUDEDIR) (let the toolchain handle it)
+
+diff -uNr libselinux-2.5.orig/src/Makefile libselinux-2.5/src/Makefile
+--- libselinux-2.5.orig/src/Makefile   2016-03-13 19:27:07.09100 +0100
 libselinux-2.5/src/Makefile2016-03-13 19:27:16.49500 +0100
+@@ -73,7 +73,7 @@
+   -fipa-pure-const -Wno-suggest-attribute=pure 
-Wno-suggest-attribute=const \
+   -Werror -Wno-aggregate-return -Wno-redundant-decls
+ 
+-override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE $(EMFLAGS)
++override CFLAGS += -I../include $(PCRE_CFLAGS) -D_GNU_SOURCE $(EMFLAGS)
+ 
+ SWIG_CFLAGS += -Wno-error -Wno-unused-variable -Wno-unused-but-set-variable 
-Wno-unused-parameter \
+   -Wno-shadow -Wno-uninitialized -Wno-missing-prototypes 
-Wno-missing-declarations
+@@ -102,17 +102,17 @@
+   $(CC) $(CFLAGS) $(SWIG_CFLAGS) $(RUBYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+ $(SWIGSO): $(SWIGLOBJ)
+-  $(CC) $(CFLAGS) -shared -o $@ $< -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
++  $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux
+ 
+ $(SWIGRUBYSO): $(SWIGRUBYLOBJ)
+-  $(CC) $(CFLAGS) -shared -o $@ $^ -L. -lselinux $(LDFLAGS) -L$(LIBDIR)
++  $(CC)