[debrepatch] 02/02: patches: add libselinux, libsepol

[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 16e2e03095603bd65365fe3d7a9f94030b9db5a1
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Sep 20 14:55:24 2016 +0200

    patches: add libselinux, libsepol
---
 patches/libselinux_825655.patch | 29 +++++++++++++++++++++++++++++
 patches/libsepol_825656.patch   | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/patches/libselinux_825655.patch b/patches/libselinux_825655.patch
new file mode 100644
index 0000000..4c7f0f0
--- /dev/null
+++ b/patches/libselinux_825655.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..0ccd1da
--- /dev/null
+++ b/patches/libsepol_825656.patch
@@ -0,0 +1,38 @@
+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

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