rpms/libselinux/devel .cvsignore, 1.187, 1.188 libselinux-rhat.patch, 1.198, 1.199 libselinux.spec, 1.377, 1.378 sources, 1.190, 1.191
Daniel J Walsh
dwalsh at fedoraproject.org
Mon Sep 28 20:33:26 UTC 2009
- Previous message (by thread): rpms/maximus/devel maximus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/libsemanage/devel .cvsignore, 1.105, 1.106 libsemanage.spec, 1.186, 1.187 sources, 1.108, 1.109
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/libselinux/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6807
Modified Files:
.cvsignore libselinux-rhat.patch libselinux.spec sources
Log Message:
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.87-1
- Update to upstream
* Add exception handling in libselinux from Dan Walsh. This uses a
shell script called exception.sh to generate a swig interface file.
* make swigify
* Make matchpathcon print <<none>> if path not found in fcontext file.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- .cvsignore 8 Sep 2009 13:09:19 -0000 1.187
+++ .cvsignore 28 Sep 2009 20:33:24 -0000 1.188
@@ -170,3 +170,4 @@ libselinux-2.0.83.tgz
libselinux-2.0.84.tgz
libselinux-2.0.85.tgz
libselinux-2.0.86.tgz
+libselinux-2.0.87.tgz
libselinux-rhat.patch:
man/man8/selinuxconlist.8 | 18 ++++++++++++++++++
man/man8/selinuxdefcon.8 | 19 +++++++++++++++++++
src/callbacks.c | 1 +
src/matchpathcon.c | 3 ++-
4 files changed, 40 insertions(+), 1 deletion(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.198 -r 1.199 libselinux-rhat.patchIndex: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- libselinux-rhat.patch 15 Sep 2009 19:24:21 -0000 1.198
+++ libselinux-rhat.patch 28 Sep 2009 20:33:24 -0000 1.199
@@ -54,55 +54,6 @@ diff --exclude-from=exclude -N -u -r nsa
va_start(ap, fmt);
rc = vfprintf(stderr, fmt, ap);
va_end(ap);
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/exception.sh libselinux-2.0.86/src/exception.sh
---- nsalibselinux/src/exception.sh 1969-12-31 19:00:00.000000000 -0500
-+++ libselinux-2.0.86/src/exception.sh 2009-09-15 15:20:59.000000000 -0400
-@@ -0,0 +1,12 @@
-+function except() {
-+echo "
-+%exception $1 {
-+ \$action
-+ if (result < 0) {
-+ PyErr_SetFromErrno(PyExc_OSError);
-+ return NULL;
-+ }
-+}
-+"
-+}
-+for i in `grep "extern *int" ../include/selinux/selinux.h | awk '{ print $3 }' | cut -d '(' -f 1`; do except $i ; done
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-2.0.86/src/Makefile
---- nsalibselinux/src/Makefile 2009-07-14 11:16:03.000000000 -0400
-+++ libselinux-2.0.86/src/Makefile 2009-09-15 15:21:17.000000000 -0400
-@@ -82,6 +82,9 @@
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -ldl -L$(LIBDIR) -Wl,-soname,$(LIBSO),-z,defs,-z,relro
- ln -sf $@ $(TARGET)
-
-+selinuxswig_exception.i: ../include/selinux/selinux.h
-+ sh exception.sh > $@
-+
- audit2why.lo: audit2why.c
- $(CC) $(CFLAGS) -I$(PYINC) -fPIC -DSHARED -c -o $@ $<
-
-@@ -100,8 +103,8 @@
- $(SWIGRUBYCOUT): $(SWIGRUBYIF)
- $(SWIGRUBY) $^
-
--swigify: $(SWIGIF)
-- $(SWIG) $^
-+swigify: $(SWIGIF) selinuxswig_exception.i
-+ $(SWIG) $<
-
- install: all
- test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
-@@ -124,7 +127,7 @@
- /sbin/restorecon $(SHLIBDIR)/$(LIBSO)
-
- clean:
-- -rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~
-+ -rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) $(AUDIT2WHYSO) *.o *.lo *~ selinuxswig_exception.i
-
- distclean: clean
- rm -f $(GENERATED) $(SWIGFILES)
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.86/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
@@ -123,16686 +74,3 @@ diff --exclude-from=exclude -N -u -r nsa
va_end(ap);
}
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux.py libselinux-2.0.86/src/selinux.py
---- nsalibselinux/src/selinux.py 2009-03-06 14:41:45.000000000 -0500
-+++ libselinux-2.0.86/src/selinux.py 2009-09-15 15:20:59.000000000 -0400
-@@ -1,12 +1,26 @@
- # This file was automatically generated by SWIG (http://www.swig.org).
--# Version 1.3.35
-+# Version 1.3.38
- #
--# Don't modify this file, modify the SWIG interface instead.
-+# Do not make changes to this file unless you know what you are doing--modify
-+# the SWIG interface file instead.
- # This file is compatible with both classic and new-style classes.
-
--import _selinux
--import new
--new_instancemethod = new.instancemethod
-+from sys import version_info
-+if version_info >= (2,6,0):
-+ def swig_import_helper():
-+ from os.path import dirname
-+ import imp
-+ try:
-+ fp, pathname, description = imp.find_module('_selinux', [dirname(__file__)])
-+ _mod = imp.load_module('_selinux', fp, pathname, description)
-+ finally:
-+ if fp is not None: fp.close()
-+ return _mod
-+ _selinux = swig_import_helper()
-+ del swig_import_helper
-+else:
-+ import _selinux
-+del version_info
- try:
- _swig_property = property
- except NameError:
-@@ -14,7 +28,7 @@
- def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
- if (name == "thisown"): return self.this.own(value)
- if (name == "this"):
-- if type(value).__name__ == 'PySwigObject':
-+ if type(value).__name__ == 'SwigPyObject':
- self.__dict__[name] = value
- return
- method = class_type.__swig_setmethods__.get(name,None)
-@@ -31,21 +45,19 @@
- if (name == "thisown"): return self.this.own()
- method = class_type.__swig_getmethods__.get(name,None)
- if method: return method(self)
-- raise AttributeError,name
-+ raise AttributeError(name)
-
- def _swig_repr(self):
- try: strthis = "proxy of " + self.this.__repr__()
- except: strthis = ""
- return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
--import types
- try:
-- _object = types.ObjectType
-+ _object = object
- _newclass = 1
- except AttributeError:
- class _object : pass
- _newclass = 0
--del types
-
-
- import shutil, os, stat
-@@ -61,46 +73,1507 @@
- map(restorecon, [os.path.join(dirname, fname)
- for fname in fnames]), None)
-
-+def copytree(src, dest):
-+ """ An SELinux-friendly shutil.copytree method """
-+ shutil.copytree(src, dest)
-+ restorecon(dest, recursive=True)
-+
-+def install(src, dest):
-+ """ An SELinux-friendly shutil.move method """
-+ shutil.move(src, dest)
-+ restorecon(dest, recursive=True)
-
-+
-+def avc_sid_to_context(*args):
-+ return _selinux.avc_sid_to_context(*args)
-+avc_sid_to_context = _selinux.avc_sid_to_context
-+
-+def avc_sid_to_context_raw(*args):
-+ return _selinux.avc_sid_to_context_raw(*args)
-+avc_sid_to_context_raw = _selinux.avc_sid_to_context_raw
-+
-+def avc_context_to_sid(*args):
-+ return _selinux.avc_context_to_sid(*args)
-+avc_context_to_sid = _selinux.avc_context_to_sid
-+
-+def avc_context_to_sid_raw(*args):
-+ return _selinux.avc_context_to_sid_raw(*args)
-+avc_context_to_sid_raw = _selinux.avc_context_to_sid_raw
-+
-+def sidget(*args):
-+ return _selinux.sidget(*args)
-+sidget = _selinux.sidget
-+
-+def sidput(*args):
-+ return _selinux.sidput(*args)
-+sidput = _selinux.sidput
-+
-+def avc_get_initial_sid(*args):
-+ return _selinux.avc_get_initial_sid(*args)
-+avc_get_initial_sid = _selinux.avc_get_initial_sid
-+AVC_OPT_UNUSED = _selinux.AVC_OPT_UNUSED
-+AVC_OPT_SETENFORCE = _selinux.AVC_OPT_SETENFORCE
-+
-+def avc_init(*args):
-+ return _selinux.avc_init(*args)
-+avc_init = _selinux.avc_init
-+
-+def avc_open(*args):
-+ return _selinux.avc_open(*args)
-+avc_open = _selinux.avc_open
-+
-+def avc_reset():
-+ return _selinux.avc_reset()
-+avc_reset = _selinux.avc_reset
-+
-+def avc_has_perm_noaudit(*args):
-+ return _selinux.avc_has_perm_noaudit(*args)
-+avc_has_perm_noaudit = _selinux.avc_has_perm_noaudit
-+
-+def avc_has_perm(*args):
-+ return _selinux.avc_has_perm(*args)
-+avc_has_perm = _selinux.avc_has_perm
[...16351 lines suppressed...]
-+ SWIG_Python_SetConstant(d, "DB_TABLE__USE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+ SWIG_Python_SetConstant(d, "DB_TABLE__SELECT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+ SWIG_Python_SetConstant(d, "DB_TABLE__UPDATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000100UL)));
-+ SWIG_Python_SetConstant(d, "DB_TABLE__INSERT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000200UL)));
-+ SWIG_Python_SetConstant(d, "DB_TABLE__DELETE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000400UL)));
-+ SWIG_Python_SetConstant(d, "DB_TABLE__LOCK",SWIG_From_unsigned_SS_long((unsigned long)(0x00000800UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__CREATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__DROP",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__GETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__SETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__EXECUTE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+ SWIG_Python_SetConstant(d, "DB_PROCEDURE__ENTRYPOINT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__CREATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__DROP",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__GETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__SETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__USE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__SELECT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__UPDATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000100UL)));
-+ SWIG_Python_SetConstant(d, "DB_COLUMN__INSERT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000200UL)));
-+ SWIG_Python_SetConstant(d, "DB_TUPLE__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+ SWIG_Python_SetConstant(d, "DB_TUPLE__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+ SWIG_Python_SetConstant(d, "DB_TUPLE__USE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+ SWIG_Python_SetConstant(d, "DB_TUPLE__SELECT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+ SWIG_Python_SetConstant(d, "DB_TUPLE__UPDATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+ SWIG_Python_SetConstant(d, "DB_TUPLE__INSERT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+ SWIG_Python_SetConstant(d, "DB_TUPLE__DELETE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__CREATE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__DROP",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__GETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__SETATTR",SWIG_From_unsigned_SS_long((unsigned long)(0x00000008UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__RELABELFROM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000010UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__RELABELTO",SWIG_From_unsigned_SS_long((unsigned long)(0x00000020UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__READ",SWIG_From_unsigned_SS_long((unsigned long)(0x00000040UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__WRITE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000080UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__IMPORT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000100UL)));
-+ SWIG_Python_SetConstant(d, "DB_BLOB__EXPORT",SWIG_From_unsigned_SS_long((unsigned long)(0x00000200UL)));
-+ SWIG_Python_SetConstant(d, "PEER__RECV",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+ SWIG_Python_SetConstant(d, "X_APPLICATION_DATA__PASTE",SWIG_From_unsigned_SS_long((unsigned long)(0x00000001UL)));
-+ SWIG_Python_SetConstant(d, "X_APPLICATION_DATA__PASTE_AFTER_CONFIRM",SWIG_From_unsigned_SS_long((unsigned long)(0x00000002UL)));
-+ SWIG_Python_SetConstant(d, "X_APPLICATION_DATA__COPY",SWIG_From_unsigned_SS_long((unsigned long)(0x00000004UL)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_SECURITY",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_PROCESS",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_SYSTEM",SWIG_From_int((int)(3)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_CAPABILITY",SWIG_From_int((int)(4)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_FILESYSTEM",SWIG_From_int((int)(5)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_FILE",SWIG_From_int((int)(6)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DIR",SWIG_From_int((int)(7)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_FD",SWIG_From_int((int)(8)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_LNK_FILE",SWIG_From_int((int)(9)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_CHR_FILE",SWIG_From_int((int)(10)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_BLK_FILE",SWIG_From_int((int)(11)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_SOCK_FILE",SWIG_From_int((int)(12)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_FIFO_FILE",SWIG_From_int((int)(13)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_SOCKET",SWIG_From_int((int)(14)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_TCP_SOCKET",SWIG_From_int((int)(15)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_UDP_SOCKET",SWIG_From_int((int)(16)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_RAWIP_SOCKET",SWIG_From_int((int)(17)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NODE",SWIG_From_int((int)(18)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETIF",SWIG_From_int((int)(19)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_SOCKET",SWIG_From_int((int)(20)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_PACKET_SOCKET",SWIG_From_int((int)(21)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_KEY_SOCKET",SWIG_From_int((int)(22)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_UNIX_STREAM_SOCKET",SWIG_From_int((int)(23)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_UNIX_DGRAM_SOCKET",SWIG_From_int((int)(24)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_SEM",SWIG_From_int((int)(25)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_MSG",SWIG_From_int((int)(26)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_MSGQ",SWIG_From_int((int)(27)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_SHM",SWIG_From_int((int)(28)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_IPC",SWIG_From_int((int)(29)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_PASSWD",SWIG_From_int((int)(30)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_DRAWABLE",SWIG_From_int((int)(31)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_SCREEN",SWIG_From_int((int)(32)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_GC",SWIG_From_int((int)(33)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_FONT",SWIG_From_int((int)(34)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_COLORMAP",SWIG_From_int((int)(35)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_PROPERTY",SWIG_From_int((int)(36)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_SELECTION",SWIG_From_int((int)(37)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_CURSOR",SWIG_From_int((int)(38)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_CLIENT",SWIG_From_int((int)(39)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_DEVICE",SWIG_From_int((int)(40)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_SERVER",SWIG_From_int((int)(41)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_EXTENSION",SWIG_From_int((int)(42)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_ROUTE_SOCKET",SWIG_From_int((int)(43)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_FIREWALL_SOCKET",SWIG_From_int((int)(44)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_TCPDIAG_SOCKET",SWIG_From_int((int)(45)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_NFLOG_SOCKET",SWIG_From_int((int)(46)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_XFRM_SOCKET",SWIG_From_int((int)(47)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_SELINUX_SOCKET",SWIG_From_int((int)(48)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_AUDIT_SOCKET",SWIG_From_int((int)(49)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_IP6FW_SOCKET",SWIG_From_int((int)(50)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_DNRT_SOCKET",SWIG_From_int((int)(51)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DBUS",SWIG_From_int((int)(52)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NSCD",SWIG_From_int((int)(53)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_ASSOCIATION",SWIG_From_int((int)(54)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET",SWIG_From_int((int)(55)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_APPLETALK_SOCKET",SWIG_From_int((int)(56)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_PACKET",SWIG_From_int((int)(57)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_KEY",SWIG_From_int((int)(58)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_CONTEXT",SWIG_From_int((int)(59)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DCCP_SOCKET",SWIG_From_int((int)(60)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_MEMPROTECT",SWIG_From_int((int)(61)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DB_DATABASE",SWIG_From_int((int)(62)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DB_TABLE",SWIG_From_int((int)(63)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DB_PROCEDURE",SWIG_From_int((int)(64)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DB_COLUMN",SWIG_From_int((int)(65)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DB_TUPLE",SWIG_From_int((int)(66)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_DB_BLOB",SWIG_From_int((int)(67)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_PEER",SWIG_From_int((int)(68)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_CAPABILITY2",SWIG_From_int((int)(69)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_RESOURCE",SWIG_From_int((int)(70)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_EVENT",SWIG_From_int((int)(71)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_SYNTHETIC_EVENT",SWIG_From_int((int)(72)));
-+ SWIG_Python_SetConstant(d, "SECCLASS_X_APPLICATION_DATA",SWIG_From_int((int)(73)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_KERNEL",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SECURITY",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_UNLABELED",SWIG_From_int((int)(3)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_FS",SWIG_From_int((int)(4)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_FILE",SWIG_From_int((int)(5)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_FILE_LABELS",SWIG_From_int((int)(6)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_INIT",SWIG_From_int((int)(7)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_ANY_SOCKET",SWIG_From_int((int)(8)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_PORT",SWIG_From_int((int)(9)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_NETIF",SWIG_From_int((int)(10)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_NETMSG",SWIG_From_int((int)(11)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_NODE",SWIG_From_int((int)(12)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_IGMP_PACKET",SWIG_From_int((int)(13)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_ICMP_SOCKET",SWIG_From_int((int)(14)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_TCP_SOCKET",SWIG_From_int((int)(15)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_MODPROBE",SWIG_From_int((int)(16)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL",SWIG_From_int((int)(17)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_FS",SWIG_From_int((int)(18)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_KERNEL",SWIG_From_int((int)(19)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_NET",SWIG_From_int((int)(20)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_NET_UNIX",SWIG_From_int((int)(21)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_VM",SWIG_From_int((int)(22)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SYSCTL_DEV",SWIG_From_int((int)(23)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_KMOD",SWIG_From_int((int)(24)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_POLICY",SWIG_From_int((int)(25)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_SCMP_PACKET",SWIG_From_int((int)(26)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_DEVNULL",SWIG_From_int((int)(27)));
-+ SWIG_Python_SetConstant(d, "SECINITSID_NUM",SWIG_From_int((int)(27)));
- SWIG_Python_SetConstant(d, "SELINUX_DEFAULTUSER",SWIG_FromCharPtr("user_u"));
-+ SWIG_Python_SetConstant(d, "SELABEL_CTX_FILE",SWIG_From_int((int)(0)));
-+ SWIG_Python_SetConstant(d, "SELABEL_CTX_MEDIA",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "SELABEL_CTX_X",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "SELABEL_OPT_UNUSED",SWIG_From_int((int)(0)));
-+ SWIG_Python_SetConstant(d, "SELABEL_OPT_VALIDATE",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "SELABEL_OPT_BASEONLY",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "SELABEL_OPT_PATH",SWIG_From_int((int)(3)));
-+ SWIG_Python_SetConstant(d, "SELABEL_OPT_SUBSET",SWIG_From_int((int)(4)));
-+ SWIG_Python_SetConstant(d, "SELABEL_NOPT",SWIG_From_int((int)(5)));
-+ SWIG_Python_SetConstant(d, "SELABEL_X_PROP",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "SELABEL_X_EXT",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "SELABEL_X_CLIENT",SWIG_From_int((int)(3)));
-+ SWIG_Python_SetConstant(d, "SELABEL_X_EVENT",SWIG_From_int((int)(4)));
-+ SWIG_Python_SetConstant(d, "SELABEL_X_SELN",SWIG_From_int((int)(5)));
-+ SWIG_Python_SetConstant(d, "SELABEL_X_POLYPROP",SWIG_From_int((int)(6)));
-+ SWIG_Python_SetConstant(d, "SELABEL_X_POLYSELN",SWIG_From_int((int)(7)));
-+ SWIG_Python_SetConstant(d, "SELINUX_CB_LOG",SWIG_From_int((int)(0)));
-+ SWIG_Python_SetConstant(d, "SELINUX_CB_AUDIT",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "SELINUX_CB_VALIDATE",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "SELINUX_ERROR",SWIG_From_int((int)(0)));
-+ SWIG_Python_SetConstant(d, "SELINUX_WARNING",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "SELINUX_INFO",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "SELINUX_AVC",SWIG_From_int((int)(3)));
-+ SWIG_Python_SetConstant(d, "MATCHPATHCON_BASEONLY",SWIG_From_int((int)(1)));
-+ SWIG_Python_SetConstant(d, "MATCHPATHCON_NOTRANS",SWIG_From_int((int)(2)));
-+ SWIG_Python_SetConstant(d, "MATCHPATHCON_VALIDATE",SWIG_From_int((int)(4)));
-+#if PY_VERSION_HEX >= 0x03000000
-+ return m;
-+#else
-+ return;
-+#endif
- }
-
-diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.86/utils/matchpathcon.c
---- nsalibselinux/utils/matchpathcon.c 2009-05-18 13:53:14.000000000 -0400
-+++ libselinux-2.0.86/utils/matchpathcon.c 2009-09-15 15:20:59.000000000 -0400
-@@ -22,9 +22,13 @@
- char *buf;
- int rc = matchpathcon(path, mode, &buf);
- if (rc < 0) {
-- fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
-- strerror(errno));
-- return 1;
-+ if (errno == ENOENT) {
-+ buf=strdup("<<none>>");
-+ } else {
-+ fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
-+ strerror(errno));
-+ return 1;
-+ }
- }
- if (header)
- printf("%s\t%s\n", path, buf);
Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -p -r1.377 -r1.378
--- libselinux.spec 15 Sep 2009 19:24:22 -0000 1.377
+++ libselinux.spec 28 Sep 2009 20:33:26 -0000 1.378
@@ -4,8 +4,8 @@
Summary: SELinux library and simple utilities
Name: libselinux
-Version: 2.0.86
-Release: 2%{?dist}
+Version: 2.0.87
+Release: 1%{?dist}
License: Public Domain
Group: System Environment/Libraries
Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz
@@ -165,6 +165,13 @@ exit 0
%{ruby_sitearch}/selinux.so
%changelog
+* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.87-1
+- Update to upstream
+ * Add exception handling in libselinux from Dan Walsh. This uses a
+ shell script called exception.sh to generate a swig interface file.
+ * make swigify
+ * Make matchpathcon print <<none>> if path not found in fcontext file.
+
* Tue Sep 8 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.86-2
- Eliminate -pthread switch in Makefile
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -p -r1.190 -r1.191
--- sources 8 Sep 2009 13:09:19 -0000 1.190
+++ sources 28 Sep 2009 20:33:26 -0000 1.191
@@ -1 +1 @@
-c9939f17d81cb62f4050db0a0f2a54f6 libselinux-2.0.86.tgz
+f70774d224d4e36ffcccd89ff03648cb libselinux-2.0.87.tgz
- Previous message (by thread): rpms/maximus/devel maximus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/libsemanage/devel .cvsignore, 1.105, 1.106 libsemanage.spec, 1.186, 1.187 sources, 1.108, 1.109
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list