summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-06 14:18:42 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-06 14:18:42 +0000
commit031a0c740edf6f179aa3eed966b2a43abb8968c5 (patch)
tree087eba688b19f6421232ef1deaf731b714fb2f41 /app-admin/sudo/files
parentVersion bump, bug #324961 thank Dustin Polke for this job. (diff)
downloadhistorical-031a0c740edf6f179aa3eed966b2a43abb8968c5.tar.gz
historical-031a0c740edf6f179aa3eed966b2a43abb8968c5.tar.bz2
historical-031a0c740edf6f179aa3eed966b2a43abb8968c5.zip
Version bump to rc2 for both 1.8.1 and 1.7.6; move plugins for 1.8 to /usr/lib/sudo; don't install sample plugins; filter gnat-gcc paths from secure_path as it's done for gcc already.
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'app-admin/sudo/files')
-rw-r--r--app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch15
-rw-r--r--app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch24
2 files changed, 24 insertions, 15 deletions
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch b/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch
deleted file mode 100644
index e0ac730b2d56..000000000000
--- a/app-admin/sudo/files/sudo-1.8.1_rc1-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: sudo-1.8.1rc1/plugins/sudoers/Makefile.in
-===================================================================
---- sudo-1.8.1rc1.orig/plugins/sudoers/Makefile.in
-+++ sudo-1.8.1rc1/plugins/sudoers/Makefile.in
-@@ -55,8 +55,8 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir)
- CFLAGS = @CFLAGS@
-
- # Flags to pass to the link stage
--LDFLAGS =
--SUDOERS_LDFLAGS = @SUDOERS_LDFLAGS@
-+LDFLAGS = @LDFLAGS@
-+SUDOERS_LDFLAGS = $(LDFLAGS) @SUDOERS_LDFLAGS@
-
- # Where to install things...
- prefix = @prefix@
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch b/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch
new file mode 100644
index 000000000000..9fa2e0dd22f8
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.8.1_rc2-plugindir.patch
@@ -0,0 +1,24 @@
+Index: sudo-1.8.1rc2/configure.in
+===================================================================
+--- sudo-1.8.1rc2.orig/configure.in
++++ sudo-1.8.1rc2/configure.in
+@@ -1099,13 +1099,14 @@ AC_ARG_WITH(askpass, [AS_HELP_STRING([--
+ ;;
+ esac], AC_MSG_RESULT(no))
+
+-with_plugindir="$libexecdir"
+-AC_ARG_WITH(plugin_dir, [AS_HELP_STRING([--with-plugin_dir], [set directory to load plugins from])],
+-[case $with_plugin_dir in
++AC_ARG_WITH(plugindir, [AS_HELP_STRING([--with-plugin_dir], [set directory to load plugins from])],
++[case $withval in
+ no) AC_MSG_ERROR(["illegal argument: --without-plugin_dir."])
+ ;;
+- *) ;;
+-esac])
++ *) with_plugindir=$withval;;
++esac],
++[with_plugindir="$libexecdir"
++])
+
+ dnl
+ dnl Options for --enable