Remove patches, merged upstream

- debian/patches/02-install_also_rsyslog_socket.patch
- debian/patches/02-tls_loop_fix.patch

4 files changed, 3 insertions, 79 deletions

diff --git a/debian/changelog b/debian/changelog
index 90dae9d..fe0bb40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 rsyslog (5.7.2-1) UNRELEASED; urgency=low
 
   * New upstream development release.
+  * Remove patches, merged upstream
+    - debian/patches/02-install_also_rsyslog_socket.patch
+    - debian/patches/02-tls_loop_fix.patch
 
  -- Michael Biebl <biebl@debian.org>  Tue, 30 Nov 2010 15:11:44 +0100
 
diff --git a/debian/patches/02-install_also_rsyslog_socket.patch b/debian/patches/02-install_also_rsyslog_socket.patch
deleted file mode 100644
index bf39495..0000000
--- a/debian/patches/02-install_also_rsyslog_socket.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit ed324a9a610f91f54514eb713ff5593bde1012e6
-Author: Michael Biebl <biebl@debian.org>
-Date:   Tue Oct 5 17:41:09 2010 +0200
-
-    Enable rsyslog.socket together with rsyslog.service
-    
-    When the rsyslog service is enabled via
-    "systemctl enable rsyslog.service" also enable the socket unit.
-
-diff --git a/rsyslog.service.in b/rsyslog.service.in
-index ea966cc..b3c5551 100644
---- a/rsyslog.service.in
-+++ b/rsyslog.service.in
-@@ -6,3 +6,4 @@ ExecStart=@sbindir@/rsyslogd -n -c5
- 
- [Install]
- WantedBy=multi-user.target
-+Also=rsyslog.socket
diff --git a/debian/patches/02-tls_loop_fix.patch b/debian/patches/02-tls_loop_fix.patch
deleted file mode 100644
index 26992b4..0000000
--- a/debian/patches/02-tls_loop_fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 925504d565c6cf4a712dd8c8217891662aaf639e
-Author: Rainer Gerhards <rgerhards@adiscon.com>
-Date:   Wed Nov 24 11:14:21 2010 +0100
-
-    bugfix(important): problem in TLS handling could cause rsyslog to loop
-    
-    ... in a tight loop, effectively disabling functionality and bearing the
-    risk of unresponsiveness of the whole system.
-    Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
-
-diff --git a/runtime/nsdsel_gtls.c b/runtime/nsdsel_gtls.c
-index c3a93be..1a389a0 100644
---- a/runtime/nsdsel_gtls.c
-+++ b/runtime/nsdsel_gtls.c
-@@ -76,6 +76,9 @@ Add(nsdsel_t *pNsdsel, nsd_t *pNsd, nsdsel_waitOp_t waitOp)
- 	if(pNsdGTLS->iMode == 1) {
- 		if(waitOp == NSDSEL_RD && gtlsHasRcvInBuffer(pNsdGTLS)) {
- 			++pThis->iBufferRcvReady;
-+			dbgprintf("nsdsel_gtls: data already present in buffer, initiating "
-+				  "dummy select %p->iBufferRcvReady=%d\n",
-+				  pThis, pThis->iBufferRcvReady);
- 			FINALIZE;
- 		}
- 		if(pNsdGTLS->rtryCall != gtlsRtry_None) {
-@@ -109,6 +112,7 @@ Select(nsdsel_t *pNsdsel, int *piNumReady)
- 	if(pThis->iBufferRcvReady > 0) {
- 		/* we still have data ready! */
- 		*piNumReady = pThis->iBufferRcvReady;
-+		dbgprintf("nsdsel_gtls: doing dummy select, data present\n");
- 	} else {
- 		iRet = nsdsel_ptcp.Select(pThis->pTcp, piNumReady);
- 	}
-@@ -190,6 +194,9 @@ IsReady(nsdsel_t *pNsdsel, nsd_t *pNsd, nsdsel_waitOp_t waitOp, int *pbIsReady)
- 	if(pNsdGTLS->iMode == 1) {
- 		if(waitOp == NSDSEL_RD && gtlsHasRcvInBuffer(pNsdGTLS)) {
- 			*pbIsReady = 1;
-+			--pThis->iBufferRcvReady; /* one "pseudo-read" less */
-+			dbgprintf("nsdl_gtls: dummy read, decermenting %p->iBufRcvReady, now %d\n",
-+				   pThis, pThis->iBufferRcvReady);
- 			FINALIZE;
- 		}
- 		if(pNsdGTLS->rtryCall != gtlsRtry_None) {
-@@ -200,6 +207,16 @@ IsReady(nsdsel_t *pNsdsel, nsd_t *pNsd, nsdsel_waitOp_t waitOp, int *pbIsReady)
- 			*pbIsReady = 0;
- 			FINALIZE;
- 		}
-+		/* now we must ensure that we do not fall back to PTCP if we have
-+		 * done a "dummy" select. In that case, we know when the predicate
-+		 * is not matched here, we do not have data available for this
-+		 * socket. -- rgerhards, 2010-11-20
-+		 */
-+		if(pThis->iBufferRcvReady) {
-+			dbgprintf("nsd_gtls: dummy read, buffer not available for this FD\n");
-+			*pbIsReady = 0;
-+			FINALIZE;
-+		}
- 	}
- 
- 	CHKiRet(nsdsel_ptcp.IsReady(pThis->pTcp, pNsdGTLS->pTcp, waitOp, pbIsReady));
diff --git a/debian/patches/series b/debian/patches/series
index 35db508..2113a56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 # Debian patches for rsyslog
 01-dont_create_db.patch
-02-install_also_rsyslog_socket.patch
-02-tls_loop_fix.patch