Fix crash on BSD, thanks Yuta SATOH <nigoro.gentoo@0x100.com> in bug #493124

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 149 insertions, 6 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 03efa82829c8..595d1e9fe94a 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.140 2013/09/13 23:43:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.141 2013/12/06 09:50:17 voyageur Exp $
+
+*windowmaker-0.95.5-r1 (06 Dec 2013)
+
+  06 Dec 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  +windowmaker-0.95.5-r1.ebuild, +files/windowmaker-0.95.5-bsd_crash.patch:
+  Fix crash on BSD, thanks Yuta SATOH <nigoro.gentoo@0x100.com> in bug #493124
 
 *windowmaker-0.95.5 (13 Sep 2013)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 50fc449a5e0d..844ddc20143f 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX windowmaker-0.95.3-fix_underlinking.patch 355 SHA256 ae4bc0f40edb8fc38084051f06672b80b59ddf7a75805ae22376565f958c9682 SHA512 9ebf6ec14cfe821eb69d8385b3009953bfc58da576f06d22291d2acb112635ffd0a89c5388656fff76f07d7aef8f68a6226b8621b776b1f7437f73159ef6d349 WHIRLPOOL edde5e6d86da9fee9d9acb1cd75244554c455fabe0bb5705a25837e09f5cb0f6c2a825a96584ae7068c1194bfe63632ff28d7136832217f3dbb694d77809ae9c
+AUX windowmaker-0.95.5-bsd_crash.patch 963 SHA256 189bde88d72d65b0412bf7f08d2bddc8f952d942d7a0cab49d3391292dcd47ba SHA512 66611ecb7b8aa43c8884734472bd41f2912a5a86c93ad908313171041a2665d08e9131270b21d3466dd3c844dab09faa099bf01e2fa2a4a81bb3910073490c3e WHIRLPOOL 78ec84ed9c61b6ece3db15bc0e5137c66d37335c9e64494bc1cd82f4a157c8e26e73796d0fb7c2706dc2cb3b9bd84b759d8570a1a3a17eb9d7d6ac9a623803ae
 AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b
 DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6
 DIST WindowMaker-0.95.3.tar.gz 2780245 SHA256 b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a SHA512 7a70f6eb9de03c466d9de6a84febc59d46edee82c789287caa3a67012ab40c9b9a029ee46236f79dc80daeecab2313999a72f4d90caa77a464876116bd48ad16 WHIRLPOOL 056adcc7fd532aca611dd3699584aef793b5a86f66f051b571f4a0c247e33a37871e775389f7449d0357d3133a75ba3a7cd862a6cc2a243e447959b977d8a731
@@ -13,13 +14,14 @@ EBUILD windowmaker-0.92.0-r11.ebuild 6343 SHA256 09979ec2a7e3ecbbebd54be27ba6b96
 EBUILD windowmaker-0.95.3-r1.ebuild 2982 SHA256 0776a28212eff71a353591e2fab0f392a1ad4459b430ef831b03c4f221365e85 SHA512 540523d33406d47c2ea9597a367de36ebe20c031058f6f6f3f9c36e30577513309cab8d497a40b02070ff9688fdbf59a89db98dbfea8269528b5365c2a351959 WHIRLPOOL e726b98478d645b14293b8891bd4404b8282ae328cd1177f4ce6d182a8053c736dbde660cb60bd818e48126aa12ad531672b8e14b8f0bfb624569c68e7ceab76
 EBUILD windowmaker-0.95.4-r1.ebuild 3003 SHA256 d7b38fbfd7a1786f84b6e1cc8811342035824ac52f2388f32e94cbf0e87044e2 SHA512 256b601419152b468d584e38860fe4c4ecd5586f6f5ea7c1905f258c4c15a3951ec677c4233a6fe268ec14662c08011d8da35c35cb98d24946ed46e7632ea2af WHIRLPOOL e728233f588cd6a029881b77d3bb505d5cc6288dfe9988be7b86a7b4f8d950f3f68160aeca688c2c5c0f8f01cc3d4a24a5ff41673fe8567790fc606344f5863b
 EBUILD windowmaker-0.95.4.ebuild 2987 SHA256 f74e8ad2c77578ae54c2796e35009f04a728965b6af0b0f27147ced9588c3fff SHA512 e46deff68ab3a1b926f0ee2ccdff50fea93d840eca4901fac4e5ab5a688e7f44931376228d230bab70e427267f3e2dfeb2c9857107b5cb28491f1f49190ddb5b WHIRLPOOL c3f86b7ea3805df8d08b192141f85633c8ca899003c8b5153a5f0b6b0f588c7f5bbce5a6fefb0ba1ea8ef344ca59f8927eb95438cded869fd66a53e8ce503fb5
+EBUILD windowmaker-0.95.5-r1.ebuild 3046 SHA256 28ad7432a6cde41858fce43bb20221a7162a6943b7a8359a52b2cd61598faed6 SHA512 bce1b40eac7911f465577ee4602fe53e315538c7afdb10ca1d1abe49b8a8b0158933faa2189a236b590b2a544dd79a80dc7fec938ecc017c4777a73cd3345b92 WHIRLPOOL f255e1b7de53e9747d4b4d4a62aac14bb9b7c95246da47a9473417c1bc1df8ce9dd1ffa45f7f46f4f79f15fb280e4130659a681c669540be4d2aff848ac92d5e
 EBUILD windowmaker-0.95.5.ebuild 3000 SHA256 c650aaf158a890df4ff4f42f51bcb03e632183da2ec1db76778c645d5d1eb641 SHA512 114d42c81b7576eab8c3ee65ee1a3b4d5641c43be451aa1304e0a83e248c5048d031e8894c67b122d723d8bff0b0035a17e579bcedb43ce0150b5b2200de3a99 WHIRLPOOL 472f8c00945e8c9792cd6dbc1085a8af2630da4aa1d52ea4c6c72a241146180d6f499c7d587c594c47019e322b0ff4266584eaefd6720f48cb1f8844d2b1a3da
-MISC ChangeLog 29034 SHA256 28c8e771ef386748f235c182bc17c945445c9cc858d5572ddc612d0f9eaa1d54 SHA512 09d41d4e3f45dbc4f700fdf01f3e61774036780f07f0c283e87058d9e690c946f012c3dec310e11c66f8acf0d319184664fe7415b0e73337939d608cb35b4ace WHIRLPOOL af3a911790468f52c6d8b19576f27d5edb07d5664f4f2d48de3f8bb1e902d2bcbce01bd80fef48195af3c3f3fe88f4d920560bbfc130ecddc756d9b8aa740f12
+MISC ChangeLog 29283 SHA256 5d5f3ef335ddc6ae5de4b115df147d4879c6e1ff18259e59ac3f7dedfb5f57cb SHA512 9d42b2abe007aef1ef052e66308ce2bfa6135de3e5cba8b3b58ad3dc85c772116d95efc8b7ac4d182564c9d794187eb16ba7cb4f836c49c6b1a7cf62771e1943 WHIRLPOOL 7ae2e3f0ee9b3cb3ed43320998ab7906b05f8a1a0ebb948bfccdf0ca2c57ac74a517205622ffb39e460aaf997d742d267d400ce1a2cfd3554d3274a9f258f419
 MISC metadata.xml 523 SHA256 e13995c0dd8f3ebfaba07e96f2721cd2f3e81554567a1c0380f88870c8b97ceb SHA512 feded16f4fd775bb4531c067965acf4c5e2a536938a39c05e6fc47833ccf53c4e2509519d20e725368ec49c132a53ec344f4957a51c57ee2f16c9eae2ecdd001 WHIRLPOOL 5a50662514af64aeb0c229fc881f325628c7cf23da8d51d94d103a4ba96332dd567eece0b4484a18a4e2dc70e6d193b6acc89c62a02d691fea88d3e7d915d425
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIzoz4ACgkQFYEBGcdFJfKygwD/cKcrsqbGcwmu7F89PiloK58f
-XkZAbWMnX4eRNYy//SgA/Rp+ug9AqBYFUGPuqDZ3LH/DDEDQudMaSW10oRmEY6Io
-=wp85
+iF4EAREIAAYFAlKhneAACgkQFYEBGcdFJfIbAAEAhshmukXai96Yf7ifq4moXARz
+vbxCQNlaZJPbwTsDuG0A/iyTNOJY43KLH597SLsHiBMVYkp+HMWD33XAwwYMrtJn
+=aorl
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch b/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch
new file mode 100644
index 000000000000..a3e71375f621
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch
@@ -0,0 +1,28 @@
+From: François Tigeot <ftigeot@wolfpond.org>
+Date: Sat, 21 Sep 2013 10:34:51 +0000 (+0200)
+Subject: osdep_bsd.c: Fix a typo causing memory to be overwritten
+X-Git-Url: http://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/38e088314a2a4b7f8031f50eb546c22e5024bdf4
+
+osdep_bsd.c: Fix a typo causing memory to be overwritten
+
+* When compiled on DragonFly+gcc 4.7.3, this out of bounds array element
+  initialization causes an important variable to be overwritten and a
+  subsequent WindowMaker crash
+
+* It was sheer luck other compilers/environments didn't exhibit any obvious
+  issue so far
+---
+
+diff --git a/src/osdep_bsd.c b/src/osdep_bsd.c
+index 3393240..ad504ad 100644
+--- a/src/osdep_bsd.c
++++ b/src/osdep_bsd.c
+@@ -86,7 +86,7 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc)
+ 		mib[0] = CTL_KERN;
+ 		mib[1] = KERN_ARGMAX;
+ 		mib[2] = 0;
+-		mib[4] = 0;
++		mib[3] = 0;
+ 
+ 		count = sizeof(argmax);
+ 		if (sysctl(mib, 2, &argmax, &count, NULL, 0) == -1)
diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
new file mode 100644
index 000000000000..1c9f1f253421
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild,v 1.1 2013/12/06 09:50:17 voyageur Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	png? ( media-libs/libpng:0= )
+	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff:0 )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+		fi;
+	done;
+
+	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
+	epatch "${FILESDIR}"/${P}-bsd_crash.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# image format types
+	# xpm is provided by X itself
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}