diff options
Diffstat (limited to 'ftp')
49 files changed, 298 insertions, 195 deletions
diff --git a/ftp/aria2/DEPENDS b/ftp/aria2/DEPENDS index a295999572..9984757110 100755 --- a/ftp/aria2/DEPENDS +++ b/ftp/aria2/DEPENDS @@ -14,5 +14,8 @@ optional_depends ca-certificates \ "--with-ca-bundle='${INSTALL_ROOT}/etc/ssl/certs/ca-certificates.crt'" \ "" \ "Do you want certificate support?" && +optional_depends libssh2 \ + --{with,without}-libssh2 \ + 'for SFTP support' && depends -sub CXX gcc && depends zlib diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS index c844c60fd9..88328536cb 100755 --- a/ftp/aria2/DETAILS +++ b/ftp/aria2/DETAILS @@ -1,12 +1,12 @@ SPELL=aria2 - VERSION=1.18.8 - SOURCE_HASH=sha512:59ca3f1d387bc58ba571ce137af08892e43c869760915a3acbb88ba536046a235ce4fd5662ce051de72df28251452db42bb565f1853f9927d3255a149e5620db + VERSION=1.36.0 + SOURCE_HASH=sha512:8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542 SOURCE=$SPELL-$VERSION.tar.xz - SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/stable/$SPELL-$VERSION/$SOURCE + SOURCE_URL[0]=https://github.com/aria2/aria2/releases/download/release-$VERSION/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://aria2.sourceforge.net/ ENTERED=20060322 - LICENSE[0]=GPL + LICENSE[0]=GPL-2.0-or-later KEYWORDS="ftp http https bittorrent" SHORT="A utility for downloading files." cat << EOF diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY index 558c5c9bc3..f400677309 100644 --- a/ftp/aria2/HISTORY +++ b/ftp/aria2/HISTORY @@ -1,3 +1,8 @@ +2022-10-13 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 1.36.0 + normalised LICENSE to SPDX + * DEPENDS: added optional dep on libssh2 + 2015-05-25 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: remove SOURCEFORGE_URL usage (automated) diff --git a/ftp/axel/DETAILS b/ftp/axel/DETAILS index 65e70ad55c..e0c9c71fc3 100755 --- a/ftp/axel/DETAILS +++ b/ftp/axel/DETAILS @@ -1,9 +1,10 @@ +# Watch: https://github.com/axel-download-accelerator/axel/releases tag/v([0-9.]+) SPELL=axel - VERSION=2.17.11 + VERSION=2.17.13 SECURITY_PATCH=5 SOURCE="$SPELL-$VERSION.tar.xz" SOURCE_URL[0]=https://github.com/axel-download-accelerator/axel/releases/download/v$VERSION/$SOURCE - SOURCE_HASH=sha512:111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1 + SOURCE_HASH=sha512:e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=https://github.com/axel-download-accelerator/axel/ LICENSE[0]="GPL" diff --git a/ftp/axel/HISTORY b/ftp/axel/HISTORY index 66dc3e6cb5..666dffb543 100644 --- a/ftp/axel/HISTORY +++ b/ftp/axel/HISTORY @@ -1,3 +1,9 @@ +2024-02-06 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 2.17.13 + +2024-01-29 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 2.17.12 + 2021-12-20 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 2.17.11 diff --git a/ftp/btfs/DEPENDS b/ftp/btfs/DEPENDS index 013566616f..6742fdbeae 100755 --- a/ftp/btfs/DEPENDS +++ b/ftp/btfs/DEPENDS @@ -3,4 +3,6 @@ depends automake && depends -sub CXX gcc && depends curl && depends fuse && -depends rb-libtorrent +depends rb-libtorrent && + +optional_depends python3 "" "" "for btplay" diff --git a/ftp/btfs/DETAILS b/ftp/btfs/DETAILS index 7b964370d9..9d9be62ea0 100755 --- a/ftp/btfs/DETAILS +++ b/ftp/btfs/DETAILS @@ -1,8 +1,8 @@ SPELL=btfs - VERSION=2.10 + VERSION=2.24 + SOURCE_HASH=sha512:33339d9eefe6836c8c96c4ea0fb6ee99150df5500f4d1dce107c20df72e0d2959152fca0901676cec1eebf1de39a69dc46ea96442aecd234c9fb4e7618337b0c SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=https://github.com/johang/${SPELL}/archive/v${VERSION}.tar.gz - SOURCE_HASH=sha512:e0f0b0d29ffdcfd820481766d55524ee8d0ace5681ee57b27ff0777f9ab2083351eefe5b7f425d0850d7bec7c9193fa7b29c30c73971abc0e82953a2a1b6a448 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="https://github.com/johang/btfs" LICENSE[0]="GPL" diff --git a/ftp/btfs/HISTORY b/ftp/btfs/HISTORY index 118c87c62e..ac92894896 100644 --- a/ftp/btfs/HISTORY +++ b/ftp/btfs/HISTORY @@ -1,2 +1,6 @@ +2023-04-04 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 2.24 + * DEPENDS: added optional python3 + 2016-07-01 Pavel Vinogradov <public@sourcemage.org> * DEPENDS, DETAILS, PRE_BUILD: spell created diff --git a/ftp/curl/CONFIGURE b/ftp/curl/CONFIGURE deleted file mode 100755 index ec81b65943..0000000000 --- a/ftp/curl/CONFIGURE +++ /dev/null @@ -1 +0,0 @@ -config_query_list CURL_SSL "Which SSL lib do you want?" none libressl openssl gnutls nss mbedtls diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS index 77603c63d7..9427569c79 100755 --- a/ftp/curl/DEPENDS +++ b/ftp/curl/DEPENDS @@ -1,46 +1,35 @@ +. "$GRIMOIRE/depends_one_of.function" + depends gmp && depends zlib && -case $CURL_SSL in - gnutls) - depends gnutls \ - "--with-gnutls \ - --without-ssl --without-nss --without-mbedtls" - ;; - libressl | openssl) - depends SSL \ - "--with-ssl \ - --without-gnutls --without-nss --without-mbedtls" - ;; - nss) - depends -sub PEM nss \ - "--with-nss \ - --without-gnutls --without-ssl --without-mbedtls" - ;; - mbedtls | polarssl) - depends mbedtls \ - "--with-mbedtls \ - --without-ssl --without-nss --without-gnutls" - ;; - none) - OPTS+=" --without-mbedtls --without-gnutls --without-nss --without-ssl" - ;; -esac && +optional_depends_one_of CURL_SSL \ + gnutls '--with-ssl --with-gnutls --without-openssl --without-nss --without-mbedtls --without-wolfssl' \ + openssl '--with-ssl --without-gnutls --with-openssl --without-nss --without-mbedtls --without-wolfssl' \ + libressl '--with-ssl --without-gnutls --with-openssl --without-nss --without-mbedtls --without-wolfssl' \ + -sub PEM nss '--with-ssl --without-gnutls --without-openssl --with-nss --without-mbedtls --without-wolfssl' \ + mbedtls '--with-ssl --without-gnutls --without-openssl --without-nss --with-mbedtls --without-wolfssl' \ + wolfssl '--with-ssl --without-gnutls --without-openssl --without-nss --without-mbedtls --with-wolfssl' \ + '--without-ssl --without-ca-bundle' \ + 'SSL library' && -if [[ "$CURL_SSL" == "none" ]]; then - OPTS+=" --without-ca-bundle" -else - depends ca-certificates "--with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt" +if [[ "$CURL_SSL" != "none" ]]; then + depends ca-certificates "--with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt" fi && -optional_depends krb5 \ - "--with-gssapi " \ - "--without-gssapi " \ +optional_depends krb5 \ + "--with-gssapi" \ + "--without-gssapi" \ "GSSAPI support" && -optional_depends libssh2 \ - "--with-libssh2" \ - '--without-libssh2' \ +optional_depends libpsl \ + "--with-libpsl" \ + "--without-libpsl" \ + "for libpsl support" && + +optional_depends libssh2 \ + "--with-libssh2" \ + '--without-libssh2' \ "for SSH (SCP and SFTP) support" && optional_depends rtmpdump \ @@ -48,36 +37,36 @@ optional_depends rtmpdump \ '--without-librtmp' \ "for RTMP streaming media support" && -optional_depends c-ares \ - "--enable-ares=$INSTALL_ROOT/usr" \ - '--disable-ares' \ +optional_depends c-ares \ + "--enable-ares=$INSTALL_ROOT/usr" \ + '--disable-ares' \ "to performs DNS requests and name resolves asynchronously" && -optional_depends libidn \ - "--with-libidn=$INSTALL_ROOT/usr" \ - '--without-libidn' \ +optional_depends libidn2 \ + "--with-libidn2=$INSTALL_ROOT/usr" \ + '--without-libidn2' \ 'for International Domain Name support' && if [[ "$CURL_SSL" != "none" ]]; then - optional_depends openldap \ - '--enable-ldap --enable-ldaps' \ - '--disable-ldap --disable-ldaps' \ + optional_depends openldap \ + '--enable-ldap --enable-ldaps' \ + '--disable-ldap --disable-ldaps' \ 'for Lightweight Directory Access Protocol support' else - optional_depends openldap \ - '--enable-ldap' \ - '--disable-ldap' \ + optional_depends openldap \ + '--enable-ldap' \ + '--disable-ldap' \ 'for Lightweight Directory Access Protocol support' fi && -optional_depends nghttp2 \ - "--with-nghttp2" \ - "--without-nghttp2" \ +optional_depends nghttp2 \ + "--with-nghttp2" \ + "--without-nghttp2" \ "for HTTP/2 support" && -optional_depends nghttp3 \ - "--with-nghttp3" \ - "--without-nghttp3" \ +optional_depends nghttp3 \ + "--with-nghttp3" \ + "--without-nghttp3" \ "for HTTP/3 support" && if is_depends_enabled ${SPELL} nghttp3; then diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS index 44b72654b4..64b1aaf009 100755 --- a/ftp/curl/DETAILS +++ b/ftp/curl/DETAILS @@ -1,16 +1,17 @@ SPELL=curl - VERSION=7.84.0 - SECURITY_PATCH=37 + VERSION=8.6.0 + SECURITY_PATCH=43 SOURCE=$SPELL-$VERSION.tar.xz SOURCE2=$SOURCE.asc SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" - SOURCE_URL[0]=https://curl.haxx.se/download/$SOURCE +# Watch: https://curl.se/download/ + SOURCE_URL[0]=https://curl.se/download/$SOURCE SOURCE_URL[1]=ftp://ftp.sunet.se/pub/www/utilities/$SPELL/$SOURCE SOURCE_URL[2]=https://${SPELL}.askapache.com/download/${SOURCE} SOURCE2_URL[1]=$SOURCE_URL.asc SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY SOURCE2_IGNORE=signature - WEB_SITE=https://curl.haxx.se/ + WEB_SITE=https://curl.se/ ENTERED=20010922 LICENSE[0]=MIT KEYWORDS="ftp" diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY index 24e4be1a5c..58595c2fad 100644 --- a/ftp/curl/HISTORY +++ b/ftp/curl/HISTORY @@ -1,3 +1,62 @@ +2024-01-31 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.6.0 + * DEPENDS: added optional libpsl + +2023-12-07 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.5.0 + +2023-10-11 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 8.4.0 + SECURITY_PATCH++fixes CVE-2023-38545 and CVE-2023-38546. + +2023-09-14 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.3.0, SECURITY_PATCH++, (CVE-2023-38039) + +2023-07-19 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.2.0 + +2023-05-31 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.1.2, updated source and Watch urls + +2023-05-24 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.1.1 + +2023-05-17 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.1.0 + +2023-03-21 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 8.0.1, SECURITY_PATCH++, (CVE-2023-27535) + +2023-02-28 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: --with-libidn -> --with-libidn2 + * DETAILS: ++PATCHLEVEL + +2023-02-20 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.88.1 + +2023-02-15 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.88.0 + +2023-01-14 Vlad Glagolev <stealth@sourcemage.org> + * {PRE_,PRE_SUB_,REPAIR^all^PRE_,}DEPENDS: recover lost nss dependency + +2022-12-21 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.87.0, SECURITY_PATCH++ + +2022-12-02 Remko van der Vossen <wich@sourcemage.org> + * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: + add SSL sub depends + +2022-12-01 Remko van der Vossen <wich@sourcemage.org> + * CONFIGURE, DEPENDS: use optional_depends_one_of for SSL library selection + +2022-10-26 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.86.0, SECURITY_PATCH++, (CVE-2022-42916, CVE-2022-42915, + CVE-2022-35260, CVE-2022-32221) + +2022-08-31 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 7.85.0, SECURITY_PATCH++, (CVE-2022-35252) + 2022-08-10 Ismael Luceno <ismael@sourcemage.org> * CONFIGURE, DEPENDS: replaced polarssl with mbedtls diff --git a/ftp/curl/PRE_SUB_DEPENDS b/ftp/curl/PRE_SUB_DEPENDS index b76a3f0d05..12f525b5e1 100755 --- a/ftp/curl/PRE_SUB_DEPENDS +++ b/ftp/curl/PRE_SUB_DEPENDS @@ -1,6 +1,12 @@ case $THIS_SUB_DEPENDS in ARES) is_depends_enabled $SPELL c-ares;; NO_ARES) is_depends_enabled $SPELL c-ares || return 0;; + SSL) is_depends_enabled $SPELL gnutls \ + || is_depends_enabled $SPELL openssl \ + || is_depends_enabled $SPELL libressl \ + || is_depends_enabled $SPELL nss \ + || is_depends_enabled $SPELL mbedtls \ + || is_depends_enabled $SPELL wolfssl ;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" return 1;; esac diff --git a/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS b/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..12f525b5e1 --- /dev/null +++ b/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS @@ -0,0 +1,12 @@ +case $THIS_SUB_DEPENDS in + ARES) is_depends_enabled $SPELL c-ares;; + NO_ARES) is_depends_enabled $SPELL c-ares || return 0;; + SSL) is_depends_enabled $SPELL gnutls \ + || is_depends_enabled $SPELL openssl \ + || is_depends_enabled $SPELL libressl \ + || is_depends_enabled $SPELL nss \ + || is_depends_enabled $SPELL mbedtls \ + || is_depends_enabled $SPELL wolfssl ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" + return 1;; +esac diff --git a/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS b/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS deleted file mode 100755 index b76a3f0d05..0000000000 --- a/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS +++ /dev/null @@ -1,6 +0,0 @@ -case $THIS_SUB_DEPENDS in - ARES) is_depends_enabled $SPELL c-ares;; - NO_ARES) is_depends_enabled $SPELL c-ares || return 0;; - *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" - return 1;; -esac diff --git a/ftp/curl/SUB_DEPENDS b/ftp/curl/SUB_DEPENDS index 26976f92d2..92f21caefe 100755 --- a/ftp/curl/SUB_DEPENDS +++ b/ftp/curl/SUB_DEPENDS @@ -1,8 +1,19 @@ +. "$GRIMOIRE/depends_one_of.function" + case $THIS_SUB_DEPENDS in ARES) message "Curl with c-ares requested, forcing c-ares dependency" && depends c-ares "--enable-ares=$INSTALL_ROOT/usr" ;; NO_ARES) message "Curl without c-ares requested, forcing disabled c-ares dependency" && optional_depends c-ares "--disable-ares" ;; + SSL) message "Curl with SSL requested, forcing SSL library dependency" && + depends_one_of CURL_SSL \ + gnutls '--with-ssl --with-gnutls --without-openssl --without-nss --without-mbedtls --without-wolfssl' \ + openssl '--with-ssl --without-gnutls --with-openssl --without-nss --without-mbedtls --without-wolfssl' \ + libressl '--with-ssl --without-gnutls --with-openssl --without-nss --without-mbedtls --without-wolfssl' \ + -sub PEM nss '--with-ssl --without-gnutls --without-openssl --with-nss --without-mbedtls --without-wolfssl' \ + mbedtls '--with-ssl --without-gnutls --without-openssl --without-nss --with-mbedtls --without-wolfssl' \ + wolfssl '--with-ssl --without-gnutls --without-openssl --without-nss --without-mbedtls --with-wolfssl' \ + 'SSL library' ;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" return 1 ;; esac diff --git a/ftp/filezilla/0001-remove-test-for-specific-version-of-wxwidgets.patch b/ftp/filezilla/0001-remove-test-for-specific-version-of-wxwidgets.patch deleted file mode 100644 index fa66b30ce6..0000000000 --- a/ftp/filezilla/0001-remove-test-for-specific-version-of-wxwidgets.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e73ca9e3189667897678a900425055f111f580ec Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <bwlf@bandrate.org> -Date: Sat, 18 Feb 2017 12:28:35 +0100 -Subject: [PATCH] remove test for specific version of wxwidgets - ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6aacb20..83476ea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -177,11 +177,6 @@ if test "$buildmain" = "yes"; then - equivalent variable and wxWidgets version is $MIN_WX_VERSION or above. - ]) - fi -- if test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" = "3.1"; then -- AC_MSG_ERROR([You must use wxWidgets 3.0.x, development versions of wxWidgets are not supported.]) -- elif test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" != "3.0"; then -- AC_MSG_ERROR([You must use wxWidgets 3.0.x, wxWidgets 3.2 or higher is not yet supported.]) -- fi - - # --universal=no doesn't work correctly, it still accepts universal builds. Reject it manually here. - if echo "$WX_CPPFLAGS" | grep __WXUNIVERSAL__ > /dev/null; then --- -2.11.1 - diff --git a/ftp/filezilla/DETAILS b/ftp/filezilla/DETAILS index 1fe15657fe..e5f59c6bca 100755 --- a/ftp/filezilla/DETAILS +++ b/ftp/filezilla/DETAILS @@ -1,8 +1,8 @@ SPELL=filezilla - VERSION=3.54.1 - SOURCE="FileZilla_${VERSION}_src.tar.bz2" + VERSION=3.66.4 + SOURCE="FileZilla_${VERSION}_src.tar.xz" SOURCE_URL[0]=https://downloads.sourceforge.net/project/portableapps/Source/FileZilla/$SOURCE - SOURCE_HASH=sha512:d41b9fb303c11c81ceb0577fa5d40d6f5d9d1dc70a6a6bb6dac5c4cb7f8fc22cf06c2cf2e7415d922d11d5d4262832db89647acc34fa9a6cd92105b7700901df + SOURCE_HASH=sha512:17c0655988229bcfb056fe86bf8d6a21ea961420cc0073b3c4416c7fda999edd8dff7c6fe6b2121afad12acc4e6e525474a24a253c2e5312b74539de4232ef6b SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE="http://filezilla-project.org/" LICENSE[0]=GPL diff --git a/ftp/filezilla/HISTORY b/ftp/filezilla/HISTORY index a78d46d070..928bc4dbed 100644 --- a/ftp/filezilla/HISTORY +++ b/ftp/filezilla/HISTORY @@ -1,3 +1,8 @@ +2024-01-03 Conner Clere <xenanthropy@sourcemage.org> + * DETAILS: version 3.66.4, update source archive (bz2 -> xz) + * 0001-remove-test-for-specific-version-of-wxwidgets.patch: removed + * PRE_BUILD: remove patch line + 2021-06-27 Florian Franzmann <bwlf@bandrate.org> * DETAILS: version 3.54.1 diff --git a/ftp/filezilla/PRE_BUILD b/ftp/filezilla/PRE_BUILD index f3190bb3e3..ae7292adae 100755 --- a/ftp/filezilla/PRE_BUILD +++ b/ftp/filezilla/PRE_BUILD @@ -1,6 +1,3 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && - -patch -p1 < "$SPELL_DIRECTORY/0001-remove-test-for-specific-version-of-wxwidgets.patch" && - autoreconf -fi diff --git a/ftp/gnaughty/DETAILS b/ftp/gnaughty/DETAILS index d564d1fe0b..0d3d00dd2b 100755 --- a/ftp/gnaughty/DETAILS +++ b/ftp/gnaughty/DETAILS @@ -10,7 +10,7 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" SHORT="automatic porn downloader" cat << EOF Gnaughty is an utility to automatically download adult sex content, i.e. porn -movies and pictures, from a known internet porn directory. Providing a +movies and pictures, from a known internet porn directory. Providing a friendly interface, users who feel like having some porn can have it served fastly and directly to their desktop. EOF diff --git a/ftp/gnunet/DEPENDS b/ftp/gnunet/DEPENDS index b4d57b48ab..cec9392e4d 100755 --- a/ftp/gnunet/DEPENDS +++ b/ftp/gnunet/DEPENDS @@ -3,6 +3,9 @@ depends curl && depends libgcrypt && depends libextractor && depends libxml2 && +optional_depends sphinx \ + --{enable,disable}-documentation \ + "for building documentation" && optional_depends libmicrohttpd \ "--with-microhttpd" \ "--without-microhttpd" \ diff --git a/ftp/gnunet/DETAILS b/ftp/gnunet/DETAILS index 29ed2ebd45..7d6d8d22ce 100755 --- a/ftp/gnunet/DETAILS +++ b/ftp/gnunet/DETAILS @@ -1,9 +1,9 @@ SPELL=gnunet - VERSION=0.8.1b - SOURCE=GNUnet-${VERSION}.tar.gz - SOURCE_URL[0]=http://gnunet.org/download/${SOURCE} - SOURCE_GPG="gurus.gpg:${SOURCE}.sig" -SOURCE_DIRECTORY=${BUILD_DIRECTORY}/GNUnet-${VERSION} + VERSION=0.19.4 + SOURCE=gnunet-${VERSION}.tar.gz + SOURCE_URL[0]=http://ftpmirror.gnu.org/$SPELL/$SOURCE + SOURCE_HASH=sha512:c994269e009c6a97860e1903e87ab08b6f79a8f5bb7c27261020e90d162f81d908fe42173969331f3cada2086df8a719caa62c46342d59d46a2b2dd2fb71efa1 +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE=http://www.gnunet.org ENTERED=20050208 LICENSE[0]=GPL diff --git a/ftp/gnunet/GNUnet-0.8.1b.tar.gz.sig b/ftp/gnunet/GNUnet-0.8.1b.tar.gz.sig Binary files differdeleted file mode 100644 index 202823b744..0000000000 --- a/ftp/gnunet/GNUnet-0.8.1b.tar.gz.sig +++ /dev/null diff --git a/ftp/gnunet/HISTORY b/ftp/gnunet/HISTORY index e89266c9f4..6c543e1c98 100644 --- a/ftp/gnunet/HISTORY +++ b/ftp/gnunet/HISTORY @@ -1,3 +1,12 @@ +2023-07-02 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 0.19.4 + +2022-12-19 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 0.19.0 + +2022-09-08 Ismael Luceno <ismael@sourcemage.org> + * DETAILS: updated spell to 0.17.5 + 2010-04-07 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated to version 0.8.1b diff --git a/ftp/lftp/gets.patch b/ftp/lftp/gets.patch index 67152533df..3033961310 100644 --- a/ftp/lftp/gets.patch +++ b/ftp/lftp/gets.patch @@ -1,5 +1,5 @@ From d8cb49a7029cd09f8f7a9bd49259fb5db61cf41f Mon Sep 17 00:00:00 2001 -From: Florian Franzmann <siflfran@hawo.net> +From: Florian Franzmann <bwlf@bandrate.org> Date: Sun, 13 Sep 2015 11:16:32 +0200 Subject: [PATCH] fix build against glibc >= 2.16 diff --git a/ftp/qbittorrent/DEPENDS b/ftp/qbittorrent/DEPENDS index a924172ae7..fa166c50e7 100755 --- a/ftp/qbittorrent/DEPENDS +++ b/ftp/qbittorrent/DEPENDS @@ -1,5 +1,5 @@ depends -sub CXX gcc && -depends qt4 && +depends qtbase && depends rb-libtorrent && depends curl && optional_depends geoip "" "--disable-geoip-database" "for GeoIP location support" diff --git a/ftp/qbittorrent/DETAILS b/ftp/qbittorrent/DETAILS index 27c60b644b..7a12662556 100755 --- a/ftp/qbittorrent/DETAILS +++ b/ftp/qbittorrent/DETAILS @@ -1,8 +1,8 @@ SPELL=qbittorrent - VERSION=2.8.5 + VERSION=4.5.0 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE - SOURCE_HASH=sha512:086f614f296b4c46bc46848e434839108707552e35e48c863ed3bd90e6702d631836715cce520e1b2318f4be127154717805f14fc35deec63a7234f8cd2b5c9a + SOURCE_HASH=sha512:776528ba6d02210ce2d4b0e7855e9fb49d409ebf29bc2cfaade665dc33ca9d8c147cd6f5ae1cd9f7e7db01835803ecac8f9f4e39f5ab90975b93655b9234949b SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION WEB_SITE="http://www.qbittorrent.org/" LICENSE=GPL diff --git a/ftp/qbittorrent/HISTORY b/ftp/qbittorrent/HISTORY index e9c0c832d4..618ac45b0b 100644 --- a/ftp/qbittorrent/HISTORY +++ b/ftp/qbittorrent/HISTORY @@ -1,3 +1,7 @@ +2022-12-24 Conner Clere <connerclere@gmail.com> + * DETAILS: version 4.5.0 + * DEPENDS: update qt dep to qt5 + 2015-05-25 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: remove SOURCEFORGE_URL usage (automated) diff --git a/ftp/rsync/DETAILS b/ftp/rsync/DETAILS index e5fce3b895..7defd0e3a9 100755 --- a/ftp/rsync/DETAILS +++ b/ftp/rsync/DETAILS @@ -1,3 +1,4 @@ +# Watch: https://github.com/WayneD/rsync/tags tags/v([0-9.]+)[.]tar . "$GRIMOIRE/FUNCTIONS" SPELL=rsync if [[ $RSYNC_BRANCH == scm ]]; then @@ -8,8 +9,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git" SOURCE_IGNORE=volatile FORCE_DOWNLOAD=1 else - VERSION=3.2.4 - SECURITY_PATCH=4 + VERSION=3.2.7 + SECURITY_PATCH=5 SOURCE=$SPELL-$VERSION.tar.gz SOURCE2=$SOURCE.asc SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" diff --git a/ftp/rsync/HISTORY b/ftp/rsync/HISTORY index 9d4bb0ba0d..ff1bcd55a0 100644 --- a/ftp/rsync/HISTORY +++ b/ftp/rsync/HISTORY @@ -1,3 +1,13 @@ +2022-10-21 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.2.7 + +2022-09-10 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.2.6 + * PRE_BUILD, patches/configure.patch: removed, fixed by upstream + +2022-08-15 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 3.2.5, SECURITY_PATCH++, (CVE-2022-29154) + 2022-05-26 Florian Franzmann <bwlf@bandrate.org> * DEPENDS: always use system popt diff --git a/ftp/rsync/PRE_BUILD b/ftp/rsync/PRE_BUILD deleted file mode 100755 index 005bf6d040..0000000000 --- a/ftp/rsync/PRE_BUILD +++ /dev/null @@ -1,4 +0,0 @@ -default_pre_build && -cd "${SOURCE_DIRECTORY}" && - -apply_patch_dir patches diff --git a/ftp/rsync/patches/configure.patch b/ftp/rsync/patches/configure.patch deleted file mode 100644 index 0988c6db96..0000000000 --- a/ftp/rsync/patches/configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure.sh b/configure.sh ---- a/configure.sh -+++ b/configure.sh -@@ -9969,20 +9969,17 @@ if test x"$ac_cv_header_popt_popt_h" = x"yes"; then - # might conflict with the system popt. - with_included_popt=yes - elif test x"$ac_cv_header_popt_h" != x"yes"; then -- with_included_popt=yes -+ with_included_popt=no - fi - - if test x"$GCC" = x"yes"; then -- if test x"$with_included_popt" != x"yes"; then -- # Turn pedantic warnings into errors to ensure an array-init overflow is an error. -- CFLAGS="$CFLAGS -pedantic-errors" -- else -+ if test x"$with_included_popt" = x"yes"; then - # Our internal popt code cannot be compiled with pedantic warnings as errors, so try to - # turn off pedantic warnings (which will not lose the error for array-init overflow). - # Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists - # -Wpedantic and use that as a flag. - case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in -- *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;; -+ *-Wpedantic*) CFLAGS="$CFLAGS -Wno-pedantic" ;; - esac - fi - fi diff --git a/ftp/uucp/DETAILS b/ftp/uucp/DETAILS index 78a7c741fa..07654d3b17 100755 --- a/ftp/uucp/DETAILS +++ b/ftp/uucp/DETAILS @@ -1,3 +1,4 @@ +# Watch: https://ftp.gnu.org/gnu/uucp SPELL=uucp VERSION=1.07 SOURCE=$SPELL-$VERSION.tar.gz diff --git a/ftp/wget/CONFIGURE b/ftp/wget/CONFIGURE index 0cbdfafcbe..dfa83efa50 100755 --- a/ftp/wget/CONFIGURE +++ b/ftp/wget/CONFIGURE @@ -1,9 +1,2 @@ -if [[ "$WGET_SSL" == "openssl" ]]; then - WGET_SSL="SSL" && - persistent_add WGET_SSL -fi && - -config_query_list WGET_SSL "Which SSL backend do you want for https and ftps?" none gnutls SSL && - config_query_option WGET_OPTS "Enable IPv6 support?" y \ "--enable-ipv6" "--disable-ipv6" diff --git a/ftp/wget/DEPENDS b/ftp/wget/DEPENDS index 297d610840..55057526b9 100755 --- a/ftp/wget/DEPENDS +++ b/ftp/wget/DEPENDS @@ -1,3 +1,5 @@ +. "$GRIMOIRE/depends_one_of.function" + depends smgl-fhs && optional_depends pcre \ @@ -50,13 +52,9 @@ optional_depends util-linux \ '--without-libuuid' \ 'for UUID generation for WARC files' && -case $WGET_SSL in - none) - ;; - gnutls) depends gnutls "--with-ssl=gnutls" - ;; - SSL) - depends SSL "--with-ssl=openssl" && - optional_depends ca-certificates '' '' 'provides security certificates' - ;; -esac +optional_depends_one_of WGET_SSL \ + gnutls '--with-ssl=gnutls' \ + openssl '--with-ssl=openssl' \ + libressl '--with-ssl=openssl' \ + '--without-ssl' \ + 'SSL library' diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS index 399c47eeb8..329ccb61ce 100755 --- a/ftp/wget/DETAILS +++ b/ftp/wget/DETAILS @@ -1,9 +1,13 @@ +# Watch: https://ftp.gnu.org/gnu/wget SPELL=wget - VERSION=1.21.3 + VERSION=1.24.5 SECURITY_PATCH=6 SOURCE=$SPELL-$VERSION.tar.gz - SOURCE_HASH=sha512:29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718 SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE + SOURCE2=$SOURCE.sig + SOURCE2_URL[0]=${SOURCE_URL[0]}.sig + SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY + SOURCE2_IGNORE=signature SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" DOC_DIRS="" WEB_SITE=https://www.gnu.org/software/wget/ diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY index f4ef6b2ae0..04ff6e68bc 100644 --- a/ftp/wget/HISTORY +++ b/ftp/wget/HISTORY @@ -1,3 +1,14 @@ +2024-03-11 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 1.24.5 + +2023-05-31 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: add gpg checking + * DETAILS: version 1.21.4 + +2022-11-30 Remko van der Vossen <wich@sourcemage.org> + * CONFIGURE, DEPENDS, SUB_DEPENDS: use {optional_,}depends_one_of + for SSL library selection + 2022-03-19 Ismael Luceno <ismael@sourcemage.org> * DETAILS: updated spell to 1.21.3 diff --git a/ftp/wget/PRE_SUB_DEPENDS b/ftp/wget/PRE_SUB_DEPENDS index 6988cdb267..53f2118bc9 100755 --- a/ftp/wget/PRE_SUB_DEPENDS +++ b/ftp/wget/PRE_SUB_DEPENDS @@ -1,6 +1,6 @@ case $THIS_SUB_DEPENDS in - SSL) if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) || is_depends_enabled $SPELL gnutls; then - return 0 + SSL) if is_depends_enabled $SPELL gnutls || is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL libressl; then + return 0 fi ;; *) echo "unknown sub_depends!" ;; diff --git a/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS b/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS index 6988cdb267..53f2118bc9 100755 --- a/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS +++ b/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS @@ -1,6 +1,6 @@ case $THIS_SUB_DEPENDS in - SSL) if is_depends_enabled $SPELL $(get_spell_provider $SPELL SSL) || is_depends_enabled $SPELL gnutls; then - return 0 + SSL) if is_depends_enabled $SPELL gnutls || is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL libressl; then + return 0 fi ;; *) echo "unknown sub_depends!" ;; diff --git a/ftp/wget/SUB_DEPENDS b/ftp/wget/SUB_DEPENDS index e530c54899..5b326ee041 100755 --- a/ftp/wget/SUB_DEPENDS +++ b/ftp/wget/SUB_DEPENDS @@ -1,11 +1,12 @@ +. "$GRIMOIRE/depends_one_of.function" + case $THIS_SUB_DEPENDS in SSL) message "wget with SSL backend is requested, forcing it" && - case $WGET_SSL in - gnutls) depends gnutls "--with-ssl=gnutls" - ;; - SSL) depends SSL "--with-ssl=openssl" - ;; - esac + depends_one_of WGET_SSL \ + gnutls '--with-ssl=gnutls' \ + openssl '--with-ssl=openssl' \ + libressl '--with-ssl=openssl' \ + 'SSL library' ;; *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; false ;; esac diff --git a/ftp/wget2/BUILD b/ftp/wget2/BUILD index 4a827e8d1c..448e746a60 100755 --- a/ftp/wget2/BUILD +++ b/ftp/wget2/BUILD @@ -1,3 +1,2 @@ OPTS+=' --disable-static' && -[[ $WGET_SSL == "none" ]] && OPTS+=" --without-ssl" default_build diff --git a/ftp/wget2/CONFIGURE b/ftp/wget2/CONFIGURE deleted file mode 100755 index 6ad9caa3f6..0000000000 --- a/ftp/wget2/CONFIGURE +++ /dev/null @@ -1,4 +0,0 @@ -config_query_list WGET_SSL "Which SSL backend do you want for https and ftps?" none gnutls SSL - -#config_query_option WGET_OPTS "Enable IPv6 support?" y \ -# "--enable-ipv6" "--disable-ipv6" diff --git a/ftp/wget2/DEPENDS b/ftp/wget2/DEPENDS index 926bdf98d3..12889f1909 100755 --- a/ftp/wget2/DEPENDS +++ b/ftp/wget2/DEPENDS @@ -1,3 +1,5 @@ +. "$GRIMOIRE/depends_one_of.function" + depends smgl-fhs && optional_depends pcre2 \ @@ -70,13 +72,10 @@ optional_depends doxygen \ '--disable-doc' \ 'build docs' && -case $WGET_SSL in - none) - ;; - gnutls) depends gnutls "--with-ssl=gnutls" - ;; - SSL) - depends SSL "--with-ssl=openssl" && - optional_depends ca-certificates '' '' 'provides security certificates' - ;; -esac +optional_depends_one_of WGET_SSL \ + gnutls '--with-ssl=gnutls' \ + openssl '--with-ssl=openssl' \ + libressl '--with-ssl=openssl' \ + wolfssl '--with-ssl=wolfssl' \ + '--with-ssl=none' \ + 'SSL library' diff --git a/ftp/wget2/DETAILS b/ftp/wget2/DETAILS index 8e6e6a9a50..199a4fcb72 100755 --- a/ftp/wget2/DETAILS +++ b/ftp/wget2/DETAILS @@ -1,5 +1,6 @@ +# Watch: https://ftp.gnu.org/gnu/wget SPELL=wget2 - VERSION=2.0.1 + VERSION=2.1.0 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_URL[0]=$GNU_URL/wget/$SOURCE SOURCE2="${SOURCE}.sig" diff --git a/ftp/wget2/HISTORY b/ftp/wget2/HISTORY index ed527e4b4a..9ce7be7d3c 100644 --- a/ftp/wget2/HISTORY +++ b/ftp/wget2/HISTORY @@ -1,3 +1,12 @@ +2023-09-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 2.1.0 + +2022-12-02 Remko van der Vossen <wich@sourcemage.org> + * BUILD, CONFIGURE, DEPENDS: use optional_depends_one_of + for SSL library selection + * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: + add SSL sub depends + 2022-05-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2.0.1 diff --git a/ftp/wget2/PRE_SUB_DEPENDS b/ftp/wget2/PRE_SUB_DEPENDS new file mode 100755 index 0000000000..f50ffc8104 --- /dev/null +++ b/ftp/wget2/PRE_SUB_DEPENDS @@ -0,0 +1,8 @@ +case $THIS_SUB_DEPENDS in + SSL) is_depends_enabled $SPELL gnutls \ + || is_depends_enabled $SPELL openssl \ + || is_depends_enabled $SPELL libressl \ + || is_depends_enabled $SPELL wolfssl ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" + return 1;; +esac diff --git a/ftp/wget2/REPAIR^all^PRE_SUB_DEPENDS b/ftp/wget2/REPAIR^all^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..f50ffc8104 --- /dev/null +++ b/ftp/wget2/REPAIR^all^PRE_SUB_DEPENDS @@ -0,0 +1,8 @@ +case $THIS_SUB_DEPENDS in + SSL) is_depends_enabled $SPELL gnutls \ + || is_depends_enabled $SPELL openssl \ + || is_depends_enabled $SPELL libressl \ + || is_depends_enabled $SPELL wolfssl ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" + return 1;; +esac diff --git a/ftp/wget2/SUB_DEPENDS b/ftp/wget2/SUB_DEPENDS new file mode 100755 index 0000000000..4d67b21ade --- /dev/null +++ b/ftp/wget2/SUB_DEPENDS @@ -0,0 +1,13 @@ +. "$GRIMOIRE/depends_one_of.function" + +case $THIS_SUB_DEPENDS in + SSL) message "$SPELL with SSL backend is requested, forcing it" && + depends_one_of WGET_SSL \ + gnutls '--with-ssl=gnutls' \ + openssl '--with-ssl=openssl' \ + libressl '--with-ssl=openssl' \ + wolfssl '--with-ssl=wolfssl' \ + 'SSL library' + ;; + *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; false ;; +esac |