rpms/libsemanage/devel .cvsignore, 1.107, 1.108 libsemanage-rhat.patch, 1.58, 1.59 libsemanage.spec, 1.189, 1.190 sources, 1.110, 1.111

Daniel J Walsh dwalsh at fedoraproject.org
Wed Nov 18 22:19:06 UTC 2009


Author: dwalsh

Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23642

Modified Files:
	.cvsignore libsemanage-rhat.patch libsemanage.spec sources 
Log Message:
* Wed Nov 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.42-1
- Update to upstream
	* Move load_policy from /usr/sbin to /sbin from Dan Walsh.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- .cvsignore	2 Nov 2009 18:01:53 -0000	1.107
+++ .cvsignore	18 Nov 2009 22:19:05 -0000	1.108
@@ -114,3 +114,4 @@ libsemanage-2.0.38.tgz
 libsemanage-2.0.39.tgz
 libsemanage-2.0.40.tgz
 libsemanage-2.0.41.tgz
+libsemanage-2.0.42.tgz

libsemanage-rhat.patch:
 include/semanage/modules.h |    5 +
 src/direct_api.c           |  119 +++++++++++++++++++++++++++++++++++++++++++--
 src/genhomedircon.c        |    7 ++
 src/libsemanage.map        |    3 +
 src/module_internal.h      |    1 
 src/modules.c              |   41 +++++++++++++++
 src/modules.h              |    1 
 src/policy.h               |    6 ++
 src/semanage.conf          |    2 
 src/semanage_store.c       |   60 ++++++++++++++++++----
 src/semanage_store.h       |    2 
 11 files changed, 231 insertions(+), 16 deletions(-)

Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- libsemanage-rhat.patch	20 Sep 2009 11:43:05 -0000	1.58
+++ libsemanage-rhat.patch	18 Nov 2009 22:19:05 -0000	1.59
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.38/include/semanage/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/modules.h libsemanage-2.0.41/include/semanage/modules.h
 --- nsalibsemanage/include/semanage/modules.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.38/include/semanage/modules.h	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/include/semanage/modules.h	2009-11-12 11:01:10.000000000 -0500
 @@ -40,10 +40,12 @@
  				 char *module_data, size_t data_len);
  int semanage_module_install_base_file(semanage_handle_t *,
@@ -22,21 +22,9 @@ diff --exclude-from=exclude -N -u -r nsa
 +int semanage_module_get_enabled(semanage_module_info_t *);
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/conf-parse.y libsemanage-2.0.38/src/conf-parse.y
---- nsalibsemanage/src/conf-parse.y	2009-08-05 15:10:56.000000000 -0400
-+++ libsemanage-2.0.38/src/conf-parse.y	2009-09-20 07:35:51.000000000 -0400
-@@ -263,7 +263,7 @@
- 	     calloc(1, sizeof(*(current_conf->load_policy)))) == NULL) {
- 		return -1;
- 	}
--	if ((conf->load_policy->path = strdup("/usr/sbin/load_policy")) == NULL) {
-+	if ((conf->load_policy->path = strdup("/sbin/load_policy")) == NULL) {
- 		return -1;
- 	}
- 	conf->load_policy->args = NULL;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.38/src/direct_api.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.41/src/direct_api.c
 --- nsalibsemanage/src/direct_api.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.38/src/direct_api.c	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/src/direct_api.c	2009-11-12 11:01:10.000000000 -0500
 @@ -66,6 +66,8 @@
  static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
  					size_t data_len);
@@ -208,9 +196,9 @@ diff --exclude-from=exclude -N -u -r nsa
  			(*num_modules)++;
  		} else {
  			/* file was not a module, so don't report it */
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.38/src/genhomedircon.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.41/src/genhomedircon.c
 --- nsalibsemanage/src/genhomedircon.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.38/src/genhomedircon.c	2009-09-20 07:41:58.000000000 -0400
++++ libsemanage-2.0.41/src/genhomedircon.c	2009-11-12 11:01:10.000000000 -0500
 @@ -310,6 +310,10 @@
  		}
  		if (strcmp(pwbuf->pw_dir, "/") == 0)
@@ -232,9 +220,9 @@ diff --exclude-from=exclude -N -u -r nsa
  		if (push_user_entry(&head, name, seuname,
  				    prefix, pwent->pw_dir) != STATUS_SUCCESS) {
  			*errors = STATUS_ERR;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.38/src/libsemanage.map
---- nsalibsemanage/src/libsemanage.map	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.38/src/libsemanage.map	2009-09-20 07:35:51.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-2.0.41/src/libsemanage.map
+--- nsalibsemanage/src/libsemanage.map	2009-10-29 15:21:39.000000000 -0400
++++ libsemanage-2.0.41/src/libsemanage.map	2009-11-12 11:01:10.000000000 -0500
 @@ -6,10 +6,13 @@
  	  semanage_module_install; semanage_module_install_file;
  	  semanage_module_upgrade; semanage_module_upgrade_file;
@@ -249,9 +237,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	  semanage_reload_policy; semanage_set_reload; semanage_set_rebuild;
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.38/src/module_internal.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/module_internal.h libsemanage-2.0.41/src/module_internal.h
 --- nsalibsemanage/src/module_internal.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.38/src/module_internal.h	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/src/module_internal.h	2009-11-12 11:01:10.000000000 -0500
 @@ -6,6 +6,7 @@
  
  hidden_proto(semanage_module_get_name)
@@ -260,9 +248,9 @@ diff --exclude-from=exclude -N -u -r nsa
      hidden_proto(semanage_module_info_datum_destroy)
      hidden_proto(semanage_module_list_nth)
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.38/src/modules.c
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.41/src/modules.c
 --- nsalibsemanage/src/modules.c	2009-09-17 08:59:43.000000000 -0400
-+++ libsemanage-2.0.38/src/modules.c	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/src/modules.c	2009-11-12 11:01:10.000000000 -0500
 @@ -154,6 +154,40 @@
  	return sh->funcs->install_base_file(sh, module_name);
  }
@@ -318,9 +306,9 @@ diff --exclude-from=exclude -N -u -r nsa
  const char *semanage_module_get_version(semanage_module_info_t * modinfo)
  {
  	return modinfo->version;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.38/src/modules.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.h libsemanage-2.0.41/src/modules.h
 --- nsalibsemanage/src/modules.h	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.38/src/modules.h	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/src/modules.h	2009-11-12 11:01:10.000000000 -0500
 @@ -26,6 +26,7 @@
  struct semanage_module_info {
  	char *name;		/* Key */
@@ -329,9 +317,9 @@ diff --exclude-from=exclude -N -u -r nsa
  };
  
  #endif
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.38/src/policy.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy.h libsemanage-2.0.41/src/policy.h
 --- nsalibsemanage/src/policy.h	2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.38/src/policy.h	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/src/policy.h	2009-11-12 11:01:10.000000000 -0500
 @@ -58,6 +58,12 @@
  	/* Upgrade a policy module */
  	int (*upgrade_file) (struct semanage_handle *, const char *);
@@ -345,18 +333,18 @@ diff --exclude-from=exclude -N -u -r nsa
  	/* Remove a policy module */
  	int (*remove) (struct semanage_handle *, char *);
  
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.38/src/semanage.conf
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.41/src/semanage.conf
 --- nsalibsemanage/src/semanage.conf	2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.38/src/semanage.conf	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/src/semanage.conf	2009-11-12 11:01:10.000000000 -0500
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
  #policy-version = 19
 -
 +expand-check=0
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.38/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2009-08-05 15:10:56.000000000 -0400
-+++ libsemanage-2.0.38/src/semanage_store.c	2009-09-20 07:35:51.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.41/src/semanage_store.c
+--- nsalibsemanage/src/semanage_store.c	2009-10-29 15:21:39.000000000 -0400
++++ libsemanage-2.0.41/src/semanage_store.c	2009-11-12 11:01:10.000000000 -0500
 @@ -57,6 +57,8 @@
  
  #include "debug.h"
@@ -459,9 +447,9 @@ diff --exclude-from=exclude -N -u -r nsa
  	    -1 || semanage_load_module(sh, base_filename, base) == -1) {
  		goto cleanup;
  	}
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.38/src/semanage_store.h
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.h libsemanage-2.0.41/src/semanage_store.h
 --- nsalibsemanage/src/semanage_store.h	2009-07-07 15:32:32.000000000 -0400
-+++ libsemanage-2.0.38/src/semanage_store.h	2009-09-20 07:35:51.000000000 -0400
++++ libsemanage-2.0.41/src/semanage_store.h	2009-11-12 11:01:10.000000000 -0500
 @@ -128,4 +128,6 @@
  		     size_t buf_len,
  		     char **sorted_buf, size_t * sorted_buf_len);


Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -p -r1.189 -r1.190
--- libsemanage.spec	2 Nov 2009 18:11:54 -0000	1.189
+++ libsemanage.spec	18 Nov 2009 22:19:06 -0000	1.190
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.41
+Version: 2.0.42
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -92,6 +92,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python*/site-packages/*
 
 %changelog
+* Wed Nov 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.42-1
+- Update to upstream
+	* Move load_policy from /usr/sbin to /sbin from Dan Walsh.
+
 * Mon Nov 2 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.41-1
 - Update to upstream
 	* Add pkgconfig file from Eamon Walsh.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- sources	2 Nov 2009 18:01:53 -0000	1.110
+++ sources	18 Nov 2009 22:19:06 -0000	1.111
@@ -1 +1 @@
-df62e25783b44d2edada3fbd5b06d960  libsemanage-2.0.41.tgz
+0fadd711479ed67fd8fb87bed58f1cb7  libsemanage-2.0.42.tgz




More information about the fedora-extras-commits mailing list