|
|
Author: dwalsh
Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4939
Modified Files:
.cvsignore policycoreutils-rhat.patch policycoreutils.spec
sources
Log Message:
* Fri Sep 1 2006 Dan Walsh <dwalsh@xxxxxxxxxx> 1.30.28-1
- Security fixes to run python in a more locked down manner
- More Translations
- Update to upstream
* Merged fix for restorecon // handling from Erich Schubert.
* Merged translations update and fixfiles fix from Dan Walsh.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- .cvsignore 31 Aug 2006 11:42:45 -0000 1.119
+++ .cvsignore 2 Sep 2006 02:43:09 -0000 1.120
@@ -111,3 +111,4 @@
policycoreutils-1.30.25.tgz
policycoreutils-1.30.26.tgz
policycoreutils-1.30.27.tgz
+policycoreutils-1.30.28.tgz
policycoreutils-rhat.patch:
VERSION | 2
audit2allow/audit2allow | 2
audit2allow/avc.py | 2
newrole/newrole.c | 1
po/ca.po | 317 +++++++++++++++++++++++--------------------
po/de.po | 272 ++++++++++--------------------------
po/el.po | 6
po/sv.po | 279 ++++++++++++++++---------------------
po/zh_TW.po | 4
restorecon/restorecon.8 | 7
restorecon/restorecon.c | 20 +-
restorecond/restorecond.init | 6
scripts/chcat | 2
scripts/fixfiles | 2
scripts/genhomedircon | 2
semanage/semanage | 2
semanage/seobject.py | 2
17 files changed, 405 insertions(+), 523 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.223 -r 1.224 policycoreutils-rhat.patch
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- policycoreutils-rhat.patch 31 Aug 2006 20:18:10 -0000 1.223
+++ policycoreutils-rhat.patch 2 Sep 2006 02:43:09 -0000 1.224
@@ -1,22 +1,21 @@
diff --exclude-from=exclude -N -u -r
nsapolicycoreutils/audit2allow/audit2allow
policycoreutils-1.30.27/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow 2006-08-28 16:58:19.000000000
-0400
-+++ policycoreutils-1.30.27/audit2allow/audit2allow 2006-08-31
16:11:24.000000000 -0400
++++ policycoreutils-1.30.27/audit2allow/audit2allow 2006-09-01
22:38:43.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-+#! /usr/bin/python
++#! /usr/bin/python -E
# Copyright (C) 2005 Red Hat
# see file 'COPYING' for use and warranty information
#
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py
policycoreutils-1.30.27/audit2allow/avc.py
--- nsapolicycoreutils/audit2allow/avc.py 2006-08-28 16:58:19.000000000
-0400
-+++ policycoreutils-1.30.27/audit2allow/avc.py 2006-08-31 16:12:13.000000000
-0400
++++ policycoreutils-1.30.27/audit2allow/avc.py 2006-09-01 22:38:51.000000000
-0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-+#! /usr/bin/python
++#! /usr/bin/python -E
# Copyright (C) 2006 Red Hat
# see file 'COPYING' for use and warranty information
#
-Binary files nsapolicycoreutils/newrole/newrole and
policycoreutils-1.30.27/newrole/newrole differ
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c
policycoreutils-1.30.27/newrole/newrole.c
--- nsapolicycoreutils/newrole/newrole.c 2006-08-28 16:58:20.000000000
-0400
+++ policycoreutils-1.30.27/newrole/newrole.c 2006-08-31 08:02:14.000000000
-0400
@@ -28,26427 +27,2359 @@
#ifdef USE_NLS
setlocale(LC_ALL, "");
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po
policycoreutils-1.30.27/po/af.po
---- nsapolicycoreutils/po/af.po 2006-08-28 16:58:21.000000000 -0400
-+++ policycoreutils-1.30.27/po/af.po 2006-08-31 07:08:21.000000000 -0400
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/ca.po
policycoreutils-1.30.27/po/ca.po
+--- nsapolicycoreutils/po/ca.po 2006-09-01 22:32:13.000000000 -0400
++++ policycoreutils-1.30.27/po/ca.po 2006-09-01 22:40:22.000000000 -0400
+@@ -4,6 +4,7 @@
+ # package.
+ #
+ # Josep Puigdemont Casamajó <josep.puigdemont@xxxxxxxxx>, 2006.
++# Xavier Conde Rueda <xavi.conde@xxxxxxxxx>, 2006
+ #
+ # This file is translated according to the glossary and style guide of
+ # Softcatalà . If you plan to modify this file, please read first the page
+@@ -22,8 +23,8 @@
+ "Project-Id-Version: policycoreutils\n"
"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-26 13:48-0400\n"
-+"POT-Creation-Date: 2006-06-29 15:53-0400\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@xxxxxx>\n"
-@@ -21,7 +21,7 @@
- msgid "usage: %s [-bq]\n"
- msgstr ""
-
--#: ../load_policy/load_policy.c:62
-+#: ../load_policy/load_policy.c:66
+ "POT-Creation-Date: 2006-06-29 15:53-0400\n"
+-"PO-Revision-Date: 2006-05-13 10:34+0200\n"
+-"Last-Translator: Josep Puigdemont Casamajó <josep.puigdemont@xxxxxxxxx>\n"
++"PO-Revision-Date: 2006-08-28 10:34+0200\n"
++"Last-Translator: Xavier Conde Rueda <xavi.conde@xxxxxxxxx>\n"
+ "Language-Team: Catalan <tradgnome@xxxxxxxxxxxxxx>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+@@ -37,12 +38,12 @@
+ #: ../load_policy/load_policy.c:66
#, c-format
msgid "%s: Can't load policy: %s\n"
- msgstr ""
-@@ -31,26 +31,26 @@
- msgid "Out of memory!\n"
- msgstr ""
+-msgstr "%s: No es pot carregar la polÃtica: %s\n"
++msgstr "%s: no es pot carregar la polÃtica: %s\n"
--#: ../newrole/newrole.c:201 ../run_init/run_init.c:126
-+#: ../newrole/newrole.c:199 ../run_init/run_init.c:126
+ #: ../newrole/newrole.c:97
#, c-format
- msgid "failed to initialize PAM\n"
- msgstr ""
+ msgid "Out of memory!\n"
+-msgstr "No hi ha prou memòria!\n"
++msgstr "No hi ha prou memòria\n"
--#: ../newrole/newrole.c:212
-+#: ../newrole/newrole.c:210
+ #: ../newrole/newrole.c:199 ../run_init/run_init.c:126
#, c-format
- msgid "failed to set PAM_TTY\n"
- msgstr ""
-
--#: ../newrole/newrole.c:250 ../run_init/run_init.c:155
-+#: ../newrole/newrole.c:246 ../run_init/run_init.c:154
- msgid "Password:"
- msgstr ""
-
--#: ../newrole/newrole.c:282 ../run_init/run_init.c:187
-+#: ../newrole/newrole.c:281 ../run_init/run_init.c:189
+@@ -61,7 +62,9 @@
+ #: ../newrole/newrole.c:281 ../run_init/run_init.c:189
#, c-format
msgid "Cannot find your entry in the shadow passwd file.\n"
- msgstr ""
+-msgstr "No s'ha pogut trobar la vostra entrada en el fitxer passwd ocult.\n"
++msgstr ""
++"No s'ha pogut trobar la vostra entrada en el fitxer de contrasenyes "
++"ocultes.\n"
--#: ../newrole/newrole.c:288 ../run_init/run_init.c:193
-+#: ../newrole/newrole.c:287 ../run_init/run_init.c:195
+ #: ../newrole/newrole.c:287 ../run_init/run_init.c:195
+ #, c-format
+@@ -71,87 +74,91 @@
+ #: ../newrole/newrole.c:354
#, c-format
- msgid "getpass cannot open /dev/tty\n"
- msgstr ""
-@@ -60,187 +60,187 @@
msgid "Error initing capabilities, aborting.\n"
- msgstr ""
+-msgstr ""
++msgstr "S'ha produït un error en iniciar les capacitats, s'estÃ
anul·lant.\n"
--#: ../newrole/newrole.c:367
-+#: ../newrole/newrole.c:368
+ #: ../newrole/newrole.c:368
#, c-format
msgid "Error dropping capabilities, aborting\n"
- msgstr ""
+-msgstr ""
++msgstr "S'ha produït un error en eliminar les capacitats, s'estÃ
anul·lant.\n"
--#: ../newrole/newrole.c:374
-+#: ../newrole/newrole.c:375
+ #: ../newrole/newrole.c:375
#, c-format
msgid "Error changing uid, aborting.\n"
- msgstr ""
+-msgstr ""
++msgstr "S'ha produït un error en canviar l'UID, s'està anul·lant.\n"
--#: ../newrole/newrole.c:380
-+#: ../newrole/newrole.c:382
+ #: ../newrole/newrole.c:382
#, c-format
msgid "Error resetting KEEPCAPS, aborting\n"
msgstr ""
++"S'ha produït un error en tornar a establir el valor de KEEPCAPS, s'està "
++"anul·lant.\n"
--#: ../newrole/newrole.c:386
-+#: ../newrole/newrole.c:390
+ #: ../newrole/newrole.c:390
#, c-format
msgid "Error dropping SETUID capability, aborting\n"
msgstr ""
++"S'ha produït un error en eliminar la capacitat per a SETUID, s'està "
++"anul·lant.\n"
--#: ../newrole/newrole.c:459
-+#: ../newrole/newrole.c:463
+ #: ../newrole/newrole.c:463
#, c-format
msgid "Sorry, newrole may be used only on a SELinux kernel.\n"
- msgstr ""
+-msgstr ""
++msgstr "El newrole només es pot fer servir amb un nucli amb SELinux.\n"
--#: ../newrole/newrole.c:464
-+#: ../newrole/newrole.c:468
+ #: ../newrole/newrole.c:468
#, c-format
msgid "Could not determine enforcing mode.\n"
- msgstr ""
+-msgstr ""
++msgstr "No s'ha pogut determinar el mode de reforç.\n"
--#: ../newrole/newrole.c:481
-+#: ../newrole/newrole.c:488
+ #: ../newrole/newrole.c:488
#, c-format
msgid "Error: multiple roles specified\n"
- msgstr ""
+-msgstr ""
++msgstr "S'ha produït un error: s'han especificat múltiples rols\n"
[...28023 lines suppressed...]
+ #: ../audit2allow/audit2allow:203
#, c-format
- msgid "No context in file %s\n"
- msgstr ""
+ msgid "Options Error: %s "
+ msgstr "Flaggfel: %s "
--#: ../run_init/run_init.c:345
-+#: ../run_init/run_init.c:353
+-#~ msgid "Usage: %s CATEGORY File ..."
+-#~ msgstr "Användning: %s KATEGORI fil ..."
+-
+-#~ msgid "Usage: %s -l CATEGORY user ..."
+-#~ msgstr "Användning: %s -l KATEGORI användare ..."
+-
+-#~ msgid "Usage: %s [[+|-]CATEGORY],...]q File ..."
+-#~ msgstr "Användning: %s [[+|-]KATEGORI],...]q fil ..."
+-
+-#~ msgid "Usage: %s -l [[+|-]CATEGORY],...]q user ..."
+-#~ msgstr "Användning: %s -l [[+|-]KATEGORI],...]q användare ..."
+-
+-#~ msgid "Usage: %s -d File ..."
+-#~ msgstr "Användning: %s -d fil ..."
+-
+-#~ msgid "Usage: %s -l -d user ..."
+-#~ msgstr "Användning: %s -l -d användare ..."
+-
+-#~ msgid "Usage: %s -L"
+-#~ msgstr "Användning: %s -L"
+-
+-#~ msgid "Usage: %s"
+-#~ msgstr "Användning: %s"
+-
+-#~ msgid "Usage: %s"
+-#~ msgstr "Användning: %s"
+-
+-#~ msgid "Usage:"
+-#~ msgstr "Användning:"
+-
+-#~ msgid "Usage: %s -L -l user"
+-#~ msgstr "Användning: %s -L -l användare"
+-
+-#~ msgid "Options Error %s"
+-#~ msgstr "Flaggfel %s"
+-
+-#~ msgid "Translations can not contain spaces '%s'"
+-#~ msgstr "�versättningar kan inte innehålla blanksteg \"%s\""
+-
+-#~ msgid "Invalid Level '%s'"
+-#~ msgstr "Ogiltig nivå \"%s\""
+-
+-#~ msgid "User %s does not exist"
+-#~ msgstr "Användaren %s finns inte"
+-
+-#~ msgid "******************** IMPORTANT ***********************\n"
+-#~ msgstr "********************* VIKTIGT ************************\n"
+-
+-#~ msgid "Options Error: %s"
+-#~ msgstr "Flaggfel: %s"
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zh_TW.po
policycoreutils-1.30.27/po/zh_TW.po
+--- nsapolicycoreutils/po/zh_TW.po 2006-09-01 22:32:13.000000000 -0400
++++ policycoreutils-1.30.27/po/zh_TW.po 2006-09-01 22:40:23.000000000
-0400
+@@ -9,7 +9,7 @@
+ "Project-Id-Version: zh_TW\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2006-06-29 15:53-0400\n"
+-"PO-Revision-Date: 2006-08-20 00:44+1000\n"
++"PO-Revision-Date: 2006-08-30 00:19+1000\n"
+ "Last-Translator: Chester Cheng <ccheng@xxxxxxxxxx>\n"
+ "Language-Team: Chinese, Traditional <zh_TW@xxxxxx>\n"
+ "MIME-Version: 1.0\n"
+@@ -169,7 +169,7 @@
+ #: ../newrole/newrole.c:693
#, c-format
- msgid "Sorry, run_init may be used only on a SELinux kernel.\n"
- msgstr ""
+ msgid "failed to set new range %s\n"
+-msgstr ""
++msgstr "è¨å®?æ?°ç¯?å?? %s 失æ??\n"
--#: ../run_init/run_init.c:364
-+#: ../run_init/run_init.c:372
+ #: ../newrole/newrole.c:708
#, c-format
- msgid "authentication failed.\n"
- msgstr ""
diff --exclude-from=exclude -N -u -r
nsapolicycoreutils/restorecon/restorecon.8
policycoreutils-1.30.27/restorecon/restorecon.8
--- nsapolicycoreutils/restorecon/restorecon.8 2006-08-28 16:58:19.000000000
-0400
+++ policycoreutils-1.30.27/restorecon/restorecon.8 2006-08-31
10:58:50.000000000 -0400
@@ -26476,7 +2407,7 @@
infilename contains a list of files to be processed by application. Use \-
for stdin.
.TP
diff --exclude-from=exclude -N -u -r
nsapolicycoreutils/restorecon/restorecon.c
policycoreutils-1.30.27/restorecon/restorecon.c
---- nsapolicycoreutils/restorecon/restorecon.c 2006-08-28 16:58:19.000000000
-0400
+--- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000
-0400
+++ policycoreutils-1.30.27/restorecon/restorecon.c 2006-08-31
11:03:43.000000000 -0400
@@ -11,6 +11,7 @@
* restorecon [-Rnv] pathname...
@@ -26512,7 +2443,21 @@
fprintf(stderr, "lstat(%s) failed: %s\n", filename,
strerror(errno));
return 1;
-@@ -319,6 +323,8 @@
+@@ -197,11 +201,8 @@
+ return 1;
+ }
+ p += len;
+- /* ensure trailing slash of directory name */
+- if (len == 0 || *(p - 1) != '/') {
+- *p = '/';
+- p++;
+- }
++ *p = '/';
++ p++;
+ strcpy(p, file_sep);
+ filename = path;
+ } else {
+@@ -322,6 +323,8 @@
close(pipe_fds[1]);
if (rc == -1 || rc > 0) {
if (nftw(buf, apply_spec, 1024, FTW_PHYS)) {
@@ -26521,7 +2466,7 @@
fprintf(stderr,
"%s: error while labeling files under
%s\n",
progname, buf);
-@@ -350,11 +356,14 @@
+@@ -353,11 +356,14 @@
exit(0);
set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
@@ -26555,25 +2500,16 @@
# Source function library.
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat
policycoreutils-1.30.27/scripts/chcat
--- nsapolicycoreutils/scripts/chcat 2006-08-28 16:58:19.000000000 -0400
-+++ policycoreutils-1.30.27/scripts/chcat 2006-08-31 16:11:53.000000000
-0400
++++ policycoreutils-1.30.27/scripts/chcat 2006-09-01 22:39:03.000000000
-0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-+#! /usr/bin/python
++#! /usr/bin/python -E
# Copyright (C) 2005 Red Hat
# see file 'COPYING' for use and warranty information
#
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles
policycoreutils-1.30.27/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles 2006-08-28 16:58:19.000000000
-0400
+--- nsapolicycoreutils/scripts/fixfiles 2006-09-01 22:32:11.000000000
-0400
+++ policycoreutils-1.30.27/scripts/fixfiles 2006-08-31 11:04:33.000000000
-0400
-@@ -48,7 +48,7 @@
- # Log to either syslog or a LOGFILE
- #
- logit () {
--if [ -z $LOGFILE ]; then
-+if [ -n $LOGFILE ]; then
- echo $1 >> $LOGFILE
- fi
- }
@@ -118,7 +118,7 @@
fi
if [ ! -z "$RPMFILES" ]; then
@@ -26583,21 +2519,36 @@
done
exit $?
fi
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon
policycoreutils-1.30.27/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon 2006-08-28 16:58:19.000000000
-0400
++++ policycoreutils-1.30.27/scripts/genhomedircon 2006-09-01
22:37:55.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#! /usr/bin/python -E
+ # Copyright (C) 2004 Tresys Technology, LLC
+ # see file 'COPYING' for use and warranty information
+ #
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage
policycoreutils-1.30.27/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2006-08-28 16:58:18.000000000
-0400
-+++ policycoreutils-1.30.27/semanage/semanage 2006-08-31 16:11:11.000000000
-0400
++++ policycoreutils-1.30.27/semanage/semanage 2006-09-01 22:38:19.000000000
-0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-+#! /usr/bin/python
++#! /usr/bin/python -E
# Copyright (C) 2005 Red Hat
# see file 'COPYING' for use and warranty information
#
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py
policycoreutils-1.30.27/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2006-08-28 16:58:18.000000000
-0400
-+++ policycoreutils-1.30.27/semanage/seobject.py 2006-08-31
16:11:40.000000000 -0400
++++ policycoreutils-1.30.27/semanage/seobject.py 2006-09-01
22:38:29.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
-+#! /usr/bin/python
++#! /usr/bin/python -E
# Copyright (C) 2005 Red Hat
# see file 'COPYING' for use and warranty information
#
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/VERSION
policycoreutils-1.30.27/VERSION
+--- nsapolicycoreutils/VERSION 2006-09-01 22:32:13.000000000 -0400
++++ policycoreutils-1.30.27/VERSION 2006-08-24 13:34:05.000000000 -0400
+@@ -1 +1 @@
+-1.30.28
++1.30.27
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- policycoreutils.spec 31 Aug 2006 20:18:12 -0000 1.305
+++ policycoreutils.spec 2 Sep 2006 02:43:12 -0000 1.306
@@ -4,8 +4,8 @@
%define libselinuxver 1.30.27-1
Summary: SELinux policy core utilities.
Name: policycoreutils
-Version: 1.30.27
-Release: 5
+Version: 1.30.28
+Release: 1
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -119,6 +119,13 @@
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
+* Fri Sep 1 2006 Dan Walsh <dwalsh@xxxxxxxxxx> 1.30.28-1
+- Security fixes to run python in a more locked down manner
+- More Translations
+- Update to upstream
+ * Merged fix for restorecon // handling from Erich Schubert.
+ * Merged translations update and fixfiles fix from Dan Walsh.
+
* Thu Aug 31 2006 Dan Walsh <dwalsh@xxxxxxxxxx> 1.30.27-5
- Change scripts to use /usr/sbin/python
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- sources 31 Aug 2006 11:42:48 -0000 1.123
+++ sources 2 Sep 2006 02:43:12 -0000 1.124
@@ -1 +1 @@
-b8f142cb8f8c1775e400f3fcb232a85f policycoreutils-1.30.27.tgz
+1af407b090709163d9eca24a8bded1e7 policycoreutils-1.30.28.tgz
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|