af6b7de546
Merge several patches from upstream to fix CVE-2011-1485. ok jasper@
55 lines
1.8 KiB
Plaintext
55 lines
1.8 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.3 2011/04/28 13:09:07 ajacoutot Exp $
|
|
|
|
Force disabling gtk-doc.
|
|
Add bsd_auth(3) support.
|
|
|
|
--- configure.ac.orig Thu Mar 3 19:26:20 2011
|
|
+++ configure.ac Wed Apr 27 16:07:00 2011
|
|
@@ -45,8 +45,6 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
|
|
fi
|
|
AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
|
|
|
|
-GTK_DOC_CHECK([1.3])
|
|
-
|
|
#### gcc warning flags
|
|
|
|
if test "x$GCC" = "xyes"; then
|
|
@@ -141,7 +139,7 @@ AC_SUBST(EXPAT_LIBS)
|
|
AC_CHECK_FUNCS(clearenv)
|
|
|
|
if test "x$GCC" = "xyes"; then
|
|
- LDFLAGS="-Wl,--as-needed $LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS"
|
|
fi
|
|
|
|
dnl ---------------------------------------------------------------------------
|
|
@@ -190,6 +188,11 @@ case $POLKIT_AUTHFW in
|
|
AC_DEFINE(POLKIT_AUTHFW_SHADOW, 1, [If using the Shadow authentication framework])
|
|
;;
|
|
|
|
+ bsdauth)
|
|
+ need_pam=no
|
|
+ AC_DEFINE(POLKIT_AUTHFW_BSDAUTH, 1, [If using the bsd_auth(3) authentication framework])
|
|
+ ;;
|
|
+
|
|
*)
|
|
AC_MSG_ERROR([Unknown Authentication Framework: $POLKIT_AUTHFW])
|
|
;;
|
|
@@ -198,6 +201,7 @@ esac
|
|
AM_CONDITIONAL(POLKIT_AUTHFW_NONE, [test x$POLKIT_AUTHFW = xnone], [Using no authfw])
|
|
AM_CONDITIONAL(POLKIT_AUTHFW_PAM, [test x$POLKIT_AUTHFW = xpam], [Using PAM authfw])
|
|
AM_CONDITIONAL(POLKIT_AUTHFW_SHADOW, [test x$POLKIT_AUTHFW = xshadow], [Using Shadow authfw])
|
|
+AM_CONDITIONAL(POLKIT_AUTHFW_BSDAUTH, [test x$POLKIT_AUTHFW = xbsdauth], [Using bsd_auth(3) authfw])
|
|
|
|
|
|
dnl ---------------------------------------------------------------------------
|
|
@@ -467,7 +471,7 @@ echo "NOTE: The directory ${sysconfdir}/polkit-1/local
|
|
echo " by root and have mode 700"
|
|
echo
|
|
|
|
-echo "NOTE: The directory ${localstatedir}/lib/polkit-1 must be owned"
|
|
+echo "NOTE: The directory ${localstatedir}/db/polkit-1 must be owned"
|
|
echo " by root and have mode 700"
|
|
echo
|
|
|