diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-08-10 09:38:03 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-08-10 09:38:03 +0000 |
| commit | edf16323e6ac401b4eaafd3f7abf655a15f7774a (patch) | |
| tree | 9e7f918ca5c7dcba231a2f66dbf2f2171ca6dfb5 /app-arch/dpkg/files | |
| parent | Stable for sparc, wrt bug #515234 (diff) | |
| download | gentoo-2-edf16323e6ac401b4eaafd3f7abf655a15f7774a.tar.gz gentoo-2-edf16323e6ac401b4eaafd3f7abf655a15f7774a.tar.bz2 gentoo-2-edf16323e6ac401b4eaafd3f7abf655a15f7774a.zip | |
Version bump. Add USE=selinux.
(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-arch/dpkg/files')
| -rw-r--r-- | app-arch/dpkg/files/dpkg-1.17.11-selinux.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch b/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch new file mode 100644 index 000000000000..352161ebb312 --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.17.11-selinux.patch @@ -0,0 +1,46 @@ + - AM_CONDITIONAL should not be run conditionally. + - When you have established you cannot build it, you cannot test it either. + - Why does it try to build libselinux compatibility _using_ the libselinux headers and library? + +--- a/m4/dpkg-libs.m4 ++++ b/m4/dpkg-libs.m4 +@@ -92,15 +92,16 @@ + [AC_DEFINE([HAVE_SETEXECFILECON], [1], + [Define to 1 if SELinux setexecfilecon is present]) + ]) +- AM_CONDITIONAL(HAVE_SETEXECFILECON, +- [test "x$ac_cv_lib_selinux_setexecfilecon" = "xyes"]) +- + AC_CHECK_HEADER([selinux/selinux.h],, + [if test -n "$with_selinux"; then + AC_MSG_FAILURE([selinux header not found]) + fi]) + fi +-])# DPKG_LIB_SELINUX ++AM_CONDITIONAL(HAVE_SETEXECFILECON, ++ [test "x$ac_cv_lib_selinux_setexecfilecon" = "xyes"]) ++]) ++ ++# DPKG_LIB_SELINUX + + # _DPKG_CHECK_LIB_CURSES_NARROW + # ----------------------------- +--- a/lib/compat/Makefile.am ++++ b/lib/compat/Makefile.am +@@ -10,7 +10,6 @@ + libcompat_test_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_LIBCOMPAT=1 + libcompat_test_la_SOURCES = \ + compat.h \ +- selinux.c \ + strnlen.c \ + strndup.c \ + strerror.c \ +@@ -57,7 +56,7 @@ + libcompat_la_SOURCES += strsignal.c + endif + +-if !HAVE_SETEXECFILECON ++if HAVE_SETEXECFILECON + libcompat_la_SOURCES += selinux.c + endif + |