Author: maciek2w Date: Sun Jan 22 23:16:56 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 2.0.3 - fixed patches - fixed man about users config file
---- Files affected: SOURCES: prozilla-man.patch (NONE -> 1.1) (NEW), prozilla-Oopt.patch (1.1 -> 1.2) , prozilla-ac_fixes.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/prozilla-man.patch diff -u /dev/null SOURCES/prozilla-man.patch:1.1 --- /dev/null Mon Jan 23 00:16:56 2006 +++ SOURCES/prozilla-man.patch Mon Jan 23 00:16:51 2006 @@ -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" ================================================================ Index: SOURCES/prozilla-Oopt.patch diff -u SOURCES/prozilla-Oopt.patch:1.1 SOURCES/prozilla-Oopt.patch:1.2 --- SOURCES/prozilla-Oopt.patch:1.1 Wed Mar 23 22:27:31 2005 +++ SOURCES/prozilla-Oopt.patch Mon Jan 23 00:16:51 2006 @@ -1,41 +1,41 @@ -diff -urN prozilla-1.3.7.3.org/src/main.c prozilla-1.3.7.3/src/main.c ---- prozilla-1.3.7.3.org/src/main.c 2005-01-23 12:09:59.000000000 +0100 -+++ prozilla-1.3.7.3/src/main.c 2005-03-23 22:25:57.000000000 +0100 -@@ -1290,6 +1290,7 @@ - int use_server = -1; - int same_url = FALSE; - char *conf_file; -+ char *opt_file = NULL; - char global_conf_file[] = GLOBAL_CONF_FILE; - /* - * set the default runtime configuration -@@ -1303,7 +1304,7 @@ - debug_init(); +--- 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, "?hrfk:1Lt:vgsP:", long_opts, -+ getopt_long(argc, argv, "?hrfk:1Lt:vgsP:O:", long_opts, - NULL)) != EOF) - { - switch (c) -@@ -1361,7 +1362,9 @@ - */ - rt.use_netrc = FALSE; - break; + 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': -+ opt_file = kstrdup(optarg); -+ break; - case 'P': - /* - * Save the downloaded file to DIR -@@ -1753,6 +1756,9 @@ - } - } ++ 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; -+ - if ((url_data.proto != URLHTTP) && (url_data.proto != URLFTP)) - { - die("Error: Unsupported Protocol was specified\n"); ++ if (opt_file) ++ url_data->file=opt_file; ++ + PrintMessage("Starting....."); + //In to %s\n",url_data->host); + // start the download ================================================================ Index: SOURCES/prozilla-ac_fixes.patch diff -u SOURCES/prozilla-ac_fixes.patch:1.1 SOURCES/prozilla-ac_fixes.patch:1.2 --- SOURCES/prozilla-ac_fixes.patch:1.1 Sun Aug 19 17:22:25 2001 +++ SOURCES/prozilla-ac_fixes.patch Mon Jan 23 00:16:51 2006 @@ -1,368 +1,5 @@ --- 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 -@@ -1,362 +1,3 @@ --dnl This code originates from Ulrich Drepper's am_with_nls. -- --AC_DEFUN(AM_GNU_GETTEXT,) -- --AC_DEFUN(AUMIX_WITH_NLS, -- [AC_MSG_CHECKING([whether NLS is requested]) -- dnl Default is enabled NLS -- AC_ARG_ENABLE(nls, -- [ --disable-nls do not use Native Language Support], -- HAVE_NLS=$enableval, HAVE_NLS=yes) -- AC_MSG_RESULT($HAVE_NLS) -- -- dnl If something goes wrong, we may still decide not to use NLS. -- dnl For this reason, defer AC_SUBST'ing HAVE_NLS until the very -- dnl last moment. -- -- if test x"$HAVE_NLS" = xyes; then -- AC_MSG_RESULT("language catalogs: $ALL_LINGUAS") -- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, -- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) -- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, -- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) -- AC_SUBST(MSGFMT) -- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -- CATOBJEXT=.gmo -- INSTOBJEXT=.mo -- DATADIRNAME=share -- -- dnl Test whether we really found GNU xgettext. -- if test "$XGETTEXT" != ":"; then -- dnl If it is not GNU xgettext we define it as : so that the -- dnl Makefiles still can work. -- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -- : ; -- else -- AC_MSG_RESULT( -- [found xgettext programs is not GNU xgettext; ignore it]) -- XGETTEXT=":" -- fi -- fi -- -- AC_CHECK_HEADERS(locale.h libintl.h) -- -- AC_CHECK_FUNCS(gettext, [], [ -- AC_CHECK_LIB(intl, gettext, [ -- dnl gettext is in libintl; announce the fact manually. -- LIBS="-lintl $LIBS" -- AC_DEFINE(HAVE_GETTEXT) -- ], [ -- AC_MSG_RESULT( -- [gettext not found; disabling NLS]) -- HAVE_NLS=no -- ]) -- ]) -- -- dnl These rules are solely for the distribution goal. While doing this -- dnl we only have to keep exactly one list of the available catalogs -- dnl in configure.in. -- for lang in $ALL_LINGUAS; do -- GMOFILES="$GMOFILES $lang.gmo" -- POFILES="$POFILES $lang.po" -- done -- dnl Construct list of names of catalog files to be constructed. -- for lang in $ALL_LINGUAS; do -- CATALOGS="$CATALOGS ${lang}${CATOBJEXT}" -- done -- -- dnl Make all variables we use known to autoconf. -- AC_SUBST(CATALOGS) -- AC_SUBST(CATOBJEXT) -- AC_SUBST(DATADIRNAME) -- AC_SUBST(GMOFILES) -- AC_SUBST(INSTOBJEXT) -- AC_SUBST(INTLLIBS) -- AC_SUBST(POFILES) -- fi -- AC_SUBST(HAVE_NLS) -- dnl Some independently maintained files, such as po/Makefile.in, -- dnl use `USE_NLS', so support it. -- USE_NLS=$HAVE_NLS -- AC_SUBST(USE_NLS) -- if test "x$HAVE_NLS" = xyes; then -- AC_DEFINE(HAVE_NLS) -- fi -- ]) -- --dnl Generate list of files to be processed by xgettext which will --dnl be included in po/Makefile. --dnl --dnl This is not strictly an Autoconf macro, because it is run from --dnl within `config.status' rather than from within configure. This --dnl is why special rules must be applied for it. --AC_DEFUN(AUMIX_PROCESS_PO, -- [srcdir=$ac_given_srcdir # Advanced autoconf hackery -- dnl I wonder what the following several lines do... -- if test "x$srcdir" != "x."; then -- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -- posrcprefix="$srcdir/" -- else -- posrcprefix="../$srcdir/" -- fi -- else --dnl posrcprefix="../" -- posrcprefix="../src/" -- fi -- rm -f po/POTFILES -- dnl Use `echo' rather than AC_MSG_RESULT, because this is run from -- dnl `config.status'. -- echo "generating po/POTFILES from $srcdir/po/POTFILES.in" -- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," \ -- -e "\$s/\(.*\) \\\\/\1/" \ -- < $srcdir/po/POTFILES.in > po/POTFILES -- echo "creating po/Makefile" -- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile -- ]) -- --# Search path for a program which passes the given test. --# Ulrich Drepper <[EMAIL PROTECTED]>, 1996. --# --# This file may be copied and used freely without restrictions. It --# can be used in projects which are not available under the GNU Public --# License but which still want to provide support for the GNU gettext --# functionality. Please note that the actual code is *not* freely --# available. -- --# serial 1 -- --dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, --dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --AC_DEFUN(AM_PATH_PROG_WITH_TEST, --[# Extract the first word of "$2", so it can be a program name with args. --set dummy $2; ac_word=[$]2 --AC_MSG_CHECKING([for $ac_word]) --AC_CACHE_VAL(ac_cv_path_$1, --[case "[$]$1" in -- /*) -- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -- for ac_dir in ifelse([$5], , $PATH, [$5]); do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- if [$3]; then -- ac_cv_path_$1="$ac_dir/$ac_word" -- break -- fi -- fi -- done -- IFS="$ac_save_ifs" --dnl If no 4th arg is given, leave the cache variable unset, --dnl so AC_PATH_PROGS will keep looking. --ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" --])dnl -- ;; --esac])dnl --$1="$ac_cv_path_$1" --if test -n "[$]$1"; then -- AC_MSG_RESULT([$]$1) --else -- AC_MSG_RESULT(no) --fi --AC_SUBST($1)dnl --]) -- --# Configure paths for GTK+ --# Owen Taylor 97-11-3 -- --dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) --dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS --dnl --AC_DEFUN(AM_PATH_GTK, --[dnl --dnl Get the cflags and libraries from the gtk-config script --dnl --AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], -- gtk_config_prefix="$withval", gtk_config_prefix="") --AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], -- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") --AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], -- , enable_gtktest=yes) -- -- for module in . $4 -- do -- case "$module" in -- gthread) -- gtk_config_args="$gtk_config_args gthread" -- ;; -- esac -- done -- -- if test x$gtk_config_exec_prefix != x ; then -- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -- if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -- fi -- fi -- if test x$gtk_config_prefix != x ; then -- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -- if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -- fi -- fi -- -- AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -- min_gtk_version=ifelse([$1], ,0.99.7,$1) -- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -- no_gtk="" -- if test "$GTK_CONFIG" = "no" ; then -- no_gtk=yes -- else -- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x$enable_gtktest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $GTK_CFLAGS" -- LIBS="$GTK_LIBS $LIBS" --dnl --dnl Now check if the installed GTK is sufficiently new. (Also sanity --dnl checks the results of gtk-config to some extent --dnl -- rm -f conf.gtktest -- AC_TRY_RUN([ --#include <gtk/gtk.h> --#include <stdio.h> --#include <stdlib.h> -- --int --main () --{ -- int major, minor, micro; -- char *tmp_version; -- -- system ("touch conf.gtktest"); -- -- /* HP/UX 9 ([EMAIL PROTECTED]) writes to sscanf strings */ -- tmp_version = g_strdup("$min_gtk_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_gtk_version"); -- exit(1); -- } -- -- if ((gtk_major_version != $gtk_config_major_version) || -- (gtk_minor_version != $gtk_config_minor_version) || -- (gtk_micro_version != $gtk_config_micro_version)) -- { -- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -- gtk_major_version, gtk_minor_version, gtk_micro_version); -- printf ("*** was found! If gtk-config was correct, then it is best\n"); -- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -- printf("*** required on your system.\n"); -- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -- printf("*** before re-running configure\n"); -- } --#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -- else if ((gtk_major_version != GTK_MAJOR_VERSION) || -- (gtk_minor_version != GTK_MINOR_VERSION) || -- (gtk_micro_version != GTK_MICRO_VERSION)) -- { -- printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -- printf("*** library (version %d.%d.%d)\n", -- gtk_major_version, gtk_minor_version, gtk_micro_version); -- } --#endif /* defined (GTK_MAJOR_VERSION) ... */ -- else -- { -- if ((gtk_major_version > major) || -- ((gtk_major_version == major) && (gtk_minor_version > minor)) || -- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -- gtk_major_version, gtk_minor_version, gtk_micro_version); -- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -- major, minor, micro); -- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -- printf("***\n"); -- printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -- printf("*** being found. The easiest way to fix this is to remove the old version\n"); -- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -- printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -- printf("*** so that the correct libraries are found at run-time))\n"); -- } -- } -- return 1; --} --],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- if test "x$no_gtk" = x ; then -- AC_MSG_RESULT(yes) -- ifelse([$2], , :, [$2]) -- else -- AC_MSG_RESULT(no) -- if test "$GTK_CONFIG" = "no" ; then -- echo "*** The gtk-config script installed by GTK could not be found" -- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the GTK_CONFIG environment variable to the" -- echo "*** full path to gtk-config." -- else -- if test -f conf.gtktest ; then -- : -- else -- echo "*** Could not run GTK test program, checking why..." -- CFLAGS="$CFLAGS $GTK_CFLAGS" -- LIBS="$LIBS $GTK_LIBS" -- AC_TRY_LINK([ --#include <gtk/gtk.h> --#include <stdio.h> --], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -- [ echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding GTK or finding the wrong" -- echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -- echo "***" -- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -- echo "*** came with the system with the command" -- echo "***" -- echo "*** rpm --erase --nodeps gtk gtk-devel" ], -- [ echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means GTK was incorrectly installed" -- echo "*** or that you have moved GTK since it was installed. In the latter case, you" -- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- GTK_CFLAGS="" -- GTK_LIBS="" -- ifelse([$3], , :, [$3]) -- fi -- AC_SUBST(GTK_CFLAGS) -- AC_SUBST(GTK_LIBS) -- rm -f conf.gtktest --]) - dnl @synopsis AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R - dnl - dnl Provides a test to determine the correct @@ -376,7 +17,7 @@ dnl @version $Id$ dnl @author Caolan McNamara <[EMAIL PROTECTED]> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/prozilla-Oopt.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/SOURCES/prozilla-ac_fixes.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit