rpms/policycoreutils/devel .cvsignore, 1.57, 1.58 policycoreutils-rhat.patch, 1.94, 1.95 policycoreutils.spec, 1.124, 1.125 sources, 1.60, 1.61
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 27 14:05:34 UTC 2005
- Previous message (by thread): rpms/libsepol/devel .cvsignore, 1.27, 1.28 libsepol.spec, 1.43, 1.44 sources, 1.27, 1.28
- Next message (by thread): rpms/im-sdk/FC-3 httx-preedit-state-svn2544-146523.patch, NONE, 1.1 httx-status-focus-svn2500-146406.patch, NONE, 1.1 unitle-Punjabi-missing-keys-svn2604-151477.patch, NONE, 1.1 xiiimp-aux-segfault-svn2507-148765.patch, NONE, 1.1 xiiimp-close-candidate-146407.patch, NONE, 1.1 xiiimp-close-on-reset-svn2543-146407.patch, NONE, 1.1 xiiimp-pango.patch, NONE, 1.1 xiiimp-preedit-area-svn2505-147458.patch, NONE, 1.1 xiiimp-preedit-callback-svn2548-147459.patch, NONE, 1.1 xiiimp-preedit-return-value-svn2549-149607.patch, NONE, 1.1 im-sdk.spec, 1.100, 1.101 xiiimp-fix-gcc-warnings.patch, 1.1, 1.2 xiiimp.so-gcc-warnings.patch, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30570
Modified Files:
.cvsignore policycoreutils-rhat.patch policycoreutils.spec
sources
Log Message:
* Thu Jul 27 2005 Dan Walsh <dwalsh at redhat.com> 1.25.3-1
- Update to match NSA
* Merged restorecon patch from Ivan Gyurdiev.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore 7 Jul 2005 10:59:34 -0000 1.57
+++ .cvsignore 27 Jul 2005 14:05:30 -0000 1.58
@@ -40,3 +40,5 @@
policycoreutils-1.23.11.tgz
policycoreutils-1.24.tgz
policycoreutils-1.25.1.tgz
+policycoreutils-1.25.2.tgz
+policycoreutils-1.25.3.tgz
policycoreutils-rhat.patch:
Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- policycoreutils-rhat.patch 14 Jun 2005 17:02:07 -0000 1.94
+++ policycoreutils-rhat.patch 27 Jul 2005 14:05:30 -0000 1.95
@@ -1,80 +1,9 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.23.11/load_policy/load_policy.c
---- nsapolicycoreutils/load_policy/load_policy.c 2005-04-14 07:22:16.000000000 -0400
-+++ policycoreutils-1.23.11/load_policy/load_policy.c 2005-05-28 01:25:28.000000000 -0400
-@@ -103,7 +103,7 @@
- if (errno == ENOENT || errno == EINVAL) {
- /* No booleans file or stale booleans in the file; non-fatal. */
- if (! quiet)
-- fprintf(stderr, _("%s: Warning! Error while setting booleans from %s: %s\n"), argv[0], boolpath, strerror(errno));
-+ fprintf(stderr, _("%s: Warning while setting booleans from %s\n"), argv[0], boolpath);
- } else {
- fprintf(stderr, _("%s: Error while setting booleans from %s: %s\n"), argv[0], boolpath, strerror(errno));
- exit(2);
-@@ -115,7 +115,7 @@
- if (ret) {
- /* Possibly ok, as there may be no booleans. */
- if (! quiet)
-- fprintf(stderr, _("%s: Warning! Error while getting boolean names: %s\n"), argv[0], strerror(errno));
-+ fprintf(stderr, _("%s: Warning! unable to get boolean names: %s\n"), argv[0], strerror(errno));
- goto load;
- }
- if (!len)
-@@ -137,7 +137,7 @@
- if (errno == EINVAL) {
- /* Stale booleans in the file; non-fatal. */
- if (! quiet)
-- fprintf(stderr, _("%s: Warning! Error while setting booleans: %s\n"), argv[0], strerror(errno));
-+ fprintf(stderr, _("%s: Warning! Unable to reset all booleans\n"), argv[0]);
- } else {
- fprintf(stderr, _("%s: Error while setting booleans: %s\n"), argv[0], strerror(errno));
- exit(2);
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.23.11/newrole/newrole.c
---- nsapolicycoreutils/newrole/newrole.c 2005-05-20 13:15:12.000000000 -0400
-+++ policycoreutils-1.23.11/newrole/newrole.c 2005-05-28 01:25:28.000000000 -0400
-@@ -198,6 +198,11 @@
- result = 0; /* user authenticated OK! */
- }
-
-+ /* Ask PAM to verify acct_mgmt */
-+ if( PAM_SUCCESS != pam_acct_mgmt(pam_handle,0) ) {
-+ result = 0; /* user authenticated OK! */
-+ }
-+
- /* We're done with PAM. Free `pam_handle'. */
- pam_end( pam_handle, PAM_SUCCESS );
-
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.23.11/scripts/genhomedircon
---- nsapolicycoreutils/scripts/genhomedircon 2005-04-14 07:22:16.000000000 -0400
-+++ policycoreutils-1.23.11/scripts/genhomedircon 2005-06-14 13:01:12.000000000 -0400
-@@ -357,16 +357,22 @@
- return udict
-
- def getHomeDirContext(self, user, home, role):
-- ret="\n\n#\n# Context for user %s\n#\n\n" % user
-+ ret="\n\n#\n# Home Context for user %s\n#\n\n" % user
- rc=commands.getstatusoutput("grep '^HOME_DIR' %s | sed -e 's|HOME_DIR|%s|' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (self.getHomeDirTemplate(), home, role, user))
- return ret + rc[1] + "\n"
-
-+ def getUserContext(self, user, sel_user, role):
-+ ret="\n\n#\n# Other Context for user %s\n#\n\n" % user
-+ rc=commands.getstatusoutput("grep 'USER' %s | sed -e 's/USER/%s/' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (self.getHomeDirTemplate(), user, role, sel_user))
-+ return ret + rc[1] + "\n"
-+
- def genHomeDirContext(self):
- users = self.getUsers()
- ret=""
- # Fill in HOME and ROLE for users that are defined
- for u in users.keys():
- ret += self.getHomeDirContext (u, users[u]["home"], users[u]["role"])
-+ ret += self.getUserContext (u, u, users[u]["role"])
- return ret+"\n"
-
- def checkExists(self, home):
-@@ -429,6 +435,7 @@
- for h in self.getHomeDirs():
- ret += self.getHomeDirContext ("user_u" , h+'/[^/]*', "user")
- ret += self.getHomeRootContext(h)
-+ ret += self.getUserContext(".*", "user_u", "user") + "\n"
- ret += self.genHomeDirContext()
- return ret
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.25.3/Makefile
+--- nsapolicycoreutils/Makefile 2005-07-18 15:07:46.000000000 -0400
++++ policycoreutils-1.25.3/Makefile 2005-07-27 10:02:12.000000000 -0400
+@@ -1,4 +1,4 @@
+-SUBDIRS=setfiles load_policy newrole run_init restorecon audit2allow audit2why scripts po sestatus semodule_link semodule_expand semodule
++SUBDIRS=setfiles load_policy newrole run_init restorecon audit2allow audit2why scripts po sestatus
+ all install relabel clean:
+ @for subdir in $(SUBDIRS); do \
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- policycoreutils.spec 7 Jul 2005 10:59:34 -0000 1.124
+++ policycoreutils.spec 27 Jul 2005 14:05:30 -0000 1.125
@@ -1,8 +1,8 @@
%define libselinuxver 1.23.1-1
-%define libsepolver 1.5.9-2
+%define libsepolver 1.7-1
Summary: SELinux policy core utilities.
Name: policycoreutils
-Version: 1.25.1
+Version: 1.25.3
Release: 1
License: GPL
Group: System Environment/Base
@@ -11,6 +11,7 @@
Prefix: %{_prefix}
BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver}
+
Requires: libselinux >= %{libselinuxver} libsepol >= %{libsepolver}
BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -35,7 +36,6 @@
%prep
%setup -q
%patch -p1 -b .rhat
-
%build
make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all
@@ -84,6 +84,14 @@
%config(noreplace) %{_sysconfdir}/sestatus.conf
%changelog
+* Thu Jul 27 2005 Dan Walsh <dwalsh at redhat.com> 1.25.3-1
+- Update to match NSA
+ * Merged restorecon patch from Ivan Gyurdiev.
+
+* Mon Jul 18 2005 Dan Walsh <dwalsh at redhat.com> 1.25.2-1
+- Update to match NSA
+ * Merged load_policy, newrole, and genhomedircon patches from Red Hat.
+
* Thu Jul 7 2005 Dan Walsh <dwalsh at redhat.com> 1.25.1-1
- Update to match NSA
* Merged loadable module support from Tresys Technology.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources 7 Jul 2005 10:59:34 -0000 1.60
+++ sources 27 Jul 2005 14:05:30 -0000 1.61
@@ -1 +1 @@
-9978db7cb19c52a3474c6445e9e21bfb policycoreutils-1.25.1.tgz
+ea4ea978c040dc35db5b38ce28383bdc policycoreutils-1.25.3.tgz
- Previous message (by thread): rpms/libsepol/devel .cvsignore, 1.27, 1.28 libsepol.spec, 1.43, 1.44 sources, 1.27, 1.28
- Next message (by thread): rpms/im-sdk/FC-3 httx-preedit-state-svn2544-146523.patch, NONE, 1.1 httx-status-focus-svn2500-146406.patch, NONE, 1.1 unitle-Punjabi-missing-keys-svn2604-151477.patch, NONE, 1.1 xiiimp-aux-segfault-svn2507-148765.patch, NONE, 1.1 xiiimp-close-candidate-146407.patch, NONE, 1.1 xiiimp-close-on-reset-svn2543-146407.patch, NONE, 1.1 xiiimp-pango.patch, NONE, 1.1 xiiimp-preedit-area-svn2505-147458.patch, NONE, 1.1 xiiimp-preedit-callback-svn2548-147459.patch, NONE, 1.1 xiiimp-preedit-return-value-svn2549-149607.patch, NONE, 1.1 im-sdk.spec, 1.100, 1.101 xiiimp-fix-gcc-warnings.patch, 1.1, 1.2 xiiimp.so-gcc-warnings.patch, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list