* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-totp/, app-crypt/tpm2-totp/files/
@ 2020-02-26 16:17 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-02-26 16:17 UTC (permalink / raw
To: gentoo-commits
commit: 8ae25bc849c29a34378347034ea88125db3092aa
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Thu Feb 20 02:06:07 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 16:17:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ae25bc8
app-crypt/tpm2-totp: Remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-crypt/tpm2-totp/Manifest | 1 -
.../tpm2-totp/files/tpm2-totp-0.1.1-build.patch | 70 ----------------------
app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild | 38 ------------
3 files changed, 109 deletions(-)
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index db6a6311864..5e4f68674f2 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,2 +1 @@
-DIST tpm2-totp-0.1.1.tar.gz 357787 BLAKE2B c7a24b30c155cfd5387180a2c8584497327eadd701068aa5eb3c385bbadf26f448f88c238849fbf68c4e7265f01d3783b3aa50a912070df1c2fd4485310f2299 SHA512 33a4af16a292ddd674a399bf12ce0b355d95de7014e8be11816a1d88edfd36ae222a8b7508f3aa1be3b46c7e04bf2712ee4839cf9f4f83fc308cb4f639ec5b9f
DIST tpm2-totp-0.2.1.tar.gz 427226 BLAKE2B e6a9dbcdac4d7fc31048aff968e3eea097752c79a3c1b8551d22558a6b143a758e7bb507722185c648000f4b1edd2f0bbdd443890b5763b297f3d42cfbd84d9d SHA512 2bda34e89b76319a40206e08c0208b0f139309c0b0e40e7168b5e7562096750df504dfcae3a39e6f82fdccbf7a79ed0802d115fbd7560dc3f5b52d81fe8fb59c
diff --git a/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch b/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
deleted file mode 100644
index 232b4f9e868..00000000000
--- a/app-crypt/tpm2-totp/files/tpm2-totp-0.1.1-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 2652497a15572d2484f57fee8be252d0d5fe4f8c Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 01:39:29 +0300
-Subject: [PATCH] build: add --disable-defaultflags
-
-Align with tpm2-tss to allow downstream to provide flags.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 42 +++++++++++++++++++++++++-----------------
- 1 file changed, 25 insertions(+), 17 deletions(-)
-
-https://github.com/tpm2-software/tpm2-totp/pull/39
-
-diff --git a/configure.ac b/configure.ac
-index baf596b..ac11e1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,23 +47,31 @@ AC_SUBST([LIBEXECDIR])
-
- AC_CONFIG_FILES([Makefile dist/tpm2-totp.pc dist/dracut/module-setup.sh dist/initcpio/install/plymouth-tpm2-totp])
-
--AX_ADD_COMPILER_FLAG([-std=c99])
--AX_ADD_COMPILER_FLAG([-Wall])
--AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Wformat-security])
--AX_ADD_COMPILER_FLAG([-Werror])
--AX_ADD_COMPILER_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
--
--# work around GCC bug #53119
--# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
--AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
--
--AX_ADD_LINK_FLAG([-Wl,--no-undefined])
--AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
--AX_ADD_LINK_FLAG([-Wl,-z,now])
--AX_ADD_LINK_FLAG([-Wl,-z,relro])
-+AC_ARG_ENABLE([defaultflags],
-+ [AS_HELP_STRING([--disable-defaultflags],
-+ [Disable default preprocessor, compiler, and linker flags.])],
-+ [enable_defaultflags=$enableval],
-+ [enable_defaultflags=yes])
-+AS_IF([test "x$enable_defaultflags" = "xyes"],
-+ [
-+ AX_ADD_COMPILER_FLAG([-std=c99])
-+ AX_ADD_COMPILER_FLAG([-Wall])
-+ AX_ADD_COMPILER_FLAG([-Wextra])
-+ AX_ADD_COMPILER_FLAG([-Wformat-security])
-+ AX_ADD_COMPILER_FLAG([-Werror])
-+ AX_ADD_COMPILER_FLAG([-fstack-protector-all])
-+ AX_ADD_COMPILER_FLAG([-fpic])
-+ AX_ADD_COMPILER_FLAG([-fPIC])
-+
-+ # work around GCC bug #53119
-+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
-+ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
-+
-+ AX_ADD_LINK_FLAG([-Wl,--no-undefined])
-+ AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
-+ AX_ADD_LINK_FLAG([-Wl,-z,now])
-+ AX_ADD_LINK_FLAG([-Wl,-z,relro])
-+ ])
-
- AX_CODE_COVERAGE
- m4_ifdef([_AX_CODE_COVERAGE_RULES],
---
-2.21.0
-
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild
deleted file mode 100644
index 8b2622c2586..00000000000
--- a/app-crypt/tpm2-totp/tpm2-totp-0.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Attest the trustworthiness of a device against a human using time-based OTP"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-totp"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=app-crypt/tpm2-tss-2.0:=
- media-gfx/qrencode:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-defaultflags
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-totp/, app-crypt/tpm2-totp/files/
@ 2021-03-20 5:59 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-03-20 5:59 UTC (permalink / raw
To: gentoo-commits
commit: 299d0bc7a122e5db3c3a899029f084f1c881fdcf
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Mar 20 01:27:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 05:52:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299d0bc7
app-crypt/tpm2-totp: Fix build with slibtool
Closes: https://bugs.gentoo.org/777291
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20014
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-totp-0.3.0-Remove-bogus-value-from-Makefile.am | 23 ++++++++++++++++++++++
app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild | 6 +++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am b/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am
new file mode 100644
index 00000000000..965b376a388
--- /dev/null
+++ b/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am
@@ -0,0 +1,23 @@
+From 893ab78144b95a52d73e1c125e56380fbec68a6f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 19 Mar 2021 11:01:03 -0700
+Subject: [PATCH] build: Remove bogus value from Makefile.am.
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 984212a..cdaecbd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -71,7 +71,7 @@ include_HEADERS += include/tpm2-totp.h
+
+ libtpm2_totp_la_SOURCES = src/libtpm2-totp.c
+ libtpm2_totp_la_LIBADD = $(AM_LDADD)
+-libtpm2_totp_la_LDFLAGS = $(AM_LDFLAGS) '(tpm2_totp)'
++libtpm2_totp_la_LDFLAGS = $(AM_LDFLAGS)
+
+ pkgconfig_DATA = dist/tpm2-totp.pc
+
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
index b02901ba1dc..5bd31217475 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,6 +32,10 @@ BDEPEND="virtual/pkgconfig"
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}/${P}-Remove-bogus-value-from-Makefile.am"
+ )
+
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-20 6:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-20 5:59 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-totp/, app-crypt/tpm2-totp/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-02-26 16:17 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox