Browse Source

Refresh patch queue

Christoph Biedl 2 years ago
parent
commit
0baefc9993

+ 0 - 18
debian/patches/1672411055.rel-26.1-63-gd702ebab.spelling-fixes-mostly-in-file-comments.patch

@@ -1,18 +0,0 @@
-Subject: Spelling fixes, mostly in file comments
-Origin: upstream, commit rel-26.1-63-gd702ebab <https://github.com/ngircd/ngircd/commit/d702ebab>
-Author: Alexander Barton <alex@barton.de>
-Date: Fri Dec 30 15:37:35 2022 +0100
-
-    This is only the change that is user-visiable.
-
---- a/src/ngircd/ngircd.c
-+++ b/src/ngircd/ngircd.c
-@@ -825,7 +825,7 @@
- 			    "Can't change working directory to \"%s\": %s!",
- 			    pwd->pw_dir, strerror(errno));
- 	} else
--		Log(LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID);
-+		Log(LOG_ERR, "Can't get user information for UID %d!?", Conf_UID);
- 
- 	return true;
-  out:

+ 0 - 28
debian/patches/1704751893.rel-26.1-55-g28777066.test-suite-update-for-openssl-3-x.patch

@@ -1,28 +0,0 @@
-Subject: Test suite: Update for OpenSSL 3.x
-Origin: upstream, commit rel-26.1-55-g28777066 <https://github.com/ngircd/ngircd/commit/28777066>
-Author: Alexander Barton <alex@barton.de>
-Date: Mon Jan 8 23:11:33 2024 +0100
-Bug-Debian: https://bugs.debian.org/1062002
-
---- a/src/testsuite/connect-ssl-cert1-test.e
-+++ b/src/testsuite/connect-ssl-cert1-test.e
-@@ -4,7 +4,7 @@
- spawn openssl s_client -quiet -connect 127.0.0.1:6790
- expect {
-         timeout { exit 1 }
--        "*CN = my.first.domain.tld"
-+        "*CN*=*my.first.domain.tld"
- }
- 
- sleep 2
---- a/src/testsuite/connect-ssl-cert2-test.e
-+++ b/src/testsuite/connect-ssl-cert2-test.e
-@@ -4,7 +4,7 @@
- spawn openssl s_client -quiet -connect 127.0.0.1:6790
- expect {
-         timeout { exit 1 }
--        "*CN = my.second.domain.tld"
-+        "*CN*=*my.second.domain.tld"
- }
- 
- sleep 2

+ 1 - 1
debian/patches/fix-race-in-testsuite.patch

@@ -1,7 +1,7 @@
 Subject: Fix race in testsuite
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: 2020-06-21
-Forwarded: https://ngircd.barton.de/pipermail/ngircd-ml/2020-June/000887.html
+Forwarded: https://lists.barton.de/mailman3/hyperkitty/list/ngircd@lists.barton.de/thread/T3RTKOP4YI7XOK5PQE4AGKALJ26KZ5KB/?noscript
 
 --- a/src/testsuite/connect-ssl-cert2-test.e
 +++ b/src/testsuite/connect-ssl-cert2-test.e

+ 0 - 2
debian/patches/series

@@ -1,7 +1,5 @@
 
 # patches cherry-picked upstream
-1672411055.rel-26.1-63-gd702ebab.spelling-fixes-mostly-in-file-comments.patch
-1704751893.rel-26.1-55-g28777066.test-suite-update-for-openssl-3-x.patch
 
 # patches that should go upstream
 fix-race-in-testsuite.patch