gentoo resync : 13.06.2020

3 files changed, 51 insertions, 15 deletions

diff --git a/games-board/gtkboard/Manifest b/games-board/gtkboard/Manifest
index cba005ff537e..e85579ca7926 100644
--- a/games-board/gtkboard/Manifest
+++ b/games-board/gtkboard/Manifest
@@ -1,5 +1,6 @@
 AUX gtkboard-0.11_pre0-gcc41.patch 591 BLAKE2B e3480d0969645815db2cdd9bf32e840bb671a2f9f89c96f5a7e6c61d258d52edc59eca03df64d461298d2afd478f9cccb396a75c31ecd701dc476d304b1f2b32 SHA512 ce7b16643054fd9171c867b6ee7db946577d610fe9f9f6ac9fab98378182934b2eca1828ec8550664c1c67bc2b0f6631ed4538feb9e52d6b9f0ac7e73c1cd656
 AUX gtkboard-0.11_pre0-gcc45.patch 696 BLAKE2B 922d0fdaf0352d21aaa5eaae8bd4eec92b0b2f4321afdf8430096fcf46e7749a06a35c1582d8f6752b0462c96ea150457b58df5d1d32d1f24e0d540e854b3e34 SHA512 7e95753b1a69fbb7031deeb160a7b6da2113171984d8680630317f121e0a12ba97c3230342a3beb5ece6d3579ac4d65a0e9fa1b78e635c690e9e5fac15b54cd9
+AUX gtkboard-0.11_pre0-stack-smash.patch 897 BLAKE2B ad479e26a9c9e730c62fba739e2eb33627cacc5befa3d3350ecfb890e432e74ed3200af52a5506e48a0a3998babbd3331168c7db9d716effdf00d94e9d98a8c3 SHA512 a1e6d4aae548fa12770cbad014f2dd312d12cea17fc9c64dd07be778be9bd479077ea5fa59e875b3a17ff4bde9cf8b074ff35f05c490a0fd3575453889f2bcf8
 DIST gtkboard-0.11pre0.tar.gz 459581 BLAKE2B efe6fc70d8b7c144f0db33502fbce509a0e600008747a5e9bd42d84d0d43de1c790436b731273c36d39356fb489f5616539655fd37ed5cfb802365dcd826e013 SHA512 09d4a1d5203ef0e21d21b5b6cb351add71d0a415ad83808b6e281dcf3f869221e99ae683846462d465eaac54f5eb292e1d8447ea7cdfb07602a8add49e2db283
-EBUILD gtkboard-0.11_pre0-r1.ebuild 934 BLAKE2B 6e721fd03960043465991a2ebc1fee4a2232f274351e78254ad240fe8e0cc4d7d867923e5160d003032fd4f99aab408a1b62b72846c4691dfe6bb32a87c22fa1 SHA512 e5f9be8adb782c47a169a7e6e333b72f6529b520a2aa4571438fecce2af7d854d16ed32cd04b6b18a244cbd86ac1842c7247b7a0e6fc3fc36e33d631e0feac51
+EBUILD gtkboard-0.11_pre0-r2.ebuild 926 BLAKE2B aaa32375c638766e959a0c5f12a7a94638c45c38c4243b74aa23032dbb09aac91513a1c44b48ad1c5da6323af07a02d8b64f92d809ac1a0ce77dd2211ba67e8d SHA512 f7d6d1bae7f4a599359926a8161eacea0430e3d076bcee12faadcabfad10068a90ebf7877644d5d6f0987ab0f580ce835470e10d2fc445896410a3ea5b060b4b
 MISC metadata.xml 331 BLAKE2B e0040c6aa21b5a10ccde6c6dd7ab3463f3821cfdf21e778b4e2dabc93b0bbf902081859f781697949aee8adc870641a7ce449a84e8e451875ebd62a4ef21d970 SHA512 809518470fc270114a602f396c94e42ed33a87e6a46924679e9f1c23dae1863ee4b5a4419bd73d95a069b3810e53f3dd59bfb40ddaa888c9683ac6e2c1c52fb3
diff --git a/games-board/gtkboard/files/gtkboard-0.11_pre0-stack-smash.patch b/games-board/gtkboard/files/gtkboard-0.11_pre0-stack-smash.patch
new file mode 100644
index 000000000000..412412eb62a9
--- /dev/null
+++ b/games-board/gtkboard/files/gtkboard-0.11_pre0-stack-smash.patch
@@ -0,0 +1,32 @@
+From: Takahide Nojima <nozzy123nozzy@gmail.com>
+Date: Mon, 6 Jan 2020 02:01:42 +0900
+Subject: fixed-stack-smash
+
+Fix stack overflow in engine.c.
+It has 2 overflows.
+  -The 'linebuf' have 4096 bytes,but '\0' puts in 4097th.
+  -The last argument of g_io_channel_read should be
+   'unsigned long' not 'int'.
+
+See https://bugs.debian.org/948527
+---
+ src/engine.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index 1b733fb..6ad3b9a 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -345,10 +345,10 @@ static gboolean process_line ()
+ 
+ static gboolean channel_process_input ()
+ {
+-	static char linebuf[4096];
++	static char linebuf[4096+1];
+ 	char *linep = linebuf;
+ 	char *line;
+-	int bytes_read;
++	gsize bytes_read;
+ #if GLIB_MAJOR_VERSION > 1
+ 	// we need to call this again because we will get new events before returning
+ 	// from this function
diff --git a/games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
index b7ae827bf8d1..2886f2c69ada 100644
--- a/games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild
+++ b/games-board/gtkboard/gtkboard-0.11_pre0-r2.ebuild
@@ -1,50 +1,53 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
 MY_P=${P/_}
+inherit desktop
+
 DESCRIPTION="Board games system"
-HOMEPAGE="http://gtkboard.sourceforge.net/"
+HOMEPAGE="http://gtkboard.sourceforge.net/indexold.html"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
+IUSE=""
 
-RDEPEND="x11-libs/gtk+:2
+BDEPEND="
+	virtual/pkgconfig"
+RDEPEND="
 	media-libs/libsdl:0[sound]
 	media-libs/sdl-mixer[vorbis]
-	gnome? ( gnome-base/libgnomeui )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/index.html )
+
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc41.patch
 	"${FILESDIR}"/${P}-gcc45.patch
+	"${FILESDIR}"/${P}-stack-smash.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i -e "/^LIBS/s:@LIBS@:@LIBS@ -lgmodule-2.0 -lm:" \
-		src/Makefile.in
+	sed -i -e "/^LIBS/s:@LIBS@:@LIBS@ -lgmodule-2.0 -lm:" src/Makefile.in || die
 }
 
 src_configure() {
 	econf \
 		--enable-gtk2 \
 		--enable-sdl \
-		$(use_enable gnome)
+		--disable-gnome
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	doicon pixmaps/${PN}.png
 	make_desktop_entry ${PN} Gtkboard
-	dodoc AUTHORS ChangeLog TODO doc/index.html
 }