Update curl version and add curl compat and gnutls

1 files changed, 139 insertions, 52 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 39ff30776da0..307c7acfabf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,16 @@
 # Maintainer: Ziah Jyothi <`echo 'Y29udGFjdEB6aWFoLmRldgo=' | base64 -d`>
-pkgname=curl-http3-ngtcp2
-pkgver=8.0.1
-pkgrel=4
-pkgdesc="An URL retrieval utility and library - compiled with HTTP/3 support (using ngtcp2 and nghttp3)"
+# Base Curl Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Base Curl Contributor: Angel Velasquez <angvp@archlinux.org>
+# Base Curl Contributor: Eric Belanger <eric@archlinux.org>
+# Base Curl Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Base Curl Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgbase=curl-http3-ngtcp2
+pkgname=(curl-http3-ngtcp2 libcurl-http3-ngtcp2-compat libcurl-http3-ngtcp2-gnutls)
+_tag='4ac817f9884c538e1343219facae19d93a42778c' # git rev-parse v${_tag_name}
+pkgver=8.1.1
+pkgrel=1
+pkgdesc="command line tool and library for transferring data with URLs - compiled with HTTP/3 support (using ngtcp2 and nghttp3)"
 arch=('x86_64')
 url='https://curl.se/'
 license=('MIT')
@@ -11,71 +19,150 @@ depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
          'openssl' 'zlib' 'zstd' 'libzstd.so' 'nghttp3' 'libnghttp3.so' 'ngtcp2' 'libngtcp2.so')
 makedepends=('git' 'patchelf')
 conflicts=('curl')
-provides=('curl' 'libcurl.so')
+provides=("curl=${pkgver}" 'libcurl.so')
 validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
-_tag='6b77e19466486b37f93d07d2107579f9508a6645' # git rev-parse v${_tag_name}
 source=("git+https://github.com/curl/curl.git?signed#tag=${_tag}"
-        "ngtcp2-refactor.patch")
+#         "ngtcp2-refactor-r3845.patch"
+        "ngtcp2-refactor-r3898.patch"
+       )
 sha512sums=('SKIP'
-            'fd0496462866aa67b86bd536a9d051dcab9f546a4bda80bd21a28a93aaac57d0d15ed8d19a36ade9642e10ae41922cb0bb63d56a96b4d79e69dda202fd686da5')
+#             'fd0496462866aa67b86bd536a9d051dcab9f546a4bda80bd21a28a93aaac57d0d15ed8d19a36ade9642e10ae41922cb0bb63d56a96b4d79e69dda202fd686da5'
+            '45cc856dbba9c74e778d39c77293b12d5cecedbcb75b4a2c4634681078fcc4dd541be1331be1bb6af4ce926c78bbe48b62524fedf0adec9c28cf01fafccae5f2'
+           )
 
 pkgver() {
-    cd "${srcdir}/curl"
-    git describe | sed -E 's/curl-([0-9]+)_([0-9]+)_([0-9]+)/\1.\2.\3/g'
+  cd "${srcdir}/curl"
+  git describe | sed -E 's/curl-([0-9]+)_([0-9]+)_([0-9]+)/\1.\2.\3/g'
 }
 
 prepare() {
-    cd "${srcdir}/curl"
+  cd "${srcdir}/curl"
 
-    # Patch curl
-    patch -Np1 -i ../ngtcp2-refactor.patch
+  local ngtcp2_version="$(pacman -Qi ngtcp2-git | grep -E '^Version\s*:\s*' | awk '{print $3}')"
+#   if [ "$(sed -E 's/^r([0-9]+).*$/\1/g' <<< "$ngtcp2_version")" -ge 3845 ]; then
+#       # Patch curl
+#       patch -Np1 -i ../ngtcp2-refactor-r3845.patch
+#   fi
+  if [ "$(sed -E 's/^r([0-9]+).*$/\1/g' <<< "$ngtcp2_version")" -ge 3898 ]; then
+      # Patch curl
+      patch -Np1 -i ../ngtcp2-refactor-r3898.patch
+  fi
 
-    # no '-DEV' in version, please...
-    sed -i "/\WLIBCURL_VERSION\W/c #define LIBCURL_VERSION \"${pkgver}\"" include/curl/curlver.h
+  # no '-DEV' in version, release date from tagged commit...
+  sed -i \
+    -e "/\WLIBCURL_VERSION\W/c #define LIBCURL_VERSION \"${pkgver}\"" \
+    -e "/\WLIBCURL_TIMESTAMP\W/c #define LIBCURL_TIMESTAMP \"$(git log -1 --format=%cs "${_tag}")\"" \
+    include/curl/curlver.h
 
-    autoreconf -fi
+  autoreconf -fi
 }
 
 build() {
-    mkdir -p "${srcdir}/build-curl"
-
-    cd "${srcdir}/build-curl"
-
-    "${srcdir}/curl/configure" \
-        LDFLAGS="-Wl,-rpath,/usr/local/lib -fPIC" \
-        --with-openssl \
-        --with-nghttp3 \
-        --with-ngtcp2 \
-        --enable-versioned-symbols \
-        --enable-alt-svc \
-        --prefix=/usr \
-        --mandir=/usr/share/man \
-        --disable-ldap \
-        --disable-ldaps \
-        --disable-manual \
-        --enable-shared \
-        --disable-static \
-        --enable-ipv6 \
-        --enable-threaded-resolver \
-        --enable-websockets \
-        --with-gssapi \
-        --with-libssh2 \
-        --without-librtmp \
-        --disable-rtsp \
-        --with-random=/dev/urandom \
-        --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make -j "$(nproc)"
+  local _configure_options=(
+    --prefix='/usr'
+    --mandir='/usr/share/man'
+    --disable-ldap
+    --disable-ldaps
+    --disable-rtsp
+    --disable-manual
+    --enable-ipv6
+    --enable-threaded-resolver
+    --enable-websockets
+    --enable-alt-svc
+    --without-librtmp
+    --with-gssapi
+    --with-libssh2
+    --with-nghttp3
+    --with-ngtcp2
+    --with-random='/dev/urandom'
+    --with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
+  )
+
+  mkdir -p "${srcdir}"/build-curl{,-compat,-gnutls}
+
+  # build curl
+  cd "${srcdir}"/build-curl
+
+  "${srcdir}/curl"/configure \
+    LDFLAGS="-Wl,-rpath,/usr/local/lib -fPIC" \
+    "${_configure_options[@]}" \
+    --with-openssl \
+    --enable-versioned-symbols
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make -j "$(nproc)"
+
+  # build libcurl-compat
+  cd "${srcdir}"/build-curl-compat
+
+  "${srcdir}/curl"/configure \
+    "${_configure_options[@]}" \
+    --with-openssl \
+    --disable-versioned-symbols
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make -C lib -j "$(nproc)"
+
+  # build libcurl-gnutls
+  cd "${srcdir}"/build-curl-gnutls
+
+  "${srcdir}/curl"/configure \
+    "${_configure_options[@]}" \
+    --disable-versioned-symbols \
+    --without-openssl \
+    --with-gnutls
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make -C lib -j "$(nproc)"
+  patchelf --set-soname 'libcurl-gnutls.so.4' ./lib/.libs/libcurl.so
+}
+
+package_curl-http3-ngtcp2() {
+  cd "${srcdir}"/build-curl
+
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install -C scripts
+
+  cd "${srcdir}/curl"
+
+  # license
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m0644 COPYING
+}
+
+package_libcurl-http3-ngtcp2-compat() {
+  pkgdesc='command line tool and library for transferring data with URLs (no versioned symbols)'
+  depends=('curl-http3-ngtcp2' 'openssl')
+  conflicts=('libcurl-compat')
+  provides=("libcurl-compat=${pkgver}" 'libcurl-compat.so')
+
+  cd "${srcdir}"/build-curl-compat
+
+  make -C lib DESTDIR="${pkgdir}" install
+
+  mv "${pkgdir}"/usr/lib/libcurl{,-compat}.so.4.8.0
+  rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
+  for version in 3 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
+    ln -s libcurl-compat.so.4.8.0 "${pkgdir}"/usr/lib/libcurl.so.${version}
+  done
+
+  install -dm 0755 "${pkgdir}"/usr/share/licenses
+  ln -s curl "${pkgdir}"/usr/share/licenses/libcurl-http3-ngtcp2-compat
 }
 
-package() {
-    cd "${srcdir}/build-curl"
+package_libcurl-http3-ngtcp2-gnutls() {
+  pkgdesc='command line tool and library for transferring data with URLs (no versioned symbols, linked against gnutls)'
+  depends=('curl-http3-ngtcp2' 'gnutls')
+  conflicts=('libcurl-gnutls')
+  provides=("libcurl-gnutls=${pkgver}" 'libcurl-gnutls.so')
+
+  cd "${srcdir}"/build-curl-gnutls
 
-    make DESTDIR="${pkgdir}" install
-    make DESTDIR="${pkgdir}" install -C scripts
+  make -C lib DESTDIR="${pkgdir}" install
 
-    cd ..
+  mv "${pkgdir}"/usr/lib/libcurl{,-gnutls}.so.4.8.0
+  rm "${pkgdir}"/usr/lib/libcurl.{a,so}*
+  ln -s libcurl-gnutls.so.4 "${pkgdir}"/usr/lib/libcurl-gnutls.so
+  for version in 3 4 4.0.0 4.1.0 4.2.0 4.3.0 4.4.0 4.5.0 4.6.0 4.7.0; do
+    ln -s libcurl-gnutls.so.4.8.0 "${pkgdir}"/usr/lib/libcurl-gnutls.so.${version}
+  done
 
-    # License
-    install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m0644 "${srcdir}/curl"/COPYING
+  install -dm 0755 "${pkgdir}"/usr/share/licenses
+  ln -s curl "${pkgdir}"/usr/share/licenses/libcurl-http3-ngtcp2-gnutls
 }