commit: 58462db8f600e9f2a120cbc7e5664573f5326dc3 Author: Stefan Strogin <steils <AT> gentoo <DOT> org> AuthorDate: Thu Dec 31 21:00:37 2020 +0000 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> CommitDate: Thu Dec 31 21:01:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58462db8
games-strategy/dopewars: upgrade to 1.6.1 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> games-strategy/dopewars/Manifest | 2 +- ...wars-1.5.12-r3.ebuild => dopewars-1.6.1.ebuild} | 22 +++++++++++----------- .../files/dopewars-1.5.12-CVE-2009-3591.patch | 20 -------------------- 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest index 144e8684bcc..12435e19901 100644 --- a/games-strategy/dopewars/Manifest +++ b/games-strategy/dopewars/Manifest @@ -1 +1 @@ -DIST dopewars-1.5.12.tar.gz 1419725 BLAKE2B 930a0406bbf36f874d3bb00c7883c7d47136022e0209ec3993302cd75979d9f80033c973e23d60c4db70a335bfd3b8ff99075af470cb382ded59fc9289ee0edc SHA512 cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a +DIST dopewars-1.6.1.tar.gz 1024168 BLAKE2B 28d650e0d1eccdfa9aa799bb4b35e82facc800ed9cbde9778c7182bd615ad0b1ec7d3fd323473f381f3ed1902b8e305a7994a5e351728aa1028be2e0665bfa57 SHA512 fab27b483b5a24abd95ffe6a52fe92c7179d8ee3e7d27393f0e7c265202781ab6a58e3b3214ff84bbc0e8195644b5c2ec94616b5f63b3fa9dc2ad2f9216e37d1 diff --git a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild b/games-strategy/dopewars/dopewars-1.6.1.ebuild similarity index 74% rename from games-strategy/dopewars/dopewars-1.5.12-r3.ebuild rename to games-strategy/dopewars/dopewars-1.6.1.ebuild index 7da82083239..0ad7abd7312 100644 --- a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild +++ b/games-strategy/dopewars/dopewars-1.6.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit desktop toolchain-funcs +inherit autotools desktop toolchain-funcs DESCRIPTION="Re-Write of the game Drug Wars" HOMEPAGE="http://dopewars.sourceforge.net/"; -SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz" +SRC_URI="https://github.com/benmwebb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -29,13 +29,12 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) " +DOCS=( AUTHORS NEWS README.md TODO doc/example-cfg doc/example-igneous ) + src_prepare() { default - eapply "${FILESDIR}"/${P}-CVE-2009-3591.patch - sed -i \ - -e "/priv_hiscore/ s:DPDATADIR:\"/var/lib\":" \ - -e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \ - -e 's:index.html:html/index.html:' \ + eautoreconf + sed -i -e 's:index.html:html/index.html:' \ src/dopewars.c || die sed -i -e "s/\-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/g" \ configure || die @@ -61,7 +60,8 @@ src_configure() { src_install() { emake DESTDIR="${D}" install rm -r "${ED}"/usr/share/gnome || die - rm -rf "${ED}"/usr/share/doc + rm -r "${ED}"/usr/share/doc || die make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png - HTML_DOCS="doc/*html" einstalldocs + HTML_DOCS="doc/*html doc/help/" + einstalldocs } diff --git a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch deleted file mode 100644 index 3b8b066a81c..00000000000 --- a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch for CVE-2009-3591 -- bug 288295. - -Fetched from upstream SVN: -http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1033&r2=1032&pathrev=1033 - ---- trunk/src/serverside.c 2009/03/10 07:18:49 1032 -+++ trunk/src/serverside.c 2009/10/05 04:11:32 1033 -@@ -504,6 +504,12 @@ - break; - case C_REQUESTJET: - i = atoi(Data); -+ /* Make sure value is within range */ -+ if (i < 0 || i >= NumLocation) { -+ dopelog(3, LF_SERVER, _("%s: DENIED jet to invalid location %s"), -+ GetPlayerName(Play), Data); -+ break; -+ } - if (Play->EventNum == E_FIGHT || Play->EventNum == E_FIGHTASK) { - if (CanRunHere(Play)) { - break;
