libselinux: Update to 2.1.7.

Conflicts:

	libselinux/libselinux.nm

diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm
index dbd857a1dc5a8a9830d6b47119ca7b662428ee10..08af1b1b0995334068b77345e2eb409d85dee97c 100644 (file)
--- a/libselinux/libselinux.nm
+++ b/libselinux/libselinux.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libselinux
-version    = 2.0.96
-release    = 2
+version    = 2.1.7
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.selinuxproject.org
@@ -13,12 +13,11 @@ license    = Public Domain
 summary    = SELinux library and simple utilities.
 
 description
-       libselinux provides an API for SELinux applications to get and set \
-       process and file security contexts and to obtain security policy \
+       libselinux provides an API for SELinux applications to get and set
+       process and file security contexts and to obtain security policy
        decisions.
 end
 
-source_dl  =
 sources    = %{thisapp}.tgz
 
 build

diff --git a/libselinux/patches/libselinux-ipfire.patch b/libselinux/patches/libselinux-ipfire.patch
index 29e0eeff499f433ca638bf0340d12197a880ba5f..b955329f90897e16a017218621bd8bc952d5838a 100644 (file)
--- a/libselinux/patches/libselinux-ipfire.patch
+++ b/libselinux/patches/libselinux-ipfire.patch
@@ -1,11 +1,11 @@
-diff -Nur a/src/Makefile b/src/Makefile
---- a/src/Makefile     2010-11-06 13:49:19.000000000 +0100
-+++ b/src/Makefile     2010-06-16 14:03:39.000000000 +0200
-@@ -95,7 +95,7 @@
-       $(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
+diff -Nur old/src/Makefile new/src/Makefile
+--- old/src/Makefile   2011-11-04 13:57:23.000000000 +0100
++++ new/src/Makefile   2011-11-19 12:24:54.163850653 +0100
+@@ -102,7 +102,7 @@
+       $(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
  
- $(AUDIT2WHYSO): audit2why.lo
--      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux ${LIBDIR}/libsepol.a -L$(LIBDIR) -Wl,-soname,$@
+ $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR) -Wl,-soname,$@
 +      $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux -lsepol -L$(LIBDIR) -Wl,-soname,$@
  
  %.o:  %.c policy.h