April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit kglobalaccel for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2016-04-01 13:01:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kglobalaccel" Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2016-03-16 10:29:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2016-04-01 13:01:16.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Mar 27 16:23:16 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Added 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch + +------------------------------------------------------------------- New: ---- 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.m5fGza/_old 2016-04-01 13:01:17.000000000 +0200 +++ /var/tmp/diff_new_pack.m5fGza/_new 2016-04-01 13:01:17.000000000 +0200 @@ -48,6 +48,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.t… Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch +Patch0: 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -105,6 +107,7 @@ %lang_package -n %lname %prep %setup -q +%patch0 -p1 rm -rf po/*/kglobalaccel5.po %build ++++++ 0001-Make-kglobalaccel5-properly-killable-fixing-super-sl.patch ++++++ >From 065fb2bab67d19e5a6aa831039f8bd155a28bd70 Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz <ahartmetz(a)gmail.com> Date: Sun, 27 Mar 2016 00:34:54 +0200 Subject: [PATCH 1/1] Make kglobalaccel5 properly killable, fixing super slow shutdown. One does not just catch signals in a multi-threaded (or really any nontrivial) application. At least since some time, Qt has separate threads for xcb and dbus. This signal catching business caused a deadlock in the main thread, which made kglobalaccel5 survive getting killed by... systemd? Now, when an unplanned signal arrives, just die like a normal process. But when shutting down orderly, actually try to save pending changes. On my Kubuntu 15.10, after an already slow logout, the shutdown splash screen would stay on for a minute or so while systemd didn't dare to shut down the computer - as I figured out, it was because kglobalaccel5 was the last process running from the previous session. So why did kglobalaccel5 not get killed by ksmserver? Apparently, due to some mess involving systemd, there are two session buses and two "unique" instances of kglobalaccel5. One of them is the one that survives. Of course, this also needs to be fixed. It might be just a local problem of mine, though. In any case, this change is also the right thing to do on its own. Also, disable fallback session management. It's just no good :) (This makes no difference for the observed bug.) (cherry picked from commit 9a8866c2a424a29ef06ee6ad594c92c62ac099c3) --- src/runtime/kglobalacceld.cpp | 7 ++++++- src/runtime/main.cpp | 16 ++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/runtime/kglobalacceld.cpp b/src/runtime/kglobalacceld.cpp index 3a55ffe..fbb0aa9 100644 --- a/src/runtime/kglobalacceld.cpp +++ b/src/runtime/kglobalacceld.cpp @@ -240,7 +240,12 @@ bool KGlobalAccelD::init() KGlobalAccelD::~KGlobalAccelD() { - GlobalShortcutsRegistry::self()->deactivateShortcuts(); + GlobalShortcutsRegistry *const reg = GlobalShortcutsRegistry::self(); + if (d->writeoutTimer.isActive()) { + d->writeoutTimer.stop(); + reg->writeSettings(); + } + reg->deactivateShortcuts(); delete d; } diff --git a/src/runtime/main.cpp b/src/runtime/main.cpp index 81dbde5..5264ad4 100644 --- a/src/runtime/main.cpp +++ b/src/runtime/main.cpp @@ -37,14 +37,6 @@ static bool isEnabled() return true; } - -static void sighandler(int /*sig*/) -{ - if (qApp) - qApp->quit(); -} - - extern "C" Q_DECL_EXPORT int main(int argc, char **argv) { // Disable Session Management the right way (C) @@ -78,12 +70,8 @@ extern "C" Q_DECL_EXPORT int main(int argc, char **argv) KDBusService service(KDBusService::Unique); app.setQuitOnLastWindowClosed( false ); - - // Stop gracefully - ::signal(SIGINT, sighandler); - ::signal(SIGTERM, sighandler); -#ifndef Q_OS_WIN - ::signal(SIGHUP, sighandler); +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 1) + QGuiApplication::setFallbackSessionManagementEnabled(false); #endif // Restart on a crash -- 2.6.2

1 0

commit http-parser for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package http-parser for openSUSE:Factory checked in at 2016-04-01 13:01:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/http-parser (Old) and /work/SRC/openSUSE:Factory/.http-parser.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "http-parser" Changes: -------- --- /work/SRC/openSUSE:Factory/http-parser/http-parser.changes 2016-02-07 09:22:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.http-parser.new/http-parser.changes 2016-04-01 13:01:11.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Mar 26 12:18:20 UTC 2016 - mpluskal(a)suse.com + +- Update to 2.6.2 + * No changelog available + +------------------------------------------------------------------- Old: ---- v2.6.0.tar.gz New: ---- v2.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ http-parser.spec ++++++ --- /var/tmp/diff_new_pack.5hYEbX/_old 2016-04-01 13:01:12.000000000 +0200 +++ /var/tmp/diff_new_pack.5hYEbX/_new 2016-04-01 13:01:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package http-parser # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,15 @@ # -Name: http-parser %define somajor suse0 -%define libname libhttp-parser-%somajor -Version: 2.6.0 +%define libname libhttp-parser-%{somajor} +Name: http-parser +Version: 2.6.2 Release: 0 Summary: HTTP request/response parser for C License: MIT Group: Development/Libraries/C and C++ -Url: http://github.com/joyent/http-parser +Url: https://github.com/joyent/http-parser Source0: https://github.com/joyent/http-parser/archive/v%{version}.tar.gz Source1: baselibs.conf Patch1: http-parser-gyp-sharedlib.patch @@ -85,12 +85,12 @@ install -pm644 http_parser.h %{buildroot}%{_includedir} #install regular variant -install "out/Release/lib.target/libhttp_parser.so.%somajor" "%buildroot/%_libdir/" -ln -sf "libhttp_parser.so.%somajor" "%buildroot/%_libdir/libhttp_parser.so" +install "out/Release/lib.target/libhttp_parser.so.%{somajor}" "%{buildroot}/%{_libdir}/" +ln -sf "libhttp_parser.so.%{somajor}" "%{buildroot}/%{_libdir}/libhttp_parser.so" #install strict variant -install "out/Release/lib.target/libhttp_parser_strict.so.%somajor" "%buildroot/%_libdir/" -ln -sf "libhttp_parser_strict.so.%somajor" "%buildroot/%_libdir/libhttp_parser_strict.so" +install "out/Release/lib.target/libhttp_parser_strict.so.%{somajor}" "%{buildroot}/%{_libdir}/" +ln -sf "libhttp_parser_strict.so.%{somajor}" "%{buildroot}/%{_libdir}/libhttp_parser_strict.so" %check export LD_LIBRARY_PATH='./out/Release/lib.target' @@ -98,7 +98,6 @@ ./out/Release/test-strict %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} ++++++ http-parser-gyp-sharedlib.patch ++++++ --- /var/tmp/diff_new_pack.5hYEbX/_old 2016-04-01 13:01:12.000000000 +0200 +++ /var/tmp/diff_new_pack.5hYEbX/_new 2016-04-01 13:01:12.000000000 +0200 @@ -12,10 +12,10 @@ http_parser.gyp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -Index: http-parser-2.5.0/http_parser.gyp +Index: http-parser-2.6.2/http_parser.gyp =================================================================== ---- http-parser-2.5.0.orig/http_parser.gyp -+++ http-parser-2.5.0/http_parser.gyp +--- http-parser-2.6.2.orig/http_parser.gyp ++++ http-parser-2.6.2/http_parser.gyp @@ -12,7 +12,7 @@ # RuntimeLibrary MUST MATCH across the entire project 'Debug': { ++++++ v2.6.0.tar.gz -> v2.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-parser-2.6.0/Makefile new/http-parser-2.6.2/Makefile --- old/http-parser-2.6.0/Makefile 2015-10-29 05:47:12.000000000 +0100 +++ new/http-parser-2.6.2/Makefile 2016-03-04 21:27:05.000000000 +0100 @@ -22,14 +22,14 @@ HELPER ?= BINEXT ?= ifeq (darwin,$(PLATFORM)) -SONAME ?= libhttp_parser.2.6.0.dylib +SONAME ?= libhttp_parser.2.6.2.dylib SOEXT ?= dylib else ifeq (wine,$(PLATFORM)) CC = winegcc BINEXT = .exe.so HELPER = wine else -SONAME ?= libhttp_parser.so.2.6.0 +SONAME ?= libhttp_parser.so.2.6.2 SOEXT ?= so endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-parser-2.6.0/README.md new/http-parser-2.6.2/README.md --- old/http-parser-2.6.0/README.md 2015-10-29 05:47:12.000000000 +0100 +++ new/http-parser-2.6.2/README.md 2016-03-04 21:27:05.000000000 +0100 @@ -1,7 +1,7 @@ HTTP Parser =========== -[![Build Status](https://travis-ci.org/joyent/http-parser.png?branch=master)](https:… +[![Build Status](https://api.travis-ci.org/nodejs/http-parser.svg?branch=master)](ht… This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in performance HTTP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-parser-2.6.0/http_parser.c new/http-parser-2.6.2/http_parser.c --- old/http-parser-2.6.0/http_parser.c 2015-10-29 05:47:12.000000000 +0100 +++ new/http-parser-2.6.2/http_parser.c 2016-03-04 21:27:05.000000000 +0100 @@ -123,7 +123,7 @@ FOR##_mark = NULL; \ } \ } while (0) - + /* Run the data callback FOR and consume the current byte */ #define CALLBACK_DATA(FOR) \ CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1) @@ -435,6 +435,12 @@ (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_') #endif +/** + * Verify that a char is a valid visible (printable) US-ASCII + * character or %x80-FF + **/ +#define IS_HEADER_CHAR(ch) \ + (ch == CR || ch == LF || ch == 9 || ((unsigned char)ch > 31 && ch != 127)) #define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res) @@ -639,6 +645,7 @@ const char *body_mark = 0; const char *status_mark = 0; enum state p_state = (enum state) parser->state; + const unsigned int lenient = parser->lenient_http_headers; /* We're in an error state. Don't bother doing anything. */ if (HTTP_PARSER_ERRNO(parser) != HPE_OK) { @@ -1000,89 +1007,40 @@ UPDATE_STATE(s_req_spaces_before_url); } else if (ch == matcher[parser->index]) { ; /* nada */ - } else if (parser->method == HTTP_CONNECT) { - if (parser->index == 1 && ch == 'H') { - parser->method = HTTP_CHECKOUT; - } else if (parser->index == 2 && ch == 'P') { - parser->method = HTTP_COPY; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - } else if (parser->method == HTTP_MKCOL) { - if (parser->index == 1 && ch == 'O') { - parser->method = HTTP_MOVE; - } else if (parser->index == 1 && ch == 'E') { - parser->method = HTTP_MERGE; - } else if (parser->index == 1 && ch == '-') { - parser->method = HTTP_MSEARCH; - } else if (parser->index == 2 && ch == 'A') { - parser->method = HTTP_MKACTIVITY; - } else if (parser->index == 3 && ch == 'A') { - parser->method = HTTP_MKCALENDAR; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - } else if (parser->method == HTTP_SUBSCRIBE) { - if (parser->index == 1 && ch == 'E') { - parser->method = HTTP_SEARCH; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - } else if (parser->method == HTTP_REPORT) { - if (parser->index == 2 && ch == 'B') { - parser->method = HTTP_REBIND; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - } else if (parser->index == 1) { - if (parser->method == HTTP_POST) { - if (ch == 'R') { - parser->method = HTTP_PROPFIND; /* or HTTP_PROPPATCH */ - } else if (ch == 'U') { - parser->method = HTTP_PUT; /* or HTTP_PURGE */ - } else if (ch == 'A') { - parser->method = HTTP_PATCH; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - } else if (parser->method == HTTP_LOCK) { - if (ch == 'I') { - parser->method = HTTP_LINK; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - } - } else if (parser->index == 2) { - if (parser->method == HTTP_PUT) { - if (ch == 'R') { - parser->method = HTTP_PURGE; - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; - } - } else if (parser->method == HTTP_UNLOCK) { - if (ch == 'S') { - parser->method = HTTP_UNSUBSCRIBE; - } else if(ch == 'B') { - parser->method = HTTP_UNBIND; - } else { + } else if (IS_ALPHA(ch)) { + + switch (parser->method << 16 | parser->index << 8 | ch) { +#define XX(meth, pos, ch, new_meth) \ + case (HTTP_##meth << 16 | pos << 8 | ch): \ + parser->method = HTTP_##new_meth; break; + + XX(POST, 1, 'U', PUT) + XX(POST, 1, 'A', PATCH) + XX(CONNECT, 1, 'H', CHECKOUT) + XX(CONNECT, 2, 'P', COPY) + XX(MKCOL, 1, 'O', MOVE) + XX(MKCOL, 1, 'E', MERGE) + XX(MKCOL, 2, 'A', MKACTIVITY) + XX(MKCOL, 3, 'A', MKCALENDAR) + XX(SUBSCRIBE, 1, 'E', SEARCH) + XX(REPORT, 2, 'B', REBIND) + XX(POST, 1, 'R', PROPFIND) + XX(PROPFIND, 4, 'P', PROPPATCH) + XX(PUT, 2, 'R', PURGE) + XX(LOCK, 1, 'I', LINK) + XX(UNLOCK, 2, 'S', UNSUBSCRIBE) + XX(UNLOCK, 2, 'B', UNBIND) + XX(UNLOCK, 3, 'I', UNLINK) +#undef XX + + default: SET_ERRNO(HPE_INVALID_METHOD); goto error; - } - } else { - SET_ERRNO(HPE_INVALID_METHOD); - goto error; } - } else if (parser->index == 4 && parser->method == HTTP_PROPFIND && ch == 'P') { - parser->method = HTTP_PROPPATCH; - } else if (parser->index == 3 && parser->method == HTTP_UNLOCK && ch == 'I') { - parser->method = HTTP_UNLINK; + } else if (ch == '-' && + parser->index == 1 && + parser->method == HTTP_MKCOL) { + parser->method = HTTP_MSEARCH; } else { SET_ERRNO(HPE_INVALID_METHOD); goto error; @@ -1408,7 +1366,12 @@ || c != CONTENT_LENGTH[parser->index]) { parser->header_state = h_general; } else if (parser->index == sizeof(CONTENT_LENGTH)-2) { + if (parser->flags & F_CONTENTLENGTH) { + SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH); + goto error; + } parser->header_state = h_content_length; + parser->flags |= F_CONTENTLENGTH; } break; @@ -1560,6 +1523,11 @@ REEXECUTE(); } + if (!lenient && !IS_HEADER_CHAR(ch)) { + SET_ERRNO(HPE_INVALID_HEADER_TOKEN); + goto error; + } + c = LOWER(ch); switch (h_state) { @@ -1727,7 +1695,10 @@ case s_header_almost_done: { - STRICT_CHECK(ch != LF); + if (UNLIKELY(ch != LF)) { + SET_ERRNO(HPE_LF_EXPECTED); + goto error; + } UPDATE_STATE(s_header_value_lws); break; @@ -1811,6 +1782,14 @@ REEXECUTE(); } + /* Cannot use chunked encoding and a content-length header together + per the HTTP specification. */ + if ((parser->flags & F_CHUNKED) && + (parser->flags & F_CONTENTLENGTH)) { + SET_ERRNO(HPE_UNEXPECTED_CONTENT_LENGTH); + goto error; + } + UPDATE_STATE(s_headers_done); /* Set this here so that on_headers_complete() callbacks can see it */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-parser-2.6.0/http_parser.h new/http-parser-2.6.2/http_parser.h --- old/http-parser-2.6.0/http_parser.h 2015-10-29 05:47:12.000000000 +0100 +++ new/http-parser-2.6.2/http_parser.h 2016-03-04 21:27:05.000000000 +0100 @@ -27,7 +27,7 @@ /* Also update SONAME in the Makefile whenever you change these. */ #define HTTP_PARSER_VERSION_MAJOR 2 #define HTTP_PARSER_VERSION_MINOR 6 -#define HTTP_PARSER_VERSION_PATCH 0 +#define HTTP_PARSER_VERSION_PATCH 2 #include <sys/types.h> #if defined(_WIN32) && !defined(__MINGW32__) && \ @@ -148,6 +148,7 @@ , F_TRAILING = 1 << 4 , F_UPGRADE = 1 << 5 , F_SKIPBODY = 1 << 6 + , F_CONTENTLENGTH = 1 << 7 }; @@ -190,6 +191,8 @@ XX(INVALID_HEADER_TOKEN, "invalid character in header") \ XX(INVALID_CONTENT_LENGTH, \ "invalid character in content-length header") \ + XX(UNEXPECTED_CONTENT_LENGTH, \ + "unexpected content-length header") \ XX(INVALID_CHUNK_SIZE, \ "invalid character in chunk size header") \ XX(INVALID_CONSTANT, "invalid constant string") \ @@ -214,10 +217,11 @@ struct http_parser { /** PRIVATE **/ unsigned int type : 2; /* enum http_parser_type */ - unsigned int flags : 7; /* F_* values from 'flags' enum; semi-public */ + unsigned int flags : 8; /* F_* values from 'flags' enum; semi-public */ unsigned int state : 7; /* enum state from http_parser.c */ - unsigned int header_state : 8; /* enum header_state from http_parser.c */ - unsigned int index : 8; /* index into current matcher */ + unsigned int header_state : 7; /* enum header_state from http_parser.c */ + unsigned int index : 7; /* index into current matcher */ + unsigned int lenient_http_headers : 1; uint32_t nread; /* # bytes read in various scenarios */ uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-parser-2.6.0/test.c new/http-parser-2.6.2/test.c --- old/http-parser-2.6.0/test.c 2015-10-29 05:47:12.000000000 +0100 +++ new/http-parser-2.6.2/test.c 2016-03-04 21:27:05.000000000 +0100 @@ -2444,7 +2444,7 @@ va_list ap; size_t i; size_t off = 0; - + va_start(ap, nmsgs); for (i = 0; i < nmsgs; i++) { @@ -3271,6 +3271,155 @@ } void +test_invalid_header_content (int req, const char* str) +{ + http_parser parser; + http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE); + size_t parsed; + const char *buf; + buf = req ? + "GET / HTTP/1.1\r\n" : + "HTTP/1.1 200 OK\r\n"; + parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf)); + assert(parsed == strlen(buf)); + + buf = str; + size_t buflen = strlen(buf); + + parsed = http_parser_execute(&parser, &settings_null, buf, buflen); + if (parsed != buflen) { + assert(HTTP_PARSER_ERRNO(&parser) == HPE_INVALID_HEADER_TOKEN); + return; + } + + fprintf(stderr, + "\n*** Error expected but none in invalid header content test ***\n"); + abort(); +} + +void +test_invalid_header_field_content_error (int req) +{ + test_invalid_header_content(req, "Foo: F\01ailure"); + test_invalid_header_content(req, "Foo: B\02ar"); +} + +void +test_invalid_header_field (int req, const char* str) +{ + http_parser parser; + http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE); + size_t parsed; + const char *buf; + buf = req ? + "GET / HTTP/1.1\r\n" : + "HTTP/1.1 200 OK\r\n"; + parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf)); + assert(parsed == strlen(buf)); + + buf = str; + size_t buflen = strlen(buf); + + parsed = http_parser_execute(&parser, &settings_null, buf, buflen); + if (parsed != buflen) { + assert(HTTP_PARSER_ERRNO(&parser) == HPE_INVALID_HEADER_TOKEN); + return; + } + + fprintf(stderr, + "\n*** Error expected but none in invalid header token test ***\n"); + abort(); +} + +void +test_invalid_header_field_token_error (int req) +{ + test_invalid_header_field(req, "Fo@: Failure"); + test_invalid_header_field(req, "Foo\01\test: Bar"); +} + +void +test_double_content_length_error (int req) +{ + http_parser parser; + http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE); + size_t parsed; + const char *buf; + buf = req ? + "GET / HTTP/1.1\r\n" : + "HTTP/1.1 200 OK\r\n"; + parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf)); + assert(parsed == strlen(buf)); + + buf = "Content-Length: 0\r\nContent-Length: 1\r\n\r\n"; + size_t buflen = strlen(buf); + + parsed = http_parser_execute(&parser, &settings_null, buf, buflen); + if (parsed != buflen) { + assert(HTTP_PARSER_ERRNO(&parser) == HPE_UNEXPECTED_CONTENT_LENGTH); + return; + } + + fprintf(stderr, + "\n*** Error expected but none in double content-length test ***\n"); + abort(); +} + +void +test_chunked_content_length_error (int req) +{ + http_parser parser; + http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE); + size_t parsed; + const char *buf; + buf = req ? + "GET / HTTP/1.1\r\n" : + "HTTP/1.1 200 OK\r\n"; + parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf)); + assert(parsed == strlen(buf)); + + buf = "Transfer-Encoding: chunked\r\nContent-Length: 1\r\n\r\n"; + size_t buflen = strlen(buf); + + parsed = http_parser_execute(&parser, &settings_null, buf, buflen); + if (parsed != buflen) { + assert(HTTP_PARSER_ERRNO(&parser) == HPE_UNEXPECTED_CONTENT_LENGTH); + return; + } + + fprintf(stderr, + "\n*** Error expected but none in chunked content-length test ***\n"); + abort(); +} + +void +test_header_cr_no_lf_error (int req) +{ + http_parser parser; + http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE); + size_t parsed; + const char *buf; + buf = req ? + "GET / HTTP/1.1\r\n" : + "HTTP/1.1 200 OK\r\n"; + parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf)); + assert(parsed == strlen(buf)); + + buf = "Foo: 1\rBar: 1\r\n\r\n"; + size_t buflen = strlen(buf); + + parsed = http_parser_execute(&parser, &settings_null, buf, buflen); + if (parsed != buflen) { + assert(HTTP_PARSER_ERRNO(&parser) == HPE_LF_EXPECTED); + return; + } + + fprintf(stderr, + "\n*** Error expected but none in header whitespace test ***\n"); + abort(); +} + +void test_header_overflow_error (int req) { http_parser parser; @@ -3696,6 +3845,18 @@ test_header_content_length_overflow_error(); test_chunk_content_length_overflow_error(); + //// HEADER FIELD CONDITIONS + test_double_content_length_error(HTTP_REQUEST); + test_chunked_content_length_error(HTTP_REQUEST); + test_header_cr_no_lf_error(HTTP_REQUEST); + test_invalid_header_field_token_error(HTTP_REQUEST); + test_invalid_header_field_content_error(HTTP_REQUEST); + test_double_content_length_error(HTTP_RESPONSE); + test_chunked_content_length_error(HTTP_RESPONSE); + test_header_cr_no_lf_error(HTTP_RESPONSE); + test_invalid_header_field_token_error(HTTP_RESPONSE); + test_invalid_header_field_content_error(HTTP_RESPONSE); + //// RESPONSES for (i = 0; i < response_count; i++) { @@ -3772,6 +3933,11 @@ test_simple("GET / HTP/1.1\r\n\r\n", HPE_INVALID_VERSION); + // Extended characters - see nodejs/test/parallel/test-http-headers-obstext.js + test_simple("GET / HTTP/1.1\r\n" + "Test: Düsseldorf\r\n", + HPE_OK); + // Well-formed but incomplete test_simple("GET / HTTP/1.1\r\n" "Content-Type: text/plain\r\n"

1 0

commit ktexteditor for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package ktexteditor for openSUSE:Factory checked in at 2016-04-01 13:01:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktexteditor (Old) and /work/SRC/openSUSE:Factory/.ktexteditor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ktexteditor" Changes: -------- --- /work/SRC/openSUSE:Factory/ktexteditor/ktexteditor.changes 2016-03-16 10:31:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktexteditor.new/ktexteditor.changes 2016-04-01 13:01:05.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Mar 27 14:50:45 UTC 2016 - hrvoje.senjan(a)gmail.com + +- Added 0001-Fix-Clazy-fix-mistake-that-broke-selection-handling-.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-Clazy-fix-mistake-that-broke-selection-handling-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktexteditor.spec ++++++ --- /var/tmp/diff_new_pack.AqznJ2/_old 2016-04-01 13:01:06.000000000 +0200 +++ /var/tmp/diff_new_pack.AqznJ2/_new 2016-04-01 13:01:06.000000000 +0200 @@ -53,6 +53,8 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.t… Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Fix-Clazy-fix-mistake-that-broke-selection-handling-.patch +Patch0: 0001-Fix-Clazy-fix-mistake-that-broke-selection-handling-.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,6 +76,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -DSYSCONF_INSTALL_DIR=%{_kf5_sysconfdir} ++++++ 0001-Fix-Clazy-fix-mistake-that-broke-selection-handling-.patch ++++++ >From 860cb9763c507be2e9202fd4e94116dfb1402566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A5re=20S=C3=A4rs?= <kare.sars(a)iki.fi> Date: Fri, 25 Mar 2016 23:32:28 +0200 Subject: [PATCH 1/1] Fix "Clazy fix" mistake that broke selection handling/layout cache Among the Clazy warning fixes, was one "count() -> !isEmpty()" that should not have been there in katelayoutcache.cpp CCMAIL: kwrite-devel(a)kde.org (cherry picked from commit f7f330b21aa394a62ac95ea9bee075f372ff6d9c) --- src/render/katelayoutcache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render/katelayoutcache.cpp b/src/render/katelayoutcache.cpp index 33781fe..3eb268f 100644 --- a/src/render/katelayoutcache.cpp +++ b/src/render/katelayoutcache.cpp @@ -165,7 +165,7 @@ void KateLayoutCache::updateViewCache(const KTextEditor::Cursor &startPos, int n { //qCDebug(LOG_KTE) << startPos << " nvlc " << newViewLineCount << " vls " << viewLinesScrolled; - int oldViewLineCount = !m_textLayouts.isEmpty(); + int oldViewLineCount = m_textLayouts.count(); if (newViewLineCount == -1) { newViewLineCount = oldViewLineCount; } -- 2.6.2

1 0

commit dolphin for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package dolphin for openSUSE:Factory checked in at 2016-04-01 13:00:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dolphin (Old) and /work/SRC/openSUSE:Factory/.dolphin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dolphin" Changes: -------- --- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes 2016-03-26 15:12:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dolphin.new/dolphin.changes 2016-04-01 13:00:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 25 16:37:37 UTC 2016 - wbauer(a)tmo.at + +- Added Fix-wrong-path-URL-conversion.patch: fixes display of + additional file metadata in dolphin's filelist for indexed files + (boo#970896) + +------------------------------------------------------------------- New: ---- Fix-wrong-path-URL-conversion.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dolphin.spec ++++++ --- /var/tmp/diff_new_pack.PTpO5b/_old 2016-04-01 13:00:58.000000000 +0200 +++ /var/tmp/diff_new_pack.PTpO5b/_new 2016-04-01 13:00:58.000000000 +0200 @@ -26,6 +26,8 @@ Source: dolphin-%{version}.tar.xz Source1: dolphinsu.desktop Patch0: dolphin-go_up.diff +# PATCH-FIX-UPSTREAM Fix-wrong-path-URL-conversion.patch boo#970896 -- fixes display of additional file metadata in dolphin's filelist +Patch1: Fix-wrong-path-URL-conversion.patch BuildRequires: baloo5-devel BuildRequires: baloo5-widgets-devel BuildRequires: extra-cmake-modules >= 1.6.0 @@ -94,6 +96,7 @@ %prep %setup -q -n dolphin-%{version} %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build ++++++ Fix-wrong-path-URL-conversion.patch ++++++ From: David Faure <faure(a)kde.org> Date: Sat, 28 Nov 2015 22:44:47 +0000 Subject: Fix wrong path->URL conversion. X-Git-Tag: v16.03.80 X-Git-Url: http://quickgit.kde.org/?p=dolphin.git&a=commitdiff&h=35b35d0c5f62641a68528… --- Fix wrong path->URL conversion. --- --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -717,7 +717,13 @@ // the corresponding file has been deleted in the meantime. return; } - + applyChangedBalooRolesForItem(item); +#endif +} + +void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &item) +{ +#ifdef HAVE_BALOO Baloo::File file(item.localPath()); file.load(); @@ -1089,7 +1095,7 @@ #ifdef HAVE_BALOO if (m_balooFileMonitor) { m_balooFileMonitor->addFile(item.localPath()); - applyChangedBalooRoles(item.localPath()); + applyChangedBalooRolesForItem(item); } #endif return data; --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -211,6 +211,7 @@ void resolveRecentlyChangedItems(); void applyChangedBalooRoles(const QString& file); + void applyChangedBalooRolesForItem(const KFileItem& file); void slotDirectoryContentsCountReceived(const QString& path, int count);

1 0

commit syslinux for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at 2016-04-01 13:00:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslinux (Old) and /work/SRC/openSUSE:Factory/.syslinux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "syslinux" Changes: -------- --- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes 2016-02-17 12:25:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2016-04-01 13:00:52.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Mar 16 13:56:48 CET 2016 - snwint(a)suse.de + +- syslinux-4.04-align.diff: fix section alignment (bsc#948445) + +------------------------------------------------------------------- +Tue Feb 16 09:41:32 CET 2016 - snwint(a)suse.de + +- create also s390x package (bsc#964471) + +------------------------------------------------------------------- New: ---- baselibs.conf syslinux-4.04-align.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslinux.spec ++++++ --- /var/tmp/diff_new_pack.zHmSJh/_old 2016-04-01 13:00:53.000000000 +0200 +++ /var/tmp/diff_new_pack.zHmSJh/_new 2016-04-01 13:00:53.000000000 +0200 @@ -37,6 +37,7 @@ Source: https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar… Source1: isolinux-config Source2: README.gfxboot +Source3: baselibs.conf Patch0: %{name}-%{version}-iso9660.diff Patch1: %{name}-%{version}-cwd.diff Patch2: %{name}-%{version}-noinitrd.diff @@ -54,6 +55,7 @@ Patch15: %{name}-%{version}-cache_fix.diff Patch16: %{name}-%{version}-mtime.diff Patch17: %{name}-%{version}-miniacc.diff +Patch18: %{name}-%{version}-align.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -87,6 +89,7 @@ %patch15 -p1 %patch16 -p1 %patch17 +%patch18 %build cp %{SOURCE2} . ++++++ baselibs.conf ++++++ arch x86_64 targets s390x:64bit targetname <name>-x86_64 arch x86_64 package syslinux conflicts "syslinux" +.* -/usr/bin/syslinux -/usr/bin/extlinux -/usr/bin/gethostip -/usr/bin/isohybrid -/usr/bin/memdiskfind ++++++ syslinux-4.04-align.diff ++++++ --- core/syslinux.ld +++ core/syslinux.ld @@ -263,7 +263,7 @@ __text_end = .; } - . = ALIGN(16); + . = ALIGN(32); __rodata_vma = .; __rodata_lma = __rodata_vma + __text_lma - __text_vma;

1 0