debian/0000755000000000000000000000000011534227630007171 5ustar debian/changelog0000644000000000000000000001100711534227460011043 0ustar puf (1.0.0-7) unstable; urgency=low [ Kai Wasserbäch ] * debian/rules: - Add --parallel to dh invocation. - Updated for debhelper 8 compatibility. - Only use the sequence from dh-autoreconf, also updates config.{sub,guess}. (Closes: #613983) * debian/control: - Bumped Standards-Version to 3.9.1, no further changes needed. - Changed my e-mail address. - Bumped B-D on debhelper. * debian/source/local-options: Make sure patches get unapplied again. * debian/compat: Now "8". -- Marco Nenciarini Fri, 04 Mar 2011 19:27:21 +0100 puf (1.0.0-6) unstable; urgency=low [ Kai Wasserbäch ] * Use new dh-autoreconf in conjunction with autotools-dev in favour of custom rules: - debian/control: + dh-autoreconf: Added Build-Depends. + autotools-dev: Added Build-Depends with "(>= 20100122.1)", because of the dh sequence. + auto{make,conf}: Removed Build-Depends. + Bumped Build-Depends on debhelper to >= 7.3.16~ for sequence support. - debian/rules: Replace everything with "dh --with autotools_dev,autoreconf $@". * debian/patches: - 0003-Fix-gcc-4.1-optimization-issue.patch: Updated to address compiler warnings. - 0006-Fix-compiler-warnings.patch: Added to address remaining warnings with GCC 4.5. * debian/control: Bumped Standards-Version to 3.9.0, no further changes needed. -- Marco Nenciarini Tue, 29 Jun 2010 22:37:38 +0200 puf (1.0.0-5) unstable; urgency=low [ Kai Wasserbäch ] * debian/rules: converted to debhelper 7 format. Fixes debian-rules-ignores-make-clean-error. * debian/control: - Bump Standards-Version to 3.8.4, no further changes needed. Fixes ancient-standards-version. - Added Homepage field. (Closes: #494814) - Added ${misc:Depends}, fixes debhelper-but-no-misc-depends. - Added Build-Depends on autoconf and automake. * Convert the package to source format "3.0 (quilt)". * debian/copyright: Fix Lintian warnings copyright-without-copyright-notice and copyright-refers-to-versionless-license-file. * debian/patches/0004-Fix-hyphen-used-as-minus-sign-reported-by-Lintian.patch: Added. Fixes hyphen-used-as-minus-sign as reported by Lintian. [ Marco Nenciarini ] * debian/rules: run autoreconf at build time. Fixes outdated-autotools-helper-file and Closes: #535740 * debian/control: add Vcs-* fields. * Add Kai Wasserbäch to Uploader field. -- Marco Nenciarini Wed, 21 Apr 2010 19:38:14 +0200 puf (1.0.0-4) unstable; urgency=low * Decleared all global static variables as volatile to fix gcc-4.1 optimization issue (Closes: #411069) -- Marco Nenciarini Sat, 17 Feb 2007 13:18:41 +0100 puf (1.0.0-3) unstable; urgency=low * debian/control: Bump Standards-Version to 3.7.2.2; no changes required * Remove the unnecessary -lnsl library reference from Makefiles to clean up unnecessary library dependency. Thanks to Christian Aichinger for his neat checklib system! -- Marco Nenciarini Wed, 11 Oct 2006 16:29:46 +0200 puf (1.0.0-2) unstable; urgency=low * src/fetch.c: Corrected double free in function ls_iterate_rm -- Marco Nenciarini Sun, 5 Feb 2006 17:22:13 +0100 puf (1.0.0-1) unstable; urgency=low * New upstream release * Updated watch file to use the qa.debian.org redirector -- Marco Nenciarini Mon, 23 Jan 2006 12:52:23 +0100 puf (0.93.2a-3) unstable; urgency=low * New maintainer. * debian/control: Bump Standards-Version to 3.6.2.0; no changes required * Use debian/compat instead of DH_COMPAT=n in debian/rules. * Update debhelper compatibility level to 5. * debian/copyright: Updated FSF address * debian/docs: Removed useless NEWS file. * Updated config.sub/config.guess (Closes: #342439) * Added watch file. -- Marco Nenciarini Mon, 23 Jan 2006 11:01:41 +0100 puf (0.93.2a-2) unstable; urgency=low * Apply gcc-3.4 patch from Andreas Jochens (Closes: #259611) -- Mike Markley Sat, 9 Oct 2004 13:37:31 -0700 puf (0.93.2a-1) unstable; urgency=low * New upstream version. -- Mike Markley Tue, 18 Mar 2003 01:51:46 -0800 puf (0.91-0beta6a1) unstable; urgency=low * Initial Release (Closes: #113756) * Upstream's manpage suggests you just do a puf -h for a list of options. I've added the options to the manpage. -- Mike Markley Sat, 29 Sep 2001 15:08:10 -0700 debian/compat0000644000000000000000000000000211534227460010370 0ustar 8 debian/control0000644000000000000000000000147211534227460010601 0ustar Source: puf Section: web Priority: optional Maintainer: Marco Nenciarini Uploaders: Kai Wasserbäch Build-Depends: debhelper (>= 8), dh-autoreconf, autotools-dev (>= 20100122.1) Standards-Version: 3.9.1 Homepage: http://puf.sourceforge.net/ Vcs-Git: git://git.debian.org/git/collab-maint/puf.git Vcs-Browser: http://git.debian.org/?p=collab-maint/puf.git Package: puf Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Parallel URL fetcher puf is a download tool for UNIX-like systems. You may use it to download single files or to mirror entire servers. It is similar to GNU wget (and has a partly compatible command line), but has the ability to do many downloads in parallel. This is very interesting, if you have a high-bandwidth internet connection. debian/copyright0000644000000000000000000000221311534227460011123 0ustar This package was debianized by Mike Markley on Fri, 28 Sep 2001 01:49:32 -0700. It was downloaded from http://puf.sourceforge.net Upstream Authors: Anders Gavare Oswald Buddenhagen Copyright: Copyright (C) 1999-2000 Anders Gavare Copyright (C) 2000-2004 Oswald Buddenhagen License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/docs0000644000000000000000000000003111534227460010037 0ustar README TODO ChangeLog.ag debian/patches/0000755000000000000000000000000011534227460010621 5ustar debian/patches/0001-Fix-double-free-in-function-ls_iterate_rm.patch0000644000000000000000000000071211534227460022213 0ustar From: Marco Nenciarini Date: Sun, 5 Feb 2006 17:22:13 +0100 Subject: [PATCH] Fix double free in function ls_iterate_rm --- src/fetch.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/fetch.c b/src/fetch.c index 159d830..fb1d014 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -481,7 +481,6 @@ fetch_all() ls_remove(au); deactivate_url(au); - free(au); continue; c_uq: ; }); -- debian/patches/0002-Clean-up-unnecessary-library-dependency.patch0000644000000000000000000000124411534227460022001 0ustar From: Marco Nenciarini Date: Wed, 11 Oct 2006 16:29:46 +0200 Subject: [PATCH] Clean up unnecessary library dependency Remove the unnecessary -lnsl library reference from Makefiles to clean up unnecessary library dependency. Thanks to Christian Aichinger for his neat checklib system! --- configure.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index f39ad7b..9eafc91 100644 --- a/configure.in +++ b/configure.in @@ -95,7 +95,6 @@ esac dnl Checks for libraries. AC_CHECK_LIB(xnet, inet_addr) AC_CHECK_LIB(socket, socket) -AC_CHECK_LIB(nsl, gethostbyname) dnl Checks for header files. -- debian/patches/0003-Fix-gcc-4.1-optimization-issue.patch0000644000000000000000000000304211534227460017653 0ustar From: Marco Nenciarini Date: Sat, 17 Feb 2007 13:18:41 +0100 Subject: [PATCH] Fix gcc-4.1 optimization issue Decleare all global static variables as volatile to fix gcc-4.1 optimization issue Closes: #411069 --- src/hostlist.c | 4 ++-- src/http_req.c | 2 +- src/url.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) Index: b/src/hostlist.c =================================================================== --- a/src/hostlist.c +++ b/src/hostlist.c @@ -13,8 +13,8 @@ int always_primary_name; -static host_t *hostlist; /* list of known hosts */ -static int real_num_hosts; +static volatile host_t *hostlist; /* list of known hosts */ +static volatile int real_num_hosts; whost_t *queue_dns_lookup; /* waiting for start of lookup */ dnsproc_t *list_dns_busy, *list_dns_idle; /* helper processes */ Index: b/src/http_req.c =================================================================== --- a/src/http_req.c +++ b/src/http_req.c @@ -11,7 +11,7 @@ #include "puf.h" -static char *user_agent; +static volatile char *user_agent; void init_user_agent(void) Index: b/src/url.c =================================================================== --- a/src/url.c +++ b/src/url.c @@ -12,9 +12,9 @@ #include "puf.h" int economize_dns; -static url_t *urllist; -static int real_num_urls; -static proxy_t *proxylist; +static volatile url_t *urllist; +static volatile int real_num_urls; +static volatile proxy_t *proxylist; /* calculate hash code for given url. eliminate duplicates */ int debian/patches/0004-Fix-hyphen-used-as-minus-sign-reported-by-Lintian.patch0000644000000000000000000000156011534227460023520 0ustar From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= Date: Tue, 13 Apr 2010 20:41:48 +0200 Subject: [PATCH] Fix hyphen-used-as-minus-sign (reported by Lintian). --- puf.1 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/puf.1 b/puf.1 index d0b1556..ec0a90c 100644 --- a/puf.1 +++ b/puf.1 @@ -3,7 +3,7 @@ .\" All Rights Reserved .TH puf 1 "11 Oct 2000" .SH NAME -puf \- http client for parallel downloading +puf - http client for parallel downloading .SH SYNTAX .LP .BI "puf" " [options] url [url ...]" @@ -16,7 +16,7 @@ The main difference is that tries to download as many urls as possible in parallel. .PP The available options vary between different versions. -Simply run `puf -h' to get a list of available options. +Simply run `puf \-h' to get a list of available options. .SH "SEE ALSO" .BR ftp (1), .BR lynx (1) -- debian/patches/0005-Upgrade-configure.in.patch0000644000000000000000000000407411534227460016204 0ustar From: Marco Nenciarini Date: Wed, 14 Apr 2010 18:52:25 +0200 Subject: [PATCH] Upgrade configure.in Remove obsolete definitions Add AM_MAINTAINER_MODE --- configure.in | 49 +------------------------------------------------ 1 files changed, 1 insertions(+), 48 deletions(-) diff --git a/configure.in b/configure.in index 9eafc91..f608967 100644 --- a/configure.in +++ b/configure.in @@ -4,54 +4,7 @@ AC_INIT(Makefile.am) AM_INIT_AUTOMAKE(puf,1.0.0) AM_CONFIG_HEADER(config.h) -dnl m4_ifdef([AS_HELP_STRING], , -dnl [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -m4_undefine([AS_HELP_STRING]) - -m4_define([AS_HELP_STRING], -[m4_pushdef([AS_Prefix], m4_default([$3], [ ]))dnl -m4_pushdef([AS_Prefix_Format], - [ %-]m4_eval(m4_len(AS_Prefix) + 1)[s ])dnl [ %-23s ] -m4_text_wrap([$2], AS_Prefix, [m4_format(AS_Prefix_Format, [[[$1]]])])dnl -m4_popdef([AS_Prefix_Format])dnl -m4_popdef([AS_Prefix])dnl -]) - -m4_undefine([AC_ARG_WITH]) - -AC_DEFUN([AC_ARG_WITH], -[m4_divert_once([HELP_WITH], [[ -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)]]) -m4_divert_once([HELP_WITH], [[$2]])dnl -# Check whether --with-$1 or --without-$1 was given. -if test "[${with_]m4_bpatsubst([$1], -, _)+set}" = set; then - withval="[$with_]m4_bpatsubst([$1], -, _)" - $3 -m4_ifvaln([$4], [else - $4])dnl -fi; dnl -])# AC_ARG_WITH - -m4_undefine([AC_ARG_ENABLE]) - -AC_DEFUN([AC_ARG_ENABLE], -[m4_divert_once([HELP_ENABLE], [[ -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]]])dnl -m4_divert_once([HELP_ENABLE], [[$2]])dnl -# Check whether --enable-$1 or --disable-$1 was given. -if test "[${enable_]m4_bpatsubst([$1], -, _)+set}" = set; then - enableval="[$enable_]m4_bpatsubst([$1], -, _)" - $3 -m4_ifvaln([$4], [else - $4])dnl -fi; dnl -])# AC_ARG_ENABLE - +AM_MAINTAINER_MODE AC_DEFUN([OB_ARG_ENABLE], [ AC_MSG_CHECKING([$3]) -- debian/patches/0006-Fix-compiler-warnings.patch0000644000000000000000000001315611534227460016417 0ustar From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= Date: Sat, 08 May 2010 20:38:21 +0200 Subject: Fix compiler warnings. Not all warnings (with GCC 4.5) are fixed as of now. That'll be done as soon as I find time to fight through the thicket of #defines. --- src/fetch.c | 2 +- src/hostlist.c | 18 +++++++++--------- src/url.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) Index: b/src/fetch.c =================================================================== --- a/src/fetch.c +++ b/src/fetch.c @@ -450,7 +450,7 @@ fetch_all() dbg(QUE, (" connect event\n")); getsockopt(au->socket, SOL_SOCKET, SO_ERROR, - (void *)&err, &errl); + (void *)&err, (socklen_t *)&errl); if (err) conn_err (au, 0, 2, 3, "connect to '%s' failed\n", "connect for $u failed"); Index: b/src/hostlist.c =================================================================== --- a/src/hostlist.c +++ b/src/hostlist.c @@ -20,7 +20,7 @@ whost_t *queue_dns_lookup; /* waiting f dnsproc_t *list_dns_busy, *list_dns_idle; /* helper processes */ -#define hhash(hp) calc_hash(hp->name) +#define hhash(hp) calc_hash((u_char*)hp->name) /* create new hostname structure */ static host_t * @@ -31,7 +31,7 @@ add_host(const char *name, int len) if ((h = mmalloc(sizeof(host_t) + len))) { memcpy(h->name, name, len); - hash = calc_nhash(name, len - 1); + hash = calc_nhash((u_char*)name, len - 1); h_add(hostlist, real_num_hosts, host_t, h, hash, free(h); return 0;, hhash); } return h; @@ -58,7 +58,7 @@ lcase(char *d, const char *s) host_t * host_lookup_fast(const char *name, int namlen) { - int hash = calc_nhash(name, namlen); + int hash = calc_nhash((u_char*)name, namlen); #define hcmp(h) !memcmp(name, h->name, namlen + 1) #define hfnd(h) return h; @@ -129,7 +129,7 @@ finish_lookup(dnsproc_t *proc) if (!wh->host) return 1; dbg(DNS, (" request originator was %s\n", wh->host->name)); - na = ((int *)buf)[0]; + na = (int)(buf[0]); if (!na) { prx(ERR, "DNS lookup for '%s' failed!\n", wh->host->name); goto badhost; @@ -156,7 +156,7 @@ finish_lookup(dnsproc_t *proc) dbg(DNS, (" entry %d is origin\n", nhs)); hapi = 1; hs[nhs++] = wh->host; - } else if ((h = host_lookup_fast(buf + cp + 1, buf[cp] - 1))) { + } else if ((h = host_lookup_fast((const char*)(buf + cp + 1), buf[cp] - 1))) { if (h->ready) { dbg(DNS, (" entry %d (%s) is already resolved\n", nhs, h->name)); @@ -171,7 +171,7 @@ finish_lookup(dnsproc_t *proc) hs[nhs++] = h; } else { dbg(DNS, (" entry %d (%s) is new\n", nhs, buf + cp + 1)); - if (!(h = add_host(buf + cp + 1, buf[cp]))) { + if (!(h = add_host((const char *)(buf + cp + 1), buf[cp]))) { if (!nhs) goto badhost; continue; @@ -293,7 +293,7 @@ fork_dnsproc() alarm(0); if (!he) { dbg(DNS, ("dns helper %d: lookup failed\n", getpid())); - ((int *)buf)[0] = 0; + buf[0] = 0; if (write(fds[1], buf, sizeof(int)) != sizeof(int)) { if (getppid() != 1) prx(ERR, "DNS helper: cannot write control socket!\n"); @@ -305,7 +305,7 @@ fork_dnsproc() na++, cp += he->h_length) memcpy(buf + cp, he->h_addr_list[na], he->h_length); dbg(DNS, ("dns helper %d: lookup successful, %d addresses\n", getpid(), na)); - ((int *)buf)[0] = na; + buf[0] = na; ((int *)buf)[1] = he->h_length; /* copy name and aliases */ @@ -327,7 +327,7 @@ fork_dnsproc() } } else { dbg(DNS, ("dns helper %d: lookup timed out\n", getpid())); - ((int *)buf)[0] = -1; + buf[0] = -1; if (write(fds[1], buf, sizeof(int)) != sizeof(int)) { if (getppid() != 1) prx(ERR, "DNS helper: cannot write control socket!\n"); Index: b/src/url.c =================================================================== --- a/src/url.c +++ b/src/url.c @@ -20,7 +20,7 @@ static volatile proxy_t *proxylist; int find_url(const char *path, int len, hinfo_t *hinfo, u_short port, int *hashp) { - int hash = calc_nhash(path, len) ^ (int)hinfo ^ port; + int hash = calc_nhash((u_char*)path, len) ^ (int)hinfo ^ port; #define ucmp(u) u->host->info == hinfo && u->port == port && \ !memcmp(u->local_part, path, len) && u->local_part[len] == '\0' @@ -143,7 +143,7 @@ print_url(char *buf, int bufl, url_t *u, dl = 0; lcat_str(buf, bufl, dl, "http://"); if (auth && u->parm->http_auth) { - lcat_mem(buf, bufl, dl, decode_auth(abuf, u->parm->http_auth), abuf); + lcat_mem(buf, bufl, dl, decode_auth(abuf, (u_char*)u->parm->http_auth), abuf); lcat_chr(buf, bufl, dl, '@'); } lcat_str(buf, bufl, dl, u->host->name); @@ -487,7 +487,7 @@ parse_add_proxy(const char *srct, const len_auth = len_enc_auth(pu->authlen); if (!(authbuf = mmalloc(len_auth))) return 0; - encode_auth(authbuf, pu->auth, pu->authlen); + encode_auth(authbuf, (u_char*)pu->auth, pu->authlen); have_auth = 1; } else { len_auth = 0; @@ -742,7 +742,7 @@ parse_add_url(const char *srct, const ch free_url(u); return 0; } - encode_auth(u->parm->http_auth, pu->auth, pu->authlen); + encode_auth(u->parm->http_auth, (u_char*)pu->auth, pu->authlen); } else if (referer && parm->http_auth && host && host->ready && host->info != referer->host->info) { @@ -828,7 +828,7 @@ do_add_url(url_t *u, int hash) u->parm->time_stamp = 0; } -#define uhash(up) calc_hash(up->local_part) ^ (int)up->host->info ^ up->port +#define uhash(up) calc_hash((u_char*)up->local_part) ^ (int)up->host->info ^ up->port h_add(urllist, real_num_urls, url_t, u, hash, return 0;, uhash); num_urls++; debian/patches/series0000644000000000000000000000042011534227460012032 0ustar 0001-Fix-double-free-in-function-ls_iterate_rm.patch 0002-Clean-up-unnecessary-library-dependency.patch 0003-Fix-gcc-4.1-optimization-issue.patch 0004-Fix-hyphen-used-as-minus-sign-reported-by-Lintian.patch 0005-Upgrade-configure.in.patch 0006-Fix-compiler-warnings.patch debian/rules0000755000000000000000000000007311534227460010252 0ustar #!/usr/bin/make -f %: dh $@ --parallel --with autoreconf debian/source/0000755000000000000000000000000011534227460010472 5ustar debian/source/format0000644000000000000000000000001411534227460011700 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000005611534227460010224 0ustar version=3 http://sf.net/puf/puf-(.*)\.tar.gz