packages: wget/wget.spec - patch to check subjectAltNames from certificates...

Wed Jul 21 10:42:16 CEST 2010

Author: glen                         Date: Wed Jul 21 08:42:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch to check subjectAltNames from certificates, patch from savannah; rel 3

---- Files affected:
packages/wget:
   wget.spec (1.148 -> 1.149) 

---- Diffs:

================================================================
Index: packages/wget/wget.spec
diff -u packages/wget/wget.spec:1.148 packages/wget/wget.spec:1.149

--- packages/wget/wget.spec:1.148	Sat Apr 10 18:29:46 2010
+++ packages/wget/wget.spec	Wed Jul 21 10:42:11 2010
@@ -14,7 +14,7 @@
 Summary(zh_CN.UTF-8):	[通讯]功能强大的下载程序,支持断点续传
 Name:		wget
 Version:	1.12
-Release:	2
+Release:	3
 License:	GPL v3+
 Group:		Networking/Utilities
 Source0:	http://ftp.gnu.org/gnu/wget/%{name}-%{version}.tar.bz2
@@ -22,17 +22,19 @@
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	d8b2b56ec7461606c22edbafaf8a418f
 Patch0:		%{name}-info.patch
+# http://savannah.gnu.org/bugs/?23934
+Patch1:		%{name}-subjectAltNames.patch
 Patch2:		%{name}-wgetrc_path.patch
 Patch3:		%{name}-home_etc.patch
-Patch5:		wget-ssl-certs.patch
+Patch5:		%{name}-ssl-certs.patch
 URL:		http://www.gnu.org/software/wget/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel >= 0.9.7m
-BuildRequires:	texinfo
 BuildRequires:	perl-devel
+BuildRequires:	texinfo
 Provides:	webclient
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -111,6 +113,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch5 -p1
@@ -136,11 +139,12 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GETTEXT_PACKAGE=wget
 
-install util/rmold.pl		$RPM_BUILD_ROOT%{_bindir}/rmold
-install doc/sample.wgetrc	$RPM_BUILD_ROOT%{_sysconfdir}/wgetrc
+install -p util/rmold.pl		$RPM_BUILD_ROOT%{_bindir}/rmold
+cp -a doc/sample.wgetrc	$RPM_BUILD_ROOT%{_sysconfdir}/wgetrc
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT%{_mandir}/README*
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
 
@@ -157,10 +161,11 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README MAILING-LIST rmold.README
 %verify(not md5 mtime size) %config(noreplace) %{_sysconfdir}/%{name}rc
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
-%lang(hu) %{_mandir}/hu/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
+%attr(755,root,root) %{_bindir}/rmold
+%attr(755,root,root) %{_bindir}/wget
+%{_mandir}/man1/wget.1*
+%{_mandir}/hu/man1/wget.1*
+%{_mandir}/pl/man1/wget.1*
 %{_infodir}/*.info*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -169,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2010/07/21 08:42:11  glen
+- patch to check subjectAltNames from certificates, patch from savannah; rel 3
+
 Revision 1.148  2010/04/10 16:29:46  arekm
 - release 2
 
@@ -318,10 +326,10 @@
 - new (now builtin) fancy progress bar, try --progress=porn
 
 Revision 1.101  2004/05/13 19:34:51  adasi
- - relup, STBR
+- relup, STBR
 
 Revision 1.100  2004/05/06 23:50:46  adasi
- - wget-nonperm.patch added - save non-permanent cookies
+- wget-nonperm.patch added - save non-permanent cookies
 
 Revision 1.99  2004/03/19 23:46:39  ankry
 - massive change: BR openssl-devel >= 0.9.7d
@@ -431,12 +439,12 @@
 - release 4
 
 Revision 1.69  2002/05/25 21:40:07  qboosh
-- new %%doc, cleanup
+- new %doc, cleanup
 
 Revision 1.68  2002/05/21 23:14:55  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.67  2002/05/17 10:01:28  qboosh
 - fixed typos, fuzzy entries and other bugs in pl.po
@@ -476,7 +484,7 @@
   Group field using gettext).
 
 Revision 1.58  2002/01/18 02:15:20  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.57  2001/11/15 23:29:05  ankry
 - added hu, pl man pages
@@ -492,7 +500,7 @@
 - release 4.
 
 Revision 1.53  2001/09/03 12:48:35  gotar
-- awful %%configure macro expansions removed,
+- awful %configure macro expansions removed,
 - no functional nor release changes.
 
 Revision 1.52  2001/08/30 09:08:27  kloczek
@@ -507,7 +515,7 @@
   (fix incorrect dnl usage in configure.in in ipv6 path).
 
 Revision 1.49  2001/08/21 18:43:35  filon
-- removed autoconf, changed to %%configure2_13 to make it build
+- removed autoconf, changed to %configure2_13 to make it build
 
 Revision 1.48  2001/07/26 05:42:25  saq
 - reverting last change: removing new macros from %p{re,ost}{,un}
@@ -519,10 +527,10 @@
 - NFY since ipv6 patch is not working yet!
 
 Revision 1.45  2001/05/09 12:12:18  wiget
-fix pl.po; release 4
+- fix pl.po; release 4
 
 Revision 1.44  2001/01/02 22:51:24  misiek
-release 3; fixed pl translation
+- release 3; fixed pl translation
 
 Revision 1.43  2001/01/02 18:08:16  kloczek
 - removed hardcoded debug=1.
@@ -531,7 +539,7 @@
 - release 2.
 
 Revision 1.41  2001/01/02 17:33:30  misiek
-ipv6 support readded
+- ipv6 support readded
 
 Revision 1.40  2001/01/02 02:02:33  kloczek
 - updated to 1.6,
@@ -541,10 +549,10 @@
 - release 12: use new rpm automation suit and adapterized.
 
 Revision 1.38  2000/06/09 07:55:13  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.37  2000/06/09 07:24:01  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.36  2000/05/24 16:50:47  zagrodzki
 - changed [ -x ... ] && to [ ! -x ... ] ||
@@ -589,12 +597,3 @@
 
 Revision 1.25  1999/07/12 23:06:17  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Thu May 20 1999 Piotr Czerwiński <pius at pld.org.pl>
-  [1.5.3-8]
-- package is FHS 2.0 compliant,
-- based on spec file written by ??? <root at ricketts.stannes.ox.ac.uk>,
-  rewritten for PLD use by me, Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>,
-  and Michał Kuratczyk <kura at pld.org.pl>,
-- pl translation by Tomasz Kłoczko <kloczek at rudy.mif.pg.gda.pl>
-  and Wojtek Ślusarczyk <wojtek at shadow.eu.org>.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wget/wget.spec?r1=1.148&r2=1.149&f=u

