Archives
Archives
| From: | "Michael Sterrett (mr_bones_)" <mr_bones_@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in games-arcade/rocksndiamonds/files: rocksndiamonds-3.3.1.2-perms.patch rocksndiamonds-3.3.1.2-parallel-build.patch |
| Date: | Wed, 31 Dec 2014 21:19:51 |
| Message-Id: | 20141231211946.C1E76E978@oystercatcher.gentoo.org |
| 1 | mr_bones_ 14/12/31 21:19:46 |
| 2 | |
| 3 | Added: rocksndiamonds-3.3.1.2-perms.patch |
| 4 | rocksndiamonds-3.3.1.2-parallel-build.patch |
| 5 | Log: |
| 6 | version bump (bug #533904) |
| 7 | |
| 8 | (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: rocksndiamonds-3.3.1.2-perms.patch |
| 17 | =================================================================== |
| 18 | diff -up rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-3.3.0.1/src/libgame/setup.c |
| 19 | --- rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 2011-12-12 14:28:30.083078680 -0500 |
| 20 | +++ rocksndiamonds-3.3.0.1/src/libgame/setup.c 2011-12-12 14:34:36.758744753 -0500 |
| 21 | @@ -1293,11 +1293,14 @@ void sortTreeInfo(TreeInfo **node_first) |
| 22 | #define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH) |
| 23 | #define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH) |
| 24 | |
| 25 | +#define MODE_R_PRIVATE (S_IRUSR) |
| 26 | #define MODE_W_PRIVATE (S_IWUSR) |
| 27 | +#define MODE_X_PRIVATE (S_IXUSR) |
| 28 | + |
| 29 | #define MODE_W_PUBLIC (S_IWUSR | S_IWGRP) |
| 30 | #define MODE_W_PUBLIC_DIR (S_IWUSR | S_IWGRP | S_ISGID) |
| 31 | |
| 32 | -#define DIR_PERMS_PRIVATE (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE) |
| 33 | +#define DIR_PERMS_PRIVATE (MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE) |
| 34 | #define DIR_PERMS_PUBLIC (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR) |
| 35 | |
| 36 | #define FILE_PERMS_PRIVATE (MODE_R_ALL | MODE_W_PRIVATE) |
| 37 | @@ -1456,7 +1459,8 @@ void createDirectory(char *dir, char *te |
| 38 | if (running_setgid) |
| 39 | posix_umask(last_umask & group_umask); |
| 40 | else |
| 41 | - dir_mode |= MODE_W_ALL; |
| 42 | + if (permission_class == PERMS_PUBLIC) |
| 43 | + dir_mode |= MODE_W_ALL; |
| 44 | |
| 45 | if (!fileExists(dir)) |
| 46 | if (posix_mkdir(dir, dir_mode) != 0) |
| 47 | |
| 48 | |
| 49 | |
| 50 | 1.1 games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch |
| 51 | |
| 52 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch?rev=1.1&view=markup |
| 53 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch?rev=1.1&content-type=text/plain |
| 54 | |
| 55 | Index: rocksndiamonds-3.3.1.2-parallel-build.patch |
| 56 | =================================================================== |
| 57 | diff -ru rocksndiamonds-3.3.1.2.orig/src/Makefile rocksndiamonds-3.3.1.2/src/Makefile |
| 58 | --- rocksndiamonds-3.3.1.2.orig/src/Makefile 2013-11-24 08:05:56.000000000 -0500 |
| 59 | +++ rocksndiamonds-3.3.1.2/src/Makefile 2014-12-31 15:47:37.539941795 -0500 |
| 60 | @@ -255,7 +255,7 @@ |
| 61 | # build targets |
| 62 | # ----------------------------------------------------------------------------- |
| 63 | |
| 64 | -all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) |
| 65 | +all: $(PROGNAME) |
| 66 | |
| 67 | $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON) |
| 68 | $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME) |