Re-digest the re-rolled rc2, drop patches merged (or replaced).

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 6 insertions, 89 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index aac78acac769..c74a5dc2cb8e 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.263 2011/04/06 14:41:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.264 2011/04/06 15:50:27 flameeyes Exp $
+
+  06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> sudo-1.8.1_rc2.ebuild,
+  -files/sudo-1.8.1_rc1-recursion.patch, -files/sudo-1.8.1_rc1-skey.patch:
+  Re-digest the re-rolled rc2, drop patches merged (or replaced).
 
   06 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/sudo-CVE-2010-2956.patch:
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc1-recursion.patch b/app-admin/sudo/files/sudo-1.8.1_rc1-recursion.patch
deleted file mode 100644
index d01e08d2d44c..000000000000
--- a/app-admin/sudo/files/sudo-1.8.1_rc1-recursion.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: sudo-1.8.1rc1/Makefile.in
-===================================================================
---- sudo-1.8.1rc1.orig/Makefile.in
-+++ sudo-1.8.1rc1/Makefile.in
-@@ -51,20 +51,17 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
- 
- SHELL = @SHELL@
- 
--all: config.status
--	for d in $(SUBDIRS) $(SAMPLES); do (cd $$d && $(MAKE) $@) || break; done
--
--check: config.status
--	for d in $(SUBDIRS) $(SAMPLES); do (cd $$d && $(MAKE) $@) || break; done
-+all check: config.status
-+	for d in $(SUBDIRS) $(SAMPLES); do $(MAKE) -C $$d $@ && continue; exit 1; done
- 
- pre-install:
--	for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done
-+	for d in $(SUBDIRS) $(SAMPLES); do $(MAKE) -C $$d $@ && continue; exit 1; done
- 
- install-dirs install-binaries install-includes install-plugin uninstall: config.status pre-install
--	for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done
-+	for d in $(SUBDIRS) $(SAMPLES); do $(MAKE) -C $$d $@ && continue; exit 1; done
- 
- install install-doc: config.status ChangeLog pre-install
--	for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done
-+	for d in $(SUBDIRS) $(SAMPLES); do $(MAKE) -C $$d $@ && continue; exit 1; done
- 
- autoconf:
- 	autoconf -I m4
diff --git a/app-admin/sudo/files/sudo-1.8.1_rc1-skey.patch b/app-admin/sudo/files/sudo-1.8.1_rc1-skey.patch
deleted file mode 100644
index 7ea6f8213c78..000000000000
--- a/app-admin/sudo/files/sudo-1.8.1_rc1-skey.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: sudo-1.8.1rc1/configure.in
-===================================================================
---- sudo-1.8.1rc1.orig/configure.in
-+++ sudo-1.8.1rc1/configure.in
-@@ -2590,13 +2590,15 @@ if test "$with_skey" = "yes"; then
- 	CPPFLAGS="${CPPFLAGS} -I${with_skey}/include"
- 	SUDO_APPEND_LIBPATH(LDFLAGS, [${with_skey}/lib])
- 	SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [${with_skey}/lib])
--	AC_PREPROC_IFELSE([#include <skey.h>], [found=yes], [found=no])
-+        AC_CHECK_HEADER([skey.h], [found=yes], [found=no],
-+          [#include <stdio.h>]) 
-     else
- 	found=no
- 	O_CPPFLAGS="$CPPFLAGS"
- 	for dir in "" "/usr/local" "/usr/contrib"; do
- 	    test -n "$dir" && CPPFLAGS="$O_CPPFLAGS -I${dir}/include"
--	    AC_PREPROC_IFELSE([#include <skey.h>], [found=yes; break])
-+            AC_CHECK_HEADER([skey.h], [found=yes; break], ,
-+              [#include <stdio.h>]) 
- 	done
- 	if test "$found" = "no" -o -z "$dir"; then
- 	    CPPFLAGS="$O_CPPFLAGS"
-@@ -2610,6 +2612,19 @@ if test "$with_skey" = "yes"; then
-     fi
-     AC_CHECK_LIB(skey, main, [found=yes], [AC_MSG_WARN([Unable to locate libskey.a, you will have to edit the Makefile and add -L/path/to/skey/lib to SUDOERS_LDFLAGS])])
-     AC_CHECK_LIB(skey, skeyaccess, AC_DEFINE(HAVE_SKEYACCESS))
-+
-+    AC_MSG_CHECKING([for RFC1938-compliant skeychallenge()])
-+    AC_COMPILE_IFELSE(
-+      [AC_LANG_PROGRAM(
-+         [#include <stdio.h>
-+          #include <skey.h>],
-+         [int main() { skeychallenge(NULL, NULL, NULL, 0); }]
-+       )],
-+      [AC_DEFINE([HAVE_RFC1938_SKEYCHALLENGE], [1], [Have 4-arguments RFC1938-compliant skeychallenge() function])
-+       AC_MSG_RESULT([yes])],
-+      [AC_MSG_RESULT([no])]
-+    )
-+
-     LDFLAGS="$O_LDFLAGS"
-     SUDOERS_LIBS="${SUDOERS_LIBS} -lskey"
-     AUTH_OBJS="$AUTH_OBJS rfc1938.lo"
-Index: sudo-1.8.1rc1/plugins/sudoers/auth/rfc1938.c
-===================================================================
---- sudo-1.8.1rc1.orig/plugins/sudoers/auth/rfc1938.c
-+++ sudo-1.8.1rc1/plugins/sudoers/auth/rfc1938.c
-@@ -46,7 +46,7 @@
- #if defined(HAVE_SKEY)
- # include <skey.h>
- # define RFC1938				skey
--#  ifdef __NetBSD__
-+#  ifdef HAVE_RFC1938_SKEYCHALLENGE
- #   define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c),(d))
- #  else
- #   define rfc1938challenge(a,b,c,d)	skeychallenge((a),(b),(c))
diff --git a/app-admin/sudo/sudo-1.8.1_rc2.ebuild b/app-admin/sudo/sudo-1.8.1_rc2.ebuild
index dfa0492d119d..e18c80e49ebb 100644
--- a/app-admin/sudo/sudo-1.8.1_rc2.ebuild
+++ b/app-admin/sudo/sudo-1.8.1_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_rc2.ebuild,v 1.1 2011/04/06 14:18:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.1_rc2.ebuild,v 1.2 2011/04/06 15:50:27 flameeyes Exp $
 
 EAPI=4
 
@@ -56,8 +56,6 @@ MAKEOPTS="${MAKEOPTS} SAMPLES="
 
 src_prepare() {
 	epatch\
-		"${FILESDIR}"/${PN}-1.8.1_rc1-recursion.patch \
-		"${FILESDIR}"/${PN}-1.8.1_rc1-skey.patch \
 		"${FILESDIR}"/${PN}-1.8.1_rc2-plugindir.patch
 
 	export AT_M4DIR="m4"