diff -Nru west-chamber-20100405+svn20111107.r124/debian/changelog west-chamber-20100405+svn20111107.r124/debian/changelog --- west-chamber-20100405+svn20111107.r124/debian/changelog 2020-12-21 00:10:03.000000000 +0000 +++ west-chamber-20100405+svn20111107.r124/debian/changelog 2020-12-30 07:14:59.000000000 +0000 @@ -1,16 +1,15 @@ -west-chamber (20100405+svn20111107.r124-12ubuntu2) hirsute; urgency=medium +west-chamber (20100405+svn20111107.r124-13) unstable; urgency=low + [ Vagrant Cascadian ] + * Fix source tarball with inconsistent file order (Closes: #977167) + * Fix generated Makefiles contain variable information (Closes: #977168) + + [ Logan Rosen ] * Update 02_port_to_xtables_2.10.patch to work with xtables-addons 3.13, which handles Linux version compatibility for 4-arg ip_route_me_harder. * Bump dependencies on xtables-addons to >= 3.13. - -- Logan Rosen Sun, 20 Dec 2020 19:10:03 -0500 - -west-chamber (20100405+svn20111107.r124-12ubuntu1) hirsute; urgency=medium - - * Fix 5.10 FTBFS - - -- Paolo Pisati Wed, 25 Nov 2020 15:56:25 +0000 + -- Ying-Chun Liu (PaulLiu) Wed, 30 Dec 2020 15:14:59 +0800 west-chamber (20100405+svn20111107.r124-12) unstable; urgency=low diff -Nru west-chamber-20100405+svn20111107.r124/debian/control west-chamber-20100405+svn20111107.r124/debian/control --- west-chamber-20100405+svn20111107.r124/debian/control 2020-12-21 00:10:03.000000000 +0000 +++ west-chamber-20100405+svn20111107.r124/debian/control 2020-12-30 07:14:59.000000000 +0000 @@ -1,8 +1,7 @@ Source: west-chamber Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ying-Chun Liu (PaulLiu) +Maintainer: Ying-Chun Liu (PaulLiu) Build-Depends: autoconf, automake, bzip2, diff -Nru west-chamber-20100405+svn20111107.r124/debian/patches/02_port_to_xtables_2.10.patch west-chamber-20100405+svn20111107.r124/debian/patches/02_port_to_xtables_2.10.patch --- west-chamber-20100405+svn20111107.r124/debian/patches/02_port_to_xtables_2.10.patch 2020-12-21 00:09:09.000000000 +0000 +++ west-chamber-20100405+svn20111107.r124/debian/patches/02_port_to_xtables_2.10.patch 2020-12-30 07:14:59.000000000 +0000 @@ -1,8 +1,10 @@ -Subject: Port to xtables 2.10 +Subject: Port to xtables 3.13 Author: Ying-Chun Liu (PaulLiu) -Last-Update: 2016-01-28 ---- a/extensions/xt_CUI.c -+++ b/extensions/xt_CUI.c +Last-Update: 2020-12-28 +Index: west-chamber-20100405+svn20111107.r124/extensions/xt_CUI.c +=================================================================== +--- west-chamber-20100405+svn20111107.r124.orig/extensions/xt_CUI.c ++++ west-chamber-20100405+svn20111107.r124/extensions/xt_CUI.c @@ -24,7 +24,7 @@ #include "compat_xtables.h" #define PFX KBUILD_MODNAME ": " @@ -12,7 +14,7 @@ { struct tcphdr _otcph, *tcph; const struct tcphdr *oth; -@@ -103,7 +103,7 @@ +@@ -103,7 +103,7 @@ static void cui_send_reset(struct sk_buf /* ip_route_me_harder expects skb->dst to be set */ skb_dst_set(skb, dst_clone(skb_dst(oldskb))); @@ -21,7 +23,7 @@ goto free_skb; else iph = ip_hdr(skb); -@@ -115,14 +115,14 @@ +@@ -115,14 +115,14 @@ static void cui_send_reset(struct sk_buf if (skb->len > dst_mtu(skb_dst(skb))) goto free_skb; @@ -38,7 +40,7 @@ { struct tcphdr _otcph, *tcph; const struct tcphdr *oth; -@@ -203,7 +203,7 @@ +@@ -203,7 +203,7 @@ static void cui_send_synack(struct sk_bu /* ip_route_me_harder expects skb->dst to be set */ skb_dst_set(skb, dst_clone(skb_dst(oldskb))); @@ -47,7 +49,7 @@ goto free_skb; else iph = ip_hdr(skb); -@@ -215,7 +215,7 @@ +@@ -215,7 +215,7 @@ static void cui_send_synack(struct sk_bu if (skb->len > dst_mtu(skb_dst(skb))) goto free_skb; @@ -56,7 +58,7 @@ return; free_skb: -@@ -223,15 +223,15 @@ +@@ -223,15 +223,15 @@ free_skb: } static unsigned int @@ -77,8 +79,10 @@ return NF_ACCEPT; } ---- a/extensions/xt_ZHANG.c -+++ b/extensions/xt_ZHANG.c +Index: west-chamber-20100405+svn20111107.r124/extensions/xt_ZHANG.c +=================================================================== +--- west-chamber-20100405+svn20111107.r124.orig/extensions/xt_ZHANG.c ++++ west-chamber-20100405+svn20111107.r124/extensions/xt_ZHANG.c @@ -24,7 +24,7 @@ #include "compat_xtables.h" #define PFX KBUILD_MODNAME ": " @@ -88,7 +92,7 @@ { struct tcphdr _otcph, *tcph, *tcph2; const struct tcphdr *oth; -@@ -110,7 +110,7 @@ +@@ -110,7 +110,7 @@ static void zhang_send_reset(struct sk_b /* ip_route_me_harder expects skb->dst to be set */ skb_dst_set(skb, dst_clone(skb_dst(oldskb))); @@ -97,7 +101,7 @@ goto free_skb; else iph = ip_hdr(skb); -@@ -162,8 +162,8 @@ +@@ -162,8 +162,8 @@ static void zhang_send_reset(struct sk_b csum_replace2(&tcph2->check, htons(((u_int8_t *)tcph)[13]), htons(((u_int8_t *)tcph2)[13])); @@ -108,7 +112,7 @@ return; free_skb: -@@ -171,12 +171,12 @@ +@@ -171,12 +171,12 @@ free_skb: } static unsigned int diff -Nru west-chamber-20100405+svn20111107.r124/debian/rules west-chamber-20100405+svn20111107.r124/debian/rules --- west-chamber-20100405+svn20111107.r124/debian/rules 2020-02-06 11:19:43.000000000 +0000 +++ west-chamber-20100405+svn20111107.r124/debian/rules 2020-12-30 07:14:59.000000000 +0000 @@ -64,18 +64,22 @@ debian/$(psource)/usr/src/modules/$(sname)/debian/ cp debian/rules.modules \ debian/$(psource)/usr/src/modules/$(sname)/debian/rules - cd debian/$(psource)/usr/src && tar c --mtime="$(BUILD_DATE)" modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules + cd debian/$(psource)/usr/src && tar c --mtime="$(BUILD_DATE)" \ + --sort=name \ + --owner=0 --group=0 --numeric-owner \ + --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \ + modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules # DKMS # DKMS: Create the directories to install the source into mkdir -p $(CURDIR)/debian/$(dkmssource)/usr/src/$(dkmssname)/extensions # DKMS: Copy only the driver source to the proper location cp extensions/*.c debian/$(dkmssource)/usr/src/$(dkmssname)/extensions - cp extensions/Kbuild extensions/Makefile extensions/Makefile.in debian/$(dkmssource)/usr/src/$(dkmssname)/extensions - cp Makefile.* Makefile \ + cp extensions/Kbuild extensions/Makefile.in debian/$(dkmssource)/usr/src/$(dkmssname)/extensions + cp Makefile.* \ mconfig \ debian/$(dkmssource)/usr/src/$(dkmssname) - find debian/$(dkmssource)/usr/src -name ".gitignore" -delete + find debian/$(dkmssource)/usr/src -name ".gitignore" -o -name Makefile.iptrules -delete #sed 's/compat_xtables.o//' extensions/Kbuild > debian/$(dkmssource)/usr/src/$(dkmssname)/Kbuild echo 'ccflags-y += -I$${XTABLESDIR}/extensions -I.' >> debian/$(dkmssource)/usr/src/$(dkmssname)/extensions/Kbuild