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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-13 17:45:51 +0000 (Sat, 13 Sep 2008)
New Revision: 2398

Removed:
   debian/trunk/debian/patches/491_configure.in_friendly_selinux_detection
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
    - Remove patches applied upstream:
      + debian/patches/491_configure.in_friendly_selinux_detection


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-09-13 17:42:43 UTC (rev 2397)
+++ debian/trunk/debian/changelog	2008-09-13 17:45:51 UTC (rev 2398)
@@ -4,6 +4,7 @@
   * New upstream release:
     - Remove patches applied upstream:
       + debian/patches/434_login_stop_checking_args_after--
+      + debian/patches/491_configure.in_friendly_selinux_detection
     - Updated patches:
       + debian/patches/431_su_uid_0_not_root
       + debian/patches/463_login_delay_obeys_to_PAM

Deleted: debian/trunk/debian/patches/491_configure.in_friendly_selinux_detection
===================================================================
--- debian/trunk/debian/patches/491_configure.in_friendly_selinux_detection	2008-09-13 17:42:43 UTC (rev 2397)
+++ debian/trunk/debian/patches/491_configure.in_friendly_selinux_detection	2008-09-13 17:45:51 UTC (rev 2398)
@@ -1,50 +0,0 @@
-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: Fixed upstream.
-
-Index: shadow-4.1.0/configure.in
-===================================================================
---- shadow-4.1.0.orig/configure.in
-+++ shadow-4.1.0/configure.in
-@@ -221,7 +221,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])
-@@ -292,15 +292,22 @@
- 		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"
-+		],
-+		[have_selinux="no"])
-+	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_MSG_ERROR([libselinux not found])])
-+	else
-+		with_selinux="no"
-+	fi
- fi
- 
- AC_SUBST(LIBPAM)

Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2008-09-13 17:42:43 UTC (rev 2397)
+++ debian/trunk/debian/patches/series	2008-09-13 17:45:51 UTC (rev 2398)
@@ -21,7 +21,6 @@
 523_su_arguments_are_no_more_concatenated_by_default
 579_chowntty_debug
 483_su_fakelogin_wrong_arg0
-491_configure.in_friendly_selinux_detection
 592_manpages_typos
 487_passwd_chauthtok_failed_message
 403_fix_PATH-MAX_hurd