From a72b2054de4b8ee0bf534edadd4de64d0ded92a9 Mon Sep 17 00:00:00 2001 From: Aveen Ismail <42414844+aveenismail@users.noreply.github.com> Date: Tue, 7 Mar 2023 15:33:31 +0100 Subject: [PATCH] Update Debian scripts (#431) Build: Restore .deb package content --- .github/workflows/linux_build.yml | 4 +- debian/changelog | 167 +++++++++++++++++++++++++++++- debian/compat | 1 + debian/control | 2 +- debian/gbp.conf | 3 + debian/libykpiv-dev.install | 4 + debian/libykpiv1.install | 1 + debian/libykpiv1.symbols | 20 ++++ debian/rules | 50 +++------ debian/watch | 3 + debian/ykcs11.install | 2 + debian/yubico-piv-tool.install | 2 + 12 files changed, 220 insertions(+), 39 deletions(-) create mode 100644 debian/compat create mode 100644 debian/gbp.conf create mode 100644 debian/libykpiv-dev.install create mode 100644 debian/libykpiv1.install create mode 100644 debian/libykpiv1.symbols create mode 100644 debian/watch create mode 100644 debian/ykcs11.install create mode 100644 debian/yubico-piv-tool.install diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 9a78f80b..174da8fa 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -6,8 +6,8 @@ on: [push] jobs: job1: - name: Ubuntu 18.04 - runs-on: ubuntu-18.04 + name: Ubuntu 22.04 + runs-on: ubuntu-22.04 steps: # This action checks-out the repository under $GITHUB_WORKSPACE, so the workflow can access it. - name: checkout diff --git a/debian/changelog b/debian/changelog index ed339fa0..7a5d1bfe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ yubico-piv-tool (2.3.1) stable; urgency=medium * ykcs11: Fix incorrect value for public key attributes CKA_PRIVATE, CKA_SENSITIVE, CKA_ALWAYS_SENSITIVE, CKA_EXTRACTABLE and CKA_NEVER_EXTRACTABLE * doc: Minor documentation improvement - -- Aveen Ismail Tue, 7 Feb 2023 13:46:51 +0100 + -- Aveen Ismail Thu, 23 Feb 2023 13:40:26 +0100 yubico-piv-tool (2.3.0) stable; urgency=medium @@ -49,4 +49,167 @@ yubico-piv-tool (2.1.0) stable; urgency=medium * 2.1.0 release - -- Aveen Ismail Mon, 8 Jun 2020 11:19:47 +0100 \ No newline at end of file + -- Aveen Ismail Mon, 8 Jun 2020 11:19:47 +0100 + +yubico-piv-tool (2.0.0-2~ppa3~ppadisttarget1) ppadisttarget; urgency=medium + + * More compiler flags + + -- Klas Lindfors Fri, 31 Jan 2020 12:44:31 +0100 + +yubico-piv-tool (2.0.0-2~ppa2~ppadisttarget1) ppadisttarget; urgency=medium + + * Fix compiler flags + + -- Klas Lindfors Fri, 31 Jan 2020 11:15:34 +0100 + +yubico-piv-tool (2.0.0-2~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Fri, 31 Jan 2020 11:03:42 +0100 + +yubico-piv-tool (1.7.0-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Wed, 03 Apr 2019 09:55:44 +0200 + +yubico-piv-tool (1.6.2-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Fri, 14 Sep 2018 10:06:16 +0200 + +yubico-piv-tool (1.6.1-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Fri, 17 Aug 2018 09:27:54 +0200 + +yubico-piv-tool (1.5.0-1~ppa2~ppadisttarget1) ppadisttarget; urgency=medium + + * Fixup build-depends, now additional dependency on check. + + -- Klas Lindfors Wed, 29 Nov 2017 12:59:54 +0100 + +yubico-piv-tool (1.5.0-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Wed, 29 Nov 2017 12:55:33 +0100 + +yubico-piv-tool (1.4.4-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Tue, 17 Oct 2017 14:09:16 +0200 + +yubico-piv-tool (1.4.3-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Tue, 18 Apr 2017 13:14:00 +0200 + +yubico-piv-tool (1.4.2-1~ppa2~ppadisttarget1) ppadisttarget; urgency=medium + + * Fixup that ykcs11 installed without any files. + + -- Klas Lindfors Fri, 02 Sep 2016 08:59:54 +0200 + +yubico-piv-tool (1.4.2-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Fri, 12 Aug 2016 16:06:04 +0200 + +yubico-piv-tool (1.4.0-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Tue, 03 May 2016 09:45:47 +0200 + +yubico-piv-tool (1.3.1-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Tue, 19 Apr 2016 07:42:18 +0200 + +yubico-piv-tool (1.3.0-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Fri, 19 Feb 2016 12:41:05 +0100 + +yubico-piv-tool (1.2.2-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Tue, 08 Dec 2015 14:15:29 +0100 + +yubico-piv-tool (1.2.1-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Tue, 08 Dec 2015 13:21:22 +0100 + +yubico-piv-tool (1.2.0-1~ppa1~ppadisttarget1) ppadisttarget; urgency=medium + + * New upstream version. + + -- Klas Lindfors Mon, 07 Dec 2015 09:50:53 +0100 + +yubico-piv-tool (1.1.0-1~ppa3~ppadisttarget1) ppadisttarget; urgency=medium + + * PPA package with conflicts/replaces on libykpiv0 + + -- Klas Lindfors Tue, 10 Nov 2015 09:36:44 +0100 + +yubico-piv-tool (1.1.0-1) unstable; urgency=low + + * New upstream version. + + -- Alessio Di Mauro Mon, 09 Nov 2015 09:30:26 +0100 + +yubico-piv-tool (1.0.3-1) unstable; urgency=low + + * New upstream version. + + -- Simon Josefsson Thu, 08 Oct 2015 12:37:17 +0200 + +yubico-piv-tool (1.0.2-1) unstable; urgency=low + + * New upstream version. + * Update upstream-signing-key.pgp. + * Tweak watch file. + + -- Simon Josefsson Tue, 22 Sep 2015 08:31:55 +0200 + +yubico-piv-tool (1.0.1-1) unstable; urgency=low + + * New upstream version. + - Update debian/copyright to match GPL->BSD relicense. + + -- Simon Josefsson Tue, 11 Aug 2015 14:02:39 +0200 + +yubico-piv-tool (1.0.0-1) unstable; urgency=low + + * New upstream version. + * Update README.source. + * Add gbp.conf. + * Add Alessio as uploader, and update upstream-signing-key.pgp. + * Update symbols. + + -- Simon Josefsson Tue, 07 Jul 2015 22:47:03 +0200 + +yubico-piv-tool (0.1.6-1) unstable; urgency=low + + * New upstream version. + + -- Simon Josefsson Wed, 15 Apr 2015 14:53:54 +0200 + +yubico-piv-tool (0.1.5-1) unstable; urgency=low + + * Initial release. (Closes: #779837) + + -- Hans-Christoph Steiner Mon, 30 Mar 2015 16:53:01 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index 880129e8..03f6a335 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Debian Authentication Maintainers , Klas Lindfors , Dain Nilsson , Alessio Di Mauro , Aveen Ismail Section: utils Priority: extra -Build-Depends: debhelper (>= 9), pkg-config, libpcsclite-dev, libssl-dev, gengetopt, help2man, dh-autoreconf, chrpath, check, cmake (>=3.5) +Build-Depends: debhelper (>= 9), pkg-config, libpcsclite-dev, libssl-dev, gengetopt, help2man, dh-autoreconf, chrpath, check, cmake Standards-Version: 4.1.4 Homepage: https://developers.yubico.com/yubico-piv-tool/ diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 00000000..5474c608 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +sign-tags = True diff --git a/debian/libykpiv-dev.install b/debian/libykpiv-dev.install new file mode 100644 index 00000000..fb74a138 --- /dev/null +++ b/debian/libykpiv-dev.install @@ -0,0 +1,4 @@ +usr/lib/*/libykpiv.so +usr/lib/*/libykpiv.a +usr/lib/*/pkgconfig +usr/include/ykpiv diff --git a/debian/libykpiv1.install b/debian/libykpiv1.install new file mode 100644 index 00000000..37a00411 --- /dev/null +++ b/debian/libykpiv1.install @@ -0,0 +1 @@ +usr/lib/*/libykpiv.so.* diff --git a/debian/libykpiv1.symbols b/debian/libykpiv1.symbols new file mode 100644 index 00000000..5faa99d3 --- /dev/null +++ b/debian/libykpiv1.symbols @@ -0,0 +1,20 @@ +libykpiv.so.1 libykpiv1 #MINVER# + YKPIV_0.1.0@YKPIV_0.1.0 0.1.0 + YKPIV_0.2.0@YKPIV_0.2.0 1.0.0 + ykpiv_authenticate@YKPIV_0.1.0 0.1.0 + ykpiv_check_version@YKPIV_0.1.0 0.1.0 + ykpiv_connect@YKPIV_0.1.0 0.1.0 + ykpiv_decipher_data@YKPIV_0.2.0 1.0.0 + ykpiv_disconnect@YKPIV_0.1.0 0.1.0 + ykpiv_done@YKPIV_0.1.0 0.1.0 + ykpiv_fetch_object@YKPIV_0.1.0 0.1.0 + ykpiv_get_version@YKPIV_0.1.0 0.1.0 + ykpiv_hex_decode@YKPIV_0.1.0 0.1.0 + ykpiv_init@YKPIV_0.1.0 0.1.0 + ykpiv_save_object@YKPIV_0.1.0 0.1.0 + ykpiv_set_mgmkey@YKPIV_0.1.0 0.1.0 + ykpiv_sign_data@YKPIV_0.1.0 0.1.0 + ykpiv_strerror@YKPIV_0.1.0 0.1.0 + ykpiv_strerror_name@YKPIV_0.1.0 0.1.0 + ykpiv_transfer_data@YKPIV_0.1.0 0.1.0 + ykpiv_verify@YKPIV_0.1.0 0.1.0 diff --git a/debian/rules b/debian/rules index 14c01659..4aa60794 100755 --- a/debian/rules +++ b/debian/rules @@ -1,36 +1,18 @@ #!/usr/bin/make -f -DH_VERBOSE = 1 -export DH_OPTIONS=-v - -BUILDDIR = build_dir - -# second called by launchpad -build: build-indep build-arch - -build-indep: - # nothing to be done - -build-arch: - mkdir $(BUILDDIR); - cd $(BUILDDIR); cmake -DCMAKE_INSTALL_PREFIX=../debian/tmp/usr .. - make -C $(BUILDDIR) - -# third called by launchpad -binary: binary-indep binary-arch - -binary-indep: - # nothing to be done - -binary-arch: - cd $(BUILDDIR); cmake -P cmake_install.cmake - mkdir debian/tmp/DEBIAN - dpkg-gencontrol -pyubico-piv-tool - dpkg --build debian/tmp .. - -# first called by launchpad -clean: - rm -f build - rm -rf $(BUILDDIR) - -.PHONY: binary binary-arch binary-indep clean +export DEB_CFLAGS_MAINT_APPEND=-std=gnu99 + +%: + dh $@ --parallel + +override_dh_install: + chrpath -d $(CURDIR)/debian/tmp/usr/bin/* + chrpath -d $(CURDIR)/debian/tmp/usr/lib/*/libykpiv.so.* + chrpath -d $(CURDIR)/debian/tmp/usr/lib/*/libykcs11.so.* + find debian/tmp -name \*.la -delete + find debian/tmp -name libykcs11.a -delete + find debian/tmp -name ykcs11-version.h -delete + dh_install --fail-missing + +override_dh_auto_configure: + dh_auto_configure -- -DSKIP_TESTS=1 diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..7d66a815 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ + https://developers.yubico.com/yubico-piv-tool/Releases/ yubico-piv-tool-(.*)\.tar\.gz diff --git a/debian/ykcs11.install b/debian/ykcs11.install new file mode 100644 index 00000000..92c5cc6f --- /dev/null +++ b/debian/ykcs11.install @@ -0,0 +1,2 @@ +usr/lib/*/libykcs11.so.* +usr/lib/*/libykcs11.so* diff --git a/debian/yubico-piv-tool.install b/debian/yubico-piv-tool.install new file mode 100644 index 00000000..a65408f7 --- /dev/null +++ b/debian/yubico-piv-tool.install @@ -0,0 +1,2 @@ +usr/bin +usr/share/man