* [gentoo-commits] repo/gentoo:master commit in: sys-auth/pam_u2f/, sys-auth/pam_u2f/files/
@ 2021-06-02 10:33 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-06-02 10:33 UTC (permalink / raw
To: gentoo-commits
commit: 5a91d497a2780e4d8ea0cbb145ddea0e3ed8a570
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 2 10:33:33 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jun 2 10:33:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a91d497
sys-auth/pam_u2f: Fix install-exec-hook to respect DESTDIR
Closes: https://bugs.gentoo.org/793797
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch | 13 +++++++++++++
sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild | 9 ++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch b/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch
new file mode 100644
index 00000000000..5ce95aa3b91
--- /dev/null
+++ b/sys-auth/pam_u2f/files/pam_u2f-1.1.1-fix-Makefile.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -43,8 +43,8 @@
+ # Release
+
+ install-exec-hook:
+- rm -f $(PAMDIR)/pam_u2f.la
+- chmod -f 644 $(PAMDIR)/pam_u2f.so || true
++ rm -f $(DESTDIR)/$(PAMDIR)/pam_u2f.la
++ chmod -f 644 $(DESTDIR)/$(PAMDIR)/pam_u2f.so || true
+
+ indent:
+ clang-format -i *.c *.h pamu2fcfg/*.c pamu2fcfg/*.h
diff --git a/sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild b/sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild
index 5d50caedc75..a8dd23c88d4 100644
--- a/sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild
+++ b/sys-auth/pam_u2f/pam_u2f-1.1.1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}"/${PN}-1.1.1-fix-Makefile.patch )
+
src_prepare() {
default
eautoreconf
@@ -30,10 +32,3 @@ src_configure() {
use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
econf --with-pam-dir=$(getpam_mod_dir)
}
-
-src_install() {
- default
-
- # plugin only
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/pam_u2f/, sys-auth/pam_u2f/files/
@ 2021-07-26 3:25 John Helmert III
0 siblings, 0 replies; 2+ messages in thread
From: John Helmert III @ 2021-07-26 3:25 UTC (permalink / raw
To: gentoo-commits
commit: 1244305b9284cf3cf0527fdac223920a5de8fde9
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 20:33:06 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 03:12:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1244305b
sys-auth/pam_u2f: drop 1.1.0
Bug: https://bugs.gentoo.org/792270
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
sys-auth/pam_u2f/Manifest | 1 -
.../pam_u2f/files/pam_u2f-1.0.2-fix-Makefile.patch | 13 -------
.../files/pam_u2f-1.1.0-include-limits_h.patch | 41 ----------------------
sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild | 37 -------------------
4 files changed, 92 deletions(-)
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index e0a33e89d4e..dfe47bbfd46 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,2 +1 @@
-DIST pam_u2f-1.1.0.tar.gz 415677 BLAKE2B dba5cd195d390ba4537752549fa5e0f4487930637fedd64b2750424d21d968bf8be54b75dccba92ac13a18b4e2d44825ec18089e9c4f5dc8e11ac12c36b8d28c SHA512 0ffcc32f0bbee279ad02f9c1cd928e2cf1df2fdebe718d869c16b7fece8edafd73cf08c5dfd6a2bc08434ed1970e16e4f89b6dae3b027a961ab43b26818b634f
DIST pam_u2f-1.1.1.tar.gz 429822 BLAKE2B 8ed44f82295ea24fe30c5830971afd29a23b48e173c3cb69d3dcaf73b142de36f86087eaee69b1793a8846fdb2efc5530d52fa9f40e4357e6cd2ea9960b9bb39 SHA512 ca81c78e67c17c369117e9d38e50033eaa96e0b15673521db2c382de1aa2566f7406fb43801a5938758480966c5e7316943769db5be826983d3865710e0274c1
diff --git a/sys-auth/pam_u2f/files/pam_u2f-1.0.2-fix-Makefile.patch b/sys-auth/pam_u2f/files/pam_u2f-1.0.2-fix-Makefile.patch
deleted file mode 100644
index a83597602d4..00000000000
--- a/sys-auth/pam_u2f/files/pam_u2f-1.0.2-fix-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -34,8 +34,8 @@
- # Release
-
- install-exec-hook:
-- rm -f $(PAMDIR)/pam_u2f.la
-- chmod -f 644 $(PAMDIR)/pam_u2f.so || true
-+ rm -f $(DESTDIR)/$(PAMDIR)/pam_u2f.la
-+ chmod -f 644 $(DESTDIR)/$(PAMDIR)/pam_u2f.so || true
-
- indent:
- indent -kr -nut -i2 *.c *.h pamu2fcfg/*.c pamu2fcfg/*.h
diff --git a/sys-auth/pam_u2f/files/pam_u2f-1.1.0-include-limits_h.patch b/sys-auth/pam_u2f/files/pam_u2f-1.1.0-include-limits_h.patch
deleted file mode 100644
index edb959c7469..00000000000
--- a/sys-auth/pam_u2f/files/pam_u2f-1.1.0-include-limits_h.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d46b5ed35017b089c30dd21305ac2147fcfc24f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
- <congdanhqx@gmail.com>
-Date: Fri, 16 Oct 2020 06:49:08 +0700
-Subject: [PATCH] b64,util: always include limits.h
-
-UCHAR_MAX and INT_MAX are defined within limits.h
-
-Current codebase failed to be built in Linux with musl libc due to
-missing this inclusion.
-
-Fix it.
----
- b64.c | 1 +
- util.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/b64.c b/b64.c
-index 0649c1e..7788089 100644
---- a/b64.c
-+++ b/b64.c
-@@ -4,6 +4,7 @@
-
- #include <openssl/bio.h>
- #include <openssl/evp.h>
-+#include <limits.h>
- #include <stdint.h>
- #include <string.h>
-
-diff --git a/util.c b/util.c
-index fdae095..3ea1bd2 100644
---- a/util.c
-+++ b/util.c
-@@ -9,6 +9,7 @@
- #include <openssl/ec.h>
- #include <openssl/obj_mac.h>
-
-+#include <limits.h>
- #include <stdlib.h>
- #include <fcntl.h>
- #include <sys/stat.h>
diff --git a/sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild b/sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild
deleted file mode 100644
index 0774e3d2d44..00000000000
--- a/sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="PAM module for FIDO2 and U2F keys"
-HOMEPAGE="https://github.com/Yubico/pam-u2f"
-SRC_URI="https://developers.yubico.com/${PN/_/-}/Releases/${P}.tar.gz"
-
-LICENSE="BSD ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
- dev-libs/libfido2:0=
- dev-libs/openssl:0=
- sys-libs/pam"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.2-fix-Makefile.patch"
- "${FILESDIR}/${PN}-1.1.0-include-limits_h.patch"
-)
-
-src_prepare() {
- default
- use debug || append-cppflags -UDEBUG_PAM -UPAM_DEBUG
- eautoreconf
-}
-
-src_configure() {
- econf --with-pam-dir=$(getpam_mod_dir)
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-26 3:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-02 10:33 [gentoo-commits] repo/gentoo:master commit in: sys-auth/pam_u2f/, sys-auth/pam_u2f/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-07-26 3:25 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox