rpms/libselinux/devel .cvsignore, 1.89, 1.90 libselinux-rhat.patch, 1.68, 1.69 libselinux.spec, 1.153, 1.154 sources, 1.91, 1.92

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Nov 29 03:02:46 UTC 2005 

Author: dwalsh

Update of /cvs/dist/rpms/libselinux/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25912

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Mon Nov 28 2005 Dan Walsh <dwalsh at redhat.com> 1.27.22-4
- Separate out libselinux-python bindings into separate rpm



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- .cvsignore	17 Nov 2005 02:41:51 -0000	1.89
+++ .cvsignore	29 Nov 2005 03:02:14 -0000	1.90
@@ -63,3 +63,4 @@
 libselinux-1.27.20.tgz
 libselinux-1.27.21.tgz
 libselinux-1.27.22.tgz
+libselinux-1.27.23.tgz

libselinux-rhat.patch:
 Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- libselinux-rhat.patch	28 Nov 2005 22:02:11 -0000	1.68
+++ libselinux-rhat.patch	29 Nov 2005 03:02:16 -0000	1.69
@@ -1,188 +1,26 @@
 diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-1.27.22/src/Makefile
---- nsalibselinux/src/Makefile	2005-11-16 21:39:52.000000000 -0500
-+++ libselinux-1.27.22/src/Makefile	2005-11-28 16:48:08.000000000 -0500
-@@ -3,25 +3,41 @@
+--- nsalibselinux/src/Makefile	2005-11-28 21:47:32.000000000 -0500
++++ libselinux-1.27.22/src/Makefile	2005-11-28 16:57:58.000000000 -0500
+@@ -3,10 +3,10 @@
  LIBDIR ?= $(PREFIX)/lib
  SHLIBDIR ?= $(DESTDIR)/lib
  INCLUDEDIR ?= $(PREFIX)/include
-+PYLIBVER ?= python2.4
+-PYINC ?= /usr/include/python2.4
+-PYLIB ?= /usr/lib/python2.4
+ PYLIBVER ?= python2.4
+-PYTHONLIBDIR ?= $(LIBDIR)/python2.4
 +PYINC ?= /usr/include/$(PYLIBVER)
 +PYLIB ?= /usr/lib/$(PYLIBVER)
 +PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
  
  LIBVERSION = 1
  
--
- LIBA=libselinux.a 
- TARGET=libselinux.so
-+SWIGIF= selinuxswig.i
-+SWIGCOUT= selinuxswig_wrap.c
-+SWIGLOBJ:= $(patsubst %.c,%.lo,$(SWIGCOUT)) 
-+SWIGSO=_selinux.so
-+SWIGFILES=$(SWIGSO) selinux.py 
- LIBSO=$(TARGET).$(LIBVERSION)
--OBJS= $(patsubst %.c,%.o,$(wildcard *.c))
--LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c))
-+OBJS= $(patsubst %.c,%.o,$(filter-out $(SWIGCOUT),$(wildcard *.c))) 
-+LOBJS= $(patsubst %.c,%.lo,$(filter-out $(SWIGCOUT),$(wildcard *.c)))
- CFLAGS ?= -Wall -W -Wundef -Wmissing-noreturn -Wmissing-format-attribute
- override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
- RANLIB=ranlib
+@@ -36,7 +36,7 @@
+ 	$(CC) $(CFLAGS) -I$(PYINC) -fpic -DSHARED -c -o $@ $<
  
--all: $(LIBA) $(LIBSO)
-+SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
-+
-+all: $(LIBA) $(LIBSO) $(SWIGSO)
- 
- $(LIBA):  $(OBJS)
- 	$(AR) rcs $@ $^
- 	$(RANLIB) $@
- 
-+$(SWIGLOBJ): $(SWIGCOUT)
-+	$(CC) $(CFLAGS) -I$(PYINC) -fpic -DSHARED -c -o $@ $<
-+
-+$(SWIGSO): $(SWIGLOBJ)
+ $(SWIGSO): $(SWIGLOBJ)
+-	$(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -l$(PYLIBVER) -L$(LIBDIR) -Wl,-soname,$@,-z,defs
 +	$(CC) $(LDFLAGS) -shared -o $@ $< -L. -lselinux -L$(LIBDIR) -Wl,-soname,$@
-+
+ 
  $(LIBSO): $(LOBJS)
  	$(CC) $(LDFLAGS) -shared -o $@ $^ -ldl -lsepol -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs
- 	ln -sf $@ $(TARGET) 
-@@ -32,16 +48,26 @@
- %.lo:  %.c policy.h
- 	$(CC) $(CFLAGS) -fpic -DSHARED -c -o $@ $<
- 
--install: all
-+$(SWIGCOUT): $(SWIGIF)
-+	$(SWIG) $^
-+
-+swigify: $(SWIGIF)
-+	$(SWIG) $^
-+
-+install: all install-pywrap
- 	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
- 	install -m 644 $(LIBA) $(LIBDIR)
- 	test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
- 	install -m 755 $(LIBSO) $(SHLIBDIR)
- 	cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
- 
-+install-pywrap: 
-+	test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
-+	install -m 755 $(SWIGFILES) $(PYTHONLIBDIR)/site-packages
-+
- relabel:
- 	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
- 
- clean: 
--	-rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) 
-+	-rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) 
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.27.22/src/selinuxswig.i
---- nsalibselinux/src/selinuxswig.i	1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-1.27.22/src/selinuxswig.i	2005-11-17 12:02:28.000000000 -0500
-@@ -0,0 +1,105 @@
-+/* Author: Dan Walsh
-+ *
-+ * Copyright (C) 2004-2005 Red Hat
-+ * 
-+ *  This library is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU Lesser General Public
-+ *  License as published by the Free Software Foundation; either
-+ *  version 2.1 of the License, or (at your option) any later version.
-+ *
-+ *  This library is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *  Lesser General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU Lesser General Public
-+ *  License along with this library; if not, write to the Free Software
-+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ */
-+
-+
-+%module selinux
-+%{
-+	#include "selinux/selinux.h"
-+%}
-+
-+extern int is_selinux_enabled(void);
-+extern int is_selinux_mls_enabled(void);
-+extern int getcon(security_context_t *con);
-+extern int setcon(security_context_t con);
-+extern int getpidcon(pid_t pid, security_context_t *con);
-+extern int getprevcon(security_context_t *con);
-+extern int getexeccon(security_context_t *con);
-+extern int setexeccon(security_context_t con);
-+extern int getfscreatecon(security_context_t *con);
-+extern int setfscreatecon(security_context_t context);
-+extern int getfilecon(const char *path, security_context_t *con);
-+extern int lgetfilecon(const char *path, security_context_t *con);
-+extern int fgetfilecon(int fd, security_context_t *con);
-+extern int setfilecon(const char *path, security_context_t con);
-+extern int lsetfilecon(const char *path, security_context_t con);
-+extern int fsetfilecon(int fd, security_context_t con);
-+extern int getpeercon(int fd, security_context_t *con);
-+extern int selinux_mkload_policy(int preservebools);
-+extern int selinux_init_load_policy(int *enforce);
-+extern int security_set_boolean_list(size_t boolcnt, 
-+				     SELboolean *boollist, 
-+				     int permanent);
-+extern int security_load_booleans(char *path);
-+extern int security_check_context(security_context_t con);
-+extern int security_canonicalize_context(security_context_t con,
-+					 security_context_t *canoncon);
-+extern int security_getenforce(void);
-+extern int security_setenforce(int value);
-+extern int security_disable(void);
-+extern int security_policyvers(void);
-+extern int security_get_boolean_names(char ***names, int *len);
-+extern int security_get_boolean_pending(const char *name);
-+extern int security_get_boolean_active(const char *name);
-+extern int security_set_boolean(const char *name, int value);
-+extern int security_commit_booleans(void);
-+
-+/* Set flags controlling operation of matchpathcon_init or matchpathcon. */
-+#define MATCHPATHCON_BASEONLY 1 /* Only process the base file_contexts file. */
-+#define MATCHPATHCON_NOTRANS  2 /* Do not perform any context translation. */
-+extern void set_matchpathcon_flags(unsigned int flags);
-+extern int matchpathcon_init(const char *path);
-+extern int matchpathcon(const char *path,
-+			mode_t mode,
-+			security_context_t *con);
-+
-+extern int matchmediacon(const char *media,
-+		 security_context_t *con);
-+
-+extern int selinux_getenforcemode(int *enforce);
-+extern const char *selinux_policy_root(void);
-+extern const char *selinux_binary_policy_path(void);
-+extern const char *selinux_failsafe_context_path(void);
-+extern const char *selinux_removable_context_path(void);
-+extern const char *selinux_default_context_path(void);
-+extern const char *selinux_user_contexts_path(void);
-+extern const char *selinux_file_context_path(void);
-+extern const char *selinux_homedir_context_path(void);
-+extern const char *selinux_media_context_path(void);
-+extern const char *selinux_contexts_path(void);
-+extern const char *selinux_booleans_path(void);
-+extern const char *selinux_customizable_types_path(void);
-+extern const char *selinux_users_path(void);
-+extern const char *selinux_usersconf_path(void);
-+extern const char *selinux_translations_path(void);
-+extern const char *selinux_path(void);
-+extern int selinux_check_passwd_access(access_vector_t requested);
-+extern int checkPasswdAccess(access_vector_t requested);
-+extern int rpm_execcon(unsigned int verified, 
-+		       const char *filename, 
-+		       char *const argv[], char *const envp[]);
-+
-+extern int is_context_customizable (security_context_t scontext);
-+
-+extern int selinux_trans_to_raw_context(security_context_t trans, 
-+					security_context_t *rawp);
-+extern int selinux_raw_to_trans_context(security_context_t raw, 
-+					security_context_t *transp);
-+
-+extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);
-+
-+}


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- libselinux.spec	28 Nov 2005 22:02:25 -0000	1.153
+++ libselinux.spec	29 Nov 2005 03:02:29 -0000	1.154
@@ -1,8 +1,8 @@
-%define libsepolver 1.9.40-1
+%define libsepolver 1.9.41-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.27.22
-Release: 4
+Version: 1.27.23
+Release: 1 
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources	17 Nov 2005 02:41:51 -0000	1.91
+++ sources	29 Nov 2005 03:02:30 -0000	1.92
@@ -1 +1 @@
-2b7233ca20f87666edc9dbc640bc76f9  libselinux-1.27.22.tgz
+39648e5fe7098c18209b96a3ced063f3  libselinux-1.27.23.tgz

More information about the fedora-cvs-commits mailing list