Curl => 8.0.1 (#8094)

* Curl => 8.0.0 * Add postinstall to handle libcurl removal removing curl binary * change core to have curl in lieu of libcurl * lint * update packages.yaml, add doc line to curl.rb * update ca_certificates to 20230311 * curl => 8.0.1 * test curl version logic * cleanup version * conflicts_ok only needed during build
2026-01-09 15:37:56 -05:00 · 2023-03-20 16:40:04 -04:00
parent 0f393f358f
commit d5e4e7cc95
51 changed files with 131 additions and 125 deletions
--- a/packages/ca_certificates.rb
+++ b/packages/ca_certificates.rb
@@ -3,26 +3,27 @@ require 'package'
 class Ca_certificates < Package
  description 'Common CA Certificates PEM files'
  homepage 'https://salsa.debian.org/debian/ca-certificates'
-  version '20210119-2' # Do not replace version with @_ver, the install will break.
-  @_ver = "#{version}[0..-3]"
+  version '20230311' # Do not replace version with @_ver, the install will break.
  license 'MPL-1.1'
  compatibility 'all'
-  source_url "https://salsa.debian.org/debian/ca-certificates/-/archive/debian/#{@_ver}/ca-certificates-debian-#{@_ver}.tar.bz2"
-  source_sha256 'af30b4d9a2c58e42134067d29f0ba6120e5960fd140393d5574d4bdcf5b824d6'
+  source_url 'https://salsa.debian.org/debian/ca-certificates.git'
+  git_hashtag '2c507f8c5aac8b50e35291739ffd40676ab08993'

  binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20210119-2_armv7l/ca_certificates-20210119-2-chromeos-armv7l.tar.xz',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20210119-2_armv7l/ca_certificates-20210119-2-chromeos-armv7l.tar.xz',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20210119-2_i686/ca_certificates-20210119-2-chromeos-i686.tar.xz',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20210119-2_x86_64/ca_certificates-20210119-2-chromeos-x86_64.tar.xz'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20230311_armv7l/ca_certificates-20230311-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20230311_armv7l/ca_certificates-20230311-chromeos-armv7l.tar.zst',
+       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20230311_i686/ca_certificates-20230311-chromeos-i686.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/ca_certificates/20230311_x86_64/ca_certificates-20230311-chromeos-x86_64.tar.zst'
  })
  binary_sha256({
-    aarch64: '84bb971e1d955d113b48013c694fd209f1627799f9c5a1e6123911c27d72ad4c',
-     armv7l: '84bb971e1d955d113b48013c694fd209f1627799f9c5a1e6123911c27d72ad4c',
-       i686: 'd8bdc641c52b7e551e2396f7276c09601b533211e1f43e21bffab55fba49eeab',
-     x86_64: '4f3ef9802940646facd1408b34b378ef866829d1c60b3b23560465afff5b97c3'
+    aarch64: 'd2bdc9b48ea268489f2c3ef9ec7a1e2bdca4af60c355463a83bd66714d6cba72',
+     armv7l: 'd2bdc9b48ea268489f2c3ef9ec7a1e2bdca4af60c355463a83bd66714d6cba72',
+       i686: '7c8814ec22eef600c82ef5247df63d3d3a488976c9d7fbeed18bdbe287423079',
+     x86_64: 'ef0260e6c237ee2e23d1571973026a39f37aefb342fa68653777ca97466629e6'
  })

+  depends_on 'py3_cryptography' => :build
+
  no_patchelf

  def self.patch
@@ -108,7 +109,7 @@ class Ca_certificates < Package
    @date_temp = `date -u`.chomp
    @ca_cert_conf = <<~CA_CERT_CONF_HEREDOC
      # Automatically generated by Chromebrew package #{Module.nesting.first}
-      # from ca-certificates-debian-#{@_ver}
+      # from ca-certificates-debian-#{version}
      # #{@date_temp}
      # Do not edit.
    CA_CERT_CONF_HEREDOC
--- a/packages/clib.rb
+++ b/packages/clib.rb
@@ -22,7 +22,7 @@ class Clib < Package
     x86_64: '06c1bac595387b7eeb3e2fddd64c94d3ef6394492e4315f4604e4c4f719efeb9'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'

  def self.build
    system "sed -i 's,PREFIX ?= /usr/local,PREFIX ?= #{CREW_DEST_PREFIX},' Makefile"
--- a/packages/cloudcross.rb
+++ b/packages/cloudcross.rb
@@ -22,7 +22,7 @@ class Cloudcross < Package
     x86_64: 'b36c6764610ad51c82bc930b701968863bde93057ce11436b7a9cb9d41c3e398'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'qtbase' => :build

  def self.build
--- a/packages/cmake.rb
+++ b/packages/cmake.rb
@@ -32,7 +32,7 @@ class Cmake < Package
  depends_on 'libnghttp2'
  depends_on 'zstd'
  depends_on 'libarchive'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'librhash'
  depends_on 'libuv'
  depends_on 'llvm' => :build
--- a/packages/codelobster.rb
+++ b/packages/codelobster.rb
@@ -9,7 +9,7 @@ class Codelobster < Package
  source_url 'https://codelobsteride.com/download/codelobsteride-1.11.1_amd64.deb'
  source_sha256 '7772c87bfda497caaf48ce92ad263a57e537f898fc307a213159d73f9b95e28f'

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'sommelier'

  binary_url({
--- a/packages/curl.rb
+++ b/packages/curl.rb
@@ -3,10 +3,66 @@ require 'package'
 class Curl < Package
  description 'Command line tool and library for transferring data with URLs.'
  homepage 'https://curl.se/'
-  version '7.88.1'
+  @_ver = '8.0.1'
+  version @_ver
  license 'curl'
  compatibility 'all'
-  is_fake
+  source_url 'https://curl.se/download/curl-8.0.1.tar.xz'
+  source_sha256 '0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0'

-  depends_on 'libcurl'
+  binary_url({
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/curl/8.0.1_armv7l/curl-8.0.1-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/curl/8.0.1_armv7l/curl-8.0.1-chromeos-armv7l.tar.zst',
+       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/curl/8.0.1_i686/curl-8.0.1-chromeos-i686.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/curl/8.0.1_x86_64/curl-8.0.1-chromeos-x86_64.tar.zst'
+  })
+  binary_sha256({
+    aarch64: 'aa1584ebca641a8fa7513f81cfa59bf5d6382be85f56c4cd4ffacf4bd0490375',
+     armv7l: 'aa1584ebca641a8fa7513f81cfa59bf5d6382be85f56c4cd4ffacf4bd0490375',
+       i686: '23894ab8f2afcf3c1d01b23f596ce45dd4119a45d1c3449d36a29b30398b3e87',
+     x86_64: '3af563e88ba9335a871cab2620f0c8703bd35275ef1ff717dd01e7b6a0d37dc2'
+  })
+
+  depends_on 'brotli' # R
+  depends_on 'ca_certificates' => :build
+  depends_on 'c_ares' # R
+  depends_on 'glibc' # R
+  depends_on 'libcyrussasl' # R
+  depends_on 'libidn2' # R
+  depends_on 'libnghttp2' # R
+  depends_on 'libpsl' # R
+  depends_on 'libssh' # R
+  depends_on 'libunistring' # R
+  depends_on 'openldap' # R
+  depends_on 'openssl' # R
+  depends_on 'python3' => :build
+  depends_on 'rust' => :build
+  depends_on 'valgrind' => :build
+  depends_on 'zlibpkg' # R
+  depends_on 'zstd' # R
+
+  no_patchelf
+
+  def self.build
+    system '[ -x configure ] || autoreconf -fvi'
+    system 'filefix'
+    system "mold -run ./configure #{CREW_OPTIONS} \
+      --disable-maintainer-mode \
+      --enable-ares \
+      --enable-ipv6 \
+      --enable-ldap \
+      --enable-unix-sockets \
+      --with-ca-bundle=#{CREW_PREFIX}/etc/ssl/certs/ca-certificates.crt \
+      --with-ca-fallback \
+      --with-ca-path=#{CREW_PREFIX}/etc/ssl/certs \
+      --with-libssh \
+      --with-openssl \
+      --without-gnutls \
+      --without-librtmp"
+    system "mold -run make -j #{CREW_NPROC}"
+  end
+
+  def self.install
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+  end
 end
--- a/packages/darktable.rb
+++ b/packages/darktable.rb
@@ -18,7 +18,7 @@ class Darktable < Package

  depends_on 'cairo'
  depends_on 'colord'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'dbus_glib'
  depends_on 'fop'
  depends_on 'gexiv2'
--- a/packages/dropbox_uploader.rb
+++ b/packages/dropbox_uploader.rb
@@ -22,7 +22,7 @@ class Dropbox_uploader < Package
     x86_64: 'de141ac2bbc1a53d30776f5a280af3733222a92ca09465f13ea5b9d6000b2731'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'

  def self.install
    system "sed -i 's,dropbox_uploader.sh,dropbox_uploader,g' dropShell.sh"
--- a/packages/elfutils.rb
+++ b/packages/elfutils.rb
@@ -27,7 +27,7 @@ class Elfutils < Package
  depends_on 'gcc' # R
  depends_on 'glibc' # R
  depends_on 'libarchive' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libmicrohttpd' # R
  depends_on 'sqlite' # R
  depends_on 'xzutils' # R
--- a/packages/ettercap.rb
+++ b/packages/ettercap.rb
@@ -31,7 +31,7 @@ class Ettercap < Package
  depends_on 'ghostscript' => :build
  depends_on 'glibc' # R
  depends_on 'libbsd' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libnet' # R
  depends_on 'libpcap' # R
  depends_on 'libtool' => :build
--- a/packages/ettercap_gtk.rb
+++ b/packages/ettercap_gtk.rb
@@ -35,7 +35,7 @@ class Ettercap_gtk < Package
  depends_on 'gtk3' # R
  depends_on 'harfbuzz' # R
  depends_on 'libbsd' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libnet' # R
  depends_on 'libpcap' # R
  depends_on 'libtool' => :build
--- a/packages/gdal.rb
+++ b/packages/gdal.rb
@@ -29,7 +29,7 @@ class Gdal < Package
  depends_on 'glibc' # R
  depends_on 'hdf5' => :build
  depends_on 'jsonc' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libdeflate' # R
  depends_on 'libgeotiff' # R
  depends_on 'libjpeg' # R
--- a/packages/git.rb
+++ b/packages/git.rb
@@ -23,7 +23,7 @@ class Git < Package
  })

  depends_on 'ca_certificates' => :build
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libunistring'
  depends_on 'pcre2'
  depends_on 'zlibpkg'
--- a/packages/glyr.rb
+++ b/packages/glyr.rb
@@ -22,7 +22,7 @@ class Glyr < Package
     x86_64: 'c9ade91fe3da5da7cd53d53ff9e17a072fc60dd540f2e812ebfccdfe041aed50'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'glib'
  depends_on 'sqlite'

--- a/packages/grive.rb
+++ b/packages/grive.rb
@@ -28,7 +28,7 @@ class Grive < Package
  depends_on 'expat' => :build
  depends_on 'gcc' # R
  depends_on 'glibc' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libgcrypt' # R
  depends_on 'libgpgerror' # R
  depends_on 'yajl' # R
--- a/packages/gstreamer.rb
+++ b/packages/gstreamer.rb
@@ -50,7 +50,7 @@ class Gstreamer < Package
  depends_on 'libass' # R
  depends_on 'libavc1394' # R
  depends_on 'libcap'
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libde265' # R
  depends_on 'libdrm' # R
  depends_on 'libdv' # R
--- a/packages/kcov.rb
+++ b/packages/kcov.rb
@@ -22,7 +22,7 @@ class Kcov < Package
     x86_64: '35ccebb9cda52beb4cf13977483fcb4ebc6011fe0c1e52ce9be2cefb5fbd300a'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'elfutils'
  depends_on 'py3_six'

--- a/packages/ldc.rb
+++ b/packages/ldc.rb
@@ -9,7 +9,7 @@ class Ldc < Package
  source_url 'https://github.com/ldc-developers/ldc/releases/download/v1.31.0/ldc2-1.31.0-linux-x86_64.tar.xz'
  source_sha256 '7dbd44786c0772ec41890a8c03e22b0985d6ef547c40943dd56bc6be21cf4d98'

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'ncurses'
  depends_on 'zlibpkg'

--- a/packages/libcurl.rb
+++ b/packages/libcurl.rb
@@ -1,68 +1,17 @@
 require 'package'
+require_relative 'curl'

 class Libcurl < Package
  description 'Command line tool and library for transferring data with URLs.'
  homepage 'https://curl.se/'
-  @_ver = '7.88.1'
-  version @_ver
+  version Curl.version.to_s
  license 'curl'
  compatibility 'all'
-  source_url 'https://curl.se/download/curl-7.88.1.tar.xz'
-  source_sha256 '1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f'
+  is_fake

-  binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libcurl/7.88.1_armv7l/libcurl-7.88.1-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libcurl/7.88.1_armv7l/libcurl-7.88.1-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libcurl/7.88.1_i686/libcurl-7.88.1-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libcurl/7.88.1_x86_64/libcurl-7.88.1-chromeos-x86_64.tar.zst'
-  })
-  binary_sha256({
-    aarch64: 'ef8cafeffc06c09cc042cec8fb79a3dc75cca5ea6d39ce47a6f2e78f607bd211',
-     armv7l: 'ef8cafeffc06c09cc042cec8fb79a3dc75cca5ea6d39ce47a6f2e78f607bd211',
-       i686: 'df6c5eeeb071abf662514a5685ac611f9bba137d90975e3af8304d5b3a521993',
-     x86_64: 'd95afcd1276483a4a384a3490fb0f841685b18bc406c3d6cd8ad202ecc26516d'
-  })
+  depends_on 'curl'

-  depends_on 'brotli' # R
-  depends_on 'ca_certificates' => :build
-  depends_on 'c_ares' # R
-  depends_on 'glibc' # R
-  depends_on 'libcyrussasl' # R
-  depends_on 'libidn2' # R
-  depends_on 'libnghttp2' # R
-  depends_on 'libpsl' # R
-  depends_on 'libssh' # R
-  depends_on 'libunistring' # R
-  depends_on 'openldap' # R
-  depends_on 'openssl' # R
-  depends_on 'python3' => :build
-  depends_on 'rust' => :build
-  depends_on 'valgrind' => :build
-  depends_on 'zlibpkg' # R
-  depends_on 'zstd' # R
-
-  no_patchelf
-
-  def self.build
-    system '[ -x configure ] || autoreconf -fvi'
-    system 'filefix'
-    system "mold -run ./configure #{CREW_OPTIONS} \
-      --disable-maintainer-mode \
-      --enable-ares \
-      --enable-ipv6 \
-      --enable-ldap \
-      --enable-unix-sockets \
-      --with-ca-bundle=#{CREW_PREFIX}/etc/ssl/certs/ca-certificates.crt \
-      --with-ca-fallback \
-      --with-ca-path=#{CREW_PREFIX}/etc/ssl/certs \
-      --with-libssh \
-      --with-openssl \
-      --without-gnutls \
-      --without-librtmp"
-    system 'mold -run make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
+  def self.postinstall
+    system 'crew reinstall curl' unless File.file?("#{CREW_PREFIX}/bin/curl")
  end
 end
--- a/packages/libexiv2.rb
+++ b/packages/libexiv2.rb
@@ -28,7 +28,7 @@ class Libexiv2 < Package
  depends_on 'expat' # R
  depends_on 'gcc' # R
  depends_on 'glibc' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'zlibpkg' # R

  def self.patch
--- a/packages/mapserver.rb
+++ b/packages/mapserver.rb
@@ -24,7 +24,7 @@ class Mapserver < Package

  depends_on 'cmake'
  depends_on 'cairo'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'fribidi'
  depends_on 'gdal'
  depends_on 'geos'
--- a/packages/minerd.rb
+++ b/packages/minerd.rb
@@ -22,7 +22,7 @@ class Minerd < Package
     x86_64: 'a4101c3804f18fa55f93ea0516c5deca35093064f47146ef1f398b8b1e10f343'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'jansson'

  def self.build
--- a/packages/mupdf.rb
+++ b/packages/mupdf.rb
@@ -27,7 +27,7 @@ class Mupdf < Package
  depends_on 'gcc' # R
  depends_on 'glibc' # R
  depends_on 'jbigkit'
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libjpeg'
  depends_on 'libx11' # R
  depends_on 'libxext' # R
--- a/packages/netcdf.rb
+++ b/packages/netcdf.rb
@@ -22,7 +22,7 @@ class Netcdf < Package
     x86_64: 'ff3aaee614a276bcbde78d0afb4339ca7312b76e16f9811bb97a621cb6f8874c'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'hdf5'

  def self.build
--- a/packages/netsurf.rb
+++ b/packages/netsurf.rb
@@ -26,7 +26,7 @@ class Netsurf < Package
  depends_on 'libidn2'
  depends_on 'libmng'
  depends_on 'libxml2'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'lcms'
  depends_on 'libwebp'
  depends_on 'libcss'
--- a/packages/newsboat.rb
+++ b/packages/newsboat.rb
@@ -24,7 +24,7 @@ class Newsboat < Package

  depends_on 'sqlite'
  depends_on 'gettext'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libxml2'
  depends_on 'libstfl'
  depends_on 'jsonc'
--- a/packages/obs.rb
+++ b/packages/obs.rb
@@ -18,7 +18,7 @@ class Obs < Package
    x86_64: '854492244415cea4b4874cf3cd2302649d5b538d89366f2fd1ccceda7ff1f3ea'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'ffmpeg'
  depends_on 'jack'
  depends_on 'jansson'
--- a/packages/od1n.rb
+++ b/packages/od1n.rb
@@ -22,7 +22,7 @@ class Od1n < Package
     x86_64: '38b19eb0cb14694e30040105ac05fd0e250ced2bbac6c0e7428b8adbd495dd2c'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'

  def self.build
    system 'make'
--- a/packages/php5.rb
+++ b/packages/php5.rb
@@ -26,7 +26,7 @@ class Php5 < Package
  depends_on 'libpng'
  depends_on 'libxslt'
  depends_on 'libzip'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'exif'
  depends_on 'freetype'
  depends_on 'pcre'
--- a/packages/php71.rb
+++ b/packages/php71.rb
@@ -27,7 +27,7 @@ class Php71 < Package
  depends_on 'libwebp'
  depends_on 'libxslt'
  depends_on 'libzip'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'exif'
  depends_on 'freetype'
  depends_on 'pcre'
--- a/packages/php72.rb
+++ b/packages/php72.rb
@@ -28,7 +28,7 @@ class Php72 < Package
  depends_on 'libjpeg'
  depends_on 'libxslt'
  depends_on 'libzip'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'exif'
  depends_on 'freetype'
  depends_on 'pcre'
--- a/packages/php73.rb
+++ b/packages/php73.rb
@@ -23,7 +23,7 @@ class Php73 < Package
     x86_64: '332b1b11d789481fc735d59722364772ec68cfc4de6c775a558b45454cb074bb'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libgcrypt'
  depends_on 'libjpeg'
  depends_on 'libpng'
--- a/packages/php74.rb
+++ b/packages/php74.rb
@@ -24,7 +24,7 @@ class Php74 < Package
  })

  depends_on 'aspell_en'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libgcrypt'
  depends_on 'libjpeg'
  depends_on 'libpng'
--- a/packages/php80.rb
+++ b/packages/php80.rb
@@ -23,7 +23,7 @@ class Php80 < Package
  })

  depends_on 'aspell_en'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libgcrypt'
  depends_on 'libjpeg'
  depends_on 'libpng'
--- a/packages/php81.rb
+++ b/packages/php81.rb
@@ -23,7 +23,7 @@ class Php81 < Package
  })

  depends_on 'aspell_en'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libgcrypt'
  depends_on 'libjpeg'
  depends_on 'libpng'
--- a/packages/php82.rb
+++ b/packages/php82.rb
@@ -23,7 +23,7 @@ class Php82 < Package
  })

  depends_on 'aspell_en'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libgcrypt'
  depends_on 'libjpeg'
  depends_on 'libpng'
--- a/packages/poppler.rb
+++ b/packages/poppler.rb
@@ -38,7 +38,7 @@ class Poppler < Package
  depends_on 'gcc' # R
  depends_on 'glibc' # R
  depends_on 'harfbuzz' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'zlibpkg' # R

  def self.build
--- a/packages/profanity.rb
+++ b/packages/profanity.rb
@@ -22,7 +22,7 @@ class Profanity < Package
     x86_64: 'ead2d0a06e37c622913b76941c292a3b10ad500a1f75ebab45e2b08779f007bd'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'glib'
  depends_on 'gpgme'
  depends_on 'gtk2'
--- a/packages/qemu.rb
+++ b/packages/qemu.rb
@@ -54,7 +54,7 @@ class Qemu < Package
  depends_on 'gcc' # R
  depends_on 'glibc' # R
  depends_on 'gnutls' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libcyrussasl' # R
  depends_on 'libpng' # R
  depends_on 'libseccomp' # R
--- a/packages/r.rb
+++ b/packages/r.rb
@@ -28,7 +28,7 @@ class R < Package
  depends_on 'glibc' # R
  depends_on 'glib' # R
  depends_on 'icu4c' # R
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libice' # R
  depends_on 'libjpeg' # R
  depends_on 'libpng' # R
--- a/packages/rng_tools.rb
+++ b/packages/rng_tools.rb
@@ -22,7 +22,7 @@ class Rng_tools < Package
     x86_64: 'df9504bf42632204e92fb4b97ac0b863c7e8cbb7d5592ec9ab7c4224071b711b'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libgcrypt'
  depends_on 'sysfsutils'
  depends_on 'psmisc'
--- a/packages/roswell.rb
+++ b/packages/roswell.rb
@@ -23,7 +23,7 @@ class Roswell < Package
  })

  depends_on 'brotli'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libcyrussasl'
  depends_on 'libnghttp2'
  depends_on 'openldap'
--- a/packages/tesseract.rb
+++ b/packages/tesseract.rb
@@ -31,7 +31,7 @@ class Tesseract < Package
  depends_on 'glib'
  depends_on 'leptonica'
  depends_on 'libarchive'
-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'libjpeg'
  depends_on 'openldap'
  depends_on 'harfbuzz'
--- a/packages/transmission.rb
+++ b/packages/transmission.rb
@@ -33,7 +33,7 @@ class Transmission < Package
  depends_on 'gtkmm4' # R
  depends_on 'harfbuzz' # R
  depends_on 'hicolor_icon_theme' # L
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libdeflate' # R
  depends_on 'libevent' # R
  depends_on 'libpsl' # R
--- a/packages/uget.rb
+++ b/packages/uget.rb
@@ -22,7 +22,7 @@ class Uget < Package
     x86_64: 'e75eeddfb77a1d22fbe9ff38b20b65a2e85862b22812f78296a4f760f44a0854'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'
  depends_on 'gtk3'
  depends_on 'libnotify'
  depends_on 'gstreamer'
--- a/packages/weechat.rb
+++ b/packages/weechat.rb
@@ -24,7 +24,7 @@ class Weechat < Package

  depends_on 'libgcrypt'
  depends_on 'aspell' => :build
-  depends_on 'libcurl' => :build
+  depends_on 'curl' => :build
  depends_on 'lua' => :build
  depends_on 'python2'
  depends_on 'tcl' => :build
--- a/packages/wxwidgets.rb
+++ b/packages/wxwidgets.rb
@@ -46,7 +46,7 @@ class Wxwidgets < Package
  depends_on 'expat' # R
  depends_on 'gcc' # R
  depends_on 'glibc' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libglvnd' # R
  depends_on 'libice' # R
  depends_on 'libpng' # R
--- a/packages/wxwidgets31.rb
+++ b/packages/wxwidgets31.rb
@@ -51,7 +51,7 @@ class Wxwidgets31 < Package
  depends_on 'freetype' # R
  depends_on 'gcc' # R
  depends_on 'glibc' # R
-  depends_on 'libcurl' # R
+  depends_on 'curl' # R
  depends_on 'libglvnd' # R
  depends_on 'libsoup2' # R
  depends_on 'libxtst' # R
--- a/packages/xercesc.rb
+++ b/packages/xercesc.rb
@@ -22,7 +22,7 @@ class Xercesc < Package
     x86_64: 'd1a0c7fd791b712963ea851792e8253474ec0ba5683d631ce0b0ac981e90762e'
  })

-  depends_on 'libcurl'
+  depends_on 'curl'

  def self.build
    system './configure',
--- a/tools/core_packages.txt
+++ b/tools/core_packages.txt
@@ -11,6 +11,7 @@ ca_certificates
 cmake
 compressdoc
 crew_profile_base
+curl
 diffutils
 docbook_xml
 docbook_xml412
@@ -52,7 +53,6 @@ jsoncpp
 krb5
 less
 libarchive
-libcurl
 libcyrussasl
 libdb
 libedit
--- a/tools/packages.yaml
+++ b/tools/packages.yaml
@@ -1165,6 +1165,11 @@ url: https://github.com/apple/cups/releases
 activity: medium
 ---
 kind: url
+name: curl
+url: https://github.com/curl/curl/releases
+activity: high
+---
+kind: url
 name: curtail
 url: https://github.com/Huluti/Curtail/releases
 activity: low
@@ -3731,11 +3736,6 @@ url: https://github.com/lipnitsk/libcue/releases
 activity: none
 ---
 kind: url
-name: libcurl
-url: https://github.com/curl/curl/releases
-activity: high
---
-kind: url
 name: libcyrussasl
 url: https://github.com/cyrusimap/cyrus-imapd/releases
 activity: medium