Browse Source

Rework patch queue

Christoph Biedl 1 year ago
parent
commit
422da140cf

debian/patches/use-ldflags-for-linking.patch → debian/patches/debian.hardening.patch


debian/patches/prefix-install-patch.patch → debian/patches/debian.prefix-install.patch


debian/patches/disable-cfr_strerror.patch → debian/patches/local.disable-cfr_strerror.patch


debian/patches/enhance-test-script.patch → debian/patches/local.enhance-test-script.patch


debian/patches/fix-buffer-weirdness.patch → debian/patches/local.fix-buffer-weirdness.patch


debian/patches/increase-max-prefixes.patch → debian/patches/local.increase-max-prefixes.patch


+ 1 - 1
debian/patches/use-libbsd.patch

@@ -32,7 +32,7 @@ Last-Update: 2017-11-18
  static    size_t strlcat(char *dst, const char *src, size_t size);
  #endif
  
-@@ -1753,7 +1754,7 @@
+@@ -1755,7 +1756,7 @@
    }
  }
  

+ 14 - 12
debian/patches/series

@@ -1,14 +1,16 @@
-# upstream code cleanup
-disable-cfr_strerror.patch
-fix-crash-on-huge-prefix-lists.patch
-fix-buffer-weirdness.patch
-use-libbsd.patch
-prefix-install-patch.patch
+# cherry-picked commits. Keep in upstream's chronological order
 
-# features
-increase-max-prefixes.patch
+# patches that should go upstream
+upstream.fix-crash-on-huge-prefix-lists.patch
+upstream.fix-unaligned-memory-access.patch
 
-# big test (see README.Debian)
-enhance-test-script.patch
-fix-unaligned-memory-access.patch
-use-ldflags-for-linking.patch
+# local modifications
+local.disable-cfr_strerror.patch
+local.fix-buffer-weirdness.patch
+local.use-libbsd.patch
+local.increase-max-prefixes.patch
+local.enhance-test-script.patch
+
+# Debianisation
+debian.prefix-install.patch
+debian.hardening.patch

debian/patches/fix-crash-on-huge-prefix-lists.patch → debian/patches/upstream.fix-crash-on-huge-prefix-lists.patch


+ 1 - 1
debian/patches/fix-unaligned-memory-access.patch

@@ -7,7 +7,7 @@ Last-Update: 2016-10-30
 
 --- a/bgpdump_lib.c
 +++ b/bgpdump_lib.c
-@@ -1326,12 +1326,14 @@
+@@ -1325,12 +1325,14 @@
  	    space = 1;
  
  	  int asn_pos = i * as->asn_len;