* [gentoo-commits] repo/gentoo:master commit in: games-strategy/dopewars/, games-strategy/dopewars/files/
@ 2018-05-01 19:37 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2018-05-01 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 2de88f03f39f8ef50015dd7b1c87fc7b32119f5f
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue May 1 19:08:58 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue May 1 19:35:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de88f03
games-strategy/dopewars: Stop using games.eclass
Package-Manager: Portage-2.3.31, Repoman-2.3.9
games-strategy/dopewars/dopewars-1.5.12-r3.ebuild | 64 ++++++++++++++++++++++
.../files/dopewars-1.5.12-CVE-2009-3591.patch | 4 +-
2 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
new file mode 100644
index 00000000000..4d1c3843761
--- /dev/null
+++ b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Re-Write of the game Drug Wars"
+HOMEPAGE="http://dopewars.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls ncurses gtk gnome sdl"
+
+RDEPEND="
+ ncurses? ( >=sys-libs/ncurses-5.2:0= )
+ gtk? ( x11-libs/gtk+:2 )
+ dev-libs/glib:2
+ nls? ( virtual/libintl )
+ sdl? (
+ media-libs/libsdl
+ media-libs/sdl-mixer
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+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:' \
+ src/dopewars.c || die
+}
+
+src_configure() {
+ local myservconf
+
+ if ! use gtk ; then
+ myservconf="--disable-gui-client --disable-gui-server --disable-glibtest --disable-gtktest"
+ fi
+
+ econf \
+ $(use_enable ncurses curses-client) \
+ $(use_enable nls) \
+ $(use_with sdl) \
+ --without-esd \
+ --enable-networking \
+ --enable-plugins \
+ ${myservconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -r "${ED}"/usr/share/gnome || die
+ rm -rf "${ED}"/usr/share/doc
+ make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png
+ HTML_DOCS="doc/*html" 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
index d657bf8744f..3b8b066a81c 100644
--- 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
@@ -3,8 +3,8 @@ 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
---- dopewars/trunk/src/serverside.c 2009/03/10 07:18:49 1032
-+++ dopewars/trunk/src/serverside.c 2009/10/05 04:11:32 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:
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/dopewars/, games-strategy/dopewars/files/
@ 2020-12-31 21:02 Stefan Strogin
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Strogin @ 2020-12-31 21:02 UTC (permalink / raw
To: gentoo-commits
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-31 21:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-01 19:37 [gentoo-commits] repo/gentoo:master commit in: games-strategy/dopewars/, games-strategy/dopewars/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-12-31 21:02 Stefan Strogin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox