Control: tags 975227 + patch Control: tags 975227 + pending Dear maintainer,
I've prepared an NMU for syncmaildir (versioned as 1.3.0-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. David
diff -Nru syncmaildir-1.3.0/debian/changelog syncmaildir-1.3.0/debian/changelog --- syncmaildir-1.3.0/debian/changelog 2018-03-17 13:13:46.000000000 -0300 +++ syncmaildir-1.3.0/debian/changelog 2021-04-21 11:05:47.000000000 -0300 @@ -1,3 +1,13 @@ +syncmaildir (1.3.0-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Convert some 'grep foo bar | wc -l' to 'grep -c foo bar' in test + suite. Bug fix: "FTBFS: running client-server/02-move-mail: .grep: + log.s2c: binary file matches", thanks to Lucas Nussbaum (Closes: + #975227). + + -- David Bremner <brem...@debian.org> Wed, 21 Apr 2021 11:05:47 -0300 + syncmaildir (1.3.0-1) unstable; urgency=medium * New upstream release diff -Nru syncmaildir-1.3.0/debian/patches/replace-use-of-grep--wc-with-grep--c-for.patch syncmaildir-1.3.0/debian/patches/replace-use-of-grep--wc-with-grep--c-for.patch --- syncmaildir-1.3.0/debian/patches/replace-use-of-grep--wc-with-grep--c-for.patch 1969-12-31 20:00:00.000000000 -0400 +++ syncmaildir-1.3.0/debian/patches/replace-use-of-grep--wc-with-grep--c-for.patch 2021-04-21 11:05:47.000000000 -0300 @@ -0,0 +1,186 @@ +From: David Bremner <brem...@debian.org> +Date: Wed, 21 Apr 2021 08:16:11 -0300 +X-Dgit-Generated: 1.3.0-1.1 6d7213c4f0646e9a896aa3acc16c886914bdd01d +Subject: Replace use of "grep | wc" with grep -c for binary files. + +The latter actually reports a number of matches on stdout, making the +tests pass. + +--- + +--- syncmaildir-1.3.0.orig/tests.d/client-server/02-move-mail ++++ syncmaildir-1.3.0/tests.d/client-server/02-move-mail +@@ -9,7 +9,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^MOVE ' log.s2c | wc -l` ++X=`grep -c '^MOVE ' log.s2c` + assert $X 1 "missing MOVE in s2c" + + X=`grep '^COMMIT$' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/03-copy-mail ++++ syncmaildir-1.3.0/tests.d/client-server/03-copy-mail +@@ -9,7 +9,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^COPY ' log.s2c | wc -l` ++X=`grep -c '^COPY ' log.s2c` + assert $X 1 "missing COPY in s2c" + + X=`grep '^GET ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/04-replace-header ++++ syncmaildir-1.3.0/tests.d/client-server/04-replace-header +@@ -9,7 +9,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^REPLACEHEADER ' log.s2c | wc -l` ++X=`grep -c '^REPLACEHEADER ' log.s2c` + assert $X 1 "missing REPLACEHEADER in s2c" + + X=`grep '^GETHEADER ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/05-replace-header-fail ++++ syncmaildir-1.3.0/tests.d/client-server/05-replace-header-fail +@@ -11,7 +11,7 @@ msync 2 + + test_eq target/Mail.old target/Mail + +-X=`grep '^REPLACEHEADER ' log.s2c | wc -l` ++X=`grep -c '^REPLACEHEADER ' log.s2c` + assert $X 1 "missing REPLACEHEADER in s2c" + + X=`grep '^GETHEADER ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/06-replace-header-already-ok ++++ syncmaildir-1.3.0/tests.d/client-server/06-replace-header-already-ok +@@ -10,7 +10,7 @@ test_eq Mail target/Mail + msync 2 + + test_eq Mail target/Mail +-X=`grep '^REPLACEHEADER ' log.s2c | wc -l` ++X=`grep -c '^REPLACEHEADER ' log.s2c` + assert $X 1 "missing REPLACEHEADER in s2c" + + X=`grep '^GETHEADER ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/08-copy-mail-already-ok ++++ syncmaildir-1.3.0/tests.d/client-server/08-copy-mail-already-ok +@@ -10,7 +10,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^COPY ' log.s2c | wc -l` ++X=`grep -c '^COPY ' log.s2c` + assert $X 1 "missing COPY in s2c" + + X=`grep '^GET ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/10-delete-already-done ++++ syncmaildir-1.3.0/tests.d/client-server/10-delete-already-done +@@ -10,7 +10,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^DELETE ' log.s2c | wc -l` ++X=`grep -c '^DELETE ' log.s2c` + assert $X 1 "missing DELETE in s2c" + + X=`grep '^COMMIT$' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/12-skip-add-already-there ++++ syncmaildir-1.3.0/tests.d/client-server/12-skip-add-already-there +@@ -10,7 +10,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^ADD ' log.s2c | wc -l` ++X=`grep -c '^ADD ' log.s2c` + assert $X 1 "missing ADD in s2c" + + X=`grep '^GET ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/14-skip-copy-already-there-copy-only ++++ syncmaildir-1.3.0/tests.d/client-server/14-skip-copy-already-there-copy-only +@@ -14,7 +14,7 @@ rm Mail/cur/$C + + test_eq Mail target/Mail + +-X=`grep '^COPY ' log.s2c | wc -l` ++X=`grep -c '^COPY ' log.s2c` + assert $X 1 "missing COPY in s2c" + + X=`grep '^GET ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/18-copybody ++++ syncmaildir-1.3.0/tests.d/client-server/18-copybody +@@ -10,7 +10,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^COPYBODY ' log.s2c | wc -l` ++X=`grep -c '^COPYBODY ' log.s2c` + assert $X 1 "missing COPY in s2c" + + X=`grep '^ADD ' log.s2c | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/19-copybody-already-ok ++++ syncmaildir-1.3.0/tests.d/client-server/19-copybody-already-ok +@@ -11,7 +11,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^COPYBODY ' log.s2c | wc -l` ++X=`grep -c '^COPYBODY ' log.s2c` + assert $X 1 "missing COPY in s2c" + + X=`grep '^GETHEADER ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/22-replace ++++ syncmaildir-1.3.0/tests.d/client-server/22-replace +@@ -10,7 +10,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^REPLACE ' log.s2c | wc -l` ++X=`grep -c '^REPLACE ' log.s2c` + assert $X 1 "missing REPLACE in s2c" + + X=`grep '^ADD ' log.s2c | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/23-replace-aready-ok ++++ syncmaildir-1.3.0/tests.d/client-server/23-replace-aready-ok +@@ -12,7 +12,7 @@ msync 2 + + test_eq Mail target/Mail + +-X=`grep '^REPLACE ' log.s2c | wc -l` ++X=`grep -c '^REPLACE ' log.s2c` + assert $X 1 "missing REPLACE in s2c" + + X=`grep '^GET ' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/34-move-fail2 ++++ syncmaildir-1.3.0/tests.d/client-server/34-move-fail2 +@@ -12,7 +12,7 @@ msync 2 + + test_eq target/Mail Mail + +-X=`grep '^MOVE ' log.s2c | wc -l` ++X=`grep -c '^MOVE ' log.s2c` + assert $X 1 "missing MOVE in s2c" + + X=`grep '^COMMIT$' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/35-delete ++++ syncmaildir-1.3.0/tests.d/client-server/35-delete +@@ -11,7 +11,7 @@ msync 2 + + test_eq target/Mail Mail + +-X=`grep '^DELETE ' log.s2c | wc -l` ++X=`grep -c '^DELETE ' log.s2c` + assert $X 1 "missing DELETE in s2c" + + X=`grep '^COMMIT$' log.c2s | wc -l` +--- syncmaildir-1.3.0.orig/tests.d/client-server/36-move-fail3 ++++ syncmaildir-1.3.0/tests.d/client-server/36-move-fail3 +@@ -11,7 +11,7 @@ sed -i 's/a/z/' target/$M + + msync 2 + +-X=`grep '^MOVE ' log.s2c | wc -l` ++X=`grep -c '^MOVE ' log.s2c` + assert $X 1 "missing MOVE in s2c" + + X=`grep '^COMMIT$' log.c2s | wc -l` diff -Nru syncmaildir-1.3.0/debian/patches/series syncmaildir-1.3.0/debian/patches/series --- syncmaildir-1.3.0/debian/patches/series 2018-03-17 13:13:46.000000000 -0300 +++ syncmaildir-1.3.0/debian/patches/series 2021-04-21 11:05:47.000000000 -0300 @@ -1 +1,2 @@ #link-against-gthread2 +replace-use-of-grep--wc-with-grep--c-for.patch
