summaryrefslogtreecommitdiff
path: root/metadata/glsa
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 22:19:36 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-14 23:22:23 +0100
commit4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree76e74807bc479502e13866b581b6bf86734ec634 /metadata/glsa
parent30d6f67c98d149508509d5e86f176d558793acc0 (diff)
gentoo resync : 13.10.2019
Diffstat (limited to 'metadata/glsa')
-rw-r--r--metadata/glsa/Manifest49
-rw-r--r--metadata/glsa/timestamp.chk6
2 files changed, 15 insertions, 40 deletions
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e080c3f8d357..fb2dbba86227 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,43 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 448845 BLAKE2B 24feded351e2c02762000f35c6c58ac935b2383bf6acdd7450f974e16e15fe0935d3f657233d5cd4ab87639ad5f410b8ea36fd5c019b93bfbfc47983ef01dbdc SHA512 569d13495f7e4953afefd29435d7953d3afa1815ae86459c1f4f84726efaaedc5598835f415738d792d2d1060be50cf8ad9140b7fcf124dd7f9ea681a55957ab
-<<<<<<< HEAD
-TIMESTAMP 2019-09-25T17:39:04Z
+TIMESTAMP 2019-10-13T20:38:57Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2LpjhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2ji2FfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCKeQ/+KL1kbDVqrKgaAGzaEi1UfXR4kzOMUrA/VhCa2f4inWI39g6vIciEEo5W
-uI8fKTAqoEBoyOukBvt8jZmZJ6sXwoQx394k0e0+dTjTLnZJ4OzySPjy45z8bFXY
-kl2dTVnl51wu8dvHMDuKRcpdHj1UFTNofCOhpwYSn8DtoSr3SLYV86djbtlUZVNM
-FgxqNuT8xQq1Q5xFq3IZjpknmnm/y9rF3JGXf2ztAJAhuHbo0fvtmxS5PS58I4BJ
-gvH8TRL4J5YzhAhCju15UOIjEeuN5gEyT94FrmRHr4zdRdqzyrWeqZq983kwnhPp
-T95YVz92p6Tt9hYUc8B5iqjKKbb5ZWXq7VrUNIeDcac0b73j1ZHYn9tnsTHAbfp2
-/2FKTgHqTmWIR/3pFpepc7CrCdngKNYpHMf8tsUcwMaj5qsUAytdiURkzru5U7wm
-ainFtygwYlhSYGH40Zps67MtQIUm18XclgIUt8fA7texLNWU9caiDh5+KbU8vait
-ZNiXhyj0GUCCGE7MhPS/5iICaIKnCyQz+euxeGdgBm5W7DeCzPu3aFoEgX205eVS
-C5nS5G3MWndBkTOd0i1qb7YpZiAxGlTf0E8tsrTnq+pVDy9TiRXo+44V70bZHP2Z
-gl6NFdRjzh7Bp/eUhVz4vv/j04OiGKc95HrCDqmKc4rwEMSkuPI=
-=2rpH
-=======
-TIMESTAMP 2019-09-28T05:09:01Z
------BEGIN PGP SIGNATURE-----
-
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl2O6u1fFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
-RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCDjQ/7BAeEbEE4AmoAoFkzMoFShrp2hg/Cy4YU/9WI7l9djWWaVYNeVkqit22u
-ZkcMZkLe4H1b53L1c89DAHiwRkNHp4YikzoTIipG6JaSfwm38XrG/aS68AqWcjL6
-vE8IXEgVyuNJ/Hw0WU645gWNcfzeZ6Ck/vEidNWbeuRUK+gE6+CKmidyorD+5z9K
-4rCEZ8DQRvWcD3BZhPjcq/A+Dy4bwnPN9UFt5ycc8/vtffkdtfcSzKyiIYZ4e8p1
-M2wqKF3jeWAlQJGV/3rAQsIZsp8MDKew2dMtIHvKwQBJ11t0S4xC5ZedlwV4Kxag
-R0dDID4Mzm+QvYbEtvkN5WEwU3tkCNv9GMp7YR/3qIjyKgo/ihwiGJUiow9VGvp9
-goUBLRsDRDUwf3ueWAdVAQnroqkEo0hqASwZUcniqwXgz/TS2IlrGYOp1g0JlkGG
-7AHIyF9wDffjnI64bVp6kYHwoOF9sBmvVYN4p2QBbTWOsBPelc5hAJJRpVbiP22l
-avOVZVt0EpZP103Ya7zlFgtTa46DyCnax7lYSvCUFtA3apjsjfdmKANeAhqyOR9Z
-ucbzyrFT9aLDnPW4Fk2+QL3eLuJ2KVteYgh0UgBXEsk4dLiasbYNh+P5IOTFUq2N
-J7pPfqkCrOs5A1SakV4Jv2q9dAAzC5l2oIyXEd4apQndBef87/c=
-=ArAv
->>>>>>> next
+klCxTw//cB1DOqxzrCdkBOpaT53PhrXYDKu36Nj/AjvQm4kHB4dQjvbqtLdXC2aa
+pvlyZbEa2le54+b/95TMBPugHN0SzQ/NpbVBWo2tSE9ILnCggUU58hxrlERQ4vnO
+FfZHrrNx8M4MDhEkF9Hpe8GqhqFLRhi5RM0czQ+x5xoMb+CKZo46oOt40skukZy0
+JftY5klDkwT+oG4plt1xSAE1ZHuOewDRjB3ak0wfFQtvEC9d/EsBHog0QJvt1huU
+rL8MheUv6GJRyybWofq7I9V7QVoZqf/8PIBhablFAbquEoWOc9kfXQ89EB+tPdax
+89h4x+fgMibxplwBqzCWv3+B6Yk9NnT/xY6YdcN+9b0dfKBZV8mR1Df37Q8hoAn7
+j8MJawd7jdhGmvuVB2jhyb9daxk7WodpLQcygNuuF5kTBq7XGXq3Xiyy+Gj6pa3O
+SCriF+O/n88bAVFqmaW0ILLD3YP37WTffI0RdVwyz6t5Kt3I+NXooOIhaeb5EwWB
+iBMR93QsBxNv8n2e9yKC7qUJrcHDrMFcq87D7KoYBbcs8YTe4X80H1RtQL7dtCcy
+2YXu3yd74BJ2bdcvnjrBYarrASvOqxUxqTi/tvE5IieAK8N/gfJ+fXwDlnVoqDx3
+Yyt1IsHx5i/Z5Kg6L7y8IxRh+KBaQZFEXY95GP1YUxklA50jJto=
+=PZ9t
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e5e5d106f537..df15733aa00e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Wed, 25 Sep 2019 17:39:00 +0000
-=======
-Sat, 28 Sep 2019 05:08:57 +0000
->>>>>>> next
+Sun, 13 Oct 2019 20:38:54 +0000