From 07f0fa8e1ce6622a973de734f36973c68af3cbe7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 13 Dec 2024 15:00:44 +0100 Subject: [PATCH] lftp: Update to 4.9.3 Remove patches included in the new release Drop debug build flags (not sure why they are set) --- lftp/PKGBUILD | 18 ++++++------------ lftp/lftp-configure-needtrio.patch | 11 ----------- lftp/lftp-correct-gettext-macros.patch | 11 ----------- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 lftp/lftp-configure-needtrio.patch delete mode 100644 lftp/lftp-correct-gettext-macros.patch diff --git a/lftp/PKGBUILD b/lftp/PKGBUILD index 50d91b27f60..f711afa6b92 100644 --- a/lftp/PKGBUILD +++ b/lftp/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jürgen Pfeifer pkgname=lftp -pkgver=4.9.2 -pkgrel=5 +pkgver=4.9.3 +pkgrel=1 pkgdesc="Sophisticated command line based FTP client (net-utils)" arch=('i686' 'x86_64') license=('GPL3') @@ -33,26 +33,20 @@ makedepends=('gcc' 'zlib-devel') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="https://lftp.yar.ru/" +msys2_repository_url="https://github.com/lavv17/lftp" msys2_references=( "cpe: cpe:/a:alexander_v._lukyanov:lftp" "cpe: cpe:/a:lftp_project:lftp" ) backup=('etc/lftp.conf') source=(https://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz - lftp-configure-needtrio.patch - lftp-4.7.6-no-undefined.patch - lftp-correct-gettext-macros.patch) -options=('debug' '!strip') -sha256sums=('c517c4f4f9c39bd415d7313088a2b1e313b2d386867fe40b7692b83a20f0670d' - 'a3781d946913a0d39a41d5b86390f255b36f67e9aea502e0117e701e295c7ea0' - 'e9a289f30d0d7fd9994165b6991a722dbe529f1fdbd738d5b44b48ec9c773bf4' - 'd6d74b134385e1c3f824b9a960376a2bcb7c0e39acab2ae1c3c764f9d338e650') + lftp-4.7.6-no-undefined.patch) +sha256sums=('96e7199d7935be33cf6b1161e955b2aab40ab77ecdf2a19cea4fc1193f457edc' + 'e9a289f30d0d7fd9994165b6991a722dbe529f1fdbd738d5b44b48ec9c773bf4') prepare() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/lftp-configure-needtrio.patch patch -p1 -i ${srcdir}/lftp-4.7.6-no-undefined.patch - patch -p1 -i ${srcdir}/lftp-correct-gettext-macros.patch autoreconf -fiv } diff --git a/lftp/lftp-configure-needtrio.patch b/lftp/lftp-configure-needtrio.patch deleted file mode 100644 index b0a676d0224..00000000000 --- a/lftp/lftp-configure-needtrio.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN lftp-4.7.1.orig/m4/needtrio.m4 lftp-4.7.1/m4/needtrio.m4 ---- lftp-4.7.1.orig/m4/needtrio.m4 2016-02-20 08:57:52.000000000 -0500 -+++ lftp-4.7.1/m4/needtrio.m4 2016-04-05 05:02:03.114909100 -0400 -@@ -9,6 +9,7 @@ - else - - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ #include - int main() - { - unsigned long long x=0,x1; diff --git a/lftp/lftp-correct-gettext-macros.patch b/lftp/lftp-correct-gettext-macros.patch deleted file mode 100644 index 32b81263b1a..00000000000 --- a/lftp/lftp-correct-gettext-macros.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lftp-4.7.3/configure.ac.orig 2016-10-25 09:21:36.467149200 +0300 -+++ lftp-4.7.3/configure.ac 2016-10-25 09:21:41.308158000 +0300 -@@ -138,7 +138,7 @@ - - ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs" - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.15]) -+AM_GNU_GETTEXT_VERSION([0.19]) - test "$MSGFMT" = "no" && MSGFMT ="$missing_dir/missing msgfmt" - test "$GMSGFMT" = "no" && GMSGFMT ="$missing_dir/missing msgfmt" - test "$XGETTEXT" = ":" && XGETTEXT="$missing_dir/missing xgettext"