[links: 1/2] Rebase to latest upstream version
Ondrej Vasik
ovasik at fedoraproject.org
Fri Jun 8 11:40:29 UTC 2012
commit 055b527ec80d43a38c8be4795199540cb2d00da4
Author: Ondřej Vašík <ovasik at redhat.com>
Date: Fri Jun 8 12:12:47 2012 +0200
Rebase to latest upstream version
.gitignore | 1 +
links-2.2-google.patch | 14 +++---
links-2.2-nss.patch | 91 --------------------------------------------
links-2.2-ssl-verify.patch | 10 ++--
links.spec | 28 ++++++++++----
sources | 2 +-
6 files changed, 34 insertions(+), 112 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3f74dc..84ac93b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
links-2.2.tar.bz2
+/links-2.6.tar.bz2
diff --git a/links-2.2-google.patch b/links-2.2-google.patch
index bbdb9ec..ea16fa4 100644
--- a/links-2.2-google.patch
+++ b/links-2.2-google.patch
@@ -14,7 +14,7 @@ index b0f5918..26f6e99 100644
--- a/html.c
+++ b/html.c
@@ -2143,7 +2143,7 @@ void html_textarea(unsigned char *a)
- void do_html_textarea(unsigned char *attr, unsigned char *html, unsigned char *eof, unsigned char **end, void *f)
+ static void do_html_textarea(unsigned char *attr, unsigned char *html, unsigned char *eof, unsigned char **end)
{
struct form_control *fc;
- unsigned char *p, *t_name, *w;
@@ -36,16 +36,16 @@ index b0f5918..26f6e99 100644
+ if (style && *style == ':') do { ++style; } while (style && *style && isblank(*style));
+ if (style && style == (unsigned char *)strcasestr(style, "none")) goto hid;
+
- if ((cols = get_num(attr, "cols")) <= 5) cols = HTML_DEFAULT_TEXTAREA_WIDTH;
+ if ((cols = get_num(attr, "cols")) < HTML_MINIMAL_TEXTAREA_WIDTH) cols = HTML_DEFAULT_TEXTAREA_WIDTH;
cols++;
- if ((rows = get_num(attr, "rows")) <= 0) rows = HTML_DEFAULT_TEXTAREA_HEIGHT;
+ set_max_textarea_width(&cols);
@@ -2212,6 +2222,8 @@ void do_html_textarea(unsigned char *attr, unsigned char *html, unsigned char *e
kill_html_stack_item(&html_top);
- if (rows > 1) ln_break(1, line_break_f, f);
- else put_chrs(" ", 1, put_chars_f, f);
-+
+ if (rows > 1) ln_break(1);
+ else put_chrs(" ", 1);
+ hid:
- special_f(f, SP_CONTROL, fc);
++
+ special_f(ff, SP_CONTROL, fc);
}
--
diff --git a/links-2.2-ssl-verify.patch b/links-2.2-ssl-verify.patch
index f06057a..dd0927d 100644
--- a/links-2.2-ssl-verify.patch
+++ b/links-2.2-ssl-verify.patch
@@ -8,12 +8,12 @@ Lubomir Rintel <lkundrak at v3.sk>
diff -up links-2.2/connect.c.ssl-verify links-2.2/connect.c
--- links-2.2/connect.c.ssl-verify 2009-04-13 19:28:13.076133802 +0200
+++ links-2.2/connect.c 2009-04-13 19:27:34.467258505 +0200
-@@ -319,6 +319,8 @@ void connected(struct connection *c)
- #ifdef HAVE_SSL
- if (c->ssl) {
- c->ssl = getSSL();
+@@ -328,6 +328,8 @@ void connected(struct connection *c)
+ if (!c->ssl) {
+ goto ssl_error;
+ }
+ if (!getenv("UNSAFE_SSL"))
+ SSL_set_verify(c->ssl, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
SSL_set_fd(c->ssl, *b->sock);
- #ifndef HAVE_NSS_COMPAT
+ #ifndef HAVE_NSS
if (c->no_tsl) c->ssl->options |= SSL_OP_NO_TLSv1;
diff --git a/links.spec b/links.spec
index 27d5fad..8f7a2ff 100644
--- a/links.spec
+++ b/links.spec
@@ -1,6 +1,6 @@
Name: links
-Version: 2.2
-Release: 14%{?dist}
+Version: 2.6
+Release: 1%{?dist}
Epoch: 1
Summary: Web browser running in both graphics and text mode
@@ -9,10 +9,12 @@ License: GPLv2+
URL: http://links.twibright.com/
Source0: http://links.twibright.com/download/%{name}-%{version}.tar.bz2
Source1: links.desktop
-Patch0: links-2.2-nss.patch
Patch1: links-2.2-ssl-verify.patch
# Not sent upstream, since they would probably break my nose for this
Patch2: links-2.2-google.patch
+# Fix configure issue
+Patch3: links-2.5-configure.patch
+Patch4: links-2.6-ipv6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel
@@ -24,8 +26,9 @@ BuildRequires: desktop-file-utils
BuildRequires: gpm-devel
BuildRequires: libX11-devel
BuildRequires: autoconf automake
-BuildRequires: nss-devel
-BuildRequires: nss_compat_ossl-devel
+#BuildRequires: nss-devel
+#BuildRequires: nss_compat_ossl-devel
+BuildRequires: openssl-devel
Requires(preun): %{_sbindir}/alternatives
Requires(post): %{_sbindir}/alternatives
@@ -47,9 +50,10 @@ scrolling.
%prep
%setup -q
-%patch0 -p1 -b .nss
%patch1 -p1 -b .verify-ssl
%patch2 -p1 -b .google
+%patch3 -p1 -b .reconf
+%patch4 -p1 -b .ipv6
%build
@@ -58,7 +62,7 @@ touch -r AUTHORS converted.AUTHORS
mv converted.AUTHORS AUTHORS
autoreconf -i
-%configure --enable-graphics
+%configure --enable-graphics --with-ssl
make %{?_smp_mflags}
@@ -102,7 +106,7 @@ exit 0
%files
%defattr(-,root,root,-)
-%doc doc/* AUTHORS BUGS KEYS TODO README COPYING
+%doc doc/* AUTHORS KEYS README COPYING
%{_bindir}/links2
%{_mandir}/man1/links2.1*
%{_datadir}/pixmaps/links.png
@@ -112,6 +116,13 @@ exit 0
%changelog
+* Fri Jun 08 2012 Ondrej Vasik <ovasik at redhat.com> - 1:2.6-1
+- rebase to latest upstream (#751354)
+- apply IPv6 support patch
+- removed nss patch(already included upstream)
+- use openssl instead of nss again (nss upstream support has some
+ header detection troubles)
+
* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1:2.2-14
- Rebuild for new libpng
@@ -121,6 +132,7 @@ exit 0
* Fri Nov 27 2009 Ondrej Vasik <ovasik at redhat.com> - 1:2.2-12
- add Requires(post) and Requires(postun) for coreutils (readlink)
(#540434)
+
* Sat Oct 17 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.2-11
- Do not display textareas hidden by CSS
diff --git a/sources b/sources
index ed702bb..476f33f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf5b20529a2a811701c5af52b28ebdd4 links-2.2.tar.bz2
+9129e7e3b5c554458b9666689248e0c7 links-2.6.tar.bz2
More information about the scm-commits
mailing list