From 18ab605e5ae485cea171174f2c6e4f2883ab33a9 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 21 Nov 2016 11:01:29 +0000 Subject: update for 3.6 release --- changelog | 12 ++------ control | 9 +++++- patches/openssl-1.1.0.patch | 62 +++++++++++++++++++++++++++++++++++++++ patches/remove-favicon-link.patch | 10 +++++++ patches/series | 2 ++ rules | 2 ++ 6 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 patches/openssl-1.1.0.patch create mode 100644 patches/remove-favicon-link.patch diff --git a/changelog b/changelog index 0cc05bc..617ef20 100644 --- a/changelog +++ b/changelog @@ -1,17 +1,11 @@ -netsurf (3.6-1) UNRELEASED; urgency=medium +netsurf (3.6-1) unstable; urgency=medium - * Update standards version (no change) * New upstream release - - -- Vincent Sanders Tue, 04 Oct 2016 09:04:59 +0100 - -netsurf (3.5-1) unstable; urgency=medium - + (closes: #803313, #812279, #769517, #788484, #731682, #828450) * Update standards version (no change) - * New upstream release (closes: #803313) * Correct VCS headers (closes: #819882) - -- Vincent Sanders Tue, 04 Sep 2016 09:04:20 +0100 + -- Vincent Sanders Sun, 20 Nov 2016 14:49:57 +0000 netsurf (3.2+dfsg-3) unstable; urgency=medium diff --git a/control b/control index b25ab59..0ea434f 100644 --- a/control +++ b/control @@ -2,6 +2,7 @@ Source: netsurf Section: web Priority: extra Maintainer: Vincent Sanders +Uploaders: Daniel Silverstone Build-Depends: debhelper (>= 9~), libcurl3-dev, libpng-dev, libgtk2.0-dev, flex, bison, libhtml-parser-perl, librsvg2-dev, libjpeg-dev, imagemagick, libfreetype6-dev, libvncserver-dev, libsdl1.2-dev, libxcb1-dev, libxcb-icccm4-dev, libxcb-image0-dev, libxcb-keysyms1-dev, libxcb-util0-dev, libssl-dev, gperf Standards-Version: 3.9.8 Homepage: http://www.netsurf-browser.org @@ -29,6 +30,8 @@ Description: small web browser with CSS support for GTK NetSurf is a multi-platform lightweight web browser. It aims to provide comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint without compromising performance. + . + This version uses the GTK+ toolkit. Package: netsurf-fb Architecture: any @@ -39,14 +42,18 @@ Description: small web browser with CSS support for framebuffers NetSurf is a multi-platform lightweight web browser. It aims to provide comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint without compromising performance. + . + This version uses no toolkit and displays output on various framebuffers. Package: netsurf-common Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, ca-certificates Replaces: netsurf-gtk (<< 2.9-2) Breaks: netsurf-gtk (<< 2.9-2) Description: small web browser with CSS support common files NetSurf is a multi-platform lightweight web browser. It aims to provide comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint without compromising performance. + . + These are the common resources for all versions. diff --git a/patches/openssl-1.1.0.patch b/patches/openssl-1.1.0.patch new file mode 100644 index 0000000..8b4df33 --- /dev/null +++ b/patches/openssl-1.1.0.patch @@ -0,0 +1,62 @@ +--- a/netsurf/content/fetchers/curl.c ++++ b/netsurf/content/fetchers/curl.c +@@ -128,6 +128,26 @@ + static char fetch_proxy_userpwd[100]; + + ++/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed */ ++#if (OPENSSL_VERSION_NUMBER < 0x1010000fL) ++static int ns_X509_up_ref(X509 *cert) ++{ ++ cert->references++; ++ return 1; ++} ++ ++static void ns_X509_free(X509 *cert) ++{ ++ cert->references--; ++ if (cert->references == 0) { ++ X509_free(cert); ++ } ++} ++#else ++#define ns_X509_up_ref X509_up_ref ++#define ns_X509_free X509_free ++#endif ++ + /** + * Initialise a cURL fetcher. + */ +@@ -438,7 +458,7 @@ + */ + if (!fetch->cert_data[depth].cert) { + fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx); +- fetch->cert_data[depth].cert->references++; ++ ns_X509_up_ref(fetch->cert_data[depth].cert); + fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx); + } + +@@ -815,10 +835,7 @@ + } + + for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) { +- f->cert_data[i].cert->references--; +- if (f->cert_data[i].cert->references == 0) { +- X509_free(f->cert_data[i].cert); +- } ++ ns_X509_free(f->cert_data[i].cert); + } + + free(f); +@@ -986,10 +1003,7 @@ + X509_get_pubkey(certs[depth].cert)); + + /* and clean up */ +- certs[depth].cert->references--; +- if (certs[depth].cert->references == 0) { +- X509_free(certs[depth].cert); +- } ++ ns_X509_free(certs[depth].cert); + } + + msg.type = FETCH_CERT_ERR; diff --git a/patches/remove-favicon-link.patch b/patches/remove-favicon-link.patch new file mode 100644 index 0000000..2719c12 --- /dev/null +++ b/patches/remove-favicon-link.patch @@ -0,0 +1,10 @@ +--- a/netsurf/!NetSurf/Resources/nl/welcome.html,faf ++++ b/netsurf/!NetSurf/Resources/nl/welcome.html,faf +@@ -3,7 +3,6 @@ + + Welkom bij NetSurf + +- + + + diff --git a/patches/series b/patches/series index a8f7a18..25a75e0 100644 --- a/patches/series +++ b/patches/series @@ -1 +1,3 @@ +remove-favicon-link.patch +openssl-1.1.0.patch set-netsurf-config.patch diff --git a/rules b/rules index 4348a4c..366c6c8 100755 --- a/rules +++ b/rules @@ -23,6 +23,8 @@ override_dh_auto_install: convert netsurf/frontends/gtk/res/netsurf.xpm debian/netsurf-gtk/usr/share/pixmaps/netsurf.png install -m 644 debian/netsurf-gtk.desktop debian/netsurf-gtk/usr/share/applications dh_auto_install -- PREFIX=/usr TARGET=framebuffer + rm debian/tmp/usr/share/netsurf/ca-bundle.txt + ln -s /etc/ssl/certs/ca-certificates.crt debian/tmp/usr/share/netsurf/ca-bundle.txt override_dh_auto_clean: dh_auto_clean -- PREFIX=/usr TARGET=gtk -- cgit v1.2.3