rpms/elinks
7
0
Fork 0
Code Issues Pull Requests Releases Activity

new upstream bugfix prerelease, defuzz patches

Browse Source
This commit is contained in:
Ondrej Vasik 2009-03-30 13:45:18 +00:00
parent 372ac0151a
commit c24c8e2637
5 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
elinks-0.12pre2.tar.bz2 elinks-0.12pre3.tar.bz2

14
elinks-0.10.1-utf_8_io-default.patch
View File

@ -1,12 +1,12 @@
diff -urNp elinks-0.12pre1-orig/src/config/options.inc elinks-0.12pre1/src/config/options.inc diff -urNp elinks-0.12pre3-orig/src/config/options.inc elinks-0.12pre3/src/config/options.inc
--- elinks-0.12pre1-orig/src/config/options.inc 2008-07-01 02:11:44.000000000 +0200 --- elinks-0.12pre3-orig/src/config/options.inc
+++ elinks-0.12pre1/src/config/options.inc 2008-07-01 16:00:34.000000000 +0200 +++ elinks-0.12pre3/src/config/options.inc
@@ -859,7 +859,7 @@ static struct option_info config_options @@ -920,7 +920,7 @@ static struct option_info config_options
* not defined, it should not be possible to set UTF-8 as "codepage"; * not defined, it should not be possible to set UTF-8 as "codepage";
* please report any such possibilities as bugs.) */ * please report any such possibilities as bugs.) */
INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"), INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
- "utf_8_io", 0, 0, - "utf_8_io", 0, 0,
+ "utf_8_io", 0, 1, + "utf_8_io", 0, 1,
N_("Enable I/O in UTF-8 for Unicode terminals. Note that currently,\n" N_("Enable I/O in UTF-8 for Unicode terminals. "
"only the subset of UTF-8 according to terminal codepage is used.\n" "Note that currently, only the subset of UTF-8 according to "
"ELinks ignores this option if the terminal codepage is UTF-8.")), "terminal codepage is used. ELinks ignores this option "

45
elinks-nss.patch
View File

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

10
elinks.spec
View File

@ -1,11 +1,11 @@
Name: elinks Name: elinks
Summary: A text-mode Web browser Summary: A text-mode Web browser
Version: 0.12 Version: 0.12
Release: 0.10.pre2%{?dist} Release: 0.11.pre3%{?dist}
License: GPLv2 License: GPLv2
URL: http://elinks.or.cz URL: http://elinks.or.cz
Group: Applications/Internet 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) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automake BuildRequires: automake
@ -41,7 +41,7 @@ advantage over graphical browsers is its speed--Links starts and exits
quickly and swiftly displays Web pages. quickly and swiftly displays Web pages.
%prep %prep
%setup -q -n %{name}-%{version}pre2 %setup -q -n %{name}-%{version}pre3
# Prevent crash when HOME is unset (bug #90663). # Prevent crash when HOME is unset (bug #90663).
%patch0 -p1 %patch0 -p1
@ -117,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/* %{_mandir}/man5/*
%changelog %changelog
* Mon Mar 30 2009 Ondrej Vasik <ovasik@redhat.com> 0.12-0.11.pre3
- new upstream bugfix prerelease
- defuzz patches
* Wed Mar 25 2009 Ondrej Vasik <ovasik@redhat.com> 0.12-0.10.pre2 * Wed Mar 25 2009 Ondrej Vasik <ovasik@redhat.com> 0.12-0.10.pre2
- use better obsoletes/provides for links, use alternatives for - use better obsoletes/provides for links, use alternatives for
links manpage and binary(#470703) links manpage and binary(#470703)

2
sources
View File

@ -1 +1 @@
bfc2a531f633c9e25e108e5ce2d864ea elinks-0.12pre2.tar.bz2 1ea76f04fb5d2e7d6d6a2c82ca310088 elinks-0.12pre3.tar.bz2