[debrepatch] 01/01: patches: refresh bash patch for version 4.4-1
Ximin Luo
infinity0 at debian.org
Mon Sep 26 12:51:12 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository debrepatch.
commit 1f219e8c6ab5e3c6c6acae208e270e604115b4e9
Author: Ximin Luo <infinity0 at debian.org>
Date: Mon Sep 26 14:50:54 2016 +0200
patches: refresh bash patch for version 4.4-1
---
patches/bash_806945.patch | 50 ++++++++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/patches/bash_806945.patch b/patches/bash_806945.patch
index 01afa67..5cec859 100644
--- a/patches/bash_806945.patch
+++ b/patches/bash_806945.patch
@@ -1,8 +1,8 @@
-diff -Nru bash-4.3/debian/changelog bash-4.3/debian/changelog
---- bash-4.3/debian/changelog 2015-09-01 01:04:48.000000000 +0200
-+++ bash-4.3/debian/changelog 2016-06-07 11:56:09.000000000 +0200
+diff -Nru bash-4.4/debian/changelog bash-4.3/debian/changelog
+--- bash-4.4/debian/changelog 2015-09-01 01:04:48.000000000 +0200
++++ bash-4.4/debian/changelog 2016-06-07 11:56:09.000000000 +0200
@@ -1,3 +1,15 @@
-+bash (4.3-14.0~reproducible1) UNRELEASED; urgency=medium
++bash (4.4-1.0~reproducible1) UNRELEASED; urgency=medium
+
+ [ Ximin Luo ]
+ * Non-maintainer upload.
@@ -12,32 +12,34 @@ diff -Nru bash-4.3/debian/changelog bash-4.3/debian/changelog
+ * Use the system man2html instead of the embedded one, for better build
+ reproducibility.
+
-+ -- Ximin Luo <infinity0 at debian.org> Tue, 07 Jun 2016 11:56:07 +0200
++ -- Ximin Luo <infinity0 at debian.org> Mon, 26 Sep 2016 14:40:45 +0200
+
- bash (4.3-14) unstable; urgency=medium
+ bash (4.4-1) unstable; urgency=medium
- * Apply upstream patches 040 - 042.
-diff -Nru bash-4.3/debian/control bash-4.3/debian/control
---- bash-4.3/debian/control 2015-01-28 17:13:32.000000000 +0100
-+++ bash-4.3/debian/control 2016-06-06 03:00:38.000000000 +0200
+ * Bash 4.4 release.
+diff -Nru bash-4.4/debian/control bash-4.3/debian/control
+--- bash-4.4/debian/control 2015-01-28 17:13:32.000000000 +0100
++++ bash-4.4/debian/control 2016-06-06 03:00:38.000000000 +0200
@@ -5,7 +5,7 @@
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
Build-Depends: autoconf, autotools-dev, bison, libncurses5-dev,
- texinfo, texi2html, debhelper (>= 5), locales, gettext, sharutils, time,
+ texinfo, texi2html, debhelper (>= 9), locales, gettext, sharutils, time,
- xz-utils, dpkg-dev (>= 1.16.1)
+ xz-utils, dpkg-dev (>= 1.16.1), man2html
Build-Depends-Indep: texlive-latex-base, ghostscript, texlive-fonts-recommended
Homepage: http://tiswww.case.edu/php/chet/bash/bashtop.html
Vcs-Browser: https://code.launchpad.net/~doko/+junk/pkg-bash-debian
-diff -Nru bash-4.3/debian/patches/pgrp-pipe.diff bash-4.3/debian/patches/pgrp-pipe.diff
---- bash-4.3/debian/patches/pgrp-pipe.diff 2013-10-23 14:41:22.000000000 +0200
-+++ bash-4.3/debian/patches/pgrp-pipe.diff 2016-06-07 12:17:05.000000000 +0200
-@@ -1,11 +1,43 @@
+diff -Nru bash-4.4/debian/patches/pgrp-pipe.diff bash-4.3/debian/patches/pgrp-pipe.diff
+--- bash-4.4/debian/patches/pgrp-pipe.diff 2013-10-23 14:41:22.000000000 +0200
++++ bash-4.4/debian/patches/pgrp-pipe.diff 2016-06-07 12:17:05.000000000 +0200
+@@ -1,13 +1,43 @@
-# DP: Define PGRP_PIPE to avoid race condition.
-
+-Index: b/config-bot.h
+-===================================================================
---- a/config-bot.h
-+++ b/config-bot.h
--@@ -197,3 +197,6 @@
+-@@ -201,3 +201,6 @@
-
- /* If you don't want bash to provide a default mail file to check. */
- #undef DEFAULT_MAIL_DIRECTORY
@@ -62,12 +64,12 @@ diff -Nru bash-4.3/debian/patches/pgrp-pipe.diff bash-4.3/debian/patches/pgrp-pi
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
++++ b/configure.ac
-+@@ -1084,9 +1084,7 @@
++@@ -1092,9 +1092,7 @@
+ solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
+ lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
+- case "`uname -r`" in
-+- 2.[[456789]]*|3*) AC_DEFINE(PGRP_PIPE) ;;
++- 2.[[456789]]*|[[34]]*) AC_DEFINE(PGRP_PIPE) ;;
+- esac ;;
++ AC_DEFINE(PGRP_PIPE) ;;
+ *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;;
@@ -75,21 +77,21 @@ diff -Nru bash-4.3/debian/patches/pgrp-pipe.diff bash-4.3/debian/patches/pgrp-pi
+ powerux*) LOCAL_LIBS="-lgen" ;;
+--- a/configure
++++ b/configure
-+@@ -15922,10 +15922,8 @@
++@@ -16064,10 +16064,8 @@
+ solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
+ lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
+ linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
+- case "`uname -r`" in
-+- 2.[456789]*|3*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h
++- 2.[456789]*|[34]*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h
++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h
+ ;;
+- esac ;;
+ *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;;
+ *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
+ powerux*) LOCAL_LIBS="-lgen" ;;
-diff -Nru bash-4.3/debian/rules bash-4.3/debian/rules
---- bash-4.3/debian/rules 2015-01-28 17:55:12.000000000 +0100
-+++ bash-4.3/debian/rules 2016-06-06 03:00:38.000000000 +0200
+diff -Nru bash-4.4/debian/rules bash-4.4/debian/rules
+--- bash-4.4/debian/rules 2015-01-28 17:55:12.000000000 +0100
++++ bash-4.4/debian/rules 2016-06-06 03:00:38.000000000 +0200
@@ -136,7 +136,7 @@
bash-doc-build: stamps/stamp-build-bash-doc
stamps/stamp-build-bash-doc:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git
More information about the Reproducible-commits
mailing list