diff options
| -rw-r--r-- | sys-auth/openpam/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-auth/openpam/files/openpam-20050201-gentoo.patch | 176 | ||||
| -rw-r--r-- | sys-auth/openpam/openpam-20050616-r1.ebuild | 55 | ||||
| -rw-r--r-- | sys-auth/openpam/openpam-20050616-r2.ebuild | 55 | ||||
| -rw-r--r-- | sys-auth/openpam/openpam-20050616.ebuild | 54 |
5 files changed, 7 insertions, 342 deletions
diff --git a/sys-auth/openpam/ChangeLog b/sys-auth/openpam/ChangeLog index 691857d20e77..775491cf43f1 100644 --- a/sys-auth/openpam/ChangeLog +++ b/sys-auth/openpam/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-auth/openpam -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.12 2008/06/10 19:04:34 aballier Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/ChangeLog,v 1.13 2009/01/21 22:30:26 aballier Exp $ + + 21 Jan 2009; Alexis Ballier <aballier@gentoo.org> + -files/openpam-20050201-gentoo.patch, -openpam-20050616.ebuild, + -openpam-20050616-r1.ebuild, -openpam-20050616-r2.ebuild: + remove old 10 Jun 2008; Alexis Ballier <aballier@gentoo.org> openpam-20071221.ebuild: keyword ~sparc-fbsd diff --git a/sys-auth/openpam/files/openpam-20050201-gentoo.patch b/sys-auth/openpam/files/openpam-20050201-gentoo.patch deleted file mode 100644 index 3b37c6fa2a76..000000000000 --- a/sys-auth/openpam/files/openpam-20050201-gentoo.patch +++ /dev/null @@ -1,176 +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 ---- openpam-20050201/lib/openpam_dynamic.c 2005-02-01 00:00:00.000000000 +0100 -+++ openpam-20050201-gentoo/lib/openpam_dynamic.c 2005-06-11 12:48:19.039206904 +0200 -@@ -73,8 +73,21 @@ - *strrchr(vpath, '.') = '\0'; - if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { - openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); -- FREE(module); -- return (NULL); -+ -+ /* Gentoo Code to handle /lib/security directory */ -+ FREE(vpath); -+ if ( asprintf(&vpath, "%s/%s.%d", OPENPAM_MODULES_DIR, path, LIB_MAJ) < 0 ) -+ goto buf_err; -+ if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { -+ openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); -+ *strrchr(vpath, '.') = '\0'; -+ if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { -+ openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); -+ FREE(module); -+ -+ return (NULL); -+ } -+ } - } - } - FREE(vpath); -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/openpam-20050616-r1.ebuild b/sys-auth/openpam/openpam-20050616-r1.ebuild deleted file mode 100644 index 822417b9b4e8..000000000000 --- a/sys-auth/openpam/openpam-20050616-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/openpam-20050616-r1.ebuild,v 1.1 2007/02/06 15:05:19 uberlord Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit multilib flag-o-matic autotools - -DESCRIPTION="Open source PAM library." -HOMEPAGE="http://www.openpam.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" -IUSE="debug vim-syntax" - -RDEPEND="!virtual/pam" -DEPEND="sys-devel/make - dev-lang/perl" -PDEPEND="|| ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) - vim-syntax? ( app-vim/pam-syntax )" - -PROVIDE="virtual/pam" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-20050201-gentoo.patch" - epatch "${FILESDIR}/${PN}-20050201-nbsd.patch" - epatch "${FILESDIR}/${P}-redef.patch" - epatch "${FILESDIR}/${P}-optional.patch" - - sed -i -e 's:-Werror::' "${S}/configure.ac" - - eautoreconf - elibtoolize -} - -src_compile() { - econf \ - --disable-dependency-tracking \ - --with-modules-dir=/$(get_libdir)/security \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - dodoc CREDITS HISTORY MANIFEST RELNOTES README -} diff --git a/sys-auth/openpam/openpam-20050616-r2.ebuild b/sys-auth/openpam/openpam-20050616-r2.ebuild deleted file mode 100644 index 951414f259ba..000000000000 --- a/sys-auth/openpam/openpam-20050616-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/openpam-20050616-r2.ebuild,v 1.1 2008/02/19 12:03:30 flameeyes Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit multilib flag-o-matic autotools - -DESCRIPTION="Open source PAM library." -HOMEPAGE="http://www.openpam.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="debug vim-syntax" - -RDEPEND="!virtual/pam" -DEPEND="sys-devel/make - dev-lang/perl" -PDEPEND="sys-auth/pambase - vim-syntax? ( app-vim/pam-syntax )" - -PROVIDE="virtual/pam" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-20050201-gentoo.patch" - epatch "${FILESDIR}/${PN}-20050201-nbsd.patch" - epatch "${FILESDIR}/${P}-redef.patch" - epatch "${FILESDIR}/${P}-optional.patch" - - sed -i -e 's:-Werror::' "${S}/configure.ac" - - eautoreconf - elibtoolize -} - -src_compile() { - econf \ - --disable-dependency-tracking \ - --with-modules-dir=/$(get_libdir)/security \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - dodoc CREDITS HISTORY MANIFEST RELNOTES README -} diff --git a/sys-auth/openpam/openpam-20050616.ebuild b/sys-auth/openpam/openpam-20050616.ebuild deleted file mode 100644 index b4b0f6153594..000000000000 --- a/sys-auth/openpam/openpam-20050616.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/openpam/openpam-20050616.ebuild,v 1.6 2006/10/30 09:54:57 flameeyes Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit multilib flag-o-matic autotools - -DESCRIPTION="Open source PAM library." -HOMEPAGE="http://www.openpam.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" -IUSE="debug vim-syntax" - -RDEPEND="!virtual/pam" -DEPEND="sys-devel/make - dev-lang/perl" -PDEPEND="|| ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules ) - vim-syntax? ( app-vim/pam-syntax )" - -PROVIDE="virtual/pam" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-20050201-gentoo.patch" - epatch "${FILESDIR}/${PN}-20050201-nbsd.patch" - epatch "${FILESDIR}/${P}-redef.patch" - - sed -i -e 's:-Werror::' "${S}/configure.ac" - - eautoreconf - elibtoolize -} - -src_compile() { - econf \ - --disable-dependency-tracking \ - --with-modules-dir=/$(get_libdir)/security \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - dodoc CREDITS HISTORY MANIFEST RELNOTES README -} |