Attachment #6988 for bug #33152

View | Details | Raw Unified | Return to bug 33152
Collapse All | Expand All




--- 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

Lines 25-30 Packager: Alexey Gladkov <legion@altlinux.ru> Link Here

(-)a/rpm/util-linux.spec (-1 / +16 lines)
25	%def_with selinux	25	%def_with selinux
26	%def_with audit	26	%def_with audit
27	%def_with udev	27	%def_with udev
		28	%def_without systemd
28	%def_enable line	29	%def_enable line
29	%def_disable mountpoint	30	%def_disable mountpoint
30	%def_disable eject	31	%def_disable eject
Lines 40-45 BuildRequires: libcap-ng-devel Link Here
40	%{?_with_selinux:BuildRequires: libselinux-devel}	41	%{?_with_selinux:BuildRequires: libselinux-devel}
41	%{?_with_audit:BuildRequires: libaudit-devel}	42	%{?_with_audit:BuildRequires: libaudit-devel}
42	%{?_with_udev:BuildRequires: libudev-devel}	43	%{?_with_udev:BuildRequires: libudev-devel}
		44	%{?_with_systemd:BuildRequires: libsystemd-devel}
43	%{?_enable_login:BuildRequires: libpam-devel}	45	%{?_enable_login:BuildRequires: libpam-devel}
44		46
45	### Sources	47	### Sources
Lines 96-101 Patch58: util-linux-2.12r-alt-mount-MS_SILENT.patch Link Here
96	Patch59: util-linux-tests.patch	98	Patch59: util-linux-tests.patch
97	Patch60: util-linux-2.20-alt-agetty-release.patch	99	Patch60: util-linux-2.20-alt-agetty-release.patch
98		100
		101	# 33152 - logger without systemd support
		102	Patch70: util-linux-2.29.0-alt-logger_man.patch
		103
99	%description	104	%description
100	The util-linux package contains a large variety of low-level system	105	The util-linux package contains a large variety of low-level system
101	utilities that are necessary for a Linux system to function. Among	106	utilities that are necessary for a Linux system to function. Among
Lines 451-456 cp -r -- %SOURCE8 %SOURCE9 %SOURCE10 %SOURCE11 %SOURCE12 . Link Here
451	%patch59 -p2	456	%patch59 -p2
452	%patch60 -p1	457	%patch60 -p1
453		458
		459	%if_without systemd
		460	%patch70 -p1
		461	%endif
		462
454	echo %version > .tarball-version	463	echo %version > .tarball-version
455		464
456	mkdir -p rpm	465	mkdir -p rpm
Lines 516-521 mv blkid.static rpm/blkid.initramfs Link Here
516	%{subst_with udev} \	525	%{subst_with udev} \
517	%{subst_with selinux} \	526	%{subst_with selinux} \
518	%{subst_with audit} \	527	%{subst_with audit} \
		528	%{subst_with systemd} \
519	%{subst_enable line} \	529	%{subst_enable line} \
520	%{subst_enable mountpoint} \	530	%{subst_enable mountpoint} \
521	%{subst_enable eject} \	531	%{subst_enable eject} \
Lines 864-869 fi Link Here
864	%if_enabled uuidd	874	%if_enabled uuidd
865	%files -n uuidd	875	%files -n uuidd
866	%_sbindir/uuidd	876	%_sbindir/uuidd
		877	%if_with systemd
		878	%_unitdir/uuidd.*
		879	%endif #with systemd
867	%_man8dir/uuidd.*	880	%_man8dir/uuidd.*
868	%endif #enabled uuidd	881	%endif #enabled uuidd
869		882
Lines 910-915 fi Link Here
910	%files -f %name.files	923	%files -f %name.files
911	%attr(2711,root,tty) %_bindir/write	924	%attr(2711,root,tty) %_bindir/write
912	%doc Documentation/.txt NEWS AUTHORS README Documentation/licenses/* Documentation/TODO	925	%doc Documentation/.txt NEWS AUTHORS README Documentation/licenses/* Documentation/TODO
		926	%if_with systemd
		927	%_unitdir/fstrim.*
		928	%endif #with systemd
913		929
914	%changelog	930	%changelog
915	* Thu Nov 17 2016 Alexey Gladkov <legion@altlinux.ru> 2.29.0-alt1	931	* Thu Nov 17 2016 Alexey Gladkov <legion@altlinux.ru> 2.29.0-alt1
916	-

Return to bug 33152

Line 0 Link Here

(-)a/rpm/patches-alt/util-linux-2.29.0-alt-logger_man.patch (+47 lines)
	1	--- util-linux/misc-utils/logger.1
	2	+++ util-linux/misc-utils/logger.1
	3	@@ -80,35 +80,6 @@ is able to set those socket credentials to the given \fIid\fR, but only if you
	4	have root permissions and a process with the specified PID exists, otherwise
	5	the socket credentials are not modified and the problem is silently ignored.
	6	.TP
	7	-.BR \-\-journald [ =\fIfile ]
	8	-Write a systemd journal entry. The entry is read from the given \fIfile\fR,
	9	-when specified, otherwise from standard input.
	10	-Each line must begin with a field that is accepted by journald; see
	11	-.BR systemd.journal-fields (7)
	12	-for details. The use of a MESSAGE_ID field is generally a good idea, as it
	13	-makes finding entries easy. Examples:
	14	-.IP
	15	-.nf
	16	-\fB logger \-\-journald <<end
	17	-\fB MESSAGE_ID=67feb6ffbaf24c5cbec13c008dd72309
	18	-\fB MESSAGE=The dogs bark, but the caravan goes on.
	19	-\fB DOGS=bark
	20	-\fB CARAVAN=goes on
	21	-\fB end
	22	-.IP
	23	-\fB logger \-\-journald=entry.txt
	24	-.fi
	25	-.IP
	26	-Notice that
	27	-.B \-\-journald
	28	-will ignore values of other options, such as priority. If priority is
	29	-needed it must be within input, and use PRIORITY field. The simple
	30	-execution of
	31	-.B journalctl
	32	-will display MESSAGE field. Use
	33	-.B journalctl \-\-output json-pretty
	34	-to see rest of the fields.
	35	-.TP
	36	.BR \-\-msgid " \fImsgid
	37	Sets the RFC5424 MSGID field. Note that the space character is not permitted
	38	inside of \fImsgid\fR. This option is only used if \fB\-\-rfc5424\fR is
	39	@@ -342,8 +313,6 @@ For the priority order and intended purposes of these facilities and levels, see
	40	.B logger \-n loghost.example.com System rebooted
	41	.SH SEE ALSO
	42	.BR syslog (3),
	43	-.BR journalctl (1),
	44	-.BR systemd.journal-fields (7)
	45	.SH STANDARDS
	46	The
	47	.B logger