netsurf: branch master updated. release/3.9-377-g3a8317f
Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1
...commit
http://git.netsurf-browser.org/netsurf.git/commit/3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1
...tree
http://git.netsurf-browser.org/netsurf.git/tree/3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1
The branch, master has been updated
via 3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1 (commit)
via 6f105c41c202c570a37cc0cca2ab15172b2dbbaf (commit)
via 24dd16ddff6a284a98c1abb30dacbf23d8895f4f (commit)
from f1e6690b25eacac268686b5ebf02a5f31ca918af (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1
commit 3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1
Author: Daniel Silverstone
Commit: Daniel Silverstone
fetch_curl_report_certs_upstream: Use new SSL_CERT_ERR_CERT_MISSING
Signed-off-by: Daniel Silverstone
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index cb09ece..0be33ae 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -482,7 +482,11 @@ fetch_curl_report_certs_upstream(struct curl_fetch_info *f)
memset(ssl_certs, 0, sizeof(ssl_certs));
for (depth = 0; depth <= f->cert_depth; depth++) {
- assert(certs[depth].cert != NULL);
+ if (certs[depth].cert == NULL) {
+ /* This certificate is missing, skip it */
+ ssl_certs[depth].err = SSL_CERT_ERR_CERT_MISSING;
+ continue;
+ }
/* get certificate version */
ssl_certs[depth].version = X509_get_version(certs[depth].cert);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6f105c41c202c570a37cc0cca2ab15172b2dbbaf
commit 6f105c41c202c570a37cc0cca2ab15172b2dbbaf
Author: Daniel Silverstone
Commit: Daniel Silverstone
Add certificate-missing error code
Signed-off-by: Daniel Silverstone
diff --git a/include/netsurf/ssl_certs.h b/include/netsurf/ssl_certs.h
index dcd644e..0444678 100644
--- a/include/netsurf/ssl_certs.h
+++ b/include/netsurf/ssl_certs.h
@@ -42,6 +42,7 @@ typedef enum {
SSL_CERT_ERR_CHAIN_SELF_SIGNED, /**< This certificate chain is self
signed */
SSL_CERT_ERR_REVOKED, /**< This certificate has been revoked */
SSL_CERT_ERR_HOSTNAME_MISMATCH, /**< This certificate host did not
match the server */
+ SSL_CERT_ERR_CERT_MISSING, /**< This certificate was missing from the
chain, its data is useless */
} ssl_cert_err;
/** Always the max known ssl certificate error type */
diff --git a/resources/FatMessages b/resources/FatMessages
index f1cb870..c5cfd3e 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -1085,6 +1085,7 @@ en.all.SSLCertErrSelfSigned:The certificate is self
signed.
en.all.SSLCertErrChainSelfSigned:The certificate chain is self signed.
en.all.SSLCertErrRevoked:The certificate has been revoked by the issuer.
en.all.SSLCertErrHostnameMismatch:The certificate is for a different host than
the server
+en.all.SSLCertErrCertMissing:The certificate was missing from the chain.
# Timeout error interface
diff --git a/utils/messages.c b/utils/messages.c
index 5525e18..418276e 100644
--- a/utils/messages.c
+++ b/utils/messages.c
@@ -445,6 +445,10 @@ const char *messages_get_sslcode(ssl_cert_err code)
/* Common name is invalid */
return messages_get_ctx("SSLCertErrHostnameMismatch",
messages_hash);
+ case SSL_CERT_ERR_CERT_MISSING:
+ /* Common name is invalid */
+ return messages_get_ctx("SSLCertErrCertMissing", messages_hash);
+
}
/* The switch has no default, so the compiler should tell us when we
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=24dd16ddff6a284a98c1abb30dacbf23d8895f4f
commit 24dd16ddff6a284a98c1abb30dacbf23d8895f4f
Author: Daniel Silverstone
Commit: Daniel Silverstone
fetch_curl_verify_callback: Do depth update after check
Signed-off-by: Daniel Silverstone
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index a1d7ee1..cb09ece 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -662,11 +662,6 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX
*x509_ctx)
depth = X509_STORE_CTX_get_error_depth(x509_ctx);
fetch = X509_STORE_CTX_get_app_data(x509_ctx);
- /* record the max depth */
- if (depth > fetch->cert_depth) {
- fetch->cert_depth = depth;
- }
-
/* certificate chain is excessively deep so fail verification */
if (depth >= MAX_SSL_CERTS) {
X509_STORE_CTX_set_error(x509_ctx,
@@
netsurf-all: branch master updated. release/3.9-1-g773298a
Gitweb links: ...log http://git.netsurf-browser.org/netsurf-all.git/shortlog/773298ad44156d8ffa298897a33bafc6d7517e88 ...commit http://git.netsurf-browser.org/netsurf-all.git/commit/773298ad44156d8ffa298897a33bafc6d7517e88 ...tree http://git.netsurf-browser.org/netsurf-all.git/tree/773298ad44156d8ffa298897a33bafc6d7517e88 The branch, master has been updated via 773298ad44156d8ffa298897a33bafc6d7517e88 (commit) from 78b690d42636517d92f1dd158a19f025aff62152 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commitdiff http://git.netsurf-browser.org/netsurf-all.git/commit/?id=773298ad44156d8ffa298897a33bafc6d7517e88 commit 773298ad44156d8ffa298897a33bafc6d7517e88 Author: Vincent Sanders Commit: Vincent Sanders default target is now gtk2 diff --git a/Makefile b/Makefile index 78d645e..3559a29 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ # NetSurf Source makefile for libraries and browser # # The TARGET variable changes what toolkit is built for valid values are: -# gtk (default if unset) +# gtk2 (default if unset) +# gtk3 # riscos # framebuffer # amiga @@ -38,7 +39,7 @@ NSLIB_RO_TARG := librufl libpencil # Build Environment -export TARGET ?= gtk +export TARGET ?= gtk2 TMP_PREFIX := $(CURDIR)/inst-$(TARGET) export PKG_CONFIG_PATH := $(TMP_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH) export PATH := $(PATH):$(TMP_PREFIX)/bin/ --- Summary of changes: Makefile |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 78d645e..3559a29 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ # NetSurf Source makefile for libraries and browser # # The TARGET variable changes what toolkit is built for valid values are: -# gtk (default if unset) +# gtk2 (default if unset) +# gtk3 # riscos # framebuffer # amiga @@ -38,7 +39,7 @@ NSLIB_RO_TARG := librufl libpencil # Build Environment -export TARGET ?= gtk +export TARGET ?= gtk2 TMP_PREFIX := $(CURDIR)/inst-$(TARGET) export PKG_CONFIG_PATH := $(TMP_PREFIX)/lib/pkgconfig:$(PKG_CONFIG_PATH) export PATH := $(PATH):$(TMP_PREFIX)/bin/ -- NetSurf 'all' tree. Typically used for releases ___ netsurf-commits mailing list netsurf-commits@netsurf-browser.org http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
netsurf: branch master updated. release/3.9-378-g2cebe26
Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/2cebe260582e646252052209d61fb78513566046 ...commit http://git.netsurf-browser.org/netsurf.git/commit/2cebe260582e646252052209d61fb78513566046 ...tree http://git.netsurf-browser.org/netsurf.git/tree/2cebe260582e646252052209d61fb78513566046 The branch, master has been updated via 2cebe260582e646252052209d61fb78513566046 (commit) from 3a8317fddb979f95ff7ae3a6c2f44f95fe1723c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2cebe260582e646252052209d61fb78513566046 commit 2cebe260582e646252052209d61fb78513566046 Author: Vincent Sanders Commit: Vincent Sanders enforce setting subtarget so gtk2 gets named the correct thing in installs diff --git a/Makefile b/Makefile index 166bf81..f8b5e9c 100644 --- a/Makefile +++ b/Makefile @@ -303,13 +303,8 @@ else else ifeq ($(TARGET),gtk2) override TARGET := gtk -ifeq ($(origin NETSURF_GTK_MAJOR),undefined) - override NETSURF_GTK_MAJOR := 2 -else - ifneq ($(NETSURF_GTK_MAJOR),2) -SUBTARGET = $(NETSURF_GTK_MAJOR) - endif -endif +override NETSURF_GTK_MAJOR := 2 +SUBTARGET = $(NETSURF_GTK_MAJOR) endif endif endif --- Summary of changes: Makefile |9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 166bf81..f8b5e9c 100644 --- a/Makefile +++ b/Makefile @@ -303,13 +303,8 @@ else else ifeq ($(TARGET),gtk2) override TARGET := gtk -ifeq ($(origin NETSURF_GTK_MAJOR),undefined) - override NETSURF_GTK_MAJOR := 2 -else - ifneq ($(NETSURF_GTK_MAJOR),2) -SUBTARGET = $(NETSURF_GTK_MAJOR) - endif -endif +override NETSURF_GTK_MAJOR := 2 +SUBTARGET = $(NETSURF_GTK_MAJOR) endif endif endif -- NetSurf Browser ___ netsurf-commits mailing list netsurf-commits@netsurf-browser.org http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
packaging/debian: branch master updated. release/3.6-3-12-g492b28c
Gitweb links:
...log
http://git.netsurf-browser.org/packaging/debian.git/shortlog/492b28c439ce4694aff20dd0a14936af62b9c9d7
...commit
http://git.netsurf-browser.org/packaging/debian.git/commit/492b28c439ce4694aff20dd0a14936af62b9c9d7
...tree
http://git.netsurf-browser.org/packaging/debian.git/tree/492b28c439ce4694aff20dd0a14936af62b9c9d7
The branch, master has been updated
via 492b28c439ce4694aff20dd0a14936af62b9c9d7 (commit)
from c1828cce0bfac32491a2721b33900ba01687f20a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commitdiff
http://git.netsurf-browser.org/packaging/debian.git/commit/?id=492b28c439ce4694aff20dd0a14936af62b9c9d7
commit 492b28c439ce4694aff20dd0a14936af62b9c9d7
Author: Vincent Sanders
Commit: Vincent Sanders
build both gtk3 and gtk2 versions
diff --git a/changelog b/changelog
index df12957..d111342 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,10 @@
-netsurf (3.9-1) UNRELEASED; urgency=medium
+netsurf (3.9-2) UNRELEASED; urgency=medium
+
+ * Build both gtk2 and gtk3 versions
+
+ -- Vincent Sanders 02 Dec 2019 22:11:04 +
+
+netsurf (3.9-1) unstable; urgency=medium
* New upstream release (Closes: #869600)
* Make png generation reproducible.
diff --git a/control b/control
index 074da22..243e401 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Vincent Sanders
Uploaders: Daniel Silverstone
-Build-Depends: debhelper (>= 9~), libcurl4-openssl-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, xxd
+Build-Depends: debhelper (>= 9~), libcurl4-openssl-dev, libpng-dev,
libgtk2.0-dev, libgtk-3-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, xxd
Standards-Version: 4.1.4
Homepage: https://www.netsurf-browser.org
Vcs-Browser: https://source.netsurf-browser.org/packaging/debian.git/
@@ -32,7 +32,19 @@ Description: small web browser with CSS support for GTK
comprehensive rendering of HTML 5 with CSS 2 in a small resource footprint
without compromising performance.
.
- This version uses the GTK+ toolkit.
+ This version uses the GTK+ 3 toolkit.
+
+Package: netsurf-gtk2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, netsurf-common
(=${source:Version})
+Provides: www-browser
+Recommends: mime-support
+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+ 2 toolkit.
Package: netsurf-fb
Architecture: any
diff --git a/netsurf-gtk.1 b/netsurf-gtk.1
deleted file mode 100644
index 13a0fa5..000
--- a/netsurf-gtk.1
+++ /dev/null
@@ -1,362 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH NETSURF 1 "April 19, 2011"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nhdisable hyphenation
-.\" .hyenable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nfdisable filling
-.\" .fienable filling
-.\" .brinsert line break
-.\" .sp insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-netsurf \- A small fast web browser
-.SH SYNOPSIS
-.B netsurf
-.RI [ options ]
-.RI [ url ]
-.SH DESCRIPTION
-This manual page documents briefly the
-.B netsurf
-browser.
-.PP
-.\" TeX users may be more comfortable with the \fB\fP and
-.\" \fI\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBnetsurf\fP is a small fast web browser. This man page only describes how to
run the browser.
-.SH OPTIONS
-This programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-.PP
-The command line parameters override any options loaded from the users Choices
file.
-.PP
-A summary of options is included below.
-.TP
-.B \-v
-Enable verbose logging.
-.TP
-.B \-\-http_proxy
-Bboolean indicating if the http proxy is being used.
-.TP
-.B \-\-http_proxy_host
-The http proxy host.
-.TP
-.B \-\-http_proxy_port
-The http proxy port.
-.TP
-.B \-\-http_proxy_auth
-The authentication scheme
