[debrepatch] 02/02: Update patches

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository debrepatch.

commit 293c1ec5cfadf84080f15841f11eafdeccd42d6f
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Nov 17 19:01:20 2016 +0100

    Update patches
    
    xz-utils: Refresh
    libselinux, libsepol: Applied upstream, now reproducible!
---
 patches/libselinux_825655.patch | 29 -----------------------------
 patches/libsepol_825656.patch   | 38 --------------------------------------
 patches/xz-utils_806331.patch   |  2 +-
 3 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/patches/libselinux_825655.patch b/patches/libselinux_825655.patch
deleted file mode 100644
index 4c7f0f0..0000000
--- a/patches/libselinux_825655.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
-new file mode 100644
-index 0000000..1a19d54
---- /dev/null
-+++ b/debian/patches/reproducible-build.patch
-@@ -0,0 +1,14 @@
-+Author: Reiner Herrmann <reiner at reiner-h.de>
-+Description: Sort source files for deterministic linking order
-+
-+--- a/src/Makefile
-++++ b/src/Makefile
-+@@ -48,7 +48,7 @@
-+ endif
-+ 
-+ GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i
-+-SRCS= $(filter-out $(UNUSED_SRCS) $(GENERATED) audit2why.c, $(wildcard *.c))
-++SRCS= $(filter-out $(UNUSED_SRCS) $(GENERATED) audit2why.c, $(sort $(wildcard *.c)))
-+ 
-+ MAX_STACK_SIZE=32768
-+ 
-diff --git a/debian/patches/series b/debian/patches/series
-index 562125a..d2e44d9 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,3 +1,4 @@
- fix-makefile-bugs.patch
- fix-cross-compile.patch
- 0003-Avoid-mounting-proc-outside-of-selinux_init_load_pol.patch
-+reproducible-build.patch
diff --git a/patches/libsepol_825656.patch b/patches/libsepol_825656.patch
deleted file mode 100644
index 0ccd1da..0000000
--- a/patches/libsepol_825656.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
-new file mode 100644
-index 0000000..404b749
---- /dev/null
-+++ b/debian/patches/reproducible-build.patch
-@@ -0,0 +1,25 @@
-+Author: Reiner Herrmann <reiner at reiner-h.de>
-+Description: Sort object files for deterministic linking order
-+
-+--- a/src/Makefile
-++++ b/src/Makefile
-+@@ -18,15 +18,15 @@
-+ LIBPC=libsepol.pc
-+ LIBMAP=libsepol.map
-+ LIBSO=$(TARGET).$(LIBVERSION)
-+-OBJS= $(patsubst %.c,%.o,$(wildcard *.c))
-+-LOBJS= $(patsubst %.c,%.lo,$(wildcard *.c))
-++OBJS= $(patsubst %.c,%.o,$(sort $(wildcard *.c)))
-++LOBJS= $(patsubst %.c,%.lo,$(sort $(wildcard *.c)))
-+ CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-format-attribute -O2
-+ 
-+ override CFLAGS += -I. -I../include -D_GNU_SOURCE
-+ 
-+ ifneq ($(DISABLE_CIL),y)
-+-OBJS += $(sort $(patsubst %.c,%.o,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATED)))
-+-LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATED)))
-++OBJS += $(sort $(patsubst %.c,%.o,$(sort $(wildcard $(CILDIR)/src/*.c)) $(CIL_GENERATED)))
-++LOBJS += $(sort $(patsubst %.c,%.lo,$(sort $(wildcard $(CILDIR)/src/*.c)) $(CIL_GENERATED)))
-+ override CFLAGS += -I$(CILDIR)/include
-+ endif
-+ 
-diff --git a/debian/patches/series b/debian/patches/series
-new file mode 100644
-index 0000000..55077d0
---- /dev/null
-+++ b/debian/patches/series
-@@ -0,0 +1 @@
-+reproducible-build.patch
diff --git a/patches/xz-utils_806331.patch b/patches/xz-utils_806331.patch
index b328762..8274795 100644
--- a/patches/xz-utils_806331.patch
+++ b/patches/xz-utils_806331.patch
@@ -21,7 +21,7 @@ diff -Nru xz-utils-5.1.1alpha+20120614/debian/rules xz-utils-5.1.1alpha+20120614
  debian/normal-build/Makefile debian/normal-build/Doxyfile: $(configure_input)
  	dh_auto_configure --builddirectory debian/normal-build -- \
 +		$(opt_reproduce) \
- 		--disable-threads --disable-static \
+ 		--enable-threads --disable-static \
  		$(opt_optimize) $(opt_quiet) \
  		--disable-xzdec --disable-lzmadec
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git