www-client/prozilla: add patches

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2353 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-08-31 19:54:56 +00:00
parent 743c34942c
commit ce1defe4fb
13 changed files with 427 additions and 25 deletions

View File

@ -2,6 +2,15 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
31 Aug 2010; Mario Fetka <mario.fetka@gmail.com> prozilla-2.0.4.ebuild,
+files/prozilla-2.0.4-Oopt-document-1.patch,
-files/prozilla-2.0.4-gcc4.patch, +files/prozilla-2.0.4-home_dir-1.patch,
+files/prozilla-Oopt.patch, +files/prozilla-ac_fixes.patch,
+files/prozilla-gcc4.patch, +files/prozilla-man.patch,
+files/prozilla-no_memleak.patch, +files/prozilla-opt.patch,
+files/prozrc.sample:
add patches
22 Feb 2010; Mario Fetka <mario.fetka@gmail.com> prozilla-2.0.4.ebuild:
add a mirror

View File

@ -1,5 +1,13 @@
AUX prozilla-2.0.4-gcc4.patch 466 RMD160 031758588c5df79ccb68d423e073b76e9a0f76fb SHA1 cdf51cd38e9f6c2997284697aacb88e8c2e27ee1 SHA256 45326d3952f6ad35a1a65a47930dc7e6788a66f69d3b8dc767a9066672dd04ba
AUX prozilla-2.0.4-Oopt-document-1.patch 1601 RMD160 1ee7295b533d4e8dbb10063b0eed35e4c18cff65 SHA1 7d911fc93d89ac04da6c719a7c322b715475dab2 SHA256 853950557e95290dc90b57f24d80738ab519c1d761368eeed00b149dd2045b81
AUX prozilla-2.0.4-home_dir-1.patch 862 RMD160 d26326db43469c23782055a1f8240d34e5490729 SHA1 19c50cb020e38111154974b45369027850e32495 SHA256 abafb6fe778e695683bd9d0c0256b26730323d804b8513746044a868b785dd79
AUX prozilla-Oopt.patch 951 RMD160 a5ab328439d4f19f2ceeeed7d366170a992b6db0 SHA1 187589b5902207e644862565716a6ec7bd84ae9b SHA256 bb488632f544cd4a0d3844296950db88b375e1172083208f56e7c211e0f68d87
AUX prozilla-ac_fixes.patch 501 RMD160 b6bec17782f67b59fe6e4a32402c15b88770aeed SHA1 c332d6752463392ac8e8f1ca7b047e86631ae2e0 SHA256 f2a8d94765cfa9d0ca1b31490619b8face8f1be44dc230ff5e9e0543acdaf4f1
AUX prozilla-gcc4.patch 2772 RMD160 452f4ee4ab3e6f1db552084cbfa65596ff7c3ca6 SHA1 3a4e1310235e9438fdc93c7ccdd1bba5602c01e2 SHA256 5f25e92eee8200ed009cf57fb868935cf865360cc726d4df3c6796b03a14b7ef
AUX prozilla-man.patch 769 RMD160 34c23469bfd2f563bacd771a580076f5a9771b6f SHA1 7b375e4f6e63f17863ec813a3aeeee41b9689f45 SHA256 150fb89d49399de6dcfeb0e76fe6532c1502218fd79ad15a1b81031c193dbf5d
AUX prozilla-no_memleak.patch 966 RMD160 fe6b961aa6fd420db3a759a24254e467bce10a15 SHA1 ff09c90c756d5e5650e256dba0c51224a78f9651 SHA256 180b136d2118fe0e91d9dad5a96ed711def414da917e7305488fcefbf2101857
AUX prozilla-opt.patch 1228 RMD160 7b1ba8559e4a7892710e4fd61b97c93d831e6452 SHA1 e2b406800183d13374e2e37c091c83614572d265 SHA256 66cde409c8a501c2ed0ba44d12a8fe38d5866860732711188444f4ff31babb9f
AUX prozrc.sample 2752 RMD160 a0dbd572ca617b6910eda182e2c4f28aec50edc8 SHA1 ba26061686958d99427230f7efd86253066bcc07 SHA256 2e2eb6ce637be0a1af854e9b327e6d5816855ece3a2ac02ba9d3e50cfcc88432
DIST prozilla-2.0.4.tar.bz2 745429 RMD160 223056a1d353bba957cb252b7cb3509816875900 SHA1 328861f1b1491226f46ce2ed7f872c6a267d384c SHA256 0fda675f6032543a73a4cd0dec02fd16b35708694f5dbae235354751e00616ac
EBUILD prozilla-2.0.4.ebuild 867 RMD160 101acb11cd424b9143b70d3850ce7941c7be300d SHA1 2951284e85dbefd3d95bad72b4d9d0b9b8e3ddf4 SHA256 88e4e9de56874566754972e11dd6021f704f18786aed8837dbf480c0362da166
MISC ChangeLog 769 RMD160 e335d365fdeee4ca5971df704614eecf66fff686 SHA1 01cad5684d33ce2577663a178637ae0df45aea64 SHA256 5aa51abf5618a83011fdfa77a5790825a52fce4441215d0edc9f4f88047d74a7
EBUILD prozilla-2.0.4.ebuild 1410 RMD160 ba38dfcd338dcdde289199ea9bb6b028ed59a370 SHA1 c78b5e0ed120fa9df5b23001935b33bc24691751 SHA256 9a2ca5c23b4b2ae4f74f959069b526af60593e8c90857733c746ebe4eec16425
MISC ChangeLog 1187 RMD160 f9fb2eb1b361314ba9cbee3e87f7b47afcd9fcb9 SHA1 cfbb7637e3c1319f3a3a2e237a112f6bbdfd1ba0 SHA256 6a94c484f0524424f3c3e0ad39ba6416c88dac0d3abb9af0b9d5c789c1ecc791
MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

View File

@ -0,0 +1,44 @@
Submitted By: Your Name (your at email dot address)
Date: 2010-08-29
Initial Package Version: 2.0.4
Origin: me
Upstream Status: dead
Description: Add Proper documentation to prozilla:
extend online help
update man Page
diff -Naur prozilla-2.0.4.orig/man/proz.1 prozilla-2.0.4/man/proz.1
--- prozilla-2.0.4.orig/man/proz.1 2010-08-29 11:26:11.000000000 +0000
+++ prozilla-2.0.4/man/proz.1 2010-08-29 11:38:20.000000000 +0000
@@ -31,6 +31,10 @@
.TP
\-\-no\-curses
Don't use the Curses interface, but the traditional plain text interface
+.SH "Filess:"
+.TP
+\-P, \-\-output\-document=FILE
+write documents to FILE
.SH "Directories:"
.TP
\-P, \-\-directory\-prefix=DIR
diff -Naur prozilla-2.0.4.orig/src/main.cpp prozilla-2.0.4/src/main.cpp
--- prozilla-2.0.4.orig/src/main.cpp 2010-08-29 11:26:11.000000000 +0000
+++ prozilla-2.0.4/src/main.cpp 2010-08-29 11:34:33.000000000 +0000
@@ -59,6 +59,7 @@
{"tries", required_argument, NULL, 't'},
{"force", no_argument, NULL, 'f'},
{"version", no_argument, NULL, 'v'},
+ {"output-document", required_argument, NULL, 'O'},
{"directory-prefix", required_argument, NULL, 'P'},
{"use-port", no_argument, NULL, 129},
{"retry-delay", required_argument, NULL, 130},
@@ -133,6 +134,9 @@
" -v,--verbose Increase the amount of information sent to stdout\n"
" --no-curses Don't use Curses, plain text to stdout\n"
"\n"
+ "Files:\n"
+ " -O, --output-document=FILE write documents to FILE\n"
+ "\n"
"Directories:\n"
" -P, --directory-prefix=DIR save the generated file to DIR/\n"
"\n"

View File

@ -1,11 +0,0 @@
--- prozilla-2.0.4/src/download_win.h.orig 2006-02-08 18:18:59.000000000 +0100
+++ prozilla-2.0.4/src/download_win.h 2006-06-22 21:05:59.000000000 +0200
@@ -52,7 +52,7 @@
void handle_joining_thread();
void handle_dl_fatal_error();
void cleanup(boolean erase_dlparts);
- void DL_Window::print_status(download_t * download, int quiet_mode);
+ void print_status(download_t * download, int quiet_mode);
connection_t *connection;
download_t *download;

View File

@ -0,0 +1,21 @@
Submitted By: Your Name (your at email dot address)
Date: 2010-08-29
Initial Package Version: 2.0.4
Origin: http://github.com/screwgoth/prozilla-dev-2.5/commit/5c5600e816124f84ddedaa09306377362504642c
Upstream Status: dead
Description: Make sure that home_dir is never empty. If all else fails, pwd is
home_dir.
diff -Naur prozilla-2.0.4.orig/libprozilla/src/main.c prozilla-2.0.4/libprozilla/src/main.c
--- prozilla-2.0.4.orig/libprozilla/src/main.c 2010-08-29 12:49:09.000000000 +0000
+++ prozilla-2.0.4/libprozilla/src/main.c 2010-08-29 15:46:41.000000000 +0000
@@ -101,6 +101,9 @@
sprintf(netrc_file, "%s/%s", libprozrtinfo.home_dir, ".netrc");
libprozrtinfo.netrc_list = parse_netrc(netrc_file);
+ } else {
+ /* Make sure home dir is never NULL */
+ libprozrtinfo.home_dir = kstrdup(".");
}
libprozrtinfo.dl_dir = kstrdup(".");

View File

@ -0,0 +1,41 @@
--- prozilla-2.0.3/src/main.cpp.orig 2006-01-22 23:40:16.000000000 +0100
+++ prozilla-2.0.3/src/main.cpp 2006-01-22 23:48:40.000000000 +0100
@@ -216,12 +216,13 @@
{
int c;
int ret;
+ char *opt_file = NULL;
proz_init (argc, argv); //init libprozilla
set_defaults (); //set some reasonable defaults
load_prefs (); //load values from the config file
while ((c =
- getopt_long (argc, argv, "?hvrfk:1Lt:VgsP:", long_opts,
+ getopt_long (argc, argv, "?hvrfk:1Lt:VgsP:O:", long_opts,
NULL)) != EOF)
{
switch (c)
@@ -274,7 +275,12 @@
*/
rt.use_netrc = FALSE;
break;
-
+ case 'O':
+ /*
+ * Output file name
+ */
+ opt_file = kstrdup(optarg);
+ break;
case 'P':
/*
* Save the downloaded file to DIR
@@ -503,6 +509,9 @@
exit (0);
}
+ if (opt_file)
+ url_data->file=opt_file;
+
PrintMessage("Starting.....");
//In to %s\n",url_data->host);
// start the download

View File

@ -0,0 +1,11 @@
--- prozilla-1.3.6/acinclude.m4~ Fri Aug 17 16:38:55 2001
+++ prozilla-1.3.6/acinclude.m4 Sun Aug 19 17:19:39 2001
@@ -376,7 +17,7 @@
dnl @version $Id: acinclude.m4,v 1.3 2001/03/25 08:16:33 kalum Exp $
dnl @author Caolan McNamara <caolan@skynet.ie>
dnl
-AC_DEFUN(AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R,
+AC_DEFUN([AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R],
[AC_CACHE_CHECK(for which type of gethostbyname_r, ac_cv_func_which_gethostname_r, [
AC_CHECK_FUNC(gethostbyname_r, [
AC_TRY_COMPILE([

View File

@ -0,0 +1,60 @@
--- prozilla-2.0.3/src/download_win.h.orig 2006-01-24 16:10:01.000000000 +0000
+++ prozilla-2.0.3/src/download_win.h 2006-01-24 16:10:06.000000000 +0000
@@ -52,7 +52,7 @@
void handle_joining_thread();
void handle_dl_fatal_error();
void cleanup(boolean erase_dlparts);
- void DL_Window::print_status(download_t * download, int quiet_mode);
+ void print_status(download_t * download, int quiet_mode);
connection_t *connection;
download_t *download;
--- prozilla-2.0.3/src/download_win.cpp.orig 2005-12-11 18:21:33.000000000 +0100
+++ prozilla-2.0.3/src/download_win.cpp 2006-01-24 20:21:03.489470750 +0100
@@ -599,7 +599,7 @@
{
fprintf (stdout,
- "%2.2d %-30.30s %15.15s %10Ld\n",
+ "%2.2d %-30.30s %15.15s %10zd\n",
i + 1, download->pconnections[i]->u.host,
proz_connection_get_status_string (download->
pconnections
@@ -608,7 +608,7 @@
(download->pconnections[i]));
}
- fprintf (stdout, "Total Bytes received %Ld Kb\n",
+ fprintf (stdout, "Total Bytes received %zd Kb\n",
proz_download_get_total_bytes_got (download) / 1024);
@@ -648,7 +648,7 @@
//WGET looks like this:
//xx% [=======> ] nnn,nnn,nnn XXXX.XXK/s ETA hh:mm:ss
- fprintf (stdout, " %.2lf%% %lldKb/%lldkb %0.3fKb/s ETA %s \r",
+ fprintf (stdout, " %.2lf%% %zdKb/%zdkb %0.3fKb/s ETA %s \r",
((float)totalDownloaded) / ((float)totalFile / 100),
totalDownloaded, totalFile, (float)aveSpeed, timeLeft);
fflush (stdout);
--- prozilla-2.0.3/libprozilla/src/ftpsearch.c.orig 2005-12-12 01:05:49.000000000 +0100
+++ prozilla-2.0.3/libprozilla/src/ftpsearch.c 2006-01-24 20:19:46.908684750 +0100
@@ -119,7 +119,7 @@
(char *) kmalloc(lycos_url_len + strlen(request->file_name) + 300);
sprintf(lycos_url_buf,
- "%s?form=advanced&query=%s&doit=Search&type=Exact+search&hits=%d&matches=&hitsprmatch=&limdom=&limpath=&limsize1=%Ld&limsize2=%lld&f1=Host&f2=Path&f3=Size&f4=-&f5=-&f6=-&header=none&sort=none&trlen=20",
+ "%s?form=advanced&query=%s&doit=Search&type=Exact+search&hits=%d&matches=&hitsprmatch=&limdom=&limpath=&limsize1=%zd&limsize2=%zd&f1=Host&f2=Path&f3=Size&f4=-&f5=-&f6=-&header=none&sort=none&trlen=20",
ftps_loc, request->file_name, num_req_mirrors,
request->file_size, request->file_size);
@@ -159,7 +159,7 @@
(char *) kmalloc(filesearching_url_len + strlen(request->file_name) + 300);
sprintf(filesearching_url_buf,
- "%s?q=%s&l=en&t=f&e=on&m=%d&o=n&s=on&s1=%Ld&s2=%Ld&d=&p=&p2=&x=10&y=14",
+ "%s?q=%s&l=en&t=f&e=on&m=%d&o=n&s=on&s1=%zd&s2=%zd&d=&p=&p2=&x=10&y=14",
ftps_loc, request->file_name, num_req_mirrors,
request->file_size, request->file_size);

View File

@ -0,0 +1,21 @@
--- prozilla-2.0.3/man/proz.1.orig 2006-01-22 23:26:51.000000000 +0100
+++ prozilla-2.0.3/man/proz.1 2006-01-22 23:29:00.000000000 +0100
@@ -103,12 +103,15 @@
can be placed in /etc/make.conf to use ProZilla to download your system updates. This example will not do FTP searches for files < 500Kb, uses the text interface (handier with portage) and saves the files in your ${DISTDIR} (normally /usr/portage/distfiles)
.SH "FILES"
.TP
-"/etc/prozilla.conf"
-The global config file
+"~/.prozilla"
+The per\-user config directory
.TP
-"~/.prozrc"
+"~/.prozilla/prozconfig"
The per\-user config file
.TP
+"~/.prozilla/debug.log"
+The per\-user debug log
+.TP
"~/.netrc"
A file which can be used to provide ProZilla with hosts, accounts and passwords
.SH "BUGS"

View File

@ -0,0 +1,45 @@
--- ./libprozilla/src/connect.c.orig Wed Feb 8 14:19:54 2006
+++ ./libprozilla/src/connect.c Sun Sep 17 14:00:02 2006
@@ -54,16 +54,14 @@
hints.ai_socktype = SOCK_STREAM;
error = getaddrinfo(name, szPort, &hints, &res);
- if (error) {
- freeaddrinfo(res);
- return HOSTERR;
- }
+ if (error)
+ return HOSTERR;
/* Create a socket. */
if ((*sock = socket(res->ai_family, res->ai_socktype, IPPROTO_TCP)) < 1)
{
- free(res);
+ freeaddrinfo(res);
return CONSOCKERR;
}
@@ -110,11 +108,11 @@
if (errno == ECONNREFUSED)
{
- free(res);
+ freeaddrinfo(res);
return CONREFUSED;
} else
{
- free(res);
+ freeaddrinfo(res);
return CONERROR;
}
} else
@@ -133,7 +131,7 @@
setsockopt(*sock, SOL_SOCKET, SO_KEEPALIVE,
(char *) &opt, (int) sizeof(opt));
- free(res);
+ freeaddrinfo(res);
return NOCONERROR;
}

View File

@ -0,0 +1,36 @@
--- prozilla-2.0.3/libprozilla/configure.in.orig 2005-12-12 01:06:00.000000000 +0100
+++ prozilla-2.0.3/libprozilla/configure.in 2006-01-27 21:24:20.701344750 +0100
@@ -168,7 +168,7 @@
AC_SUBST(MSGFMT)
-CFLAGS="-Wall -O0 -D_REENTRANT"
+CFLAGS="$CFLAGS -Wall -D_REENTRANT"
if test "x$GCC" != "xyes"; then
enable_compiler_warnings = "no";
@@ -176,11 +176,11 @@
if test "x$enable_compiler_warnings" != "xno"; then
if test "x$enable_compiler_warnings" = "xmin"; then
- CFLAGS="$CFLAGS -g -ansi -pedantic"
+ CFLAGS="$CFLAGS -ansi -pedantic"
fi
if test "x$enable_compiler_warnings" = "xyes"; then
CFLAGS="$CFLAGS \
--g -ansi -pedantic -W -Wtraditional -Wshadow -Wpointer-arith \
+-ansi -pedantic -W -Wtraditional -Wshadow -Wpointer-arith \
-Wcast-qual -Wcast-align -Wwrite-strings -Wconversion \
-Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations -Wnested-externs -Winline"
--- prozilla-2.0.3/configure.in.orig 2005-12-12 01:07:52.000000000 +0100
+++ prozilla-2.0.3/configure.in 2006-01-27 21:23:52.247566500 +0100
@@ -82,7 +82,7 @@
AC_TYPE_SIZE_T
TYPE_SOCKLEN_T
-CFLAGS="-Wall -O2 -D_REENTRANT"
+CFLAGS="$CFLAGS -Wall -D_REENTRANT"
dnl ==============

View File

@ -0,0 +1,102 @@
# Prozilla rc file.
# Any line beginning w/ a "#" is a comment
# Empty lines are ignored
# This will generate a file named debug.log
# If you want to report a bug please also send the file debug.log.
#
#debug=off
# How many connections prozilla will make.
# This greatly depends on your bandwidth.
# Recommended values:
# 33k: dunno, tell us what you find to be the best
# 56-64k: dunno, tell us what you find to be the best
# Cable: dunno, tell us what you find to be the best
# DSL: dunno, tell us what you find to be the best
# Subspatial Transmissions: dunno, tell us if you have this ;)
#
#threads = 4
# How many servers will we ping at once
# Recommended values...
#
pingatonce = 5
# Wait 2*n seconds for a server response (default 2*4)
pingtimeout = 4
# The next option is a very nice thing. Just set it on ;)
# BTW, it's still under test. If you find bugs please report
# them at <prozilla@genesys.ro>
#
# Patches are greatly appreciated.
#ftpsearch = ON
#The next line spcifies the server to use for the ftpsearch
# lycos changed it from ftpsearch.lycos com to the following
#
#ftpsearchurl = http://download.lycos.com/swadv/AdvResults.asp
#ftpsearchurl = http://ftpsearch.uniovi.es:8000/ftpsearch
# How many mirrors we will request from ftpsearch.
# This option only make sense w/ ftpsearch ON
#
#mirrors = 40
# The timeout period
# How long do we wait when there is no response before starting again
#
#timeout = 180
# How many attempts do we make when we encounter a data transmission error
# to get the file in (default is 200), specify 0 to try infinitely
#
#tries = 200
#The timedelay between retries. (default 15 seconds)
#
#retrydelay = 15
# The force option, off by default. When enabled cause Prozilla NOT
# to prompt the user about overwriting existent files etc..
#
#forcemode = off
# Maximum redirections allowed
#
#maxredirs = 10
# Use ~/.netrc? On by default
#
#netrc = on
# Uses PASV by default. If you don't like it set it OFF and will use PORT instead.
#
#pasv = off
# If you turn this option ON, when an error occurs, ProZilla will print the
# error to stdout and quit instead of waiting for the user to press a key to
# exit
#
#nogetch = off
#The maxbps option can be used to limit the bandwith consumption of
# prozilla for example maxbps = 40000 will limit it to consume a maximum of
# 40k of bandwith, the default is 0 which means unlimited bandwith
# consumption (ie no limitation just get as fast as possible)
#
#maxbps = 0
#mainoutputdir
#This specifies to which directory the output file will be built
#mainoutputdir = /home/weasel/downloads
#Now if you download a file called gcc-2.95.2.tar.bz2 it will be saved as
#/home/weasel/downloads/gcc-2.95.2.tar.bz2
#
#mainoutputdir = .

View File

@ -2,37 +2,52 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
inherit eutils
EAPI="2"
inherit eutils autotools
DESCRIPTION="A download manager"
HOMEPAGE="http://prozilla.genesys.ro/"
SRC_URI="http://prozilla.genesys.ro/downloads/prozilla/tarballs/${P}.tar.bz2
SRC_URI="http://ftp.disconnected-by-peer.at/prozilla/${P}.tar.bz2
ftp://ftp.jpix.ad.jp/pub/FreeBSD/ports/distfiles/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~ppc sparc x86"
IUSE=""
IUSE="static nls pic"
RDEPEND="virtual/libc
>=sys-libs/ncurses-5.2"
DEPEND="${RDEPEND}
>=sys-apps/sed-4"
src_unpack() {
unpack ${A}
cd ${S}
epatch "${FILESDIR}"/prozilla-2.0.4-gcc4.patch
src_prepare() {
epatch "${FILESDIR}"/prozilla-ac_fixes.patch
epatch "${FILESDIR}"/prozilla-Oopt.patch
epatch "${FILESDIR}"/prozilla-2.0.4-Oopt-document-1.patch
epatch "${FILESDIR}"/prozilla-man.patch
epatch "${FILESDIR}"/prozilla-gcc4.patch
epatch "${FILESDIR}"/prozilla-opt.patch
epatch "${FILESDIR}"/prozilla-2.0.4-home_dir-1.patch
epatch "${FILESDIR}"/prozilla-no_memleak.patch
head -n 667 libprozilla/acinclude.m4 > tmp
mv tmp libprozilla/acinclude.m4
# die
eautoreconf
}
src_compile() {
econf --enable-shared
src_configure() {
econf --enable-shared \
$(use_enable static) \
$(use_enable nls) \
$(use_with pic)
}
src_install () {
make DESTDIR="${D}" install || die "make install failed"
dodoc ANNOUNCE AUTHORS CREDITS ChangeLog FAQ NEWS README TODO
newdoc prozrc.sample prozilla.conf.example
dodoc AUTHORS CREDITS* ChangeLog docs/FAQ libprozilla/docs/HACKING NEWS README TODO
insinto /etc
newins "${FILESDIR}"/prozrc.sample prozilla.conf
rm -f "${D}"/usr/share/locale/locale.alias
}