diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/06-fixup-bbstored-certs.diff | 35 | ||||
-rw-r--r-- | debian/patches/07-fix-ftbfs-signed-char.diff | 11 | ||||
-rw-r--r-- | debian/patches/series | 2 |
3 files changed, 0 insertions, 48 deletions
diff --git a/debian/patches/06-fixup-bbstored-certs.diff b/debian/patches/06-fixup-bbstored-certs.diff deleted file mode 100644 index f752bd2c..00000000 --- a/debian/patches/06-fixup-bbstored-certs.diff +++ /dev/null @@ -1,35 +0,0 @@ -From: Reinhard Tartler <siretart@tauware.de> -Subject: Fixup bbstored for newer openssl - -It appears that modern openssl versions slightly changed the formatting -for printing the common name of a certificate. - -I've also dropped the check against filename because I cound't get the -filename to match against my local files - the check didn't appear too -useful to me. - - ---- a/bin/bbstored/bbstored-certs.in -+++ b/bin/bbstored/bbstored-certs.in -@@ -171,12 +171,6 @@ sub cmd_sign - - my $acc = $1; - -- # check against filename -- if(!($csr =~ m/(\A|\/)([A-Fa-f0-9]+)-/) || $2 ne $acc) -- { -- die "Certificate request filename does not match name in certificate ($common_name)" -- } -- - print <<__E; - - This certificate is for backup account -@@ -288,7 +282,7 @@ sub get_csr_common_name - my $subject; - while(<CSRTEXT>) - { -- $subject = $1 if m/Subject:.+?CN=([-\.\w]+)/ -+ $subject = $1 if m/Subject:.+?CN\s?=\s?([-\.\w]+)/ - } - close CSRTEXT; - diff --git a/debian/patches/07-fix-ftbfs-signed-char.diff b/debian/patches/07-fix-ftbfs-signed-char.diff deleted file mode 100644 index 559fb314..00000000 --- a/debian/patches/07-fix-ftbfs-signed-char.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/httpserver/cdecode.cpp -+++ b/lib/httpserver/cdecode.cpp -@@ -12,7 +12,7 @@ extern "C" - - int base64_decode_value(char value_in) - { -- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; -+ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; - static const char decoding_size = sizeof(decoding); - value_in -= 43; - if (value_in < 0 || value_in > decoding_size) return -1; diff --git a/debian/patches/series b/debian/patches/series index a03c1985..f52e7b08 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ 03-adjust-syslog-facility.diff 05-dont_use_net_for_docs.diff -06-fixup-bbstored-certs.diff -07-fix-ftbfs-signed-char.diff |