upgpkg: json_dto 0.3.3-2

Fix license, CMake build guidelines

bloaty/.SRCINFO

@@ -1,17 +1,16 @@
 pkgbase = bloaty
 	pkgdesc = a size profiler for binaries
 	pkgver = 1.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/google/bloaty
 	arch = x86_64
-	license = Apache
+	license = Apache-2.0
 	makedepends = cmake
 	depends = gcc-libs
 	depends = re2
 	depends = protobuf
 	depends = capstone
 	depends = abseil-cpp
-	options = !emptydirs
 	source = https://github.com/google/bloaty/releases/download/v1.1/bloaty-1.1.tar.bz2
 	source = https://src.fedoraproject.org/rpms/bloaty/raw/rawhide/f/bloaty-1.1-absl.patch
 	sha256sums = a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f

bloaty/PKGBUILD

@@ -1,14 +1,13 @@
 # Maintainer: Bert Peters <bert@bertptrs.nl>
 pkgname=bloaty
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="a size profiler for binaries"
 arch=(x86_64)
 url="https://github.com/google/bloaty"
-license=('Apache')
+license=('Apache-2.0')
 depends=(gcc-libs re2 protobuf capstone abseil-cpp)
 makedepends=(cmake)
-options=(!emptydirs)
 source=(
     "https://github.com/google/bloaty/releases/download/v$pkgver/bloaty-$pkgver.tar.bz2"
     "https://src.fedoraproject.org/rpms/bloaty/raw/rawhide/f/bloaty-1.1-absl.patch")
@@ -23,10 +22,8 @@ prepare() {
 
 build() {
     cd "$pkgname-$pkgver"
-	# Bloaty doesn't allow using an empty build type.
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None \
-	# Unfortunately, this breaks RELRO, so we need to fix that
+        -DCMAKE_EXE_LINKER_FLAGS_RELEASE="$LDFLAGS" -Wno-dev
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_EXE_LINKER_FLAGS_RELEASE="$LDFLAGS" -Wno-dev .
     make
 }
 

cargo-cache/.SRCINFO

@@ -0,0 +1,14 @@
+pkgbase = cargo-cache
+	pkgdesc = Display info and prune cargo cache
+	pkgver = 0.8.3
+	pkgrel = 2
+	url = https://github.com/matthiaskrgr/cargo-cache
+	arch = x86_64
+	license = MIT
+	license = Apache-2.0
+	makedepends = cargo
+	depends = libgit2
+	source = cargo-cache-0.8.3.tar.gz::https://github.com/matthiaskrgr/cargo-cache/archive/0.8.3.tar.gz
+	sha256sums = d0f71214d17657a27e26aef6acf491bc9e760432a9bc15f2571338fcc24800e4
+
+pkgname = cargo-cache

cargo-cache/PKGBUILD

@@ -0,0 +1,33 @@
+# Maintainer: Bert Peters <bert@bertptrs.nl>
+# Contributor: Jason Nader <jason d0t nader pr0t0nmail.c0m>
+
+pkgname=cargo-cache
+pkgver=0.8.3
+pkgrel=2
+pkgdesc="Display info and prune cargo cache"
+arch=('x86_64')
+url="https://github.com/matthiaskrgr/cargo-cache"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/matthiaskrgr/cargo-cache/archive/$pkgver.tar.gz")
+license=('MIT' 'Apache-2.0')
+depends=('cargo')
+sha256sums=('d0f71214d17657a27e26aef6acf491bc9e760432a9bc15f2571338fcc24800e4')
+depends=('libgit2')
+makedepends=('cargo')
+
+prepare() {
+    cd "$pkgname-$pkgver"
+    # Upstream tried to make libgit vendoring optional but it doesn't work. Manually implement it anyway.
+    sed -i "s|\[\"vendored-libgit2\"\]|\[\]|" Cargo.toml
+    sed -i "s|, \"vendored-libgit\"||" Cargo.toml
+}
+
+build() {
+    cd "$pkgname-$pkgver"
+    cargo build --release --locked
+}
+
+package() {
+    cd "$pkgname-$pkgver"
+    install -Dm755 "target/release/cargo-cache" "$pkgdir/usr/bin/cargo-cache"
+    install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE-MIT
+}

hashclash-git/.SRCINFO

@@ -0,0 +1,16 @@
+pkgbase = hashclash-git
+	pkgdesc = Project HashClash - MD5 & SHA-1 cryptanalysis
+	pkgver = r46.d833657
+	pkgrel = 1
+	url = https://github.com/cr-marcstevens/hashclash
+	arch = x86_64
+	license = MIT
+	makedepends = git
+	makedepends = boost
+	depends = boost-libs
+	provides = hashclash
+	conflicts = hashclash
+	source = hashclash::git+https://github.com/cr-marcstevens/hashclash
+	md5sums = SKIP
+
+pkgname = hashclash-git

hashclash-git/PKGBUILD

@@ -0,0 +1,36 @@
+# Maintainer: Bert Peters <bert@bertptrs.nl>
+pkgname=hashclash-git
+pkgver=r46.d833657
+pkgrel=1
+pkgdesc="Project HashClash - MD5 & SHA-1 cryptanalysis "
+arch=(x86_64)
+url="https://github.com/cr-marcstevens/hashclash"
+license=('MIT')
+depends=(boost-libs)
+makedepends=('git' 'boost')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=("${pkgname%-git}::git+https://github.com/cr-marcstevens/hashclash")
+md5sums=('SKIP')
+
+pkgver() {
+	cd "$srcdir/${pkgname%-git}"
+
+	# Git, no tags available
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+	cd "$srcdir/${pkgname%-git}"
+	autoreconf --install
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "$srcdir/${pkgname%-git}"
+	make DESTDIR="$pkgdir/" install
+	install -D "$srcdir/${pkgname%-git}/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+	install -d "$pkgdir/usr/share/${pkgname%-git}/scripts"
+	install -Dt "$pkgdir/usr/share/${pkgname%-git}/scripts" -m755 scripts/*
+}

json_dto/.SRCINFO

@@ -1,10 +1,10 @@
 pkgbase = json_dto
 	pkgdesc = A small header-only library for converting data between json representation and c++ structs
 	pkgver = 0.3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Stiffstream/json_dto
 	arch = any
-	license = BSD
+	license = BSD-3-Clause
 	checkdepends = catch2-v2
 	makedepends = cmake
 	depends = rapidjson

json_dto/PKGBUILD

@@ -1,11 +1,11 @@
 # Maintainer: Bert Peters <bert@bertptrs.nl>
 pkgname=json_dto
 pkgver=0.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A small header-only library for converting data between json representation and c++ structs"
 arch=(any)
 url="https://github.com/Stiffstream/json_dto"
-license=('BSD')
+license=('BSD-3-Clause')
 depends=(rapidjson)
 makedepends=(cmake)
 checkdepends=(catch2-v2)
@@ -16,6 +16,7 @@ build() {
     cd "$pkgname-v.$pkgver"
     cmake dev -DCMAKE_INSTALL_PREFIX=/usr -DJSON_DTO_SAMPLE=Off \
         -DJSON_DTO_TEST=On \
+        -DCMAKE_BUILD_TYPE=None \
         -DJSON_DTO_FIND_DEPS=On -Wno-dev
     make
 }