From b620fb1b0929ff9657a2588aaa42b85e3021c102 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 20 Oct 2017 17:35:36 +0100 Subject: gentoo resync : 20.10.2017 --- app-admin/augeas/Manifest | 6 - app-admin/augeas/files/augeas-0.10.0-gets.patch | 15 -- .../files/augeas-0.10.0-libxml2-pkgconfig.patch | 24 ---- app-admin/augeas/files/augeas-0.10.0-test.patch | 56 -------- app-admin/augeas/files/augeas-0.10.0-test2.patch | 49 ------- app-admin/augeas/files/cve-2017-7555.patch | 159 --------------------- .../augeas/files/cve-bunch-of-them-symlink.patch | 76 ---------- app-admin/keepassxc/Manifest | 2 +- app-admin/keepassxc/keepassxc-2.1.4-r1.ebuild | 2 + 9 files changed, 3 insertions(+), 386 deletions(-) delete mode 100644 app-admin/augeas/files/augeas-0.10.0-gets.patch delete mode 100644 app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch delete mode 100644 app-admin/augeas/files/augeas-0.10.0-test.patch delete mode 100644 app-admin/augeas/files/augeas-0.10.0-test2.patch delete mode 100644 app-admin/augeas/files/cve-2017-7555.patch delete mode 100644 app-admin/augeas/files/cve-bunch-of-them-symlink.patch (limited to 'app-admin') diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest index 705a9d1b1fe5..5d0179960ae3 100644 --- a/app-admin/augeas/Manifest +++ b/app-admin/augeas/Manifest @@ -1,9 +1,3 @@ -AUX augeas-0.10.0-gets.patch 548 SHA256 10b57fbb769625d8677bf07f400cf94589b15a2f5244fad35b4b18a36dbca58c SHA512 cde05c4905613be475a051aab93f7bf9d5733c44e6d946a82ae39423dd51f21c98485e41a000dd54c750b3c4fcb1cf6b64237ebd708bbc91d0d37c10f346ec21 WHIRLPOOL 974cd4e4993ec13334c06fdea8afb173d8cdb921de306184507e196bc227803c331a9ae0c3e7a99234c86b80e939d2ee900a041421f6d7bc29a1173c0649efbb -AUX augeas-0.10.0-libxml2-pkgconfig.patch 635 SHA256 ee4aea080eca0e1de6b93fc7ffc9e4105bafc9625f67d77e3490ab43f58463db SHA512 69d8398e0a6dce8959af0a83ab3e3767be1a9c5dda9b3ba03e6305a79b05df04652f76ff087dd5e82a2d46af9d042df0937b2ec885ca39ca2a05ad4df1fb84be WHIRLPOOL 7db91af93c5bf6b62a0ba808a2f01325e93e5719a58ab8591da2f035001544907c56047151641973c9a542d3e04cbc67de1c2794abfa000b58c54c27889c1669 -AUX augeas-0.10.0-test.patch 1991 SHA256 42fcbbc1c8dbbe5c5ac3d1e04bbcb3eccce460de491dad4f8142f35f6fdaf33b SHA512 42e1c1b9024aab5f6d425c9fe421a3d5a81fd2e47908ad489aa8ea5044006b6c664810c9f8a12ad355217d4614b653f2a34000cafa8985ddc42632306cfb04a8 WHIRLPOOL 2ed6d9c3537eea7e3de425fc1084ac1b803c4ddf19d9fee7e26ea3796dac43d623a1a6d9f6487537fcf33e242bd35e2e4018ede2b9ddb5d24c24373e079c0455 -AUX augeas-0.10.0-test2.patch 1713 SHA256 d8efe22028a65fc5346742fde4bf27550db06c43a030da83f7c2eada54cc0b0e SHA512 8c8b5d0e1d182a30db1cbb1c61a7594109e569dcb280433314eac4879ee6fc10bb415ecec1d10f7b0e85e5b0c1703774a16b9d4662e2b6c18767d94f37d60eb2 WHIRLPOOL 889923e71151c24b2742307bdead8bfa2c49f70689567028bb9b204c98883510ce046d432f9e7893f58db968d6c239f408b1c0fbca18eb7fdced898393a592dc -AUX cve-2017-7555.patch 5771 SHA256 c82638220c1136000539db1e084abf10efd0d41e0d02a226e6b6bb8f5bbcce6e SHA512 209364d6d8af5b755f8675b2eff8fa8e240ec364fc97e7a4644f320aad94f64600120d3da7d67a7a4f243acace4a41d13b1dbccfbe0c2021853adb7f3949c8b4 WHIRLPOOL 7714fa4be323f5ff7c8b50fedb48c95bd9f10f2ad26d0480ff2a73eaa3785e206963cc3e44c2ba1207a6e05ddc18a85bd65ca68bc40ec5108510c5ed7f64a74d -AUX cve-bunch-of-them-symlink.patch 2415 SHA256 4db27194c976fedec981d8db6129422ad03456d80026d4a707b7ebcf74af072e SHA512 a702cce3f448cef9ce42e56d3ce7e6ceb8c5054031e6b1a9465639b4462ab4c7427f826a2783e12e4dc90f2bc6896f473ffc0e4d8d37e6d55cdb0192315eddb1 WHIRLPOOL 2791834ba2eed688451983c4a2544198e81d1fdf16cd6a9fde811cbb075643e0b534006e06561c6125543db1dc00731bc297330c91e1e4dc0367318e96c2a188 DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0 DIST augeas-1.9.0.tar.gz 2199534 SHA256 2b463d398cabc9b42747aa61d3e83ed6a93ce03d9074cf8e7a7bd3107a668343 SHA512 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171 WHIRLPOOL 226262afff83c9e3421928b24d0ca067b9971f353d152a5de6fd74d8bdf30259acf63881fe761d4c538f36865c8dcd6679583c12649e2c4545374e30a226b568 EBUILD augeas-1.8.1.ebuild 1000 SHA256 6a112f872b20c583f7cf1d7acd019f9918a057af2c4f937b69ce5d40506e399e SHA512 47871941fbcb08efce33560c5e8d857fef6e2dff1cdde7c31af6b205517af837840b83664fde9b6943b5ee3c3a367a7709c603b9409397cb79d7f879fedde1a0 WHIRLPOOL 95be95ed87eebccabb97abef577d88ab1fc0db4cb3e807b8bf8a7e8dc0fff80cc59a68c8150a4601060d36f6ced58adbd70cfb18ea552975e59ca30d05556993 diff --git a/app-admin/augeas/files/augeas-0.10.0-gets.patch b/app-admin/augeas/files/augeas-0.10.0-gets.patch deleted file mode 100644 index 5f754955be6c..000000000000 --- a/app-admin/augeas/files/augeas-0.10.0-gets.patch +++ /dev/null @@ -1,15 +0,0 @@ - gnulib/lib/stdio.in.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gnulib/lib/stdio.in.h b/gnulib/lib/stdio.in.h -index 9091497..fa7e3fb 100644 ---- a/gnulib/lib/stdio.in.h -+++ b/gnulib/lib/stdio.in.h -@@ -162,7 +162,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ - #undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch b/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch deleted file mode 100644 index aaa418670154..000000000000 --- a/app-admin/augeas/files/augeas-0.10.0-libxml2-pkgconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b41deef293841da50a236023bad486ea3f57e4dc Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Sat, 3 Dec 2011 14:21:50 +0000 -Subject: [PATCH] pkg-config: Augeas requires libxml2. - ---- - augeas.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/augeas.pc.in b/augeas.pc.in -index c97847d..9e166db 100644 ---- a/augeas.pc.in -+++ b/augeas.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: augeas - Version: @VERSION@ - Description: Augeas configuration editing library --Requires: -+Requires.private: libxml-2.0 - Libs: -L${libdir} -laugeas @LIBS@ - Cflags: -I${includedir} --- -1.7.6 - diff --git a/app-admin/augeas/files/augeas-0.10.0-test.patch b/app-admin/augeas/files/augeas-0.10.0-test.patch deleted file mode 100644 index e2630014f29a..000000000000 --- a/app-admin/augeas/files/augeas-0.10.0-test.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 075f8d35497fb36d9193e5364c055049c66fa5eb Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Mon, 9 Jan 2012 18:52:11 +0100 -Subject: [PATCH 1/2] Allow JSON number literals to be followed by whitespace - -Add a test case. - -Fixes https://fedorahosted.org/augeas/ticket/247 ---- - AUTHORS | 1 + - lenses/json.aug | 2 +- - lenses/tests/test_json.aug | 3 +++ - 3 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/AUTHORS b/AUTHORS -index df63f95..e7870f2 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -44,6 +44,7 @@ Contributions by: - Bill Pemberton - Alan Pevec - Robin Lee Powell -+ Lubomir Rintel - Roman Rakus - Satoru SATOH - Nicolas Valcárcel Scerpella -diff --git a/lenses/json.aug b/lenses/json.aug -index c22ad90..6ceab09 100644 ---- a/lenses/json.aug -+++ b/lenses/json.aug -@@ -29,7 +29,7 @@ let str_store = - let q = del "\"" "\"" in - q . store /[^"]*/ . q . ws (* " Emacs, relax *) - --let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ ] -+let number = [ label "number" . store /-?[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?/ . ws ] - let str = [ label "string" . str_store ] - - let const (r:regexp) = [ label "const" . store r . ws ] -diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug -index 0bcd25d..d8b7fa8 100644 ---- a/lenses/tests/test_json.aug -+++ b/lenses/tests/test_json.aug -@@ -8,6 +8,9 @@ test lns get "true" = { "const" = "true" } - - test lns get "3.141" = { "number" = "3.141" } - -+test lns get "{ \"key\" : 666 }" = -+ { "dict" { "entry" = "key" { "number" = "666" } } } -+ - test lns get "[true, 0, \"yo\"]" = - { "array" { "const" = "true" } { "number" = "0" } { "string" = "yo" } } - --- -1.7.7.5 - diff --git a/app-admin/augeas/files/augeas-0.10.0-test2.patch b/app-admin/augeas/files/augeas-0.10.0-test2.patch deleted file mode 100644 index 743ccfdce1fc..000000000000 --- a/app-admin/augeas/files/augeas-0.10.0-test2.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 100a7b38222a63c6435a72b4974b55f39a28989e Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Mon, 9 Jan 2012 19:24:41 +0100 -Subject: [PATCH 2/2] Correctly parse empty object and arrays in JSON - -Add a test case. -Fix from David Lutterkort . - -https://fedorahosted.org/augeas/ticket/248 ---- - lenses/json.aug | 4 ++-- - lenses/tests/test_json.aug | 5 +++++ - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/lenses/json.aug b/lenses/json.aug -index 6ceab09..2645806 100644 ---- a/lenses/json.aug -+++ b/lenses/json.aug -@@ -37,9 +37,9 @@ let const (r:regexp) = [ label "const" . store r . ws ] - let value0 = str | number | const /true|false|null/ - - let fix_value (value:lens) = -- let array = [ label "array" . lbrack . Build.opt_list value comma . rbrack ] in -+ let array = [ label "array" . lbrack . (Build.opt_list value comma)? . rbrack ] in - let pair = [ label "entry" . str_store . colon . value ] in -- let obj = [ label "dict" . lbrace . Build.opt_list pair comma . rbrace ] in -+ let obj = [ label "dict" . lbrace . (Build.opt_list pair comma)? . rbrace ] in - (str | number | obj | array | const /true|false|null/) - - (* Typecheck finitely deep nesting *) -diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug -index d8b7fa8..aec7d4c 100644 ---- a/lenses/tests/test_json.aug -+++ b/lenses/tests/test_json.aug -@@ -30,6 +30,11 @@ test lns get "{ \"0\": true, \"1\":false }" = - test lns get "{\"menu\": \"entry one\"}" = - { "dict" { "entry" = "menu" { "string" = "entry one" } } } - -+test lns get "[ ]" = -+ { "array" } -+ -+test lns get "{}" = -+ { "dict" } - - let s = "{\"menu\": { - \"id\": \"file\", --- -1.7.7.5 - diff --git a/app-admin/augeas/files/cve-2017-7555.patch b/app-admin/augeas/files/cve-2017-7555.patch deleted file mode 100644 index aaacdc2674c0..000000000000 --- a/app-admin/augeas/files/cve-2017-7555.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 4cca923b732990bec0c699b2e69911c2221b2498 Mon Sep 17 00:00:00 2001 -From: David Lutterkort -Date: Fri, 4 Aug 2017 17:13:52 -0700 -Subject: [PATCH] * src/pathx.c (parse_name): correctly handle trailing - whitespace in names - -When a name ended in whitespace, we incorrectly assumed it was always ok to -trim that whitespace. That is not true if that whitespace is escaped, -i.e. if the path expression is something like '/x\ '. In that case, the -name really needs to be literally 'x ', i.e., we can not trim that -whitespace. - -The incorrect behavior led to turning '/x\ ' first into 'x\' and then, -because we assume that '\' is always followed by a character inside the -string, when we removed the escaping '\', we would read beyond the end of -the intermediate string result; if we were lucky, that would lead to a -crash, otherwise we'd continue with junk. - -We now make sure that escaped whitespace at the end of a string does not -get stripped, avoiding all these headaches. - -Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621 ---- - src/pathx.c | 27 +++++++++++++++++++------ - tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 80 insertions(+), 6 deletions(-) - -diff --git a/src/pathx.c b/src/pathx.c -index d292cb30..9a2f9c76 100644 ---- a/src/pathx.c -+++ b/src/pathx.c -@@ -1710,6 +1710,16 @@ int pathx_escape_name(const char *in, char **out) { - return 0; - } - -+/* Return true if POS is preceded by an odd number of backslashes, i.e., if -+ * POS is escaped. Stop the search when we get to START */ -+static bool backslash_escaped(const char *pos, const char *start) { -+ bool result=false; -+ while (pos-- > start && *pos == '\\') { -+ result = !result; -+ } -+ return result; -+} -+ - /* - * NameNoWS ::= [^][|/\= \t\n] | \\. - * NameWS ::= [^][|/\=] | \\. -@@ -1719,11 +1729,14 @@ static char *parse_name(struct state *state) { - const char *s = state->pos; - char *result; - -+ /* Advance state->pos until it points to the first character that is -+ * not part of a name. */ - while (*state->pos != '\0' && strchr(name_follow, *state->pos) == NULL) { -- /* This is a hack: since we allow spaces in names, we need to avoid -- * gobbling up stuff that is in follow(Name), e.g. 'or' so that -- * things like [name1 or name2] still work. -- */ -+ /* Since we allow spaces in names, we need to avoid gobbling up -+ * stuff that is in follow(Name), e.g. 'or' so that things like -+ * [name1 or name2] still work. In other words, we'll parse 'x frob -+ * y' as one name, but for 'x or y', we consider 'x' a name in its -+ * own right. */ - if (STREQLEN(state->pos, " or ", strlen(" or ")) || - STREQLEN(state->pos, " and ", strlen(" and "))) - break; -@@ -1738,10 +1751,12 @@ static char *parse_name(struct state *state) { - state->pos += 1; - } - -- /* Strip trailing white space */ -+ /* Strip trailing white space. Make sure we respect escaped whitespace -+ * and don't strip it as in "x\\ " */ - if (state->pos > s) { - state->pos -= 1; -- while (isspace(*state->pos) && state->pos >= s) -+ while (isspace(*state->pos) && state->pos > s -+ && !backslash_escaped(state->pos, s)) - state->pos -= 1; - state->pos += 1; - } -diff --git a/tests/test-xpath.c b/tests/test-xpath.c -index 3e418e5f..82986474 100644 ---- a/tests/test-xpath.c -+++ b/tests/test-xpath.c -@@ -355,6 +355,62 @@ static int test_wrong_regexp_flag(struct augeas *aug) { - return -1; - } - -+static int test_trailing_ws_in_name(struct augeas *aug) { -+ int r; -+ -+ printf("%-30s ... ", "trailing_ws_in_name"); -+ -+ /* We used to incorrectly lop escaped whitespace off the end of a -+ * name. Make sure that we really create a tree node with label 'x ' -+ * with the below set, and look for it in a number of ways to ensure we -+ * are not lopping off trailing whitespace. */ -+ r = aug_set(aug, "/ws\\ ", "1"); -+ if (r < 0) { -+ fprintf(stderr, "failed to set '/ws ': %d\n", r); -+ goto fail; -+ } -+ /* We did not create a node with label 'ws' */ -+ r = aug_get(aug, "/ws", NULL); -+ if (r != 0) { -+ fprintf(stderr, "created '/ws' instead: %d\n", r); -+ goto fail; -+ } -+ -+ /* We did not create a node with label 'ws\t' (this also checks that we -+ * don't create something like 'ws\\' by dropping the last whitespace -+ * character. */ -+ r = aug_get(aug, "/ws\\\t", NULL); -+ if (r != 0) { -+ fprintf(stderr, "found '/ws\\t': %d\n", r); -+ goto fail; -+ } -+ -+ /* But we did create 'ws ' */ -+ r = aug_get(aug, "/ws\\ ", NULL); -+ if (r != 1) { -+ fprintf(stderr, "could not find '/ws ': %d\n", r); -+ goto fail; -+ } -+ -+ /* If the whitespace is preceded by an even number of '\\' chars, -+ * whitespace must be stripped */ -+ r = aug_set(aug, "/nows\\\\ ", "1"); -+ if (r < 0) { -+ fprintf(stderr, "set of '/nows' failed: %d\n", r); -+ goto fail; -+ } -+ r = aug_get(aug, "/nows\\\\", NULL); -+ if (r != 1) { -+ fprintf(stderr, "could not get '/nows\\'\n"); -+ goto fail; -+ } -+ printf("PASS\n"); -+ return 0; -+ fail: -+ printf("FAIL\n"); -+ return -1; -+} -+ - static int run_tests(struct test *tests, int argc, char **argv) { - char *lensdir; - struct augeas *aug = NULL; -@@ -398,6 +454,9 @@ static int run_tests(struct test *tests, int argc, char **argv) { - - if (test_wrong_regexp_flag(aug) < 0) - result = EXIT_FAILURE; -+ -+ if (test_trailing_ws_in_name(aug) < 0) -+ result = EXIT_FAILURE; - } - aug_close(aug); - free(lensdir); diff --git a/app-admin/augeas/files/cve-bunch-of-them-symlink.patch b/app-admin/augeas/files/cve-bunch-of-them-symlink.patch deleted file mode 100644 index 3bd1d95ae42d..000000000000 --- a/app-admin/augeas/files/cve-bunch-of-them-symlink.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 051c73a9a7ffe9e525f6f0a1b8f5198ff8cc6752 Mon Sep 17 00:00:00 2001 -From: Dominic Cleal -Date: Sat, 11 Aug 2012 20:39:14 +0100 -Subject: [PATCH] Fix regression in permissions of created files - -Commit 16387744 changed temporary file creation to use mkstemp, resulting in -new files being created with 0600 permissions. For brand new files created -through Augeas, their permissions stayed at 0600 rather than being set by the -umask as before. - - * src/transform.c (transform_save): chmod after creating new files to - permissions implied by the umask ---- - src/transform.c | 10 ++++++++++ - tests/test-preserve.sh | 15 ++++++++++++++- - 2 files changed, 24 insertions(+), 1 deletion(-) - -diff --git a/src/transform.c b/src/transform.c -index a3acd10..1ca3d5f 100644 ---- a/src/transform.c -+++ b/src/transform.c -@@ -1096,6 +1096,16 @@ int transform_save(struct augeas *aug, struct tree *xfm, - err_status = "xfer_attrs"; - goto done; - } -+ } else { -+ /* Since mkstemp is used, the temp file will have secure permissions -+ * instead of those implied by umask, so change them for new files */ -+ mode_t curumsk = umask(022); -+ umask(curumsk); -+ -+ if (fchmod(fileno(fp), 0666 - curumsk) < 0) { -+ err_status = "create_chmod"; -+ return -1; -+ } - } - - if (tree != NULL) -diff --git a/tests/test-preserve.sh b/tests/test-preserve.sh -index 042dab9..9719ac6 100755 ---- a/tests/test-preserve.sh -+++ b/tests/test-preserve.sh -@@ -59,9 +59,12 @@ if [ $selinux = yes -a xetc_t != "x$act_con" ] ; then - exit 1 - fi - --# Check that we create new files without error -+# Check that we create new files without error and with permissions implied -+# from the umask - init_dirs - -+oldumask=$(umask) -+umask 0002 - $AUGTOOL > /dev/null <