From 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 21 Jul 2022 08:43:51 +0100 Subject: gentoo auto-resync : 21:07:2022 - 08:43:51 --- net-ftp/Manifest.gz | Bin 3344 -> 3339 bytes net-ftp/gftp/Manifest | 5 --- net-ftp/gftp/files/gftp-2.0.19-desktop.patch | 26 ----------- .../gftp-2.0.19-gftp-expand-path-sigsegv.patch | 21 --------- net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch | 27 ----------- net-ftp/gftp/gftp-2.0.19-r3.ebuild | 50 --------------------- 6 files changed, 129 deletions(-) delete mode 100644 net-ftp/gftp/files/gftp-2.0.19-desktop.patch delete mode 100644 net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch delete mode 100644 net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch delete mode 100644 net-ftp/gftp/gftp-2.0.19-r3.ebuild (limited to 'net-ftp') diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index 1ea931232a1a..32a2cd7403e7 100644 Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest index f48f0af347bd..63a5a2cf03ed 100644 --- a/net-ftp/gftp/Manifest +++ b/net-ftp/gftp/Manifest @@ -1,8 +1,3 @@ -AUX gftp-2.0.19-desktop.patch 837 BLAKE2B a9199ab915aa43dfc9138066da05524020a443f8053aed3e71a910df947f912118f2d82988580e91c4d06c3c3d9169157f887e2f96f26db1f122c5b0033a25e9 SHA512 c71c10eca36e767e4778c4664723f04ea23a20cb6b96e2b0e45c439ed83a1daa325919683663695c17ab26317021090d4855f9f5b6e952f70a400980b0ebfe69 -AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 BLAKE2B 4733b21dae4e801ac9b22c0bf460f0de23ffcc95ca184035cb19ca331e84a0deba9a8d22c8aa67b279cb3b92f9706a08bede3e374659b296598ad5297b3a0e47 SHA512 4ee09d50955fc91dea33bb71d8bd65a7c481f02c7bdf6dce53bbd630307c2ab898b533babe7597b1e434d0defdde3be6e145c0c5344d21e8a23c1537eb5f2bbf -AUX gftp-2.0.19-glibc-2.30.patch 908 BLAKE2B 3bea073b519b2fe64571ef58a2bbb10b978ad7615ef7cbcce8448eff97db186f21153171e405181f275f73a0cfc274f9d048030da2ae18b9f5e535b93626444f SHA512 ec024c09e06874ac955b9fccae3fb95b05ecab6da186a9e28c4802dbc3f14d95d32d44dc60e7152b1560517a8971f61859aa715b7802ebe0884823112ab68fdc -DIST gftp-2.0.19.tar.bz2 1687167 BLAKE2B b7cd5409c7dfe4672a383417554c39a848b9afa341de498eea76bd02a2099559f14d7d0ceebe13d52842c311a4b242a0d558aa017dd7062a3369a7c2c3af19a0 SHA512 59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172 DIST gftp-2.9.1b.tar.xz 872308 BLAKE2B 3588321689a1c6d8e0585e0439507f774b30e05630f774d7909f32fd66c289a961602b84cde97377de47d0c63fe4cf5452ec1e0b986c578958a6080cf5814fc8 SHA512 31d0aa4d3c5adf3d9ac2c2517402f9bdcab5fb1187df521a978acf41c1997a120797056dd1ca7bedc32e0dec0ac7c06c1790e47821660277fb6572205ce0fe93 -EBUILD gftp-2.0.19-r3.ebuild 956 BLAKE2B c6da7f7b7be9775101f2493b19c3ba83941d3a5852086b6ced665e62443a76e34023ea9803d6a5502eec98e107953d05ab0233c0e2ab1c901f198261c704db49 SHA512 db454dca8bd2cc841f10b193ac21b71c90583ef21004acb0cb9f2853d9e389a49b7ef4ab4b02aabc6c68192d2317fc5e04ca19f3d6a7c6041494acdf3700467d EBUILD gftp-2.9.1b.ebuild 760 BLAKE2B f3a1d5a2aa05765a04cea3c000b696a7bccaf446aba1957a682fba5f6686f9efc50cf853b50f8298432fee01ebb0781ae7547f75d2f1ee518147a0ad43049518 SHA512 1de4b44b10c1d1a91df521ffc7a6d33423c4d92d877a76a93201d236741159802ce431d150f59b36e7ef15480bbadf46d7867cb0bce05791f1b8f5ba0be7e3fa MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/net-ftp/gftp/files/gftp-2.0.19-desktop.patch b/net-ftp/gftp/files/gftp-2.0.19-desktop.patch deleted file mode 100644 index 878a77b5bf72..000000000000 --- a/net-ftp/gftp/files/gftp-2.0.19-desktop.patch +++ /dev/null @@ -1,26 +0,0 @@ -@@ -, +, @@ - - * the Encoding key is now deprecated, and UTF-8 is the default value. - * As the value of Icon is not an absolute path, there should be no extension. - * The Application category is deprecated. - docs/gftp.desktop | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) ---- a/docs/gftp.desktop -+++ a/docs/gftp.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=gFTP - Comment=Download and upload files using multiple file transfer protocols - Comment[fr]=Télécharge des fichiers en utilisant le protocole FTP -@@ -8,8 +7,8 @@ Exec=gftp %u - Terminal=false - X-MultipleArgs=false - Type=Application --Icon=gftp.png --Categories=Application;Network; -+Icon=gftp -+Categories=Network; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=gftp - X-GNOME-Bugzilla-Component=general diff --git a/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch b/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch deleted file mode 100644 index f3e029dea0ca..000000000000 --- a/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix segmentation fault, when gftpui_run_chdir is called with directory=0x0, -and then calls gftp_expand_path (src=0x0), -the NULL string was cloned using g_strdup, which returns NULL if -its only argument is NULL, then this returned string was unreferenced. - - lib/misc.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/lib/misc.c b/lib/misc.c -index 16c019b..2791466 100644 ---- a/lib/misc.c -+++ b/lib/misc.c -@@ -143,6 +143,8 @@ gftp_expand_path (gftp_request * request, const char *src) - tempchar; - struct passwd *pw; - -+ g_return_val_if_fail(src != NULL, NULL); -+ - pw = NULL; - str = g_strdup (src); - diff --git a/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch b/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch deleted file mode 100644 index ee1d596a03c3..000000000000 --- a/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/692230 -https://github.com/masneyb/gftp/commit/371c494a34c1820544d6563fb7ef5ca51a0ee199 - -From 371c494a34c1820544d6563fb7ef5ca51a0ee199 Mon Sep 17 00:00:00 2001 -From: Brian Masney -Date: Thu, 21 Jul 2016 05:05:18 -0400 -Subject: [PATCH] fixed compiling on some versions of Linux. Patch picked up - from the Fedora Project at - https://github.com/repoforge/rpms/blob/master/specs/gftp/gftp-stropts.patch - ---- - lib/pty.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/pty.c b/lib/pty.c -index f7cb1f9..f9d609b 100644 ---- a/lib/pty.c -+++ b/lib/pty.c -@@ -61,7 +61,7 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name) - - #elif HAVE_GRANTPT - --#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)) -+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__linux__)) - #include - #endif - diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild b/net-ftp/gftp/gftp-2.0.19-r3.ebuild deleted file mode 100644 index 8d4fab840477..000000000000 --- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Gnome based FTP Client" -SRC_URI="http://www.gftp.org/${P}.tar.bz2" -HOMEPAGE="http://www.gftp.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86" -IUSE="gtk ssl" - -RDEPEND=" - dev-libs/glib:2 - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:0 - gtk? ( x11-libs/gtk+:2 ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PATCHES=( - # Fix SIGSEGV for gftp_expand_path function - "${FILESDIR}/${P}-${PN}-expand-path-sigsegv.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=740785 - "${FILESDIR}/${P}-desktop.patch" - - # https://bugs.gentoo.org/692230 - "${FILESDIR}"/${P}-glibc-2.30.patch -) - -src_configure() { - gnome2_src_configure \ - $(use_enable gtk gtkport) \ - $(use_enable ssl) -} - -src_install() { - gnome2_src_install - dodoc docs/USERS-GUIDE -} -- cgit v1.2.3