Add patch from Redhat bugzilla to make sure that ~/.rocksndiamonds is created writabl...

Package-Manager: portage-2.1.10.11/cvs/Linux i686
RepoMan-Options: --force

diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index 8c672b1278da22aeea15e7ca2fcbc0d4e724b824..3026ffcf4976957da0e32f4b979bf4c3b7549494 100644 (file)
--- a/games-arcade/rocksndiamonds/ChangeLog
+++ b/games-arcade/rocksndiamonds/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for games-arcade/rocksndiamonds
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.42 2011/08/12 18:57:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.43 2011/12/13 04:15:12 mr_bones_ Exp $
+
+*rocksndiamonds-3.3.0.1-r1 (13 Dec 2011)
+
+  13 Dec 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  -rocksndiamonds-3.2.6.1.ebuild,
+  -files/rocksndiamonds-3.2.6.1-parallel-build.patch,
+  -rocksndiamonds-3.3.0.1.ebuild, +rocksndiamonds-3.3.0.1-r1.ebuild,
+  +files/rocksndiamonds-3.3.0.1-perms.patch:
+  Add patch from Redhat bugzilla to make sure that ~/.rocksndiamonds is created
+  writable only by the user (bug #394499)
 
   12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
   rocksndiamonds-3.3.0.1.ebuild:

diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
index 4871f3d17d9c47518ca507aa91100ecb40d4430d..ddce599ed884b5984eb4edfb7acf98721cba1373 100644 (file)
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,31 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX rocksndiamonds-3.2.6.1-parallel-build.patch 380 RMD160 c7be803b01337e5462490ba85a13b140321682b7 SHA1 500bf286a9a8e88f01dda77214921db600922904 SHA256 45b34ccf039153021b74d553553faa5fe913c68028acf59d57448f1e779df1a2
 AUX rocksndiamonds-3.3.0.1-parallel-build.patch 392 RMD160 26ffff09baa3ab2a00fa911ceec90434e670f245 SHA1 f40ba68b698e5d66d2f89687ca9f7fd69daa1d67 SHA256 ba1bc3e33d6173d4bd245730d9691a1618afe5061949259c9f76c510f380bad4
+AUX rocksndiamonds-3.3.0.1-perms.patch 1258 RMD160 44f4f3ca173067d210e04154201661897238e835 SHA1 b9e704cb5ce789546a73b731950f692d413a5646 SHA256 56914fc689f21847eb7a382a8df5301a85562ec3bb1b59dcfd0c1bb0c9ac9c84
 DIST BD2K3-1.0.0.zip 4715324 RMD160 50b0ffdecb609711f9bfd5819b50ac1816e18588 SHA1 822f8c2767b68360f73dd5ae4bc56c3e39c2d9ba SHA256 5fc5130c859e69d6907bff87e01ff2296d59f7376202a8aacc03e55f359fb351
 DIST Boulder_Dash_Dream-1.0.0.zip 10923437 RMD160 ecf209811ed15767d1114c82c800ca801d0387a4 SHA1 d6900835dee0b551ac3aeac275657817c4a26786 SHA256 6f9dc48023830fbdc318d8f18013b5a7e84ab3c815ba566a4a2c46faeb65c969
 DIST Contributions-1.2.0.zip 9499312 RMD160 d6f2f83bbfeb224a09175ef0c39b5a1530f092be SHA1 5f67026debbc672fdf8effcc2dc7efd087a5ae3a SHA256 d533dc69cd136d2bb7d76d674ab087285799191e0a516320aba8ac2368ce6dd2
 DIST Snake_Bite-1.0.0.zip 6506066 RMD160 b8a5d7dc61086c8b3ef08275dd597ecae63ee80d SHA1 ddf2ccf0caa2a8595ea771878827429c1f09cdad SHA256 6f6b573d89588f56cb3b326f3a42fb57277307bd709713dbef329885ac4d006d
 DIST Sokoban-1.0.0.zip 295339 RMD160 b0c07aa209dad3f615a6dd0a0aeced4a527059a2 SHA1 0ae1cf65db9f8b6a76e55d7236f77a19684b6027 SHA256 63f9d36789edca22c0f9454202f9fd21fcee89111642459b5882314f13ebdc0e
 DIST rnd-contrib-1.0.0.tar.gz 3389242 RMD160 54c9b860b7d027eb6e24af72e8b731df85776195 SHA1 9b55ae5865575ba76a90353b1b3883ef3950d792 SHA256 c24b56399ba202ebf60bb60316e81d7996ccd02ae281a7e54f2f555e088a1ce1
-DIST rnd_jue-v7.zip 10216825 RMD160 3c8a4b86289267d30772b0a1cd3889d3a476eb49 SHA1 0396db88600db82cbdda5cc090b05974c3026509 SHA256 8b7910ce8e9170eabad917bdbe0ca2db840ed4489414022e706025fb40125906
 DIST rnd_jue-v8.tar.bz2 17244645 RMD160 ce044462880707bcffe517ebf3aca1f4469fcff1 SHA1 2071230bf7c3237927174bc9bc7b13b9c163aaae SHA256 442a21a24b7c004f0c8f8c4fc844cac7f3ff4692574a0a7df2835a1da4dab7fa
 DIST rockslevels-dx-1.0.tar.gz 211151 RMD160 1fb969e4205aa16318a8a8ae4d33de21b5050c78 SHA1 5f2d119c978c4f91bb1ff53594a8765b5237caae SHA256 23f1710710eef1dcd1c490670de16d2d58dc98f3fdd9a2df186bdca590e57579
 DIST rockslevels-emc-1.0.tar.gz 3824268 RMD160 d9baa3e625f8857b40dc247f39ae16a53d27f77c SHA1 1b4de87eef54f3f8b5bb3dd6eda47588dc2182d4 SHA256 a04e554fb8b6d010c73e21de090f116dad6054e43e00edc80c59c71a8a1eaa0c
 DIST rockslevels-sp-1.0.tar.gz 373564 RMD160 ddfc4b5af5bdbbabd1fd884f14f76257d75e52d3 SHA1 049edb601654bdf31046ffd60c8234a13cf19540 SHA256 770d75a5926bb924c6787a6f95ee9f7af743b629ea14005ab0375b57eb488f25
-DIST rocksndiamonds-3.2.6.1.tar.gz 3473786 RMD160 136df20ffbe745b65417d39f406d2bbb4f544f1c SHA1 18ddf5ce93a83a3fb89d65b69a80291a978f5b7e SHA256 bd38ae60ddeadb11c6bab876ad861b373139deca8c6dafdeae3f640051949d6c
 DIST rocksndiamonds-3.3.0.1.tar.gz 2494558 RMD160 44f8bec6be74ce0346ec6826844d923cc69069a6 SHA1 529612c95355292fb76d0b954ce51f7cb54dc22a SHA256 974897f14136ecec91c7bdded8d904d74f2064a6c8a6c6c83f2f7111108747d3
-EBUILD rocksndiamonds-3.2.6.1.ebuild 3196 RMD160 0e31cde6a9f79c23da3f6ad189b102e269d6cd76 SHA1 4420aaca4097401bc7b279f3a77690cb4dad7609 SHA256 299ae3a2d8ce6d8f0c03ca9af777b08091bebf308105568e6141dbb94013cfd2
-EBUILD rocksndiamonds-3.3.0.1.ebuild 3248 RMD160 59422a909b61130ede30d04ac53e948d692593b9 SHA1 60e0485c13ec955fcf7f617c519150c115a5685c SHA256 354d68fc61b61866c95c32f73fadeebfb38452308738db2ac6e10ea70de95d64
-MISC ChangeLog 6505 RMD160 3069ced44d890aed29d809239e710dccbd9de1fe SHA1 a004a20db1ed2ad740cf806e65a723f9a6a57087 SHA256 f3ec8ed7eae28351a32067cddaadff466f079e5df75e6e3eb1ae21210c06e293
+EBUILD rocksndiamonds-3.3.0.1-r1.ebuild 3289 RMD160 ea4d360684c9552a7c67d149aa99ee5d67b10fa2 SHA1 1db47b145f7066e811c63cbafaaa5e5671be38ad SHA256 a0e6e9d9690574d87b1287042cdc1ae2d7a9a39daa3c21501be0fd720afe397f
+MISC ChangeLog 6926 RMD160 021d3518f2530a8a35f366d5c260bd79b0a81ec2 SHA1 40a9d1e1b05ba13d819f3515ac95abdb4d9a1e92 SHA256 426c0b787947ffb6953a781979db1bdd1d589b8968f88c59c268551b037c5af1
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk5Fd50ACgkQIiMqcbOVdxRA/QP+ITbYk8fKKqH+v4oKBBDG2TL6
-XhKdnV2NHFfWHV10dU1MZLE/in26SdAqBoFiPStM92IyyQpqxuJrQ/LUttL/d5Av
-j8oYkdXWs0vdRHODu0leYukGeZAWmuapxxjRHLsizlZ9tM9TjW1O9y4clVk62ZND
-kSQnEi1RFDo1P7tvx4I=
-=pMC1
------END PGP SIGNATURE-----

diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.1-parallel-build.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.1-parallel-build.patch
deleted file mode 100644 (file)
index 8e3a565..0000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.2.6.1-parallel-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/126080
-
---- src/Makefile
-+++ src/Makefile
-@@ -220,7 +220,7 @@
- # build targets
- # -----------------------------------------------------------------------------
- 
--all: libgame_dir game_em_dir $(PROGNAME)
-+all: $(PROGNAME)
- 
- $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON)
-       $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME)

diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.0.1-perms.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.0.1-perms.patch
new file mode 100644 (file)
index 0000000..65a06e6
--- /dev/null
+++ b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.0.1-perms.patch
@@ -0,0 +1,29 @@
+diff -up rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-3.3.0.1/src/libgame/setup.c
+--- rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606   2011-12-12 14:28:30.083078680 -0500
++++ rocksndiamonds-3.3.0.1/src/libgame/setup.c 2011-12-12 14:34:36.758744753 -0500
+@@ -1293,11 +1293,14 @@ void sortTreeInfo(TreeInfo **node_first)
+ #define MODE_W_ALL            (S_IWUSR | S_IWGRP | S_IWOTH)
+ #define MODE_X_ALL            (S_IXUSR | S_IXGRP | S_IXOTH)
+ 
++#define MODE_R_PRIVATE                (S_IRUSR)
+ #define MODE_W_PRIVATE                (S_IWUSR)
++#define MODE_X_PRIVATE                (S_IXUSR)
++
+ #define MODE_W_PUBLIC         (S_IWUSR | S_IWGRP)
+ #define MODE_W_PUBLIC_DIR     (S_IWUSR | S_IWGRP | S_ISGID)
+ 
+-#define DIR_PERMS_PRIVATE     (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
++#define DIR_PERMS_PRIVATE     (MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE)
+ #define DIR_PERMS_PUBLIC      (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
+ 
+ #define FILE_PERMS_PRIVATE    (MODE_R_ALL | MODE_W_PRIVATE)
+@@ -1456,7 +1459,8 @@ void createDirectory(char *dir, char *te
+   if (running_setgid)
+     posix_umask(last_umask & group_umask);
+   else
+-    dir_mode |= MODE_W_ALL;
++    if (permission_class == PERMS_PUBLIC)
++      dir_mode |= MODE_W_ALL;
+ 
+   if (!fileExists(dir))
+     if (posix_mkdir(dir, dir_mode) != 0)

diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild
deleted file mode 100644 (file)
index c5b05be..0000000
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.2.6.1.ebuild,v 1.3 2010/02/10 03:26:02 josejx Exp $
-
-EAPI=2
-inherit flag-o-matic eutils games
-
-DESCRIPTION="A Boulderdash clone"
-HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"
-SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
-       http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
-       http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
-       http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
-       http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
-       http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
-       http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
-       http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
-       http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
-       http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
-       http://www.jb-line.de/hp/rnd_jue-v7.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="X sdl"
-
-DEPEND="app-arch/unzip
-       X? ( x11-libs/libX11 )
-       !sdl? ( x11-libs/libX11 )
-       sdl? (
-               >=media-libs/libsdl-1.2.3[joystick,video]
-               >=media-libs/sdl-mixer-1.2.4[mikmod,mp3,timidity]
-               media-libs/sdl-net
-               >=media-libs/sdl-image-1.2.2[gif]
-               media-libs/smpeg
-       )"
-
-src_unpack() {
-       unpack ${P}.tar.gz
-       cd "${S}"
-       unpack \
-               rockslevels-emc-1.0.tar.gz \
-               rockslevels-sp-1.0.tar.gz \
-               rockslevels-dx-1.0.tar.gz
-}
-
-src_prepare() {
-       # make it parallel-friendly.
-       epatch "${FILESDIR}"/${P}-parallel-build.patch
-       sed -i \
-               -e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
-               -e '/^MAKE/d' \
-               -e '/^CC/d' \
-               Makefile \
-               || die "sed failed"
-
-       cd levels
-       unpack \
-               rnd_jue-v7.zip \
-               BD2K3-1.0.0.zip \
-               rnd-contrib-1.0.0.tar.gz \
-               Snake_Bite-1.0.0.zip \
-               Contributions-1.2.0.zip \
-               Boulder_Dash_Dream-1.0.0.zip \
-               Sokoban-1.0.0.zip
-}
-
-src_compile() {
-       replace-cpu-flags k6 k6-1 k6-2 i586
-
-       local makeopts="RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}"
-       if use X || { ! use X && ! use sdl; } ; then
-               make clean || die
-               emake ${makeopts} OPTIONS="${CFLAGS}" x11 || die
-               mv rocksndiamonds{,.x11}
-       fi
-       if use sdl ; then
-               make clean || die
-               emake ${makeopts} OPTIONS="${CFLAGS}" sdl || die
-               mv rocksndiamonds{,.sdl}
-       fi
-}
-
-src_install() {
-       if use X || { ! use X && ! use sdl; } ; then
-               dogamesbin rocksndiamonds.x11 || die "dogamesbin failed"
-       fi
-       if use sdl ; then
-               dogamesbin rocksndiamonds.sdl || die "dogamesbin failed"
-               dosym rocksndiamonds.sdl "${GAMES_BINDIR}/rocksndiamonds"
-       else
-               dosym rocksndiamonds.x11 "${GAMES_BINDIR}/rocksndiamonds"
-       fi
-       insinto "${GAMES_DATADIR}/${PN}"
-       doins -r graphics levels music sounds || die "doins failed"
-
-       newman rocksndiamonds.{1,6}
-       dodoc CHANGES CREDITS HARDWARE README TODO docs/elements/*.txt
-       newicon graphics/gfx_classic/rocks_icon_32x32.pcx ${PN}.pcx
-       make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.pcx
-
-       prepgamesdirs
-}

diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1-r1.ebuild
similarity index 95%
rename from games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1.ebuild
rename to games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1-r1.ebuild
index 4ef5b9f1cf771dee3d4e78ed192db1a0d785b973..ef2713dd6372a211337827dc29efae26f4b7906f 100644 (file)
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1.ebuild
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1.ebuild,v 1.4 2011/08/12 18:57:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.3.0.1-r1.ebuild,v 1.1 2011/12/13 04:15:12 mr_bones_ Exp $
 
 EAPI=2
 inherit flag-o-matic eutils games
@@ -46,7 +46,9 @@ src_unpack() {
 
 src_prepare() {
        # make it parallel-friendly.
-       epatch "${FILESDIR}"/${P}-parallel-build.patch
+       epatch \
+               "${FILESDIR}"/${P}-parallel-build.patch \
+               "${FILESDIR}"/${P}-perms.patch
        sed -i \
                -e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
                -e '/^MAKE/d' \