Accepting request 199335 from home:cboltz
- add apparmor-utils-po-de-r2091.diff: fix some (mis)translations OBS-URL: https://build.opensuse.org/request/show/199335 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=47
This commit is contained in:
Christian Boltz
Git OBS Bridge
parent
3350370468
commit
7800cf233b
@ -8,20 +8,21 @@ After this change in ntp:
|
||||
|
||||
we need to read openssl.cnf or starting of ntpd will fail silently(!)
|
||||
|
||||
Index: b/profiles/apparmor.d/usr.sbin.ntpd
|
||||
===================================================================
|
||||
--- a/profiles/apparmor.d/usr.sbin.ntpd
|
||||
+++ b/profiles/apparmor.d/usr.sbin.ntpd
|
||||
@@ -38,10 +38,12 @@
|
||||
/etc/ntp/step-tickers r,
|
||||
/etc/ntpd.conf r,
|
||||
/etc/ntpd.conf.tmp r,
|
||||
/etc/gai.conf r,
|
||||
|
||||
+ /etc/ssl/openssl.cnf r,
|
||||
+
|
||||
/tmp/ntp* rwl,
|
||||
/usr/sbin/ntpd rmix,
|
||||
/var/lib/ntp/drift rwl,
|
||||
/var/lib/ntp/drift.TEMP rwl,
|
||||
/var/lib/ntp/drift/ntp.drift rw,
|
||||
|
||||
Patch v2 by Christian Boltz: use abstractions/openssl instead of
|
||||
allowing /etc/ssl/openssl.cnf directly
|
||||
|
||||
|
||||
=== modified file 'profiles/apparmor.d/usr.sbin.ntpd'
|
||||
--- profiles/apparmor.d/usr.sbin.ntpd 2011-08-08 20:16:06 +0000
|
||||
+++ profiles/apparmor.d/usr.sbin.ntpd 2013-09-16 20:28:39 +0000
|
||||
@@ -14,6 +14,7 @@
|
||||
/usr/sbin/ntpd {
|
||||
#include <abstractions/base>
|
||||
#include <abstractions/nameservice>
|
||||
+ #include <abstractions/openssl>
|
||||
#include <abstractions/xad>
|
||||
|
||||
capability dac_override,
|
||||
|
||||
|
||||
201
apparmor-utils-po-de-r2091.diff
Normal file
201
apparmor-utils-po-de-r2091.diff
Normal file
@ -0,0 +1,201 @@
|
||||
=== modified file 'utils/po/de.po'
|
||||
--- utils/po/de.po 2011-02-09 00:29:59 +0000
|
||||
+++ utils/po/de.po 2013-09-13 19:12:39 +0000
|
||||
@@ -1,19 +1,23 @@
|
||||
# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
|
||||
+# Copyright (C) 2013 Christian Boltz
|
||||
# This file is distributed under the same license as the package.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: apparmor-utils\n"
|
||||
"Report-Msgid-Bugs-To: apparmor-general@forge.novell.com\n"
|
||||
"POT-Creation-Date: 2008-09-22 22:56-0700\n"
|
||||
-"PO-Revision-Date: 2009-02-05 13:38\n"
|
||||
-"Last-Translator: Novell Language <language@novell.com>\n"
|
||||
+"PO-Revision-Date: 2013-09-13 21:05+0200\n"
|
||||
+"Last-Translator: Christian Boltz <apparmor@cboltz.de>\n"
|
||||
"Language-Team: Novell Language <language@novell.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
+"Language: de\n"
|
||||
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
|
||||
#: ../genprof:69
|
||||
+#, fuzzy
|
||||
msgid "Please enter the program to profile: "
|
||||
msgstr "Geben Sie das Programm für das Profil ein: "
|
||||
|
||||
@@ -52,12 +57,12 @@
|
||||
#: ../logprof:72
|
||||
#, perl-format
|
||||
msgid "usage: %s [ -d /path/to/profiles ] [ -f /path/to/logfile ] [ -m \"mark in log to start processing after\""
|
||||
-msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ -f /pfad/zu/protokolldatei ] [ -m \"markierng im protokoll, nach der die verarbeitung gestartet werden soll\""
|
||||
+msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ -f /pfad/zu/protokolldatei ] [ -m \"Markierng im Protokoll, nach der die Verarbeitung gestartet werden soll\""
|
||||
|
||||
#: ../autodep:63
|
||||
#, perl-format
|
||||
msgid "Can't find AppArmor profiles in %s."
|
||||
-msgstr "In %s wurden keine Unterdomänenprofile gefunden."
|
||||
+msgstr "In %s wurden keine AppArmor-Profile gefunden."
|
||||
|
||||
#: ../autodep:71
|
||||
msgid "Please enter the program to create a profile for: "
|
||||
@@ -86,7 +91,7 @@
|
||||
#: ../audit:131
|
||||
#, perl-format
|
||||
msgid "usage: %s [ -d /path/to/profiles ] [ program to switch to audit mode ]"
|
||||
-msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ programm, das in den prüfmodus versetzt werden soll ]"
|
||||
+msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ Programm, das in den Prüfmodus versetzt werden soll ]"
|
||||
|
||||
#: ../complain:64
|
||||
msgid "Please enter the program to switch to complain mode: "
|
||||
@@ -100,7 +105,7 @@
|
||||
#: ../complain:131
|
||||
#, perl-format
|
||||
msgid "usage: %s [ -d /path/to/profiles ] [ program to switch to complain mode ]"
|
||||
-msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ programm, das in den meldungsmodus versetzt werden soll ]"
|
||||
+msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ Programm, das in den Meldungsmodus versetzt werden soll ]"
|
||||
|
||||
#: ../enforce:64
|
||||
msgid "Please enter the program to switch to enforce mode: "
|
||||
@@ -109,12 +114,12 @@
|
||||
#: ../enforce:105 ../AppArmor.pm:592
|
||||
#, perl-format
|
||||
msgid "Setting %s to enforce mode."
|
||||
-msgstr "Einstellungen %s für Erwzingungsmodus"
|
||||
+msgstr "%s wird in den Erwzingen-Modus versetzt."
|
||||
|
||||
#: ../enforce:131
|
||||
#, perl-format
|
||||
msgid "usage: %s [ -d /path/to/profiles ] [ program to switch to enforce mode ]"
|
||||
-msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ programm, das in den erzwingen-modus versetzt werden soll ]"
|
||||
+msgstr "Syntax: %s [ -d /pfad/zu/profilen ] [ Programm, das in den Erzwingen-Modus versetzt werden soll ]"
|
||||
|
||||
#: ../unconfined:50
|
||||
#, perl-format
|
||||
@@ -193,7 +198,7 @@
|
||||
|
||||
#: ../AppArmor.pm:1159
|
||||
msgid "Select which of the changed profiles you would like to upload\nto the repository"
|
||||
-msgstr "Wählen Sie die geänderten Profile aus, die Sie an das Repository \nhochladen möchten"
|
||||
+msgstr "Wählen Sie die geänderten Profile aus, die Sie in das Repository \nhochladen möchten"
|
||||
|
||||
#: ../AppArmor.pm:1161
|
||||
msgid "Changed profiles"
|
||||
@@ -210,7 +215,7 @@
|
||||
#: ../AppArmor.pm:1236 ../AppArmor.pm:1316
|
||||
#, perl-format
|
||||
msgid "WARNING: An error occured while uploading the profile %s\n%s\n"
|
||||
-msgstr "ACHTUNG: Fehler beim Heraufladen von Profil %s\n%s\n"
|
||||
+msgstr "ACHTUNG: Fehler beim Hochladen von Profil %s\n%s\n"
|
||||
|
||||
#: ../AppArmor.pm:1241
|
||||
msgid "Uploaded changes to repository."
|
||||
@@ -223,11 +228,11 @@
|
||||
#: ../AppArmor.pm:1311
|
||||
#, perl-format
|
||||
msgid "Uploaded %s to repository."
|
||||
-msgstr "'%s' an Repository hochgeladen."
|
||||
+msgstr "'%s' ins Repository hochgeladen."
|
||||
|
||||
#: ../AppArmor.pm:1322
|
||||
msgid "Repository Error\nRegistration or Signin was unsuccessful. User login\ninformation is required to upload profiles to the\nrepository. These changes have not been sent.\n"
|
||||
-msgstr "Repository-Fehler\nRegistrierung oder Anmeldung war erfolglos. Die Anmeldeinformationen\ndes Nutzers werden benötigt, um Profile in das Repository\n heraufzuladen. Diese Änderungen wurden nicht gesendet.\n"
|
||||
+msgstr "Repository-Fehler\nRegistrierung oder Anmeldung war erfolglos. Die Anmeldeinformationen\ndes Nutzers werden benötigt, um Profile in das Repository\n hochzuladen. Diese Änderungen wurden nicht gesendet.\n"
|
||||
|
||||
#: ../AppArmor.pm:1379 ../AppArmor.pm:1419
|
||||
msgid "(Y)es"
|
||||
@@ -251,7 +256,7 @@
|
||||
|
||||
#: ../AppArmor.pm:1748
|
||||
msgid "Abandoning all changes."
|
||||
-msgstr "Alle Änderungen verwerfen?"
|
||||
+msgstr "Alle Änderungen verworfen."
|
||||
|
||||
#: ../AppArmor.pm:1854
|
||||
msgid "Default Hat"
|
||||
@@ -259,7 +264,7 @@
|
||||
|
||||
#: ../AppArmor.pm:1856
|
||||
msgid "Requested Hat"
|
||||
-msgstr "Hat angefordert"
|
||||
+msgstr "Angeforderter Hat"
|
||||
|
||||
#: ../AppArmor.pm:2142
|
||||
msgid "Program"
|
||||
@@ -387,16 +392,17 @@
|
||||
#: ../AppArmor.pm:3250
|
||||
#, perl-format
|
||||
msgid "Invalid mode found: %s"
|
||||
-msgstr "Ungültige Option: %s"
|
||||
+msgstr "Ungültiger Modus gefunden: %s"
|
||||
|
||||
#: ../AppArmor.pm:3301 ../AppArmor.pm:3334
|
||||
+#, fuzzy
|
||||
msgid "Capability"
|
||||
msgstr "Funktion"
|
||||
|
||||
#: ../AppArmor.pm:3354 ../AppArmor.pm:3628 ../AppArmor.pm:3875
|
||||
#, perl-format
|
||||
msgid "Adding #include <%s> to profile."
|
||||
-msgstr "#include <%s> zum Profil hinzufügen."
|
||||
+msgstr "#include <%s> zum Profil hinzugefügt."
|
||||
|
||||
#: ../AppArmor.pm:3357 ../AppArmor.pm:3629 ../AppArmor.pm:3669
|
||||
#: ../AppArmor.pm:3879
|
||||
@@ -405,12 +411,12 @@
|
||||
msgstr "%s vorherige übereinstimmende Profileinträge wurden gelöscht."
|
||||
|
||||
#: ../AppArmor.pm:3368
|
||||
-#, perl-format
|
||||
+#, fuzzy, perl-format
|
||||
msgid "Adding capability %s to profile."
|
||||
msgstr "Funktion %s wird dem Profil hinzugefügt."
|
||||
|
||||
#: ../AppArmor.pm:3373
|
||||
-#, perl-format
|
||||
+#, fuzzy, perl-format
|
||||
msgid "Denying capability %s to profile."
|
||||
msgstr "Funktion %s wird dem Profil verweigert."
|
||||
|
||||
@@ -457,7 +463,7 @@
|
||||
|
||||
#: ../AppArmor.pm:3687
|
||||
msgid "The specified path does not match this log entry:"
|
||||
-msgstr "Der angegebene Pfad stimmt nicht mit dem Protokolleintrag überein."
|
||||
+msgstr "Der angegebene Pfad stimmt nicht mit dem Protokolleintrag überein:"
|
||||
|
||||
#: ../AppArmor.pm:3688
|
||||
msgid "Log Entry"
|
||||
@@ -482,17 +488,17 @@
|
||||
#: ../AppArmor.pm:3905
|
||||
#, perl-format
|
||||
msgid "Adding network access %s %s to profile."
|
||||
-msgstr "Netzwerkzugriff '%s' '%s' wird zu Profil hinzugefügt."
|
||||
+msgstr "Netzwerkzugriff '%s' '%s' wird zum Profil hinzugefügt."
|
||||
|
||||
#: ../AppArmor.pm:3924
|
||||
#, perl-format
|
||||
msgid "Denying network access %s %s to profile."
|
||||
-msgstr "Netzwerkzugriff '%s' '%s' auf Profil wird verweigert."
|
||||
+msgstr "Netzwerkzugriff '%s' '%s' wird dem Profil verweigert."
|
||||
|
||||
#: ../AppArmor.pm:4132
|
||||
#, perl-format
|
||||
msgid "Reading log entries from %s."
|
||||
-msgstr "%s Mailserver-Domains werden eingelesen..."
|
||||
+msgstr "Protokolleinträge von %s werden eingelesen."
|
||||
|
||||
#: ../AppArmor.pm:4133
|
||||
#, perl-format
|
||||
@@ -572,6 +578,7 @@
|
||||
msgstr "Ungültige Tastenkombination in Standardelement"
|
||||
|
||||
#: ../AppArmor.pm:6392
|
||||
+#, fuzzy
|
||||
msgid "Invalid default"
|
||||
msgstr "Ungültiger Standard"
|
||||
|
||||
|
||||
@ -3,6 +3,11 @@ Mon Sep 16 18:23:46 UTC 2013 - seife+obs@b1-systems.com
|
||||
|
||||
- fix ntp by allowing read access to openssl.cnf
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 13 22:41:18 UTC 2013 - opensuse@cboltz.de
|
||||
|
||||
- add apparmor-utils-po-de-r2091.diff: fix some (mis)translations
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 12 20:40:38 UTC 2013 - opensuse@cboltz.de
|
||||
|
||||
|
||||
@ -97,8 +97,11 @@ Patch5: apparmor-utils-string-split
|
||||
# make apparmor/__init__.py ready for the new tools developed in GSoC. Submitted upstream 2013-09-12
|
||||
Patch6: apparmor-init.py-gsoc.diff
|
||||
|
||||
# fix ntpd after configuration change
|
||||
Patch7: apparmor-2.8.2-fix-ntpd-profile.diff
|
||||
# fix some (mis)translations in utils/po/de.po (upstream trunk r2186, 2.8 r2091)
|
||||
Patch7: apparmor-utils-po-de-r2091.diff
|
||||
|
||||
# fix ntpd after configuration change (submitted upstream 2013-09-16)
|
||||
Patch8: apparmor-2.8.2-fix-ntpd-profile.diff
|
||||
|
||||
# Add support for eDirectory calls in abstractions/nameservice. Not accepted upstream (yet) because of open questions
|
||||
Patch12: apparmor-2.5.1-edirectory-profile
|
||||
@ -470,7 +473,8 @@ SubDomain.
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
%patch6
|
||||
%patch7 -p1
|
||||
%patch7
|
||||
%patch8
|
||||
%patch12 -p1
|
||||
|
||||
# only create Immunix::SubDomain perl module for openSUSE <= 12.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user