summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-04-22 16:13:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-04-22 16:13:32 +0000
commit087a0b7b006bf4701cec7b48970b9f9e7b666c0a (patch)
tree45036d8b669d3e79c3189cbe811701bda2ee61eb /sys-auth
parentPrepare for new ssmtp with optional mta support (bug #289973). (diff)
downloadgentoo-2-087a0b7b006bf4701cec7b48970b9f9e7b666c0a.tar.gz
gentoo-2-087a0b7b006bf4701cec7b48970b9f9e7b666c0a.tar.bz2
gentoo-2-087a0b7b006bf4701cec7b48970b9f9e7b666c0a.zip
Backport -openpam.patch from 0.4.2.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/pam_usb/ChangeLog6
-rw-r--r--sys-auth/pam_usb/files/pam_usb-0.5.0-openpam.patch16
-rw-r--r--sys-auth/pam_usb/pam_usb-0.5.0.ebuild11
3 files changed, 28 insertions, 5 deletions
diff --git a/sys-auth/pam_usb/ChangeLog b/sys-auth/pam_usb/ChangeLog
index 1fd24b27ec95..2466479045ef 100644
--- a/sys-auth/pam_usb/ChangeLog
+++ b/sys-auth/pam_usb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-auth/pam_usb
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/ChangeLog,v 1.18 2011/04/22 16:03:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/ChangeLog,v 1.19 2011/04/22 16:13:32 ssuominen Exp $
+
+ 22 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> pam_usb-0.5.0.ebuild,
+ +files/pam_usb-0.5.0-openpam.patch:
+ Backport -openpam.patch from 0.4.2.
*pam_usb-0.5.0 (22 Apr 2011)
diff --git a/sys-auth/pam_usb/files/pam_usb-0.5.0-openpam.patch b/sys-auth/pam_usb/files/pam_usb-0.5.0-openpam.patch
new file mode 100644
index 000000000000..d5493d67a130
--- /dev/null
+++ b/sys-auth/pam_usb/files/pam_usb-0.5.0-openpam.patch
@@ -0,0 +1,16 @@
+--- src/pam.c
++++ src/pam.c
+@@ -16,8 +16,12 @@
+ */
+
+ #define PAM_SM_AUTH
++
++#include <stdlib.h>
++#include <string.h>
++
+ #include <security/pam_modules.h>
+-#include <security/_pam_macros.h>
++#include <security/pam_appl.h>
+
+ #include "version.h"
+ #include "conf.h"
diff --git a/sys-auth/pam_usb/pam_usb-0.5.0.ebuild b/sys-auth/pam_usb/pam_usb-0.5.0.ebuild
index e6c2c9e325d8..822b92e541f2 100644
--- a/sys-auth/pam_usb/pam_usb-0.5.0.ebuild
+++ b/sys-auth/pam_usb/pam_usb-0.5.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/pam_usb-0.5.0.ebuild,v 1.1 2011/04/22 16:03:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/pam_usb-0.5.0.ebuild,v 1.2 2011/04/22 16:13:32 ssuominen Exp $
EAPI=4
-inherit pam toolchain-funcs
+inherit eutils pam toolchain-funcs
DESCRIPTION="A pam module to provide authentication using USB device"
HOMEPAGE="http://pamusb.org/"
@@ -27,9 +27,12 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-openpam.patch
+}
+
src_compile() {
- tc-export CC
- emake
+ emake CC="$(tc-getCC)"
}
src_install() {