From ec60f91bc5db43f122d920750363092ba2309d5f Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 13 Sep 2008 17:45:51 +0000 Subject: [PATCH] - Remove patches applied upstream: + debian/patches/491_configure.in_friendly_selinux_detection --- debian/changelog | 1 + ...91_configure.in_friendly_selinux_detection | 50 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 debian/patches/491_configure.in_friendly_selinux_detection diff --git a/debian/changelog b/debian/changelog index 424666dd..edd2bc37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ shadow (1:4.1.2-1) experimental; urgency=low * 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 diff --git a/debian/patches/491_configure.in_friendly_selinux_detection b/debian/patches/491_configure.in_friendly_selinux_detection deleted file mode 100644 index a4d6b873..00000000 --- a/debian/patches/491_configure.in_friendly_selinux_detection +++ /dev/null @@ -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 - -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) diff --git a/debian/patches/series b/debian/patches/series index 06d85393..3b7e624b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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