From f8c5bcce1115366ee40d93650ddfacb1f271f620 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 28 May 2017 23:03:22 +0100 Subject: update for 3.7 series --- changelog | 3 +- control | 2 +- patches/fix-nsgenbind-be.patch | 489 ----------------------------------------- patches/openssl-1.1.0.patch | 62 ------ patches/series | 2 - 5 files changed, 3 insertions(+), 555 deletions(-) delete mode 100644 patches/fix-nsgenbind-be.patch delete mode 100644 patches/openssl-1.1.0.patch diff --git a/changelog b/changelog index 39b5cea..d7e599e 100644 --- a/changelog +++ b/changelog @@ -1,7 +1,8 @@ -netsurf (3.6-4) UNRELEASED; urgency=medium +netsurf (3.7-1) UNRELEASED; urgency=medium * Make png generation reproducible. * Add font recommend dependancy for framebuffer edition + * Remove unecessary patches for 3.7 -- Vincent Sanders Mon, 02 Jan 2017 11:55:26 +0000 diff --git a/control b/control index b2d81de..ac8ec57 100644 --- a/control +++ b/control @@ -3,7 +3,7 @@ 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 +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, libssl1.0-dev, gperf Standards-Version: 3.9.8 Homepage: http://www.netsurf-browser.org Vcs-Browser: http://source.netsurf-browser.org/packaging/debian.git/ diff --git a/patches/fix-nsgenbind-be.patch b/patches/fix-nsgenbind-be.patch deleted file mode 100644 index d583bf6..0000000 --- a/patches/fix-nsgenbind-be.patch +++ /dev/null @@ -1,489 +0,0 @@ ---- a/nsgenbind/src/nsgenbind-ast.c -+++ b/nsgenbind/src/nsgenbind-ast.c -@@ -132,6 +132,19 @@ - return nn; - } - -+struct genbind_node * -+genbind_new_number_node(enum genbind_node_type type, -+ struct genbind_node *l, -+ int number) -+{ -+ struct genbind_node *nn; -+ nn = calloc(1, sizeof(struct genbind_node)); -+ nn->type = type; -+ nn->l = l; -+ nn->r.number = number; -+ return nn; -+} -+ - - /* exported interface defined in nsgenbind-ast.h */ - int ---- a/nsgenbind/src/nsgenbind-ast.h -+++ b/nsgenbind/src/nsgenbind-ast.h -@@ -71,7 +71,18 @@ - - char *genbind_strapp(char *a, char *b); - -+/** -+ * create a new node with value from pointer -+ */ - struct genbind_node *genbind_new_node(enum genbind_node_type type, struct genbind_node *l, void *r); -+ -+/** -+ * create a new number node -+ * -+ * Create a node with of number type -+ */ -+struct genbind_node *genbind_new_number_node(enum genbind_node_type type, struct genbind_node *l, int number); -+ - struct genbind_node *genbind_node_link(struct genbind_node *tgt, struct genbind_node *src); - - struct genbind_node *genbind_node_prepend(struct genbind_node *list, struct genbind_node *inst); ---- a/nsgenbind/src/nsgenbind-parser.y -+++ b/nsgenbind/src/nsgenbind-parser.y -@@ -138,17 +138,17 @@ - } - - location_node = genbind_new_node(GENBIND_NODE_TYPE_FILE, -- genbind_new_node(GENBIND_NODE_TYPE_LINE, -- cdata_node, -- (void *)lineno), -+ genbind_new_number_node(GENBIND_NODE_TYPE_LINE, -+ cdata_node, -+ lineno), - strdup(filename)); - - /* generate method node */ - method_node = genbind_new_node(GENBIND_NODE_TYPE_METHOD, - NULL, -- genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE, -+ genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE, - location_node, -- (void *)methodtype)); -+ methodtype)); - - class_node = genbind_node_find_type_ident(*genbind_ast, - NULL, -@@ -304,11 +304,11 @@ - { - $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD, - NULL, -- genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE, -+ genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE, - genbind_new_node(GENBIND_NODE_TYPE_CDATA, - NULL, - $2), -- (void *)$1)); -+ $1)); - } - ; - -@@ -568,11 +568,11 @@ - TOK_PROPERTY Modifiers TOK_IDENTIFIER ';' - { - $$ = genbind_new_node(GENBIND_NODE_TYPE_PROPERTY, NULL, -- genbind_new_node(GENBIND_NODE_TYPE_MODIFIER, -+ genbind_new_number_node(GENBIND_NODE_TYPE_MODIFIER, - genbind_new_node(GENBIND_NODE_TYPE_IDENT, - NULL, - $3), -- (void *)$2)); -+ $2)); - } - | - TOK_FLAGS ClassFlags ';' -@@ -584,11 +584,11 @@ - { - $$ = genbind_new_node(GENBIND_NODE_TYPE_METHOD, - NULL, -- genbind_new_node(GENBIND_NODE_TYPE_METHOD_TYPE, -+ genbind_new_number_node(GENBIND_NODE_TYPE_METHOD_TYPE, - genbind_new_node(GENBIND_NODE_TYPE_CDATA, - NULL, - $2), -- (void *)$1)); -+ $1)); - } - ; - ---- a/nsgenbind/src/webidl-ast.c -+++ b/nsgenbind/src/webidl-ast.c -@@ -120,6 +120,7 @@ - - - struct webidl_node * -+/* exported interface documented in webidl-ast.h */ - webidl_node_new(enum webidl_node_type type, - struct webidl_node *l, - void *r) -@@ -128,7 +129,21 @@ - nn = calloc(1, sizeof(struct webidl_node)); - nn->type = type; - nn->l = l; -- nn->r.text = r; -+ nn->r.value = r; -+ return nn; -+} -+ -+/* exported interface documented in webidl-ast.h */ -+struct webidl_node * -+webidl_new_number_node(enum webidl_node_type type, -+ struct webidl_node *l, -+ int number) -+{ -+ struct webidl_node *nn; -+ nn = calloc(1, sizeof(struct webidl_node)); -+ nn->type = type; -+ nn->l = l; -+ nn->r.number = number; - return nn; - } - ---- a/nsgenbind/src/webidl-ast.h -+++ b/nsgenbind/src/webidl-ast.h -@@ -92,8 +92,17 @@ - - int webidl_cmp_node_type(struct webidl_node *node, void *ctx); - -+/** -+ * create a new node with a pointer value -+ */ - struct webidl_node *webidl_node_new(enum webidl_node_type, struct webidl_node *l, void *r); - -+/** -+ * create a new node with an integer value -+ */ -+struct webidl_node *webidl_new_number_node(enum webidl_node_type type, struct webidl_node *l, int number); -+ -+ - void webidl_node_set(struct webidl_node *node, enum webidl_node_type type, void *r); - - struct webidl_node *webidl_node_prepend(struct webidl_node *list, struct webidl_node *node); ---- a/nsgenbind/src/webidl-parser.y -+++ b/nsgenbind/src/webidl-parser.y -@@ -735,9 +735,9 @@ - | - TOK_INT_LITERAL - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_INT, -- NULL, -- (void *)$1); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_INT, -+ NULL, -+ $1); - } - | - TOK_NULL_LITERAL -@@ -750,16 +750,16 @@ - BooleanLiteral: - TOK_TRUE - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL, -- NULL, -- (void *)true); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL, -+ NULL, -+ (int)true); - } - | - TOK_FALSE - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_LITERAL_BOOL, -- NULL, -- (void *)false); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_LITERAL_BOOL, -+ NULL, -+ (int)false); - } - ; - -@@ -846,16 +846,18 @@ - - /* deal with inherit modifier */ - if ($1) { -- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER, -+ attribute = webidl_new_number_node( -+ WEBIDL_NODE_TYPE_MODIFIER, - attribute, -- (void *)WEBIDL_TYPE_MODIFIER_INHERIT); -+ WEBIDL_TYPE_MODIFIER_INHERIT); - } - - /* deal with readonly modifier */ - if ($2) { -- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER, -+ attribute = webidl_new_number_node( -+ WEBIDL_NODE_TYPE_MODIFIER, - attribute, -- (void *)WEBIDL_TYPE_MODIFIER_READONLY); -+ WEBIDL_TYPE_MODIFIER_READONLY); - } - - $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE, -@@ -880,14 +882,16 @@ - { - struct webidl_node *attribute; - -- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER, -- $2, (void *)WEBIDL_TYPE_MODIFIER_STATIC); -+ attribute = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER, -+ $2, -+ WEBIDL_TYPE_MODIFIER_STATIC); - - /* deal with readonly modifier */ - if ($1) { -- attribute = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER, -+ attribute = webidl_new_number_node( -+ WEBIDL_NODE_TYPE_MODIFIER, - attribute, -- (void *)WEBIDL_TYPE_MODIFIER_READONLY); -+ WEBIDL_TYPE_MODIFIER_READONLY); - } - - $$ = webidl_node_new(WEBIDL_NODE_TYPE_ATTRIBUTE, -@@ -900,8 +904,9 @@ - struct webidl_node *operation; - - /* add static modifier */ -- operation = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER, -- $2, (void *)WEBIDL_TYPE_MODIFIER_STATIC); -+ operation = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER, -+ $2, -+ WEBIDL_TYPE_MODIFIER_STATIC); - - /* put return type on the operation */ - operation = webidl_node_prepend($1, operation); -@@ -1015,16 +1020,16 @@ - Special: - TOK_GETTER - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL, -- NULL, -- (void *)WEBIDL_TYPE_SPECIAL_GETTER); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL, -+ NULL, -+ WEBIDL_TYPE_SPECIAL_GETTER); - } - | - TOK_SETTER - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL, -- NULL, -- (void *)WEBIDL_TYPE_SPECIAL_SETTER); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL, -+ NULL, -+ WEBIDL_TYPE_SPECIAL_SETTER); - } - | - TOK_CREATOR -@@ -1032,23 +1037,23 @@ - /* second edition removed this special but the - * specifications still use it! - */ -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL, -- NULL, -- (void *)WEBIDL_TYPE_SPECIAL_CREATOR); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL, -+ NULL, -+ WEBIDL_TYPE_SPECIAL_CREATOR); - } - | - TOK_DELETER - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL, -- NULL, -- (void *)WEBIDL_TYPE_SPECIAL_DELETER); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL, -+ NULL, -+ WEBIDL_TYPE_SPECIAL_DELETER); - } - | - TOK_LEGACYCALLER - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_SPECIAL, -- NULL, -- (void *)WEBIDL_TYPE_SPECIAL_LEGACYCALLER); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_SPECIAL, -+ NULL, -+ WEBIDL_TYPE_SPECIAL_LEGACYCALLER); - } - ; - -@@ -1679,8 +1684,9 @@ - TOK_ANY TypeSuffixStartingWithArray - { - /* todo deal with TypeSuffixStartingWithArray */ -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, -- NULL, (void *)WEBIDL_TYPE_ANY); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_ANY); - } - ; - -@@ -1742,29 +1748,39 @@ - | - TOK_STRING TypeSuffix - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_STRING); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ $2, -+ WEBIDL_TYPE_STRING); - } - | - TOK_IDENTIFIER TypeSuffix - { - struct webidl_node *type; -- type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_USER); -+ type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ $2, -+ WEBIDL_TYPE_USER); - $$ = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1); - } - | - TOK_SEQUENCE '<' Type '>' Null - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $3, (void *)WEBIDL_TYPE_SEQUENCE); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ $3, -+ WEBIDL_TYPE_SEQUENCE); - } - | - TOK_OBJECT TypeSuffix - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_OBJECT); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ $2, -+ WEBIDL_TYPE_OBJECT); - } - | - TOK_DATE TypeSuffix - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, $2, (void *)WEBIDL_TYPE_DATE); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ $2, -+ WEBIDL_TYPE_DATE); - } - ; - -@@ -1778,7 +1794,9 @@ - TOK_IDENTIFIER Null - { - struct webidl_node *type; -- type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_USER); -+ type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_USER); - type = webidl_node_new(WEBIDL_NODE_TYPE_IDENT, type, $1); - $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type); - } -@@ -1793,17 +1811,23 @@ - | - TOK_BOOLEAN - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_BOOL); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_BOOL); - } - | - TOK_BYTE - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_BYTE); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_BYTE); - } - | - TOK_OCTET - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_OCTET); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_OCTET); - } - ; - -@@ -1811,9 +1835,9 @@ - UnrestrictedFloatType: - TOK_UNRESTRICTED FloatType - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER, -- $2, -- (void *)WEBIDL_TYPE_MODIFIER_UNRESTRICTED); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER, -+ $2, -+ WEBIDL_TYPE_MODIFIER_UNRESTRICTED); - } - | - FloatType -@@ -1823,12 +1847,16 @@ - FloatType: - TOK_FLOAT - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_FLOAT); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_FLOAT); - } - | - TOK_DOUBLE - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_DOUBLE); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_DOUBLE); - } - ; - -@@ -1836,9 +1864,9 @@ - UnsignedIntegerType: - TOK_UNSIGNED IntegerType - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_MODIFIER, -- $2, -- (void *)WEBIDL_TYPE_MODIFIER_UNSIGNED); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_MODIFIER, -+ $2, -+ WEBIDL_TYPE_MODIFIER_UNSIGNED); - } - | - IntegerType -@@ -1848,15 +1876,21 @@ - IntegerType: - TOK_SHORT - { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_SHORT); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_SHORT); - } - | - TOK_LONG OptionalLong - { - if ($2) { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_LONGLONG); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_LONGLONG); - } else { -- $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_LONG); -+ $$ = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_LONG); - } - } - ; -@@ -1927,7 +1961,9 @@ - TOK_VOID - { - struct webidl_node *type; -- type = webidl_node_new(WEBIDL_NODE_TYPE_TYPE_BASE, NULL, (void *)WEBIDL_TYPE_VOID); -+ type = webidl_new_number_node(WEBIDL_NODE_TYPE_TYPE_BASE, -+ NULL, -+ WEBIDL_TYPE_VOID); - $$ = webidl_node_new(WEBIDL_NODE_TYPE_TYPE, NULL, type); - } - diff --git a/patches/openssl-1.1.0.patch b/patches/openssl-1.1.0.patch deleted file mode 100644 index 8b4df33..0000000 --- a/patches/openssl-1.1.0.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- 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/series b/patches/series index 3b4893c..f320190 100644 --- a/patches/series +++ b/patches/series @@ -1,4 +1,2 @@ -fix-nsgenbind-be.patch remove-favicon-link.patch -openssl-1.1.0.patch set-netsurf-config.patch -- cgit v1.2.3