diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
| commit | 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch) | |
| tree | 53bf797418ac5e9b99c41ca0382c87b82421e5de /games-strategy | |
| parent | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff) | |
gentoo new year resync : 01.01.2021
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/Manifest.gz | bin | 8233 -> 8225 bytes | |||
| -rw-r--r-- | games-strategy/dopewars/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/dopewars/dopewars-1.6.1.ebuild (renamed from games-strategy/dopewars/dopewars-1.5.12-r3.ebuild) | 22 | ||||
| -rw-r--r-- | games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch | 20 |
4 files changed, 13 insertions, 34 deletions
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz Binary files differindex 04dd2640dc76..be09f6ef23f6 100644 --- a/games-strategy/Manifest.gz +++ b/games-strategy/Manifest.gz diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest index 66ab1b46973d..56829024e05e 100644 --- a/games-strategy/dopewars/Manifest +++ b/games-strategy/dopewars/Manifest @@ -1,4 +1,3 @@ -AUX dopewars-1.5.12-CVE-2009-3591.patch 696 BLAKE2B a627b4b714af717942f310411154a069b5ee9a9e98454f325e085354bf1d534528048404cf8c0f78150d5f6af9ca1f8e9aac2d95c90d864e3bea5de51546086d SHA512 3f9476db27f1de31363470688f8a5ec97fa51fda4eb6025da513a1ad1640e5faa802ee7202e0698970eb3bbcb0edadfd304d839f2a3643a64d50e7354c8a049e -DIST dopewars-1.5.12.tar.gz 1419725 BLAKE2B 930a0406bbf36f874d3bb00c7883c7d47136022e0209ec3993302cd75979d9f80033c973e23d60c4db70a335bfd3b8ff99075af470cb382ded59fc9289ee0edc SHA512 cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a -EBUILD dopewars-1.5.12-r3.ebuild 1504 BLAKE2B f84e67f880840e61f606a344ee51702c3b658c14721dd7cdbf40d93fce7b4216e870d475991fc0f2dbeb655e7d5142d1ad499b3b308999e0dd59f4c267426fc7 SHA512 a8407811ef881a1ddd2f03f5f79d6cb7c86062a2d9a941ed7bb94d78479111fb811c7a4aa4c167a761e0aab6e9c6c7ed02cc754068776c5e8af969894fd01a5a +DIST dopewars-1.6.1.tar.gz 1024168 BLAKE2B 28d650e0d1eccdfa9aa799bb4b35e82facc800ed9cbde9778c7182bd615ad0b1ec7d3fd323473f381f3ed1902b8e305a7994a5e351728aa1028be2e0665bfa57 SHA512 fab27b483b5a24abd95ffe6a52fe92c7179d8ee3e7d27393f0e7c265202781ab6a58e3b3214ff84bbc0e8195644b5c2ec94616b5f63b3fa9dc2ad2f9216e37d1 +EBUILD dopewars-1.6.1.ebuild 1499 BLAKE2B 5630e1358aa39dcbe52df7f88ecd99e7d1f655f50c57d832cd137e0467cfb71a84dd9c5834f49bfc475b89f58f7674c0eabdbdf312bd3450692c6e6d70201dbd SHA512 2af517fff53cc61a802a9109b6ce5aa1dca32665e84143e841ed5f29c342f35ead91fe9c56ec0f4f7c42c8e9f4497ee7865391766f7378e540278d1d99342fa0 MISC metadata.xml 331 BLAKE2B af8487e0de1082dcc36415bf1216b7fcfdf35a3caf93fe3e5a0f40de32978b442eac43dfc7283a82a5403e5abfc73ff2b48ee6fce3b489a6fbc88529c4db28ab SHA512 26259f05b18c933c638d693805a106d26288c96ba220a719d8ec12d65b28c9abdb1d120694d31c07194282081e92dd83522e936771ab71e2ce86ea12d629d5b4 diff --git a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild b/games-strategy/dopewars/dopewars-1.6.1.ebuild index 7da820832395..0ad7abd73123 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 3b8b066a81cd..000000000000 --- 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; |