1.13.4.
This commit is contained in:
Jon Ciesla
parent
1dfbea88c0
commit
62d384e32e
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
wget-1.12.tar.bz2
|
||||
/wget-1.13.4.tar.bz2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
308a5476fc096a8a525d07279a6f6aa3 wget-1.12.tar.bz2
|
||||
12115c3750a4d92f9c6ac62bac372e85 wget-1.13.4.tar.bz2
|
||||
|
||||
@ -43,15 +43,6 @@ diff -urN wget-1.12/doc/sample.wgetrc.munged_for_texi_inclusion wget-1.12.patche
|
||||
diff -urN wget-1.12/doc/wget.info wget-1.12.patched/doc/wget.info
|
||||
--- wget-1.12/doc/wget.info 2009-09-22 18:30:20.000000000 +0200
|
||||
+++ wget-1.12.patched/doc/wget.info 2009-11-17 12:28:40.000000000 +0100
|
||||
@@ -113,7 +113,7 @@
|
||||
* 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
|
||||
+ startup files (`/etc/wgetrc' by default) for site
|
||||
settings.
|
||||
|
||||
* Finally, GNU Wget is free software. This means that everyone may
|
||||
@@ -2351,8 +2351,8 @@
|
||||
===================
|
||||
|
||||
@ -93,21 +84,6 @@ diff -urN wget-1.12/doc/wget.info wget-1.12.patched/doc/wget.info
|
||||
diff -urN wget-1.12/doc/wget.texi wget-1.12.patched/doc/wget.texi
|
||||
--- wget-1.12/doc/wget.texi 2009-09-04 23:22:04.000000000 +0200
|
||||
+++ wget-1.12.patched/doc/wget.texi 2009-11-17 12:29:03.000000000 +0100
|
||||
@@ -190,12 +190,12 @@
|
||||
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.
|
||||
+(@file{/etc/wgetrc} by default) for site settings.
|
||||
|
||||
@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
|
||||
@@ -2670,8 +2670,8 @@
|
||||
@cindex location of wgetrc
|
||||
|
||||
@ -161,3 +137,33 @@ diff -urN wget-1.12/README wget-1.12.patched/README
|
||||
site settings.
|
||||
|
||||
Wget works under almost all Unix variants in use today and, unlike
|
||||
--- wget-1.12/doc/wget.info.start 2011-12-19 10:34:29.409272713 -0600
|
||||
+++ wget-1.12/doc/wget.info 2011-12-19 10:34:51.760129197 -0600
|
||||
@@ -113,7 +113,7 @@
|
||||
* 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
|
||||
+ startup files (`/etc/wgetrc' by default) for site
|
||||
settings. You can also specify the location of a startup file with
|
||||
the -config option.
|
||||
|
||||
--- wget-1.12/doc/wget.texi.start 2011-12-19 10:38:18.305730849 -0600
|
||||
+++ wget-1.12/doc/wget.texi 2011-12-19 10:38:49.272615753 -0600
|
||||
@@ -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
|
||||
|
||||
18
wget.spec
18
wget.spec
@ -1,7 +1,7 @@
|
||||
Summary: A utility for retrieving files using the HTTP or FTP protocols
|
||||
Name: wget
|
||||
Version: 1.12
|
||||
Release: 4%{?dist}
|
||||
Version: 1.13.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Internet
|
||||
Url: http://www.gnu.org/software/wget/
|
||||
@ -10,7 +10,7 @@ Patch1: wget-rh-modified.patch
|
||||
Patch2: wget-1.12-path.patch
|
||||
|
||||
# http://bzr.savannah.gnu.org/lh/wget/trunk/revision/2317
|
||||
Patch3: wget-1.12-certificate-subjectAltName.patch
|
||||
#Patch3: wget-1.12-certificate-subjectAltName.patch
|
||||
Provides: webclient
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
@ -28,16 +28,16 @@ support for Proxy servers, and configurability.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
%patch1 -p0
|
||||
%patch2 -p1
|
||||
%patch3 -p0
|
||||
#%patch3 -p0
|
||||
|
||||
%build
|
||||
if pkg-config openssl ; then
|
||||
CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
|
||||
LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
|
||||
fi
|
||||
%configure --with-ssl --enable-largefile --enable-opie --enable-digest --enable-ntlm --enable-nls --enable-ipv6 --disable-rpath
|
||||
%configure --with-ssl=openssl --enable-largefile --enable-opie --enable-digest --enable-ntlm --enable-nls --enable-ipv6 --disable-rpath
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -67,6 +67,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_infodir}/*
|
||||
|
||||
%changelog
|
||||
* Fri Dec 16 2011 Jon Ciesla <limburgher@gmail.com> - 1.13.4-1
|
||||
- New upstream, BZ 730286.
|
||||
- Modified path patch.
|
||||
- subjectAltNames patch upstreamed.
|
||||
- Specified openssl at config time.
|
||||
|
||||
* Thu Jun 23 2011 Volker Fröhlich <volker27@gmx.at> - 1.12-4
|
||||
- Applied patch to accept subjectAltNames in X509 certificates (#674186)
|
||||
- New URL (#658969)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user