upgpkg: upx-git 4.2.3.r17.g90a7faa1-1

2 files changed, 27 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c242d1f012a4..04faede2cdad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = upx-git
 	pkgdesc = A free, portable, extendable, high-performance executable packer for several executable formats
-	pkgver = 4.0.2.r13.g15484aa2
+	pkgver = 4.2.3.r17.g90a7faa1
 	pkgrel = 1
 	url = https://upx.github.io/
 	arch = i686
 	arch = x86_64
-	license = GPL2
+	license = GPL-2.0-or-later
 	makedepends = git
+	makedepends = cmake
 	depends = gcc-libs
-	depends = ucl
-	depends = zlib
-	provides = upx=4.0.2.r13.g15484aa2
+	provides = upx=4.2.3.r17.g90a7faa1
 	conflicts = upx
 	source = git+https://github.com/upx/upx.git#branch=devel
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e490f94d8d83..5c1c3108f736 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=upx-git
-pkgver=4.0.2.r13.g15484aa2
+pkgver=4.2.3.r17.g90a7faa1
 pkgrel=1
 pkgdesc="A free, portable, extendable, high-performance executable packer for several executable formats"
 arch=('i686' 'x86_64')
 url="https://upx.github.io/"
-license=('GPL2')
-depends=('gcc-libs' 'ucl' 'zlib')
-makedepends=('git')
+license=('GPL-2.0-or-later')
+depends=('gcc-libs')
+makedepends=('git' 'cmake')
 provides=("upx=$pkgver")
 conflicts=('upx')
 source=("git+https://github.com/upx/upx.git#branch=devel")
@@ -24,18 +24,33 @@ prepare() {
 pkgver() {
   cd "upx"
 
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  _tag=$(git tag -l --sort -v:refname | grep -E '^v?[0-9\.]+$' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//'
 }
 
 build() {
   cd "upx"
 
-  make all
+  cmake \
+    -B "_build" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_INSTALL_LIBDIR="lib" \
+    -DUSE_STRICT_DEFAULTS=OFF \
+    ./
+  make -C "_build"
+}
+
+check() {
+  cd "upx"
+
+  #make -C "_build" test
 }
 
 package() {
   cd "upx"
 
-  install -Dm755 "src/upx.out" "$pkgdir/usr/bin/upx"
-  install -Dm644 "doc/upx.1" -t "$pkgdir/usr/share/man/man1"
+  make -C "_build" DESTDIR="$pkgdir" install
 }