From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- net-misc/wput/Manifest | 4 ++ .../wput/files/wput-0.6.2-respect-destdir.patch | 23 +++++++++++ net-misc/wput/files/wput-fix-crash.patch | 47 ++++++++++++++++++++++ net-misc/wput/wput-0.6.2.ebuild | 36 +++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 net-misc/wput/files/wput-0.6.2-respect-destdir.patch create mode 100644 net-misc/wput/files/wput-fix-crash.patch create mode 100644 net-misc/wput/wput-0.6.2.ebuild (limited to 'net-misc/wput') diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest index 0ef3c1dc28dc..9bd2302729f1 100644 --- a/net-misc/wput/Manifest +++ b/net-misc/wput/Manifest @@ -1,5 +1,9 @@ AUX wput-0.6-gentoo.diff 641 BLAKE2B 2876ac3eb4f42590d01cde847cd5866ddfc7cd7e4630d901e573ef87f8b99d55e08c063c8ff0e497fae3cc75ccb72acddfd1787f19dfef12672a5447b364ceb6 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a AUX wput-0.6-respectldflags.patch 391 BLAKE2B fd2c41ce1fcc4866b5951bba49f4cd4d7ff5f4a9891016460e99d14ff78d3275273d234fd86df1b1cb3ecc5d5a4c7527f5b80cb2a00106a69f5d82badfc46497 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146 +AUX wput-0.6.2-respect-destdir.patch 763 BLAKE2B 2f933c1c8f30df659726997d6380ec8e18c4abc987804b8f492a35399ff65bbc9a13e28d9263218776a0e68319adf6980db23d27f161a9a68a431760ea7b73c8 SHA512 868412a0ed44476960c723bff0167ee411fbc6161c9e0254eadcf2dc4cf3fe5efedf2a9d1fccd7381b384d73d977f297cfa37715ecdf377d98d0fe0a3f6d7129 +AUX wput-fix-crash.patch 2183 BLAKE2B 5d27232a74f895567ede151843df61d21f43913689b27f380c71cbd0dfd619fc081f6d01d24ab34b2cc183c9f5d60f6c419307efc4875a00bcf8b95b4b5e73f6 SHA512 bd8d2ac244486968a977257f32d47cb18b158756bf73aebb19a69c4e4f3c60fbe58b8bfb2118edaf7ec28e42b5e0b270c383cb3014d4f48b8e766d73c24fac50 DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b +DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd EBUILD wput-0.6.1-r1.ebuild 771 BLAKE2B 11233a6e15d359f028f1abe461ad17b63236daf5eede7311e0fe86989941153033334575be4c41a8470f931161e1de535be12446ebccaf47037a6684e11e9ea8 SHA512 284e8945df93ba93a2322f1f62254b4fa671a1bd6045cecbe52bfcb54918b12f27cde9d710f896ea39839cafa1dfe617597fe6674717d8c297cf512dc43e9702 +EBUILD wput-0.6.2.ebuild 792 BLAKE2B a50545adf471673b1685a7c806fa8b23017b6a2d01d54f5e9c8f2991c3ef59c978b7c9cded040e58e0faf9239f021eaf66b183974d881004fae5cebd2d7943c1 SHA512 973f29353ff28d8131a8121f73749b3265e4cbe47e40862eb7dfebded29e8c25d29892390ea1e5ff98816f674c47cb23c31da6b2f9616bd9d24d8b6c92a2e4e1 MISC metadata.xml 239 BLAKE2B a1e387e39d693cc8b109174934b235238904f96fb78916bc73bd86e4b442443cc3b225409745025fb826de6086eb6356429527338c3aa1b42e92f1d886d7a094 SHA512 8326a50cb35d854df982951d3632c3b36672f9ba75f9644da70a4814a27ffda0c7c435e733c5be15210e2d2eb39ca781500ce55c1d409a1e81844fcecd859a10 diff --git a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch new file mode 100644 index 000000000000..f0cbfcdebd69 --- /dev/null +++ b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch @@ -0,0 +1,23 @@ +diff --git a/Makefile.in b/Makefile.in +index 6756cd2..6debea8 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -16,12 +16,12 @@ win-clean: + + install: all + cd po && $(MAKE) $(MAKEDEFS) $@ +- mkdir -p $(bindir) +- mkdir -p $(mandir) +- install -m0755 wput $(bindir) +- install -m0644 doc/wput.1.gz $(mandir) +- ln -s $(bindir)/wput $(bindir)/wdel +- install -m0644 doc/wdel.1.gz $(mandir) ++ install -d $(DESTDIR)/$(bindir) ++ install -d $(DESTDIR)/$(mandir) ++ install -m0755 wput $(DESTDIR)/$(bindir) ++ install -m0644 doc/wput.1 $(DESTDIR)/$(mandir) ++ ln -s wput $(DESTDIR)/$(bindir)/wdel ++ install -m0644 doc/wdel.1 $(DESTDIR)/$(mandir) + @echo "----------------" + @echo "Wput and Wdel installed. See 'wput/wdel -h' or 'man wput/wdel' for" + @echo "usage information." diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch new file mode 100644 index 000000000000..2afab8e59913 --- /dev/null +++ b/net-misc/wput/files/wput-fix-crash.patch @@ -0,0 +1,47 @@ +diff -ur wput-0.6.2+git20130413.orig/src/progress.c wput-0.6.2+git20130413/src/progress.c +--- wput-0.6.2+git20130413.orig/src/progress.c 2013-07-15 00:05:50.000000000 +0200 ++++ wput-0.6.2+git20130413/src/progress.c 2016-10-25 16:48:05.909105000 +0200 +@@ -181,7 +181,7 @@ + static char output[15]; + time_t secs = time (NULL); + struct tm *ptm = localtime (&secs); +- sprintf (output, "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec); ++ snprintf (output, sizeof(output), "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec); + return output; + } + +@@ -261,11 +261,11 @@ + unit = 3, trate = trate / (1024 * 1024 * 1024); + + if(trate < 100) +- sprintf(buf, "%s%.2f%s", (trate < 10) ? " " : "", trate, units[sp][unit]); ++ snprintf(buf, sizeof(buf), "%s%.2f%s", (trate < 10) ? " " : "", trate, units[sp][unit]); + else if(trate < 1000) +- sprintf(buf, "%.1f%s", trate, units[sp][unit]); ++ snprintf(buf, sizeof(buf), "%.1f%s", trate, units[sp][unit]); + else +- sprintf(buf, " %d%s", (int) trate, units[sp][unit]); ++ snprintf(buf, sizeof(buf), " %d%s", (int) trate, units[sp][unit]); + return buf; + } + /* wrapper for our progress_bar */ +@@ -303,13 +303,15 @@ + remain = (int) (WINCONV (fsession->local_fsize - transfered) * ((double) time_diff * 1000) + / (double) WINCONV tbytes / 1000); + if(remain < 60) +- sprintf(buf, "ETA %02ds", remain); ++ snprintf(buf, sizeof(buf), "ETA %02ds", remain); + else if(remain < 3600) +- sprintf(buf, "ETA %2d:%02dm", remain / 60, remain % 60); ++ snprintf(buf, sizeof(buf), "ETA %2d:%02dm", remain / 60, remain % 60); + else if(remain < 3600 * 24) +- sprintf(buf, "ETA %2d:%02dh", remain / 3600, (remain % 3600) / 60); ++ snprintf(buf, sizeof(buf), "ETA %2d:%02dh", remain / 3600, (remain % 3600) / 60); ++ else if(remain < 3600 * 24 * 100) ++ snprintf(buf, sizeof(buf), "ETA %2d:%02dd", remain / (3600 * 24), (remain % (24 * 3600)) / 3600); + else +- sprintf(buf, "ETA %2d:%02dd", remain / (3600 * 24), (remain % (24 * 3600)) / 3600); ++ snprintf(buf, sizeof(buf), "ETA **:** "); + /* NO, there won't be an eta of weeks or years! 14.4modem times are gone ;). god bless all gprs-users */ + + return buf; diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild new file mode 100644 index 000000000000..c95956b3e7b1 --- /dev/null +++ b/net-misc/wput/wput-0.6.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP" +HOMEPAGE="http://wput.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug nls ssl" + +RDEPEND="ssl? ( net-libs/gnutls )" + +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}/${PN}-0.6.2-respect-destdir.patch" + "${FILESDIR}/${PN}-0.6-respectldflags.patch" + "${FILESDIR}/${PN}-fix-crash.patch" +) + +DOCS=( ChangeLog INSTALL TODO ) + +src_configure() { + local myconf="--enable-g-switch=no" + use debug && myconf="--enable-memdbg=yes" + econf \ + $(use_enable nls) \ + $(use_with ssl) \ + "${myconf}" +} -- cgit v1.2.3