Fixed backgammon segfaults in too-small window. Bug #150282

Package-Manager: portage-2.1.2.2

5 files changed, 174 insertions, 9 deletions

diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index f919934193e0..1bb133389a76 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-misc/bsd-games
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.29 2007/03/07 17:02:53 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.30 2007/05/16 18:35:28 tupone Exp $
+
+*bsd-games-2.17-r3 (16 May 2007)
+
+  16 May 2007; Tupone Alfredo <tupone@gentoo.org>
+  +files/bsd-games-2.17-bg.patch, +bsd-games-2.17-r3.ebuild:
+  Fixed backgammon segfaults in too-small window. Bug #150282 by carlosqueso
 
   07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   bsd-games-2.17-r2.ebuild:
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 777147a4c543..2658dfec3a52 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -5,6 +5,10 @@ AUX bsd-games-2.17-64bit.patch 1322 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f287
 MD5 257813b76a41c8b2c02701571c804227 files/bsd-games-2.17-64bit.patch 1322
 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f28773d files/bsd-games-2.17-64bit.patch 1322
 SHA256 cbe649fa75bc3e16f27032d05b8ce770ae036df83435211e429379852528fcfe files/bsd-games-2.17-64bit.patch 1322
+AUX bsd-games-2.17-bg.patch 732 RMD160 c7f5c44b151111e1da8b493c6e376b61e187a6b9 SHA1 197ae9a7ce927bbc1331aaa4f7b28eb971e75f4e SHA256 d25eb2b0e6790b6a852bce08f384994fed7b37a9d33d12d01b65e67fbd8f67d7
+MD5 f063590dd9cb06ef9abf72daf91a131d files/bsd-games-2.17-bg.patch 732
+RMD160 c7f5c44b151111e1da8b493c6e376b61e187a6b9 files/bsd-games-2.17-bg.patch 732
+SHA256 d25eb2b0e6790b6a852bce08f384994fed7b37a9d33d12d01b65e67fbd8f67d7 files/bsd-games-2.17-bg.patch 732
 AUX bsd-games-2.17-gcc4.patch 893 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296bb SHA1 adbdf06c228ee81ccc0a694db979ae4aab7591bc SHA256 96639f25206401c0dde3f9f28ac287c9e26c3efb526481fa48b482f8c9ab4ac0
 MD5 ecbae8c67d0898a9e4d428b940de45a2 files/bsd-games-2.17-gcc4.patch 893
 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296bb files/bsd-games-2.17-gcc4.patch 893
@@ -27,10 +31,14 @@ EBUILD bsd-games-2.17-r2.ebuild 3999 RMD160 90976dd6e6f7fddbc1517782425c713f3798
 MD5 0359e3bfe7002e1bde8a24abbc1d721c bsd-games-2.17-r2.ebuild 3999
 RMD160 90976dd6e6f7fddbc1517782425c713f37987a03 bsd-games-2.17-r2.ebuild 3999
 SHA256 26a47f68f404b48b1babfb9780c46d02e9665249c166f8069a0c82c0767aad3c bsd-games-2.17-r2.ebuild 3999
-MISC ChangeLog 4133 RMD160 e8ba0ba5cabf64f3dedadaa4314ec25298d52cf3 SHA1 4d0e833496a08087cd290a5f4a8878c6dd726b6d SHA256 ab57a9845c9b0b8af8c76a22a946d1100648e708d10a47578dde436fc053db97
-MD5 6dce52982a61f31d8ae0c2b9c65df2cd ChangeLog 4133
-RMD160 e8ba0ba5cabf64f3dedadaa4314ec25298d52cf3 ChangeLog 4133
-SHA256 ab57a9845c9b0b8af8c76a22a946d1100648e708d10a47578dde436fc053db97 ChangeLog 4133
+EBUILD bsd-games-2.17-r3.ebuild 4038 RMD160 8f1677e8e7a6983f267ac367c115d9fa2e61f69d SHA1 3fbf6be2d583b34bd5ea80b2020620d12ddb6b3e SHA256 fb45eda794110232beee0e0f7f05c3bcdd437b4b8eb4f8f17ab0cde7bae19074
+MD5 1fac5c6c7b402a9db9e500c66de5c9a9 bsd-games-2.17-r3.ebuild 4038
+RMD160 8f1677e8e7a6983f267ac367c115d9fa2e61f69d bsd-games-2.17-r3.ebuild 4038
+SHA256 fb45eda794110232beee0e0f7f05c3bcdd437b4b8eb4f8f17ab0cde7bae19074 bsd-games-2.17-r3.ebuild 4038
+MISC ChangeLog 4354 RMD160 9acd066dbb0d4bbaa8a1e5739c018548bd18111e SHA1 43083849efefa8c1bd3196a5929e3e388392dd41 SHA256 c72b8221709ab533097920aef9a186c4f58f44a223bb10cefd691207e9fcce19
+MD5 bce05fd1d5fea31eb34f5b31b94a3d53 ChangeLog 4354
+RMD160 9acd066dbb0d4bbaa8a1e5739c018548bd18111e ChangeLog 4354
+SHA256 c72b8221709ab533097920aef9a186c4f58f44a223bb10cefd691207e9fcce19 ChangeLog 4354
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -38,10 +46,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 27b34a2c494e0dffe4b571f839ad1c88 files/digest-bsd-games-2.17-r2 494
 RMD160 9e529f6c955c47d1932c953b23df61f165761c1f files/digest-bsd-games-2.17-r2 494
 SHA256 7e0561136f3d22a5323cb0d99293b99d11e79949c48dab69fc9f36b7bd9fdcdf files/digest-bsd-games-2.17-r2 494
+MD5 27b34a2c494e0dffe4b571f839ad1c88 files/digest-bsd-games-2.17-r3 494
+RMD160 9e529f6c955c47d1932c953b23df61f165761c1f files/digest-bsd-games-2.17-r3 494
+SHA256 7e0561136f3d22a5323cb0d99293b99d11e79949c48dab69fc9f36b7bd9fdcdf files/digest-bsd-games-2.17-r3 494
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGGuKMdz7hIScOURERApmRAJ9sgNe2ivIYAms0qBu5ZKgCGeEbNQCgxPUw
-2xJuWgEmzM21etIL8yf7Z1E=
-=fIaU
+iD8DBQFGS076RmMZkarFlIwRAhNqAKCi5SndEZsdoZY8/OEOpXyebI3r0gCg7blP
+3Alg/pdEzsOnK7qVKACYXQU=
+=mckB
 -----END PGP SIGNATURE-----
diff --git a/games-misc/bsd-games/bsd-games-2.17-r3.ebuild b/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
new file mode 100644
index 000000000000..b04c01177ffe
--- /dev/null
+++ b/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r3.ebuild,v 1.1 2007/05/16 18:35:28 tupone Exp $
+
+inherit eutils games
+
+DEB_PATCH_VER=7
+DESCRIPTION="collection of games from NetBSD"
+HOMEPAGE="http://www.advogato.org/proj/bsd-games/"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
+	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!games-misc/wtf
+	!app-misc/banner
+	sys-libs/ncurses
+	sys-apps/miscfiles"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+# Set GAMES_TO_BUILD variable to whatever you want
+export GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc
+backgammon banner battlestar bcd boggle caesar canfield countmail cribbage
+dab dm factor fish gomoku hack hangman hunt mille monop morse
+number phantasia pig pom ppt primes quiz rain random robots sail snake
+tetris trek wargames worm worms wtf wump}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${DISTDIR}"/bsdgames_${PV}-${DEB_PATCH_VER}.diff.gz \
+		"${FILESDIR}"/${P}-64bit.patch \
+		"${FILESDIR}"/${P}-headers.patch \
+		"${FILESDIR}"/${P}-bg.patch \
+		"${FILESDIR}"/${P}-gcc4.patch
+
+	sed -i \
+		-e "s:/usr/games:${GAMES_BINDIR}:" \
+		wargames/wargames \
+		|| die "sed wargames failed"
+
+	cp "${FILESDIR}"/config.params-gentoo config.params
+	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params
+	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params
+}
+
+src_compile() {
+	./configure || die
+	emake OPTIMIZE="${CFLAGS}" || die "emake failed"
+}
+
+src_test() {
+	addwrite /dev/full
+	emake -j1 check || die "make check failed"
+}
+
+build_game() {
+	has ${1} ${GAMES_TO_BUILD}
+}
+
+do_statefile() {
+	touch "${D}/${GAMES_STATEDIR}/${1}"
+	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}"
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
+		README PACKAGING SECURITY THANKS TODO YEAR2000
+
+	# set some binaries to run as games group (+S)
+	build_game atc && fperms g+s "${GAMES_BINDIR}"/atc
+	build_game battlestar && fperms g+s "${GAMES_BINDIR}"/battlestar
+	build_game canfield && fperms g+s "${GAMES_BINDIR}"/canfield
+	build_game cribbage && fperms g+s "${GAMES_BINDIR}"/cribbage
+	build_game phantasia && fperms g+s "${GAMES_BINDIR}"/phantasia
+	build_game robots && fperms g+s "${GAMES_BINDIR}"/robots
+	build_game sail && fperms g+s "${GAMES_BINDIR}"/sail
+	build_game snake && fperms g+s "${GAMES_BINDIR}"/snake
+	build_game tetris && fperms g+s "${GAMES_BINDIR}"/tetris-bsd
+
+	# state files
+	build_game atc && do_statefile atc_score
+	build_game battlestar && do_statefile battlestar.log
+	build_game canfield && do_statefile cfscores
+	build_game cribbage && do_statefile criblog
+	build_game hack && keepdir "${GAMES_STATEDIR}"/hack
+	build_game robots && do_statefile robots_roll
+	build_game sail && do_statefile saillog
+	build_game snake && do_statefile snake.log && do_statefile snakerawscores
+	build_game tetris && do_statefile tetris-bsd.scores
+	# state dirs
+	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/*
+
+	# extra docs
+	build_game atc && { docinto atc ; dodoc atc/BUGS; }
+	build_game boggle && { docinto boggle ; dodoc boggle/README{,.linux}; }
+	build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
+	build_game hunt && { docinto hunt ; dodoc hunt/README{,.linux}; }
+	build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
+	build_game trek && { docinto trek ; dodoc trek/USD.doc/trek.me; }
+
+	# Since factor is usually not installed, and primes.6 is a symlink to
+	# factor.6, make sure that primes.6 is ok ...
+	if build_game primes && [[ ! $(build_game factor) ]] ; then
+		rm -f "${D}"/usr/share/man/man6/{factor,primes}.6
+		newman factor/factor.6 primes.6
+	fi
+
+	prepalldocs
+	prepgamesdirs
+}
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
new file mode 100644
index 000000000000..07dc520b77e4
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
@@ -0,0 +1,22 @@
+--- backgammon/common_source/fancy.c.old	2007-05-16 20:16:46.000000000 +0200
++++ backgammon/common_source/fancy.c	2007-05-16 20:19:00.000000000 +0200
+@@ -58,7 +58,7 @@
+ int     lUP;			/* length of UP */
+ int     CO;			/* number of columns */
+ int     LI;			/* number of lines */
+-int    *linect;			/* array of lengths of lines on screen (the
++static int linect[25];		/* array of lengths of lines on screen (the
+ 				 * actual screen is not stored) */
+ 
+  /* two letter codes */
+@@ -728,10 +728,5 @@
+ 		lND = strlen(ND);
+ 	if (LI < 24 || CO < 72 || !(CL && UP && ND))
+ 		return (0);
+-	linect = (int *) calloc(LI + 1, sizeof(int));
+-	if (linect == NULL) {
+-		write(2, "\r\nOut of memory!\r\n", 18);
+-		getout(0);
+-	}
+ 	return (1);
+ }
diff --git a/games-misc/bsd-games/files/digest-bsd-games-2.17-r3 b/games-misc/bsd-games/files/digest-bsd-games-2.17-r3
new file mode 100644
index 000000000000..24250086d8d2
--- /dev/null
+++ b/games-misc/bsd-games/files/digest-bsd-games-2.17-r3
@@ -0,0 +1,6 @@
+MD5 238a38a3a017ca9b216fc42bde405639 bsd-games-2.17.tar.gz 2563311
+RMD160 a8f9c829bb09dfa071ecafbd6cb15560dba888d8 bsd-games-2.17.tar.gz 2563311
+SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 bsd-games-2.17.tar.gz 2563311
+MD5 24561d4326d22ae9fce0778db548db45 bsdgames_2.17-7.diff.gz 12530
+RMD160 4c213632111ac8035058214889fd9229723b9785 bsdgames_2.17-7.diff.gz 12530
+SHA256 41b4b99ae96f1b42beb37818f377cc194ab4146fe845818e8d29663d4f52ff88 bsdgames_2.17-7.diff.gz 12530