diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-ftp/ftp | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'net-ftp/ftp')
| -rw-r--r-- | net-ftp/ftp/Manifest | 3 | ||||
| -rw-r--r-- | net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch | 14 | ||||
| -rw-r--r-- | net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 30 |
3 files changed, 35 insertions, 12 deletions
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest index a9727eb1a897..91245836b3d9 100644 --- a/net-ftp/ftp/Manifest +++ b/net-ftp/ftp/Manifest @@ -1,5 +1,6 @@ +AUX ftp-0.17.34.0.2.5.1-musl-glob-brace.patch 350 BLAKE2B c061328876a4e47b10fbfd01da1703abf8bf710a3ceaebbbb86b44ed4b9c7d796809e63ede40f0d8218c57ff07b48164452450d8365a707f0d03317c42e04545 SHA512 e56bff74eff1f18519fd06e730ab15b4f155ce258ce0638e4275a03a2fc51234b198eec0fbe37ff56b2211a732040a93dbc4999a672d5a6c4f73912d8d82968a DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5 SHA512 083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554 DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d SHA512 6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718 -EBUILD ftp-0.17.34.0.2.5.1.ebuild 1507 BLAKE2B 11473a162ef03ae30414308b40edcc55e9a9e6aa5ed78c07caca0630f9e89f545a571c36b27a3f8f43962e720b7d7b7404e0283d7278c9e9bb2e0389eae4b77b SHA512 6656ced60a327119cdaf7c82558b9a892a0217e03ef4d50d609089cb46f69dfe8b5e8c0c1462b036d4807464fa6fd2557cce9e1fa269211812c9e14a59a2308f +EBUILD ftp-0.17.34.0.2.5.1.ebuild 1739 BLAKE2B 08051dc05b9b200c67149e85dc66803ab9973a265924dda8439be353f905068363f9af4060accc1bae6ec5bdf93809aff5fb689efb7c18be9047dde2c8d148b4 SHA512 3ba91f7394875c05a2b9a2ec6e4fd9054ea6e3b7a5430406dbac6ef3dd1d215d1b99530f1081bc33282642274a91cd44bec2d36590013c4b5048e8f8a0189a43 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch new file mode 100644 index 000000000000..386af410e913 --- /dev/null +++ b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/832430 + +See e.g. https://patchwork.kernel.org/project/selinux/patch/20180517051117.48454-5-jason@perfinion.com/ too. +--- a/ftp/cmds.h ++++ b/ftp/cmds.h +@@ -61,3 +61,7 @@ + void do_umask(int argc, char *argv[]); + void idle_cmd(int argc, char *argv[]); + void setpassive(void); ++ ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif + diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild index a25ce7b145e0..bbdb45b4f87b 100644 --- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild +++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit edo flag-o-matic toolchain-funcs PATCH_VER="3" MY_PN="netkit-ftp" @@ -11,11 +11,13 @@ MY_PV="$(ver_cut 1-2)" MY_P="netkit-${PN}-${MY_PV}" DEB_PN="${MY_PN}-ssl" DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)" + DESCRIPTION="Standard Linux FTP client" HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html" SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" @@ -24,22 +26,23 @@ IUSE="ipv6 readline ssl" RDEPEND=" >=sys-libs/ncurses-5.2:= - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) + elibc_musl? ( sys-libs/obstack-standalone ) + readline? ( sys-libs/readline:= ) + ssl? ( dev-libs/openssl:= ) " DEPEND="${RDEPEND}" BDEPEND="sys-apps/grep" -S=${WORKDIR}/${MY_P} - src_prepare() { local p for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series || die); do - eapply "${WORKDIR}/debian/patches/${p}" + eapply "${WORKDIR}"/debian/patches/${p} done eapply "${WORKDIR}"/patch + eapply "${FILESDIR}"/${PN}-0.17.34.0.2.5.1-musl-glob-brace.patch + # Drop bashism from configure sed -i \ -e 's:echo -n:printf %s :' \ configure || die @@ -48,15 +51,20 @@ src_prepare() { } src_configure() { - append-lfs-flags #101038 + # bug #101038 + append-lfs-flags tc-export CC - # not an autoconf script - ./configure \ + + # Not an autoconf script + edo ./configure \ --prefix=/usr \ $(use_enable ipv6) \ $(use_enable readline) \ - $(use_enable ssl) \ - || die + $(use_enable ssl) + + if use elibc_musl ; then + sed -i -e '/^LIBS=/ s/$/ -lobstack/' MCONFIG || die + fi } src_install() { |