From 7c362e0eae5ebfe607fb350f20131925eed1743f30d7936c9c20ba73c24d4f51 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 25 Jul 2012 11:14:53 +0000 Subject: [PATCH 1/6] update to 2.1.9 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=48 --- libselinux-2.0.91.tar.bz2 | 3 --- libselinux-2.1.9.tar.gz | 3 +++ libselinux-bindings.spec | 6 +++--- libselinux.spec | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 libselinux-2.0.91.tar.bz2 create mode 100644 libselinux-2.1.9.tar.gz diff --git a/libselinux-2.0.91.tar.bz2 b/libselinux-2.0.91.tar.bz2 deleted file mode 100644 index 20528dc..0000000 --- a/libselinux-2.0.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67a89821c9cd01288af5e6c784cc963fd13cc7c5d2a06ae8e7241ce187682ea1 -size 156090 diff --git a/libselinux-2.1.9.tar.gz b/libselinux-2.1.9.tar.gz new file mode 100644 index 0000000..e2f2d43 --- /dev/null +++ b/libselinux-2.1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:749d4b39c80aa9df8247b8b3187ab72442c0dbad6e70bf312e25052bd4e7063f +size 155840 diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index 76958bd..bbeec12 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -23,13 +23,13 @@ BuildRequires: ruby-devel BuildRequires: swig Name: libselinux-bindings -Version: 2.0.91 +Version: 2.1.9 Release: 0 -Url: http://www.nsa.gov/research/selinux/ +Url: http://userspace.selinuxproject.org/ Summary: SELinux library and simple utilities License: GPL-2.0 ; SUSE-Public-Domain Group: System/Libraries -Source: libselinux-%{version}.tar.bz2 +Source: http://userspace.selinuxproject.org/releases/20120216/libselinux-%{version}.tar.gz Source1: selinux-ready Source2: baselibs.conf Patch0: libselinux-rhat.patch diff --git a/libselinux.spec b/libselinux.spec index 092155e..e326175 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -21,13 +21,13 @@ BuildRequires: libsepol-devel >= %{libsepol_ver} BuildRequires: pkg-config Name: libselinux -Version: 2.0.91 +Version: 2.1.9 Release: 0 -Url: http://www.nsa.gov/selinux/ +Url: http://userspace.selinuxproject.org/ Summary: SELinux library and simple utilities License: GPL-2.0 ; SUSE-Public-Domain Group: System/Libraries -Source: %{name}-%{version}.tar.bz2 +Source: http://userspace.selinuxproject.org/releases/20120216/%{name}-%{version}.tar.gz Source1: selinux-ready Source2: baselibs.conf Patch0: %{name}-rhat.patch From caf7403104bec9c16ddb9148dd94f53155d5305547b53e3f022a79ed65a14577 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 25 Jul 2012 11:15:17 +0000 Subject: [PATCH 2/6] - updated to 2.1.9 again (see below) OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=49 --- libselinux.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libselinux.changes b/libselinux.changes index df5138d..94ba4c1 100644 --- a/libselinux.changes +++ b/libselinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 25 11:15:02 UTC 2012 - meissner@suse.com + +- updated to 2.1.9 again (see below) + ------------------------------------------------------------------- Wed Jun 13 08:56:36 UTC 2012 - coolo@suse.com From 4d8da5108c1c6594eeb307254bf97c30faa3c3c8662d304ae7d9bb9ddd57f182 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 25 Jul 2012 11:25:26 +0000 Subject: [PATCH 3/6] libsepol adjust OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=50 --- libselinux-bindings.spec | 2 +- libselinux.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index bbeec12..94b03bd 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -16,7 +16,7 @@ # -%define libsepol_ver 2.0.32 +%define libsepol_ver 2.1.4 BuildRequires: libsepol-devel-static >= %{libsepol_ver} BuildRequires: python-devel BuildRequires: ruby-devel diff --git a/libselinux.spec b/libselinux.spec index e326175..caba902 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -16,7 +16,7 @@ # -%define libsepol_ver 2.0.32 +%define libsepol_ver 2.1.4 BuildRequires: libsepol-devel >= %{libsepol_ver} BuildRequires: pkg-config From 80abb8133f0f6da8e94ee0cc566abd626c3329f9dff509d8486d9b79af69250f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 25 Jul 2012 11:46:17 +0000 Subject: [PATCH 4/6] refreshed patch OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=51 --- libselinux-ruby.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libselinux-ruby.patch b/libselinux-ruby.patch index d87b4b9..ba01a31 100644 --- a/libselinux-ruby.patch +++ b/libselinux-ruby.patch @@ -1,24 +1,24 @@ Index: src/Makefile =================================================================== ---- src/Makefile.orig 2010-02-24 20:05:41.000000000 +0100 -+++ src/Makefile 2012-06-13 10:56:04.477254689 +0200 -@@ -9,8 +9,8 @@ PYLIB ?= /usr/lib/$(PYLIBVER) - PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) +--- src/Makefile.orig ++++ src/Makefile +@@ -15,8 +15,8 @@ PYTHONLIBDIR ?= $(shell pkg-config --lib + PYLIBDIR ?= $(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) -RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM) +RUBYINC ?= $(shell ruby -r rbconfig -e "print Config::CONFIG['rubyhdrdir'].nil? ? '$(LIBDIR)/ruby/$(RUBYLIBVER)' : Config::CONFIG['rubyhdrdir']") +RUBYINSTALL ?= $(shell ruby -r rbconfig -e "print Config::CONFIG['vendorarchdir'].nil? ? '$(DESTDIR)'+Config::CONFIG['sitearchdir'] : '$(DESTDIR)'+Config::CONFIG['vendorarchdir']") + LIBBASE=$(shell basename $(LIBDIR)) VERSION = $(shell cat ../VERSION) - LIBVERSION = 1 -@@ -72,7 +72,7 @@ $(SWIGLOBJ): $(SWIGCOUT) - $(CC) $(filter-out -Werror,$(CFLAGS)) -I$(PYINC) -fPIC -DSHARED -c -o $@ $< +@@ -76,7 +76,7 @@ $(SWIGLOBJ): $(SWIGCOUT) + $(CC) $(filter-out -Werror, $(CFLAGS)) $(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) -Wl,-soname,$@ + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) $(PYTHONLIBDIR) -Wl,-soname,$@,-z,defs From 146d4e58d3829194bbf26a86fc923e06315a44d45496c5b711496ad33c9aa1f6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 25 Jul 2012 13:33:06 +0000 Subject: [PATCH 5/6] selinuxexeccon OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=52 --- libselinux.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libselinux.spec b/libselinux.spec index caba902..8294833 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -167,6 +167,7 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/setenforce %{_sbindir}/togglesebool %{_sbindir}/selinux-ready +%{_sbindir}/selinuxexeccon %{_mandir}/man5/* %{_mandir}/man8/* From 9696cb31b582b4fa625244086a38c16df4a2f9749c5ed7f5385a17c1f96eccaa Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 10 Aug 2012 19:40:37 +0000 Subject: [PATCH 6/6] - updated to 2.1.9 again (see below) OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=53 --- libselinux-bindings.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libselinux-bindings.changes b/libselinux-bindings.changes index d2ab0c4..d542a5b 100644 --- a/libselinux-bindings.changes +++ b/libselinux-bindings.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 25 11:15:02 UTC 2012 - meissner@suse.com + +- updated to 2.1.9 again (see below) + ------------------------------------------------------------------- Fri Jun 1 18:34:04 CEST 2012 - mls@suse.de