I have made the following changes intended for : CE:Utils / wget Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/5315 Thank You, Denis Mingulov [This message was auto-generated] --- Request # 5315: Messages from BOSS: State: review at 2012-07-27T16:42:02 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:mdn:branches:CE:Utils / wget -> CE:Utils / wget changes files: -------------- --- wget.changes +++ wget.changes @@ -0,0 +1,4 @@ +* Fri Jul 27 2012 Denis Mingulov <[email protected]> - 1.13.4 +- Fixes NEMO#205: wget spec file has invalid URL +- Update to version 1.13.4 + old: ---- wget-1.12-CVE-2010-2252.patch wget-1.12-path.patch wget-1.12.tar.bz2 new: ---- wget-1.13.4-path.patch wget-1.13.4.tar.bz2 spec files: ----------- --- wget.spec +++ wget.spec @@ -1,22 +1,23 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.23 +# Generated by: spectacle version 0.24 # + +Name: wget + # >> macros # << macros -Name: wget Summary: A utility for retrieving files using the HTTP or FTP protocols -Version: 1.12 +Version: 1.13.4 Release: 1 Group: Applications/Internet License: GPLv3+ -URL: http://wget.sunsite.dk/ +URL: http://www.gnu.org/software/wget/ Source0: ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.bz2 Source100: wget.yaml -Patch0: wget-1.12-path.patch +Patch0: wget-1.13.4-path.patch Patch1: wget-1.10.1-helpfix.patch -Patch2: wget-1.12-CVE-2010-2252.patch BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig BuildRequires: texinfo @@ -24,7 +25,6 @@ BuildRequires: autoconf Provides: webclient - %description GNU Wget is a file retrieval utility which can use either the HTTP or FTP protocols. Wget features include the ability to work in the @@ -35,7 +35,6 @@ support for Proxy servers, and configurability. - %package docs Summary: Documentation files for %{name} Group: Applications/Internet @@ -51,12 +50,10 @@ %prep %setup -q -n %{name}-%{version} -# wget-1.12-path.patch +# wget-1.13.4-path.patch %patch0 -p1 # wget-1.10.1-helpfix.patch %patch1 -p1 -# wget-1.12-CVE-2010-2252.patch -%patch2 -p1 # >> setup # << setup @@ -69,7 +66,7 @@ # << build pre %configure --disable-static \ - --with-ssl \ + --with-ssl=openssl \ --enable-largefile \ --enable-opie \ --enable-digest \ @@ -82,6 +79,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -91,13 +89,8 @@ # >> install post rm -f %{buildroot}/%{_infodir}/dir # << install post -%find_lang wget - - - - - +%find_lang wget %post docs %install_info --info-dir=%_infodir %{_infodir}/wget.info.gz @@ -116,7 +109,6 @@ %{_bindir}/wget # << files - %files docs %defattr(-,root,root,-) # >> files docs @@ -125,4 +117,3 @@ %doc %{_mandir}/man1/wget.* %doc %{_infodir}/wget.info.gz # << files docs - other changes: -------------- ++++++ wget-1.13.4-path.patch (new) --- wget-1.13.4-path.patch +++ wget-1.13.4-path.patch @@ -0,0 +1,184 @@ +diff -uNr wget-1.13.4/doc/sample.wgetrc wget-1.13.4-fixed/doc/sample.wgetrc +--- wget-1.13.4/doc/sample.wgetrc 2011-01-01 14:12:33.000000000 +0200 ++++ wget-1.13.4-fixed/doc/sample.wgetrc 2012-07-27 17:34:08.634214410 +0300 +@@ -7,7 +7,7 @@ + ## not contain a comprehensive list of commands -- look at the manual + ## to find out what you can put into this file. + ## +-## Wget initialization file can reside in /usr/local/etc/wgetrc ++## Wget initialization file can reside in /etc/wgetrc + ## (global, for all users) or $HOME/.wgetrc (for a single user). + ## + ## To use the settings in this file, you will have to uncomment them, +@@ -16,7 +16,7 @@ + + + ## +-## Global settings (useful for setting up in /usr/local/etc/wgetrc). ++## Global settings (useful for setting up in /etc/wgetrc). + ## Think well before you change them, since they may reduce wget's + ## functionality, and make it behave contrary to the documentation: + ## +diff -uNr wget-1.13.4/doc/wget.info wget-1.13.4-fixed/doc/wget.info +--- wget-1.13.4/doc/wget.info 2011-09-13 11:17:45.000000000 +0300 ++++ wget-1.13.4-fixed/doc/wget.info 2012-07-27 17:58:23.849430432 +0300 +@@ -113,8 +113,8 @@ + * Most of the features are fully configurable, either through + command line options, or via the initialization file `.wgetrc' + (*note Startup File::). Wget allows you to define "global" +- startup files (`/usr/local/etc/wgetrc' by default) for site +- settings. You can also specify the location of a startup file with ++ startup files (`/etc/wgetrc' by default) for site settings. ++ You can also specify the location of a startup file with + the -config option. + + * Finally, GNU Wget is free software. This means that everyone may +@@ -2373,9 +2373,7 @@ + =================== + + When initializing, Wget will look for a "global" startup file, +-`/usr/local/etc/wgetrc' by default (or some prefix other than +-`/usr/local', if Wget was not installed there) and read commands from +-there, if it exists. ++/etc/wgetrc' by default and read commands from there, if it exists. + + Then it will look for the user's file. If the environmental variable + `WGETRC' is set, Wget will try to load that file. Failing that, no +@@ -2385,8 +2383,7 @@ + + The fact that user's settings are loaded after the system-wide ones + means that in case of collision user's wgetrc _overrides_ the +-system-wide wgetrc (in `/usr/local/etc/wgetrc' by default). Fascist +-admins, away! ++system-wide wgetrc (in `/etc/wgetrc' by default). + + + File: wget.info, Node: Wgetrc Syntax, Next: Wgetrc Commands, Prev: Wgetrc Location, Up: Startup File +@@ -2910,7 +2907,7 @@ + ## not contain a comprehensive list of commands -- look at the manual + ## to find out what you can put into this file. + ## +- ## Wget initialization file can reside in /usr/local/etc/wgetrc ++ ## Wget initialization file can reside in /etc/wgetrc + ## (global, for all users) or $HOME/.wgetrc (for a single user). + ## + ## To use the settings in this file, you will have to uncomment them, +@@ -2919,7 +2916,7 @@ + + + ## +- ## Global settings (useful for setting up in /usr/local/etc/wgetrc). ++ ## Global settings (useful for setting up in /etc/wgetrc). + ## Think well before you change them, since they may reduce wget's + ## functionality, and make it behave contrary to the documentation: + ## +diff -uNr wget-1.13.4/doc/wget.texi wget-1.13.4-fixed/doc/wget.texi +--- wget-1.13.4/doc/wget.texi 2011-08-06 13:22:58.000000000 +0300 ++++ wget-1.13.4-fixed/doc/wget.texi 2012-07-27 18:04:27.911235724 +0300 +@@ -190,14 +190,14 @@ + Most of the features are fully configurable, either through command line + options, or via the initialization file @file{.wgetrc} (@pxref{Startup + File}). Wget allows you to define @dfn{global} startup files +-(@file{/usr/local/etc/wgetrc} by default) for site settings. You can also ++(@file{/etc/wgetrc} by default) for site settings. You can also + specify the location of a startup file with the --config option. + + + @ignore + @c man begin FILES + @table @samp +-@item /usr/local/etc/wgetrc ++@item /etc/wgetrc + Default location of the @dfn{global} startup file. + + @item .wgetrc +@@ -459,8 +459,6 @@ + which case @samp{-d} will not work. Please note that compiling with + debug support is always safe---Wget compiled with the debug support will + @emph{not} print any debug info unless requested with @samp{-d}. +-@xref{Reporting Bugs}, for more information on how to use @samp{-d} for +-sending bug reports. + + @cindex quiet + @item -q +@@ -954,7 +952,7 @@ + @samp{>}, and the control characters in the ranges 0--31 and 128--159. + In addition to this, Wget in Windows mode uses @samp{+} instead of + @samp{:} to separate host and port in local file names, and uses +-@samp{@@} instead of @samp{?} to separate the query portion of the file ++@samp{ @@ } instead of @samp{ ? } to separate the query portion of the file + name from the rest. Therefore, a URL that would be saved as + @samp{www.xemacs.org:4300/search.pl?input=blah} in Unix mode would be + saved as @samp{www.xemacs.org+4300/search.pl@@input=blah} in Windows +@@ -1278,7 +1276,7 @@ + would send in the same situation. Different browsers keep textual + cookie files in different locations: + +-@table @asis ++@table @samp + @item Netscape 4.x. + The cookies are in @file{~/.netscape/cookies.txt}. + +@@ -2696,9 +2694,7 @@ + @cindex location of wgetrc + + When initializing, Wget will look for a @dfn{global} startup file, +-@file{/usr/local/etc/wgetrc} by default (or some prefix other than +-@file{/usr/local}, if Wget was not installed there) and read commands +-from there, if it exists. ++@file{/etc/wgetrc} by default and read commands from there, if it exists. + + Then it will look for the user's file. If the environmental variable + @code{WGETRC} is set, Wget will try to load that file. Failing that, no +@@ -2708,8 +2704,7 @@ + + The fact that user's settings are loaded after the system-wide ones + means that in case of collision user's wgetrc @emph{overrides} the +-system-wide wgetrc (in @file{/usr/local/etc/wgetrc} by default). +-Fascist admins, away! ++system-wide wgetrc (in @file{/etc/wgetrc} by default). + + @node Wgetrc Syntax, Wgetrc Commands, Wgetrc Location, Startup File + @section Wgetrc Syntax +@@ -2755,7 +2750,7 @@ + wgetrc command can be specified on the command line using the + @samp{--execute} switch (@pxref{Basic Startup Options}.) + +-@table @asis ++@table @samp + @item accept/reject = @var{string} + Same as @samp{-A}/@samp{-R} (@pxref{Types of Files}). + +diff -uNr wget-1.13.4/NEWS wget-1.13.4-fixed/NEWS +--- wget-1.13.4/NEWS 2011-09-13 11:11:53.000000000 +0300 ++++ wget-1.13.4-fixed/NEWS 2012-07-27 18:05:40.723596773 +0300 +@@ -640,7 +640,7 @@ + + ** Compiles on pre-ANSI compilers. + +-** Global wgetrc now goes to /usr/local/etc (i.e. $sysconfdir). ++** Global wgetrc now goes to /etc (i.e. $sysconfdir). + + ** Lots of bugfixes. + +@@ -703,7 +703,7 @@ + ** Fixed a long-standing bug, so that Wget now works over SLIP + connections. + +-** You can have a system-wide wgetrc (/usr/local/lib/wgetrc by ++** You can have a system-wide wgetrc (/etc/wgetrc by + default). Settings in $HOME/.wgetrc override the global ones, of + course :-) + +diff -uNr wget-1.13.4/README wget-1.13.4-fixed/README +--- wget-1.13.4/README 2011-01-01 14:12:33.000000000 +0200 ++++ wget-1.13.4-fixed/README 2012-07-27 18:06:33.123856613 +0300 +@@ -33,7 +33,7 @@ + + Most of the features are configurable, either through command-line + options, or via initialization file .wgetrc. Wget allows you to +-install a global startup file (/usr/local/etc/wgetrc by default) for ++install a global startup file (/etc/wgetrc by default) for + site settings. + + Wget works under almost all Unix variants in use today and, unlike ++++++ wget-1.12.tar.bz2 -> wget-1.13.4.tar.bz2 (279933 lines skipped) ++++++ wget.yaml --- wget.yaml +++ wget.yaml @@ -1,16 +1,15 @@ Name: wget Summary: A utility for retrieving files using the HTTP or FTP protocols -Version: 1.12 +Version: 1.13.4 Release: 1 Group: Applications/Internet License: GPLv3+ -URL: http://wget.sunsite.dk/ +URL: http://www.gnu.org/software/wget/ Sources: - ftp://ftp.gnu.org/gnu/wget/wget-%{version}.tar.bz2 Patches: - - wget-1.12-path.patch + - wget-1.13.4-path.patch - wget-1.10.1-helpfix.patch - - wget-1.12-CVE-2010-2252.patch Description: | GNU Wget is a file retrieval utility which can use either the HTTP or FTP protocols. Wget features include the ability to work in the @@ -30,7 +29,7 @@ Provides: - webclient ConfigOptions: - - --with-ssl + - --with-ssl=openssl - --enable-largefile - --enable-opie - --enable-digest ++++++ deleted files: --- wget-1.12-CVE-2010-2252.patch --- wget-1.12-path.patch
