Date: Thursday, May 28, 2020 @ 20:31:31 Author: dvzrv Revision: 387782
upgpkg: sbsigntools 0.9.3-2: Rebuilding with source verification. Switching to current upstream at git.kernel.org. Adding all available sodeps in package() and moving the respective packages to makedepends. Adding PGP source verification by adding James Bottomley's key (D5606E73C8B46271BEAD9ADF814AE47C214854D6). Switching to git over https for submodule. Removing unneeded autogen patch. Running autogen.sh in prepare (because of special sauce). Installing docs. Updating maintainer info. Modified: sbsigntools/trunk/PKGBUILD Deleted: sbsigntools/trunk/0001-sbsigntools-fix-autogen.sh-for-build-service.patch ---------------------------------------------------------+ 0001-sbsigntools-fix-autogen.sh-for-build-service.patch | 277 -------------- PKGBUILD | 59 +- 2 files changed, 31 insertions(+), 305 deletions(-) Deleted: 0001-sbsigntools-fix-autogen.sh-for-build-service.patch =================================================================== --- 0001-sbsigntools-fix-autogen.sh-for-build-service.patch 2020-05-28 18:59:45 UTC (rev 387781) +++ 0001-sbsigntools-fix-autogen.sh-for-build-service.patch 2020-05-28 20:31:31 UTC (rev 387782) @@ -1,277 +0,0 @@ -From c8c7e1ba97d15433247bcf87e88485cf7c6b7cc3 Mon Sep 17 00:00:00 2001 -From: James Bottomley <[email protected]> -Date: Tue, 26 Jun 2012 09:49:05 +0100 -Subject: sbsigntools: fix autogen.sh for build service - ---- - AUTHORS | 4 ++ - ChangeLog | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - autogen.sh | 10 --- - 3 files changed, 228 insertions(+), 10 deletions(-) - create mode 100644 AUTHORS - create mode 100644 ChangeLog - -diff --git a/AUTHORS b/AUTHORS -new file mode 100644 -index 0000000..3eaa355 ---- /dev/null -+++ b/AUTHORS -@@ -0,0 +1,4 @@ -+ Adam Conrad -+ Ivan Hu -+ James Bottomley -+ Jeremy Kerr -diff --git a/ChangeLog b/ChangeLog -new file mode 100644 -index 0000000..d5d5ea6 ---- /dev/null -+++ b/ChangeLog -@@ -0,0 +1,224 @@ -+2012-06-20 c07dfb9 Ivan Hu <[email protected]> -+ -+ * configure: Add check for bfh.h -+ -+2012-06-19 5e07c4e Ivan Hu <[email protected]> -+ -+ * tests: Add a test to check invalid PKCS7 signature attaching -+ -+2012-06-19 bfb778e Ivan Hu <[email protected]> -+ -+ * sbattach: Check that attached signatures are valid PKCS7 data -+ -+2012-06-14 bf6df84 Jeremy Kerr <[email protected]> -+ -+ * sbverify: Use a variable for image filename -+ -+2012-06-13 9b7f7fb Jeremy Kerr <[email protected]> -+ -+ * image: Unconditionally parse PE/COFF data -+ -+2012-06-13 128f1c1 Jeremy Kerr <[email protected]> -+ -+ * sbverify: Check for failed image load -+ -+2012-06-13 b48e256 Jeremy Kerr <[email protected]> -+ -+ * tests: Add tests for missing image, cert & key files -+ -+2012-06-13 0af5e01 Jeremy Kerr <[email protected]> -+ -+ * tests: Execute tests in a clean (temporary) directory -+ -+2012-06-13 8716e88 Jeremy Kerr <[email protected]> -+ -+ * tests: Use COMPILE.S for assembing test object -+ -+2012-06-13 807f0e6 Jeremy Kerr <[email protected]> -+ -+ * Version 0.2 -+ -+2012-06-13 7c2d8bb Jeremy Kerr <[email protected]> -+ -+ * docs: Add simple manpage for sbattach -+ -+2012-06-13 deb9211 Jeremy Kerr <[email protected]> -+ -+ * automake: Clean generated man files -+ -+2012-06-13 3cde1e4 Jeremy Kerr <[email protected]> -+ -+ * tests: Add a few simple tests -+ -+2012-06-13 cc881c2 Jeremy Kerr <[email protected]> -+ -+ * Remove unused test.c file -+ -+2012-06-12 4c79e3a Jeremy Kerr <[email protected]> -+ -+ * sbattach: Add too to manage detached signatures -+ -+2012-06-12 564f5bc Jeremy Kerr <[email protected]> -+ -+ * image: Add facility to write unsigned images -+ -+2012-06-11 a07b8d2 Jeremy Kerr <[email protected]> -+ -+ * sbsign,sbverify: Update getopt_long optstrings -+ -+2012-06-11 5836038 Jeremy Kerr <[email protected]> -+ -+ * sbverify: Add support for detached signatures -+ -+2012-06-11 b8a7d51 Jeremy Kerr <[email protected]> -+ -+ * sbverify: Split image signature table reading to separate function -+ -+2012-06-11 e9f438c Jeremy Kerr <[email protected]> -+ -+ * Fix warnings from added -W flags -+ -+2012-06-11 f19e8bb Jeremy Kerr <[email protected]> -+ -+ * automake: Add -Wall -Wextra CFLAGS -+ -+2012-06-11 af4f088 Jeremy Kerr <[email protected]> -+ -+ * sbsign: Add --detached option to create detached PKCS7 signatures -+ -+2012-06-11 0c9fbd2 Jeremy Kerr <[email protected]> -+ -+ * sbsign: fix flag for verbose operation -+ -+2012-06-11 3673db1 Jeremy Kerr <[email protected]> -+ -+ * docs: Fix manpage creation -+ -+2012-05-29 9b2f3a7 Adam Conrad <[email protected]> -+ -+ * autogen.sh: Fix ccan_module assignment -+ -+2012-05-28 3fb0f00 Jeremy Kerr <[email protected]> -+ -+ * image: use read_write_all from ccan -+ -+2012-05-28 f1112b4 Jeremy Kerr <[email protected]> -+ -+ * image: Fix format specifier for 32-bit builds -+ -+2012-05-24 d5e634c Jeremy Kerr <[email protected]> -+ -+ * autoconfiscate -+ -+2012-05-23 82f8c30 Jeremy Kerr <[email protected]> -+ -+ * docs: Add initial manpages -+ -+2012-05-23 c14efcb Jeremy Kerr <[email protected]> -+ -+ * sbsign,sbverify: help2man-ize usage output -+ -+2012-05-23 98a4f10 Jeremy Kerr <[email protected]> -+ -+ * Makefile: Add dist targets -+ -+2012-05-22 1b2b5c6 Jeremy Kerr <[email protected]> -+ -+ * ccan: Add ccan import logic -+ -+2012-05-15 6ff68e5 Jeremy Kerr <[email protected]> -+ -+ * Move ccan submodule -+ -+2012-05-15 9a08e25 Jeremy Kerr <[email protected]> -+ -+ * Remove unused header -+ -+2012-05-14 bc618c5 Jeremy Kerr <[email protected]> -+ -+ * Remove pkcs7-simple test file -+ -+2012-05-14 9ac930e Jeremy Kerr <[email protected]> -+ -+ * Makefile: add install target -+ -+2012-05-14 a1b270f Jeremy Kerr <[email protected]> -+ -+ * Makefile: Comment components -+ -+2012-05-14 c67b82a Jeremy Kerr <[email protected]> -+ -+ * sbverify: clean up openssl init -+ -+2012-05-14 c499763 Jeremy Kerr <[email protected]> -+ -+ * sbverify: add check for invalid PKCS7 data -+ -+2012-05-14 74eb766 Jeremy Kerr <[email protected]> -+ -+ * sbverify: Add certificate chain verification -+ -+2012-05-12 e111127 Jeremy Kerr <[email protected]> -+ -+ * verify: move idc-related parsing to idc.c -+ -+2012-05-12 46cf6a6 Jeremy Kerr <[email protected]> -+ -+ * sbsign: fix incorrect check for certificate load -+ -+2012-05-12 57d9f0c Jeremy Kerr <[email protected]> -+ -+ * image: reformat gap warnings -+ -+2012-05-12 ab05bec Jeremy Kerr <[email protected]> -+ -+ * image: add cert table to image size -+ -+2012-05-12 e1fec08 Jeremy Kerr <[email protected]> -+ -+ * sbverify: Add check for image hash -+ -+2012-05-12 fefe97c Jeremy Kerr <[email protected]> -+ -+ * sbverify: check for presence of signature table -+ -+2012-05-12 b73f723 Jeremy Kerr <[email protected]> -+ -+ * Makefile: add $(tools) var -+ -+2012-05-12 55b1940 Jeremy Kerr <[email protected]> -+ -+ * sbsigntool -> sbsign -+ -+2012-05-12 a183de9 Jeremy Kerr <[email protected]> -+ -+ * image: open output file with O_TRUNC -+ -+2012-04-24 04b70fc Jeremy Kerr <[email protected]> -+ -+ * sbsigntooL: expand usage info -+ -+2012-04-24 9826a43 Jeremy Kerr <[email protected]> -+ -+ * Add GPLv3 text in COPYING -+ -+2012-04-24 906654e Jeremy Kerr <[email protected]> -+ -+ * coff: remove unneeded coff includes -+ -+2012-04-23 9d3c8b5 Jeremy Kerr <[email protected]> -+ -+ * Add copyright comments -+ -+2012-04-23 e019eec Jeremy Kerr <[email protected]> -+ -+ * image: warn about potential checksum differences -+ -+2012-04-23 01e33cd Jeremy Kerr <[email protected]> -+ -+ * idc: allocate using the image context -+ -+2012-04-23 acd8c0a Jeremy Kerr <[email protected]> -+ -+ * Initial commit -+ -diff --git a/autogen.sh b/autogen.sh -index 32ea6f6..117835b 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -16,16 +16,6 @@ then - --build-type=automake lib/ccan $ccan_modules - fi - --# Create generatable docs from git --( -- echo "Authors of sbsigntool:" -- echo -- git log --format='%an' | sort -u | sed 's,^,\t,' --) > AUTHORS -- --# Generate simple ChangeLog --git log --date=short --format='%ad %t %an <%ae>%n%n * %s%n' > ChangeLog -- - # automagic - aclocal - autoheader --- -2.1.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-28 18:59:45 UTC (rev 387781) +++ PKGBUILD 2020-05-28 20:31:31 UTC (rev 387782) @@ -1,43 +1,46 @@ -# Maintainer: Tobias Powalowski <[email protected]> -# Contributor : Mico Tischler <mt-ml at gmx dot net> -# Contributor : Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Maintainer: David Runge <[email protected]> +# Contributor: Tobias Powalowski <[email protected]> +# Contributor: Mico Tischler <mt-ml at gmx dot net> +# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -pkgname="sbsigntools" +pkgname=sbsigntools pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Tools to add signatures to EFI binaries and Drivers" arch=('x86_64') -url="https://build.opensuse.org/package/show/home:jejb1:UEFI/sbsigntools"; +url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/about"; license=('GPL3') -makedepends=('gnu-efi-libs' 'help2man' 'git') -depends=('libutil-linux' 'openssl') -source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git#tag=v${pkgver}"; - "git://git.ozlabs.org/~ccan/ccan" - "0001-sbsigntools-fix-autogen.sh-for-build-service.patch") +depends=('glibc' 'openssl') +makedepends=('git' 'gnu-efi' 'help2man' 'libutil-linux') +source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git#tag=v${pkgver}?signed"; + "git+https://git.ozlabs.org/ccan";) sha256sums=('SKIP' - 'SKIP' - '9085ad181f67ac911918864783a9804af456d33c4631659e6acaaa27987786d7') + 'SKIP') +validpgpkeys=('D5606E73C8B46271BEAD9ADF814AE47C214854D6') # James Bottomley <[email protected]> prepare() { - cd "${srcdir}/${pkgname}" - patch -p1 -i "${srcdir}/0001-sbsigntools-fix-autogen.sh-for-build-service.patch" - - git submodule init - git config submodule."lib/ccan.git".url "${srcdir}/ccan" - git submodule update + cd ${pkgname} + git submodule init + git config submodule."lib/ccan.git".url "${srcdir}/ccan" + git submodule update + ./autogen.sh } build() { - cd "${pkgname}" - - NOCONFIGURE=1 ./autogen.sh - ./configure --prefix="/usr" --bindir="/usr/bin" --sbindir="/usr/bin" --libexecdir="/usr/lib" --mandir="/usr/share/man" --sysconfdir="/etc" - cp "lib/ccan.git/config.h" "lib/ccan/" - make + cd "${pkgname}" + ./configure --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/bin" \ + --libexecdir="/usr/lib" \ + --mandir="/usr/share/man" \ + --sysconfdir="/etc" + make } package() { - cd "${pkgname}" - - make DESTDIR="${pkgdir}" install + depends+=('libuuid.so') + cd "${pkgname}" + make DESTDIR="${pkgdir}" install + install -vDm 644 {AUTHORS,ChangeLog,NEWS,README} \ + -t "${pkgdir}/usr/share/doc/${pkgname}" }
