diff --git a/.cvsignore b/.cvsignore index ffad7f5..6c2736a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -160,3 +160,4 @@ libselinux-2.0.73.tgz libselinux-2.0.74.tgz libselinux-2.0.75.tgz libselinux-2.0.76.tgz +libselinux-2.0.77.tgz diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index 6c71adb..aac0b92 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -3078,6 +3078,47 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/utils/getdefaultcon.c libseli - return 0; + return ret >= 0; } +diff --exclude-from=exclude -N -u -r nsalibselinux/utils/Makefile libselinux-2.0.76/utils/Makefile +--- nsalibselinux/utils/Makefile 2008-08-28 09:34:24.000000000 -0400 ++++ libselinux-2.0.76/utils/Makefile 2008-12-19 15:55:54.000000000 -0500 +@@ -2,28 +2,33 @@ + PREFIX ?= $(DESTDIR)/usr + LIBDIR ?= $(PREFIX)/lib + BINDIR ?= $(PREFIX)/sbin ++_BINDIR ?= $(DESTDIR)/sbin + + CFLAGS ?= -Wall + override CFLAGS += -I../include -D_GNU_SOURCE $(EMFLAGS) + LDLIBS += -L../src -lselinux -L$(LIBDIR) + + TARGETS=$(patsubst %.c,%,$(wildcard *.c)) ++ ++ + ifeq ($(DISABLE_AVC),y) + UNUSED_TARGETS+=compute_av compute_create compute_member compute_relabel + endif + ifeq ($(DISABLE_BOOL),y) + UNUSED_TARGETS+=getsebool togglesebool + endif +-TARGETS:= $(filter-out $(UNUSED_TARGETS), $(TARGETS)) ++TARGETS:= $(filter-out $(UNUSED_TARGETS) matchpathcon, $(TARGETS)) + +-all: $(TARGETS) ++all: $(TARGETS) matchpathcon + + install: all + -mkdir -p $(BINDIR) + install -m 755 $(TARGETS) $(BINDIR) +- ++ -mkdir -p $(_BINDIR) ++ install -m 755 matchpathcon $(_BINDIR) ++ (cd $(BINDIR); ln -fs ../../sbin/matchpathcon) + clean: +- rm -f $(TARGETS) *.o ++ rm -f $(TARGETS) *.o *~ + + indent: + ../../scripts/Lindent $(wildcard *.[ch]) diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.76/utils/matchpathcon.c --- nsalibselinux/utils/matchpathcon.c 2008-10-28 10:06:51.000000000 -0400 +++ libselinux-2.0.76/utils/matchpathcon.c 2008-12-19 15:14:20.000000000 -0500 diff --git a/libselinux.spec b/libselinux.spec index 26a3713..e3ee98c 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -4,8 +4,8 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.76 -Release: 6%{?dist} +Version: 2.0.77 +Release: 1%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -127,6 +127,7 @@ exit 0 %defattr(-,root,root,-) /%{_lib}/libselinux.so.* /var/run/setrans +/sbin/matchpathcon %files utils %defattr(-,root,root,-) @@ -163,10 +164,13 @@ exit 0 %{ruby_sitearch}/selinux.so %changelog +* Tue Jan 6 2009 Dan Walsh - 2.0.77-1 +- Update to upstream + * Tue Dec 16 2008 Dan Walsh - 2.0.76-6 - Strip trailing / for matchpathcon -* Tue Dec 16 2008 Dan Walsh - 2.0.76-5 +* Tue Dec 16 2008 Dan Walsh l - 2.0.76-5 - Fix segfault if seusers file does not work * Fri Dec 12 2008 Dan Walsh - 2.0.76-4 diff --git a/sources b/sources index 5a2c847..6de76b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6829e79d3103683961d82c419bdb4e86 libselinux-2.0.76.tgz +f0660b8d415b25e39d20f31717d48f2c libselinux-2.0.77.tgz