Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2013-07-02 12:29:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rsyslog" Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2013-06-17 10:17:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2013-07-02 14:30:24.000000000 +0200 @@ -1,0 +2,32 @@ +Wed Jun 26 10:48:34 UTC 2013 - [email protected] + +- Use --enable-cached-man-pages configure option on SLES-11, where + rst2man is not available and removed prebuilt man pages. + +------------------------------------------------------------------- +Sat Jun 22 20:54:14 UTC 2013 - [email protected] + +- update to 7.4.1 [v7.4-stable]: + - imjournal: add ratelimiting capability + - bugfix imzmq3: potential segfault on startup +- includes changes from 7.4.0 [v7.4-stable]: + - doc bugfix: ReadMode wrong in imfile doc, two values were swapped + - imjournal: no longer do periodic wakeup + - bugfix: potential hang *in debug mode* on rsyslogd termination + - bugfix: $template statement with multiple spaces lead to invalid tpl name + - 0mq fixes +- includes changes from version 7.3.15 + - bugfix: problem in build system (especially when cross-compiling) + - bugfix: imjournal had problem with systemd journal API change + - imjournal: now obtain and include PID + - bugfix: .logsig files had tlv16 indicator bit at wrong offset + - bugfix: omrelp legacy config parameters set a timeout of zero + which lead the legacy config to be unusable. + - bugfix: segfault on startup if a disk queue was configure without file + name + - bugfix: invalid addressing in string class (recent regression) +- packaging changes: + - rebase rsyslog-unit.patch + - move libee/liblognorm dependencies to mmnormalize conditional + +------------------------------------------------------------------- Old: ---- rscryutil.1.gz rsgtutil.1.gz rsyslog-7.3.14.tar.gz New: ---- rsyslog-7.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.aqsRDW/_old 2013-07-02 14:30:25.000000000 +0200 +++ /var/tmp/diff_new_pack.aqsRDW/_new 2013-07-02 14:30:25.000000000 +0200 @@ -20,7 +20,7 @@ Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0+ and Apache-2.0) Group: System/Daemons -Version: 7.3.14 +Version: 7.4.1 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd @@ -140,13 +140,18 @@ %endif %if %{with mmnormalize} # mmnormalize support -BuildRequires: liblognorm-devel -%endif +BuildRequires: liblognorm-devel >= 0.3.1 +%if 0%{?suse_version} >= 1210 +BuildRequires: pkgconfig(libee) >= 0.4.0 +%else +BuildRequires: libee-devel +%endif # >= 1210 +%endif # with mmnormalize +# # mmjsonparse needs liblognorm, # but json check is unconditional %if 0%{?suse_version} >= 1210 BuildRequires: pkgconfig(json) >= 0.9 -BuildRequires: pkgconfig(libee) >= 0.4.0 BuildRequires: pkgconfig(libestr) >= 0.1.5 %else BuildRequires: libee-devel @@ -160,6 +165,9 @@ %endif %if 0%{?suse_version} >= 1200 BuildRequires: python-docutils +%bcond_without rst2man +%else +%bcond_with rst2man %endif %if %{with systemd} %{?systemd_requires} @@ -171,8 +179,6 @@ Source2: rsyslog.conf.in Source4: rsyslog.d.remote.conf.in Source5: rsyslog-service-prepare.in -Source10: rscryutil.1.gz -Source11: rsgtutil.1.gz # PATCH-FIX-OPENSUSE rsyslog-unit.patch [email protected] Customize upstream systemd unit for openSUSE needs. Patch0: rsyslog-unit.patch @@ -472,10 +478,6 @@ done %endif dos2unix doc/*.html -# v7.3.14 does not ship them pre-built -for m in rscryutil.1 rsgtutil.1 ; do - test -f tools/${m} || gunzip -c "$RPM_SOURCE_DIR/${m}.gz" > tools/${m} -done %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../../grammar" @@ -485,6 +487,9 @@ # --enable-gui \ %configure \ --with-moddirs=%{rsyslog_module_dir_withdeps} \ +%if ! %{with rst2man} + --enable-cached-man-pages \ +%endif --enable-option-checking \ --enable-largefile \ --enable-regexp \ ++++++ rsyslog-7.3.14.tar.gz -> rsyslog-7.4.1.tar.gz ++++++ ++++ 20097 lines of diff (skipped) ++++++ rsyslog-unit.patch ++++++ --- /var/tmp/diff_new_pack.aqsRDW/_old 2013-07-02 14:30:26.000000000 +0200 +++ /var/tmp/diff_new_pack.aqsRDW/_new 2013-07-02 14:30:26.000000000 +0200 @@ -1,33 +1,28 @@ ---- rsyslog-7.3.14.orig/rsyslog.service.in -+++ rsyslog-7.3.14/rsyslog.service.in -@@ -1,9 +1,17 @@ +--- + rsyslog.service.in | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +Index: rsyslog-7.4.1/rsyslog.service.in +=================================================================== +--- rsyslog-7.4.1.orig/rsyslog.service.in 2013-06-17 06:50:28.000000000 +0100 ++++ rsyslog-7.4.1/rsyslog.service.in 2013-06-22 21:41:46.000000000 +0100 +@@ -1,11 +1,18 @@ [Unit] Description=System Logging Service + Requires=syslog.socket +Requires=var-run.mount -+Requires=syslog.socket +After=var-run.mount +Conflicts=syslog-ng.service syslogd.service [Service] + Type=notify -ExecStart=@sbindir@/rsyslogd -n --Sockets=syslog.socket -+Type=notify ++ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS + StandardOutput=null +Environment=RSYSLOGD_PARAMS= +ExecStartPre=@sbindir@/rsyslog-service-prepare +EnvironmentFile=-/etc/sysconfig/syslog -+ExecStart=@sbindir@/rsyslogd -n $RSYSLOGD_PARAMS +ExecReload=/bin/kill -HUP $MAINPID - StandardOutput=null [Install] ---- rsyslog-7.3.14.orig/tools/syslogd.c -+++ rsyslog-7.3.14/tools/syslogd.c -@@ -2033,7 +2033,7 @@ int realMain(int argc, char **argv) - close(2); - ourConf->globals.bErrMsgToStderr = 0; - } -- -+ sd_notify(0, "READY=1"); - mainloop(); - - /* do any de-init's that need to be done AFTER this comment */ + WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
