summaryrefslogtreecommitdiff
path: root/sys-auth/pam_p11
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-30 17:36:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-30 17:36:28 +0100
commit7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch)
treef2cbbaa8bb9209cd15208721103228336149b799 /sys-auth/pam_p11
parent7a86906b67693cc65671d3e1476835d3a7e13092 (diff)
gentoo resync : 30.06.2019
Diffstat (limited to 'sys-auth/pam_p11')
-rw-r--r--sys-auth/pam_p11/Manifest6
-rw-r--r--sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch26
-rw-r--r--sys-auth/pam_p11/files/pam_p11-0.2.0-openssl11.patch76
-rw-r--r--sys-auth/pam_p11/pam_p11-0.2.0.ebuild42
-rw-r--r--sys-auth/pam_p11/pam_p11-0.3.0.ebuild2
5 files changed, 2 insertions, 150 deletions
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index 210b2b3ce746..e6e5ff90b65e 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -1,7 +1,3 @@
-AUX pam_p11-0.2.0-build.patch 812 BLAKE2B efd9b8f46bff6bfd04d0be9a82998ddb3ef4b53d17130be349b0ed85fd5845e4c4aeff24417e740a3f8534d76bc7598666a9f07836aeeb264bb9d71a05c8ab77 SHA512 ebb3802d4ed4e6e6b2bb863edceb04e02246f5d36a0b7d78ba17295f151c2864a13fd9b161568da614b03c38f81c2157793a4160a90bbb61a9e666c4075807ef
-AUX pam_p11-0.2.0-openssl11.patch 2501 BLAKE2B 445b10d67ac5102c4b2b95931ef7168e25ac5627d5a60e6fe3f28dd01840a0882c4f6558d841af9e2ba64bb46a00692cccf403c19195a2eb3f7bc702d23056cc SHA512 1e0ebce3b42f66b2c1d9a0ac2c0369dc6a4d8c379625aad151260c844263381b3ffb8f12e2298152d7b6213cc773bf6aa77b603bebb321902ab106e376966367
-DIST pam_p11-0.2.0.tar.gz 417550 BLAKE2B e3c5bb32d6c7c84776341796ebdb9850a9561778aee820acb2a6c61112a2a5df5ee7c539cb5974439e565046e944f4710b87c3b51dea61fdb2cd9171daac3a0c SHA512 2cadf6fe880c953554757099741f3cfe992067f251b7e7e977a6dda5f65cbe1f55b1de6d180638997eada0d3b760887091014b99f8ae4b6d31b25af8e555343c
DIST pam_p11-0.3.0.tar.gz 422806 BLAKE2B 60ac1cc0b8fff536553b2502f906f7730c1be760b2948389f5a6399979f994b3fcfa04226f1605c64d02bad47f46c9bd28fa076d819814b9121241b034407d4b SHA512 f89cf57f6365c25e54830d18180aad7d14b7eaef82eb0d419bcc3d8b881e1e07993a2c4e635e90b4f2fb779fec24fa0d912388f898d726e387bc0db63d772d49
-EBUILD pam_p11-0.2.0.ebuild 794 BLAKE2B d0e27ab2400ee4020ff19340b3fd05f3c4d76b499a2c691626077edcf658cf40d948a582002c25457f6d89c00f830cf64d5c12a3299b36c60fc4013f81edbff3 SHA512 a34f0f2bd5ec5dedc07a8f49cc67e6945dad7ccae263ec55014ba3fb3ba9d535297b2099ae7fbe7f3baac8e6088e3b2c01210d19e698ab64bc9269b7d9e574fc
-EBUILD pam_p11-0.3.0.ebuild 658 BLAKE2B 313e54055b346cb7ff88ad12dffc30caeae899a16070e00caa9f6e601946baa10652432140af945355fc96126eaea509a8522f84a46294d0e6a954a675c0ede0 SHA512 ca6339fe4dbd2c1406bbdc56567abec840c0bef37e0047d1250c8d998233687ff7513211c42d120d255bb53f09181a14427358dafb278811a87fe9d62d1e6098
+EBUILD pam_p11-0.3.0.ebuild 657 BLAKE2B d028c59591981a7a9b70e080c349d035f64f4460c25bcedd315bb00ef79f859ecde4144c3f5f1ff0d7e43b7c00966690e31b84a46d602ba27035f86a3974f10e SHA512 1468f91b78ceb9d2e3dbf368bcd7d604886445374b3e3554f2cb2d61aa67b2781ca8283f1c49051fafb5a8eb6784c1859eb373a8f9c3612f91126a41272d6220
MISC metadata.xml 382 BLAKE2B 8617a56b292f5844a178afcbaaf56ad5e1c221871fba9012f19e2b94f2a745e2a39e0298d4edc1b30a4aa62bddfa0afef1751966292d2b9e3117832787e0da8d SHA512 1747f4d94dd0a90448d38557beae49c4532f752a33956a54795a58262d42c259d7371a9ebe5a5ac347a7d1178d7932c7f40bce363c476f7a199ff03129fdaf6c
diff --git a/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch b/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch
deleted file mode 100644
index 813499acd3a7..000000000000
--- a/sys-auth/pam_p11/files/pam_p11-0.2.0-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 659a6eb5434039c27b41a9d06edc64923e5042b9 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 15 Aug 2018 18:30:51 +0300
-Subject: [PATCH] build: pam_p11: unsigned comparison
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/pam_p11.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pam_p11.c b/src/pam_p11.c
-index 960c164..1cf6cb2 100644
---- a/src/pam_p11.c
-+++ b/src/pam_p11.c
-@@ -553,7 +553,7 @@ static int randomize(pam_handle_t *pamh, unsigned char *r, unsigned int r_len)
- {
- int ok = 0;
- int fd = open("/dev/urandom", O_RDONLY);
-- if (0 <= fd && read(fd, r, r_len) == r_len) {
-+ if (0 <= fd && read(fd, r, r_len) == (ssize_t)r_len) {
- ok = 1;
- } else {
- pam_syslog(pamh, LOG_CRIT, "Error reading from /dev/urandom: %s",
---
-2.16.4
-
diff --git a/sys-auth/pam_p11/files/pam_p11-0.2.0-openssl11.patch b/sys-auth/pam_p11/files/pam_p11-0.2.0-openssl11.patch
deleted file mode 100644
index 8c41e29bed1f..000000000000
--- a/sys-auth/pam_p11/files/pam_p11-0.2.0-openssl11.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 46a6079817c67a09e5ac493af3381c655bd91c26 Mon Sep 17 00:00:00 2001
-From: Peter Popovec <popovec.peter@gmail.com>
-Date: Tue, 21 Aug 2018 10:24:36 +0200
-Subject: [PATCH] Replacing deprecated OpenSSL API functions (#12)
-
-fixes https://github.com/OpenSC/pam_p11/issues/10
----
- configure.ac | 5 +++++
- src/pam_p11.c | 17 ++++++++++++++---
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5bcbdd6..2854a99 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -85,6 +85,11 @@ PKG_CHECK_MODULES(
- )]
- )
-
-+saved_LIBS="$LIBS"
-+LIBS="$OPENSSL_LIBS $LIBS"
-+AC_CHECK_FUNCS(EVP_MD_CTX_new EVP_MD_CTX_free EVP_MD_CTX_reset)
-+LIBS="$saved_LIBS"
-+
- if test -z "${PAM_LIBS}"; then
- AC_ARG_VAR([PAM_CFLAGS], [C compiler flags for pam])
- AC_ARG_VAR([PAM_LIBS], [linker flags for pam])
-diff --git a/src/pam_p11.c b/src/pam_p11.c
-index 2b4bfbe..60380e5 100644
---- a/src/pam_p11.c
-+++ b/src/pam_p11.c
-@@ -31,6 +31,17 @@
- #include <openssl/crypto.h>
- #include <libp11.h>
-
-+/* openssl deprecated API emulation */
-+#ifndef HAVE_EVP_MD_CTX_NEW
-+#define EVP_MD_CTX_new() EVP_MD_CTX_create()
-+#endif
-+#ifndef HAVE_EVP_MD_CTX_FREE
-+#define EVP_MD_CTX_free(ctx) EVP_MD_CTX_destroy((ctx))
-+#endif
-+#ifndef HAVE_EVP_MD_CTX_RESET
-+#define EVP_MD_CTX_reset(ctx) EVP_MD_CTX_cleanup((ctx))
-+#endif
-+
- #ifdef ENABLE_NLS
- #include <libintl.h>
- #include <locale.h>
-@@ -578,7 +589,7 @@ static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey)
- unsigned char signature[256];
- unsigned int siglen = sizeof signature;
- const EVP_MD *md = EVP_sha1();
-- EVP_MD_CTX *md_ctx = EVP_MD_CTX_create();
-+ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
- EVP_PKEY *privkey = PKCS11_get_private_key(authkey);
- EVP_PKEY *pubkey = PKCS11_get_public_key(authkey);
-
-@@ -596,7 +607,7 @@ static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey)
- || !EVP_SignInit(md_ctx, md)
- || !EVP_SignUpdate(md_ctx, challenge, sizeof challenge)
- || !EVP_SignFinal(md_ctx, signature, &siglen, privkey)
-- || !EVP_MD_CTX_cleanup(md_ctx)
-+ || !EVP_MD_CTX_reset(md_ctx)
- || !EVP_VerifyInit(md_ctx, md)
- || !EVP_VerifyUpdate(md_ctx, challenge, sizeof challenge)
- || 1 != EVP_VerifyFinal(md_ctx, signature, siglen, pubkey)) {
-@@ -613,7 +624,7 @@ static int key_verify(pam_handle_t *pamh, int flags, PKCS11_KEY *authkey)
- if (NULL != privkey)
- EVP_PKEY_free(privkey);
- if (NULL != md_ctx) {
-- EVP_MD_CTX_destroy(md_ctx);
-+ EVP_MD_CTX_free(md_ctx);
- }
- return ok;
- }
diff --git a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild b/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
deleted file mode 100644
index f2aa0f8952fa..000000000000
--- a/sys-auth/pam_p11/pam_p11-0.2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam
-
-DESCRIPTION="PAM module for authenticating against PKCS#11 tokens"
-HOMEPAGE="https://github.com/opensc/pam_p11/wiki"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="virtual/pam
- dev-libs/libp11
- dev-libs/openssl:0="
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${P}-openssl11.patch" #658036
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --with-pamdir="$(getpam_mod_dir)"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-auth/pam_p11/pam_p11-0.3.0.ebuild b/sys-auth/pam_p11/pam_p11-0.3.0.ebuild
index 9f8624cd5168..e004a486dd8f 100644
--- a/sys-auth/pam_p11/pam_p11-0.3.0.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
RDEPEND="virtual/pam
dev-libs/libp11:=