Bug#688928: unblock: rsyslog/5.8.11-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package rsyslog
The changelog reads:
* Disable omstdout module again. Upstream doesn't consider it viable for
production use but mainly for the internal testbench.
* debian/patches/03-fix_relp_dns_resolution.patch: When using RELP for
remote logging, correctly resolve the client hostname if the fromhost
property contains the client IP. (Closes: #682529)
Thanks to Apollon Oikonomopoulos for the patch.
Especially, the first point, dropping the omstdout plugin, is important.
I accidentally had that enabled in my last upload, but talking with
upstream it quickly became clear that this module should not be shipped
in our next Debian release.
Full debdiff attached.
Thanks for your great work,
Michael
unblock rsyslog/5.8.11-2
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index 849126e..ff6eca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+rsyslog (5.8.11-2) unstable; urgency=low
+
+ * Disable omstdout module again. Upstream doesn't consider it viable for
+ production use but mainly for the internal testbench.
+ * debian/patches/03-fix_relp_dns_resolution.patch: When using RELP for
+ remote logging, correctly resolve the client hostname if the fromhost
+ property contains the client IP. (Closes: #682529)
+ Thanks to Apollon Oikonomopoulos for the patch.
+
+ -- Michael Biebl <biebl@debian.org> Wed, 26 Sep 2012 20:36:09 +0200
+
rsyslog (5.8.11-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/03-fix_relp_dns_resolution.patch b/debian/patches/03-fix_relp_dns_resolution.patch
new file mode 100644
index 0000000..b3dfeab
--- /dev/null
+++ b/debian/patches/03-fix_relp_dns_resolution.patch
@@ -0,0 +1,44 @@
+--- a/plugins/imrelp/imrelp.c
++++ b/plugins/imrelp/imrelp.c
+@@ -44,6 +44,7 @@
+ #include "msg.h"
+ #include "unicode-helper.h"
+ #include "prop.h"
++#include "glbl.h"
+
+ MODULE_TYPE_INPUT
+ MODULE_TYPE_NOKEEP
+@@ -52,6 +53,7 @@
+ DEF_IMOD_STATIC_DATA
+ DEFobjCurrIf(net)
+ DEFobjCurrIf(prop)
++DEFobjCurrIf(glbl)
+
+ /* Module static data */
+ static relpEngine_t *pRelpEngine; /* our relp engine */
+@@ -104,6 +106,9 @@
+ CHKiRet(relpEngineSetDbgprint(pRelpEngine, dbgprintf));
+ CHKiRet(relpEngineSetEnableCmd(pRelpEngine, (uchar*) "syslog", eRelpCmdState_Required));
+ CHKiRet(relpEngineSetSyslogRcv(pRelpEngine, onSyslogRcv));
++ if (!glbl.GetDisableDNS()) {
++ CHKiRet(relpEngineSetDnsLookupMode(pRelpEngine, 1));
++ }
+ }
+
+ CHKiRet(relpEngineAddListner(pRelpEngine, pNewVal));
+@@ -162,6 +167,7 @@
+ iRet = relpEngineDestruct(&pRelpEngine);
+
+ /* release objects we used */
++ objRelease(glbl, CORE_COMPONENT);
+ objRelease(prop, CORE_COMPONENT);
+ objRelease(net, LM_NET_FILENAME);
+ ENDmodExit
+@@ -187,6 +193,7 @@
+ CODEmodInit_QueryRegCFSLineHdlr
+ pRelpEngine = NULL;
+ /* request objects we use */
++ CHKiRet(objUse(glbl, CORE_COMPONENT));
+ CHKiRet(objUse(prop, CORE_COMPONENT));
+ CHKiRet(objUse(net, LM_NET_FILENAME));
+
diff --git a/debian/patches/series b/debian/patches/series
index c92adc9..d985f46 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
# Debian patches for rsyslog
01-dont_create_db.patch
02-path_max.patch
+03-fix_relp_dns_resolution.patch
diff --git a/debian/rsyslog.install b/debian/rsyslog.install
index a538bfc..6c4248e 100644
--- a/debian/rsyslog.install
+++ b/debian/rsyslog.install
@@ -19,7 +19,6 @@ usr/lib/rsyslog/lmtcpsrv.so
usr/lib/rsyslog/lmzlibw.so
usr/lib/rsyslog/ommail.so
usr/lib/rsyslog/omprog.so
-usr/lib/rsyslog/omstdout.so
usr/lib/rsyslog/omuxsock.so
usr/lib/rsyslog/omruleset.so
usr/lib/rsyslog/pm*.so
diff --git a/debian/rules b/debian/rules
index 21e4367..c04f837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ override_dh_auto_configure:
--enable-pmrfc3164sd \
--enable-pmsnare \
--enable-omprog \
- --enable-omstdout \
--enable-omuxsock \
--disable-testbench \
--with-systemdsystemunitdir=/lib/systemd/system
Reply to: