Remove stale patches. Spotted by nigoro, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/42.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

6 files changed, 8 insertions, 223 deletions

diff --git a/sys-auth/openpam/ChangeLog b/sys-auth/openpam/ChangeLog
index 9d01f9ab6cfe..eb3ed3f0de32 100644
--- a/sys-auth/openpam/ChangeLog
+++ b/sys-auth/openpam/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/openpam
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.27 2015/02/22 10:03:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.28 2015/02/22 14:17:31 mgorny Exp $
+
+  22 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  -files/openpam-20050201-nbsd.patch, -files/openpam-20050616-optional.patch,
+  -files/openpam-20050616-redef.patch, -files/openpam-20071221-gentoo.patch,
+  -files/openpam-20111218-nomajor.patch:
+  Remove stale patches. Spotted by nigoro, https://github.com/gentoo/gentoo-
+  portage-rsync-mirror/pull/42.
 
 *openpam-20140912 (22 Feb 2015)
 
diff --git a/sys-auth/openpam/files/openpam-20050201-nbsd.patch b/sys-auth/openpam/files/openpam-20050201-nbsd.patch
deleted file mode 100644
index bc797db8d065..000000000000
--- a/sys-auth/openpam/files/openpam-20050201-nbsd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- openpam-20050201.orig/lib/pam_debug_log.c	2006-02-18 01:15:39.000000000 -0200
-+++ openpam-20050201/lib/pam_debug_log.c	2006-02-18 01:16:30.000000000 -0200
-@@ -47,7 +47,8 @@
-     const char *file, const char *function, const char *format, ...)
- {
- 	va_list ap;
--	char *fmtbuf, *modname, *period;
-+	char *fmtbuf;
-+	const char *modname, *period;
- 
- 	if (!(flags & PAM_SILENT) && !openpam_get_option(pamh, "no_warn")) {
- 		modname = basename(file);
diff --git a/sys-auth/openpam/files/openpam-20050616-optional.patch b/sys-auth/openpam/files/openpam-20050616-optional.patch
deleted file mode 100644
index 8610cdf0efe6..000000000000
--- a/sys-auth/openpam/files/openpam-20050616-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur openpam-20050616.orig/lib/openpam_configure.c openpam-20050616/lib/openpam_configure.c
---- openpam-20050616.orig/lib/openpam_configure.c	2005-06-15 23:00:00 +0100
-+++ openpam-20050616/lib/openpam_configure.c	2007-02-06 14:55:20 +0000
-@@ -220,8 +220,14 @@
- 			goto syserr;
- 		this->module = openpam_load_module(name);
- 		FREE(name);
--		if (this->module == NULL)
-+		if (this->module == NULL) {
-+			if (this->flag == PAM_OPTIONAL ||
-+			    this->flag == PAM_SUFFICIENT) {
-+				free(this);
-+				continue;
-+			}
- 			goto fail;
-+		}
- 
- 		/* module options */
- 		p = q = next_word(p);
-@@ -249,7 +255,7 @@
- 		/* next please... */
- 		FREE(line);
- 	}
--	if (!feof(f))
-+	if (!feof(f) || count == 0)
- 		goto syserr;
- 	fclose(f);
- 	return (count);
diff --git a/sys-auth/openpam/files/openpam-20050616-redef.patch b/sys-auth/openpam/files/openpam-20050616-redef.patch
deleted file mode 100644
index d19bab7a6494..000000000000
--- a/sys-auth/openpam/files/openpam-20050616-redef.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openpam-20050616/lib/Makefile.am
-===================================================================
---- openpam-20050616.orig/lib/Makefile.am
-+++ openpam-20050616/lib/Makefile.am
-@@ -50,8 +50,6 @@ libpam_la_SOURCES = \
- 	pam_vprompt.c \
- 	$(NULL)
- 
--libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@/"'
--
- libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@ @DL_LIBS@
- 
- # Not implemented yet:
diff --git a/sys-auth/openpam/files/openpam-20071221-gentoo.patch b/sys-auth/openpam/files/openpam-20071221-gentoo.patch
deleted file mode 100644
index 4c0e152939b8..000000000000
--- a/sys-auth/openpam/files/openpam-20071221-gentoo.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -Nur openpam-20050201/include/security/Makefile.am openpam-20050201-gentoo/include/security/Makefile.am
---- openpam-20050201/include/security/Makefile.am	2005-02-01 00:00:00.000000000 +0100
-+++ openpam-20050201-gentoo/include/security/Makefile.am	2005-06-11 12:48:19.038207056 +0200
-@@ -6,4 +6,5 @@
- 	pam_appl.h \
- 	pam_constants.h \
- 	pam_modules.h \
--	pam_types.h
-+	pam_types.h \
-+	pam_mod_misc.h
-diff -Nur openpam-20050201/include/security/pam_mod_misc.h openpam-20050201-gentoo/include/security/pam_mod_misc.h
---- openpam-20050201/include/security/pam_mod_misc.h	1970-01-01 01:00:00.000000000 +0100
-+++ openpam-20050201-gentoo/include/security/pam_mod_misc.h	2005-06-11 12:48:19.038207056 +0200
-@@ -0,0 +1,56 @@
-+/*-
-+ * Copyright 1998 Juniper Networks, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ *	$FreeBSD: src/lib/libpam/libpam/security/pam_mod_misc.h,v 1.12 2003/05/31 16:56:35 des Exp $
-+ */
-+
-+#ifndef PAM_MOD_MISC_H
-+#define PAM_MOD_MISC_H
-+
-+#include <sys/cdefs.h>
-+
-+/*
-+ * Common option names
-+ */
-+#define	PAM_OPT_NULLOK		"nullok"
-+#define PAM_OPT_AUTH_AS_SELF	"auth_as_self"
-+#define PAM_OPT_ECHO_PASS	"echo_pass"
-+#define PAM_OPT_DEBUG		"debug"
-+
-+__BEGIN_DECLS
-+void	_pam_verbose_error(pam_handle_t *, int, const char *,
-+		const char *, const char *, ...);
-+__END_DECLS
-+
-+#define	PAM_LOG(...) \
-+	openpam_log(PAM_LOG_DEBUG, __VA_ARGS__)
-+
-+#define PAM_RETURN(arg) \
-+	return (arg)
-+
-+#define PAM_VERBOSE_ERROR(...) \
-+	_pam_verbose_error(pamh, flags, __FILE__, __FUNCTION__, __VA_ARGS__)
-+
-+#endif
-diff -Nur openpam-20050201/lib/Makefile.am openpam-20050201-gentoo/lib/Makefile.am
---- openpam-20050201/lib/Makefile.am	2005-02-01 00:00:00.000000000 +0100
-+++ openpam-20050201-gentoo/lib/Makefile.am	2005-06-11 12:48:19.038207056 +0200
-@@ -46,6 +46,7 @@
- 	pam_verror.c \
- 	pam_vinfo.c \
- 	pam_vprompt.c \
-+	pam_debug_log.c \
- 	$(NULL)
- 
- libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@ @DL_LIBS@
-diff -Nur openpam-20050201/lib/openpam_dynamic.c openpam-20050201-gentoo/lib/openpam_dynamic.c
-diff -Nur openpam-20050201/lib/pam_debug_log.c openpam-20050201-gentoo/lib/pam_debug_log.c
---- openpam-20050201/lib/pam_debug_log.c	1970-01-01 01:00:00.000000000 +0100
-+++ openpam-20050201-gentoo/lib/pam_debug_log.c	2005-06-11 12:55:17.688562528 +0200
-@@ -0,0 +1,64 @@
-+/*-
-+ * Copyright 2001 Mark R V Murray
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#include <sys/cdefs.h>
-+
-+#ifndef __GLIBC__
-+#include <libgen.h>
-+#endif
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <security/pam_appl.h>
-+#include <security/openpam.h>
-+#include <security/pam_mod_misc.h>
-+
-+/* Print a verbose error, including the function name and a
-+ * cleaned up filename.
-+ */
-+void
-+_pam_verbose_error(pam_handle_t *pamh, int flags,
-+    const char *file, const char *function, const char *format, ...)
-+{
-+	va_list ap;
-+	char *fmtbuf, *modname, *period;
-+
-+	if (!(flags & PAM_SILENT) && !openpam_get_option(pamh, "no_warn")) {
-+		modname = basename(file);
-+		period = strchr(modname, '.');
-+		if (period == NULL)
-+			period = strchr(modname, '\0');
-+		va_start(ap, format);
-+		asprintf(&fmtbuf, "%.*s: %s: %s\n", (int)(period - modname),
-+		    modname, function, format);
-+		pam_verror(pamh, fmtbuf, ap);
-+		free(fmtbuf);
-+		va_end(ap);
-+	}
-+}
diff --git a/sys-auth/openpam/files/openpam-20111218-nomajor.patch b/sys-auth/openpam/files/openpam-20111218-nomajor.patch
deleted file mode 100644
index 6f67b9a02fef..000000000000
--- a/sys-auth/openpam/files/openpam-20111218-nomajor.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Check only for the .so: it spits out 'No such file or directory' warnings if the .so.MAJOR isnt found and tries the .so anyway, so this avoids the warnings.
-
---- lib/openpam_dynamic.c.old	2012-04-21 17:03:28.000000000 +0000
-+++ lib/openpam_dynamic.c	2012-04-21 17:05:11.000000000 +0000
-@@ -94,12 +94,9 @@
- 		prefix = "";
- 
- 	/* try versioned module first, then unversioned module */
--	if (asprintf(&vpath, "%s%s.%d", prefix, path, LIB_MAJ) < 0)
-+	if (asprintf(&vpath, "%s%s", prefix, path) < 0)
- 		goto err;
--	if ((dlh = try_dlopen(vpath)) == NULL && errno == ENOENT) {
--		*strrchr(vpath, '.') = '\0';
--		dlh = try_dlopen(vpath);
--	}
-+	dlh = try_dlopen(vpath);
- 	serrno = errno;
- 	FREE(vpath);
- 	errno = serrno;