Attachment 6988 Details for Bug 33152 – systemd support; off by default

[patch] systemd support; off by default

util-linux-systemd.patch (text/plain), 4.40 KB, created by Vladimir D. Seleznev on 2017-02-22 22:25:50 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir D. Seleznev

Created: 2017-02-22 22:25:50 MSK

Size: 4.40 KB

patch

obsolete

>From 95798b1a6be7ae6372b5230184c76b6aac64b32b Mon Sep 17 00:00:00 2001
>From: "Vladimir D. Seleznev" <vseleznv@altlinux.org>
>Date: Wed, 22 Feb 2017 20:17:06 +0300
>Subject: [PATCH] added with_systemd knob support; is off by default
>
>---
> .../util-linux-2.29.0-alt-logger_man.patch         | 47 ++++++++++++++++++++++
> rpm/util-linux.spec                                | 16 ++++++++
> 2 files changed, 63 insertions(+)
> create mode 100644 rpm/patches-alt/util-linux-2.29.0-alt-logger_man.patch
>
>diff --git a/rpm/patches-alt/util-linux-2.29.0-alt-logger_man.patch b/rpm/patches-alt/util-linux-2.29.0-alt-logger_man.patch
>new file mode 100644
>index 0000000..f76100a
>--- /dev/null
>+++ b/rpm/patches-alt/util-linux-2.29.0-alt-logger_man.patch
>@@ -0,0 +1,47 @@
>+--- util-linux/misc-utils/logger.1
>++++ util-linux/misc-utils/logger.1
>+@@ -80,35 +80,6 @@ is able to set those socket credentials to the given \fIid\fR, but only if you
>+ have root permissions and a process with the specified PID exists, otherwise
>+ the socket credentials are not modified and the problem is silently ignored.
>+ .TP
>+-.BR \-\-journald [ =\fIfile ]
>+-Write a systemd journal entry.  The entry is read from the given \fIfile\fR,
>+-when specified, otherwise from standard input.
>+-Each line must begin with a field that is accepted by journald; see
>+-.BR systemd.journal-fields (7)
>+-for details.  The use of a MESSAGE_ID field is generally a good idea, as it
>+-makes finding entries easy.  Examples:
>+-.IP
>+-.nf
>+-\fB    logger \-\-journald <<end
>+-\fB    MESSAGE_ID=67feb6ffbaf24c5cbec13c008dd72309
>+-\fB    MESSAGE=The dogs bark, but the caravan goes on.
>+-\fB    DOGS=bark
>+-\fB    CARAVAN=goes on
>+-\fB    end
>+-.IP
>+-\fB    logger \-\-journald=entry.txt
>+-.fi
>+-.IP
>+-Notice that
>+-.B \-\-journald
>+-will ignore values of other options, such as priority.  If priority is
>+-needed it must be within input, and use PRIORITY field.  The simple
>+-execution of
>+-.B journalctl
>+-will display MESSAGE field.  Use
>+-.B journalctl \-\-output json-pretty
>+-to see rest of the fields.
>+-.TP
>+ .BR \-\-msgid " \fImsgid
>+ Sets the RFC5424 MSGID field.  Note that the space character is not permitted
>+ inside of \fImsgid\fR.  This option is only used if \fB\-\-rfc5424\fR is
>+@@ -342,8 +313,6 @@ For the priority order and intended purposes of these facilities and levels, see
>+ .B logger \-n loghost.example.com System rebooted
>+ .SH SEE ALSO
>+ .BR syslog (3),
>+-.BR journalctl (1),
>+-.BR systemd.journal-fields (7)
>+ .SH STANDARDS
>+ The
>+ .B logger
>diff --git a/rpm/util-linux.spec b/rpm/util-linux.spec
>index 82221f5..4c22e93 100644
>--- a/rpm/util-linux.spec
>+++ b/rpm/util-linux.spec
>@@ -25,6 +25,7 @@ Packager: Alexey Gladkov <legion@altlinux.ru>
> %def_with selinux
> %def_with audit
> %def_with udev
>+%def_without systemd
> %def_enable line
> %def_disable mountpoint
> %def_disable eject
>@@ -40,6 +41,7 @@ BuildRequires: libcap-ng-devel
> %{?_with_selinux:BuildRequires: libselinux-devel}
> %{?_with_audit:BuildRequires: libaudit-devel}
> %{?_with_udev:BuildRequires: libudev-devel}
>+%{?_with_systemd:BuildRequires: libsystemd-devel}
> %{?_enable_login:BuildRequires: libpam-devel}
> 
> ### Sources
>@@ -96,6 +98,9 @@ Patch58: util-linux-2.12r-alt-mount-MS_SILENT.patch
> Patch59: util-linux-tests.patch
> Patch60: util-linux-2.20-alt-agetty-release.patch
> 
>+# 33152 - logger without systemd support
>+Patch70: util-linux-2.29.0-alt-logger_man.patch
>+
> %description
> The util-linux package contains a large variety of low-level system
> utilities that are necessary for a Linux system to function. Among
>@@ -451,6 +456,10 @@ cp -r -- %SOURCE8 %SOURCE9 %SOURCE10 %SOURCE11 %SOURCE12 .
> %patch59 -p2
> %patch60 -p1
> 
>+%if_without systemd
>+%patch70 -p1
>+%endif
>+
> echo %version > .tarball-version
> 
> mkdir -p rpm
>@@ -516,6 +525,7 @@ mv blkid.static rpm/blkid.initramfs
> 	%{subst_with udev} \
> 	%{subst_with selinux} \
> 	%{subst_with audit} \
>+	%{subst_with systemd} \
> 	%{subst_enable line} \
> 	%{subst_enable mountpoint} \
> 	%{subst_enable eject} \
>@@ -864,6 +874,9 @@ fi
> %if_enabled uuidd
> %files -n uuidd
> %_sbindir/uuidd
>+%if_with systemd
>+%_unitdir/uuidd.*
>+%endif #with systemd
> %_man8dir/uuidd.*
> %endif #enabled uuidd
> 
>@@ -910,6 +923,9 @@ fi
> %files -f %name.files
> %attr(2711,root,tty) %_bindir/write
> %doc Documentation/*.txt NEWS AUTHORS README* Documentation/licenses/* Documentation/TODO
>+%if_with systemd
>+%_unitdir/fstrim.*
>+%endif #with systemd
> 
> %changelog
> * Thu Nov 17 2016 Alexey Gladkov <legion@altlinux.ru> 2.29.0-alt1
>-- 
>2.10.2
>

Actions: View | Diff

Attachments on bug 33152: 6988