[arch-commits] Commit in crypto++/trunk (PKGBUILD crypto++.install)

Maxime Gauduin alucryd at archlinux.org
Mon May 18 10:53:32 UTC 2020


    Date: Monday, May 18, 2020 @ 10:53:32
  Author: alucryd
Revision: 629441

FS#66692: crypto++ 8.2.0-3

Modified:
  crypto++/trunk/PKGBUILD
Deleted:
  crypto++/trunk/crypto++.install

------------------+
 PKGBUILD         |   79 ++++++++++++++++++++++++++---------------------------
 crypto++.install |    4 --
 2 files changed, 39 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-18 10:53:20 UTC (rev 629440)
+++ PKGBUILD	2020-05-18 10:53:32 UTC (rev 629441)
@@ -1,4 +1,5 @@
-# Maintainer: Baptiste Jonglez <archlinux at bitsofnetworks.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Baptiste Jonglez <archlinux at bitsofnetworks.org>
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Alexander Rødseth <rodseth at gmail.com>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
@@ -7,56 +8,54 @@
 
 pkgname=crypto++
 pkgver=8.2.0
-_srcver=${pkgver//./}
-pkgrel=2
-pkgdesc="A free C++ class library of cryptographic schemes"
-arch=('x86_64')
-url="https://www.cryptopp.com/"
-license=('custom')
-depends=('gcc-libs')
-makedepends=('unzip')
-# Fix https://bugs.archlinux.org/task/56689
-install="crypto++.install"
-source=("https://www.cryptopp.com/cryptopp${_srcver}.zip"{,.sig}
-        'libcrypto++.pc'
-        'cve-2019-14318.patch')
-# Checksums from https://www.cryptopp.com/release600.html
-sha1sums=('b042d2f0c93410abdec7c12bcd92787d019f8da1'
-          'SKIP'
-          'ef530175d27101dcb23a3f92d3c80a529f1d7b02'
-          '4788135c92536cac42a98e59d219a9e859b759e3')
-sha256sums=('03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058'
-            'SKIP'
-            '8722862336f9fe0181734619c197bf4248f0e07b93bdcd693709f57b2f6aa9e6'
-            'd9cabc1eab0dfbab1d4bfff75fa99766995089e52b83a175918e738516efbb41')
-sha512sums=('753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5'
-            'SKIP'
-            '3be1569e81af1f9b35e944faae3e9962ee2e492fb38e94fe7f847b85da033a79bbfeff193e0edb2d69f2d893f6e8279be144b9395653db67374300f7feb23276'
-            'c5075963acc0f8f5bac38306bac324e0ca5aa74abed417cf5f626267c4c409f84c31a89e351b07a1880cfd30c1451e0f1e3dd8721050df74c1d3d080097a84d9')
-validpgpkeys=('B8CC19802062211A508B2F5CCE0586AF1F8E37BD') # Jeffrey Walton (Crypto++ Release) <noloader at gmail.com>
+pkgrel=3
+pkgdesc='A free C++ class library of cryptographic schemes'
+arch=(x86_64)
+url=https://www.cryptopp.com/
+license=(custom)
+depends=(gcc-libs)
+makedepends=(
+  git
+  unzip
+)
+source=(
+  git+https://github.com/weidai11/cryptopp.git#tag=9dcc26c58213abb8351fbb1b2a7a1d2c667366e4
+  #git+https://github.com/weidai11/cryptopp.git?signed#tag=9dcc26c58213abb8351fbb1b2a7a1d2c667366e4
+  cve-2019-14318.patch
+)
+sha256sums=(
+  SKIP
+  d9cabc1eab0dfbab1d4bfff75fa99766995089e52b83a175918e738516efbb41
+)
+validpgpkeys=(B8CC19802062211A508B2F5CCE0586AF1F8E37BD) # Jeffrey Walton <noloader at gmail.com>
 
+pkgver() {
+  cd cryptopp
+
+  git describe --tags | sed 's/^CRYPTOPP_//; s/_/./g'
+}
+
 prepare() {
-  patch -p0 < "$srcdir"/cve-2019-14318.patch
+  cd cryptopp
+
+  patch -Np0 -i ../cve-2019-14318.patch
 }
 
 build() {
-  CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
+  export CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC"
+  make -C cryptopp dynamic cryptest.exe libcryptopp.pc
 }
 
 check() {
-  make test
+  make -C cryptopp test
 }
 
 package() {
-  make install DESTDIR="$pkgdir" PREFIX="/usr"
-  # Install pkgconfig file
-  install -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 "${srcdir}/libcrypto++.pc" "${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
+  make DESTDIR="${pkgdir}" PREFIX=/usr -C cryptopp install
+  install -Dm 644 cryptopp/License.txt -t "${pkgdir}"/usr/share/licenses/crypto++/
   # Remove cryptest.exe and test files, only needed for check() and bloats the package
   # because cryptest.exe is linked statically.
-  rm "${pkgdir}/usr/bin/cryptest.exe"
-  rmdir "${pkgdir}/usr/bin/"
-  rm -r "${pkgdir}/usr/share/cryptopp/"
-  # Install license
-  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  rm -rf "${pkgdir}"/usr/{bin,share/cryptopp}
 }
+
+# vim: ts=2 sw=2 et:

Deleted: crypto++.install
===================================================================
--- crypto++.install	2020-05-18 10:53:20 UTC (rev 629440)
+++ crypto++.install	2020-05-18 10:53:32 UTC (rev 629441)
@@ -1,4 +0,0 @@
-pre_upgrade() {
-	# Up to crypto++ 5.6.5-3, libcryptopp.so.5.6 was not tracked by pacman (symlinked at install time)
-	[ -L /usr/lib/libcryptopp.so.5.6 ] && unlink /usr/lib/libcryptopp.so.5.6 || true
-}



More information about the arch-commits mailing list