From 5fb9d20e5b6b0225866563d8d5859ea343862c5c58b08a96b39295102b6ee225 Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Mon, 11 Jun 2012 09:09:02 +0000 Subject: [PATCH 1/2] - revert back to 2.0.98 for 12.2 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=43 --- libselinux-2.0.98.tar.gz | 3 +++ libselinux-2.1.9.tar.gz | 3 --- libselinux-bindings.spec | 6 +++--- libselinux.changes | 5 +++++ libselinux.spec | 6 +++--- 5 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 libselinux-2.0.98.tar.gz delete mode 100644 libselinux-2.1.9.tar.gz diff --git a/libselinux-2.0.98.tar.gz b/libselinux-2.0.98.tar.gz new file mode 100644 index 0000000..8e86ab7 --- /dev/null +++ b/libselinux-2.0.98.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f36d000f7c41426bc053cf0327f36744d070e339536d3d027f14de5eda93902 +size 206574 diff --git a/libselinux-2.1.9.tar.gz b/libselinux-2.1.9.tar.gz deleted file mode 100644 index e2f2d43..0000000 --- a/libselinux-2.1.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f -size 155840 diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index 42c236b..1623eaa 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -23,13 +23,13 @@ BuildRequires: ruby-devel BuildRequires: swig Name: libselinux-bindings -Version: 2.1.9 +Version: 2.0.98 Release: 0 -Url: http://www.nsa.gov/selinux/ +Url: http://www.nsa.gov/research/selinux/ Summary: SELinux library and simple utilities License: GPL-2.0 ; SUSE-Public-Domain Group: System/Libraries -Source: libselinux-%{version}.tar.gz +Source: http://userspace.selinuxproject.org/releases/20101221/devel/libselinux-%{version}.tar.gz Source1: selinux-ready Source2: baselibs.conf Patch0: libselinux-rhat.patch diff --git a/libselinux.changes b/libselinux.changes index cab0529..a17009d 100644 --- a/libselinux.changes +++ b/libselinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 11 09:06:55 UTC 2012 - factory-maintainer@kulow.org + +- revert back to 2.0.98 for 12.2 + ------------------------------------------------------------------- Fri Jun 1 18:34:04 CEST 2012 - mls@suse.de diff --git a/libselinux.spec b/libselinux.spec index 14c150f..645f4b6 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -21,13 +21,13 @@ BuildRequires: libsepol-devel >= %{libsepol_ver} BuildRequires: pkg-config Name: libselinux -Version: 2.1.9 +Version: 2.0.98 Release: 0 Url: http://www.nsa.gov/selinux/ Summary: SELinux library and simple utilities License: GPL-2.0 ; SUSE-Public-Domain Group: System/Libraries -Source: %{name}-%{version}.tar.gz +Source: http://userspace.selinuxproject.org/releases/20101221/devel/%{name}-%{version}.tar.gz Source1: selinux-ready Source2: baselibs.conf Patch0: %{name}-rhat.patch @@ -97,9 +97,9 @@ decisions. Required for any applications that use the SELinux API. %package devel Summary: Development Include Files and Libraries for SELinux Group: Development/Libraries/C and C++ +Requires: glibc-devel Requires: libselinux1 = %{version} Requires: libsepol-devel >= %{libsepol_ver} -Requires: glibc-devel %description devel This package contains the development files, which are From 8dbca95ae6db19547f2c06597202a2245e230b13d2bc2c549924b8b5d75cbd2f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 11 Jun 2012 09:22:55 +0000 Subject: [PATCH 2/2] rebase OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=44 --- libselinux-ruby.patch | 20 +++++++++++--------- libselinux.spec | 1 - 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libselinux-ruby.patch b/libselinux-ruby.patch index 151e6c9..164db8f 100644 --- a/libselinux-ruby.patch +++ b/libselinux-ruby.patch @@ -1,7 +1,9 @@ ---- ./src/Makefile.orig 2012-06-04 08:20:19.000000000 +0000 -+++ ./src/Makefile 2012-06-04 09:43:23.000000000 +0000 -@@ -15,8 +15,8 @@ PYTHONLIBDIR ?= $(shell pkg-config --lib - PYLIBDIR ?= $(LIBDIR)/$(PYLIBVER) +Index: src/Makefile +=================================================================== +--- src/Makefile.orig 2010-12-20 21:13:33.000000000 +0100 ++++ src/Makefile 2012-06-11 11:17:42.465960993 +0200 +@@ -9,8 +9,8 @@ PYLIB ?= /usr/lib/$(PYLIBVER) + PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) RUBYLIBVER ?= $(shell ruby -e 'print RUBY_VERSION.split(".")[0..1].join(".")') RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM') -RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) @@ -11,12 +13,12 @@ LIBBASE=$(shell basename $(LIBDIR)) VERSION = $(shell cat ../VERSION) -@@ -76,7 +76,7 @@ $(SWIGLOBJ): $(SWIGCOUT) - $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $< +@@ -73,7 +73,7 @@ $(SWIGLOBJ): $(SWIGCOUT) + $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $< $(SWIGRUBYLOBJ): $(SWIGRUBYCOUT) -- $(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $< -+ $(CC) $(filter-out -Werror, $(CFLAGS)) -I$(RUBYINC) -I$(RUBYINC)/$(RUBYPLATFORM) -fPIC -DSHARED -c -o $@ $< +- $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -fPIC -DSHARED -c -o $@ $< ++ $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(RUBYINC) -I$(RUBYINC)/$(RUBYPLATFORM) -fPIC -DSHARED -c -o $@ $< $(SWIGSO): $(SWIGLOBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) $(PYTHONLIBDIR) -Wl,-soname,$@,-z,defs + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@ diff --git a/libselinux.spec b/libselinux.spec index 645f4b6..aea768b 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -164,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/selinuxconlist %{_sbindir}/selinuxdefcon %{_sbindir}/selinuxenabled -%{_sbindir}/selinuxexeccon %{_sbindir}/setenforce %{_sbindir}/togglesebool %{_sbindir}/selinux-ready