summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Julien Pivotto <roidelapluie@inuits.eu> 2017-01-14 22:28:38 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-01-19 00:05:39 +0100
commit730f9623ca6123d9d8e16847d68b5a453b0c5c75 (patch)
tree5edfdef73abe6eb1843fc9bb8eca4b47e510f461
parent1bfb848b45221dffb7e3611eddfb1ebe4b0740de (diff)
downloadselinux-730f9623ca6123d9d8e16847d68b5a453b0c5c75.tar.gz
selinux-730f9623ca6123d9d8e16847d68b5a453b0c5c75.tar.xz
security/libsemanage: version bump to 2.6
Change-Id: I7ad9e7e83a083029b1f9128cc891fd517354522f Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu> Reviewed-on: https://galileo.mailstation.de/gerrit/8026 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Heiko Becker <heirecka@exherbo.org>
-rw-r--r--packages/security/libsemanage/files/libsemanage-respect-prefixed-tools.patch56
-rw-r--r--packages/security/libsemanage/files/libsemanage-support-overriding-randlib.patch26
-rw-r--r--packages/security/libsemanage/libsemanage-2.6.exheres-0 (renamed from packages/security/libsemanage/libsemanage-2.5.exheres-0)5
3 files changed, 0 insertions, 87 deletions
diff --git a/packages/security/libsemanage/files/libsemanage-respect-prefixed-tools.patch b/packages/security/libsemanage/files/libsemanage-respect-prefixed-tools.patch
deleted file mode 100644
index 1cc5dd4..0000000
--- a/packages/security/libsemanage/files/libsemanage-respect-prefixed-tools.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 93cf6aa5218f7d78e61e340cee8318cc44381964 Mon Sep 17 00:00:00 2001
-From: Julien Pivotto <roidelapluie@inuits.eu>
-Date: Mon, 16 May 2016 20:50:59 +0200
-Subject: [PATCH] libselinux, libsemanage: respect CC and PKG_CONFIG
- environment variable
-Upstream: yes
-Source: exherbo
-
-
-Compilation tools respects certain environment variables, like CC.
-However, in libselinux and libsemanage, they are not respected
-everywhere. This command fixes respect for those variables, falling back
-to the previous hardcoded values if not specified.
----
- libsemanage/src/Makefile | 5 +++--
- libsemanage/src/exception.sh | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index d1fcc0b..b0711a7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -5,6 +5,7 @@ PYTHON ?= python
- PYPREFIX ?= $(notdir $(PYTHON))
- RUBY ?= ruby
- RUBYPREFIX ?= $(notdir $(RUBY))
-+PKG_CONFIG ?= pkg-config
-
- # Installation directories.
- PREFIX ?= $(DESTDIR)/usr
-@@ -12,11 +13,11 @@ LIBDIR ?= $(PREFIX)/lib
- SHLIBDIR ?= $(DESTDIR)/lib
- INCLUDEDIR ?= $(PREFIX)/include
- PYLIBVER ?= $(shell $(PYTHON) -c 'import sys;print("python%d.%d" % sys.version_info[0:2])')
--PYINC ?= $(shell pkg-config --cflags $(PYPREFIX))
-+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-$(RUBYLIBVER))
-+RUBYINC ?= $(shell $(PKG_CONFIG) --cflags ruby-$(RUBYLIBVER))
- RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
-
- LIBBASE=$(shell basename $(LIBDIR))
-diff --git a/src/exception.sh b/src/exception.sh
-index 94619d2..d18959c 100644
---- a/src/exception.sh
-+++ b/src/exception.sh
-@@ -9,6 +9,6 @@ echo "
- }
- "
- }
--gcc -x c -c -I../include - -aux-info temp.aux < ../include/semanage/semanage.h
-+${CC:-gcc} -x c -c -I../include - -aux-info temp.aux < ../include/semanage/semanage.h
- for i in `awk '/extern int/ { print $6 }' temp.aux`; do except $i ; done
- rm -f -- temp.aux -.o
diff --git a/packages/security/libsemanage/files/libsemanage-support-overriding-randlib.patch b/packages/security/libsemanage/files/libsemanage-support-overriding-randlib.patch
deleted file mode 100644
index aa5fcf1..0000000
--- a/packages/security/libsemanage/files/libsemanage-support-overriding-randlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Julien Pivotto <roidelapluie@inuits.eu>
-Date: Thu, 12 May 2016 21:57:26 +0200
-Subject: [PATCH] libsemanage: Support overriding Makefile RANLIB
-Upstream: yes
-Source: exherbo
-
----
- libsemanage/src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/libsemanage/src/Makefile
-index d1fcc0b..71eadd6 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -61,7 +61,7 @@ SWIG_CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -Wno
- -Wno-unused-parameter
-
- override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE
--RANLIB=ranlib
-+RANLIB ?= ranlib
-
- SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
-
---
-2.6.1
-
diff --git a/packages/security/libsemanage/libsemanage-2.5.exheres-0 b/packages/security/libsemanage/libsemanage-2.6.exheres-0
index 69a88bd..4ba8cb7 100644
--- a/packages/security/libsemanage/libsemanage-2.5.exheres-0
+++ b/packages/security/libsemanage/libsemanage-2.6.exheres-0
@@ -23,11 +23,6 @@ DEPENDENCIES="
dev-util/cunit
"
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}/${PN}-support-overriding-randlib.patch"
- "${FILES}/${PN}-respect-prefixed-tools.patch"
-)
-
DEFAULT_SRC_TEST_PARAMS=(
CC="${CC}"
LIBS="../src/libsemanage.a /usr/$(exhost --target)/lib/libselinux.a /usr/$(exhost --target)/lib/libsepol.a"