rpms/elinks/devel .cvsignore, 1.25, 1.26 elinks-0.10.1-utf_8_io-default.patch, 1.2, 1.3 elinks-nss.patch, 1.1, 1.2 elinks.spec, 1.65, 1.66 sources, 1.25, 1.26

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/elinks/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30596

Modified Files:
	.cvsignore elinks-0.10.1-utf_8_io-default.patch 
	elinks-nss.patch elinks.spec sources 
Log Message:
new upstream bugfix prerelease, defuzz patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Sep 2008 20:43:28 -0000	1.25
+++ .cvsignore	30 Mar 2009 13:45:18 -0000	1.26
@@ -1 +1 @@
-elinks-0.12pre2.tar.bz2
+elinks-0.12pre3.tar.bz2

elinks-0.10.1-utf_8_io-default.patch:

Index: elinks-0.10.1-utf_8_io-default.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-0.10.1-utf_8_io-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- elinks-0.10.1-utf_8_io-default.patch	2 Jul 2008 08:48:38 -0000	1.2
+++ elinks-0.10.1-utf_8_io-default.patch	30 Mar 2009 13:45:18 -0000	1.3
@@ -1,12 +1,12 @@
-diff -urNp elinks-0.12pre1-orig/src/config/options.inc elinks-0.12pre1/src/config/options.inc
---- elinks-0.12pre1-orig/src/config/options.inc	2008-07-01 02:11:44.000000000 +0200
-+++ elinks-0.12pre1/src/config/options.inc	2008-07-01 16:00:34.000000000 +0200
-@@ -859,7 +859,7 @@ static struct option_info config_options
+diff -urNp elinks-0.12pre3-orig/src/config/options.inc elinks-0.12pre3/src/config/options.inc
+--- elinks-0.12pre3-orig/src/config/options.inc
++++ elinks-0.12pre3/src/config/options.inc
+@@ -920,7 +920,7 @@ static struct option_info config_options
  	 * not defined, it should not be possible to set UTF-8 as "codepage";
  	 * please report any such possibilities as bugs.)  */
  	INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
 -		"utf_8_io", 0, 0,
 +		"utf_8_io", 0, 1,
- 		N_("Enable I/O in UTF-8 for Unicode terminals. Note that currently,\n"
- 		"only the subset of UTF-8 according to terminal codepage is used.\n"
- 		"ELinks ignores this option if the terminal codepage is UTF-8.")),
+ 		N_("Enable I/O in UTF-8 for Unicode terminals. "
+ 		"Note that currently, only the subset of UTF-8 according to "
+ 		"terminal codepage is used. ELinks ignores this option "

elinks-nss.patch:

Index: elinks-nss.patch
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks-nss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elinks-nss.patch	1 Oct 2008 09:46:03 -0000	1.1
+++ elinks-nss.patch	30 Mar 2009 13:45:18 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ruNp elinks-0.12pre2.orig/configure.in elinks-0.12pre2/configure.in
---- elinks-0.12pre2.orig/configure.in	2008-10-01 10:38:34.000000000 +0200
-+++ elinks-0.12pre2/configure.in	2008-10-01 10:39:43.000000000 +0200
-@@ -949,6 +949,7 @@ gnutls_withval="$withval"
+diff -ruNp elinks-0.12pre3.orig/configure.in elinks-0.12pre3/configure.in
+--- elinks-0.12pre3.orig/configure.in	2009-03-30 15:31:31.000000000 +0200
++++ elinks-0.12pre3/configure.in	2009-03-30 15:31:31.000000000 +0200
+@@ -1014,6 +1014,7 @@ gnutls_withval="$withval"
  
  if test "$enable_gnutls" = yes; then
  	disable_openssl=yes;
@@ -9,8 +9,8 @@
  fi
  
  AC_ARG_WITH(openssl, [  --without-openssl       disable OpenSSL support],
-@@ -956,6 +957,37 @@ AC_ARG_WITH(openssl, [  --without-openss
- AC_ARG_WITH(openssl, [  --with-openssl[=DIR]    enable OpenSSL support (default)])
+@@ -1021,6 +1022,37 @@ AC_ARG_WITH(openssl, [  --without-openss
+ AC_ARG_WITH(openssl, [[  --with-openssl[=DIR]    enable OpenSSL support (default)]])
  openssl_withval="$withval"
  
 +AC_ARG_WITH(nss_compat_ossl, [[  --with-nss_compat_ossl[=DIR]
@@ -47,7 +47,7 @@
  # ---- OpenSSL
  
  AC_MSG_CHECKING([for OpenSSL])
-@@ -1078,10 +1110,11 @@ AC_MSG_RESULT($cf_result)
+@@ -1143,10 +1175,11 @@ AC_MSG_RESULT($cf_result)
  
  # Final SSL setup
  
@@ -175,29 +175,30 @@
  
  #ifndef PATH_MAX
  #define	PATH_MAX	256 /* according to my /usr/include/bits/posix1_lim.h */
-@@ -71,12 +75,26 @@ static struct option_info openssl_option
- 		 N_("Enable or not the sending of X509 client certificates\n"
- 		    "to servers which request them.")),
+@@ -71,12 +75,27 @@ static struct option_info openssl_option
+ 		N_("Enable or not the sending of X509 client certificates "
+ 		"to servers which request them.")),
  
 +#ifdef CONFIG_NSS_COMPAT_OSSL
 +	INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate nickname"),
 +		"nickname", 0, "",
-+		 N_("The nickname of the client certificate stored in NSS\n"
-+		    "database. If this value is unset, the nickname from\n"
-+		    "the X509_CLIENT_CERT variable is used instead. If you\n"
-+		    "have a PKCS#12 file containing client certificate, you\n"
-+		    "can import it into your NSS database with:\n"
-+		    "$ pk12util -i mycert.p12 -d /path/to/database\n\n"
-+		    "The NSS database location can be changed by SSL_DIR\n"
-+		    "environment variable. The database can be also shared\n"
++		 N_("The nickname of the client certificate stored in NSS "
++		    "database. If this value is unset, the nickname from "
++		    "the X509_CLIENT_CERT variable is used instead. If you "
++		    "have a PKCS#12 file containing client certificate, you "
++		    "can import it into your NSS database with: "
++		    "$ pk12util -i mycert.p12 -d /path/to/database "
++       " "
++		    "The NSS database location can be changed by SSL_DIR "
++		    "environment variable. The database can be also shared "
 +		    "with Mozilla browsers.")),
 +#else
  	INIT_OPT_STRING("connection.ssl.client_cert", N_("Certificate File"),
  		"file", 0, "",
- 		 N_("The location of a file containing the client certificate\n"
- 		    "and unencrypted private key in PEM format. If unset, the\n"
- 		    "file pointed to by the X509_CLIENT_CERT variable is used\n"
- 		    "instead.")),
+ 		N_("The location of a file containing the client certificate "
+ 		"and unencrypted private key in PEM format. If unset, the "
+ 		"file pointed to by the X509_CLIENT_CERT variable is used "
+ 		"instead.")),
 +#endif
  
  	NULL_OPTION_INFO,


Index: elinks.spec
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/elinks.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- elinks.spec	25 Mar 2009 13:16:16 -0000	1.65
+++ elinks.spec	30 Mar 2009 13:45:18 -0000	1.66
@@ -1,11 +1,11 @@
 Name:      elinks
 Summary:   A text-mode Web browser
 Version:   0.12
-Release:   0.10.pre2%{?dist}
+Release:   0.11.pre3%{?dist}
 License:   GPLv2
 URL:       http://elinks.or.cz
 Group:     Applications/Internet
-Source:    http://elinks.or.cz/download/elinks-%{version}pre2.tar.bz2
+Source:    http://elinks.or.cz/download/elinks-%{version}pre3.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: automake
@@ -41,7 +41,7 @@
 quickly and swiftly displays Web pages.
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 
 # Prevent crash when HOME is unset (bug #90663).
 %patch0 -p1
@@ -117,6 +117,10 @@
 %{_mandir}/man5/*
 
 %changelog
+* Mon Mar 30 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.11.pre3
+- new upstream bugfix prerelease
+- defuzz patches
+
 * Wed Mar 25 2009 Ondrej Vasik <ovasik at redhat.com> 0.12-0.10.pre2
 - use better obsoletes/provides for links, use alternatives for
   links manpage and binary(#470703)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elinks/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	29 Sep 2008 20:43:28 -0000	1.25
+++ sources	30 Mar 2009 13:45:18 -0000	1.26
@@ -1 +1 @@
-bfc2a531f633c9e25e108e5ce2d864ea  elinks-0.12pre2.tar.bz2
+1ea76f04fb5d2e7d6d6a2c82ca310088  elinks-0.12pre3.tar.bz2