From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- net-ftp/Manifest.gz | Bin 3676 -> 3668 bytes net-ftp/filezilla/Manifest | 6 +- net-ftp/filezilla/filezilla-3.47.2.1.ebuild | 88 --------- net-ftp/filezilla/filezilla-3.50.0.ebuild | 87 --------- net-ftp/filezilla/filezilla-3.52.0.4.ebuild | 87 +++++++++ net-ftp/lftp/Manifest | 2 +- net-ftp/lftp/lftp-4.9.2.ebuild | 4 +- net-ftp/linksys-tftp/Manifest | 4 +- .../files/linksys-tftp-1.2.1-r1-clang.patch | 196 +++++++++++++++++++++ .../files/linksys-tftp-1.2.1-r1-fno-common.patch | 11 ++ net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild | 21 +-- net-ftp/ncftp/Manifest | 2 +- net-ftp/ncftp/ncftp-3.2.6-r2.ebuild | 4 +- 13 files changed, 316 insertions(+), 196 deletions(-) delete mode 100644 net-ftp/filezilla/filezilla-3.47.2.1.ebuild delete mode 100644 net-ftp/filezilla/filezilla-3.50.0.ebuild create mode 100644 net-ftp/filezilla/filezilla-3.52.0.4.ebuild create mode 100644 net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch create mode 100644 net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch (limited to 'net-ftp') diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index 3ca2c2d31262..52fed2cfe39e 100644 Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest index 14ee2618a17c..a6b94cdca73e 100644 --- a/net-ftp/filezilla/Manifest +++ b/net-ftp/filezilla/Manifest @@ -1,10 +1,8 @@ AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00 AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575be47e8a13b1d07f159ed05aaf9e8624030fa1ea2ce1ab63a7283336511bc14b6a922c8536d9ac992a231cf53f9c825299b4b588512c62 SHA512 3c0e6178f8fcc3793cbc722fcb91b2b2834eccda17ab6260243d1262198debe3c71ced1c2443ada8245a7bcf02b5fbb5fffdb16bdab948dc3badc149576ab027 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c -DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5070aadbcaf81ace2311f6cfddb47e7f67ec62396ae3690c139bcc1a8368be690776b3163dd6d53a6ebb27ee5e99300b3c67b SHA512 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc -DIST FileZilla_3.50.0_src.tar.bz2 4791977 BLAKE2B c0352eea9c4cd0a10d25b21b0a6982a762df6353a8da0703179270ef27be71bf151591011c45aae6e303437ac5ecca6a340635c392e2ed6db1a4a9d4002f4d7b SHA512 5edcb18aa7e4a0a59678d589d20996d7f6311f717e55a70c9dacafe42e3df6cba79be778bef34ff399672941dfb78a4732b83f21016b721702c763f0408b3e40 DIST FileZilla_3.51.0_src.tar.bz2 4808717 BLAKE2B 67f614032145abe7f715254fd47756d3a537d2eca63be976c29351f79e15d3620e77c1bb7beccc2b61a1df8b86484334a3e77639402c93e8ce28d4b12eb8884f SHA512 b5e0f80b61eb168b41f7582bf10bf0067da76aec3165ffe13819e20eb842ffc0fb12b01c54843b3ec4e7355111c36be249db3526e2ea2eaa77ba4274ffa03e93 -EBUILD filezilla-3.47.2.1.ebuild 1991 BLAKE2B f3d922bc88cf3de4cb7c7b97713006d7699025cb9240f3602b2aebbda21e470a5b0f85980adfcc0c5548054e732bb4e0c2f56f4c515ceab73d0169dc5bacac9d SHA512 57275acd8ee50c2f5d4e42faf3e5b834d3d68267dac42c141f42a0d45da32be23f9b612c0ba54623b0b2ae672f45a060d2ec5245a02ed75bc5a5e22a63b21ee5 -EBUILD filezilla-3.50.0.ebuild 1961 BLAKE2B af10edbedc83cd229573186d94fbc595e3860475ac0b0de392903dffb21a92dac9b22588ee4b5edbd4b55e3ec168c58a8203155db35cd751738c7bd42aa0539c SHA512 2f97de78b3c0b7907c05f988c3c07c788366975241f425beeee54127593fa0fc9a323477e0af64e73b766d011a13b32d3d9ca25aa75e2a18a665f6c43186dd87 +DIST FileZilla_3.52.0.4_src.tar.bz2 4812985 BLAKE2B 245433ba085ded75b6f283be3bf8a36779644ee7beacd70adfbab89c82faa14b4b4b811c1eab1fa069686e168a3c0e2066841a2ba87ad93e90d3f035d4a81da2 SHA512 adf3f1264c6e98c19313eb9857278247b1590b6d41848683056aca25ff62e367d0349b740c000c3549153d84e9fb0615bfe94e8015e55a52dfb9eccb809c8411 EBUILD filezilla-3.51.0.ebuild 1957 BLAKE2B 2e3089f2a70a43ef4dafc954204a2c770fbf0969f1510d1f10d11c1d133314699431a439d83bf8a124fd0df001dcbfe9da1cb794219545269e855599420a0e97 SHA512 c0892524296e0449e20148bd3723a603fe78b7dd2c96cf4dc0bc040c661cfe36483ca94a251af9ac761d31534d994be0a88a9c45785f87665e62a0c887a348ca +EBUILD filezilla-3.52.0.4.ebuild 1961 BLAKE2B fac20a3303d173d9590befc1d8ad7984a9f64600655efaa84ccdb722309d6db055b332e378721709082da21e8ce95cd7fb7b70737b781c0dc758e366833ab9a3 SHA512 fbe14ca5bae08360767874bd4ef5355add7252d1f5141ed88fdcd174cff880bc7466377d459350efeb28259073aaec54d328a7dfae2f02067b8e1ab7d9e308d3 MISC metadata.xml 459 BLAKE2B 71b683a0a48407daa9577a84b6d08bb6bcbcea46b9805fd31256e4f55666c0716b4fe43cbd30617ec1b88cc8697eb9a4254f7bd3e399ecdfcd81e92db24b4cd2 SHA512 e1f653c9a5dd7631ebea96be29472e2824cc6377c9e8783cd56913c1d7951eb9d80cbdaff05affc766c6f38277b6aea5b8a23e8b808840f29249eb7e0cfdfe3f diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild deleted file mode 100644 index 25f124c1173c..000000000000 --- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools flag-o-matic wxwidgets xdg - -MY_PV=${PV/_/-} -MY_P="FileZilla_${MY_PV}" - -DESCRIPTION="FTP client with lots of useful features and an intuitive interface" -HOMEPAGE="https://filezilla-project.org/" -SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 x86" -IUSE="dbus nls test" - -# pugixml 1.7 minimal dependency is for c++11 proper configuration -RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 - >=dev-libs/nettle-3.1:= - >=dev-db/sqlite-3.7 - >=dev-libs/libfilezilla-0.20.2:= - =dev-libs/pugixml-1.7 - >=net-libs/gnutls-3.5.7 - >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] - x11-misc/xdg-utils - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/libtool-1.4 - nls? ( >=sys-devel/gettext-0.11 ) - test? ( >=dev-util/cppunit-1.13.0 )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${MY_PV} - -DOCS=(AUTHORS ChangeLog NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.22.1-debug.patch - "${FILESDIR}"/${PN}-3.47.0-metainfo.patch - "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! test-flag-CXX -std=c++14; then - eerror "${P} requires C++14-capable C++ compiler. Your current compiler" - eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" - eerror "to gcc-4.9 or an equivalent version supporting C++14." - die "Currently active compiler does not support -std=c++14" - fi - fi -} - -src_prepare() { - setup-wxwidgets - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-autoupdatecheck - --with-pugixml=system - $(use_enable nls locales) - $(use_with dbus) - ) - econf "${myeconfargs[@]}" -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/net-ftp/filezilla/filezilla-3.50.0.ebuild b/net-ftp/filezilla/filezilla-3.50.0.ebuild deleted file mode 100644 index c567d79aeb8c..000000000000 --- a/net-ftp/filezilla/filezilla-3.50.0.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER="3.0-gtk3" - -inherit autotools flag-o-matic wxwidgets xdg - -MY_PV=${PV/_/-} -MY_P="FileZilla_${MY_PV}" - -DESCRIPTION="FTP client with lots of useful features and an intuitive interface" -HOMEPAGE="https://filezilla-project.org/" -SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" -IUSE="dbus nls test" - -# pugixml 1.7 minimal dependency is for c++11 proper configuration -RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 - >=dev-libs/nettle-3.1:= - >=dev-db/sqlite-3.7 - >=dev-libs/libfilezilla-0.24.1:= - >=dev-libs/pugixml-1.7 - >=net-libs/gnutls-3.5.7 - >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] - x11-misc/xdg-utils - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/libtool-1.4 - nls? ( >=sys-devel/gettext-0.11 ) - test? ( >=dev-util/cppunit-1.13.0 )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}"/${PN}-${MY_PV} - -DOCS=(AUTHORS ChangeLog NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-3.22.1-debug.patch - "${FILESDIR}"/${PN}-3.47.0-metainfo.patch - "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! test-flag-CXX -std=c++14; then - eerror "${P} requires C++14-capable C++ compiler. Your current compiler" - eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" - eerror "to gcc-4.9 or an equivalent version supporting C++14." - die "Currently active compiler does not support -std=c++14" - fi - fi -} - -src_prepare() { - setup-wxwidgets - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-autoupdatecheck - --with-pugixml=system - $(use_enable nls locales) - $(use_with dbus) - ) - econf "${myeconfargs[@]}" -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/net-ftp/filezilla/filezilla-3.52.0.4.ebuild b/net-ftp/filezilla/filezilla-3.52.0.4.ebuild new file mode 100644 index 000000000000..ba2ce7335de1 --- /dev/null +++ b/net-ftp/filezilla/filezilla-3.52.0.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +WX_GTK_VER="3.0-gtk3" + +inherit autotools flag-o-matic wxwidgets xdg + +MY_PV=${PV/_/-} +MY_P="FileZilla_${MY_PV}" + +DESCRIPTION="FTP client with lots of useful features and an intuitive interface" +HOMEPAGE="https://filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="dbus nls test" + +# pugixml 1.7 minimal dependency is for c++11 proper configuration +RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 + >=dev-libs/nettle-3.1:= + >=dev-db/sqlite-3.7 + >=dev-libs/libfilezilla-0.26.0:= + >=dev-libs/pugixml-1.7 + >=net-libs/gnutls-3.5.7 + >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] + x11-misc/xdg-utils + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=sys-devel/libtool-1.4 + nls? ( >=sys-devel/gettext-0.11 ) + test? ( >=dev-util/cppunit-1.13.0 )" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}"/${PN}-${MY_PV} + +DOCS=(AUTHORS ChangeLog NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.22.1-debug.patch + "${FILESDIR}"/${PN}-3.47.0-metainfo.patch + "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_prepare() { + setup-wxwidgets + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-autoupdatecheck + --with-pugixml=system + $(use_enable nls locales) + $(use_with dbus) + ) + econf "${myeconfargs[@]}" +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + xdg_pkg_postinst +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index f768d0430a7b..92a2b621572d 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -11,6 +11,6 @@ AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25 AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08 AUX lftp-4.9.2-libressl.patch 1393 BLAKE2B fb014efb50ceb0ad1b0f58c8ebc70c43b474552f3e9f084a8d40e178c4d5dbf2b830fa987ac52a7249b790dfe8f84ed39f7676eedc66612acb2a83e3599bf952 SHA512 f427059a2047d817a1b0eab03cc861d78538a5bde7686ff9bf6955f7965f27b15f6b8ff5299fe821298e716d440b16f0fb61b922badf233fa88ba725a0a48396 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad -EBUILD lftp-4.9.2.ebuild 2695 BLAKE2B 9223fcd9897abf7aad049871552c5965fc4bbf2d3d689645c726345f6eb16a9bac50e9d45e5343ff67bdc424847653efa652f975ef5a4e5df1950d935c17a20e SHA512 ed7f7ff346a98d1b54faa217cea21f106aa263e592f976dd23deb1921728aaae2e7becadf80ff50df3cd29a1aa838d7ef9c4e865a6a2d529cb9f2b23841448f8 +EBUILD lftp-4.9.2.ebuild 2684 BLAKE2B 5181ba9e9737f23ca780e180a65fb0b82e4c1610f1d4c6ea51abae92fae6cdc3a3d1c5fe42cb01baefddd924e921964d457109d3975ff62246ec7e4d42a95eb2 SHA512 228e327e4885e23e0185521e843a4e5648fd6570081e16f2b44fa3593a195ad7d0755d31146a4d09de0cba79e3eb2570fca0b382fd47e5ae12e9531868164965 EBUILD lftp-9999.ebuild 2438 BLAKE2B e96329335ad785af88182d486ba295a750c565136c41ebaa83f59b5430bf70de4f40f80d4abc79e68dd0b5b8d60e0ad8152c0e6ed6f119f687f95cfc6db783a1 SHA512 3b5a771d1be09c8b010ddc47cf2aa791a2924c464272feb7183a6f7da457fb0d6b7e2667828d41c405a47b93a5eb69b03616579cf0c501354719de5b35ad8f5a MISC metadata.xml 592 BLAKE2B 87ed7484a2723b3f46c358e839930919c22b296c86e44b492136c553150b040b903da2361a71eeecd8f4a7b077389988b9f185fa222f6559ebf65c44609514f4 SHA512 86dc525bb6734b4bf7995df33ef4f8027b01263afa9f827916224abeff84a04079dc50a62aa8c93c55c588d94669fcd6eee17984ef4b8913aa777e9f03a6e1ed diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild index 7c8050452b69..8acf412956ac 100644 --- a/net-ftp/lftp/lftp-4.9.2.ebuild +++ b/net-ftp/lftp/lftp-4.9.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://lftp.tech/ftp/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" RESTRICT="test" diff --git a/net-ftp/linksys-tftp/Manifest b/net-ftp/linksys-tftp/Manifest index d6bbabfb0e07..674765ebf4bb 100644 --- a/net-ftp/linksys-tftp/Manifest +++ b/net-ftp/linksys-tftp/Manifest @@ -1,5 +1,7 @@ AUX linksys-tftp-1.2.1-r1-Makefile.patch 734 BLAKE2B 3ac66fa3b8f2693d072836031785726fbe1ab23d762ce8aad70fcba06cc262bc5e10b65f2464adcb03fe56a44cf4303d52668172d22a4008c3d8151489c93c1f SHA512 ebb5288cf4774550f7bcc090efd43873c631ff6a029e17fcbaffe9150d71b37a4f3f317744958c3a8864f0e64042f4bfcd144aecd6ee6bf245d8c34a63c875a3 +AUX linksys-tftp-1.2.1-r1-clang.patch 4206 BLAKE2B bf7fda154ac8341bd15c6c3ee8998451e08aaf612c0361c2c2dd89d8f2a809c8428d5e8d1097857fa5d32cc9ffed31a52714f53ef83b4f2eea03100651b1c571 SHA512 4c513621e535f72cfda5fe80277ee28597dcdc8ded9a902cb08e71c38ec84e200da83a7b37fa4f387f13b81e9e70f4e3d6718f924e21a84196676cb84272207a +AUX linksys-tftp-1.2.1-r1-fno-common.patch 231 BLAKE2B 412c90ea110ded87aca95df6132d1825189b0f21ce2be21ac57a754980f5c99dfbfb426a093a58d179e9562cc2e4d2a09bfdcae9d47100ad7a7899a9bcd1ea3f SHA512 ed36e569a8d5d75c4c1674591a44f9b83eb40b9a3b29e847f8760417c4dbce62b2e7e95e65f9513d40d1e996dc6061d538d11f76995d81ab91f30e9f6472974e AUX linksys-tftp-1.2.1-r1-header.patch 959 BLAKE2B 7db548e0ecc70528c0ca974ca6cc1244615138aaead1f7f0e6384e35217532493f1e6d5fc167e54ab44e36cf241e5e821400cd60ec1ac900aee217e7e8478725 SHA512 8d59f13f16b9b512488d5773904ac0f617d2bbbff567040e009e8033012435c713d0ebac5ea145add5adb8881a66eefef4926a8aab2adc6590826744549356f7 DIST linksys-tftp-1.2.1.tar.bz2 11124 BLAKE2B 44a3bb1a11c9dae6014c3ec5f0c56c2a056e542f2f7f1d7a805479925beedebe9a79a8cddc64ce2455b459d8fa4436f16d52c6d86d8595fa1f05aa747f14bc78 SHA512 7d99cd7cc2144396fe008ed0fbc21053ef4e614021d6d2e24adca799d8eabd1b3c177b4bee20e14034170bc234d36e9eeaaf8e825513ef6f37e73643b91667fc -EBUILD linksys-tftp-1.2.1-r3.ebuild 616 BLAKE2B b7a96d3a5ecaa211600678e7ffe96b25c2ae51a7eb059fe565a3a0828241801a1b424d0ef19d7afe760094e83c2cfb6d8959c0722ac5a565190675f8bb049995 SHA512 e116e13d1ed342dbfae4ebb2f8e4288ea35990bf7ac08738958e8b177398fb09ab5b87724d2ab9791a03bdd11e6743e48885ce52db18fbeea27f051adf3e03d1 +EBUILD linksys-tftp-1.2.1-r3.ebuild 642 BLAKE2B 10ff536014310c4c5200381566968e0b4c6fd66b66948e61f923b6edc58947e4560f8b09d39cc4440f7931122d599cd7d1b974f62ea745a32ce551d1a58a689b SHA512 6ad9d3c50bed561d3a02fff787b61c7eefb3d318f78382ad09fbd08498c55336e2f48026930ed0361104b4c8cbb15858e041e0aba72f398f8cd19a74a973360b MISC metadata.xml 257 BLAKE2B c0414223216e6f9feab05fa4f6837713d195308a1c2cb561240dc05f212872da091cccb2d2dba14263dc989d67a756e0b6e7e06089544301b0ff04b0416fc2a7 SHA512 4c898784a8a98208bf3efdfed832bd66ece4f6af70d271946741e23947c080d850073f3859b8859717ba2ea74aa032cdd17e5950fe08bd26b45d30b6c636eff6 diff --git a/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch new file mode 100644 index 000000000000..94ccee0c9eef --- /dev/null +++ b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-clang.patch @@ -0,0 +1,196 @@ +--- a/main.c ++++ b/main.c +@@ -159,7 +159,7 @@ setpeer(argc, argv) + + if (!argv[1]) { + printf("usage: %s host-name [port] (Default port is 69/udp)\n", argv[0]); +- return; ++ return 0; + } + host = gethostbyname(argv[1]); + if (host) { +@@ -172,7 +172,7 @@ setpeer(argc, argv) + if (sin.sin_addr.s_addr == -1) { + connected = 0; + printf("%s: unknown host\n", argv[1]); +- return; ++ return 0; + } + strcpy(hostname, argv[1]); + } +@@ -182,7 +182,7 @@ setpeer(argc, argv) + if (port < 0) { + printf("%s: bad port number\n", argv[2]); + connected = 0; +- return; ++ return 0; + } + port = htons(port); + } +@@ -209,7 +209,7 @@ modecmd(argc, argv) + + if (argc < 2) { + printf("Using %s mode to transfer files.\n", mode); +- return; ++ return 0; + } + if (argc == 2) { + for (p = modes; p->m_name; p++) +@@ -217,7 +217,7 @@ modecmd(argc, argv) + break; + if (p->m_name) { + setmode(p->m_mode); +- return; ++ return 0; + } + printf("%s: unknown mode\n", argv[1]); + /* drop through and print usage message */ +@@ -231,7 +231,7 @@ modecmd(argc, argv) + sep = " | "; + } + printf(" ]\n"); +- return; ++ return 0; + } + + setbinary(argc, argv) +@@ -265,31 +265,32 @@ put(argc, argv) + + if (argc < 3) { + putusage(argv[0]); +- return; ++ return 0; + } + linkpass = argv[2]; + if (!connected) { + fprintf(stderr,"No target machine specified.\n"); +- return; ++ return 0; + } + cp = argv[1]; + fd = open(cp, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "tftp: "); perror(cp); +- return; ++ return 0; + } + if (verbose) + printf("putting %s to %s:%s [%s] AUTH %s\n", + cp, hostname, cp, mode, linkpass); + sin.sin_port = port; + sendfile(fd, cp, mode, linkpass); +- return; ++ return 0; + } + + putusage(s) + char *s; + { + printf("usage: %s file [linksys pass] (you must be connected)\n", s); ++ return 0; + } + + /* +@@ -304,18 +305,18 @@ get(argc, argv) + + if (argc < 3) { + getusage(argv[0]); +- return; ++ return 0; + } + linkpass = argv[2]; + if (!connected) { + fprintf(stderr,"No target machine specified.\n"); +- return; ++ return 0; + } + cp = argv[1]; + fd = creat(cp, 0644); + if (fd < 0) { + fprintf(stderr, "tftp: "); perror(cp); +- return; ++ return 0; + } + if (verbose) + printf("getting from %s:%s to %s [%s] AUTH %s\n", +@@ -323,7 +324,7 @@ get(argc, argv) + sin.sin_port = port; + recvfile(fd, cp, mode, linkpass); + +- return; ++ return 0; + } + + getusage(s) +@@ -349,7 +350,7 @@ setrexmt(argc, argv) + } + if (argc != 2) { + printf("usage: %s value\n", argv[0]); +- return; ++ return 0; + } + t = atoi(argv[1]); + if (t < 0) +@@ -375,7 +376,7 @@ settimeout(argc, argv) + } + if (argc != 2) { + printf("usage: %s value\n", argv[0]); +- return; ++ return 0; + } + t = atoi(argv[1]); + if (t < 0) +@@ -450,7 +451,7 @@ getcmd(name) + longest = 0; + nmatches = 0; + found = 0; +- if(!name) return; ++ if(!name) return 0; + for (c = cmdtab; p = c->name; c++) { + for (q = name; *q == *p++; q++) + if (*q == 0) /* exact match? */ +@@ -513,7 +514,7 @@ help(argc, argv) + printf("Commands may be abbreviated. Commands are:\n\n"); + for (c = cmdtab; c->name; c++) + printf("%-*s\t%s\n", HELPINDENT, c->name, c->help); +- return; ++ return 0; + } + while (--argc > 0) { + register char *arg; +@@ -557,7 +558,7 @@ setblocksize(argc, argv) + } + if (argc != 2) { + printf("usage: %s value\n", argv[0]); +- return; ++ return 0; + } + t = atoi(argv[1]); + if (t < 8 || t > 1432) +@@ -570,5 +571,5 @@ banner() { + printf("Mike Lynn\tabaddon [at] 802.11ninja.net\n"); + printf("Linksys TFTP Client for *BSD/Linux\tThe Firmware gets sexier\n"); + printf("Modified Berkeley TFTP client Release: %s\n\n",svers); +- return; ++ return 0; + } +--- a/tftpsubs.c ++++ b/tftpsubs.c +@@ -116,7 +116,7 @@ read_ahead(file, convert) + + b = &bfs[nextone]; /* look at "next" buffer */ + if (b->counter != BF_FREE) /* nop if not free */ +- return; ++ return 0; + nextone = !nextone; /* "incr" next buffer ptr */ + + dp = (struct tftphdr *)b->buf; +@@ -131,7 +131,7 @@ read_ahead(file, convert) + b->counter += i; + } while (i != 0 && !(i < 0 && errno != EINTR) && + b->counter < segsize); +- return; ++ return 0; + } + + p = dp->th_data; diff --git a/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch new file mode 100644 index 000000000000..a63977619845 --- /dev/null +++ b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-fno-common.patch @@ -0,0 +1,11 @@ +--- a/tftp.c ++++ b/tftp.c +@@ -50,7 +50,7 @@ extern int segsize; + #define PKTSIZE (1432+4) /* SEGSIZE+4 */ + char ackbuf[PKTSIZE]; + int timeout; +-jmp_buf toplevel; ++extern jmp_buf toplevel; + jmp_buf timeoutbuf; + + #ifndef OACK diff --git a/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild index b265bc6ee05c..ba390c758671 100644 --- a/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild +++ b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r3.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="TFTP client suitable for uploading to the Linksys WRT54G Wireless Router" -HOMEPAGE="https://www.redsand.net/solutions/linksys_tftp.html" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="https://www.redsand.net/solutions/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" -src_prepare() { - epatch "${FILESDIR}"/${P}-r1-header.patch - epatch "${FILESDIR}"/${P}-r1-Makefile.patch -} +PATCHES=( + "${FILESDIR}/${P}-r1-header.patch" + "${FILESDIR}/${P}-r1-Makefile.patch" + "${FILESDIR}/${P}-r1-fno-common.patch" + "${FILESDIR}/${P}-r1-clang.patch" +) src_compile() { emake CC="$(tc-getCC)" @@ -25,5 +26,5 @@ src_compile() { src_install() { dobin linksys-tftp - dodoc README + einstalldocs } diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest index 971e9c2cfd93..28127b76951b 100644 --- a/net-ftp/ncftp/Manifest +++ b/net-ftp/ncftp/Manifest @@ -1,4 +1,4 @@ AUX ncftp-3.2.6-fno-common.patch 1818 BLAKE2B 620e3fbc7e297d3186fe9eef8855e2a663a5abcd680269101d5547ab9f6b9addcfe6040ba35e16e8e540784796e34304a9377b1149f7ac00fe0859627a141200 SHA512 c6bf0cc4324583d9aae3f3a57c900437a78d30138d0b9da06fea66cd5fbf57a79ea420afe33536a5bbcf2ace61aaca30ea04155df638daeae125ed9ca90b1c25 DIST ncftp-3.2.6-src.tar.xz 420564 BLAKE2B ce6d8d2bf06761f884e9edfe6d0bb0230f5d515078a787c4e6faf7716b760166acdd0accf3de1e1f5f3d892c8c86348cdbbefeac6be05e6806011a3e8f4c9b02 SHA512 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382 -EBUILD ncftp-3.2.6-r2.ebuild 1032 BLAKE2B 153449e2fd0d606c29e1259b8d9c7e9887c5aa9dcb190c2554039526fdcc37ce8b4690597180d6b1acada1439b604f3476c9be49f58728eef17ce06d887fcb84 SHA512 4255ff78fb240b92e47f5dc4d73536c108ecbc15c5db149936836c7c5512da8c8ab7fc4e73c49d954c11c6ba5e47c7e880aa8cdd98d7c497723c66014530af21 +EBUILD ncftp-3.2.6-r2.ebuild 1021 BLAKE2B b7b4269a8aea831c2a2f9be5238f0c012944773d279913afb5c5f88228decfd5d6c8bbb002bd83d04a45d0ba60e7f2af1ff79fd342f00eca5171e18fa1fa2a56 SHA512 a1fffbaac6a9e9d11bdf16b4fe34c3edb9790fa15ce00450f599451326aef90a875dde87fb2b11c83dd596a677a5f97d885844fe089a4416f278ae4da8c46fd2 MISC metadata.xml 662 BLAKE2B e41a84c3553efba6d4425c73d7aefeabc235057178408f63a649a2580110f8e7af365b41bea7ec150091b2a57f871ad81476607bbfe73dc7d2ee123a9f175ada SHA512 a3a91d842e2865916280524c6d844c83133f136cf6f9fd59e6246026295f4fe9f5ab535944b79c7c5417b50672de5edc25b5dc34df069721a535342b30b6ab98 diff --git a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild index 364708b141e2..2ad892c6a4a1 100644 --- a/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild +++ b/net-ftp/ncftp/ncftp-3.2.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI=" LICENSE="Clarified-Artistic" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" IUSE="pch" DEPEND=" -- cgit v1.2.3