[Pkg-shadow-commits] r858 - in trunk/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-02-09 20:53:47 +0000 (Thu, 09 Feb 2006)
New Revision: 858

Added:
   trunk/debian/patches/491_configure.in_friendly_selinux_detection
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
detect that SE Linux is not present without failing if --without-selinux or --with-selinux is not specified.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-09 18:55:03 UTC (rev 857)
+++ trunk/debian/changelog	2006-02-09 20:53:47 UTC (rev 858)
@@ -1,8 +1,11 @@
 shadow (1:4.0.14-6) UNRELEASED; urgency=low
 
   * The "Cantal" ("Vieux" flavour) release
+  * Upstream bugs or fixes not already fixed in upstream releases or CVS:
+    - 491_configure.in_friendly_selinux_detection:
+      Detect that selinux is not present without failing.
 
- -- Christian Perrier <bubulle at debian.org>  Thu,  9 Feb 2006 19:53:16 +0100
+ -- Christian Perrier <bubulle at debian.org>  Thu,  9 Feb 2006 21:52:03 +0100
 
 shadow (1:4.0.14-5) unstable; urgency=low
 

Added: trunk/debian/patches/491_configure.in_friendly_selinux_detection
===================================================================
--- trunk/debian/patches/491_configure.in_friendly_selinux_detection	2006-02-09 18:55:03 UTC (rev 857)
+++ trunk/debian/patches/491_configure.in_friendly_selinux_detection	2006-02-09 20:53:47 UTC (rev 858)
@@ -0,0 +1,48 @@
+Goal: detect that SE Linux is not present without failing if
+      --without-selinux or --with-selinux is not specified.
+
+Fix: FTBFS on kfreebsd (and probably The Hurd)
+
+Author: Mike Frysinger <vapier at gentoo.org>
+
+Status wrt upstream: reported by Mike, not applied yet
+
+Index: shadow-4.0.14/configure.in
+===================================================================
+--- shadow-4.0.14.orig/configure.in	2006-01-03 00:51:44.000000000 +0100
++++ shadow-4.0.14/configure.in	2006-02-09 21:38:45.000000000 +0100
+@@ -226,7 +226,7 @@
+ 	[with_libpam=$withval], [with_libpam=yes])
+ AC_ARG_WITH(selinux,
+ 	[AC_HELP_STRING([--with-selinux], [use SELinux support @<:@default=autodetect@:>@])],
+-	[with_selinux=$withval], [with_selinux=yes])
++	[with_selinux=$withval], [with_selinux=maybe])
+ AC_ARG_WITH(skey,
+ 	[AC_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])],
+ 	[with_skey=$withval], [with_skey=no])
+@@ -288,13 +288,21 @@
+ 		AC_DEFINE(HAVE_LIBCRACK_PW, 1, [Defined if it includes *Pw functions.]))
+ fi
+ 
+-if test "$with_selinux" = "yes"; then
++if test "$with_selinux" != "no"; then
++	have_selinux="yes"
+ 	AC_CHECK_LIB(selinux, is_selinux_enabled,
+ 		[LIBSELINUX="-lselinux"],
+-		[AC_MSG_ERROR([libselinux not found])])
++		[have_selinux="no"])
+ 	AC_SUBST(LIBSELINUX)
+-	AC_CHECK_HEADERS(selinux/selinux.h, [], [selinux/selinux.h is missing])
+-	AC_DEFINE(WITH_SELINUX, 1, [Build shadow with SELinux support])
++	if test "x$have_selinux$with_selinux" = "xnoyes" ; then
++		AC_MSG_ERROR([libselinux not found])
++	elif test "x$have_selinux" = "xyes" ; then
++		with_selinux="yes"
++		AC_CHECK_HEADERS(selinux/selinux.h, [], [selinux/selinux.h is missing])
++		AC_DEFINE(WITH_SELINUX, 1, [Build shadow with SELinux support])
++	else
++		with_selinux="no"
++	fi
+ fi
+ 
+ AC_SUBST(LIBPAM)

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-02-09 18:55:03 UTC (rev 857)
+++ trunk/debian/patches/series	2006-02-09 20:53:47 UTC (rev 858)
@@ -53,6 +53,7 @@
 489_useradd_allow_non_uniq_uid
 390_useradd_always_unlock_group_databases
 490_link_selinux_only_when_needed
+491_configure.in_friendly_selinux_detection
 # 999-2 is about using cdbs. It does not patch upstream files
 # so shouldn't be here, but we keep it for the future
 # 999-2_build_using_cdbs