Red Eclipse 1.3

parent 578453b1
......@@ -4,31 +4,25 @@
# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves gmail.com>
pkgname=redeclipse
pkgver=1.2
pkgrel=3
pkgdesc='A first-person shooter, built as a total conversion of Cube Engine 2.'
pkgver=1.3
pkgrel=1
pkgdesc='A first-person shooter, built as a total conversion of Cube Engine 2'
arch=(i686 x86_64)
url=http://redeclipse.net
license=(CCPL-by-sa ZLIB)
depends=(enet libgl mesa sdl sdl_image sdl_mixer zlib hicolor-icon-theme)
makedepends=('mesa' 'gzip' 'imagemagick')
makedepends=('mesa' 'gzip')
categories=('games')
source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux_bsd.tar.bz2
system-libs.diff
no-x128-icon-since-old-imagemagick.diff
security-text-command-fix.patch)
md5sums=('e133361f79be01782bf0bbc4c5a01236'
'f34900e6c8247754800d8fba0600dfb7'
'd6c0c52a0e217e21f8951426fe40db18'
'89253e190972021c9e89b75d91ee408b')
source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_nix_bsd.tar.bz2
system-libs.diff)
md5sums=('ef11041eb9ef49c9a4b278ccfd544fe4'
'06757915ad76d693b38852fb4f9d1a11')
build() {
cd "$srcdir/$pkgname/src"
# Patches.
patch -uN Makefile $srcdir/system-libs.diff
patch -uN system-install.mk $srcdir/no-x128-icon-since-old-imagemagick.diff
patch -uN engine/textedit.h $srcdir/security-text-command-fix.patch
patch -uN Makefile $srcdir/system-libs.diff # System enet.
# Compilation.
make
......@@ -39,6 +33,5 @@ package() {
make -C src/ DESTDIR="$pkgdir" prefix=/usr system-install
# License.
install -Dm644 license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -Dm644 trademark.txt "$pkgdir/usr/share/licenses/$pkgname/TRADEMARK"
install -Dm644 doc/all-licenses.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt"
}
--- system-install.mk.old 2012-04-17 00:58:07.088468000 +0200
+++ system-install.mk 2012-04-17 00:59:08.305449416 +0200
@@ -4,7 +4,6 @@
install/nix/redeclipse_x32.png \
install/nix/redeclipse_x48.png \
install/nix/redeclipse_x64.png \
- install/nix/redeclipse_x128.png
prefix=/usr/local
games=
@@ -28,9 +27,6 @@
install/nix/redeclipse_x64.png: redeclipse.ico
convert 'redeclipse.ico[2]' $@
-install/nix/redeclipse_x128.png: redeclipse.ico
- convert 'redeclipse.ico[3]' $@
-
icons: $(ICONS)
system-install-client: client
@@ -88,7 +84,6 @@
install -d $(icondir)/32x32/apps
install -d $(icondir)/48x48/apps
install -d $(icondir)/64x64/apps
- install -d $(icondir)/128x128/apps
sed -e 's,@LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-e 's,@DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-e 's,@DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
@@ -101,8 +96,6 @@
$(icondir)/48x48/apps/$(redeclipse).png
install -m644 install/nix/redeclipse_x64.png \
$(icondir)/64x64/apps/$(redeclipse).png
- install -m644 install/nix/redeclipse_x128.png \
- $(icondir)/128x128/apps/$(redeclipse).png
system-install-cube2font: system-install-cube2font-docs
install -d $(bindir)
@@ -137,7 +130,6 @@
@rm -fv $(icondir)/32x32/apps/$(redeclipse).png
@rm -fv $(icondir)/48x48/apps/$(redeclipse).png
@rm -fv $(icondir)/64x64/apps/$(redeclipse).png
- @rm -fv $(icondir)/128x128/apps/$(redeclipse).png
system-uninstall: system-uninstall-client system-uninstall-server system-uninstall-data system-uninstall-docs system-uninstall-menus
-@rmdir -v $(libexecdir)/$(redeclipse)
Author: Lee "Eihrul" Salzman <lsalzman@gmail.com>
Date: Sun, 22 Jul 2012 21:22:55 +0000
Subject: text command fix
Description: File access security fix
Game maps can in cube2-engine games be transmitted either from server
to client or from client to client, which includes a config file
(mapname.cfg) which is in "cubescript" format, this makes it possible
for an attacker to send a malign script via a new map (which must be
chosen by admin on a server, or created in cooperative editing mode). A
script like this could trivially read/write to any files which the user
running the client has access to (it is executed when the client loads
the map).
.
This patch stops "textedit" commands being able to be run in map-run
scripts, thus disabling the ability to read/write to user files.
Origin: upstream, https://sourceforge.net/apps/trac/redeclipse/changeset/3764
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684143
Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=846368
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/redeclipse/+bug/1034148
--- a/src/engine/textedit.h
+++ b/src/engine/textedit.h
@@ -690,7 +690,7 @@
#define TEXTCOMMAND(f, s, d, body) ICOMMAND(0, f, s, d,\
editor *top = currentfocus();\
- if(!top) return;\
+ if(!top || identflags&IDF_WORLD) return;\
body\
)
--- Makefile.old 2011-07-31 21:38:04.000000000 +0200
+++ Makefile 2011-07-31 21:50:43.000000000 +0200
@@ -5,7 +5,7 @@
--- Makefile.orig 2012-08-31 05:59:06.000000000 +0000
+++ Makefile 2012-09-01 08:54:52.276484541 +0000
@@ -9,7 +9,7 @@
PLATFORM= $(shell uname -s)
PLATFORM_SUFFIX=_native
......@@ -9,37 +9,37 @@
STRIP=
ifeq (,$(findstring -g,$(CXXFLAGS)))
@@ -22,7 +22,7 @@
CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm
@@ -42,7 +42,7 @@
CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
else
CLIENT_INCLUDES= -DINTERFACE -DIRC $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
+CLIENT_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
endif
ifeq ($(PLATFORM),Linux)
CLIENT_LIBS+= -lrt
@@ -92,7 +92,7 @@
SERVER_LIBS= -mwindows -Llib -lzdll -lenet -lws2_32 -lwinmm
@@ -113,7 +113,7 @@
SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
else
SERVER_INCLUDES= -DSTANDALONE -DMASTERSERVER -DIRC $(INCLUDES)
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
-SERVER_LIBS= -Lenet/.libs -lenet -lz
+SERVER_LIBS= -lenet -lz
endif
SERVER_OBJS= \
shared/crypto-standalone.o \
@@ -157,13 +157,13 @@
$(STRIP) ../bin/reserver.exe
@@ -178,13 +178,13 @@
$(STRIP) $(WINBIN)/$(APPSERVER).exe
endif
else
-client: libenet $(CLIENT_OBJS)
+client: $(CLIENT_OBJS)
$(CXX) $(CXXFLAGS) -o reclient $(CLIENT_OBJS) $(CLIENT_LIBS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
ifneq (,$(STRIP))
$(STRIP) reclient
$(STRIP) $(APPCLIENT)
endif
-server: libenet $(SERVER_OBJS)
+server: $(SERVER_OBJS)
$(CXX) $(CXXFLAGS) -o reserver $(SERVER_OBJS) $(SERVER_LIBS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
ifneq (,$(STRIP))
$(STRIP) reserver
$(STRIP) $(APPSERVER)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment