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

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

7 files changed, 23 insertions, 243 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/Manifest b/sys-auth/openpam/Manifest
index 1b3c1e8c57d4..ce75463af17b 100644
--- a/sys-auth/openpam/Manifest
+++ b/sys-auth/openpam/Manifest
@@ -1,34 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX openpam-20050201-nbsd.patch 449 SHA256 5ca47d57dc688dfddb24107026f049f70e520d62acde34b6a395b99b8be90d02 SHA512 7921a8b4db381b5d8a2c6cbae04ad3efc8606d0e7e48af87f1ced4648913d0863bc75b277ad667fd15e332414e49b78ccf9817e1949c4f3fab8325e8925f93f6 WHIRLPOOL e0b58a4e8673ae8c37bfe1ad8560e854221edb4070712f31b43de0a56f054c9ef35d6205f398fe1ca62af0c2ca087ad42490004f5306aa5142625c59c45e95fd
-AUX openpam-20050616-optional.patch 744 SHA256 aa360df90347ee520a063ede6befdf7b4e56360243ed319708f2852587e8dfdb SHA512 732b80bf3c9e7fb7940cf9c45cc9378701eee2c631eaa752895698aaa6c4047b9ecba5761fee81ba373c15789d11b5997ec2216de869af25908d154dd38ffce2 WHIRLPOOL 110cd315ed253bff56532d89b9f81f0dfbc9c154e3204fd3004ac311ca16292963d182a5cd12b56a3d742c8f6672f5e687dcd7d06b09399c7436e7797d9f6870
-AUX openpam-20050616-redef.patch 423 SHA256 b5db305b4d80fe538b3d6b46dabc8975c50c3937eca73e6ca480a8f48327786c SHA512 ac8e5b485d0a075991dd8d2c07968331d0843038b461d3cb02ebcbe257d8f86bfb35f71172e56181fb9f7a49c881cf502748c3a6fd2508a0e8f13e5b394dd0b9 WHIRLPOOL 5a89bfcb57804b1d81d7beed034e8de0859c7d9221a1fd888f6ed39dae32e705fe0fe55828084ccb0da248c7129856a4b740a2839e9dbd4980d44659ab133d53
-AUX openpam-20071221-gentoo.patch 5897 SHA256 71eac5df9bd81696f850503b37ac53effb329e4420bda6167bb72634191a24ba SHA512 b68c2fbdc4c833d415aa1108c6df0c6605903736a031a71f8785a595579a6b6ed9b66e3bbbb2c4bcdfe138e85984d5c02bf9ec1de08b9037e2efeb21a494fb83 WHIRLPOOL 4d7f5992ae2b84199ac815392dedcc841b1a4729e6c00b3026bb416abfdf58ef7e735225512344c7bfe2aad6aae88ccd9136bc0617e6b6fcb7d6a1a6ee059fc9
-AUX openpam-20111218-nomajor.patch 712 SHA256 de1539205877e91cd8d119b22ffb8e46f9744a4bc4cf35b53d581ea936a4f7a7 SHA512 3a4bb646d018584ce78c6c40df1eff6e4c6fe7f9d1303abeb76d5ea337ea95e430089d49540e2ecdb2e7746f3ea7e4e147855be18c4087b46ab1206fcd57eaa0 WHIRLPOOL a6a28b38c9eaf556946eb10a9cdc6071442ebd99d84d571e4aae6a22cc611acde134ec6845b09d0307ded4c640a671cc5b06d09921cd2b878d48216dbc23b3d3
 AUX openpam-20130907-gentoo.patch 5832 SHA256 7c7becc8ae5a8c3d37a5cb6ba420bb850c48b92de6b23721be5e951dc5293aef SHA512 f4e8baefaa2113f6e864eebf6e9c596b229a06ea4038c4cf6f9ba96fd8347df7a7cbff691d54da0710b35440a766f0f2d411ccf19f66201508c227f6a4238cef WHIRLPOOL 514445abe383e9d5ee04da4613b222e6a6d61f986948e2d7175cb65c12b9ec26e11a27fcf34349ceabc70f25c72f716135d002e77d053b2068cb9dacea1ab204
 AUX openpam-20130907-module-dir.patch 507 SHA256 32349f486dfd908deeea8f1178aeb45a483954032078d51fd852ce9eae1a3a9c SHA512 724af899dddc1932e841aba2f0fe94c18a1d944e5da35d0ff01438ebecb59888db0dbe66f3882aaca2b56661fd7a07afa5438c009baa704fc9e4534854e5c7bb WHIRLPOOL 3cf3829cae17a671277ac836a95a76800c20f6429e76acc7fac8aa3c39887e4cdb9190de7e4e8c7fa2374a6f7fcb6dff7ed1853716d7cf63659e23916c383de7
 AUX openpam-20130907-nbsd.patch 463 SHA256 5b60353ba75668fccc42801662a851304d6536311203bfe475b4c1446a74c775 SHA512 8b9f8729830d47b47972ed3c7cbfca0c9bd5b87a245e0fb3e37594a247c89780f481ec3480285a829c1f86a90d591dc9778f6b2e2a57f718a5ec85d74a21af08 WHIRLPOOL c199c5c27ddca2998c741545ea3ffbaeaaafa7026606713f386d0294d31541539e29e97c480be0bebeb9a5f68926020056cd76446a56cea36a6dd42d4aa48f88
 DIST openpam-20140912.tar.gz 457600 SHA256 82bc29397fa68ce49742618e0affdaa9abd4341d9ffbe607f9b10cdf1242bc87 SHA512 c6cfbd669fe1b67af43a33c33bf2587e1512c27f1b96b9b38df37b81ecc4999d85e04b361b19a7265dbf271ebd3de3bd55342ee4fdbee9c68836b69714706423 WHIRLPOOL 35e066f131be15c9427ebf21c062e9274d4745f47ede2df2082135dc5eb4b568067be28f71d373d2bd5e4f93fbc6ec29ef7f0baa8a7cbc399ab679192ebd2e44
 EBUILD openpam-20140912.ebuild 1140 SHA256 b333e1057db06305388f39b71e6c2f60847d7c0fcb2a345d0fb3b67fbf4ffa0e SHA512 b68926ef9e3bc71d2050e09e485cc62b74693cbeeaa1c8d469a1e16312cd5ecfc870811dbdf28d912a60fa8d09a19dc8a5e386e201837fcf2e1611c82b6c423c WHIRLPOOL 2fcecb1763877e4b903c6d069ea6b11c7143b1d8e92f27edf162f8295b04c9cf7d414bf803a94870317671e545002fbbeca8955d01f9d23d9cbeb085dc26573a
-MISC ChangeLog 5142 SHA256 f9341a7c6c2f3fdb465f92e72bd8fdadf026de81adca21fde1d5dbb0a3369336 SHA512 e519828b23dd05f9954a9e5525bc81284bbf0478455b847e32b7a26c256b89cf741d112f343dede3765b81d873caa88fa3b6410aae65d07697382b51fc554eb3 WHIRLPOOL a3b30c59766a43a875cf2eb582cc75b381d2636a81b1fd401a97f3c3b4f85d8bbb4bd5c4232037a93f438b7da574d22be24176c7cae0f147fcd10168ffc9f280
+MISC ChangeLog 5498 SHA256 52bdd3e1b94c2bfa0b2632e1da4428a4dfa6fb84d2e5f57c95dc1b37224a4747 SHA512 40a863e4983c2a06ed0ca04c071c626341811697b4968a317dc0cd15e754b68d08fb5c8aa171f9f138a4472f63ee31863ce8eb251060d585813b65848066375f WHIRLPOOL 2e74e85d7134b563ccd5a37eb2cbba00d53625357910114dc7255ac889127c7fbaedc62eda4ea1355cb80de97e9a635e9419743afda0bf7c34c2187a6f3a6a31
 MISC metadata.xml 156 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 SHA512 aecca1f1d4eff88d6d0ebb895d3529e0ac602e488368880f4fde751dd5b8768cccb8ed9cb1bbea36fc47a5169e50afb9b40ac3f608a5a4e4838e9f3c64255714 WHIRLPOOL bea666b5dcd6e8f24c75b7331c3bcfffe66c054d5c29e21b09c1ea7232b1a3bbd564c2e294b639a8c61e6bcbe3ede92b55cbb12e5e7208dad0bc334842ba4d84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU6amCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU6eT8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO0KcQALzyHCubjR2KLbtF4zSuCd+6
-96EnMy71ZmlU9pZ3dJFLbv4qxMTstoGLmqNpifa95w/pCiwRpbubjcw1WUuLunw9
-i41Mb+zVftlIOgPBlEXkNq5HYtyZS9YSUEq77rK7QQrjjaVzCxzatj7lImTxirKl
-Y5reok7t8hDhJzdeCzh2p/h0znDy7SqlyauNQAx9TJXAWfw6UfJ3Bo+Sp9e6ZGfF
-zu40ib/nkiGLo/LmD3DzSwMQWYEqSdehZIbSmMG2BSo0a6EI13V2c5eSL7ABeMO/
-/5aX1S+gUcPzv3OBh951lUl1G9N7jVPt9JDI4EpCj70hFjL00Q5ri9Sh+htBx1fL
-ZSmAUlqyMq6/EnrspCaa0TfGqSYQcz8tnfCYLxaQ4kMNTd1VL96XLONBiPmdorTa
-u99oP5eaOHW9c1ScZnCqdQlIgdl2HUtdwe2rzGQsCoAuVvPKuQM/q/Q4tldzMmJX
-pb2c7Me9eisdYvQRBzfS3Axri/ttObnpMFg/HypKU4RSid3kwg+gSobRXz7MsJFM
-wn7ItGkzkQ0aUK4mXiuhqF4e/enKK0XfpSczl5IkYiu63v0wSpKlPQoa3sKphA8h
-pgw7MeuZCysWFzpF9x/7BO7TrhzFTRnq7/srYb74LQkLxSN+WjhiSpAckav759Li
-SZ3/ZoDTIIVB2IU+FLog
-=HkWv
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKZ8QAI3aJvGAaSCzXixfYm5KLyh5
+Cz04m4HjPZIYU9VJquAMGlyvnBjXn39zKanE1vFn/gzsGO0FyJvwp6C/d4v4qcxF
+GiIMdi8hm78cmhqt4FsoVPkak/z3m+bIaqpCu5OMUd9XDTL9y9+ItMYW0X7qcs1Q
+U09W9QfpmGsdR7Prg/uzm7ASCFXmlIJBcZURwiK6VMRO4xLHR2fq5FoTW5fRLQEO
+u4fxUyYrIdpr3n6HlodrzFDAGnRsJVKvEJFdUTiuZV4MOuwvuBqunHlAQHo2Kjw/
+5/T6OevJ8jjqFOAWKQIrznfS+NJ3q/JuLyT/ieIlpI/xqzBRYXgyGbPKlHbBh889
+1lge4TXAfcVB4Cw0qWkWjy0dDAEqCeNTXgCO1nFHtF3WtOK5A1sgrSkQ/9EuyM3U
+2ph06ImAk3fzqGnNTPCcecGSlBRcSt8RV6oHZfGSsvjv4JCTbXNtw7cGdrybuFgR
+Lna8CG5AtgESkg1xizsN4A8KO9Srf3yFP6Dekd4UYNzcQNz+qFBcWhEb0iRlZ8+I
+IuN5pI0F67xLa1CDjcpmKuPwSANHmheYtGkgSyK667qTpSsvAmBBC/kXSw0eJRLW
+b1v8bG0H4SX86c0PYprAYh2IV2qFGa/UMYmytWAbWoM0Eq9j+HsLaKN7ebS8nu2x
+JUFgucST5dVI9lbMkhZi
+=FLiU
 -----END PGP SIGNATURE-----
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;