dist-git conversion

#2781)

.gitignore

@@ -171,3 +171,6 @@ libselinux-2.0.84.tgz
 libselinux-2.0.85.tgz
 libselinux-2.0.86.tgz
 libselinux-2.0.87.tgz
+libselinux-2.0.88.tgz
+libselinux-2.0.89.tgz
+libselinux-2.0.90.tgz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libselinux
-# $Id: Makefile,v 1.1 2004/09/09 07:41:22 cvsdist Exp $
-NAME := libselinux
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

libselinux-rhat.patch

@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.86/man/man8/selinuxconlist.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.90/man/man8/selinuxconlist.8
 --- nsalibselinux/man/man8/selinuxconlist.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.86/man/man8/selinuxconlist.8	2009-09-15 15:20:59.000000000 -0400
++++ libselinux-2.0.90/man/man8/selinuxconlist.8	2010-01-18 16:52:28.000000000 -0500
 @@ -0,0 +1,18 @@
 +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
@@ -20,32 +20,37 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 lib
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxdefcon(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.86/man/man8/selinuxdefcon.8
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.90/man/man8/selinuxdefcon.8
 --- nsalibselinux/man/man8/selinuxdefcon.8	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.86/man/man8/selinuxdefcon.8	2009-09-15 15:20:59.000000000 -0400
-@@ -0,0 +1,19 @@
++++ libselinux-2.0.90/man/man8/selinuxdefcon.8	2010-01-18 16:52:28.000000000 -0500
+@@ -0,0 +1,24 @@
 +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation"
 +.SH "NAME"
-+selinuxdefcon \- list default SELinux context for user 
++selinuxdefcon \- report default SELinux context for user 
 +
 +.SH "SYNOPSIS"
-+.B selinuxdefcon [-l level] user [fromcon]
++.B selinuxdefcon [-l level] user fromcon
 +
 +.SH "DESCRIPTION"
-+.B seconlist
-+reports the default context for the specified user from current context or specified context
++.B selinuxdefcon
++reports the default context for the specified user from the specified context
 +
 +.B \-l level
 +mcs/mls level
 +
++.SH EXAMPLE
++# selinuxdefcon jsmith system_u:system_r:sshd_t:s0
++.br
++unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
++
 +.SH AUTHOR	
 +This manual page was written by Dan Walsh <dwalsh@redhat.com>.
 +
 +.SH "SEE ALSO"
 +secon(8), selinuxconlist(8)
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.86/src/callbacks.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.90/src/callbacks.c
 --- nsalibselinux/src/callbacks.c	2009-04-08 09:06:23.000000000 -0400
-+++ libselinux-2.0.86/src/callbacks.c	2009-09-15 15:20:59.000000000 -0400
++++ libselinux-2.0.90/src/callbacks.c	2010-01-18 16:52:28.000000000 -0500
 @@ -16,6 +16,7 @@
  {
  	int rc;
@@ -54,9 +59,97 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.
  	va_start(ap, fmt);
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.86/src/matchpathcon.c
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-2.0.90/src/init.c
+--- nsalibselinux/src/init.c	2009-07-14 11:16:03.000000000 -0400
++++ libselinux-2.0.90/src/init.c	2010-02-22 11:04:16.000000000 -0500
+@@ -23,7 +23,7 @@
+ static void init_selinuxmnt(void)
+ {
+ 	char *buf=NULL, *p;
+-	FILE *fp;
++	FILE *fp=NULL;
+ 	struct statfs sfbuf;
+ 	int rc;
+ 	size_t len;
+@@ -57,16 +57,17 @@
+ 			break;
+ 		}
+ 	}
+-	fclose(fp);
+ 
+-	if (!exists)
+-		return;
++	if (!exists) 
++		goto out;
++
++	fclose(fp);
+ 
+ 	/* At this point, the usual spot doesn't have an selinuxfs so
+ 	 * we look around for it */
+ 	fp = fopen("/proc/mounts", "r");
+ 	if (!fp)
+-		return;
++		goto out;
+ 
+ 	__fsetlocking(fp, FSETLOCKING_BYCALLER);
+ 	while ((num = getline(&buf, &len, fp)) != -1) {
+@@ -90,7 +91,8 @@
+ 
+       out:
+ 	free(buf);
+-	fclose(fp);
++	if (fp)
++		fclose(fp);
+ 	return;
+ }
+ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/label_file.c libselinux-2.0.90/src/label_file.c
+--- nsalibselinux/src/label_file.c	2009-05-18 13:53:14.000000000 -0400
++++ libselinux-2.0.90/src/label_file.c	2010-01-18 16:53:54.000000000 -0500
+@@ -20,6 +20,9 @@
+ #include "callbacks.h"
+ #include "label_internal.h"
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ /*
+  * Internals, mostly moved over from matchpathcon.c
+  */
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/libselinux.pc.in libselinux-2.0.90/src/libselinux.pc.in
+--- nsalibselinux/src/libselinux.pc.in	2009-11-02 12:58:30.000000000 -0500
++++ libselinux-2.0.90/src/libselinux.pc.in	2010-02-18 10:02:46.000000000 -0500
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@libdir@
+ includedir=@includedir@
+ 
+ Name: libselinux
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.90/src/Makefile
+--- nsalibselinux/src/Makefile	2009-12-01 15:46:50.000000000 -0500
++++ libselinux-2.0.90/src/Makefile	2010-02-18 10:20:27.000000000 -0500
+@@ -11,6 +11,7 @@
+ RUBYPLATFORM ?= $(shell ruby -e 'print RUBY_PLATFORM')
+ RUBYINC ?= $(LIBDIR)/ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
+ RUBYINSTALL ?= $(LIBDIR)/ruby/site_ruby/$(RUBYLIBVER)/$(RUBYPLATFORM)
++LIBBASE=$(shell basename $(LIBDIR))
+ 
+ VERSION = $(shell cat ../VERSION)
+ LIBVERSION = 1
+@@ -85,7 +86,7 @@
+ 	ln -sf $@ $(TARGET) 
+ 
+ $(LIBPC): $(LIBPC).in
+-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
++	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+ 
+ selinuxswig_python_exception.i: ../include/selinux/selinux.h
+ 	bash exception.sh > $@ 
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.90/src/matchpathcon.c
 --- nsalibselinux/src/matchpathcon.c	2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.86/src/matchpathcon.c	2009-09-15 15:20:59.000000000 -0400
++++ libselinux-2.0.90/src/matchpathcon.c	2010-01-18 16:52:28.000000000 -0500
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>

libselinux.spec

@@ -4,8 +4,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.87
-Release: 1%{?dist}
+Version: 2.0.90
+Release: 5%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -147,6 +147,7 @@ exit 0
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libselinux.so
+%{_libdir}/pkgconfig/libselinux.pc
 %dir %{_includedir}/selinux
 %{_includedir}/selinux/*
 %{_mandir}/man3/*
@@ -165,6 +166,34 @@ exit 0
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Mon Feb 22 2010 Dan Walsh <dwalsh@redhat.com> - 2.0.90-5
+- Fix potential doublefree on init
+
+* Thu Feb 18 2010 Dan Walsh <dwalsh@redhat.com> - 2.0.90-4
+- Fix libselinux.pc
+
+* Mon Jan 18 2010 Dan Walsh <dwalsh@redhat.com> - 2.0.90-3
+- Fix man page for selinuxdefcon
+
+* Mon Jan 4 2010 Dan Walsh <dwalsh@redhat.com> - 2.0.90-2
+- Free memory on disabled selinux boxes
+
+* Tue Dec 1 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.90-1
+- Update to upstream 
+	* add/reformat man pages by Guido Trentalancia <guido@trentalancia.com>.
+	* Change exception.sh to be called with bash by Manoj Srivastava <srivasta@debian.org>
+
+* Mon Nov 2 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.89-2
+- Fix selinuxdefcon man page
+
+* Mon Nov 2 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.89-1
+- Update to upstream 
+	* Add pkgconfig file from Eamon Walsh.
+
+* Thu Oct 29 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.88-1
+- Update to upstream 
+	* Rename and export selinux_reset_config()
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.87-1
 - Update to upstream 
 	* Add exception handling in libselinux from Dan Walsh. This uses a

sources

@@ -1 +1 @@
-f70774d224d4e36ffcccd89ff03648cb  libselinux-2.0.87.tgz
+87c744d919d632502ca91ca213c2168f  libselinux-2.0.90.tgz