From: Michael Sterrett Date: Mon, 7 Aug 2006 03:45:42 +0000 (+0000) Subject: add upstream patch for DoS issue (bug #141563); rev bumped to force out X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4da82c42591e0b41a5c97b701510a6dff2be4098;p=gentoo.git add upstream patch for DoS issue (bug #141563); rev bumped to force out Package-Manager: portage-2.1.1_pre4-r3 --- diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index cbfc0cc3d582..8040be163d7a 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,21 +1,25 @@ +AUX freeciv-2.0.8-DoS.patch 1065 RMD160 f4a383a17a6508f7e95966d63bc03785156398e8 SHA1 9106687bf60cc1d321d57277e8a465402d85b99b SHA256 c3e3f83440b581aea1d2d9f46f10f4daeded8fa0f822f974439c6a7d783b190a +MD5 6f66d4ce889a078a7a154b6e5c9842c9 files/freeciv-2.0.8-DoS.patch 1065 +RMD160 f4a383a17a6508f7e95966d63bc03785156398e8 files/freeciv-2.0.8-DoS.patch 1065 +SHA256 c3e3f83440b581aea1d2d9f46f10f4daeded8fa0f822f974439c6a7d783b190a files/freeciv-2.0.8-DoS.patch 1065 AUX freeciv.png 3657 RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd SHA1 929520ea26f3e3093f8ab1984ffd61c99c154511 SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160 MD5 42ae5aa07b3e176f81dfa905bcc0eb4f files/freeciv.png 3657 RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd files/freeciv.png 3657 SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160 files/freeciv.png 3657 DIST freeciv-2.0.8.tar.bz2 8535513 RMD160 7ab93442cf63db22e9e660d2c1955990a1376d26 SHA1 b9098dc46ed169e053f9c7405cc3abf9cebe9792 SHA256 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3 DIST stdsounds3.tar.gz 118278 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 SHA1 103d02a0702687fb038f5187a321f8074b4ebfb5 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa -EBUILD freeciv-2.0.8.ebuild 5047 RMD160 c353e1b7ec06a13b8a16b360e4d03a14ef9933b8 SHA1 48d2ff7043b8b2fccff0b3467d0c20b12a9572c9 SHA256 380d84238b508e9a242a72c11294d1c775a8c6301f3ddfffb9b88ee4094abcf7 -MD5 7a107dc027360c6180646dcefa7d05d2 freeciv-2.0.8.ebuild 5047 -RMD160 c353e1b7ec06a13b8a16b360e4d03a14ef9933b8 freeciv-2.0.8.ebuild 5047 -SHA256 380d84238b508e9a242a72c11294d1c775a8c6301f3ddfffb9b88ee4094abcf7 freeciv-2.0.8.ebuild 5047 -MISC ChangeLog 7870 RMD160 ee216c3cbcf99239a36b9532c0a33850a66c8747 SHA1 cc673f9f869c1354cf9d2226e0769d73caaea459 SHA256 4508bcf28a0c2f88418eff9970553492960c5d82c1bb4588f60d54524aa8639a -MD5 45a0e98dcde9282398bdd57e867ad93a ChangeLog 7870 -RMD160 ee216c3cbcf99239a36b9532c0a33850a66c8747 ChangeLog 7870 -SHA256 4508bcf28a0c2f88418eff9970553492960c5d82c1bb4588f60d54524aa8639a ChangeLog 7870 +EBUILD freeciv-2.0.8-r1.ebuild 5174 RMD160 d79965d3ef7de17087d3e69880cef0016d119f56 SHA1 fc282f363d6e9309b17be59df203bc5e77d7bc29 SHA256 de96c2a18da2c8697e2a8a5250ea4acd558486ea7f9d392f6d3a671d2d2f430e +MD5 b387320a219a22925126e2d621266bea freeciv-2.0.8-r1.ebuild 5174 +RMD160 d79965d3ef7de17087d3e69880cef0016d119f56 freeciv-2.0.8-r1.ebuild 5174 +SHA256 de96c2a18da2c8697e2a8a5250ea4acd558486ea7f9d392f6d3a671d2d2f430e freeciv-2.0.8-r1.ebuild 5174 +MISC ChangeLog 8122 RMD160 7f7909a130e654ef771015580db13f2b1369dc01 SHA1 ff32d30b484f0890f9a5e81af3ba714d10047a22 SHA256 7a1bae153e7c5f4a9ec73ffc1d56446746940197b964929e21ca12c25aa89631 +MD5 91a1d97f189f712d3378559a8eaa4fe4 ChangeLog 8122 +RMD160 7f7909a130e654ef771015580db13f2b1369dc01 ChangeLog 8122 +SHA256 7a1bae153e7c5f4a9ec73ffc1d56446746940197b964929e21ca12c25aa89631 ChangeLog 8122 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 40f3883d3eefecb900a217e2dc40e3da files/digest-freeciv-2.0.8 479 -RMD160 d6332b47a3075ae2b93849528921b9e3672197b5 files/digest-freeciv-2.0.8 479 -SHA256 2d5e6d0e14506a64b40ca97b8bec34a97483796d45226cbe1b316d617377bdf2 files/digest-freeciv-2.0.8 479 +MD5 40f3883d3eefecb900a217e2dc40e3da files/digest-freeciv-2.0.8-r1 479 +RMD160 d6332b47a3075ae2b93849528921b9e3672197b5 files/digest-freeciv-2.0.8-r1 479 +SHA256 2d5e6d0e14506a64b40ca97b8bec34a97483796d45226cbe1b316d617377bdf2 files/digest-freeciv-2.0.8-r1 479 diff --git a/games-strategy/freeciv/files/digest-freeciv-2.0.8 b/games-strategy/freeciv/files/digest-freeciv-2.0.8 deleted file mode 100644 index fd5043d06cbd..000000000000 --- a/games-strategy/freeciv/files/digest-freeciv-2.0.8 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 8535513 -RMD160 7ab93442cf63db22e9e660d2c1955990a1376d26 freeciv-2.0.8.tar.bz2 8535513 -SHA256 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3 freeciv-2.0.8.tar.bz2 8535513 -MD5 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz 118278 -RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 stdsounds3.tar.gz 118278 -SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa stdsounds3.tar.gz 118278 diff --git a/games-strategy/freeciv/freeciv-2.0.8.ebuild b/games-strategy/freeciv/freeciv-2.0.8.ebuild deleted file mode 100644 index 10ffe06d61d0..000000000000 --- a/games-strategy/freeciv/freeciv-2.0.8.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8.ebuild,v 1.10 2006/07/30 03:33:10 kumba Exp $ - -inherit games - -MY_P=${PN}-${PV/_/-} -DESCRIPTION="multiplayer strategy game (Civilization Clone)" -HOMEPAGE="http://www.freeciv.org/" -SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2 - !dedicated? ( - alsa? ( - http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - esd? ( - http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) - sdl? ( - http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~mips ppc sparc x86" -IUSE="alsa dedicated esd gtk nls readline sdl Xaw3d" - -RDEPEND="sys-libs/zlib - readline? ( sys-libs/readline ) - !dedicated? ( - gtk? ( - >=dev-util/pkgconfig-0.9 - >=x11-libs/gtk+-2.0.0 - >=dev-libs/glib-2.0.0 - >=dev-libs/atk-1.0.3 - >=x11-libs/pango-1.0.5 - ) - !gtk? ( - Xaw3d? ( - x11-libs/Xaw3d ) - !Xaw3d? ( - || ( - x11-libs/libXaw - virtual/x11 ) ) - || ( ( - x11-libs/libX11 - x11-libs/libICE - x11-libs/libSM - x11-libs/libXt - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm ) - virtual/x11 ) ) - alsa? ( - >=media-libs/alsa-lib-1.0 - >=media-libs/audiofile-0.2 - ) - esd? ( >=media-sound/esound-0.2 ) - sdl? ( - >=media-libs/sdl-mixer-1.2 - >=media-libs/libsdl-1.2 - ) - )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - || ( ( x11-proto/xextproto ) - virtual/x11 )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - games_pkg_setup - if ! use dedicated ; then - if use gtk ; then - einfo "The Freeciv Client will be built with the GTK+-2 toolkit" - elif use Xaw3d ; then - einfo "The Freeciv Client will be built with the Xaw3d toolkit" - else - einfo "The Freeciv Client will be built with the Xaw toolkit" - fi - if ! use esd && ! use alsa && ! use sdl ; then - ewarn - ewarn "To enable sound support in civclient, you must enable" - ewarn "at least one of this USE flags: alsa, esd, sdl" - ewarn - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # install locales in /usr/share/locale - sed -i \ - -e 's:^\(localedir = \).*:\1/usr/share/locale:' \ - intl/Makefile.in po/Makefile.in.in \ - || die "sed failed" - sed -i \ - -e '/^#define LOCALEDIR/s:".*":"/usr/share/locale":' \ - configure \ - || die "sed failed" - - # change .desktop icon to the freeciv icon rather than the gnome globe - sed -i \ - -e 's:^\(Icon=\).*:\1freeciv.png:' \ - bootstrap/freeciv.desktop.in \ - || die "sed failed" - - # change .desktop category so it is not gnome specific - sed -i \ - -e 's:^\(Categories=GNOME;Application;Game;Strategy;\):Categories=Application;Game;StrategyGame;:' \ - bootstrap/freeciv.desktop.in \ - || die "sed failed" - # install the .desktop in /usr/share/applications - sed -i \ - -e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \ - client/Makefile.in \ - || die "sed failed" - - # remove civclient manpage if dedicated server - if use dedicated ; then - sed -i \ - -e '/man_MANS = /s:civclient.6::' \ - doc/man/Makefile.in \ - || die "sed failed" - fi -} - -src_compile() { - local mysoundconf - local myclient - - if use dedicated ; then - mysoundconf="--disable-alsa --disable-esd --disable-sdl-mixer" - myclient="no" - else - myclient="xaw" - use Xaw3d && myclient="xaw3d" - if use gtk ; then - myclient="gtk-2.0" - fi - #FIXME --enable-{alsa,esd,sdl-mixer} actually disable them... - #FIXME ==> use --disable-* only, and autodetect to enable. - use alsa || mysoundconf="${mysoundconf} --disable-alsa" - use esd || mysoundconf="${mysoundconf} --disable-esd" - use sdl || mysoundconf="${mysoundconf} --disable-sdl-mixer" - fi - - egamesconf \ - --disable-dependency-tracking \ - --with-zlib \ - $(use_enable nls) \ - $(use_with readline) \ - --enable-client=${myclient} \ - ${mysoundconf} \ - || die "egamesconf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - if ! use dedicated ; then - # Install the app-defaults if Xaw/Xaw3d toolkit - if ! use gtk ; then - insinto /etc/X11/app-defaults - doins data/Freeciv || die "doins failed" - fi - # Install sounds if at least one sound plugin was built - if use alsa || use esd || use sdl ; then - cp -R ../data/stdsounds* "${D}${GAMES_DATADIR}/${PN}" \ - || die "failed to install sounds" - fi - # Create and install the html manual. It can't be done for dedicated - # servers, because the 'civmanual' tool is then not built. Also - # delete civmanual from the GAMES_BINDIR, because it's then useless. - # Note: to have it localized, it should be ran from _postinst, or - # something like that, but then it's a PITA to avoid orphan files... - ./manual/civmanual || die "civmanual failed" - dohtml manual*.html || die "dohtml failed" - rm -f "${D}/${GAMES_BINDIR}/civmanual" - fi - - dodoc ChangeLog NEWS \ - doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO} - - doicon "${FILESDIR}/${PN}.png" - - prepgamesdirs -}