rpms/libsemanage/devel .cvsignore, 1.104, 1.105 libsemanage-rhat.patch, 1.56, 1.57 libsemanage.spec, 1.184, 1.185 sources, 1.107, 1.108
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Sep 17 13:03:00 UTC 2009
- Previous message (by thread): rpms/mingw32-binutils/devel .cvsignore, 1.5, 1.6 mingw32-binutils.spec, 1.9, 1.10 sources, 1.5, 1.6
- Next message (by thread): rpms/dvisvgm/F-11 .cvsignore, 1.1, 1.2 dvisvgm.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/libsemanage/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25443
Modified Files:
.cvsignore libsemanage-rhat.patch libsemanage.spec sources
Log Message:
* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-1
- Update to upstream
* Change semodule upgrade behavior to install even if the module
is not present from Dan Walsh.
* Make genhomedircon trim excess '/' from homedirs from Dan Walsh.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- .cvsignore 9 Sep 2009 17:57:12 -0000 1.104
+++ .cvsignore 17 Sep 2009 13:02:58 -0000 1.105
@@ -110,3 +110,4 @@ libsemanage-2.0.33.tgz
libsemanage-2.0.35.tgz
libsemanage-2.0.36.tgz
libsemanage-2.0.37.tgz
+libsemanage-2.0.38.tgz
libsemanage-rhat.patch:
include/semanage/modules.h | 5 +
src/conf-parse.y | 2
src/direct_api.c | 119 +++++++++++++++++++++++++++++++++++++++++++--
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, 225 insertions(+), 17 deletions(-)
Index: libsemanage-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage-rhat.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- libsemanage-rhat.patch 9 Sep 2009 17:57:12 -0000 1.56
+++ libsemanage-rhat.patch 17 Sep 2009 13:02:59 -0000 1.57
@@ -35,8 +35,8 @@ diff --exclude-from=exclude -N -u -r nsa
}
conf->load_policy->args = NULL;
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/direct_api.c libsemanage-2.0.37/src/direct_api.c
---- nsalibsemanage/src/direct_api.c 2009-09-08 09:03:10.000000000 -0400
-+++ libsemanage-2.0.37/src/direct_api.c 2009-09-09 13:55:07.000000000 -0400
+--- nsalibsemanage/src/direct_api.c 2009-09-17 08:59:43.000000000 -0400
++++ libsemanage-2.0.37/src/direct_api.c 2009-09-10 17:15:32.000000000 -0400
@@ -66,6 +66,8 @@
static int semanage_direct_install_base(semanage_handle_t * sh, char *base_data,
size_t data_len);
@@ -74,7 +74,7 @@ diff --exclude-from=exclude -N -u -r nsa
return 0;
}
-@@ -1277,6 +1288,107 @@
+@@ -1273,6 +1284,107 @@
return retval;
}
@@ -182,7 +182,7 @@ diff --exclude-from=exclude -N -u -r nsa
/* Removes a module from the sandbox. Returns 0 on success, -1 if out
* of memory, -2 if module not found or could not be removed. */
static int semanage_direct_remove(semanage_handle_t * sh, char *module_name)
-@@ -1297,8 +1409,7 @@
+@@ -1293,8 +1405,7 @@
goto cleanup;
}
base++;
@@ -192,7 +192,7 @@ diff --exclude-from=exclude -N -u -r nsa
if (unlink(module_filenames[i]) == -1) {
ERR(sh, "Could not remove module file %s.",
module_filenames[i]);
-@@ -1373,6 +1484,7 @@
+@@ -1369,6 +1480,7 @@
}
ssize_t size;
char *data = NULL;
@@ -200,7 +200,7 @@ diff --exclude-from=exclude -N -u -r nsa
if ((size = bunzip(sh, fp, &data)) > 0) {
fclose(fp);
-@@ -1397,6 +1509,7 @@
+@@ -1393,6 +1505,7 @@
if (type == SEPOL_POLICY_MOD) {
(*modinfo)[*num_modules].name = name;
(*modinfo)[*num_modules].version = version;
@@ -208,42 +208,6 @@ 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.37/src/genhomedircon.c
---- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400
-+++ libsemanage-2.0.37/src/genhomedircon.c 2009-09-09 13:55:07.000000000 -0400
-@@ -304,10 +304,20 @@
- continue;
- if (!semanage_list_find(shells, pwbuf->pw_shell))
- continue;
-+ int len = strlen(pwbuf->pw_dir) -1;
-+ for(; len > 0 && pwbuf->pw_dir[len]=='/'; len--) {
-+ pwbuf->pw_dir[len]=0;
-+ }
- if (strcmp(pwbuf->pw_dir, "/") == 0)
- continue;
- if (semanage_str_count(pwbuf->pw_dir, '/') <= 1)
- continue;
-+
-+ if (strcmp(pwbuf->pw_dir, "/root") == 0) {
-+ /* don't relabel /root*/
-+ continue;
-+ }
-+
- if (!(path = strdup(pwbuf->pw_dir))) {
- break;
- }
-@@ -794,6 +804,11 @@
- * /root */
- continue;
- }
-+ if (strcmp(pwent->pw_dir, "/root") == 0) {
-+ /* don't relabel /root*/
-+ continue;
-+ }
-+
- 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.37/src/libsemanage.map
--- nsalibsemanage/src/libsemanage.map 2009-07-07 15:32:32.000000000 -0400
+++ libsemanage-2.0.37/src/libsemanage.map 2009-09-09 13:55:07.000000000 -0400
@@ -273,9 +237,9 @@ diff --exclude-from=exclude -N -u -r nsa
hidden_proto(semanage_module_list_nth)
#endif
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/modules.c libsemanage-2.0.37/src/modules.c
---- nsalibsemanage/src/modules.c 2009-01-13 08:45:35.000000000 -0500
-+++ libsemanage-2.0.37/src/modules.c 2009-09-09 13:55:07.000000000 -0400
-@@ -147,6 +147,40 @@
+--- nsalibsemanage/src/modules.c 2009-09-17 08:59:43.000000000 -0400
++++ libsemanage-2.0.37/src/modules.c 2009-09-10 17:15:42.000000000 -0400
+@@ -154,6 +153,40 @@
return sh->funcs->install_base_file(sh, module_name);
}
@@ -316,7 +280,7 @@ diff --exclude-from=exclude -N -u -r nsa
int semanage_module_remove(semanage_handle_t * sh, char *module_name)
{
if (sh->funcs->remove == NULL) {
-@@ -202,6 +236,13 @@
+@@ -209,6 +242,13 @@
hidden_def(semanage_module_get_name)
Index: libsemanage.spec
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- libsemanage.spec 9 Sep 2009 17:57:13 -0000 1.184
+++ libsemanage.spec 17 Sep 2009 13:02:59 -0000 1.185
@@ -2,7 +2,7 @@
%define libselinuxver 2.0.0-1
Summary: SELinux binary policy manipulation library
Name: libsemanage
-Version: 2.0.37
+Version: 2.0.38
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -91,6 +91,12 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/python*/site-packages/*
%changelog
+* Thu Sep 17 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.38-1
+- Update to upstream
+ * Change semodule upgrade behavior to install even if the module
+ is not present from Dan Walsh.
+ * Make genhomedircon trim excess '/' from homedirs from Dan Walsh.
+
* Wed Sep 9 2009 Dan Walsh <dwalsh at redhat.com> - 2.0.37-1
- Update to upstream
* Fix persistent dontaudit support to rebuild policy if the
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsemanage/devel/sources,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- sources 9 Sep 2009 17:57:13 -0000 1.107
+++ sources 17 Sep 2009 13:02:59 -0000 1.108
@@ -1 +1 @@
-bacf84c36e8e57a424da23eb585373ee libsemanage-2.0.37.tgz
+e4cde213b36fe94b30704600026c39f2 libsemanage-2.0.38.tgz
- Previous message (by thread): rpms/mingw32-binutils/devel .cvsignore, 1.5, 1.6 mingw32-binutils.spec, 1.9, 1.10 sources, 1.5, 1.6
- Next message (by thread): rpms/dvisvgm/F-11 .cvsignore, 1.1, 1.2 dvisvgm.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list