* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-abrmd/, app-crypt/tpm2-abrmd/files/
@ 2018-12-31 22:10 Alon Bar-Lev
0 siblings, 0 replies; 2+ messages in thread
From: Alon Bar-Lev @ 2018-12-31 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 7a8bbaf6fbcd80d4ed98e6fa85ca47a29e163526
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 22:02:18 2018 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 22:08:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8bbaf6
app-crypt/tpm2-abrmd: initial add
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-crypt/tpm2-abrmd/Manifest | 1 +
.../tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch | 32 +++++++++++++
app-crypt/tpm2-abrmd/files/tpm2-abrmd.confd | 1 +
app-crypt/tpm2-abrmd/files/tpm2-abrmd.initd | 15 ++++++
app-crypt/tpm2-abrmd/metadata.xml | 11 +++++
app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild | 55 ++++++++++++++++++++++
6 files changed, 115 insertions(+)
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
new file mode 100644
index 00000000000..cee50e66439
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -0,0 +1 @@
+DIST tpm2-abrmd-2.0.3.tar.gz 563029 BLAKE2B 89c20066b05818825a2addacaf123568ec095d021e9811b78d11c336af9a9e97fe280a08b4478331663efd1da9b2db54207ca53728398aefe4407bfe4b0c7efd SHA512 70b431b9d09e1c1db819aabf6ca8e40a7553573339f43a6c872ad685b7822e5046bd8ede25dcd0608ce2d8fa32257f6c1dd7f234aa7d6a447ac795625d4e0fac
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
new file mode 100644
index 00000000000..72e823405e9
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.0.3-build.patch
@@ -0,0 +1,32 @@
+diff --git a/configure.ac b/configure.ac
+index ecbc3bb..5973ff5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -135,7 +135,6 @@ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ # these macros are defined in m4/flags.m4
+ AX_ADD_COMPILER_FLAG([-Wall])
+ AX_ADD_COMPILER_FLAG([-Wextra])
+-AX_ADD_COMPILER_FLAG([-Werror])
+ AX_ADD_COMPILER_FLAG([-std=gnu99])
+ AX_ADD_COMPILER_FLAG([-Wformat])
+ AX_ADD_COMPILER_FLAG([-Wformat-security])
+@@ -143,19 +142,9 @@ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
+ # work around for Glib usage of function pointers type casting
+ # https://bugzilla.gnome.org/show_bug.cgi?id=793272
+ AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
+-AX_ADD_COMPILER_FLAG([-fdata-sections])
+-AX_ADD_COMPILER_FLAG([-ffunction-sections])
+-AX_ADD_COMPILER_FLAG([-fstack-protector-all])
+-AX_ADD_COMPILER_FLAG([-fpic])
+-AX_ADD_COMPILER_FLAG([-fPIC])
+ AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
+ AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
+ AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
+-AX_ADD_LINK_FLAG([-Wl,--gc-sections])
+-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_SUBST([PATH])
+
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd.confd b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.confd
new file mode 100644
index 00000000000..619e3dfde77
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.confd
@@ -0,0 +1 @@
+TPM2_ABRMD_ARGS=
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd.initd b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.initd
new file mode 100644
index 00000000000..0272921dcbd
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/files/tpm2-abrmd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+description="TPM2 Access Broker & Resource Manager"
+command="/usr/sbin/tpm2-abrmd"
+command_args="${TPM2_ABRMD_ARGS} --logger=syslog"
+command_background=1
+command_user="tss:tss"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+
+depend() {
+ use logger
+ after coldplug
+}
diff --git a/app-crypt/tpm2-abrmd/metadata.xml b/app-crypt/tpm2-abrmd/metadata.xml
new file mode 100644
index 00000000000..81a49e4dc59
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tpm2-software/tpm2-abrmd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
new file mode 100644
index 00000000000..8a2bb55ac65
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd user
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RDEPEND="sys-apps/dbus:=
+ dev-libs/glib:=
+ app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+ dev-util/gdbus-codegen"
+
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
+pkg_setup() {
+ enewgroup tss
+ enewuser tss -1 -1 / tss
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable test unit) \
+ --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+ --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+ --with-systemdpresetdisable \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-abrmd/, app-crypt/tpm2-abrmd/files/
@ 2020-09-15 14:11 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-09-15 14:11 UTC (permalink / raw
To: gentoo-commits
commit: 1776ddd88c901cad1ce29ec08ca6da58c34a6943
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Wed Aug 19 20:00:50 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 14:11:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1776ddd8
app-crypt/tpm2-abrmd: Remove old
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17176
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-crypt/tpm2-abrmd/Manifest | 2 -
.../tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch | 118 ---------------------
app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild | 55 ----------
app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild | 51 ---------
4 files changed, 226 deletions(-)
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 8c93ee844f6..7b889203c0f 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,3 +1 @@
-DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
-DIST tpm2-abrmd-2.3.1.tar.gz 566988 BLAKE2B 281c1288baaa07b93939219143f4ecc2420b353d04d751746b6e43c93e092d0facb3d0ddbc20129328666d69954dd16ea7e709fea99690af80b2c83e1ac855e4 SHA512 144ab2b147cd18f892f3c05181efdbed2ac422fe8507eb42871ffe571340b6395431743a4f1995a7ce7a914fd5e7afd2b17328062c893a0403708c2c4d92e0cb
DIST tpm2-abrmd-2.3.3.tar.gz 573449 BLAKE2B c3bc0311a73a0c69060a4d19517c3b5d09077ee8efdcd6e7d605675111cb5ac568d1e43bf9c329d4fad21fd44fb50b20e502205360461533c68866d329c320db SHA512 2191c7e466271cb85fcb20fcd91c78df80f53030fb055d0b4670db33708939b60a9124955356f27662975abdcb9c8d144df884003986ffdbd801ca4e47edc21a
diff --git a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch b/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
deleted file mode 100644
index e58bb7f72ef..00000000000
--- a/app-crypt/tpm2-abrmd/files/tpm2-abrmd-2.1.1-build.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From a0a961c05c8916863a67a61f469c717f617e1c58 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 01:03:03 +0300
-Subject: [PATCH 1/2] build: let autoconf detect system extensions
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-https://github.com/tpm2-software/tpm2-abrmd/pull/632
-
-diff --git a/configure.ac b/configure.ac
-index 35a0c21..0cc8ce8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_INIT([tpm2-abrmd],
- AC_CONFIG_MACRO_DIR([m4])
- AC_PROG_CC
- AC_PROG_LN_S
-+AC_USE_SYSTEM_EXTENSIONS
- LT_INIT()
- PKG_INSTALLDIR()
- AM_INIT_AUTOMAKE([foreign subdir-objects])
-@@ -151,9 +152,6 @@ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
- AX_ADD_COMPILER_FLAG([-fpic])
- AX_ADD_COMPILER_FLAG([-fPIC])
- AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
--AX_ADD_PREPROC_FLAG([-D_GNU_SOURCE])
--AX_ADD_PREPROC_FLAG([-U_FORTIFY_SOURCE])
--AX_ADD_PREPROC_FLAG([-D_FORTIFY_SOURCE=2])
- AX_ADD_LINK_FLAG([-Wl,--gc-sections])
- AX_ADD_LINK_FLAG([-Wl,--no-undefined])
- AX_ADD_LINK_FLAG([-Wl,-z,noexecstack])
---
-2.21.0
-
-From 977de33fe1499e7e8fa25f4c1247aaf9b71ba3a2 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Fri, 31 May 2019 01:03:08 +0300
-Subject: [PATCH 2/2] build: add --disable-defaultflags
-
-Align with other tpm2 build systems.
-Enable downstream to override flags.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 54 ++++++++++++++++++++++++++++++----------------------
- 1 file changed, 31 insertions(+), 23 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0cc8ce8..dc32b09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,29 +134,37 @@ AS_IF([test \( "x$enable_integration" = "xyes" \) -a \( "x$enable_test_hwtpm" =
- [AC_MSG_NOTICE([Integration tests will be executed against the TPM device.])])
- AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
-
--# preprocessor / compiler / linker flags
--# these macros are defined in m4/flags.m4
--AX_ADD_COMPILER_FLAG([-Wall])
--AX_ADD_COMPILER_FLAG([-Wextra])
--AX_ADD_COMPILER_FLAG([-Werror])
--AX_ADD_COMPILER_FLAG([-std=gnu99])
--AX_ADD_COMPILER_FLAG([-Wformat])
--AX_ADD_COMPILER_FLAG([-Wformat-security])
--AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
--# work around for Glib usage of function pointers type casting
--# https://bugzilla.gnome.org/show_bug.cgi?id=793272
--AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
--AX_ADD_COMPILER_FLAG([-fdata-sections])
--AX_ADD_COMPILER_FLAG([-ffunction-sections])
--AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
--AX_ADD_COMPILER_FLAG([-fpic])
--AX_ADD_COMPILER_FLAG([-fPIC])
--AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
--AX_ADD_LINK_FLAG([-Wl,--gc-sections])
--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"],
-+ [
-+ # preprocessor / compiler / linker flags
-+ # these macros are defined in m4/flags.m4
-+ AX_ADD_COMPILER_FLAG([-Wall])
-+ AX_ADD_COMPILER_FLAG([-Wextra])
-+ AX_ADD_COMPILER_FLAG([-Werror])
-+ AX_ADD_COMPILER_FLAG([-std=gnu99])
-+ AX_ADD_COMPILER_FLAG([-Wformat])
-+ AX_ADD_COMPILER_FLAG([-Wformat-security])
-+ AX_ADD_COMPILER_FLAG([-Wno-missing-braces])
-+ # work around for Glib usage of function pointers type casting
-+ # https://bugzilla.gnome.org/show_bug.cgi?id=793272
-+ AX_ADD_COMPILER_FLAG([-Wno-cast-function-type])
-+ AX_ADD_COMPILER_FLAG([-fdata-sections])
-+ AX_ADD_COMPILER_FLAG([-ffunction-sections])
-+ AX_ADD_TOOLCHAIN_FLAG([-fstack-protector-all])
-+ AX_ADD_COMPILER_FLAG([-fpic])
-+ AX_ADD_COMPILER_FLAG([-fPIC])
-+ AX_ADD_COMPILER_FLAG([-Wstrict-overflow=5])
-+ AX_ADD_LINK_FLAG([-Wl,--gc-sections])
-+ 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_SUBST([PATH])
-
---
-2.21.0
-
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild
deleted file mode 100644
index dddc82c0e86..00000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/dbus:=
- acct-group/tss
- acct-user/tss
- dev-libs/glib:=
- app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- dev-util/gdbus-codegen"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-defaultflags \
- --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
- --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
- --with-systemdpresetdisable \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild
deleted file mode 100644
index 53562b771fd..00000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/tss
- acct-user/tss
- sys-apps/dbus:=
- dev-libs/glib:=
- app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
- dev-util/gdbus-codegen"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_enable test unit) \
- --disable-defaultflags \
- --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
- --with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
- --with-systemdpresetdisable \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-15 14:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-15 14:11 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-abrmd/, app-crypt/tpm2-abrmd/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2018-12-31 22:10 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox