groups/241.native_packages_inet.group:curl:${PKG_DEPENDS}: adds gnutls.

groups/241.native_packages_inet.group:curl: moved from groups/231.native_packages_etc.group.

2 files changed, 17 insertions, 16 deletions

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 384aec52..7b52ba7a 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -3,14 +3,14 @@
 #
 GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
-alsa_lib apr apr_util bdwgc bmake bochs bzip2 clzip cmake cron curl
-dante dbus debianutils emacs expat ffmpeg file gdbm geoip gettext_tiny
-ghostscript giflib gnuchess gzip hastyhex hexcurse htop icecast
-imagemagick infounzip infozip john lcms2 less lmdb lolcode mintty mlogin
-musl_compat musl_fts ncdu ncurses ncursestw ncursesw npth openjpeg p7zip
-pcre popt procps_ng qemu qpdf qrencode rpm rw shared_mime_info slang
-sqlite3 tcl tdnf texinfo tiff tmux tzdb utf8proc util_linux vim w32api
-w32lib xorriso xz yabasic zstd")";
+alsa_lib apr apr_util bdwgc bmake bochs bzip2 clzip cmake cron dante dbus
+debianutils emacs expat ffmpeg file gdbm geoip gettext_tiny ghostscript
+giflib gnuchess gzip hastyhex hexcurse htop icecast imagemagick infounzip
+infozip john lcms2 less lmdb lolcode mintty mlogin musl_compat musl_fts
+ncdu ncurses ncursestw ncursesw npth openjpeg p7zip pcre popt procps_ng
+qemu qpdf qrencode rpm rw shared_mime_info slang sqlite3 tcl tdnf texinfo
+tiff tmux tzdb utf8proc util_linux vim w32api w32lib xorriso xz yabasic
+zstd")";
 : ${PKG_ALSA_LIB_SHA256SUM:=3cdc3a93a6427a26d8efab4ada2152e64dd89140d981f6ffa003e85be707aedf};
 : ${PKG_ALSA_LIB_VERSION:=1.1.8};
 : ${PKG_ALSA_LIB_URL:=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PKG_ALSA_LIB_VERSION}.tar.bz2};
@@ -64,10 +64,6 @@ w32lib xorriso xz yabasic zstd")";
 : ${PKG_CRON_URLS_GIT:="pkg-cron=https://github.com/lalbornoz/pkg-cron@master"};
 : ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"};
 : ${PKG_CRON_IN_TREE:=1};
-: ${PKG_CURL_SHA256SUM:=b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a};
-: ${PKG_CURL_VERSION:=7.68.0};
-: ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
-: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"};
 : ${PKG_DANTE_DEPENDS:="libtirpc"};
 : ${PKG_DANTE_SHA256SUM:=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7};
 : ${PKG_DANTE_VERSION:=1.4.2};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index dc7f21bb..d41872c9 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -3,10 +3,10 @@
 #
 GROUP_TARGET="native_packages";
 NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" "
-apk_tools aria2 bind ca_certificates dropbear fetchmail git gnupg gnutls
-httpd inetutils irssi isync ldns lighttpd lynx mailutils microsocks mtr
-mutt nginx nullmailer openlitespeed opensmtpd openssh pacman rsync socat
-thttpd w3m weechat wget whois")";
+apk_tools aria2 bind ca_certificates curl dropbear fetchmail git gnupg
+gnutls httpd inetutils irssi isync ldns lighttpd lynx mailutils microsocks
+mtr mutt nginx nullmailer openlitespeed opensmtpd openssh pacman rsync
+socat thttpd w3m weechat wget whois")";
 : ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl libz"};
 : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
 : ${PKG_APK_TOOLS_VERSION:=2.6.8};
@@ -30,6 +30,11 @@ thttpd w3m weechat wget whois")";
 : ${PKG_CA_CERTIFICATES_CFLAGS_BUILD_EXTRA:=-I${PREFIX_NATIVE}/include};
 : ${PKG_CA_CERTIFICATES_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_CA_CERTIFICATES_ENV_VARS_EXTRA:="HOST_CC=gcc"};
+: ${PKG_CURL_DEPENDS:="gnutls"};
+: ${PKG_CURL_SHA256SUM:=b724240722276a27f6e770b952121a3afd097129d8c9fe18e6272dc34192035a};
+: ${PKG_CURL_VERSION:=7.68.0};
+: ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
+: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"};
 : ${PKG_DROPBEAR_DEPENDS:="libz"};
 : ${PKG_DROPBEAR_SHA256SUM:=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4};
 : ${PKG_DROPBEAR_VERSION:=2019.78};