gentoo auto-resync : 30:08:2024 - 12:00:55

3 files changed, 24 insertions, 1 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 2b87fba2fcff..600393a96403 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -3,6 +3,7 @@ AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d
 AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 AUX tigervnc-1.13.1.confd 518 BLAKE2B ee5e354a36638850595cda0c4d083c6837609201cca520175f78b03aa8cce18c6b89f534cdaf6c409ecd5aacf0c0115a52ebd458cc4aaa4aa0ba19942e2352cf SHA512 57db5b7ba590a48fc7e91da13cbe2ff0bf6e96088d522d214f6dc5266ea9dc214c561c9705380477f25d65eede870ef3b054fa77fabac78cd5ac449204e07b59
 AUX tigervnc-1.13.1.initd 2635 BLAKE2B 4600e73a22cb774030bcb0f750a50b134f06183a30008781e78c5e64034ab4ae8e5598e8e65f01c2bee96276ded4ec583df73f5eee0bc1ff1e8c2524af9ea6fd SHA512 acdbd97e3f559474c0c5b9211a8a3885f70d7d59a89c236d01b50490c6c2a70c4b7f9c2346f161640b09123cadb8803f0cbe9ddaa0efd046bcdd00033f133673
+AUX tigervnc-1.14.0-typo-VncAuth.patch 763 BLAKE2B 6e0f209159aac2f6ed78784606b7d3fd4a3bb618321249eb75452441f8781571e08da8a83fb657559e75e81f0ebf5d55affb5f965c0523adf5cdf349aa2cfcd3 SHA512 8c4c80b735060a15e25eec17ec155e321f1b6fa3bf5367838cbaababc3850a0894ae89fb53821b8efced801cc97295b8602b19d9a99e72767e00b402288d990a
 AUX tigervnc-1.14.0-xsession-path.patch 1008 BLAKE2B f73bbab10b21a8b27b5b1773e43b254ca5e5017efd84aba8916ad6b5549c2cffabcbac7c14c0b1d8dbb2fb280299d580ceab45399b593abc8f520d692988024b SHA512 cc3ead0af6c618b00914a131723fcf401f913a10e3398e92702387e805dc94f7878558deff4ee12d58e8f2608a7d268ba937a8fcc34ed303b9e3328e77b98bf6
 AUX tigervnc-1.14.0.confd 530 BLAKE2B 1152c237744ee69ab317a8d979a8282abb259cb359500b251c31faf6a683ec11c31ef283749e420f5fce54a9f5bec7e97df4ccfdae41871173d30458c8669137 SHA512 75dbae29d2bab1e1b56f9d2d73bb674cbd968a9919e085bc1d356726caed91b469474753176d657c0b5ef2afe6fdf691b661d2224062b22bc39a9752951ac6d4
 AUX tigervnc-1.14.0.initd 2996 BLAKE2B 675bc890a23805aceeeb1ee559d192c4a39ee7251d520cc5d98cfd2c2f075737fb3ed192903a08f850603847ce7769e3ae01b2c29dc4591cb3444edf835c6e0d SHA512 0e4043df37125e48d4314fc87400bf5e4eb9ca9848d2afead2f34b4f94422a03b939c3cf246a40c44b91e9cf0aec261f35a3c98e9861810db2f5a73f384a3c60
@@ -11,6 +12,6 @@ DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b
 DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
 EBUILD tigervnc-1.13.1-r3.ebuild 5432 BLAKE2B e9104059ab3ca717699f38329a8c428f24f7ff9d42ebd27181f30f0dd4bad7ba7af86f7e1a75406a0f08a6570cf1bed9ee4d03c50f266d6bf9c681d1b7bd2c86 SHA512 b921c52372954381ae535c6c7e9fa518c31f33a62e13a63ae9cca0f0fd210f4efa40d769966d86a4c3d4ad71d6b2d0caa30de6fd4d4b1de61f41faedb87e803a
-EBUILD tigervnc-1.14.0.ebuild 5601 BLAKE2B 1a3846d6b22ff6ba386085c90617b33900d647d2987de019035714bfa3854fe91964ecb54a05f7529032b51ed1268f8e2bb833e34af2e4054224bd2c7c932c9f SHA512 33c9fe94bca0497669743eef6e966d6eef60be7db45d14fa55218508a1453b65be4a922f39f0ffd290d513cc0bbf82c4bf3f3c566b0bd31d1b5f263d710b0d3d
+EBUILD tigervnc-1.14.0-r1.ebuild 5654 BLAKE2B 07d66216434342d7f49e8d2305f503f29d70144ed9ab301d2ad4cd2742efcb75236aa72ad1811724de797379f98815b5ec682cbf52a204ae15dfa522c783c2d1 SHA512 27cbe12e11d1ef6e128fa72ce1dcb4ab70872ac73fad6127a803d5e30087221cebab5ec149b86f1ff793948fc015bb91587351c3b161ce03264904ec7fd8df01
 EBUILD tigervnc-9999.ebuild 5451 BLAKE2B 969ff59f69636c982e7c4bbf6fae54941b1d0f71950135d62700b31d28166e84708de6a4d5b0f3f3e0e3e3b05f37a3e5b7c15a3ad9154a1c8709f7428071b1bf SHA512 7fbb6c3eaaafb0284816e6a0c93524991f3b4d506cf93d3e3563b5f4da5264b8541e27a5420fcc8716a252b78694ecffc1b2eae0834d5f4b1057b58971db08a0
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
new file mode 100644
index 000000000000..8408fb77db5f
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/938694
+https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582
+
+From 4f6a3521874da5a67fd746389cfa9b6199eb3582 Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Mon, 29 Jul 2024 16:16:08 +0200
+Subject: [PATCH] Add missing comma in default security type list
+
+Otherwise it merges with the next entry, removing both of them from the
+default list.
+--- a/common/rfb/SecurityClient.cxx
++++ b/common/rfb/SecurityClient.cxx
+@@ -60,7 +60,7 @@ StringParameter SecurityClient::secTypes
+  "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,"
+ #endif
+ #ifdef HAVE_NETTLE
+- "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII"
++ "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII,"
+ #endif
+  "VncAuth,None",
+ ConfViewer);
diff --git a/net-misc/tigervnc/tigervnc-1.14.0.ebuild b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
index 858119355b1a..771510fc74c3 100644
--- a/net-misc/tigervnc/tigervnc-1.14.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
 	"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+	"${FILESDIR}"/${P}-typo-VncAuth.patch # bug #938694
 )
 
 src_unpack() {