diff -Nru netsed-1.2/debian/changelog netsed-1.2/debian/changelog --- netsed-1.2/debian/changelog 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/changelog 2016-09-02 12:42:55.000000000 +0000 @@ -1,3 +1,29 @@ +netsed (1.2-3) unstable; urgency=medium + + * Address FTBFS due to test suite failure. + + debian/patches/use_calloc.diff: New file. (Closes: #818852, #831270) + + debian/patches/ruby_issues.diff: New file. + + -- Mats Erik Andersson Fri, 02 Sep 2016 14:42:55 +0200 + +netsed (1.2-2) unstable; urgency=low + + * Step Standards-Version to 3.9.8, no changes. + * Use debhelper in compatibility level 9. + + debian/rules: Remove explicit setting of CPPFLAGS, etcetera. + Allow all available hardening mechanisms. + * debian/control: Path correction in Vcs-Git. Use HTTPS transport + for Vcs-Git as well as for Vcs-Browser. Remove obsolete build + dependency on dpkg-dev. + * debian/copyright: Update time span of my contribution. + * debian/docs: Drop upstream's file TODO. + * debian/NEWS: Remove obsolete file. + * debian/patches/series: Remove this unused file. + * debian/watch: Disable signature checking, since upstream does + not sign in the expected manner. Problem found by Tiago Ilieve. + + -- Mats Erik Andersson Sun, 01 May 2016 01:12:26 +0200 + netsed (1.2-1) unstable; urgency=low * New upstream version. diff -Nru netsed-1.2/debian/compat netsed-1.2/debian/compat --- netsed-1.2/debian/compat 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/compat 2016-09-02 12:42:55.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru netsed-1.2/debian/control netsed-1.2/debian/control --- netsed-1.2/debian/control 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/control 2016-09-02 12:42:55.000000000 +0000 @@ -2,15 +2,15 @@ Section: net Priority: optional Maintainer: Mats Erik Andersson -Standards-Version: 3.9.5 -Build-Depends: debhelper (>= 8.0.0~), ruby, procps, dpkg-dev (>= 1.15.7) +Standards-Version: 3.9.8 +Build-Depends: debhelper (>= 9), procps, ruby Homepage: http://silicone.homelinux.org/projects/netsed/ -Vcs-Git: git://anonscm.debian.org/collab-maint/netsed.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/netsed.git +Vcs-Git: https://anonscm.debian.org/git/collab-maint/netsed.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/netsed.git Package: netsed Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: network packet-altering stream editor NetSED is a small and handy utility designed to alter, in real time, the contents of packets forwarded through your network. It is really diff -Nru netsed-1.2/debian/copyright netsed-1.2/debian/copyright --- netsed-1.2/debian/copyright 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/copyright 2016-09-02 12:42:55.000000000 +0000 @@ -14,7 +14,7 @@ Copyright: 2001, Gergely Nagy 2001 - 2002, Lenart Janos 2010, Tim Retout + 2010 - 2016, Mats Erik Andersson 2011, Arno Töll License: GPL-2+ Comment: This package was debianized by Lenart Janos from diff -Nru netsed-1.2/debian/docs netsed-1.2/debian/docs --- netsed-1.2/debian/docs 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/docs 2016-09-02 12:42:55.000000000 +0000 @@ -1,2 +1 @@ README -TODO diff -Nru netsed-1.2/debian/NEWS netsed-1.2/debian/NEWS --- netsed-1.2/debian/NEWS 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -netsed (1.00b-2) unstable; urgency=low - - An updated manual page has been generated directly - from my own Docbook source. - - -- Mats Erik Andersson Wed, 22 Jun 2011 20:20:19 +0200 - -netsed (1.00b-1) unstable; urgency=low - - This package is now based on the efforts of a new - upstream author, having forked the stale original, - and having continued the development from that point. - - This makes the shipped manual page outdated, since I - myself am aiding upstream in writing the new documenta- - tion. It will enter only with the next upstream release. - - -- Mats Erik Andersson Sat, 11 Jun 2011 02:26:38 +0200 diff -Nru netsed-1.2/debian/patches/ruby_issues.diff netsed-1.2/debian/patches/ruby_issues.diff --- netsed-1.2/debian/patches/ruby_issues.diff 1970-01-01 00:00:00.000000000 +0000 +++ netsed-1.2/debian/patches/ruby_issues.diff 2016-09-02 12:42:55.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Ruby interpreter complains. + During builds against glibc version 2.23, an error report mentioned + that implicit conversion of nil to an empty string is not automatic. +Author: Mats Erik Andersson +Forwarded: no +Last-Update: 2016-06-18 + +diff -Naurp netsed-1.2.orig/test/test_helper.rb netsed-1.2/test/test_helper.rb +--- netsed-1.2.orig/test/test_helper.rb 2013-10-13 17:08:07.000000000 +0200 ++++ netsed-1.2/test/test_helper.rb 2016-06-18 11:27:18.990947997 +0200 +@@ -47,7 +47,7 @@ class NetsedRun + # waiting for netsed to listen + begin + line = @pipe.gets +- @data << line ++ @data << line.to_s + end until line =~ /^\[\+\] Listening on port/ + end + diff -Nru netsed-1.2/debian/patches/series netsed-1.2/debian/patches/series --- netsed-1.2/debian/patches/series 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/patches/series 2016-09-02 12:42:55.000000000 +0000 @@ -1 +1,2 @@ -# No local patches! +use_calloc.diff +ruby_issues.diff diff -Nru netsed-1.2/debian/patches/use_calloc.diff netsed-1.2/debian/patches/use_calloc.diff --- netsed-1.2/debian/patches/use_calloc.diff 1970-01-01 00:00:00.000000000 +0000 +++ netsed-1.2/debian/patches/use_calloc.diff 2016-09-02 12:42:55.000000000 +0000 @@ -0,0 +1,26 @@ +Description: Build failure during test phase. + When built against glibc version 2.23, the provided tests + fail completely. The cause turns out to be a segmentation + fault in the rule interpreter. The upstream code implicitly + depends on a counter field being zeroed at return from malloc. + Instead use calloc() for the large structures. +Bug-Debian: http://bugs.debian.org/818852 + http://bugs.debian.org/831270 +Author: Mats Erik Andersson +Forwarded: yes +Last-Update: 2016-09-02 + +diff -Naup netsed-1.2.orig/netsed.c netsed-1.2/netsed.c +--- netsed-1.2.orig/netsed.c 2013-10-13 17:08:07.000000000 +0200 ++++ netsed-1.2/netsed.c 2016-09-02 14:13:10.477993876 +0200 +@@ -506,8 +506,8 @@ void parse_params(int argc,char* argv[]) + rport = argv[optind++]; + + // allocate rule arrays, rule number is number of params after 5 +- rule=malloc((argc-optind)*sizeof(struct rule_s)); +- rule_live=malloc((argc-optind)*sizeof(int)); ++ rule=calloc(argc-optind,sizeof(struct rule_s)); ++ rule_live=calloc(argc-optind,sizeof(int)); + // parse rules + for (i=optind;i. -# Written from scratch and adapted to debhelper 8. # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -export CPPFLAGS CFLAGS LDFLAGS - pkg = netsed +DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS + %: dh $@ diff -Nru netsed-1.2/debian/watch netsed-1.2/debian/watch --- netsed-1.2/debian/watch 2014-05-24 19:29:24.000000000 +0000 +++ netsed-1.2/debian/watch 2016-09-02 12:42:55.000000000 +0000 @@ -1,4 +1,9 @@ version=3 -opts=pgpsigurlmangle=s|(.*).tar.gz$|\1.sig| \ +# Upstream is not signing the archive per se, but instead publishes +# a signed, small text stating the relevant MD5, SHA1, and SHA256 sums, +# in addition to naming the Git commit used while preparing the archive. +# +# opts=pgpsigurlmangle=s|(.*).tar.gz$|$1.sig| + http://silicone.homelinux.org/release/netsed/netsed-([.0-9]+[a-z]?)\.tar\.gz