gentoo resync : 05.03.2021

3 files changed, 51 insertions, 3 deletions

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