upgpkg: curl-git 8.4.0.r38.gd31a8424e8-1

2 files changed, 173 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ae381f29745..ce6a39908308 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = curl-git
-	pkgdesc = An URL retrieval utility and library
-	pkgver = 7.83.1.r187.g06fc95830
+	pkgdesc = A command line tool and library for transferring data with URLs
+	pkgver = 8.4.0.r38.gd31a8424e8
 	pkgrel = 1
-	url = https://github.com/curl/curl
+	url = https://curl.se/
+	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = git
+	makedepends = gnutls
+	makedepends = openssl
+	makedepends = patchelf
+	depends = glibc
 	depends = ca-certificates
 	depends = brotli
+	depends = krb5
 	depends = libbrotlidec.so
 	depends = libgssapi_krb5.so
-	depends = krb5
 	depends = libidn2
 	depends = libidn2.so
 	depends = libnghttp2
@@ -18,15 +23,45 @@ pkgbase = curl-git
 	depends = libpsl.so
 	depends = libssh2
 	depends = libssh2.so
-	depends = openssl
+	depends = libzstd.so
 	depends = zlib
 	depends = zstd
-	depends = libzstd.so
-	provides = libcurl.so
-	provides = curl=7.83.1
-	conflicts = curl
-	source = curl-git::git+https://github.com/curl/curl?signed
-	validpgpkeys = 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
+	options = staticlibs
+	source = git+https://github.com/curl/curl.git
 	sha256sums = SKIP
 
 pkgname = curl-git
+	depends = glibc
+	depends = ca-certificates
+	depends = brotli
+	depends = krb5
+	depends = libbrotlidec.so
+	depends = libgssapi_krb5.so
+	depends = libidn2
+	depends = libidn2.so
+	depends = libnghttp2
+	depends = libpsl
+	depends = libpsl.so
+	depends = libssh2
+	depends = libssh2.so
+	depends = libzstd.so
+	depends = zlib
+	depends = zstd
+	depends = openssl
+	provides = curl=8.4.0.r38.gd31a8424e8
+	conflicts = curl
+
+pkgname = libcurl-compat-git
+	pkgdesc = A command line tool and library for transferring data with URLs (no versioned symbols)
+	depends = curl
+	provides = libcurl-compat=8.4.0.r38.gd31a8424e8
+	provides = libcurl-compat.so
+	conflicts = libcurl-compat
+
+pkgname = libcurl-gnutls-git
+	pkgdesc = A command line tool and library for transferring data with URLs (no versioned symbols, linked against gnutls)
+	depends = curl
+	depends = gnutls
+	provides = libcurl-gnutls=8.4.0.r38.gd31a8424e8
+	provides = libcurl-gnutls.so
+	conflicts = libcurl-gnutls
diff --git a/PKGBUILD b/PKGBUILD
index 6fc843216da0..f6abec731464 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+# Previous maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor:  Vincent Grande <shoober420@gmail.com>
 # Contributor: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,58 +7,141 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
-## GPG key: https://daniel.haxx.se/mykey.asc
-
-pkgname=curl-git
-pkgver=7.83.1.r187.g06fc95830
+pkgbase=curl-git
+pkgname=('curl-git' 'libcurl-compat-git' 'libcurl-gnutls-git')
+pkgver=8.4.0.r38.gd31a8424e8
 pkgrel=1
-pkgdesc="An URL retrieval utility and library"
-arch=('x86_64')
-url="https://github.com/curl/curl"
+pkgdesc="A command line tool and library for transferring data with URLs"
+arch=('i686' 'x86_64')
+url="https://curl.se/"
 license=('MIT')
-depends=(
-	'ca-certificates' 'brotli' 'libbrotlidec.so' 'libgssapi_krb5.so'
-	'krb5' 'libidn2' 'libidn2.so' 'libnghttp2' 'libpsl' 'libpsl.so'
-	'libssh2' 'libssh2.so' 'openssl' 'zlib' 'zstd' 'libzstd.so')
-makedepends=('git')
-provides=('libcurl.so' "curl=${pkgver%.r*}")
-conflicts=('curl')
-source=("$pkgname::git+$url?signed")
+depends=('glibc' 'ca-certificates' 'brotli' 'krb5' 'libbrotlidec.so' 'libgssapi_krb5.so'
+         'libidn2' 'libidn2.so' 'libnghttp2' 'libpsl' 'libpsl.so' 'libssh2' 'libssh2.so'
+         'libzstd.so' 'zlib' 'zstd')
+makedepends=('git' 'gnutls' 'openssl' 'patchelf')
+options=('staticlibs')
+source=("git+https://github.com/curl/curl.git")
 sha256sums=('SKIP')
-validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') ## Daniel Stenburg
+
 
 pkgver() {
-	git -C "$pkgname" describe --long --tags | sed 's/^curl-//;s/_/./g;s/-/.r/;s/-/./'
+  cd "curl"
+
+  _tag=$(git tag -l --sort -v:refname | grep -E '^curl-[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/^curl-//;s/_/./g'
 }
 
 build() {
-	cd "$pkgname"
-
-	./buildconf
-	./configure \
-			--prefix=/usr \
-			--mandir=/usr/share/man \
-			--disable-ldap \
-			--disable-ldaps \
-			--disable-manual \
-			--enable-ipv6 \
-			--enable-versioned-symbols \
-			--enable-threaded-resolver \
-			--with-gssapi \
-			--with-libssh2 \
-			--with-openssl \
-			--with-random=/dev/urandom \
-			--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-
-	make
+  cd "curl"
+
+  local _configure_options=(
+    --prefix="/usr"
+    --disable-ldap
+    --disable-ldaps
+    --disable-manual
+    --enable-ipv6
+    --enable-threaded-resolver
+    --with-ca-bundle="/etc/ssl/certs/ca-certificates.crt"
+    --with-gssapi
+    --with-libssh2
+  )
+
+  autoreconf -fi
+
+  mkdir -p _build{-curl,-libcurl-compat,-libcurl-gnutls}
+
+  # build curl
+  pushd "_build-curl"
+  ../configure \
+    "${_configure_options[@]}" \
+    --enable-versioned-symbols \
+    --with-openssl
+  make
+  popd
+
+  # build libcurl-compat
+  pushd "_build-libcurl-compat"
+  ../configure \
+    "${_configure_options[@]}" \
+    --disable-versioned-symbols \
+    --with-openssl
+  make -C "lib"
+  popd
+
+  # build libcurl-gnutls
+  pushd "_build-libcurl-gnutls"
+  ../configure \
+    "${_configure_options[@]}" \
+    --disable-versioned-symbols \
+    --with-gnutls \
+    --without-openssl
+  make -C "lib"
+  patchelf --set-soname 'libcurl-gnutls.so.4' "lib/.libs/libcurl.so"
+  popd
+}
+
+check() {
+  cd "_build-curl"
+
+  #make check
+}
+
+package_curl-git() {
+  depends+=('openssl')
+  provides=("curl=$pkgver")
+  conflicts=('curl')
+
+  cd "curl"
+
+  make -C "_build-curl" DESTDIR="$pkgdir" install
+  make -C "_build-curl/scripts" DESTDIR="$pkgdir" install
+  install -Dm644 "COPYING" -t "$pkgdir/usr/share/licenses/curl"
 }
 
-package() {
-	cd "$pkgname"
+package_libcurl-compat-git() {
+  pkgdesc='A command line tool and library for transferring data with URLs (no versioned symbols)'
+  depends=('curl')
+  provides=("libcurl-compat=$pkgver" 'libcurl-compat.so')
+  conflicts=('libcurl-compat')
+
+  cd "curl"
+
+  make -C "_build-libcurl-compat/lib" DESTDIR="$pkgdir" install
+
+  mv "$pkgdir/usr/lib/libcurl.a" "$pkgdir/usr/lib/libcurl-compat.a"
+
+  _version_full=$(find $pkgdir/usr/lib -type f | grep .so | tail -c 6)
+  _version_major=$(echo $_version_full | head -c 1)
+  rm "$pkgdir/usr/lib/libcurl.so"
+  rm "$pkgdir/usr/lib/libcurl.so.$_version_major"
+  mv "$pkgdir/usr/lib/libcurl.so.$_version_full" "$pkgdir/usr/lib/libcurl-compat.so.$_version_full"
+  ln -s "libcurl-compat.so.$_version_full" "$pkgdir/usr/lib/libcurl-compat.so"
+  ln -s "libcurl-compat.so.$_version_full" "$pkgdir/usr/lib/libcurl-compat.so.$_version_major"
+
+  install -Dm644 "COPYING" -t "$pkgdir/usr/share/licenses/libcurl-compat"
+}
+
+package_libcurl-gnutls-git() {
+  pkgdesc="A command line tool and library for transferring data with URLs (no versioned symbols, linked against gnutls)"
+  depends=('curl' 'gnutls')
+  provides=("libcurl-gnutls=$pkgver" 'libcurl-gnutls.so')
+  conflicts=('libcurl-gnutls')
+
+  cd "curl"
+
+  make -C "_build-libcurl-gnutls/lib" DESTDIR="$pkgdir" install
+
+  mv "$pkgdir/usr/lib/libcurl.a" "$pkgdir/usr/lib/libcurl-gnutls.a"
 
-	make DESTDIR="$pkgdir" install
-	make DESTDIR="$pkgdir" install -C scripts
+  _version_full=$(find $pkgdir/usr/lib -type f | grep .so | tail -c 6)
+  _version_major=$(echo $_version_full | head -c 1)
+  rm "$pkgdir/usr/lib/libcurl.so"
+  rm "$pkgdir/usr/lib/libcurl.so.$_version_major"
+  mv "$pkgdir/usr/lib/libcurl.so.$_version_full" "$pkgdir/usr/lib/libcurl-gnutls.so.$_version_full"
+  ln -s "libcurl-gnutls.so.$_version_full" "$pkgdir/usr/lib/libcurl-gnutls.so"
+  ln -s "libcurl-gnutls.so.$_version_full" "$pkgdir/usr/lib/libcurl-gnutls.so.$_version_major"
 
-	# license
-	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "COPYING" -t "$pkgdir/usr/share/licenses/libcurl-gnutls"
 }