diff --git a/journalctl-require-argument-for-priority b/journalctl-require-argument-for-priority index 2ecfcbe..871ac96 100644 --- a/journalctl-require-argument-for-priority +++ b/journalctl-require-argument-for-priority @@ -9,11 +9,11 @@ unaffected because it is specified in the getopt_long parameter list. src/journal/journalctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index cccd8a7..011a11b 100644 ---- a/src/journal/journalctl.c -+++ b/src/journal/journalctl.c -@@ -157,7 +157,7 @@ static int parse_argv(int argc, char *argv[]) { +Index: systemd-195/src/journal/journalctl.c +=================================================================== +--- systemd-195.orig/src/journal/journalctl.c ++++ systemd-195/src/journal/journalctl.c +@@ -158,7 +158,7 @@ static int parse_argv(int argc, char *ar { "this-boot", no_argument, NULL, 'b' }, { "directory", required_argument, NULL, 'D' }, { "header", no_argument, NULL, ARG_HEADER }, @@ -22,6 +22,3 @@ index cccd8a7..011a11b 100644 { "setup-keys", no_argument, NULL, ARG_SETUP_KEYS }, { "interval", required_argument, NULL, ARG_INTERVAL }, { "verify", no_argument, NULL, ARG_VERIFY }, --- -1.7.10.4 - diff --git a/kmod-fix-builtin-typo.patch b/kmod-fix-builtin-typo.patch deleted file mode 100644 index 77853c5..0000000 --- a/kmod-fix-builtin-typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a9f4815da56b8efc519595c3d8a78fe064fa8d69 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Fri, 26 Oct 2012 00:28:23 +0200 -Subject: [PATCH] udev: kmod - fix typo - ---- - src/udev/udev-builtin-kmod.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c -index 1df055b..aacdff8 100644 ---- a/src/udev/udev-builtin-kmod.c -+++ b/src/udev/udev-builtin-kmod.c -@@ -75,7 +75,7 @@ static int builtin_kmod(struct udev_device *dev, int argc, char *argv[], bool te - struct udev *udev = udev_device_get_udev(dev); - int i; - -- if (ctx) -+ if (!ctx) - return 0; - - if (argc < 3 || strcmp(argv[1], "load")) { --- -1.7.10.4 - diff --git a/libudev-validate-argument-udev_enumerate_new.patch b/libudev-validate-argument-udev_enumerate_new.patch deleted file mode 100644 index 9f14aa0..0000000 --- a/libudev-validate-argument-udev_enumerate_new.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e68893075083a7461b1572233d23fdb23541d630 Mon Sep 17 00:00:00 2001 -From: Michael Terry -Date: Fri, 14 Dec 2012 09:02:13 -0500 -Subject: [PATCH] libudev: validate 'udev' argument to udev_enumerate_new() - -https://bugs.freedesktop.org/show_bug.cgi?id=58289 ---- - src/libudev/libudev-enumerate.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c -index 1729655..6a5f4e0 100644 ---- a/src/libudev/libudev-enumerate.c -+++ b/src/libudev/libudev-enumerate.c -@@ -81,6 +81,8 @@ _public_ struct udev_enumerate *udev_enumerate_new(struct udev *udev) - { - struct udev_enumerate *udev_enumerate; - -+ if (udev == NULL) -+ return NULL; - udev_enumerate = calloc(1, sizeof(struct udev_enumerate)); - if (udev_enumerate == NULL) - return NULL; --- -1.7.10.4 - diff --git a/systemd.changes b/systemd.changes index 3bd5778..4e9245c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -5,6 +5,11 @@ Tue Jan 29 13:32:30 UTC 2013 - rmilasan@suse.com add: 1019-udev-Fix-device-matching-in-the-accelerometer.patch - keymap: add aditional support for some keyboard keys add: 1018-keymap-add-aditional-support.patch +- journalctl: require argument for --priority + add: journalctl-require-argument-for-priority +- dropped useless patches: + libudev-validate-argument-udev_enumerate_new.patch + kmod-fix-builtin-typo.patch - rename udev-root-symlink.service to systemd-udev-root-symlink.service. ------------------------------------------------------------------- diff --git a/systemd.spec b/systemd.spec index 0bd2a0f..07b60c7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -255,6 +255,8 @@ Patch122: improve-man-environment.patch Patch123: tmpfiles-X-type.patch # PATCH-FIX-UPSTREAM systemd-fix-merge-ignore-dependencies.patch fcrozat@suse.com bnc#800365 -- fix merging with --ignore-dependencies waiting for dependencies Patch124: systemd-fix-merge-ignore-dependencies.patch +# PATCH-FIX-UPSTREAM journalctl-require-argument-for-priority +Patch125: journalctl-require-argument-for-priority # udev patches # PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch @@ -562,6 +564,7 @@ cp %{SOURCE7} m4/ %patch122 -p1 %patch123 -p1 %patch124 -p1 +%patch125 -p1 %build autoreconf -fiv