From c60347c6dcc052e8be59f8b449ba8852cb8d3cb4 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 28 Jul 2018 16:21:49 +0800 Subject: [PATCH] de-fuzz patches against new revision --- debian/patches/gzip_reproducible_build.diff | 4 +--- debian/patches/sigpipe.diff | 6 +++--- debian/patches/zgrep-syntax-error.diff | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/patches/gzip_reproducible_build.diff b/debian/patches/gzip_reproducible_build.diff index e268852..62124e1 100644 --- a/debian/patches/gzip_reproducible_build.diff +++ b/debian/patches/gzip_reproducible_build.diff @@ -1,5 +1,3 @@ -diff --git a/doc/gzip.texi b/doc/gzip.texi -index 1d8d100..60c471f 100644 --- a/doc/gzip.texi +++ b/doc/gzip.texi @@ -9,7 +9,7 @@ @@ -10,4 +8,4 @@ index 1d8d100..60c471f 100644 +(version @value{VERSION}), and documents commands for compressing and decompressing data. - Copyright @copyright{} 1998-1999, 2001-2002, 2006-2007, 2009-2016 Free Software + Copyright @copyright{} 1998-1999, 2001-2002, 2006-2007, 2009-2018 Free Software diff --git a/debian/patches/sigpipe.diff b/debian/patches/sigpipe.diff index 2bc2303..7339b81 100644 --- a/debian/patches/sigpipe.diff +++ b/debian/patches/sigpipe.diff @@ -1,6 +1,6 @@ ---- gzip-1.6.orig/gzip.c -+++ gzip-1.6/gzip.c -@@ -562,7 +562,11 @@ int main (int argc, char **argv) +--- a/gzip.c ++++ b/gzip.c +@@ -658,7 +658,11 @@ ALLOC(ush, tab_prefix1, 1L<<(BITS-1)); #endif diff --git a/debian/patches/zgrep-syntax-error.diff b/debian/patches/zgrep-syntax-error.diff index 104da7e..190b6e1 100644 --- a/debian/patches/zgrep-syntax-error.diff +++ b/debian/patches/zgrep-syntax-error.diff @@ -1,8 +1,6 @@ -diff --git a/zgrep.in b/zgrep.in -index 7ce45ae..30ee129 100644 --- a/zgrep.in +++ b/zgrep.in -@@ -69,7 +69,7 @@ while test $# -ne 0; do +@@ -69,7 +69,7 @@ option=$(expr "X$option" : 'X\(-.[0-9]*\)');; (--binary-*=* | --[lm]a*=* | --reg*=*) ;; -- 2.30.2