Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/dopewars/, games-strategy/dopewars/files/
Date: Thu, 31 Dec 2020 21:02:07
Message-Id: 1609448497.58462db8f600e9f2a120cbc7e5664573f5326dc3.steils@gentoo
1 commit: 58462db8f600e9f2a120cbc7e5664573f5326dc3
2 Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 31 21:00:37 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 31 21:01:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58462db8
7
8 games-strategy/dopewars: upgrade to 1.6.1
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
12
13 games-strategy/dopewars/Manifest | 2 +-
14 ...wars-1.5.12-r3.ebuild => dopewars-1.6.1.ebuild} | 22 +++++++++++-----------
15 .../files/dopewars-1.5.12-CVE-2009-3591.patch | 20 --------------------
16 3 files changed, 12 insertions(+), 32 deletions(-)
17
18 diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
19 index 144e8684bcc..12435e19901 100644
20 --- a/games-strategy/dopewars/Manifest
21 +++ b/games-strategy/dopewars/Manifest
22 @@ -1 +1 @@
23 -DIST dopewars-1.5.12.tar.gz 1419725 BLAKE2B 930a0406bbf36f874d3bb00c7883c7d47136022e0209ec3993302cd75979d9f80033c973e23d60c4db70a335bfd3b8ff99075af470cb382ded59fc9289ee0edc SHA512 cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a
24 +DIST dopewars-1.6.1.tar.gz 1024168 BLAKE2B 28d650e0d1eccdfa9aa799bb4b35e82facc800ed9cbde9778c7182bd615ad0b1ec7d3fd323473f381f3ed1902b8e305a7994a5e351728aa1028be2e0665bfa57 SHA512 fab27b483b5a24abd95ffe6a52fe92c7179d8ee3e7d27393f0e7c265202781ab6a58e3b3214ff84bbc0e8195644b5c2ec94616b5f63b3fa9dc2ad2f9216e37d1
25
26 diff --git a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild b/games-strategy/dopewars/dopewars-1.6.1.ebuild
27 similarity index 74%
28 rename from games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
29 rename to games-strategy/dopewars/dopewars-1.6.1.ebuild
30 index 7da82083239..0ad7abd7312 100644
31 --- a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
32 +++ b/games-strategy/dopewars/dopewars-1.6.1.ebuild
33 @@ -1,13 +1,13 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 +# Copyright 1999-2020 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 -EAPI=6
39 +EAPI=7
40
41 -inherit desktop toolchain-funcs
42 +inherit autotools desktop toolchain-funcs
43
44 DESCRIPTION="Re-Write of the game Drug Wars"
45 HOMEPAGE="http://dopewars.sourceforge.net/"
46 -SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
47 +SRC_URI="https://github.com/benmwebb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
48
49 LICENSE="GPL-2"
50 SLOT="0"
51 @@ -29,13 +29,12 @@ DEPEND="${RDEPEND}
52 nls? ( sys-devel/gettext )
53 "
54
55 +DOCS=( AUTHORS NEWS README.md TODO doc/example-cfg doc/example-igneous )
56 +
57 src_prepare() {
58 default
59 - eapply "${FILESDIR}"/${P}-CVE-2009-3591.patch
60 - sed -i \
61 - -e "/priv_hiscore/ s:DPDATADIR:\"/var/lib\":" \
62 - -e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \
63 - -e 's:index.html:html/index.html:' \
64 + eautoreconf
65 + sed -i -e 's:index.html:html/index.html:' \
66 src/dopewars.c || die
67 sed -i -e "s/\-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/g" \
68 configure || die
69 @@ -61,7 +60,8 @@ src_configure() {
70 src_install() {
71 emake DESTDIR="${D}" install
72 rm -r "${ED}"/usr/share/gnome || die
73 - rm -rf "${ED}"/usr/share/doc
74 + rm -r "${ED}"/usr/share/doc || die
75 make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png
76 - HTML_DOCS="doc/*html" einstalldocs
77 + HTML_DOCS="doc/*html doc/help/"
78 + einstalldocs
79 }
80
81 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
82 deleted file mode 100644
83 index 3b8b066a81c..00000000000
84 --- a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
85 +++ /dev/null
86 @@ -1,20 +0,0 @@
87 -Patch for CVE-2009-3591 -- bug 288295.
88 -
89 -Fetched from upstream SVN:
90 -http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1033&r2=1032&pathrev=1033
91 -
92 ---- trunk/src/serverside.c 2009/03/10 07:18:49 1032
93 -+++ trunk/src/serverside.c 2009/10/05 04:11:32 1033
94 -@@ -504,6 +504,12 @@
95 - break;
96 - case C_REQUESTJET:
97 - i = atoi(Data);
98 -+ /* Make sure value is within range */
99 -+ if (i < 0 || i >= NumLocation) {
100 -+ dopelog(3, LF_SERVER, _("%s: DENIED jet to invalid location %s"),
101 -+ GetPlayerName(Play), Data);
102 -+ break;
103 -+ }
104 - if (Play->EventNum == E_FIGHT || Play->EventNum == E_FIGHTASK) {
105 - if (CanRunHere(Play)) {
106 - break;