[debrepatch] 02/03: update patches, remove ones already applied
Ximin Luo
infinity0 at debian.org
Tue Apr 18 18:27:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository debrepatch.
commit fdc31f0fa864c602172a12cf79e760631d9591ea
Author: Ximin Luo <infinity0 at debian.org>
Date: Tue Apr 18 20:19:30 2017 +0200
update patches, remove ones already applied
---
patches/bash_806945_incomplete.patch | 8 ++---
patches/glibc_783210_incomplete.patch | 62 -----------------------------------
patches/shadow_817971.patch | 29 ----------------
3 files changed, 4 insertions(+), 95 deletions(-)
diff --git a/patches/bash_806945_incomplete.patch b/patches/bash_806945_incomplete.patch
index 5cec859..b00432e 100644
--- a/patches/bash_806945_incomplete.patch
+++ b/patches/bash_806945_incomplete.patch
@@ -20,10 +20,10 @@ diff -Nru bash-4.4/debian/changelog bash-4.3/debian/changelog
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.8
+@@ -6,7 +6,7 @@
Build-Depends: autoconf, autotools-dev, bison, libncurses5-dev,
- texinfo, texi2html, debhelper (>= 9), locales, gettext, sharutils, time,
+ texinfo, texi2html, debhelper (>= 9), gettext, sharutils,
+ locales <!nocheck>, time <!nocheck>,
- 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
@@ -92,7 +92,7 @@ diff -Nru bash-4.4/debian/patches/pgrp-pipe.diff bash-4.3/debian/patches/pgrp-pi
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 @@
+@@ -135,7 +135,7 @@
bash-doc-build: stamps/stamp-build-bash-doc
stamps/stamp-build-bash-doc:
rm -f bash/doc/bashref.info
diff --git a/patches/glibc_783210_incomplete.patch b/patches/glibc_783210_incomplete.patch
deleted file mode 100644
index 40d379f..0000000
--- a/patches/glibc_783210_incomplete.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nru glibc-2.24/debian/changelog glibc-2.24/debian/changelog
---- glibc-2.24/debian/changelog 2016-11-25 22:09:39.000000000 +0000
-+++ glibc-2.24/debian/changelog 2016-11-15 18:03:37.000000000 +0000
-@@ -1,3 +1,10 @@
-+glibc (2.24-7.1) UNRELEASED; urgency=medium
-+
-+ * Non-maintainer upload.
-+ * Try for reproducibility.
-+
-+ -- Ximin Luo <infinity0 at profitbricks-build17-amd64> Tue, 15 Nov 2016 18:03:37 +0000
-+
- glibc (2.24-7) unstable; urgency=medium
-
- [ Samuel Thibault ]
-diff -Nru glibc-2.24/debian/rules glibc-2.24/debian/rules
---- glibc-2.24/debian/rules 2016-11-25 21:59:04.000000000 +0000
-+++ glibc-2.24/debian/rules 2016-11-15 18:03:37.000000000 +0000
-@@ -45,6 +45,7 @@
-
- DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-
-+SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
- DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
- GLIBC_VERSION = $(shell echo $(DEB_VERSION) | sed -e 's/.*://' -e 's/[+-].*//')
-
-diff -Nru glibc-2.24/debian/rules.d/build.mk glibc-2.24/debian/rules.d/build.mk
---- glibc-2.24/debian/rules.d/build.mk 2016-11-25 12:02:24.000000000 +0000
-+++ glibc-2.24/debian/rules.d/build.mk 2016-11-15 18:03:37.000000000 +0000
-@@ -316,18 +316,16 @@
- $(stamp)source: $(stamp)patch
- mkdir -p $(build-tree)
- cd .. && \
-- find $(GLIBC_SOURCES) -depth -newermt '$(DEB_BUILD_DATE)' \
-- -print0 | \
-- xargs -0r touch --no-dereference --date='$(DEB_BUILD_DATE)'
-- cd .. && \
- find $(GLIBC_SOURCES) -print0 | \
- LC_ALL=C sort -z | \
- tar -c -J --null -T - --no-recursion \
- --mode=go=rX,u+rw,a-s \
-+ --clamp-mtime --mtime "@$(SOURCE_DATE_EPOCH)" \
- --owner=root --group=root --numeric-owner \
- -f $(CURDIR)/$(build-tree)/glibc-$(GLIBC_VERSION).tar.xz
- mkdir -p debian/glibc-source/usr/src/glibc
- tar cf - --files-from debian/glibc-source.filelist \
-+ --clamp-mtime --mtime "@$(SOURCE_DATE_EPOCH)" \
- | tar -x -C debian/glibc-source/usr/src/glibc -f -
-
- touch $@
-diff -Nru glibc-2.24/debian/rules.d/debhelper.mk glibc-2.24/debian/rules.d/debhelper.mk
---- glibc-2.24/debian/rules.d/debhelper.mk 2016-11-25 22:08:30.000000000 +0000
-+++ glibc-2.24/debian/rules.d/debhelper.mk 2016-11-15 18:03:37.000000000 +0000
-@@ -77,8 +77,7 @@
- -exec chmod a+x '{}' ';'
- dh_makeshlibs -Xgconv/ -p$(curpass) -V "$(call xx,shlib_dep)"
- # Add relevant udeb: lines in shlibs files
-- chmod a+x debian/shlibs-add-udebs
-- ./debian/shlibs-add-udebs $(curpass)
-+ sh ./debian/shlibs-add-udebs $(curpass)
-
- dh_installdeb -p$(curpass)
- dh_shlibdeps -p$(curpass)
diff --git a/patches/shadow_817971.patch b/patches/shadow_817971.patch
deleted file mode 100644
index 011d7c8..0000000
--- a/patches/shadow_817971.patch
+++ /dev/null
@@ -1,29 +0,0 @@
->From 1d81ce999de214481a45d962a8ad03de22d293e4 Mon Sep 17 00:00:00 2001
-From: Niels Thykier <niels at thykier.net>
-Date: Sat, 12 Mar 2016 08:13:57 +0000
-Subject: [PATCH] d/rules: Explicitly set SHELL to /bin/bash
-
-Otherwise, configure will derive it from the environment and the
-package then differs based on the shell used by the builder.
-
-Signed-off-by: Niels Thykier <niels at thykier.net>
----
- debian/rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/rules b/debian/rules
-index 51c0f5d..1519c38 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -19,7 +19,7 @@ DEB_DESTDIR=$(CURDIR)/debian/tmp
- include /usr/share/cdbs/1/class/autotools.mk
-
- # Adds extra options when calling the configure script:
--DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man --disable-account-tools-setuid --with-group-name-max-length=32 --without-acl --without-attr --without-tcb
-+DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man --disable-account-tools-setuid --with-group-name-max-length=32 --without-acl --without-attr --without-tcb SHELL=/bin/bash
- ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
- DEB_CONFIGURE_EXTRA_FLAGS += --host=$(DEB_HOST_GNU_TYPE)
- endif
---
-2.7.0
-
--
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