* [gentoo-commits] repo/gentoo:master commit in: net-misc/wput/files/, net-misc/wput/
@ 2022-09-26 12:10 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-09-26 12:10 UTC (permalink / raw
To: gentoo-commits
commit: 8ec95f3f9000ec314553778e3fc9aedae8a93775
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 03:58:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 03:58:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec95f3f
net-misc/wput: add 0.6.2_p20130413_p11 (Debian fork)
Fixes Clang 15.
Closes: https://bugs.gentoo.org/871180
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/wput/Manifest | 2 +
...-0.6.2_p20130413_p11-no-compress-manpages.patch | 39 ++++++++++++++++
...t-0.6.2_p20130413_p11-xopen_source-strdup.patch | 14 ++++++
net-misc/wput/wput-0.6.2_p20130413_p11.ebuild | 54 ++++++++++++++++++++++
4 files changed, 109 insertions(+)
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index bd6176fde979..5d5aff6c7a1c 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1 +1,3 @@
DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
+DIST wput_0.6.2+git20130413-11.debian.tar.xz 15976 BLAKE2B 4f1facab61d22544855ce49875357c8d67d6eab013cf73cb8507a334c07b1f9e9391e342347eeafdb26b62a4156d4a0a4e2967198662ad66ef8ebb35ed2c9bf8 SHA512 d80e727edee34bd0f9b40b14c0ed1bfd2ec456542445fd38c487f06d47ca210d785e911a71d455d335b9e3940a5cfc19cc7202d93501b0b0f4f3a1e6f6a5fc0a
+DIST wput_0.6.2+git20130413.orig.tar.bz2 257503 BLAKE2B a5386f5de3e8df23d814b3a7ebba1725bcb75f0a61bd26ea402053bd11d717ae5bdd1c1bc9e43d4f4a61f55a91d9222fffe62988b869b68c206c46bfd89cf28b SHA512 f8bb23f60ae008ecd18ec7f891fc17fe8d2b3550d7788c591067e48af00c934f2c3b2e5d07234fc25bcf6cb94464710ff0309151e9ad6dd734f5a30c3fdab06f
diff --git a/net-misc/wput/files/wput-0.6.2_p20130413_p11-no-compress-manpages.patch b/net-misc/wput/files/wput-0.6.2_p20130413_p11-no-compress-manpages.patch
new file mode 100644
index 000000000000..cc0c6e8e1b8b
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6.2_p20130413_p11-no-compress-manpages.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,7 +10,6 @@ bindir=@bindir@
+ all clean:
+ cd po && $(MAKE) $(MAKEDEFS) $@
+ cd src && $(MAKE) $(MAKEDEFS) $@
+- cd doc && $(MAKE) $(MAKEDEFS) $@
+
+ win-clean:
+ cd src && $(MAKE) $(MAKEDEFS) $@
+@@ -20,9 +20,9 @@ install: all
+ install -m0755 -d $(destdir)$(bindir)
+ install -m0755 -d $(destdir)$(mandir)
+ install -m0755 wput $(destdir)$(bindir)
+- install -m0644 doc/wput.1.gz $(destdir)$(mandir)
++ install -m0644 doc/wput.1 $(destdir)$(mandir)
+ cd $(destdir)$(bindir) && ln -s wput wdel
+- install -m0644 doc/wdel.1.gz $(destdir)$(mandir)
++ 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."
+@@ -34,6 +34,6 @@ install: all
+ uninstall:
+ rm -f $(destdir)$(bindir)/wput
+ rm -f $(destdir)$(bindir)/wdel
+- rm -f $(destdir)$(mandir)/wput.1.gz
+- rm -f $(destdir)$(mandir)/wdel.1.gz
++ rm -f $(destdir)$(mandir)/wput.1
++ rm -f $(destdir)$(mandir)/wdel.1
+
+--- a/doc/Makefile
++++ /dev/null
+@@ -1,5 +0,0 @@
+-all:
+- gzip < wput.1 > wput.1.gz
+- gzip < wdel.1 > wdel.1.gz
+-clean:
+- rm -f wput.1.gz wdel.1.gz
diff --git a/net-misc/wput/files/wput-0.6.2_p20130413_p11-xopen_source-strdup.patch b/net-misc/wput/files/wput-0.6.2_p20130413_p11-xopen_source-strdup.patch
new file mode 100644
index 000000000000..e2426d3fc25f
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6.2_p20130413_p11-xopen_source-strdup.patch
@@ -0,0 +1,14 @@
+ftp-ls.c:319:22: error: call to undeclared library function 'strdup' with type 'char *(const char *)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+ cur.linkto = xstrdup (p + 4);
+ ^
+--- a/src/ftp-ls.c
++++ b/src/ftp-ls.c
+@@ -29,7 +29,7 @@ file, but you are not obligated to do so. If you do not wish to do
+ so, delete this exception statement from your version. */
+
+ #include "config.h"
+-#define _XOPEN_SOURCE
++#define _XOPEN_SOURCE 600
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
new file mode 100644
index 000000000000..5934fa45be29
--- /dev/null
+++ b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
+HOMEPAGE="http://wput.sourceforge.net/"
+
+if [[ ${PV} == *_p* ]] ; then
+ MY_PV=$(ver_cut 1-3)
+ SRC_URI=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5).orig.tar.bz2"
+ SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz"
+ S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5)
+else
+ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tgz"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug ssl"
+
+RDEPEND="ssl? ( net-libs/gnutls:= )"
+DEPEND="${RDEPEND}"
+# Debian's patches to fix spelling means need gettext to regenerate
+# It's so common that it's not really worth the 'touch' dance to avoid it
+# or conditional patching.
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-xopen_source-strdup.patch
+ "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-no-compress-manpages.patch
+)
+
+src_prepare() {
+ eapply $(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series)
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --enable-g-switch=no
+ --enable-nls
+
+ $(usev debug '--enable-memdbg=yes')
+ $(use_with ssl)
+ )
+
+ econf "${myconf[@]}"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/wput/files/, net-misc/wput/
@ 2024-09-14 13:37 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2024-09-14 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 2d9281c3244bf563e586ec0b6c7902161c4f15bc
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 13:35:16 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 13:36:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9281c3
net-misc/wput: drop 0.6.2, 0.6.2_p20130413_p11
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
net-misc/wput/Manifest | 1 -
net-misc/wput/files/wput-0.6-respectldflags.patch | 11 -----
net-misc/wput/files/wput-0.6.2-fno-common.patch | 25 ----------
.../wput/files/wput-0.6.2-respect-destdir.patch | 21 ---------
net-misc/wput/files/wput-fix-crash.patch | 46 ------------------
net-misc/wput/wput-0.6.2.ebuild | 35 --------------
net-misc/wput/wput-0.6.2_p20130413_p11.ebuild | 54 ----------------------
7 files changed, 193 deletions(-)
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 5d5aff6c7a1c..74aab32dde1a 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,3 +1,2 @@
-DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
DIST wput_0.6.2+git20130413-11.debian.tar.xz 15976 BLAKE2B 4f1facab61d22544855ce49875357c8d67d6eab013cf73cb8507a334c07b1f9e9391e342347eeafdb26b62a4156d4a0a4e2967198662ad66ef8ebb35ed2c9bf8 SHA512 d80e727edee34bd0f9b40b14c0ed1bfd2ec456542445fd38c487f06d47ca210d785e911a71d455d335b9e3940a5cfc19cc7202d93501b0b0f4f3a1e6f6a5fc0a
DIST wput_0.6.2+git20130413.orig.tar.bz2 257503 BLAKE2B a5386f5de3e8df23d814b3a7ebba1725bcb75f0a61bd26ea402053bd11d717ae5bdd1c1bc9e43d4f4a61f55a91d9222fffe62988b869b68c206c46bfd89cf28b SHA512 f8bb23f60ae008ecd18ec7f891fc17fe8d2b3550d7788c591067e48af00c934f2c3b2e5d07234fc25bcf6cb94464710ff0309151e9ad6dd734f5a30c3fdab06f
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
deleted file mode 100644
index 9f0e09c4a78d..000000000000
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wput/src/Makefile.in
-+++ wput/src/Makefile.in
-@@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
- ftp-ls.o: ftp.h wget.h url.h
-
- wput: $(OBJ)
-- $(CC) -o $(EXE) $(OBJ) $(LIBS)
-+ $(CC) $(LDFLAGS) -o $(EXE) $(OBJ) $(LIBS)
- clean:
- rm -f *.o *~ *.bak ../wput getopt/*.o
- win-clean: clean
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch
deleted file mode 100644
index f188141aa87b..000000000000
--- a/net-misc/wput/files/wput-0.6.2-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/
-https://bugs.gentoo.org/706954
---- a/src/wput.h
-+++ b/src/wput.h
-@@ -140,7 +140,9 @@
-
- unsigned short int retry_interval;
- unsigned int speed_limit;
--} opt;
-+};
-+
-+extern struct global_options opt;
-
- extern _fsession * fsession_queue_entry_point;
- extern char * email_address;
---- a/src/wput.c
-+++ b/src/wput.c
-@@ -55,6 +55,7 @@
- #include "utils.h"
-
- extern char *optarg;
-+struct global_options opt;
-
- #ifdef WIN32
- const static char * version = "0.6.2-w32";
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
deleted file mode 100644
index 9cece1f388f8..000000000000
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 3d0efc9fd37f..000000000000
--- a/net-misc/wput/files/wput-fix-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/progress.c
-+++ b/src/progress.c
-@@ -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
deleted file mode 100644
index b721e93da415..000000000000
--- a/net-misc/wput/wput-0.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="https://wput.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug nls ssl"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.6.2-respect-destdir.patch"
- "${FILESDIR}/${PN}-0.6-respectldflags.patch"
- "${FILESDIR}/${PN}-fix-crash.patch"
- "${FILESDIR}/${PN}-0.6.2-fno-common.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}"
-}
diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
deleted file mode 100644
index 44e3ab8667a5..000000000000
--- a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="https://wput.sourceforge.net/"
-
-if [[ ${PV} == *_p* ]] ; then
- MY_PV=$(ver_cut 1-3)
- SRC_URI=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5).orig.tar.bz2"
- SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz"
- S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5)
-else
- SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tgz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug ssl"
-
-RDEPEND="ssl? ( net-libs/gnutls:= )"
-DEPEND="${RDEPEND}"
-# Debian's patches to fix spelling means need gettext to regenerate
-# It's so common that it's not really worth the 'touch' dance to avoid it
-# or conditional patching.
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-xopen_source-strdup.patch
- "${FILESDIR}"/${PN}-0.6.2_p20130413_p11-no-compress-manpages.patch
-)
-
-src_prepare() {
- eapply $(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series)
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --enable-g-switch=no
- --enable-nls
-
- $(usev debug '--enable-memdbg=yes')
- $(use_with ssl)
- )
-
- econf "${myconf[@]}"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/wput/files/, net-misc/wput/
@ 2020-11-01 5:11 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-11-01 5:11 UTC (permalink / raw
To: gentoo-commits
commit: a1e12b78372b32130e849b458f6dbdf2df363e7a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 1 05:01:40 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 05:10:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e12b78
net-misc/wput: fix build with gcc 10
Closes: https://bugs.gentoo.org/706954
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/wput/files/wput-0.6-gentoo.diff | 5 ++---
net-misc/wput/files/wput-0.6-respectldflags.patch | 4 +---
net-misc/wput/files/wput-0.6.2-fno-common.patch | 25 ++++++++++++++++++++++
.../wput/files/wput-0.6.2-respect-destdir.patch | 2 --
net-misc/wput/files/wput-fix-crash.patch | 5 ++---
net-misc/wput/wput-0.6.1-r1.ebuild | 15 +++++--------
net-misc/wput/wput-0.6.2.ebuild | 9 ++++----
7 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
index 312172348d0..7ddf0ba3ba1 100644
--- a/net-misc/wput/files/wput-0.6-gentoo.diff
+++ b/net-misc/wput/files/wput-0.6-gentoo.diff
@@ -1,6 +1,5 @@
-diff -urN wput/Makefile.in wput/Makefile.in
---- wput/Makefile.in 2006-04-04 18:16:52.000000000 +0100
-+++ wput/Makefile.in 2006-11-07 17:31:10.000000000 +0000
+--- a/Makefile.in
++++ b/Makefile.in
@@ -15,8 +15,12 @@
install: all
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
index d2b460b339b..9f0e09c4a78 100644
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch
+++ b/net-misc/wput/files/wput-0.6-respectldflags.patch
@@ -1,6 +1,4 @@
-Index: wput/src/Makefile.in
-===================================================================
---- wput.orig/src/Makefile.in
+--- wput/src/Makefile.in
+++ wput/src/Makefile.in
@@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
ftp-ls.o: ftp.h wget.h url.h
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch
new file mode 100644
index 00000000000..f188141aa87
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6.2-fno-common.patch
@@ -0,0 +1,25 @@
+https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/
+https://bugs.gentoo.org/706954
+--- a/src/wput.h
++++ b/src/wput.h
+@@ -140,7 +140,9 @@
+
+ unsigned short int retry_interval;
+ unsigned int speed_limit;
+-} opt;
++};
++
++extern struct global_options opt;
+
+ extern _fsession * fsession_queue_entry_point;
+ extern char * email_address;
+--- a/src/wput.c
++++ b/src/wput.c
+@@ -55,6 +55,7 @@
+ #include "utils.h"
+
+ extern char *optarg;
++struct global_options opt;
+
+ #ifdef WIN32
+ const static char * version = "0.6.2-w32";
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
index f0cbfcdebd6..9cece1f388f 100644
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
+++ b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6756cd2..6debea8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,12 +16,12 @@ win-clean:
diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch
index 2afab8e5991..3d0efc9fd37 100644
--- a/net-misc/wput/files/wput-fix-crash.patch
+++ b/net-misc/wput/files/wput-fix-crash.patch
@@ -1,6 +1,5 @@
-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
+--- a/src/progress.c
++++ b/src/progress.c
@@ -181,7 +181,7 @@
static char output[15];
time_t secs = time (NULL);
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
index 4622df77796..4121f54eca3 100644
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
+DESCRIPTION="Tiny program like wget to upload files/whole directories via FTP"
HOMEPAGE="http://wput.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
@@ -12,15 +12,14 @@ SLOT="0"
KEYWORDS="amd64 ppc ~sparc x86"
IUSE="debug nls ssl"
+BDEPEND="nls? ( sys-devel/gettext )"
RDEPEND="ssl? ( net-libs/gnutls )"
-
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-0.6-gentoo.diff"
"${FILESDIR}/${PN}-0.6-respectldflags.patch"
+ "${FILESDIR}/${PN}-0.6.2-fno-common.patch"
)
DOCS=( ChangeLog INSTALL TODO )
@@ -33,7 +32,3 @@ src_configure() {
$(use_with ssl) \
"${myconf}"
}
-
-src_install() {
- default
-}
diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild
index c95956b3e7b..dd45712ffb4 100644
--- a/net-misc/wput/wput-0.6.2.ebuild
+++ b/net-misc/wput/wput-0.6.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
HOMEPAGE="http://wput.sourceforge.net/"
@@ -12,16 +12,15 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="debug nls ssl"
+BDEPEND="nls? ( sys-devel/gettext )"
RDEPEND="ssl? ( net-libs/gnutls )"
-
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-0.6.2-respect-destdir.patch"
"${FILESDIR}/${PN}-0.6-respectldflags.patch"
"${FILESDIR}/${PN}-fix-crash.patch"
+ "${FILESDIR}/${PN}-0.6.2-fno-common.patch"
)
DOCS=( ChangeLog INSTALL TODO )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-14 13:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-26 12:10 [gentoo-commits] repo/gentoo:master commit in: net-misc/wput/files/, net-misc/wput/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-14 13:37 Petr Vaněk
2020-11-01 5:11 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox