Accepting request 241318 from Base:System

- Add upstream patches 0001-po-add-Ukrainian-translation.patch 0002-man-document-yearly-and-annually-in-systemd.time-7.patch 0003-core-nicer-message-when-inotify-watches-are-exhauste.patch - Add patch 0001-fix-only-discover-Xen-domU.patch to fix upstream patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch - Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch - Add upstream patches 0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch 0002-units-serial-getty-.service-use-the-default-RestartS.patch 1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch - Add upstream patches 0001-po-add-Ukrainian-translation.patch 0002-man-document-yearly-and-annually-in-systemd.time-7.patch 0003-core-nicer-message-when-inotify-watches-are-exhauste.patch - Add patch 0001-fix-only-discover-Xen-domU.patch to fix upstream patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch - Check if NAME key has a value before going thru the rule (bnc#885232). Add 1051-check-if-NAME-has-a-value.patch - Add upstream patches 0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch 0002-units-serial-getty-.service-use-the-default-RestartS.patch OBS-URL: https://build.opensuse.org/request/show/241318 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=193
2014-07-18 04:40:27 +00:00 · 2014-07-18 04:40:27 +00:00 · 90eaea0661
commit 90eaea0661
parent ffde84ad21 ac7e245f9b
12 changed files with 794 additions and 0 deletions
--- a/0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch
+++ b/0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch
@ -0,0 +1,110 @@
+Based on 874bc134ac6504c45e94174e37af13ff21a6bfe2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Mon, 14 Jul 2014 16:53:23 -0400
+Subject: [PATCH] Clear up confusion wrt. ENTRY_SIZE_MAX and DATA_SIZE_MAX
+
+Define DATA_SIZE_MAX to mean the maximum size of a single
+field, and ENTRY_SIZE_MAX to mean the size of the whole
+entry, with some rough calculation of overhead over the payload.
+
+Check if entries are not too big when processing native journal
+messages.
+---
+ src/journal/coredump.c        |    6 +++---
+ src/journal/journald-native.c |   25 +++++++++++++++++++++----
+ 2 files changed, 24 insertions(+), 7 deletions(-)
+--- src/journal/coredump.c
+++ src/journal/coredump.c	2014-07-16 13:02:54.438235659 +0000
+@@ -38,10 +38,10 @@
+ #include "cgroup-util.h"
+ 
+ /* Few programs have less than 3MiB resident */
+-#define COREDUMP_MIN_START (3*1024*1024)
+#define COREDUMP_MIN_START (3*1024*1024u)
+ /* Make sure to not make this larger than the maximum journal entry
+- * size. See ENTRY_SIZE_MAX in journald-native.c. */
+-#define COREDUMP_MAX (767*1024*1024)
+ * size. See DATA_SIZE_MAX in journald-native.c. */
+#define COREDUMP_MAX (1024*1024*767u)
+ 
+ enum {
+         ARG_PID = 1,
+--- src/journal/journald-native.c
+++ src/journal/journald-native.c	2014-07-16 12:50:45.000000000 +0000
+@@ -34,8 +34,8 @@
+ 
+ /* Make sure not to make this smaller than the maximum coredump
+  * size. See COREDUMP_MAX in coredump.c */
+-#define ENTRY_SIZE_MAX (1024*1024*768)
+-#define DATA_SIZE_MAX (1024*1024*768)
+#define ENTRY_SIZE_MAX (1024*1024*770u)
+#define DATA_SIZE_MAX (1024*1024*768u)
+ 
+ static bool valid_user_field(const char *p, size_t l) {
+         const char *a;
+@@ -86,7 +86,7 @@ void server_process_native_message(
+         struct iovec *iovec = NULL;
+         unsigned n = 0, j, tn = (unsigned) -1;
+         const char *p;
+-        size_t remaining, m = 0;
+        size_t remaining, m = 0, entry_size = 0;
+         int priority = LOG_INFO;
+         char *identifier = NULL, *message = NULL;
+         pid_t object_pid = 0;
+@@ -110,9 +110,17 @@ void server_process_native_message(
+ 
+                 if (e == p) {
+                         /* Entry separator */
+
+                        if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
+                                log_debug("Entry is too big with %u properties and %zu bytes, ignoring.",
+                                          n, entry_size);
+                                continue;
+                        }
+
+                         server_dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, NULL, priority, object_pid);
+                         n = 0;
+                         priority = LOG_INFO;
+                        entry_size = 0;
+ 
+                         p++;
+                         remaining--;
+@@ -150,6 +158,7 @@ void server_process_native_message(
+                                 iovec[n].iov_base = (char*) p;
+                                 iovec[n].iov_len = l;
+                                 n++;
+                                entry_size += iovec[n].iov_len;
+ 
+                                 /* We need to determine the priority
+                                  * of this entry for the rate limiting
+@@ -218,7 +227,7 @@ void server_process_native_message(
+                         l = le64toh(l_le);
+ 
+                         if (l > DATA_SIZE_MAX) {
+-                                log_debug("Received binary data block too large, ignoring.");
+                                log_debug("Received binary data block of %zu bytes is too large, ignoring.", l);
+                                 break;
+                         }
+ 
+@@ -242,6 +251,7 @@ void server_process_native_message(
+                                 iovec[n].iov_base = k;
+                                 iovec[n].iov_len = (e - p) + 1 + l;
+                                 n++;
+                                entry_size += iovec[n].iov_len;
+                         } else
+                                 free(k);
+ 
+@@ -255,6 +265,13 @@ void server_process_native_message(
+ 
+         tn = n++;
+         IOVEC_SET_STRING(iovec[tn], "_TRANSPORT=journal");
+        entry_size += strlen("_TRANSPORT=journal");
+
+        if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
+                log_debug("Entry is too big with %u properties and %zu bytes, ignoring.",
+                          n, entry_size);
+                goto finish;
+        }
+ 
+         if (message) {
+                 if (s->forward_to_syslog)
--- a/0001-fix-only-discover-Xen-domU.patch
+++ b/0001-fix-only-discover-Xen-domU.patch
@ -0,0 +1,17 @@
+Fix upstream patch patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch
+of the commit 37287585b6ba9a55065c8f94458f6db3c0abe0af
+---
+ systemd-210/src/shared/virt.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- systemd-210/src/shared/virt.c
+++ systemd-210/src/shared/virt.c	2014-07-17 07:25:12.169628255 +0000
+@@ -174,7 +174,7 @@
+                         if (streq(cap, "control_d"))
+                                 break;
+ 
+-                if (!i)  {
+                if (!cap)  {
+                         _id = "xen";
+                         r = 1;
+                 }
--- a/0001-po-add-Ukrainian-translation.patch
+++ b/0001-po-add-Ukrainian-translation.patch
@ -0,0 +1,406 @@
+From 260b6323cc2aebe722d5b8e43fa63a502f906774 Mon Sep 17 00:00:00 2001
+From: Daniel Korostil <ted.korostiled@gmail.com>
+Date: Thu, 17 Jul 2014 02:07:29 +0300
+Subject: [PATCH] po: add Ukrainian translation
+
+---
+ po/LINGUAS |    1 +
+ po/uk.po   |  377 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 378 insertions(+)
+ create mode 100644 po/uk.po
+
+diff --git po/LINGUAS po/LINGUAS
+index 2cb0f30..f214ece 100644
+--- po/LINGUAS
+++ po/LINGUAS
+@@ -4,3 +4,4 @@ fr
+ it
+ pl
+ ru
+uk
+diff --git po/uk.po po/uk.po
+new file mode 100644
+index 0000000..7a5212a
+--- /dev/null
+++ po/uk.po
+@@ -0,0 +1,377 @@
+# Ukrainian translation for systemd.
+# Copyright (C) 2014 systemd's COPYRIGHT HOLDER
+# This file is distributed under the same license as the systemd package.
+# Eugene Melnik <jeka7js@gmail.com>, 2014.
+# Daniel Korostil <ted.korostiled@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: systemd master\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=sys"
+"temd&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-06-06 22:16+0000\n"
+"PO-Revision-Date: 2014-07-16 19:13+0300\n"
+"Last-Translator: Daniel Korostil <ted.korostiled@gmail.com>\n"
+"Language-Team: linux.org.ua\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1
+msgid "Set host name"
+msgstr "Встановити назву вузла"
+
+#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2
+msgid "Authentication is required to set the local host name."
+msgstr "Засвідчення потрібне, щоб встановити назву локального вузла."
+
+#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3
+msgid "Set static host name"
+msgstr "Встановити статичну назву вузла"
+
+#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4
+msgid ""
+"Authentication is required to set the statically configured local host name, "
+"as well as the pretty host name."
+msgstr ""
+"Засвідчення потрібне, щоб вказати статично налаштовану назву локального "
+"вузла, так само й форматовану."
+
+#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5
+msgid "Set machine information"
+msgstr "Встановити інформацію про машину"
+
+#: ../src/hostname/org.freedesktop.hostname1.policy.in.h:6
+msgid "Authentication is required to set local machine information."
+msgstr "Засвідчення потрібно, щоб вказати локальну інформацію про машини."
+
+#: ../src/locale/org.freedesktop.locale1.policy.in.h:1
+msgid "Set system locale"
+msgstr "Вказати системну локаль"
+
+#: ../src/locale/org.freedesktop.locale1.policy.in.h:2
+msgid "Authentication is required to set the system locale."
+msgstr "Засвідчення потрібно, щоб встановити системну локаль."
+
+#: ../src/locale/org.freedesktop.locale1.policy.in.h:3
+msgid "Set system keyboard settings"
+msgstr "Вказати налаштування системної клавіатури"
+
+#: ../src/locale/org.freedesktop.locale1.policy.in.h:4
+msgid "Authentication is required to set the system keyboard settings."
+msgstr "Засвідчення потрібно, щоб вказати налаштування системної клавіатури."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:1
+msgid "Allow applications to inhibit system shutdown"
+msgstr "Дозволити програмам перешкоджати вимкненню системи"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:2
+msgid ""
+"Authentication is required to allow an application to inhibit system "
+"shutdown."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам перешкоджати вимкненню системи."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:3
+msgid "Allow applications to delay system shutdown"
+msgstr "Дозволити програмам затримувати вимкнення системи"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:4
+msgid ""
+"Authentication is required to allow an application to delay system shutdown."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам затримувати вимкнення системи."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:5
+msgid "Allow applications to inhibit system sleep"
+msgstr "Дозволити програмам перешкоджати засинанню системи"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:6
+msgid ""
+"Authentication is required to allow an application to inhibit system sleep."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам перешкоджати засинанню системи."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:7
+msgid "Allow applications to delay system sleep"
+msgstr "Дозволити програмами затримувати засинання системи"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:8
+msgid ""
+"Authentication is required to allow an application to delay system sleep."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам затримувати засинання системи."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:9
+msgid "Allow applications to inhibit automatic system suspend"
+msgstr "Дозволити програмам перешкоджати автоматичному призупиненню системи"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:10
+msgid ""
+"Authentication is required to allow an application to inhibit automatic "
+"system suspend."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам перешкоджати автоматичному "
+"призупиненню системи."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:11
+msgid "Allow applications to inhibit system handling of the power key"
+msgstr "Дозволити програмам перешкоджати обробленню системою клавіші живлення"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:12
+msgid ""
+"Authentication is required to allow an application to inhibit system "
+"handling of the power key."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам перешкоджати обробленню "
+"системою клавіші живлення."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:13
+msgid "Allow applications to inhibit system handling of the suspend key"
+msgstr ""
+"Дозволити програмам перешкоджати обробленню системою клавіші призупинення"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:14
+msgid ""
+"Authentication is required to allow an application to inhibit system "
+"handling of the suspend key."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам перешкоджати обробленню "
+"системою клавіші призупинення."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:15
+msgid "Allow applications to inhibit system handling of the hibernate key"
+msgstr "Дозволити програмам перешкоджати обробленню системою клавіші присипання"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:16
+msgid ""
+"Authentication is required to allow an application to inhibit system "
+"handling of the hibernate key."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам перешкоджати обробленню "
+"системою клавіші присипання."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:17
+msgid "Allow applications to inhibit system handling of the lid switch"
+msgstr ""
+"Дозволити програмам перешкоджати обробленню системою клавіші перемикання "
+"кришки"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:18
+msgid ""
+"Authentication is required to allow an application to inhibit system "
+"handling of the lid switch."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити програмам перешкоджати обробленню "
+"системою клавіші перемикання кришки."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:19
+msgid "Allow non-logged-in users to run programs"
+msgstr "Дозволити незареєстрованим користувачам запускати програми"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:20
+msgid ""
+"Authentication is required to allow a non-logged-in user to run programs."
+msgstr ""
+"Засвідчення потрібно, щоб дозволити незареєстрованим користувачам запускати "
+"програми."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:21
+msgid "Allow attaching devices to seats"
+msgstr "Дозволити під'єднання пристроїв до місць"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:22
+msgid "Authentication is required for attaching a device to a seat."
+msgstr "Засвідчення потрібно, щоб під'єднувати пристрої до місць."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:23
+msgid "Flush device to seat attachments"
+msgstr "Очисний пристрій для під'єднань до місця"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:24
+msgid ""
+"Authentication is required for resetting how devices are attached to seats."
+msgstr "Засвідчення потрібно, щоб перезапустити спосіб під'єднання до місць."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:25
+msgid "Power off the system"
+msgstr "Вимкнути систему"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:26
+msgid "Authentication is required for powering off the system."
+msgstr "Засвідчення потрібно, щоб вимкнути систему."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:27
+msgid "Power off the system while other users are logged in"
+msgstr "Вимикнути систему, коли інші користувачі ще в ній"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:28
+msgid ""
+"Authentication is required for powering off the system while other users are "
+"logged in."
+msgstr ""
+"Засвідчення потрібно, щоб вимкнути систему, коли інші користувачі в ній."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:29
+msgid "Power off the system while an application asked to inhibit it"
+msgstr "Вимкнути систему, коли програми намагаються першкодити цьому"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:30
+msgid ""
+"Authentication is required for powering off the system while an application "
+"asked to inhibit it."
+msgstr ""
+"Засвідчення потрібно, щоб вимкнути систему, коли програми намагаються "
+"першкодити цьому."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:31
+msgid "Reboot the system"
+msgstr "Перезавантажити систему"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:32
+msgid "Authentication is required for rebooting the system."
+msgstr "Для перезавантаження системи необхідна ідентифікація."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:33
+msgid "Reboot the system while other users are logged in"
+msgstr "Перезавантажити, якщо інщі користувачі в системі"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:34
+msgid ""
+"Authentication is required for rebooting the system while other users are "
+"logged in."
+msgstr ""
+"Засвідчення потрібно, щоб перезапустити систему, коли інші користувачі в "
+"ній."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:35
+msgid "Reboot the system while an application asked to inhibit it"
+msgstr "Перезапустити систему, коли програми намагаються першкодити цьому"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:36
+msgid ""
+"Authentication is required for rebooting the system while an application "
+"asked to inhibit it."
+msgstr ""
+"Засвідчення потрібно, щоб перезапустити систему, коли програми намагаються "
+"першкодити цьому."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:37
+msgid "Suspend the system"
+msgstr "Призупинити систему"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:38
+msgid "Authentication is required for suspending the system."
+msgstr "Засвідчення потрібно, щоб призупинити систему."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:39
+msgid "Suspend the system while other users are logged in"
+msgstr "Призупинити систему, коли інші користувачі в ній"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:40
+msgid ""
+"Authentication is required for suspending the system while other users are "
+"logged in."
+msgstr ""
+"Засвідчення потрібно, щоб призупинити систему, коли інші користувачі в ній."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:41
+msgid "Suspend the system while an application asked to inhibit it"
+msgstr "Призупинити систему, коли програми намагаються першкодити цьому"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:42
+msgid ""
+"Authentication is required for suspending the system while an application "
+"asked to inhibit it."
+msgstr ""
+"Засвідчення потрібно, щоб призупнити систему, коли програми намагаються "
+"першкодити цьому."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:43
+msgid "Hibernate the system"
+msgstr "Приспати систему"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:44
+msgid "Authentication is required for hibernating the system."
+msgstr "Засвідчення потрібно, щоб приспати систему."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:45
+msgid "Hibernate the system while other users are logged in"
+msgstr "Приспати систему, коли інші користувачі в ній"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:46
+msgid ""
+"Authentication is required for hibernating the system while other users are "
+"logged in."
+msgstr ""
+"Засвідчення потрібно, щоб присипання систему, коли інші користувачі в ній."
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:47
+msgid "Hibernate the system while an application asked to inhibit it"
+msgstr "Приспати систему, коли програми намагаються першкодити цьому"
+
+#: ../src/login/org.freedesktop.login1.policy.in.h:48
+msgid ""
+"Authentication is required for hibernating the system while an application "
+"asked to inhibit it."
+msgstr ""
+"Засвідчення потрібно, щоб приспати систему, коли програми намагаються "
+"першкодити цьому."
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:1
+msgid "Set system time"
+msgstr "Вказати системний час"
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:2
+msgid "Authentication is required to set the system time."
+msgstr "Засвідчення потрібно, щоб вказати системний час."
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:3
+msgid "Set system timezone"
+msgstr "Вказати системний часовий пояс"
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:4
+msgid "Authentication is required to set the system timezone."
+msgstr "Засвідчення потрібно, щоб вказати системний часовий пояс."
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:5
+msgid "Set RTC to local timezone or UTC"
+msgstr "Вкажіть RTC для локального часового поясу або UTC"
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:6
+msgid ""
+"Authentication is required to control whether the RTC stores the local or "
+"UTC time."
+msgstr "Засвідчення потрібно, щоб контролювати, чи RTC зберігає час, чи UTC."
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:7
+msgid "Turn network time synchronization on or off"
+msgstr "Увімкнути або вимкнути синхронізування через мережу"
+
+#: ../src/timedate/org.freedesktop.timedate1.policy.in.h:8
+msgid ""
+"Authentication is required to control whether network time synchronization "
+"shall be enabled."
+msgstr ""
+"Засвідчення потрібно, щоб контролювати, чи синхронізування часу через мережу "
+"запущено."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:1
+msgid "Send passphrase back to system"
+msgstr "Надіслати пароль назад у систему"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:2
+msgid ""
+"Authentication is required to send the entered passphrase back to the system."
+msgstr "Засвідчення потрібно, щоб надіслати введений пароль назад у систему."
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:3
+msgid "Privileged system and service manager access"
+msgstr "Привілейований доступ до менеджера системи і служб"
+
+#: ../src/core/org.freedesktop.systemd1.policy.in.in.h:4
+msgid "Authentication is required to access the system and service manager."
+msgstr "Засвідчення потрібно, щоб доступитись до менеджера системи і служб."
+-- 
+1.7.9.2
+
--- a/0002-man-document-yearly-and-annually-in-systemd.time-7.patch
+++ b/0002-man-document-yearly-and-annually-in-systemd.time-7.patch
@ -0,0 +1,49 @@
+From 8c275eef38bf7e3e592e4cb35a497522d1f15bb6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 16 Jul 2014 22:17:29 -0400
+Subject: [PATCH] man: document yearly and annually in systemd.time(7)
+
+https://bugs.freedesktop.org/show_bug.cgi?id=81158
+---
+ man/systemd.time.xml |   18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git man/systemd.time.xml man/systemd.time.xml
+index 0706cdf..02431a5 100644
+--- man/systemd.time.xml
+++ man/systemd.time.xml
+@@ -243,12 +243,16 @@
+ 
+                 <para>The special expressions
+                 <literal>hourly</literal>, <literal>daily</literal>,
+-                <literal>monthly</literal> and <literal>weekly</literal>
+-                may be used as calendar events which refer to
+-                <literal>*-*-* *:00:00</literal>, <literal>*-*-*
+-                00:00:00</literal>, <literal>*-*-01 00:00:00</literal> and
+-                <literal>Mon *-*-* 00:00:00</literal>,
+-                respectively.</para>
+                <literal>monthly</literal>, <literal>weekly</literal>,
+                and <literal>yearly</literal> or
+                <literal>annually</literal> may be used as calendar
+                events which refer to
+                <literal>*-*-* *:00:00</literal>,
+                <literal>*-*-* 00:00:00</literal>,
+                <literal>*-*-01 00:00:00</literal>,
+                <literal>Mon *-*-* 00:00:00</literal>, and
+                <literal>*-01-01 00:00:00</literal> respectively.
+                </para>
+ 
+                 <para>Examples for valid timestamps and their
+                 normalized form:</para>
+@@ -277,6 +281,8 @@ Wed-Sat,Tue 12-10-15 1:2:3 → Tue-Sat 2012-10-15 01:02:03
+                      daily → *-*-* 00:00:00
+                    monthly → *-*-01 00:00:00
+                     weekly → Mon *-*-* 00:00:00
+                    yearly → *-01-01 00:00:00
+                  annually → *-01-01 00:00:00
+                      *:2/3 → *-*-* *:02/3:00</programlisting>
+ 
+                   <para>Calendar events are used by timer units, see
+-- 
+1.7.9.2
+
--- a/0002-units-serial-getty-.service-use-the-default-RestartS.patch
+++ b/0002-units-serial-getty-.service-use-the-default-RestartS.patch
@ -0,0 +1,29 @@
+Based on 4bf04322b8b7ecca4f3d65cfc642d0ac16356129 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 15 Jul 2014 18:28:10 +0200
+Subject: [PATCH] units/serial-getty@.service: use the default RestartSec
+
+For pluggable ttys such as USB serial devices, the getty is restarted
+and exits in a loop until the remove event reaches systemd. Under
+certain circumstances the restart loop can overload the system in a
+way that prevents the remove event from reaching systemd for a long
+time (e.g. at least several minutes on a small embedded system).
+
+Use the default RestartSec to prevent the restart loop from
+overloading the system. Serial gettys are interactive units, so
+waiting an extra 100ms really doesn't make a difference anyways
+compared to the time it takes the user to log in.
+---
+ units/serial-getty@.service.m4 |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- units/serial-getty@.service.m4
+++ units/serial-getty@.service.m4	2014-07-16 00:00:00.000000000 +0000
+@@ -27,7 +27,6 @@ ExecStart=-/sbin/agetty --keep-baud %I 1
+ ExecStopPost=-/sbin/vhangup /dev/%I
+ Type=idle
+ Restart=always
+-RestartSec=0
+ UtmpIdentifier=%I
+ TTYPath=/dev/%I
+ TTYReset=yes
--- a/0003-core-nicer-message-when-inotify-watches-are-exhauste.patch
+++ b/0003-core-nicer-message-when-inotify-watches-are-exhauste.patch
@ -0,0 +1,30 @@
+From 18abe7bd3e13525b257da69ac49ff7841c289567 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 16 Jul 2014 22:52:53 -0400
+Subject: [PATCH] core: nicer message when inotify watches are exhausted
+
+inotify_add_watch returns ENOSPC, which translates to
+"No space left on device", which is misleading.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=73628
+---
+ src/core/path.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git src/core/path.c src/core/path.c
+index 20e454d..f54c77f 100644
+--- src/core/path.c
+++ src/core/path.c
+@@ -99,7 +99,8 @@ int path_spec_watch(PathSpec *s, sd_event_io_handler_t handler) {
+                                 break;
+                         }
+ 
+-                        log_warning("Failed to add watch on %s: %m", s->path);
+                        log_warning("Failed to add watch on %s: %s", s->path,
+                                    errno == ENOSPC ? "too many watches" : strerror(-r));
+                         r = -errno;
+                         if (cut)
+                                 *cut = tmp;
+-- 
+1.7.9.2
+
--- a/1051-check-if-NAME-has-a-value.patch
+++ b/1051-check-if-NAME-has-a-value.patch
@ -0,0 +1,12 @@
+Index: systemd-210/src/udev/rule_generator/76-net-sriov-names.rules
+===================================================================
+--- systemd-210.orig/src/udev/rule_generator/76-net-sriov-names.rules
+++ systemd-210/src/udev/rule_generator/76-net-sriov-names.rules
+@@ -5,6 +5,7 @@
+ ACTION=="remove", GOTO="net-sriov-names_end"
+ SUBSYSTEM!="net", GOTO="net-sriov-names_end"
+ KERNEL!="eth*", GOTO="net-sriov-names_end"
+NAME=="?*", GOTO="net-sriov-names_end"
+ 
+ IMPORT{cmdline}="net.ifnames"
+ ENV{net.ifnames}=="1", GOTO="net-sriov-names_end"
--- a/1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
+++ b/1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
@ -0,0 +1,45 @@
+From 30632d97d9d68c8202e562f34afae8f8d6e9c377 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay@vrfy.org>
+Date: Tue, 15 Jul 2014 17:35:53 +0200
+Subject: [PATCH] rules: uaccess - add ID_SOFTWARE_RADIO
+
+On Tue, Jul 15, 2014 at 1:52 PM, Alick Zhao <alick9188@gmail.com> wrote:
+>>>
+>>> So maybe ID_SOFTWARE_RADIO ?
+>>
+>> Hmm, SDR is more a term for a generic technology than for a device
+>> class. To me it does not really sound like an administrator would know
+>> what this is.
+>>
+>> What exactly is the device or subsystem you want to make accessible to
+>> locally logged-in users only?
+>
+> Initially it is bladeRF, but many more are of interest: USRP, rtl-sdr,
+> HackRF, ... [1]
+>
+> I agree an administrator might not know what SDR is, since it is
+> currently still not widely known, and makes sense only for amateurs
+> and researchers. But as a SDR fan, I see many new SDR peripherals
+> are created recently, and expect to see more. So a generic ID seems
+> reasonable to me.
+>
+> [1] http://en.wikipedia.org/wiki/List_of_software-defined_radios
+---
+ src/login/70-uaccess.rules |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git src/login/70-uaccess.rules src/login/70-uaccess.rules
+index 57f619d..694df2c 100644
+--- src/login/70-uaccess.rules
+++ src/login/70-uaccess.rules
+@@ -72,4 +72,7 @@ ENV{DDC_DEVICE}=="?*", TAG+="uaccess"
+ # media player raw devices (for user-mode drivers, Android SDK, etc.)
+ SUBSYSTEM=="usb", ENV{ID_MEDIA_PLAYER}=="?*", TAG+="uaccess"
+ 
+# software-defined radio communication devices
+ENV{ID_SOFTWARE_RADIO}=="?*", TAG+="uaccess"
+
+ LABEL="uaccess_end"
+-- 
+1.7.9.2
+
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Jul 17 09:30:28 UTC 2014 - werner@suse.de
+
+- Add upstream patches
+  0001-po-add-Ukrainian-translation.patch
+  0002-man-document-yearly-and-annually-in-systemd.time-7.patch
+  0003-core-nicer-message-when-inotify-watches-are-exhauste.patch
+- Add patch 0001-fix-only-discover-Xen-domU.patch to fix upstream 
+  patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch
+ 
+-------------------------------------------------------------------
+Thu Jul 17 06:32:51 UTC 2014 - rmilasan@suse.com
+
+- Check if NAME key has a value before going thru the rule (bnc#885232).
+  Add 1051-check-if-NAME-has-a-value.patch 
+
+-------------------------------------------------------------------
+Wed Jul 16 16:33:12 UTC 2014 - werner@suse.de
+
+- Add upstream patches
+  0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch
+  0002-units-serial-getty-.service-use-the-default-RestartS.patch
+  1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
+
 -------------------------------------------------------------------
 Tue Jul 15 12:30:31 UTC 2014 - rmilasan@suse.com

--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@ -695,6 +695,18 @@ Patch336:       0003-sd-event-always-call-epoll_ctl-on-mask-updates-if-ed.patch
 Patch337:       0004-fileio-quote-more-shell-characters-in-envfiles.patch
 # PATCH-FIX-SUSE Do a vhangup on all consoles lines (bnc#886599)
 Patch338:       vhangup-on-all-consoles.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/16
+Patch339:       0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/16
+Patch340:       0002-units-serial-getty-.service-use-the-default-RestartS.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/17
+Patch341:       0001-po-add-Ukrainian-translation.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/17
+Patch342:       0002-man-document-yearly-and-annually-in-systemd.time-7.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/17
+Patch343:       0003-core-nicer-message-when-inotify-watches-are-exhauste.patch
+# PATCH-FIX-SUSE Fix patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch
+Patch344:       0001-fix-only-discover-Xen-domU.patch

 # UDEV PATCHES
 # ============
@ -802,6 +814,10 @@ Patch1048:      1048-udev-net_setup_link-add-a-bit-more-logging.patch
 Patch1049:      1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch
 # PATCH-FIX-SUSE 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch (bnc#885232)
 Patch1050:      1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch
+# PATCH-FIX-SUSE 1051-check-if-NAME-has-a-value.patch (bnc#885232)
+Patch1051:      1051-check-if-NAME-has-a-value.patch
+# PATCH-FIX-UPSTREAM 1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
+Patch1052:      1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch

 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@ -1298,6 +1314,12 @@ cp %{SOURCE7} m4/
 %patch336 -p0
 %patch337 -p0
 %patch338 -p0
+%patch339 -p0
+%patch340 -p0
+%patch341 -p0
+%patch342 -p0
+%patch343 -p0
+%patch344 -p1

 # udev patches
 %patch1001 -p1
@ -1357,6 +1379,8 @@ cp %{SOURCE7} m4/
 %patch1048 -p0
 %patch1049 -p0
 %patch1050 -p1
+%patch1051 -p1
+%patch1052 -p0

 # ensure generate files are removed
 rm -f units/emergency.service
--- a/systemd.changes
+++ b/systemd.changes
@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Jul 17 09:30:28 UTC 2014 - werner@suse.de
+
+- Add upstream patches
+  0001-po-add-Ukrainian-translation.patch
+  0002-man-document-yearly-and-annually-in-systemd.time-7.patch
+  0003-core-nicer-message-when-inotify-watches-are-exhauste.patch
+- Add patch 0001-fix-only-discover-Xen-domU.patch to fix upstream 
+  patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch
+ 
+-------------------------------------------------------------------
+Thu Jul 17 06:32:51 UTC 2014 - rmilasan@suse.com
+
+- Check if NAME key has a value before going thru the rule (bnc#885232).
+  Add 1051-check-if-NAME-has-a-value.patch 
+
+-------------------------------------------------------------------
+Wed Jul 16 16:33:12 UTC 2014 - werner@suse.de
+
+- Add upstream patches
+  0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch
+  0002-units-serial-getty-.service-use-the-default-RestartS.patch
+  1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
+
 -------------------------------------------------------------------
 Tue Jul 15 12:30:31 UTC 2014 - rmilasan@suse.com

--- a/systemd.spec
+++ b/systemd.spec
@ -690,6 +690,18 @@ Patch336:       0003-sd-event-always-call-epoll_ctl-on-mask-updates-if-ed.patch
 Patch337:       0004-fileio-quote-more-shell-characters-in-envfiles.patch
 # PATCH-FIX-SUSE Do a vhangup on all consoles lines (bnc#886599)
 Patch338:       vhangup-on-all-consoles.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/16
+Patch339:       0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/16
+Patch340:       0002-units-serial-getty-.service-use-the-default-RestartS.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/17
+Patch341:       0001-po-add-Ukrainian-translation.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/17
+Patch342:       0002-man-document-yearly-and-annually-in-systemd.time-7.patch
+# PATCH-FIX-UPSTREAM added at 2014/07/17
+Patch343:       0003-core-nicer-message-when-inotify-watches-are-exhauste.patch
+# PATCH-FIX-SUSE Fix patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch
+Patch344:       0001-fix-only-discover-Xen-domU.patch

 # UDEV PATCHES
 # ============
@ -797,6 +809,10 @@ Patch1048:      1048-udev-net_setup_link-add-a-bit-more-logging.patch
 Patch1049:      1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch
 # PATCH-FIX-SUSE 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch (bnc#885232)
 Patch1050:      1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch
+# PATCH-FIX-SUSE 1051-check-if-NAME-has-a-value.patch (bnc#885232)
+Patch1051:      1051-check-if-NAME-has-a-value.patch
+# PATCH-FIX-UPSTREAM 1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch
+Patch1052:      1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch

 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@ -1293,6 +1309,12 @@ cp %{SOURCE7} m4/
 %patch336 -p0
 %patch337 -p0
 %patch338 -p0
+%patch339 -p0
+%patch340 -p0
+%patch341 -p0
+%patch342 -p0
+%patch343 -p0
+%patch344 -p1

 # udev patches
 %patch1001 -p1
@ -1352,6 +1374,8 @@ cp %{SOURCE7} m4/
 %patch1048 -p0
 %patch1049 -p0
 %patch1050 -p1
+%patch1051 -p1
+%patch1052 -p0

 # ensure generate files are removed
 rm -f units/emergency.service