gentoo resync : 05.03.2021

6 files changed, 122 insertions, 3 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 3586a45cb305..2c8b1362db95 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gtk-splitter/Manifest b/app-arch/gtk-splitter/Manifest
index 4104cdac2fde..1df89b375d84 100644
--- a/app-arch/gtk-splitter/Manifest
+++ b/app-arch/gtk-splitter/Manifest
@@ -1,4 +1,5 @@
+AUX gtk-splitter-2.2.1-format-security.patch 1607 BLAKE2B 139c6e5fc45b5bd088cf86b0bd83840f81f5662802d41159b0c9265997c1b1847695345ac2a8a992482500e593207f8ab23a253621d07c1ab4db1bb1c3aa26bf SHA512 59354087826411e6f0cf479a9f77540851c578ea5216c9fefeb62ab7f92211409eeb11d8e3d42fc6823539d51abc2c4ece15771854b70e72f1ce0fe26dda5a85
 AUX gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch 325 BLAKE2B e5b7e8f53f7c774631b9d776afa0f74f6e36cbdd6775fee064c50a71b918e780de03360f9bcadf333adb89a9724ea4667726c16807dffdb730c03f44e69303c6 SHA512 19beddfab6ec199f013f4f3d12a5921df49267ea3ee851e2bfb4ec043f899015ffde7bd45308aca8734d735b203a822dede78c785212e45c49351ae7f501c49b
 DIST gtk-splitter-2.2.1.tar.gz 93515 BLAKE2B 32ab62076028efb69584c05f21c28744b1261e03640391787c9fb70a547eb7d184be2ce1f945c3bd659ebdf4b3b9b998331e3e5dbc3c5ee9d5beb72149893e16 SHA512 c84e43dddb5f1eef5a4fed7db7541012374d7e6bed760835adae20fa35a4685cb7a1a866ad02cbaf36ff3ee4d5bd3872a154e46ce9692603a3273859d2eb36dc
-EBUILD gtk-splitter-2.2.1-r2.ebuild 798 BLAKE2B 4f80b9db373035b2382a76ce1541571a2ad6f358b7583dc92c84f8e03756be3dea9c9765953f2c2db61d372f305958ee62dc74cdb00401e01ea5aed1ef25b9e2 SHA512 db4f38313dbaf853ee7607c2428884f9a9fc9037f50c8f68884177275cc3fb8d01001f4ee694f63bee3c9a3bdebdb27647ad0fe63031fd66035f97f1c000eed1
+EBUILD gtk-splitter-2.2.1-r2.ebuild 841 BLAKE2B 42a9fca65c7466094ffc45d320d7528f90b6b004be016ce3ad88ee983144e0740b64c70a7b60fc30278e223219114e5dac63e1cb5b95259dcd62c500f883d192 SHA512 9a8386a901771fb9df42533dace2d3daf29bbd21c8a0c77c085dd273c2d741b1cb4b15c443f0a42043e897e53fd4333ef65fd53c681a2032c82be1477ae6bb62
 MISC metadata.xml 249 BLAKE2B 58ba2f73d5e08fb2c2e4f818eb1cbf5521a0505631ae5f1294e26ae94d49d6cd500b62123a14eb29728153a0a2f44107079b647bc06a5f290a7197980979561a SHA512 c8fc6ae730050d8fa5b3395f954362303338f4123d3a4aff506b9f7c528739923b0ab5a22300bccf8512ac9910efa3d72d1e525301374b6fdf84b10e6693ef6a
diff --git a/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-format-security.patch b/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-format-security.patch
new file mode 100644
index 000000000000..7c8cb0e382a4
--- /dev/null
+++ b/app-arch/gtk-splitter/files/gtk-splitter-2.2.1-format-security.patch
@@ -0,0 +1,44 @@
+--- a/src/dostextfile.c
++++ b/src/dostextfile.c
+@@ -30,14 +30,14 @@
+ /* Write a string to the file pointed to by b without the eoln. */
+ void write_dostextfile(FILE *b, char *data)
+ {
+-   fprintf( b, data );
++   fprintf( b, "%s", data );
+    fflush( b );
+ }
+ 
+ /* Write a string to the file pointed to by b with the eoln. */
+ void writeln_dostextfile(FILE *b, char *data)
+ {
+-   fprintf( b, data );
++   fprintf( b, "%s", data );
+    fputc( 0x0d, b );
+    fputc( 0x0a, b );
+    fflush( b );
+--- a/src/interface.c
++++ b/src/interface.c
+@@ -216,6 +216,7 @@
+                                     GTK_DIALOG_MODAL,
+                                     GTK_MESSAGE_ERROR,
+                                     GTK_BUTTONS_CLOSE,
++                                    "%s", 
+                                     error );
+                                     
+    /* Display the error dialog. */  
+@@ -233,12 +234,14 @@
+                                        GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_INFO,
+                                        GTK_BUTTONS_CLOSE,
++                                       "%s",
+                                        "File verification successful" );
+    else
+       dialog = gtk_message_dialog_new( NULL,
+                                        GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_WARNING,
+                                        GTK_BUTTONS_CLOSE,
++				       "%s",
+                                        "File verification unsuccessful" );
+                                     
+    /* Display the error dialog. */  
diff --git a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
index 288cc392ddae..8cfa2563d8f8 100644
--- a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
+++ b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-r1-desktop-QA-fixes.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-r1-desktop-QA-fixes.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_configure() {
 	default
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 12e776d1bb1a..f57d2c0ce6a3 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -4,7 +4,9 @@ AUX zstd-1.4.5-fix-uclibc-ng.patch 762 BLAKE2B 3ead6b2ca56a6109b984a7e4b73d80b8a
 DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
 DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
 DIST zstd-1.4.8.tar.gz 1816546 BLAKE2B 950d03c408e9d3fc2081969553c46247a1b8c13a22542effbf70373625bbfeb2a810e0adf0e1c6180cef590e7a28487191b1a577982fddc7a00d1507b461efd5 SHA512 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
+DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 EBUILD zstd-1.4.4-r4.ebuild 1829 BLAKE2B af328824a7bf0d2c624eb44b2944fb6722a8029fd60a27699099b43df8bf185632da2e22c33dd817e0882431f5969e43442011dec99d6373ad6b335702458550 SHA512 0a78f7dc6ac514feb22cab76f61ba43e5bbe23399cdcaffcdd5073cb4ff01cda577c11082e9421973f9143e7eac07a511e0b7660c92d601d4ce56574a7fa7758
 EBUILD zstd-1.4.5.ebuild 1730 BLAKE2B 7512b6b7c94c40a397af11f7ba0a829efa992c1850100eb210cafbc0c37fc348be18b3cc0b3a729ee8b21e613cdf3adc5a864e1cba26f8e6b300ae93730cd949 SHA512 657b61078f485e216f2315e9ce3c586e36c14a1655d7f252e748c027ea69e38f71dbd439996f897056eba1a277104387a3e6d7012d10978e3e892bfd9e7742f1
 EBUILD zstd-1.4.8-r1.ebuild 1678 BLAKE2B 7544c7630e0a7b31f0c536c9704ae93f8ac35e5c2ced17b3f728f960d85cc584739e9e1995383cd198d595620366d7b1fd91dc2a57a29b3bb57ba3903adb7661 SHA512 45126b517b8c50c5ed7a21f742bbd05f66b9cc4ea3976532b3f8bb20aed04920867be2b1126e7d5889aa4f7f3a1e10e7ada9cb2d388ddfed40f79564cfaa08ae
+EBUILD zstd-1.4.9.ebuild 1678 BLAKE2B 7544c7630e0a7b31f0c536c9704ae93f8ac35e5c2ced17b3f728f960d85cc584739e9e1995383cd198d595620366d7b1fd91dc2a57a29b3bb57ba3903adb7661 SHA512 45126b517b8c50c5ed7a21f742bbd05f66b9cc4ea3976532b3f8bb20aed04920867be2b1126e7d5889aa4f7f3a1e10e7ada9cb2d388ddfed40f79564cfaa08ae
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.4.9.ebuild b/app-arch/zstd/zstd-1.4.9.ebuild
new file mode 100644
index 000000000000..a7b21ee6fe57
--- /dev/null
+++ b/app-arch/zstd/zstd-1.4.9.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs +threads"
+
+RDEPEND="app-arch/xz-utils
+	lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	multilib_copy_sources
+
+	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
+	# where upstream build system does not add -pthread for Makefile-based
+	# build system.
+	use threads && append-flags $(test-flags-CCLD -pthread)
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"${@}"
+}
+
+multilib_src_compile() {
+	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+	mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+	if multilib_is_native_abi ; then
+		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+		mymake -C contrib/pzstd
+	fi
+}
+
+multilib_src_install() {
+	mymake -C lib DESTDIR="${D}" install
+
+	if multilib_is_native_abi ; then
+		mymake -C programs DESTDIR="${D}" install
+
+		mymake -C contrib/pzstd DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}