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

11 files changed, 58 insertions, 68 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index cd0d3e0da0b4..9781b7832adf 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index e3c040d38581..107f95344039 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,6 @@
+AUX asunder-3.0.1-fix-tests.patch 203 BLAKE2B f6410aa48d68ac17b4e0116c2b2ce35928b33599e2dceff7a7b5ab3149405f68d684a6b1d0bf59892d18342c8afdad3f53502c838f72558f1ac1bae10d18fd4b SHA512 420203fc34265814377de76e1a3262cc9f6bd630eb06ea99914715e7fc5f7c0867dae66a4a53f8d92439a89bfb5968acbdef8ac684f365e10d2c23ed876029d4
 DIST asunder-2.9.7.tar.bz2 283805 BLAKE2B 6c92d02586e7d0781ac0d698047d588ef7aa5e0c1544cdd8ffb4fd7c00d0066f61c01aa82502b4a4417ba6b70fb3da2c537e5d1e715ea992831f7d618724b949 SHA512 ef5e998b3e3e552ac23696619742caff9c30e52cb2b11f75395cc6e4b2134c58df1c4a97e930db0e8c61dfc31e77b3d9a99a4c9ab6c07ae59b9e91f723401e23
 DIST asunder-3.0.1.tar.bz2 301493 BLAKE2B 3333a76512d8ce61d81b7b24d2b9d5682651f1feea43411bc86a45b486aab0283339f81db13579108bd815cd615d446abe8ca88ca84637b1b9f0aa941056d849 SHA512 07b4caa80c35b39f407952276237787561100e1f546637b64119741f75385afe8db43a991cce364fb152ed5d20b9a9ac99a972b6cbb9616073dada2e2d048b74
 EBUILD asunder-2.9.7-r1.ebuild 929 BLAKE2B ad6e68f98cd67cad62368e957e643459b4234c84d24e854159aa47d0888dd3cfa3d5a985202beb50df7c120708ae046ac0e0bd240690f28a2830a4834bbc9d26 SHA512 7af87e95f04ca7efe53318d879569ab92a2f9a2c5f3422137b1dd41d6f2e4aecc8ba6b6fdbe17aad4823176ea57d5ef7e0c9b663140f4a0ff3b31116ff153571
-EBUILD asunder-3.0.1-r1.ebuild 931 BLAKE2B efd1c6e9a5f9132c13c1336ed9cc6575c7de9883f322a0ce0a5eb251a7aa7dd71069f5e23d50dedc693a676be0f410764ea86bef97210129a3c4853600ae1227 SHA512 db9afbaed8c5ef319b5c5cf056b4333942ab7be38c632a86a866b48a14b8aea9374ddd37dc8afa659e00ffca29db61fc24281b62c8ede795da6bf455324b229f
+EBUILD asunder-3.0.1-r1.ebuild 986 BLAKE2B 8b3e753f6abdabc8bcee6f049a66e34820aca0681809f16f3c1f3002364d3112cac1e6b7456fc17fbb290ebd6d8d8879e8bf8979f7de9371e4e83fcb7c8396e0 SHA512 1b43abb7f346cc9c28ec7ace20c9fb44f3950f900cf3594dc849d8da9c25097aaf4e151c91a39d538f7812fcaced56c8cfd55499350310a2e3f067f7b546a189
 MISC metadata.xml 346 BLAKE2B 834e443617483d5a0aaee70af73664a7df8750f6e7f45bd50b32ee38e794f258d995e35f9f1acaae380913100a46462d93d3756c15277b3e7c35807153bad5b3 SHA512 6d1d57ad927b868d230f98c4bc6a0d75b67ed0e66f3fbca682f304367f00c229d2ec5d526d9d9ee5bd0080bba8304e92eb8ca458079926d7b44632382c81ff84
diff --git a/media-sound/asunder/asunder-3.0.1-r1.ebuild b/media-sound/asunder/asunder-3.0.1-r1.ebuild
index 22ad05fbe08e..b53892be0e52 100644
--- a/media-sound/asunder/asunder-3.0.1-r1.ebuild
+++ b/media-sound/asunder/asunder-3.0.1-r1.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
@@ -31,6 +31,8 @@ RDEPEND="${DEPEND}
 	vorbis? ( media-sound/vorbis-tools )
 	wavpack? ( media-sound/wavpack )"
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-fix-tests.patch" )
+
 src_prepare() {
 	default
 	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
diff --git a/media-sound/asunder/files/asunder-3.0.1-fix-tests.patch b/media-sound/asunder/files/asunder-3.0.1-fix-tests.patch
new file mode 100644
index 000000000000..d5be02045bdd
--- /dev/null
+++ b/media-sound/asunder/files/asunder-3.0.1-fix-tests.patch
@@ -0,0 +1,11 @@
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -6,5 +6,6 @@ src/interface.c
+ src/prefs.c
+ src/support.c
+ src/threads.c
++src/upload.c
+ src/util.c
+-src/wrappers.c
+\ No newline at end of file
++src/wrappers.c
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 6b819f4652e7..e4d82df106a0 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,6 +1,4 @@
-DIST qsampler-0.9.10.tar.gz 222310 BLAKE2B 1fc9c4d063dcce9f3cd69e74e0205b4585e2609eb09fea409fccb87560f4eb767ce322b9dc6d18c3e7ae79c5eff7d06a3bc4c408f6880c161f34d9d93f7ca0fd SHA512 599db13d35a0cf25e5d5fcd02a8fe7995500552c2f2b298883395af9876ecd7fd5aca4528fa8aa5dcd678038ea8704b69131df95c7d9de8061a2c0d163ccbde9
 DIST qsampler-0.9.11.tar.gz 222413 BLAKE2B a19abb43d6d7f0087094b54568b22c9391081e49464ee5626e14c24536afc51680b4f22191bb7baf6abb989f2fa548aadc1d1a1d93876bd16022bd34dfe556a5 SHA512 cd8e33e5791d9d3c768972bd63b53bf9eeb95435247ca5c4fd2488ec4bf67e519bbecd7d4a08f701c5bf85f60710d299e9eef2f3e59e5ec4af58c6ded52b5c56
-EBUILD qsampler-0.9.10-r2.ebuild 1109 BLAKE2B 887064b1a556c1e4d65cbc8ead0f8be4a95a18e106b2df85d4e87b399a971cddfb9f18a150d23f3b2e8a2a426622f086b63a083c90c2dddf88e62e10fc19baef SHA512 569015697e1a1d49669a8d5f783cf131762392e078ed10e2578f01820d93547ca9d6f4e4dc116b305b54ade7d190bf5a9a5324160790c93a53b377fcffa0d95a
-EBUILD qsampler-0.9.11.ebuild 1110 BLAKE2B cc1819820467f889ebe521151f3b0f0269f9725f90689a4d43544ab0d9705b3713ba9c1e3e6ea08b60d0fa682dc30ab24bf78a679ad3663bad0eb4562f37b1b6 SHA512 82b79f0ddab10540fce314264b3a1bfd07311573dc778261a58f291541af39003e1780720931d8903c0f9fa50c7f54f37e04d4cd67d366b0ab3ccc4c46f8f64b
+EBUILD qsampler-0.9.11.ebuild 1109 BLAKE2B 0200ecbde1e427db00c5bbea679315f29800edfe07c1f83a5ef182795db70eec8f5fdb4a8b85149a4bf46fd1ac62bf05abba6d8a2da2fbf51502dc0d10cbf4cf SHA512 da871f4aeb7a78b3caccabe86bd09eb5eabcaedb5dea047704b07474efa34e36e4a76d31b4ea75c6f10fd13df072b1707bd10a8899796c92569e61c197c24f63
 EBUILD qsampler-9999.ebuild 1127 BLAKE2B fe6481616d6378b2e1ee4c93c85067679456c077dd27ffc7f648bca82afb7dfd0a0577bd8c907749b0479623695872237e012b7ac69b689d3be8e2a929226bf1 SHA512 5993759e56318b590a8ec7eef5346729ecf7a547c8f5f6ec9130b00125a92b39a6bffe5f00fbe80565072eef9b240521b43bd5bb1a0e4bf948af66243e137d47
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-0.9.10-r2.ebuild b/media-sound/qsampler/qsampler-0.9.10-r2.ebuild
deleted file mode 100644
index 1f9d9347f7bc..000000000000
--- a/media-sound/qsampler/qsampler-0.9.10-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +libgig qt6"
-
-DEPEND="
-	media-libs/alsa-lib
-	media-libs/liblscp:=
-	x11-libs/libX11
-	libgig? ( media-libs/libgig:= )
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}
-	media-sound/linuxsampler
-"
-BDEPEND="
-	qt6? ( dev-qt/qttools:6[linguist] )
-	!qt6? ( dev-qt/linguist-tools:5 )
-"
-
-DOCS=( ChangeLog README TRANSLATORS )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_LIBGIG=$(usex libgig 1 0)
-		-DCONFIG_QT6=$(usex qt6 1 0)
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qsampler/qsampler-0.9.11.ebuild b/media-sound/qsampler/qsampler-0.9.11.ebuild
index 697cc016c524..c8b3e3ac5c18 100644
--- a/media-sound/qsampler/qsampler-0.9.11.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.11.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
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() {