[Pkg-shadow-commits] r1040 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-07-11 20:21:40 +0000 (Tue, 11 Jul 2006)
New Revision: 1040

Modified:
   trunk/debian/patches/491_configure.in_friendly_selinux_detection
Log:
Update for 4.0.17.
The selinux detection was changed, but it will still fail on systems
without the selinux header.


Modified: trunk/debian/patches/491_configure.in_friendly_selinux_detection
===================================================================
--- trunk/debian/patches/491_configure.in_friendly_selinux_detection	2006-07-11 06:45:49 UTC (rev 1039)
+++ trunk/debian/patches/491_configure.in_friendly_selinux_detection	2006-07-11 20:21:40 UTC (rev 1040)
@@ -7,10 +7,10 @@
 
 Status wrt upstream: reported by Mike, not applied yet
 
-Index: shadow-4.0.16/configure.in
+Index: shadow-4.0.17/configure.in
 ===================================================================
---- shadow-4.0.16.orig/configure.in	2006-05-31 23:23:48.743248208 +0700
-+++ shadow-4.0.16/configure.in	2006-05-31 23:25:09.062037896 +0700
+--- shadow-4.0.17.orig/configure.in	2006-06-25 14:27:52.000000000 +0200
++++ shadow-4.0.17/configure.in	2006-07-11 22:07:03.000000000 +0200
 @@ -220,7 +220,7 @@
  	[with_libpam=$withval], [with_libpam=yes])
  AC_ARG_WITH(selinux,
@@ -20,7 +20,7 @@
  AC_ARG_WITH(skey,
  	[AC_HELP_STRING([--with-skey], [use S/Key support @<:@default=no@:>@])],
  	[with_skey=$withval], [with_skey=no])
-@@ -282,14 +282,21 @@
+@@ -282,15 +282,22 @@
  		AC_DEFINE(HAVE_LIBCRACK_PW, 1, [Defined if it includes *Pw functions.]))
  fi
  
@@ -28,19 +28,20 @@
 +if test "$with_selinux" != "no"; then
 +	have_selinux="yes"
  	AC_CHECK_LIB(selinux, is_selinux_enabled,
- 		[LIBSELINUX="-lselinux"],
--		[AC_MSG_ERROR([libselinux not found])])
+ 		[LIBSELINUX="-lselinux"
++		],
 +		[have_selinux="no"])
- 	AC_SUBST(LIBSELINUX)
--	AC_CHECK_HEADERS(selinux/selinux.h, [],
--		[AC_MSG_ERROR([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
+ 		AC_SUBST(LIBSELINUX)
+-		AC_CHECK_HEADERS(selinux/selinux.h, [],
+-			[AC_MSG_ERROR([selinux/selinux.h is missing])])
 +		with_selinux="yes"
 +		AC_CHECK_HEADERS(selinux/selinux.h, [], [selinux/selinux.h is missing])
-+		AC_DEFINE(WITH_SELINUX, 1, [Build shadow with SELinux support])
+ 		AC_DEFINE(WITH_SELINUX, 1, [Build shadow with SELinux support])
+-		],
+-		[AC_MSG_ERROR([libselinux not found])])
 +	else
 +		with_selinux="no"
 +	fi