From ae9c65dc33f5fec11139214763c47b6d4303e7c056f0be2cfcb0c92319a737cd Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Tue, 7 May 2013 18:50:45 +0000
Subject: [PATCH 1/2] =?UTF-8?q?-=20update=20to=207.3.14=20[beta]=202013-05?=
 =?UTF-8?q?-06:=20=20=20-=20bugfix:=20some=20man=20pages=20were=20not=20pr?=
 =?UTF-8?q?operly=20installed=20either=20=20=20=20=20rscryutil=20or=20rsgt?=
 =?UTF-8?q?util=20man=20was=20installed,=20but=20not=20both.=20=20=20=20?=
 =?UTF-8?q?=20Thanks=20to=20Marius=20Tomaschewski=20for=20the=20patch.=20?=
 =?UTF-8?q?=20=20-=20bugfix:=20potential=20segfault=20on=20startup=20when?=
 =?UTF-8?q?=20builtin=20module=20was=20=20=20=20=20specified=20in=20module?=
 =?UTF-8?q?()=20statement.=20=20=20=20=20Thanks=20to=20Marius=20Tomaschews?=
 =?UTF-8?q?ki=20for=20reporting=20the=20bug.=20=20=20-=20bugfix:=20segfaul?=
 =?UTF-8?q?t=20due=20to=20invalid=20dynafile=20cache=20handling=20=20=20?=
 =?UTF-8?q?=20=20Accidently,=20the=20old-style=20cache=20size=20parameter?=
 =?UTF-8?q?=20was=20used=20when=20the=20=20=20=20=20dynafile=20cache=20was?=
 =?UTF-8?q?=20created=20in=20a=20RainerScript=20action.=20If=20the=20=20?=
 =?UTF-8?q?=20=20=20old-style=20size=20was=20lower=20than=20the=20one=20ac?=
 =?UTF-8?q?tually=20set,=20this=20lead=20to=20=20=20=20=20misadressing=20w?=
 =?UTF-8?q?hen=20the=20size=20was=20overrun,=20and=20that=20could=20lead?=
 =?UTF-8?q?=20to=20=20=20=20=20all=20kinds=20of=20=E2=80=9Cinteresting=20t?=
 =?UTF-8?q?hings=E2=80=9D,=20often=20in=20segfaults.=20=20=20=20=20closes:?=
 =?UTF-8?q?=20http://bugzilla.adiscon.com/show=5Fbug.cgi=3Fid=3D440?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=147
---
 rsyslog-7.3.13.tar.gz |  3 ---
 rsyslog-7.3.14.tar.gz |  3 +++
 rsyslog.changes       | 18 ++++++++++++++++++
 rsyslog.spec          |  5 ++---
 4 files changed, 23 insertions(+), 6 deletions(-)
 delete mode 100644 rsyslog-7.3.13.tar.gz
 create mode 100644 rsyslog-7.3.14.tar.gz

diff --git a/rsyslog-7.3.13.tar.gz b/rsyslog-7.3.13.tar.gz
deleted file mode 100644
index 67811bf..0000000
--- a/rsyslog-7.3.13.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b11f63626aa849141a39e9c94ebcc495e19ab03f283a16b348f2fb0ab77be387
-size 2898293
diff --git a/rsyslog-7.3.14.tar.gz b/rsyslog-7.3.14.tar.gz
new file mode 100644
index 0000000..b56f030
--- /dev/null
+++ b/rsyslog-7.3.14.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:333a23edecd2313c59dbd30e90f132618b7041f5c938106f2bf094a3a369de19
+size 2897853
diff --git a/rsyslog.changes b/rsyslog.changes
index 3198237..7215b8e 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue May  7 18:27:48 UTC 2013 - mt@suse.de
+
+- update to 7.3.14 [beta] 2013-05-06:
+  - bugfix: some man pages were not properly installed either
+    rscryutil or rsgtutil man was installed, but not both.
+    Thanks to Marius Tomaschewski for the patch.
+  - bugfix: potential segfault on startup when builtin module was
+    specified in module() statement.
+    Thanks to Marius Tomaschewski for reporting the bug.
+  - bugfix: segfault due to invalid dynafile cache handling
+    Accidently, the old-style cache size parameter was used when the
+    dynafile cache was created in a RainerScript action. If the
+    old-style size was lower than the one actually set, this lead to
+    misadressing when the size was overrun, and that could lead to
+    all kinds of “interesting things”, often in segfaults.
+    closes: http://bugzilla.adiscon.com/show_bug.cgi?id=440
+
 -------------------------------------------------------------------
 Tue Apr 30 13:59:30 UTC 2013 - mt@suse.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index 567295f..5c5b3fc 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -20,7 +20,7 @@ Name:           rsyslog
 Summary:        The enhanced syslogd for Linux and Unix
 License:        (GPL-3.0+ and Apache-2.0)
 Group:          System/Daemons
-Version:        7.3.13
+Version:        7.3.14
 Release:        0
 %if 0%{?suse_version} >= 1210
 %bcond_without  systemd
@@ -89,6 +89,7 @@ BuildRequires:  dos2unix
 BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig
+BuildRequires:  python-docutils
 BuildRequires:  zlib-devel
 %if %{with elasticsearch}
 BuildRequires:  curl-devel
@@ -569,8 +570,6 @@ make %{?_smp_mflags:%{_smp_mflags}} V=1
 
 %install
 make install DESTDIR="%{buildroot}"  V=1
-# Hack for v7.3.13, remove when fixed upstream
-install -m644 tools/rsgtutil.1 %{buildroot}%{_mandir}/man1/
 #
 rm -f %{buildroot}%{rsyslog_module_dir_nodeps}/*.la
 #

From ad0f9393103071ce8e68e5687541b03999b8c7dfd75a7a14680b51f85df3ccee Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Mon, 13 May 2013 09:46:03 +0000
Subject: [PATCH 2/2] - Fixed SLES-11 build that does not have
 rst2man/python-docutils;   added pre-built rscryutil.1 and rsgtutil.1 as
 sources because   v7.3.14 does not ship them pre-built any more.

OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=148
---
 rscryutil.1.gz  |  3 +++
 rsgtutil.1.gz   |  3 +++
 rsyslog.changes |  7 +++++++
 rsyslog.spec    | 10 +++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 rscryutil.1.gz
 create mode 100644 rsgtutil.1.gz

diff --git a/rscryutil.1.gz b/rscryutil.1.gz
new file mode 100644
index 0000000..5e731af
--- /dev/null
+++ b/rscryutil.1.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8db256a6a22713b44f0803a1d65ce7c33800843e6383352df4c48a878e3b762f
+size 2615
diff --git a/rsgtutil.1.gz b/rsgtutil.1.gz
new file mode 100644
index 0000000..5882698
--- /dev/null
+++ b/rsgtutil.1.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ed6549e69c3c1c07b7b01437a7eb610224a4f2de954caae6a43a6242b6957c8
+size 2732
diff --git a/rsyslog.changes b/rsyslog.changes
index 7215b8e..ca317eb 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon May 13 09:42:56 UTC 2013 - mt@suse.de
+
+- Fixed SLES-11 build that does not have rst2man/python-docutils;
+  added pre-built rscryutil.1 and rsgtutil.1 as sources because
+  v7.3.14 does not ship them pre-built any more.
+
 -------------------------------------------------------------------
 Tue May  7 18:27:48 UTC 2013 - mt@suse.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index 5c5b3fc..14c5b9b 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -89,7 +89,6 @@ BuildRequires:  dos2unix
 BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig
-BuildRequires:  python-docutils
 BuildRequires:  zlib-devel
 %if %{with elasticsearch}
 BuildRequires:  curl-devel
@@ -159,6 +158,9 @@ BuildRequires:  pkgconfig(uuid) >= 2.21.0
 %else
 BuildRequires:  libuuid-devel
 %endif
+%if 0%{?suse_version} >= 1200
+BuildRequires:  python-docutils
+%endif
 %if %{with systemd}
 %{?systemd_requires}
 BuildRequires:  pkgconfig(systemd)
@@ -169,6 +171,8 @@ Source1:        rsyslog.sysconfig
 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 crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
 Patch0:         rsyslog-unit.patch
 
@@ -468,6 +472,10 @@ for file in rsyslog-service-prepare; do
 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"