Cleanup, use a single patch rather than a patches tarball (patches are split in GitHub), simplify checks and hide symbols that are not part of the PAM interface.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 229 insertions, 12 deletions

diff --git a/sys-auth/pam_dotfile/ChangeLog b/sys-auth/pam_dotfile/ChangeLog
index 2af2b78ee19f..a68e71bfd35d 100644
--- a/sys-auth/pam_dotfile/ChangeLog
+++ b/sys-auth/pam_dotfile/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/pam_dotfile
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_dotfile/ChangeLog,v 1.10 2008/05/16 08:55:52 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_dotfile/ChangeLog,v 1.11 2013/02/24 00:00:50 flameeyes Exp $
+
+*pam_dotfile-0.7-r2 (24 Feb 2013)
+
+  24 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/pam_dotfile-0.7-gentoo.patch, +pam_dotfile-0.7-r2.ebuild:
+  Cleanup, use a single patch rather than a patches tarball (patches are split
+  in GitHub), simplify checks and hide symbols that are not part of the PAM
+  interface.
 
   16 May 2008; Diego Pettenò <flameeyes@gentoo.org>
   -pam_dotfile-0.7.ebuild:
diff --git a/sys-auth/pam_dotfile/Manifest b/sys-auth/pam_dotfile/Manifest
index 9b204e241815..4da95607c2e9 100644
--- a/sys-auth/pam_dotfile/Manifest
+++ b/sys-auth/pam_dotfile/Manifest
@@ -1,15 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST pam_dotfile-0.7.tar.gz 229009 RMD160 a75bd58304ea4acc66630d8c04def859693c1380 SHA1 12ef5512628e1131f36da388ab0b31b43b0cd9b8 SHA256 88e99da6aaecec19ea294eb10bcb432f1ce506d1ca53d416ea74bb165a3a4534
-DIST pam_dotfile-patches-1.tar.bz2 2172 RMD160 d78f9b9e6ed200483137ddbb0e4ce89d74c805e9 SHA1 30cc16245e981954432cc5d0e9cfadb124dfc1c3 SHA256 fa78ddf1bc2c4938925a8bb71be2705d8a38904c1693b0bbb9f2f3c5f4e8dc5b
-EBUILD pam_dotfile-0.7-r1.ebuild 1331 RMD160 8871bdd794a3585fb14ec8a09ae1618293315f3e SHA1 586fa264859c1e5e55a0cb7779f5bf9945606944 SHA256 cd936aac33a61a2f4747974365696505d25b3a4fb17264158f843b5d7c340ea2
-MISC ChangeLog 2593 RMD160 a890002c982f633854306d6ad8dbceb53adfc4f6 SHA1 f5ebca80090ba17ce70b4d18f297d0dba7f92b1b SHA256 903189d8b993ac0e449a45d0e7971d1195628770d42c0931f26c3eea5cae10ec
-MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
+AUX pam_dotfile-0.7-gentoo.patch 3789 SHA256 bce873f2e4a37e151aeb234ddb8f43f18fdeddca13f074e378b3a75dd30f3eb5 SHA512 83501f36f044cc24c2437112444e1280866e2c78f4f2823cd2b4ec2883fd6bff81fb23c7108bc773e50d1dbf97ac307df09245984cdf4fd068f314ad4bc57771 WHIRLPOOL a2701cebbe14206714f85cc0ee551d8f19159257c1a7d9c6ad3092475db4edbab86f7c164b46bcf7c68961dce9497f92506954465ba2e1c98716e53cff4e9bd0
+DIST pam_dotfile-0.7.tar.gz 229009 SHA256 88e99da6aaecec19ea294eb10bcb432f1ce506d1ca53d416ea74bb165a3a4534 SHA512 544160068af2c6a488271d36cfae43340d4d7801702aef629ba781dff12b99334bc76ec14396783d0a9823d0f976c847335fe8b1b07cbbb6e43d0bd658ff7500 WHIRLPOOL 528f41b15955d196d1be39a58d014e094d34dd57ed2681c22618407f34a849bd26cf07b3450c78dbd850b2d8b1d8700520c61f8299d5a17bee81b6c43bfd0030
+DIST pam_dotfile-patches-1.tar.bz2 2172 SHA256 fa78ddf1bc2c4938925a8bb71be2705d8a38904c1693b0bbb9f2f3c5f4e8dc5b SHA512 a6b29361e089f7223c3f915320a921b5f20603a16673d518300ea458a816360950a76a4f8e1842040f7b0e676d4c67c6de2586640c2bb4638a4e63138b78600a WHIRLPOOL 1fc23a8169d3cd020aae43f59f6fa2866553e61cc7e26a60c7ea5b091fd66b13c1a8f0e05525b92a5a5ab590263d3d10d82faec97e5f3a4fbdba4a927755f130
+EBUILD pam_dotfile-0.7-r1.ebuild 1331 SHA256 cd936aac33a61a2f4747974365696505d25b3a4fb17264158f843b5d7c340ea2 SHA512 94a1763964dfa15910a71cb97804d10e3f37bdab2da49cc6ffcf285922ccbc2d6aa1c58e4e134ba8dddb104bb64f4490f545b7402b1a3d9edd99c1221f6cd0de WHIRLPOOL 7bcc21fc121c19c173ffbe0171e837df021d8a763d6e849172b0fecdbecd4c7df32a65a9fde8f9266aed1fb5901663d843284ac5c545b880db86e218ffcfdffc
+EBUILD pam_dotfile-0.7-r2.ebuild 1054 SHA256 fc99922189575134db71227d3944474b1d25846089558fcf6d8eb58c8e8b9775 SHA512 14998b6359b284bc9375e2bba5f7d4a1752e62fdda93aa8e10110a2bbf2b9412f6f67af81a4dfded2531437ee8bf49a06a6f9214e8c33bb0076956185e0830bf WHIRLPOOL d1f535563a1ac19e224d3de86eccae3ceb60e7b96ca6a2b3d1d73ef20986fd282d53084915db2c5ae27b48abc38cc4d8fceb2bcb901804d3678b39fdc296590a
+MISC ChangeLog 2920 SHA256 c531bdce60b3578a17326ab8bbf1c73344b8527da95666f5f906f2cd9746ca9c SHA512 0c6cf66166f537d2cc0956891d144bedfe35ab5bd5de50faaaba7903d3c1890f1c8b86defc285df6644f3b2cef848b4fa17ca5e69216083f3ea0fa7e2ab96d07 WHIRLPOOL 50758543a004c29464a4dceaf2959d44eacc9889b073ff405c2447db5f107d4ae404f5b8c3ce506a501d9bd9f0479e065906e007fc014a710698f9ebee6d039f
+MISC metadata.xml 218 SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c SHA512 217b7a849b37939cd09e4c77087093c10439761e69e3e9cfee77001823b8ea85f1c721608ac4c6974cbd6d0760b9e442d36ae7fde3a474bb122ff056eee74e56 WHIRLPOOL 34d3c42dec82504735c729dcf8c6e64893772272b8f45c2822837e2583c3b3cdf0b45f05e95afb6e20fa808bb3009f23d100875af3164043ef00801732df93b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkgtTB0ACgkQAiZjviIA2XirgwCgvHrwVsVUQlki9OC//pHq1xqI
-UtkAoMb6XUeXl5CI87dcMapD2bFSYtIH
-=XyU6
+iQEcBAEBCAAGBQJRKVh2AAoJEBzRPIrUMBNCDqcH/2vIFIIJyqk0+blCKwU/IYIw
+W28c2PTR0wMRLC1nS+gFe6pUIcqUvFduJMYPlQWZUdInMJIhaCU1jgcdPI4quFY3
+QU6JmvXESeYL8Hd2pG/YmFFTGvbNkbf+SpfwWpYRFRHHMmx+M/ORmYAM+FAlr8pX
+2ncjnYCNROYDOVPhrRXBUJvYahc8EHQdxgj5E6Rv+NSzUrkIhUc4h0ar+2xjz4rR
+ToWCDgsDH1I+MVSzATVsLMLCSUaDqtSIXtsu2QSEyHLgHQuEbfsLEm7bmrQ/uCSB
+oWRnMaxTGdjq/QoYJQAOfJ9NxKIVi57ZTOKZdfJq982HNO40dx8CW4UNb4GDlAw=
+=UFSs
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_dotfile/files/pam_dotfile-0.7-gentoo.patch b/sys-auth/pam_dotfile/files/pam_dotfile-0.7-gentoo.patch
new file mode 100644
index 000000000000..023f86553c39
--- /dev/null
+++ b/sys-auth/pam_dotfile/files/pam_dotfile-0.7-gentoo.patch
@@ -0,0 +1,157 @@
+diff --git a/configure.ac b/configure.ac
+index 4730bdf..b8d8747 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,16 +44,26 @@ CFLAGS="$CFLAGS -L/lib"
+ # Checks for libraries.
+ AC_CHECK_HEADER([security/pam_modules.h],, [AC_MSG_ERROR([*** Sorry, you have to install the PAM development files ***])])
+ 
+-LIBS="$LIBS -ldl -lpam -lpam_misc"
+-
+-case "$host" in
+-  *-*-linux*)
+-    PAM_MODDIR="/lib/security"
+-    ;;
+-  *)
+-    PAM_MODDIR="/usr/lib"
+-    ;;
+-esac
++AC_CHECK_HEADERS([security/_pam_macros.h security/pam_misc.h security/openpam.h])
++
++AC_CHECK_LIB([pam], [pam_start])
++AC_CHECK_LIB([pam_misc], [misc_conv])
++
++AC_ARG_WITH([pammoddir],
++	AC_HELP_STRING([--with-pammoddir], [Install module in specified directory]),
++	[
++		PAM_MODDIR=$withval
++	], [
++		case "$host" in
++			*-*-linux*)
++				PAM_MODDIR="/lib/security"
++				;;
++			*)
++				PAM_MODDIR="/usr/lib"
++				;;
++		esac
++	])
++
+ AC_SUBST(PAM_MODDIR)
+ 
+ # Checks for header files.
+@@ -64,7 +74,7 @@ AC_FUNC_LSTAT
+ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+ AC_FUNC_VPRINTF
+ 
+-AC_CHECK_HEADERS([fcntl.h limits.h syslog.h termios.h])
++AC_CHECK_HEADERS([fcntl.h limits.h syslog.h termios.h sys/types.h])
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2905b7c..e7e47d2 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,7 +22,7 @@ moduledir = @PAM_MODDIR@
+ module_LTLIBRARIES = pam_dotfile.la
+ 
+ pam_dotfile_la_SOURCES = pam_dotfile.c md5.c md5util.c md5.h md5util.h log.c log.h common.c common.h
+-pam_dotfile_la_LDFLAGS = -module -avoid-version
++pam_dotfile_la_LDFLAGS = -module -avoid-version -export-symbols-regex '^pam_'
+ pam_dotfile_la_CFLAGS = $(AM_CFLAGS)
+ 
+ sbin_PROGRAMS = pam-dotfile-helper
+diff --git a/src/common.h b/src/common.h
+index ef34cf3..6a57116 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -21,7 +21,10 @@
+ ***/
+ 
+ #include <security/pam_modules.h>
+-#include <security/_pam_macros.h>
++#include <security/pam_appl.h>
++#ifdef HAVE_SECURITY__PAM_MACROS_H
++#  include <security/_pam_macros.h>
++#endif
+ 
+ typedef struct context {
+     int opt_debug;
+diff --git a/src/pam-dotfile-helper.c b/src/pam-dotfile-helper.c
+index 04c73de..1c09b18 100644
+--- a/src/pam-dotfile-helper.c
++++ b/src/pam-dotfile-helper.c
+@@ -23,6 +23,14 @@
+ #include <signal.h>
+ #include <pwd.h>
+ 
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
++#ifdef HAVE_SYS_TYPES_H
++#  include <sys/types.h>
++#endif
++
+ #include "common.h"
+ #include "log.h"
+ 
+diff --git a/src/pam_dotfile.c b/src/pam_dotfile.c
+index 405f494..183aafd 100644
+--- a/src/pam_dotfile.c
++++ b/src/pam_dotfile.c
+@@ -29,11 +29,19 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+ 
+ #define PAM_SM_AUTH
+ 
+ #include <security/pam_modules.h>
+-#include <security/_pam_macros.h>
++#include <security/pam_appl.h>
++#ifdef HAVE_SECURITY__PAM_MACROS_H
++#  include <security/_pam_macros.h>
++#endif
++
++#ifndef x_strdup
++#  define x_strdup(s)  ( (s) ? strdup(s):NULL )
++#endif
+ 
+ #include "md5.h"
+ #include "md5util.h"
+diff --git a/src/pamtest.c b/src/pamtest.c
+index 171e601..6583de1 100644
+--- a/src/pamtest.c
++++ b/src/pamtest.c
+@@ -19,11 +19,28 @@
+ 
+ #include <stdio.h>
+ 
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <security/pam_appl.h>
+-#include <security/pam_misc.h>
++
++#ifdef HAVE_SECURITY_PAM_MISC_H
++#  include <security/pam_misc.h>
++#endif
++
++#ifdef HAVE_SECURITY_OPENPAM_H
++#  include <security/openpam.h>
++#endif
+ 
+ int main(int argc, char*argv[]) {
++#ifdef HAVE_LIBPAM_MISC
+     static struct pam_conv pc = { misc_conv, NULL };
++#elif defined(_OPENPAM)
++    static struct pam_conv pc = { openpam_nullconv, NULL };
++#else
++    static struct pam_conv pc = { NULL };
++#endif
+     pam_handle_t *ph = NULL;
+     int r, ret;
+     char *username, *procname, *service;
diff --git a/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild b/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild
new file mode 100644
index 000000000000..ad33dc668c8a
--- /dev/null
+++ b/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild,v 1.1 2013/02/24 00:00:50 flameeyes Exp $
+
+EAPI=5
+
+inherit eutils pam autotools autotools-utils
+
+MY_P="${P/_beta/beta}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="pam module to allow password-storing in \$HOME/dotfiles"
+HOMEPAGE="http://0pointer.de/lennart/projects/pam_dotfile/
+	https://github.com/gentoo/pam_dotfile/"
+SRC_URI="http://0pointer.de/lennart/projects/pam_dotfile/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/pam"
+DEPEND="${RDEPEND}
+	doc? ( www-client/lynx )"
+
+HTML_DOCS="doc"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc lynx)
+		--with-pammoddir=$(getpam_mod_dir)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# kill the libtool archives
+	rm -rf "${D}"/$(getpam_mod_dir)/*.la
+}