Hello community,
here is the log from the commit of package quilt
checked in at Tue Oct 30 01:15:53 CET 2007.
--------
--- quilt/quilt.changes 2007-10-26 11:55:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/quilt/quilt.changes 2007-10-29 20:47:24.319260000 +0100
@@ -1,0 +2,6 @@
+Mon Oct 29 20:46:46 CET 2007 - agruen@suse.de
+
+- quilt mail: Work around a ``Broken pipe'' problem in
+ quilt_mail_patch_filter().
+
+-------------------------------------------------------------------
Old:
----
quilt-0.46_cvs20071026.tar.bz2
New:
----
quilt-0.46_cvs20071029.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ quilt.spec ++++++
--- /var/tmp/diff_new_pack.ma8987/_old 2007-10-30 01:14:50.000000000 +0100
+++ /var/tmp/diff_new_pack.ma8987/_new 2007-10-30 01:14:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package quilt (Version 0.46_cvs20071026)
+# spec file for package quilt (Version 0.46_cvs20071029)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@
Summary: A Tool for Working with Many Patches
License: GPL v2 or later
Group: Productivity/Text/Utilities
-Version: 0.46_cvs20071026
+Version: 0.46_cvs20071029
Release: 1
Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat
AutoReqProv: off
@@ -43,7 +43,7 @@
Andreas Gruenbacher
%prep
-%setup -q -n quilt-%{version}
+%setup -q
%patch -p1 -P 1 -P 2 -P 3 -P 4
%build
@@ -105,6 +105,9 @@
%doc doc/README.MAIL
%doc doc/quilt.pdf
%changelog
+* Mon Oct 29 2007 - agruen@suse.de
+- quilt mail: Work around a ``Broken pipe'' problem in
+ quilt_mail_patch_filter().
* Fri Oct 26 2007 - bwalle@suse.de
- change version to '0.46_cvs20071026' to make it clear to the
user that this is a CVS version
++++++ quilt-0.46_cvs20071026.tar.bz2 -> quilt-0.46_cvs20071029.tar.bz2 ++++++
++++ 1816 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/quilt-0.46_cvs20071026/configure.ac new/quilt-0.46_cvs20071029/configure.ac
--- old/quilt-0.46_cvs20071026/configure.ac 2007-10-26 11:49:22.000000000 +0200
+++ new/quilt-0.46_cvs20071029/configure.ac 2007-07-26 13:58:21.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([quilt],[0.46_cvs20071026],[quilt-dev@nongnu.org])
+AC_INIT([quilt],[0.46],[quilt-dev@nongnu.org])
AC_CONFIG_AUX_DIR(config)
AC_PREREQ(2.53)
AC_REVISION ($Revision: 1.83 $)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/quilt-0.46_cvs20071026/po/de.po new/quilt-0.46_cvs20071029/po/de.po
--- old/quilt-0.46_cvs20071026/po/de.po 2007-10-26 11:49:38.000000000 +0200
+++ new/quilt-0.46_cvs20071029/po/de.po 2007-10-29 20:37:39.000000000 +0100
@@ -322,7 +322,7 @@
"Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden."
"\\n"
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:381
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:373
msgid "Patch %s not applied before patch %s\\n"
msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
@@ -819,28 +819,28 @@
msgstr ""
"Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender."
-#: quilt/mail.in:409
+#: quilt/mail.in:401
msgid "Unable to extract a subject header from %s\\n"
msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n"
-#: quilt/mail.in:433
+#: quilt/mail.in:425
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n"
-#: quilt/mail.in:442
+#: quilt/mail.in:434
#, fuzzy
msgid "File %s does not exist\\n"
msgstr "Patch %s existiert nicht\\n"
-#: quilt/mail.in:502
+#: quilt/mail.in:494
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
-#: quilt/mail.in:505
+#: quilt/mail.in:497
msgid "Introduction has no subject header\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
-#: quilt/mail.in:602
+#: quilt/mail.in:594
msgid "Introduction saved as %s\\n"
msgstr "Einleitung gespeichert als %s\\n"
@@ -1335,21 +1335,6 @@
msgid "Delivery address `%s' is invalid\n"
msgstr "Zustelladresse `%s' ist ungültig\n"
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, fuzzy, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Datei %s ist unverändert\\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, fuzzy, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Umbenennen von %s auf %s: %s\n"
-
#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
msgid "No patches in series\\n"
msgstr "Keine Patches in der series-Datei\\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/quilt-0.46_cvs20071026/po/fr.po new/quilt-0.46_cvs20071029/po/fr.po
--- old/quilt-0.46_cvs20071026/po/fr.po 2007-10-26 11:49:38.000000000 +0200
+++ new/quilt-0.46_cvs20071029/po/fr.po 2007-10-29 20:37:39.000000000 +0100
@@ -324,7 +324,7 @@
"Impossible de cr�er des patches avec -p%s. Veuillez sp�cifier -p0 ou -p1 � "
"la place\\n"
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:381
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:373
msgid "Patch %s not applied before patch %s\\n"
msgstr "Le patch %s n'est pas appliqu� avant %s\\n."
@@ -815,29 +815,29 @@
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr "Impossible de d�terminer l'adresse d'exp�diteur. Utilisez --sender."
-#: quilt/mail.in:409
+#: quilt/mail.in:401
msgid "Unable to extract a subject header from %s\\n"
msgstr "Impossible d'extraire une ligne de sujet de %s\\n"
-#: quilt/mail.in:433
+#: quilt/mail.in:425
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Les patches %s ont des sujets dupliqu�s.\\n"
-#: quilt/mail.in:442
+#: quilt/mail.in:434
#, fuzzy
msgid "File %s does not exist\\n"
msgstr "Le patch %s n'existe pas\\n"
-#: quilt/mail.in:502
+#: quilt/mail.in:494
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr ""
"L'introduction n'a pas de ligne de sujet (sauvegard� en tant que %s)\\n"
-#: quilt/mail.in:505
+#: quilt/mail.in:497
msgid "Introduction has no subject header\\n"
msgstr "L'introduction ne contient pas de ligne de sujet\\n"
-#: quilt/mail.in:602
+#: quilt/mail.in:594
msgid "Introduction saved as %s\\n"
msgstr "Introduction sauvegard�e en tant que %s\\n"
@@ -1348,21 +1348,6 @@
msgid "Delivery address `%s' is invalid\n"
msgstr "L'adresse de destination `%s' est invalide\n"
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Le fichier %s a disparu !\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Impossible de renommer %s en %s : %s\n"
-
#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
msgid "No patches in series\\n"
msgstr "Aucun patch dans la s�rie\\n"
@@ -1617,3 +1602,12 @@
#~ msgid "File %s removed from patch %s\\n"
#~ msgstr "Le fichier %s a �t� enlev� du patch %s.\\n"
+
+#~ msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+#~ msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
+
+#~ msgid "File %s disappeared!\n"
+#~ msgstr "Le fichier %s a disparu !\n"
+
+#~ msgid "Failed to rename %s to %s: %s\n"
+#~ msgstr "Impossible de renommer %s en %s : %s\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/quilt-0.46_cvs20071026/po/ja.po new/quilt-0.46_cvs20071029/po/ja.po
--- old/quilt-0.46_cvs20071026/po/ja.po 2007-10-26 11:49:38.000000000 +0200
+++ new/quilt-0.46_cvs20071029/po/ja.po 2007-10-29 20:37:39.000000000 +0100
@@ -312,7 +312,7 @@
msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
msgstr "-p%s でパッチの差分はとれません。-p0か -p1を指定してください\\n"
-#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:381
+#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:373
msgid "Patch %s not applied before patch %s\\n"
msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
@@ -786,28 +786,28 @@
"エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n"
"を使用してください。"
-#: quilt/mail.in:409
+#: quilt/mail.in:401
msgid "Unable to extract a subject header from %s\\n"
msgstr "%s から件名を取り出せません。\\n"
-#: quilt/mail.in:433
+#: quilt/mail.in:425
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "パッチ %s の件名が重複しています。\\n"
-#: quilt/mail.in:442
+#: quilt/mail.in:434
#, fuzzy
msgid "File %s does not exist\\n"
msgstr "パッチ %s が存在しません\\n"
-#: quilt/mail.in:502
+#: quilt/mail.in:494
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "序文に件名がありません(%s として保存されました)\\n"
-#: quilt/mail.in:505
+#: quilt/mail.in:497
msgid "Introduction has no subject header\\n"
msgstr "序文に件名がありません\\n"
-#: quilt/mail.in:602
+#: quilt/mail.in:594
msgid "Introduction saved as %s\\n"
msgstr "序文は %s という名前で保存されました\\n"
@@ -1305,21 +1305,6 @@
msgid "Delivery address `%s' is invalid\n"
msgstr "配送先のアドレス `%s' が不正です\n"
-#: quilt/scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
-
-#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
-#, fuzzy, perl-format
-msgid "File %s disappeared!\n"
-msgstr "パッチ %s に変更はありません\\n"
-
-#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
-#, fuzzy, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "%s から %s へ名前を変更しました: %s\n"
-
#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495
msgid "No patches in series\\n"
msgstr "シリーズに登録されているパッチがありません\\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/quilt-0.46_cvs20071026/quilt/mail.in new/quilt-0.46_cvs20071029/quilt/mail.in
--- old/quilt-0.46_cvs20071026/quilt/mail.in 2007-10-26 11:49:06.000000000 +0200
+++ new/quilt-0.46_cvs20071029/quilt/mail.in 2007-10-29 20:37:36.000000000 +0100
@@ -288,60 +288,55 @@
if [ "$(type -t quilt_mail_patch_filter 2> /dev/null)" != function ]
then
quilt_mail_patch_filter() {
- local patch=$(cat)
- local header=$(echo "$patch" | patch_header) body subject
+ local tmpdir=$(gen_tempfile -d)
+ cat > $tmpdir/patch
+ patch_header < $tmpdir/patch > $tmpdir/header
+ local subject
local -a mh
# Does this patch have a Subject: line?
- subject=$(echo "$header" | formail -x Subject:)
+ subject=$(formail -x Subject: < $tmpdir/header)
if [ -n "$subject" ]
then
- body=$(echo "$patch" | awk '
- in_body { print }
- /^$/ { in_body = 1 }
- ')
+ awk '
+ in_body { print }
+ /^$/ { in_body = 1 }
+ ' $tmpdir/patch > $tmpdir/body
fi
# Does this patch have DESC // subject // EDESC?
if [ -z "$subject" ]
then
- local desc=$(echo "$header" | awk '
+ local desc=$(awk '
/^EDESC\>/ { desc = 0 }
desc { print }
/^DESC\>/ { desc = 1 }
- ')
+ ' $tmpdir/header)
if [ -n "$desc" ]
then
subject=$(echo "$desc" | join_lines)
- body=$(echo "$patch" | awk '
- /^DESC/ { desc = 1 }
- ! desc { print }
- /^EDESC/ { desc = 0 }
- ')
+ awk '
+ /^DESC/ { desc = 1 }
+ ! desc { print }
+ /^EDESC/ { desc = 0 }
+ ' $tmpdir/patch > $tmpdir/body
fi
fi
# Is the first paragraph short enough to be used as the subject?
if [ -z "$subject" ]
then
- local para=$(echo "$header" | sed -e $'/^[ \t]*$/q')
+ local para=$(sed -e $'/^[ \t]*$/q' $tmpdir/header)
if [ ${#para} -gt 0 -a ${#para} -lt 150 ]
then
subject=$(echo "$para" | join_lines)
- body="$(echo "$patch" | awk '
- in_body { print }
- /^[ \t]*$/ { in_body = 1 }
- ')"
+ awk '
+ in_body { print }
+ /^[ \t]*$/ { in_body = 1 }
+ ' $tmpdir/patch > $tmpdir/body
fi
fi
- #if ${#mh[@]} -eq 0 ]
- #then
- # # Use the patch name as the subject.
- # mh=( "Replace-Subject: $1" )
- # body=$patch
- #fi
-
if [ -z "$subject" ]
then
return 1
@@ -349,20 +344,17 @@
subject=$(echo "$subject" \
| sed -e $'s/^\\(\\(\\[[^]]*\\]\\|fwd:\\|fw:\\|re:\\|aw:\\|tr:\\)[ \t]*\\)*//i')
- mh=( "Replace-Subject: $subject" )
+ echo "Replace-Subject: $subject"
# Add recipients defined by some recognized keywords
- local saved_IFS=$IFS; IFS=$'\n'
- mh=( "${mh[@]}"
- $(echo "$header" \
- | sed -n -e "/\<${LOGNAME:-$(whoami)}@/d" \
- -e 's/^\(To\|Cc\):/Recipient-\1:/ip' \
- -e 's/^\(Signed-off-by\|Acked-by\):/Recipient-Cc:/ip') )
- IFS=$saved_IFS
+ sed -n -e "/\<${LOGNAME:-$(whoami)}@/d" \
+ -e 's/^\(To\|Cc\):/Recipient-\1:/ip' \
+ -e 's/^\(Signed-off-by\|Acked-by\):/Recipient-Cc:/ip' \
+ $tmpdir/header
- printf "%s\n" "${mh[@]}"
echo
- echo "$body"
+ cat $tmpdir/body
+ rm -rf $tmpdir
}
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/quilt-0.46_cvs20071026/quilt.changes new/quilt-0.46_cvs20071029/quilt.changes
--- old/quilt-0.46_cvs20071026/quilt.changes 2007-10-26 11:49:06.000000000 +0200
+++ new/quilt-0.46_cvs20071029/quilt.changes 2007-10-29 20:40:10.000000000 +0100
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Oct 29 20:38:25 CET 2007 - agruen@suse.de
+
+- quilt/mail.in: Ran into a bash ``Broken pipe'' problem in
+ quilt_mail_patch_filter() which I cannot explain or cleanly
+ reproduce. Work around it by not using pipes and subshells as
+ extensively here.
+
+-------------------------------------------------------------------
Thu Oct 25 13:52:34 CEST 2007 - agruen@suse.de
- quilt/mail.in: Make sure that shell meta-characters like * in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/quilt-0.46_cvs20071026/quilt.spec new/quilt-0.46_cvs20071029/quilt.spec
--- old/quilt-0.46_cvs20071026/quilt.spec 2007-10-26 11:49:42.000000000 +0200
+++ new/quilt-0.46_cvs20071029/quilt.spec 2007-10-29 20:46:28.000000000 +0100
@@ -6,7 +6,7 @@
Summary: Scripts for working with series of patches
License: GPL
Group: Productivity/Text/Utilities
-Version: 0.46_cvs20071026
+Version: 0.46
Release: 1
Requires: coreutils diffutils patch gzip bzip2 perl mktemp gettext
Autoreqprov: off
@@ -57,6 +57,11 @@
%doc %{_docdir}/%{name}-%{version}/quilt.pdf
%changelog
+* Mon Oct 29 2007 - agruen@suse.de
+- quilt/mail.in: Ran into a bash ``Broken pipe'' problem in
+ quilt_mail_patch_filter() which I cannot explain or cleanly
+ reproduce. Work around it by not using pipes and subshells as
+ extensively here.
* Thu Oct 25 2007 - agruen@suse.de
- quilt/mail.in: Make sure that shell meta-characters like * in
subjects won't get expanded by accident (this was broken). Add
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org