gentoo auto-resync : 04:01:2024 - 14:00:20

4 files changed, 39 insertions, 5 deletions

diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 1ff8f3af6296..fed5b20362f3 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,7 +1,8 @@
 AUX vorbis-tools-1.4.2-clang16.patch 613 BLAKE2B 571cfe069cf2b29ebba4582f90db471d45a8bc864a04bd5cc3e3193ac45a3b2b3ae4dc3cd9708253674faf716747fa9841d6012348a714b6a8453f24ae0db7ee SHA512 8e99492e5ebbfb5f4d1b268e168058bed163e0bb278ecdc67976bd1181996d19c068a61983536a0ea5ff2bc9ff1dbab0c2bb609a4f2a2782f9f8358a5cee4273
-AUX vorbis-tools-1.4.2-docdir.patch 416 BLAKE2B 1ce521f429314e40b9fbde91103dc0fd4cb02a0801479da8c4d5cf17334e6586c23a892f12398b9cc62c86fd17394d5325bd580c5be1d03ffd11e5a21bf18443 SHA512 96f1ef85b92e25dd1d029cf19b4e81ca455cbf9da83b49bf50ce10bbbf02a0150975eaeb2ded262c8931d213d6d767013ced4d7334ab5a6fa1c06f55bf278c91
+AUX vorbis-tools-1.4.2-docdir.patch 344 BLAKE2B 60a572dbf0b3a01e660a20ba8ea393d444a71e177c0fcad80c1f8d881a8f2579c4f87cc45d9bd63255585094fab3a9f4f07a6d1e885c8b78f0a6dcaec77f3125 SHA512 9c7db5f4f12f653710c3bd3d343f14b98d1b75169a988cca5688c76451fe991455779f18160713e85bf90595d931f058f098c094f3f1d07234bbdacb89186c0a
+AUX vorbis-tools-1.4.2-fix-buffer-overflow.patch 1005 BLAKE2B 791947499def14911dc57704293e7be17a4382a5375d411c4f7c52a319f6482eddc88bd5aa40b5b830f65cece564aed43d87ca0a93433de1ee2f62100ff005e1 SHA512 cb300e0993c37e23cebcc151518be58d1e2d8d8d869b8d2f92fb5cefaa49412a6e9dc58c52f2a984f99f12b89f4cd4d2ebb73cdb3cc48807e7b359eb3d43602e
 AUX vorbis-tools-1.4.2-r3-docdir.patch 333 BLAKE2B 4995047906f8d83402bdfe6d340a9cac658a73b369700509f7f314260d595b123278fbf9a88e50a1b6c2c7bed00ea80f18f7bad6467239e1b7cc5906f00c4c64 SHA512 9b8c781c5f3f67ece38f0bb4844d1ba18571a91f07ffda0c99449015b043346b2c7be03c957be34bc02abc4664b7b131fb547a2a97dc16278fd8a70790f6fba0
 DIST vorbis-tools-1.4.2.tar.gz 1389947 BLAKE2B 6cec240a2c069a74accfadd4d4a5a2a75bb4ad40c83aff86e190f7b19a87d4348d7a932e69a9ae9dd2efff636f47d3465b3d26d39393b4fec925cb7d1543f77e SHA512 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
 EBUILD vorbis-tools-1.4.2-r2.ebuild 983 BLAKE2B 9d1164502c49862cf8b0d1dd35bbb33054684449c56ec1b30c0d15040a2f41a02edb79c0421d66e8eb38676910ebaee54e27b1fadaa593c722de5601539f6727 SHA512 408a083cf10a2cd7bb9229bd9f5833255e9e293c0066c61ba5bb1e5c68b5980c1506c2f982c4e99b0a0b96cc65740dd5a23bc0f41a476de8104b7a680030cc1c
-EBUILD vorbis-tools-1.4.2-r3.ebuild 1059 BLAKE2B 8d9938b3ece3875097a5aa9858539253f510d6137bae8d63a9437907517f32d632a3ee0d340f330b4d15e9f69a846de910f96f46b80edce894820a75daaec242 SHA512 90d88d4a0b2a71292efaffad0bcc3dea51f174450d6849f3383c4a70fd20e0c02660aa9efe25314fb1473d85b6b80bb63884c1cba5961b9309edf2d542e7aba4
+EBUILD vorbis-tools-1.4.2-r4.ebuild 1105 BLAKE2B 1c46bc63983f96cc37c4b364af7a23bd502297414fea3d37c95e7b1c76d28e372dec18bb3e6aefc601c21f88487a542527ef352e04259b0977a99623ba6e3d52 SHA512 047754d4e4e27fb4e274f4334e1dc176c28bf73ad267208947884abdc195cecb6ffee682461e412871039802604944b671a94039b213de1aa9c2160296e8ed5d
 MISC metadata.xml 428 BLAKE2B 06363d3740051fdb8d99d36d6f488019d80f87d82c2919f6be0e22f3c8041b516f0c9da7dbbad266147498ea3b15446bf1a0614413bbfe0b799adb92ef9c96f4 SHA512 f288eb76ce48927f0b30db2a3efb4ebb0ae25f77c0dfdd7e4272763232afb75c6010ebdcff5869f0201395aa81597907197ee14f7fa1c0df16c4eeb83076014e
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-docdir.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-docdir.patch
index faec14fe65c6..3dc0bd1892f8 100644
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-docdir.patch
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-docdir.patch
@@ -1,8 +1,8 @@
 Thanks-to: Chris Mayo
 https://bugs.gentoo.org/533774
 
---- a/configure	2021-01-21 10:14:17.000000000 +0100
-+++ b/configure	2021-01-23 14:24:06.178883282 +0100
+--- a/configure
++++ b/configure
 @@ -937,7 +937,7 @@
  runstatedir='${localstatedir}/run'
  includedir='${prefix}/include'
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-fix-buffer-overflow.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..20d4b65e2630
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.2-fix-buffer-overflow.patch
@@ -0,0 +1,32 @@
+fix from https://gitlab.xiph.org/xiph/vorbis-tools/-/merge_requests/7
+
+ diff --git a/oggenc/platform.c b/oggenc/platform.c
+ index 6d9f4ef..b66e47a 100644
+ --- a/oggenc/platform.c
+ +++ b/oggenc/platform.c
+ @@ -136,18 +136,22 @@ int create_directories(char *fn, int isutf8)
+  {
+      char *end, *start;
+      struct stat statbuf;
+ -    char *segment = malloc(strlen(fn)+1);
+ +    const size_t fn_len = strlen(fn);
+ +    char *segment = malloc(fn_len+1);
+  #ifdef _WIN32
+      wchar_t seg[MAX_PATH+1];
+  #endif
+  
+      start = fn;
+  #ifdef _WIN32
+ -    if(strlen(fn) >= 3 && isalpha(fn[0]) && fn[1]==':')
+ +    // Strip drive prefix
+ +    if(fn_len >= 3 && isalpha(fn[0]) && fn[1]==':') {
+ + 
+          start = start+2;
+  #endif
+  
+ -    while((end = strpbrk(start+1, PATH_SEPS)) != NULL)
+ +    // Loop through path segments, creating directories if necessary
+ +    while((end = strpbrk(start + strspn(start, PATH_SEPS), PATH_SEPS)) != NULL)
+      {
+          int rv;
+          memcpy(segment, fn, end-fn);
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.2-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild
index 5ba47cf06cc9..05d291d1539e 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.2-r3.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,6 +34,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-r3-docdir.patch
 	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-fix-buffer-overflow.patch
 )
 
 src_prepare() {