Refresh all patches for the new upstream stable branch.

3 files changed, 14 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index d42ab27..fcc2f00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rsyslog (3.20.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh all patches for the new upstream stable branch.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 15 Jan 2009 23:58:42 +0100
 
diff --git a/debian/patches/allowed_sender_reload.patch b/debian/patches/allowed_sender_reload.patch
index 38006e3..f503070 100644
--- a/debian/patches/allowed_sender_reload.patch
+++ b/debian/patches/allowed_sender_reload.patch
@@ -10,11 +10,11 @@ Michael Biebel, olgoat, and Juha Koho for reporting and analyzing
 the bug.
 ---
 
-diff --git a/net.c b/net.c
-index 54d162b..788d541 100644
---- a/net.c
-+++ b/net.c
-@@ -105,6 +105,30 @@ setAllowRoot(struct AllowedSenders **ppAllowRoot, uchar *pszType)
+Index: rsyslog/runtime/net.c
+===================================================================
+--- rsyslog.orig/runtime/net.c	2009-01-16 00:06:21.000000000 +0100
++++ rsyslog/runtime/net.c	2009-01-16 00:07:23.000000000 +0100
+@@ -116,6 +116,30 @@
  finalize_it:
  	RETiRet;
  }
@@ -44,8 +44,8 @@ index 54d162b..788d541 100644
 +}
  
  
- /* Code for handling allowed/disallowed senders
-@@ -214,6 +238,11 @@ clearAllowedSenders(uchar *pszType)
+ /* add a wildcard entry to this permitted peer. Entries are always
+@@ -556,6 +580,11 @@
  			free(pPrev->allowedSender.addr.NetAddr);
  		free(pPrev);
  	}
diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
index d320bb8..316ebc6 100644
--- a/debian/patches/manpage_fixes.patch
+++ b/debian/patches/manpage_fixes.patch
@@ -1,5 +1,7 @@
---- rsyslog-3.18.5.orig/rsyslogd.8
-+++ rsyslog-3.18.5/rsyslogd.8
+Index: rsyslog/tools/rsyslogd.8
+===================================================================
+--- rsyslog.orig/tools/rsyslogd.8	2009-01-16 00:06:21.000000000 +0100
++++ rsyslog/tools/rsyslogd.8	2009-01-16 00:07:07.000000000 +0100
 @@ -68,7 +68,7 @@
  ensure that rsyslogd follows its default, standard BSD behavior. Of course,
  some configuration file changes are necessary in order to support the
@@ -53,7 +55,7 @@
  machines (those, that are in no AllowedSender list).
  .TP
  .B "\-x"
-@@ -336,7 +336,7 @@
+@@ -344,7 +344,7 @@
  
  .TP
  .B RSYSLOG_DEBUGLOG
@@ -62,7 +64,7 @@
  in addition to stdout.
  .TP
  .B RSYSLOG_MODDIR
-@@ -344,7 +344,7 @@
+@@ -352,7 +352,7 @@
  .PD
  .SH BUGS
  Please review the file BUGS for up-to-date information on known