October 2018 - netsurf-commits - listmaster.pepperfish.net

netsurf: branch master updated. release/3.8-33-ge275b31

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/e275b3175b710d3289e83... ...commit http://git.netsurf-browser.org/netsurf.git/commit/e275b3175b710d3289e83bf... ...tree http://git.netsurf-browser.org/netsurf.git/tree/e275b3175b710d3289e83bf01... The branch, master has been updated via e275b3175b710d3289e83bf0130bd0504951adc2 (commit) from 8687265c9a2f26a0ee40f80366d4f17a3d600fac (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=e275b3175b710d3289e... commit e275b3175b710d3289e83bf0130bd0504951adc2 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> check dom call return and improve handling of missing form type diff --git a/content/handlers/html/box_construct.c b/content/handlers/html/box_construct.c index 5650fbf..5e5d90d 100644 --- a/content/handlers/html/box_construct.c +++ b/content/handlers/html/box_construct.c @@ -2476,49 +2476,57 @@ static bool box_input_text(html_content *html, struct box *box, bool box_input(BOX_SPECIAL_PARAMS) { - struct form_control *gadget = NULL; + struct form_control *gadget; dom_string *type = NULL; dom_exception err; nsurl *url; nserror error; - dom_element_get_attribute(n, corestring_dom_type, &type); - gadget = html_forms_get_control_for_node(content->forms, n); - if (gadget == NULL) - goto no_memory; + if (gadget == NULL) { + return false; + } + box->gadget = gadget; box->flags |= IS_REPLACED; gadget->box = box; gadget->html = content; - if (type && dom_string_caseless_lwc_isequal(type, - corestring_lwc_password)) { + /* get entry type */ + err = dom_element_get_attribute(n, corestring_dom_type, &type); + if ((err != DOM_NO_ERR) || (type == NULL)) { + /* no type so "text" is assumed */ + if (box_input_text(content, box, n) == false) { + return false; + } + *convert_children = false; + return true; + } + + + if (dom_string_caseless_lwc_isequal(type, corestring_lwc_password)) { if (box_input_text(content, box, n) == false) goto no_memory; - } else if (type && dom_string_caseless_lwc_isequal(type, - corestring_lwc_file)) { + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_file)) { box->type = BOX_INLINE_BLOCK; - } else if (type && dom_string_caseless_lwc_isequal(type, + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_hidden)) { /* no box for hidden inputs */ box->type = BOX_NONE; - } else if (type && - (dom_string_caseless_lwc_isequal(type, + } else if ((dom_string_caseless_lwc_isequal(type, corestring_lwc_checkbox) || dom_string_caseless_lwc_isequal(type, corestring_lwc_radio))) { - } else if (type && - (dom_string_caseless_lwc_isequal(type, + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_submit) || dom_string_caseless_lwc_isequal(type, corestring_lwc_reset) || dom_string_caseless_lwc_isequal(type, - corestring_lwc_button))) { + corestring_lwc_button)) { struct box *inline_container, *inline_box; if (box_button(n, content, box, 0) == false) @@ -2560,11 +2568,12 @@ bool box_input(BOX_SPECIAL_PARAMS) box_add_child(box, inline_container); - } else if (type && dom_string_caseless_lwc_isequal(type, + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_image)) { gadget->type = GADGET_IMAGE; - if (box->style && ns_computed_display(box->style, + if (box->style && + ns_computed_display(box->style, box_is_root(n)) != CSS_DISPLAY_NONE && nsoption_bool(foreground_images) == true) { dom_string *s; @@ -2595,20 +2604,19 @@ bool box_input(BOX_SPECIAL_PARAMS) } } } else { - /* the default type is "text" */ + /* unhandled type the default is "text" */ if (box_input_text(content, box, n) == false) goto no_memory; } - if (type) - dom_string_unref(type); + dom_string_unref(type); *convert_children = false; + return true; no_memory: - if (type) - dom_string_unref(type); + dom_string_unref(type); return false; } ----------------------------------------------------------------------- Summary of changes: content/handlers/html/box_construct.c | 52 +++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/content/handlers/html/box_construct.c b/content/handlers/html/box_construct.c index 5650fbf..5e5d90d 100644 --- a/content/handlers/html/box_construct.c +++ b/content/handlers/html/box_construct.c @@ -2476,49 +2476,57 @@ static bool box_input_text(html_content *html, struct box *box, bool box_input(BOX_SPECIAL_PARAMS) { - struct form_control *gadget = NULL; + struct form_control *gadget; dom_string *type = NULL; dom_exception err; nsurl *url; nserror error; - dom_element_get_attribute(n, corestring_dom_type, &type); - gadget = html_forms_get_control_for_node(content->forms, n); - if (gadget == NULL) - goto no_memory; + if (gadget == NULL) { + return false; + } + box->gadget = gadget; box->flags |= IS_REPLACED; gadget->box = box; gadget->html = content; - if (type && dom_string_caseless_lwc_isequal(type, - corestring_lwc_password)) { + /* get entry type */ + err = dom_element_get_attribute(n, corestring_dom_type, &type); + if ((err != DOM_NO_ERR) || (type == NULL)) { + /* no type so "text" is assumed */ + if (box_input_text(content, box, n) == false) { + return false; + } + *convert_children = false; + return true; + } + + + if (dom_string_caseless_lwc_isequal(type, corestring_lwc_password)) { if (box_input_text(content, box, n) == false) goto no_memory; - } else if (type && dom_string_caseless_lwc_isequal(type, - corestring_lwc_file)) { + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_file)) { box->type = BOX_INLINE_BLOCK; - } else if (type && dom_string_caseless_lwc_isequal(type, + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_hidden)) { /* no box for hidden inputs */ box->type = BOX_NONE; - } else if (type && - (dom_string_caseless_lwc_isequal(type, + } else if ((dom_string_caseless_lwc_isequal(type, corestring_lwc_checkbox) || dom_string_caseless_lwc_isequal(type, corestring_lwc_radio))) { - } else if (type && - (dom_string_caseless_lwc_isequal(type, + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_submit) || dom_string_caseless_lwc_isequal(type, corestring_lwc_reset) || dom_string_caseless_lwc_isequal(type, - corestring_lwc_button))) { + corestring_lwc_button)) { struct box *inline_container, *inline_box; if (box_button(n, content, box, 0) == false) @@ -2560,11 +2568,12 @@ bool box_input(BOX_SPECIAL_PARAMS) box_add_child(box, inline_container); - } else if (type && dom_string_caseless_lwc_isequal(type, + } else if (dom_string_caseless_lwc_isequal(type, corestring_lwc_image)) { gadget->type = GADGET_IMAGE; - if (box->style && ns_computed_display(box->style, + if (box->style && + ns_computed_display(box->style, box_is_root(n)) != CSS_DISPLAY_NONE && nsoption_bool(foreground_images) == true) { dom_string *s; @@ -2595,20 +2604,19 @@ bool box_input(BOX_SPECIAL_PARAMS) } } } else { - /* the default type is "text" */ + /* unhandled type the default is "text" */ if (box_input_text(content, box, n) == false) goto no_memory; } - if (type) - dom_string_unref(type); + dom_string_unref(type); *convert_children = false; + return true; no_memory: - if (type) - dom_string_unref(type); + dom_string_unref(type); return false; } -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-32-g8687265

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/8687265c9a2f26a0ee40f... ...commit http://git.netsurf-browser.org/netsurf.git/commit/8687265c9a2f26a0ee40f80... ...tree http://git.netsurf-browser.org/netsurf.git/tree/8687265c9a2f26a0ee40f8036... The branch, master has been updated via 8687265c9a2f26a0ee40f80366d4f17a3d600fac (commit) from a8ee1c2d63b79672c39a2c40c4067f05b6afb799 (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=8687265c9a2f26a0ee4... commit 8687265c9a2f26a0ee40f80366d4f17a3d600fac Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> fix stupid typo in previous commit diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c index c8ec550..02951aa 100644 --- a/frontends/gtk/login.c +++ b/frontends/gtk/login.c @@ -139,7 +139,7 @@ get_login_description(struct nsurl *url, NSLOG(netsurf, INFO, "key:%s url:%s realm:%s str:%s", key, url_s, realm, str); - if ((str != NULL) && (strcmp(key, str) != 0) { + if ((str != NULL) && (strcmp(key, str) != 0)) { *out_str = str; } else { /* no message so fallback */ ----------------------------------------------------------------------- Summary of changes: frontends/gtk/login.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c index c8ec550..02951aa 100644 --- a/frontends/gtk/login.c +++ b/frontends/gtk/login.c @@ -139,7 +139,7 @@ get_login_description(struct nsurl *url, NSLOG(netsurf, INFO, "key:%s url:%s realm:%s str:%s", key, url_s, realm, str); - if ((str != NULL) && (strcmp(key, str) != 0) { + if ((str != NULL) && (strcmp(key, str) != 0)) { *out_str = str; } else { /* no message so fallback */ -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-31-ga8ee1c2

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/a8ee1c2d63b79672c39a2... ...commit http://git.netsurf-browser.org/netsurf.git/commit/a8ee1c2d63b79672c39a2c4... ...tree http://git.netsurf-browser.org/netsurf.git/tree/a8ee1c2d63b79672c39a2c40c... The branch, master has been updated via a8ee1c2d63b79672c39a2c40c4067f05b6afb799 (commit) from 04a515a8ca679844b3aab8d28243d1711693528c (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=a8ee1c2d63b79672c39... commit a8ee1c2d63b79672c39a2c40c4067f05b6afb799 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> explicitly check for null string before compare diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c index 96639fa..c8ec550 100644 --- a/frontends/gtk/login.c +++ b/frontends/gtk/login.c @@ -139,7 +139,7 @@ get_login_description(struct nsurl *url, NSLOG(netsurf, INFO, "key:%s url:%s realm:%s str:%s", key, url_s, realm, str); - if (strcmp(key, str) != 0) { + if ((str != NULL) && (strcmp(key, str) != 0) { *out_str = str; } else { /* no message so fallback */ ----------------------------------------------------------------------- Summary of changes: frontends/gtk/login.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontends/gtk/login.c b/frontends/gtk/login.c index 96639fa..c8ec550 100644 --- a/frontends/gtk/login.c +++ b/frontends/gtk/login.c @@ -139,7 +139,7 @@ get_login_description(struct nsurl *url, NSLOG(netsurf, INFO, "key:%s url:%s realm:%s str:%s", key, url_s, realm, str); - if (strcmp(key, str) != 0) { + if ((str != NULL) && (strcmp(key, str) != 0) { *out_str = str; } else { /* no message so fallback */ -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-30-g04a515a

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/04a515a8ca679844b3aab... ...commit http://git.netsurf-browser.org/netsurf.git/commit/04a515a8ca679844b3aab8d... ...tree http://git.netsurf-browser.org/netsurf.git/tree/04a515a8ca679844b3aab8d28... The branch, master has been updated via 04a515a8ca679844b3aab8d28243d1711693528c (commit) from 631a3145f87aec6248be77a6fe3e6c263e373c91 (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=04a515a8ca679844b3a... commit 04a515a8ca679844b3aab8d28243d1711693528c Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> add sha 256 checksum fallback binary name for openbsd diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index 8bf7d9a..8a49797 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -451,6 +451,7 @@ command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=echo # find sha256 binary name SHAR256SUM=sha256sum +command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=sha256 command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=echo ${MD5SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 ----------------------------------------------------------------------- Summary of changes: utils/jenkins-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index 8bf7d9a..8a49797 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -451,6 +451,7 @@ command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=echo # find sha256 binary name SHAR256SUM=sha256sum +command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=sha256 command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=echo ${MD5SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-29-g631a314

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/631a3145f87aec6248be7... ...commit http://git.netsurf-browser.org/netsurf.git/commit/631a3145f87aec6248be77a... ...tree http://git.netsurf-browser.org/netsurf.git/tree/631a3145f87aec6248be77a6f... The branch, master has been updated via 631a3145f87aec6248be77a6fe3e6c263e373c91 (commit) from 7ef2b8b71179bcc5fe90a673f684fc221f7d28a3 (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=631a3145f87aec6248b... commit 631a3145f87aec6248be77a6fe3e6c263e373c91 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> fix sha256 file name suffix in script diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index d6bf6da..8bf7d9a 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -454,7 +454,7 @@ SHAR256SUM=sha256sum command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=echo ${MD5SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 -${SHAR256SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha +${SHAR256SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha256 ############ Package artifact deployment ################ ----------------------------------------------------------------------- Summary of changes: utils/jenkins-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index d6bf6da..8bf7d9a 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -454,7 +454,7 @@ SHAR256SUM=sha256sum command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=echo ${MD5SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 -${SHAR256SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha +${SHAR256SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha256 ############ Package artifact deployment ################ -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-28-g7ef2b8b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7ef2b8b71179bcc5fe90a... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7ef2b8b71179bcc5fe90a67... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7ef2b8b71179bcc5fe90a673f... The branch, master has been updated via 7ef2b8b71179bcc5fe90a673f684fc221f7d28a3 (commit) from 3523cdc4a441e9fb2d8fcc020b04bd819b3019b8 (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=7ef2b8b71179bcc5fe9... commit 7ef2b8b71179bcc5fe90a673f684fc221f7d28a3 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> fix stupid error expanding shell variable diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index cff753a..d6bf6da 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -472,7 +472,7 @@ for SUFFIX in "${PKG_SFX}" .md5 .sha256;do # remove the local file artifact rm -f "${PKG_SRC}${SUFFIX}" - OLD_ARTIFACT_TARGETS=${OLD_ARTIFACT_TARGETS} "${DESTDIR}/NetSurf-${OLD_IDENTIFIER}${SUFFIX}" + OLD_ARTIFACT_TARGETS="${OLD_ARTIFACT_TARGETS} ${DESTDIR}/NetSurf-${OLD_IDENTIFIER}${SUFFIX}" done ----------------------------------------------------------------------- Summary of changes: utils/jenkins-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index cff753a..d6bf6da 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -472,7 +472,7 @@ for SUFFIX in "${PKG_SFX}" .md5 .sha256;do # remove the local file artifact rm -f "${PKG_SRC}${SUFFIX}" - OLD_ARTIFACT_TARGETS=${OLD_ARTIFACT_TARGETS} "${DESTDIR}/NetSurf-${OLD_IDENTIFIER}${SUFFIX}" + OLD_ARTIFACT_TARGETS="${OLD_ARTIFACT_TARGETS} ${DESTDIR}/NetSurf-${OLD_IDENTIFIER}${SUFFIX}" done -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-27-g3523cdc

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/3523cdc4a441e9fb2d8fc... ...commit http://git.netsurf-browser.org/netsurf.git/commit/3523cdc4a441e9fb2d8fcc0... ...tree http://git.netsurf-browser.org/netsurf.git/tree/3523cdc4a441e9fb2d8fcc020... The branch, master has been updated via 3523cdc4a441e9fb2d8fcc020b04bd819b3019b8 (commit) from ef5333672435c094c6088da8052838b43020c66e (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=3523cdc4a441e9fb2d8... commit 3523cdc4a441e9fb2d8fcc020b04bd819b3019b8 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> cope with md5sum being named different things on bsd diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index be71d89..cff753a 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -443,8 +443,18 @@ if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then fi # create package checksum files -md5sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 -sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha + +# find md5sum binary +MD5SUM=md5sum; +command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=md5 +command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=echo + +# find sha256 binary name +SHAR256SUM=sha256sum +command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=echo + +${MD5SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 +${SHAR256SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha ############ Package artifact deployment ################ @@ -453,18 +463,20 @@ sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha DESTDIR=/srv/ci.netsurf-browser.org/html/builds/${TARGET}/ NEW_ARTIFACT_TARGET="NetSurf-${IDENTIFIER}" +OLD_ARTIFACT_TARGETS="" -for SUFFIX in "${PKG_SFX}" .md5 .sha;do +for SUFFIX in "${PKG_SFX}" .md5 .sha256;do # copy the file to the output - always use scp as it works local or remote scp "${PKG_SRC}${SUFFIX}" netsurf@ci.netsurf-browser.org:${DESTDIR}/${NEW_ARTIFACT_TARGET}${SUFFIX} # remove the local file artifact rm -f "${PKG_SRC}${SUFFIX}" + + OLD_ARTIFACT_TARGETS=${OLD_ARTIFACT_TARGETS} "${DESTDIR}/NetSurf-${OLD_IDENTIFIER}${SUFFIX}" done ############ Expired package artifact removal and latest linking ############## -OLD_ARTIFACT_TARGET="NetSurf-${OLD_IDENTIFIER}${PKG_SFX}" -ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" +ssh netsurf(a)ci.netsurf-browser.org "rm -f ${OLD_ARTIFACT_TARGETS} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" ----------------------------------------------------------------------- Summary of changes: utils/jenkins-build.sh | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index be71d89..cff753a 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -443,8 +443,18 @@ if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then fi # create package checksum files -md5sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 -sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha + +# find md5sum binary +MD5SUM=md5sum; +command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=md5 +command -v ${MD5SUM} >/dev/null 2>&1 || MD5SUM=echo + +# find sha256 binary name +SHAR256SUM=sha256sum +command -v ${SHAR256SUM} >/dev/null 2>&1 || SHAR256SUM=echo + +${MD5SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 +${SHAR256SUM} "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha ############ Package artifact deployment ################ @@ -453,18 +463,20 @@ sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha DESTDIR=/srv/ci.netsurf-browser.org/html/builds/${TARGET}/ NEW_ARTIFACT_TARGET="NetSurf-${IDENTIFIER}" +OLD_ARTIFACT_TARGETS="" -for SUFFIX in "${PKG_SFX}" .md5 .sha;do +for SUFFIX in "${PKG_SFX}" .md5 .sha256;do # copy the file to the output - always use scp as it works local or remote scp "${PKG_SRC}${SUFFIX}" netsurf@ci.netsurf-browser.org:${DESTDIR}/${NEW_ARTIFACT_TARGET}${SUFFIX} # remove the local file artifact rm -f "${PKG_SRC}${SUFFIX}" + + OLD_ARTIFACT_TARGETS=${OLD_ARTIFACT_TARGETS} "${DESTDIR}/NetSurf-${OLD_IDENTIFIER}${SUFFIX}" done ############ Expired package artifact removal and latest linking ############## -OLD_ARTIFACT_TARGET="NetSurf-${OLD_IDENTIFIER}${PKG_SFX}" -ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" +ssh netsurf(a)ci.netsurf-browser.org "rm -f ${OLD_ARTIFACT_TARGETS} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-26-gef53336

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/ef5333672435c094c6088... ...commit http://git.netsurf-browser.org/netsurf.git/commit/ef5333672435c094c6088da... ...tree http://git.netsurf-browser.org/netsurf.git/tree/ef5333672435c094c6088da80... The branch, master has been updated via ef5333672435c094c6088da8052838b43020c66e (commit) from 7e08cf4352d41c372584db69fc59c928f63c324f (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=ef5333672435c094c60... commit ef5333672435c094c6088da8052838b43020c66e Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> update the deployment script to add sha and md5 checksums diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index d18cac3..be71d89 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -442,27 +442,29 @@ if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then exit 1 fi +# create package checksum files +md5sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 +sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha + ############ Package artifact deployment ################ #destination for package artifacts DESTDIR=/srv/ci.netsurf-browser.org/html/builds/${TARGET}/ -NEW_ARTIFACT_TARGET="NetSurf-${IDENTIFIER}${PKG_SFX}" - -# copy the file into the output - always use scp as it works local or remote -scp "${PKG_SRC}${PKG_SFX}" netsurf@ci.netsurf-browser.org:${DESTDIR}/${NEW_ARTIFACT_TARGET} - -# remove the local package file artifact -rm -f "${PKG_SRC}${PKG_SFX}" +NEW_ARTIFACT_TARGET="NetSurf-${IDENTIFIER}" -# setup latest link -ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}" > ${DESTDIR}/LATEST" +for SUFFIX in "${PKG_SFX}" .md5 .sha;do + # copy the file to the output - always use scp as it works local or remote + scp "${PKG_SRC}${SUFFIX}" netsurf@ci.netsurf-browser.org:${DESTDIR}/${NEW_ARTIFACT_TARGET}${SUFFIX} + # remove the local file artifact + rm -f "${PKG_SRC}${SUFFIX}" +done -############ Package artifact cleanup ################ +############ Expired package artifact removal and latest linking ############## OLD_ARTIFACT_TARGET="NetSurf-${OLD_IDENTIFIER}${PKG_SFX}" -ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET}" +ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" ----------------------------------------------------------------------- Summary of changes: utils/jenkins-build.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index d18cac3..be71d89 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -442,27 +442,29 @@ if [ ! -f "${PKG_SRC}${PKG_SFX}" ]; then exit 1 fi +# create package checksum files +md5sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.md5 +sha256sum "${PKG_SRC}${PKG_SFX}" > ${PKG_SRC}.sha + ############ Package artifact deployment ################ #destination for package artifacts DESTDIR=/srv/ci.netsurf-browser.org/html/builds/${TARGET}/ -NEW_ARTIFACT_TARGET="NetSurf-${IDENTIFIER}${PKG_SFX}" - -# copy the file into the output - always use scp as it works local or remote -scp "${PKG_SRC}${PKG_SFX}" netsurf@ci.netsurf-browser.org:${DESTDIR}/${NEW_ARTIFACT_TARGET} - -# remove the local package file artifact -rm -f "${PKG_SRC}${PKG_SFX}" +NEW_ARTIFACT_TARGET="NetSurf-${IDENTIFIER}" -# setup latest link -ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}" > ${DESTDIR}/LATEST" +for SUFFIX in "${PKG_SFX}" .md5 .sha;do + # copy the file to the output - always use scp as it works local or remote + scp "${PKG_SRC}${SUFFIX}" netsurf@ci.netsurf-browser.org:${DESTDIR}/${NEW_ARTIFACT_TARGET}${SUFFIX} + # remove the local file artifact + rm -f "${PKG_SRC}${SUFFIX}" +done -############ Package artifact cleanup ################ +############ Expired package artifact removal and latest linking ############## OLD_ARTIFACT_TARGET="NetSurf-${OLD_IDENTIFIER}${PKG_SFX}" -ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET}" +ssh netsurf(a)ci.netsurf-browser.org "rm -f ${DESTDIR}/${OLD_ARTIFACT_TARGET} ${DESTDIR}/LATEST && echo "${NEW_ARTIFACT_TARGET}${PKG_SFX}" > ${DESTDIR}/LATEST" -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-25-g7e08cf4

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7e08cf4352d41c372584d... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7e08cf4352d41c372584db6... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7e08cf4352d41c372584db69f... The branch, master has been updated via 7e08cf4352d41c372584db69fc59c928f63c324f (commit) from 4a24a14b09304272349c83c57b0d202193d30d4d (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=7e08cf4352d41c37258... commit 7e08cf4352d41c372584db69fc59c928f63c324f Author: Michael Drake <michael.drake(a)codethink.co.uk> Commit: Michael Drake <michael.drake(a)codethink.co.uk> Treeview: Fix designated struct initialisation. diff --git a/desktop/treeview.c b/desktop/treeview.c index 48422e8..3db90cc 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -4773,12 +4773,12 @@ treeview_mouse_action(treeview *tree, browser_mouse_state mouse, int x, int y) } else { /* On tree */ struct treeview_mouse_action ma = { - ma.tree = tree, - ma.mouse = mouse, - ma.x = x, - ma.y = y, - ma.current_y = search_height, - ma.search_height = search_height, + .tree = tree, + .mouse = mouse, + .x = x, + .y = y, + .current_y = search_height, + .search_height = search_height, }; treeview_walk_internal(tree, tree->root, ----------------------------------------------------------------------- Summary of changes: desktop/treeview.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/desktop/treeview.c b/desktop/treeview.c index 48422e8..3db90cc 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -4773,12 +4773,12 @@ treeview_mouse_action(treeview *tree, browser_mouse_state mouse, int x, int y) } else { /* On tree */ struct treeview_mouse_action ma = { - ma.tree = tree, - ma.mouse = mouse, - ma.x = x, - ma.y = y, - ma.current_y = search_height, - ma.search_height = search_height, + .tree = tree, + .mouse = mouse, + .x = x, + .y = y, + .current_y = search_height, + .search_height = search_height, }; treeview_walk_internal(tree, tree->root, -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

netsurf: branch master updated. release/3.8-24-g4a24a14

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/4a24a14b09304272349c8... ...commit http://git.netsurf-browser.org/netsurf.git/commit/4a24a14b09304272349c83c... ...tree http://git.netsurf-browser.org/netsurf.git/tree/4a24a14b09304272349c83c57... The branch, master has been updated via 4a24a14b09304272349c83c57b0d202193d30d4d (commit) from 7a61c957243f8f4fe4d8b89dc19e90aa98e98a25 (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=4a24a14b09304272349... commit 4a24a14b09304272349c83c57b0d202193d30d4d Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> ensure fedora gcc gives us all the version information diff --git a/Makefile b/Makefile index 064ae69..0b6388a 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,7 @@ else endif # compiler versioning to adjust warning flags -CC_VERSION := $(shell $(CC) -dumpversion) +CC_VERSION := $(shell $(CC) -dumpversion -dumpfullversion) CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION))) CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION))) define cc_ver_ge ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 064ae69..0b6388a 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,7 @@ else endif # compiler versioning to adjust warning flags -CC_VERSION := $(shell $(CC) -dumpversion) +CC_VERSION := $(shell $(CC) -dumpversion -dumpfullversion) CC_MAJOR := $(word 1,$(subst ., ,$(CC_VERSION))) CC_MINOR := $(word 2,$(subst ., ,$(CC_VERSION))) define cc_ver_ge -- NetSurf Browser

4 years, 5 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits October 2018