| 1 |
commit: df90aa3c22aa152128bdef92acd77ceea8f5d071 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 4 14:46:26 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 15:07:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df90aa3c |
| 7 |
|
| 8 |
sys-auth/thinkfinger: Fix for slibtool |
| 9 |
|
| 10 |
Thanks-to: orbea <orbea <AT> riseup.net> |
| 11 |
Closes: https://bugs.gentoo.org/778980 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-auth/thinkfinger/files/0.3-autoreconf.patch | 25 +++++++++++++++++ |
| 15 |
sys-auth/thinkfinger/files/0.3-slibtool.patch | 37 +++++++++++++++++++++++++ |
| 16 |
sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild | 9 +++++- |
| 17 |
3 files changed, 70 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/sys-auth/thinkfinger/files/0.3-autoreconf.patch b/sys-auth/thinkfinger/files/0.3-autoreconf.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..f0b7a1c2023 |
| 22 |
--- /dev/null |
| 23 |
+++ b/sys-auth/thinkfinger/files/0.3-autoreconf.patch |
| 24 |
@@ -0,0 +1,25 @@ |
| 25 |
+From 922e00d123092da33f3237071236e28b0f120766 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: orbea <orbea@××××××.net> |
| 27 |
+Date: Sun, 28 Mar 2021 11:04:26 -0700 |
| 28 |
+Subject: [PATCH 1/2] build: Fix autoreconf. |
| 29 |
+ |
| 30 |
+--- |
| 31 |
+ configure.in | 2 -- |
| 32 |
+ 1 file changed, 2 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/configure.in b/configure.in |
| 35 |
+index 2bdd150..4b277b9 100644 |
| 36 |
+--- a/configure.in |
| 37 |
++++ b/configure.in |
| 38 |
+@@ -179,8 +179,6 @@ AM_CONDITIONAL(HAVE_OLD_PAM, test "x$HAVE_OLD_PAM" = "xyes") |
| 39 |
+ |
| 40 |
+ # AC_CONFIG_FILES |
| 41 |
+ AC_CONFIG_FILES([Makefile |
| 42 |
+- README |
| 43 |
+- INSTALL |
| 44 |
+ docs/Makefile |
| 45 |
+ docs/autodocs/Makefile |
| 46 |
+ libthinkfinger/Makefile |
| 47 |
+-- |
| 48 |
+2.26.3 |
| 49 |
+ |
| 50 |
|
| 51 |
diff --git a/sys-auth/thinkfinger/files/0.3-slibtool.patch b/sys-auth/thinkfinger/files/0.3-slibtool.patch |
| 52 |
new file mode 100644 |
| 53 |
index 00000000000..2b56e9ce1c8 |
| 54 |
--- /dev/null |
| 55 |
+++ b/sys-auth/thinkfinger/files/0.3-slibtool.patch |
| 56 |
@@ -0,0 +1,37 @@ |
| 57 |
+From 477ef76901ae46d58202091060a763f9b4c4b57f Mon Sep 17 00:00:00 2001 |
| 58 |
+From: orbea <orbea@××××××.net> |
| 59 |
+Date: Sun, 28 Mar 2021 11:08:43 -0700 |
| 60 |
+Subject: [PATCH 2/2] build: Fix creating the libpam_thinkfinger library. |
| 61 |
+ |
| 62 |
+--- |
| 63 |
+ pam/Makefile.am | 13 ++++++------- |
| 64 |
+ 1 file changed, 6 insertions(+), 7 deletions(-) |
| 65 |
+ |
| 66 |
+diff --git a/pam/Makefile.am b/pam/Makefile.am |
| 67 |
+index d3bfcab..38c3cab 100644 |
| 68 |
+--- a/pam/Makefile.am |
| 69 |
++++ b/pam/Makefile.am |
| 70 |
+@@ -1,14 +1,13 @@ |
| 71 |
+-pam_PROGRAMS = pam_thinkfinger.so |
| 72 |
++pam_LTLIBRARIES = libpam_thinkfinger.la |
| 73 |
+ pamdir = $(SECUREDIR) |
| 74 |
+ |
| 75 |
+ INCLUDES = -I$(top_srcdir)/libthinkfinger |
| 76 |
+ |
| 77 |
+ if HAVE_OLD_PAM |
| 78 |
+-pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c |
| 79 |
++libpam_thinkfinger_la_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c |
| 80 |
+ else |
| 81 |
+-pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c |
| 82 |
++libpam_thinkfinger_la_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c |
| 83 |
+ endif |
| 84 |
+-pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed |
| 85 |
+-pam_thinkfinger_so_CFLAGS = $(CFLAGS) |
| 86 |
+-pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS) |
| 87 |
+- |
| 88 |
++libpam_thinkfinger_la_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed |
| 89 |
++libpam_thinkfinger_la_CFLAGS = $(CFLAGS) |
| 90 |
++libpam_thinkfinger_la_LIBADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS) |
| 91 |
+-- |
| 92 |
+2.26.3 |
| 93 |
+ |
| 94 |
|
| 95 |
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild |
| 96 |
index 5148727daa4..d877ef488e9 100644 |
| 97 |
--- a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild |
| 98 |
+++ b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild |
| 99 |
@@ -3,7 +3,7 @@ |
| 100 |
|
| 101 |
EAPI=7 |
| 102 |
|
| 103 |
-inherit linux-info pam |
| 104 |
+inherit autotools linux-info pam |
| 105 |
|
| 106 |
DESCRIPTION="Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads" |
| 107 |
HOMEPAGE="http://thinkfinger.sourceforge.net/" |
| 108 |
@@ -28,6 +28,8 @@ PATCHES=( |
| 109 |
"${FILESDIR}"/${PV}-send-sync-event.patch |
| 110 |
"${FILESDIR}"/${PV}-tftoolgroup.patch |
| 111 |
"${FILESDIR}"/${PV}-strip-strip.patch |
| 112 |
+ "${FILESDIR}"/${PV}-autoreconf.patch |
| 113 |
+ "${FILESDIR}"/${PV}-slibtool.patch |
| 114 |
) |
| 115 |
|
| 116 |
pkg_setup() { |
| 117 |
@@ -38,6 +40,11 @@ pkg_setup() { |
| 118 |
fi |
| 119 |
} |
| 120 |
|
| 121 |
+src_prepare() { |
| 122 |
+ default |
| 123 |
+ eautoreconf |
| 124 |
+} |
| 125 |
+ |
| 126 |
src_configure() { |
| 127 |
econf \ |
| 128 |
--disable-static \ |
Archives