From b01f1db399c9d5581b2619a8ca15a9155292bc97 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 26 Aug 2018 02:42:38 +0100 Subject: sys-firmware/gnuk: Version bump Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- .../gnuk/files/1.2.10-Disable-PIE-by-default.patch | 24 +++++ ...-Always-get-version-from-the-VERSION-file.patch | 32 ++++++ ...-Always-get-version-from-the-VERSION-file.patch | 32 ------ sys-firmware/gnuk/gnuk-1.2.10.ebuild | 119 +++++++++++++++++++++ sys-firmware/gnuk/gnuk-1.2.8.ebuild | 114 -------------------- 5 files changed, 175 insertions(+), 146 deletions(-) create mode 100644 sys-firmware/gnuk/files/1.2.10-Disable-PIE-by-default.patch create mode 100644 sys-firmware/gnuk/files/1.2.10-MINOR-Always-get-version-from-the-VERSION-file.patch delete mode 100644 sys-firmware/gnuk/files/1.2.8-MINOR-Always-get-version-from-the-VERSION-file.patch create mode 100644 sys-firmware/gnuk/gnuk-1.2.10.ebuild delete mode 100644 sys-firmware/gnuk/gnuk-1.2.8.ebuild (limited to 'sys-firmware') diff --git a/sys-firmware/gnuk/files/1.2.10-Disable-PIE-by-default.patch b/sys-firmware/gnuk/files/1.2.10-Disable-PIE-by-default.patch new file mode 100644 index 00000000..2469ecb5 --- /dev/null +++ b/sys-firmware/gnuk/files/1.2.10-Disable-PIE-by-default.patch @@ -0,0 +1,24 @@ +From a62a16d0f7561c91580bec39a2170fabf6f3c80a Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Tue, 28 Aug 2018 21:51:26 +0100 +Subject: [PATCH] Disable PIE by default + +If gcc is built using --enable-default-pie, generated binary will +contain dynamic relocations which is irrelevant for firmware build +--- + chopstx/rules.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chopstx/rules.mk b/chopstx/rules.mk +index 110079efdaaa..39ec326fb295 100644 +--- a/chopstx/rules.mk ++++ b/chopstx/rules.mk +@@ -42,7 +42,7 @@ OUTFILES = $(BUILDDIR)/$(PROJECT) + endif + + +-OPT += -ffunction-sections -fdata-sections -fno-common ++OPT += -ffunction-sections -fdata-sections -fno-common -fno-pie + + OBJS = $(addprefix $(BUILDDIR)/, $(notdir $(CSRC:.c=.o))) + diff --git a/sys-firmware/gnuk/files/1.2.10-MINOR-Always-get-version-from-the-VERSION-file.patch b/sys-firmware/gnuk/files/1.2.10-MINOR-Always-get-version-from-the-VERSION-file.patch new file mode 100644 index 00000000..6d704acb --- /dev/null +++ b/sys-firmware/gnuk/files/1.2.10-MINOR-Always-get-version-from-the-VERSION-file.patch @@ -0,0 +1,32 @@ +From 97d8b30d11913ae4d25da22d6c1de19b75e3d5fa Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sun, 19 Feb 2017 02:18:13 +0000 +Subject: [PATCH] MINOR: Always get version from the VERSION file + +--- + src/configure | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/src/configure b/src/configure +index e959befdddf3..ca6710cba8a3 100755 +--- a/src/configure ++++ b/src/configure +@@ -51,17 +51,7 @@ exec_prefix='${prefix}' + libexecdir='${exec_prefix}/libexec' + + # Revision number +-if test -e ../.git; then +- if type git >/dev/null 2>&1; then +- REVISION=$(git describe --dirty="-modified") +- else +- # echo 'No git available, please install git' +- GIT_REVISION=$(sed -e 's/^\(.......\).*$/g\1/' "../.git/$(sed -e 's/^ref: //' ../.git/HEAD)") +- REVISION=$(cat ../VERSION)-$GIT_REVISION +- fi +-else +- REVISION=$(cat ../VERSION) +-fi ++REVISION=$(cat ../VERSION) + + # Process each option + for option; do diff --git a/sys-firmware/gnuk/files/1.2.8-MINOR-Always-get-version-from-the-VERSION-file.patch b/sys-firmware/gnuk/files/1.2.8-MINOR-Always-get-version-from-the-VERSION-file.patch deleted file mode 100644 index 6d704acb..00000000 --- a/sys-firmware/gnuk/files/1.2.8-MINOR-Always-get-version-from-the-VERSION-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 97d8b30d11913ae4d25da22d6c1de19b75e3d5fa Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Sun, 19 Feb 2017 02:18:13 +0000 -Subject: [PATCH] MINOR: Always get version from the VERSION file - ---- - src/configure | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/src/configure b/src/configure -index e959befdddf3..ca6710cba8a3 100755 ---- a/src/configure -+++ b/src/configure -@@ -51,17 +51,7 @@ exec_prefix='${prefix}' - libexecdir='${exec_prefix}/libexec' - - # Revision number --if test -e ../.git; then -- if type git >/dev/null 2>&1; then -- REVISION=$(git describe --dirty="-modified") -- else -- # echo 'No git available, please install git' -- GIT_REVISION=$(sed -e 's/^\(.......\).*$/g\1/' "../.git/$(sed -e 's/^ref: //' ../.git/HEAD)") -- REVISION=$(cat ../VERSION)-$GIT_REVISION -- fi --else -- REVISION=$(cat ../VERSION) --fi -+REVISION=$(cat ../VERSION) - - # Process each option - for option; do diff --git a/sys-firmware/gnuk/gnuk-1.2.10.ebuild b/sys-firmware/gnuk/gnuk-1.2.10.ebuild new file mode 100644 index 00000000..1cff6331 --- /dev/null +++ b/sys-firmware/gnuk/gnuk-1.2.10.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +inherit git-r3 eutils python-r1 udev + +DESCRIPTION="An Implementation of USB Cryptographic Token for GnuPG" +HOMEPAGE="https://www.fsij.org/category/gnuk.html" +EGIT_REPO_URI="https://salsa.debian.org/gnuk-team/${PN}/${PN}.git" +EGIT_COMMIT="release/${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug doc tools" + +DEPEND="doc? ( dev-python/sphinx )" +RDEPEND="virtual/udev + tools? ( + ${PYTHON_DEPS} + dev-python/pyusb[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${PV}-MINOR-Always-get-version-from-the-VERSION-file.patch" + "${FILESDIR}/${PV}-Disable-PIE-by-default.patch" +) + +pkg_pretend() { + if type -p arm-none-eabi-gcc > /dev/null 2>&1 ; then + return 0 + fi + + eerror "Before you could build the firmware, you need to install arm-none-eabi toolchain" + eerror "Run the following commands:" + eerror " emerge -vat crossdev" + eerror " crossdev --stable -t arm-none-eabi" + die "arm-none-eabi toolchain is needed" +} + +src_prepare () { + default + + mv tool/get_raw_public_key.py "tool/${PN}-get_raw_public_key.py" + mv tool/gnuk_put_binary_libusb.py "tool/${PN}-put_binary_libusb.py" + mv tool/gnuk_remove_keys_libusb.py "tool/${PN}-remove_keys_libusb.py" + mv tool/gnuk_upgrade.py "tool/${PN}-upgrade.py" + mv tool/stlinkv2.py "tool/${PN}-stlinkv2.py" + mv tool/upgrade_by_passwd.py "tool/${PN}-upgrade_by_passwd.py" + mv tool/usb_strings.py "tool/${PN}-usb_strings.py" +} + +src_configure() { + cd "${S}/src" + ./configure \ + --target=FST_01 \ + --vidpid=234b:0000 \ + --enable-certdo \ + --enable-factory-reset \ + --enable-hid-card-change \ + $(use_enable debug) \ + || die "configure failed" +} + +src_compile() { + cd "${S}/src" + emake CROSS="arm-none-eabi-" + + if use doc ; then + cd "${S}/doc" + emake html + emake man + fi + + cd "${S}/regnual" + emake TRGT="arm-none-eabi-" +} + +src_install() { + insinto "/usr/share/${PN}/firmware" + doins "src/build/${PN}.bin" + doins "regnual/regnual.bin" + + udev_dorules "${FILESDIR}/60-${PN}.rules" + + if use doc ; then + HTML_DOCS=( doc/_build/html/* ) + doman doc/_build/man/* + fi + + install_example() { + python_export PYTHON_SCRIPTDIR + insinto "${PYTHON_SCRIPTDIR}" + doins "${1}" + } + + if use tools ; then + python_foreach_impl python_domodule tool/gnuk_token.py + python_foreach_impl python_domodule tool/gpg_agent.py + python_foreach_impl python_domodule tool/kdf_calc.py + python_foreach_impl python_domodule tool/rsa.py + + python_foreach_impl python_doscript "tool/${PN}-get_raw_public_key.py" + python_foreach_impl python_doscript "tool/${PN}-put_binary_libusb.py" + python_foreach_impl python_doscript "tool/${PN}-remove_keys_libusb.py" + python_foreach_impl python_doscript "tool/${PN}-stlinkv2.py" + python_foreach_impl python_doscript "tool/${PN}-upgrade.py" + python_foreach_impl python_doscript "tool/${PN}-upgrade_by_passwd.py" + python_foreach_impl python_doscript "tool/${PN}-usb_strings.py" + python_foreach_impl install_example tool/rsa_example.key + + udev_dorules "${FILESDIR}/10-stlink.rules" + fi + + dodoc AUTHORS ChangeLog NEWS README THANKS + dodoc -r doc/note +} diff --git a/sys-firmware/gnuk/gnuk-1.2.8.ebuild b/sys-firmware/gnuk/gnuk-1.2.8.ebuild deleted file mode 100644 index 66199638..00000000 --- a/sys-firmware/gnuk/gnuk-1.2.8.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit git-r3 eutils python-r1 udev - -DESCRIPTION="An Implementation of USB Cryptographic Token for GnuPG" -HOMEPAGE="https://www.fsij.org/category/gnuk.html" -EGIT_REPO_URI="https://salsa.debian.org/gnuk-team/${PN}/${PN}.git" -EGIT_COMMIT="release/${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug doc tools" - -DEPEND="doc? ( dev-python/sphinx )" -RDEPEND="virtual/udev - tools? ( - ${PYTHON_DEPS} - dev-python/pyusb[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - )" - -PATCHES=( "${FILESDIR}/${PV}-MINOR-Always-get-version-from-the-VERSION-file.patch" ) - -pkg_pretend() { - if type -p arm-none-eabi-gcc > /dev/null 2>&1 ; then - return 0 - fi - - eerror "Before you could build the firmware, you need to install arm-none-eabi toolchain" - eerror "Run the following commands:" - eerror " emerge -vat crossdev" - eerror " crossdev --stable -t arm-none-eabi" - die "arm-none-eabi toolchain is needed" -} - -src_prepare () { - default - - mv tool/get_raw_public_key.py "tool/${PN}-get_raw_public_key.py" - mv tool/gnuk_put_binary_libusb.py "tool/${PN}-put_binary_libusb.py" - mv tool/gnuk_remove_keys_libusb.py "tool/${PN}-remove_keys_libusb.py" - mv tool/gnuk_upgrade.py "tool/${PN}-upgrade.py" - mv tool/stlinkv2.py "tool/${PN}-stlinkv2.py" - mv tool/upgrade_by_passwd.py "tool/${PN}-upgrade_by_passwd.py" - mv tool/usb_strings.py "tool/${PN}-usb_strings.py" -} - -src_configure() { - cd "${S}/src" - ./configure \ - --target=FST_01 \ - --vidpid=234b:0000 \ - --enable-certdo \ - --enable-factory-reset \ - $(use_enable debug) \ - || die "configure failed" -} - -src_compile() { - cd "${S}/src" - emake CROSS="arm-none-eabi-" - - if use doc ; then - cd "${S}/doc" - emake html - emake man - fi - - cd "${S}/regnual" - emake TRGT="arm-none-eabi-" -} - -src_install() { - insinto "/usr/share/${PN}/firmware" - doins "src/build/${PN}.bin" - doins "regnual/regnual.bin" - - udev_dorules "${FILESDIR}/60-${PN}.rules" - - if use doc ; then - HTML_DOCS=( doc/_build/html/* ) - doman doc/_build/man/* - fi - - install_example() { - python_export PYTHON_SCRIPTDIR - insinto "${PYTHON_SCRIPTDIR}" - doins "${1}" - } - - if use tools ; then - python_foreach_impl python_domodule tool/gnuk_token.py - python_foreach_impl python_domodule tool/gpg_agent.py - python_foreach_impl python_domodule tool/rsa.py - - python_foreach_impl python_doscript "tool/${PN}-get_raw_public_key.py" - python_foreach_impl python_doscript "tool/${PN}-put_binary_libusb.py" - python_foreach_impl python_doscript "tool/${PN}-remove_keys_libusb.py" - python_foreach_impl python_doscript "tool/${PN}-stlinkv2.py" - python_foreach_impl python_doscript "tool/${PN}-upgrade.py" - python_foreach_impl python_doscript "tool/${PN}-upgrade_by_passwd.py" - python_foreach_impl python_doscript "tool/${PN}-usb_strings.py" - python_foreach_impl install_example tool/rsa_example.key - - udev_dorules "${FILESDIR}/10-stlink.rules" - fi - - dodoc AUTHORS ChangeLog NEWS README THANKS - dodoc -r doc/note -} -- cgit v1.2.3