diff options
Diffstat (limited to 'source/xap/gnuchess')
-rwxr-xr-x | source/xap/gnuchess/gnuchess.SlackBuild | 24 | ||||
-rw-r--r-- | source/xap/gnuchess/gnuchess.SlackBuild.diff | 89 | ||||
-rw-r--r-- | source/xap/gnuchess/gnuchess.gcc4_fix.diff | 11 | ||||
-rw-r--r-- | source/xap/gnuchess/gnuchess.getline.glibc.diff | 39 | ||||
-rw-r--r-- | source/xap/gnuchess/xboard.desktop | 2 |
5 files changed, 10 insertions, 155 deletions
diff --git a/source/xap/gnuchess/gnuchess.SlackBuild b/source/xap/gnuchess/gnuchess.SlackBuild index 99cb5c067..b27193dc9 100755 --- a/source/xap/gnuchess/gnuchess.SlackBuild +++ b/source/xap/gnuchess/gnuchess.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,11 +21,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERGNUCHESS=5.07 +VERGNUCHESS=5.08 VERSJENG=11.2 VEREBOARD=1.1.1 -VERXBOARD=4.4.2 -BUILD=${BUILD:-5} +VERXBOARD=4.5.1 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -59,11 +59,8 @@ mkdir -p $TMP $PKG ### gnuchess cd $TMP rm -rf gnuchess-$VERGNUCHESS -tar xvf $CWD/gnuchess-$VERGNUCHESS.tar.bz2 || exit 1 +tar xvf $CWD/gnuchess-$VERGNUCHESS.tar.?z* || exit 1 cd gnuchess-$VERGNUCHESS || exit 1 -# make gnuchess compile with gcc4 -zcat $CWD/gnuchess.gcc4_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/gnuchess.getline.glibc.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -80,8 +77,8 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/gnuchess-$VERGNUCHESS cp -a \ - doc/README \ - AUTHORS COPYING INSTALL NEWS TODO \ + doc/README* \ + AUTHORS COPYING* INSTALL NEWS TODO \ $PKG/usr/doc/gnuchess-$VERGNUCHESS ### Sjeng @@ -105,7 +102,7 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/Sjeng-Free-$VERSJENG cp -a \ - AUTHORS BUGS COPYING NEWS README THANKS TODO \ + AUTHORS BUGS COPYING* NEWS README* THANKS TODO \ $PKG/usr/doc/Sjeng-Free-$VERSJENG ### eboard @@ -129,7 +126,7 @@ make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/eboard-$VEREBOARD cp -a \ - AUTHORS COPYING README TODO Documentation/*.txt \ + AUTHORS COPYING* README* TODO Documentation/*.txt \ $PKG/usr/doc/eboard-$VEREBOARD ### XBoard @@ -146,9 +143,6 @@ find . \ # --infodir is fubar. #zcat $CWD/xboard.infodir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Taken from Debian to fix CVE-2004-2552 -# FOR WHICH THERE IS NO ATTACK VECTOR!!! -#zcat $CWD/xboard.buffer_overflow_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/xap/gnuchess/gnuchess.SlackBuild.diff b/source/xap/gnuchess/gnuchess.SlackBuild.diff deleted file mode 100644 index 0112a9d22..000000000 --- a/source/xap/gnuchess/gnuchess.SlackBuild.diff +++ /dev/null @@ -1,89 +0,0 @@ ---- gnuchess.SlackBuild 2006-04-04 03:47:10.000000000 +0300 -+++ gnuchess.SlackBuild 2007-05-08 17:06:11.000000000 +0300 -@@ -4,10 +4,10 @@ - - VERGNUCHESS=5.07 - VERSJENG=11.2 --VEREBOARD=0.9.5 -+VEREBOARD=1.0.3 - VERXBOARD=4.2.7 - ARCH=${ARCH:-i486} --BUILD=${BUILD:-2} -+BUILD=${BUILD:-3} - - if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" -@@ -27,6 +27,8 @@ - rm -rf gnuchess-$VERGNUCHESS - tar xjvf $CWD/gnuchess-$VERGNUCHESS.tar.bz2 - cd gnuchess-$VERGNUCHESS -+# make gnuchess compile with gcc4 -+zcat $CWD/gnuchess.gcc4_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig - chown -R root:root . - find . -perm 664 -exec chmod 644 {} \; - find . -perm 600 -exec chmod 644 {} \; -@@ -93,33 +95,13 @@ - find . -perm 511 -exec chmod 755 {} \; - find . -perm 711 -exec chmod 755 {} \; - find . -perm 555 -exec chmod 755 {} \; --CFLAGS="$SLKCFLAGS" \ - ./configure \ -- --prefix=/usr -+ --prefix=/usr --extra-flags=`echo $SLKCFLAGS | sed -e "y/ /:/"` - make -j3 --#make install DESTDIR=$PKG --install -d $PKG/usr/bin --install -m 0755 eboard $PKG/usr/bin/eboard --install -m 0755 eboard-config $PKG/usr/bin/eboard-config --install -m 0755 eboard-addtheme $PKG/usr/bin/eboard-addtheme --install -d $PKG/usr/man/man1 --install -d $PKG/usr/man/man6 --install -m 0644 eboard.6 $PKG/usr/man/man6 --install -m 0644 eboard-addtheme.1 $PKG/usr/man/man1 --install -m 0644 eboard-config.1 $PKG/usr/man/man1 --install -d $PKG/usr/share/eboard --install -m 0644 classic.png $PKG/usr/share/eboard/classic.png --install -m 0644 ghouls.png $PKG/usr/share/eboard/ghouls.png --install -m 0644 plastic.png $PKG/usr/share/eboard/plastic.png --install -m 0644 eboard_themes.conf $PKG/usr/share/eboard/eboard_themes.conf --install -m 0644 NAG.en.txt $PKG/usr/share/eboard/NAG.en.txt --( cd multilang -- install -d $PKG/usr/share/eboard -- install -m 0644 eboard.cs.dict eboard.de.dict eboard.es.dict eboard.it.dict eboard.pt_BR.dict $PKG/usr/share/eboard --) -+make install DESTDIR=$PKG - mkdir -p $PKG/usr/doc/eboard-$VEREBOARD - cp -a \ -- AUTHORS COPYING README TODO \ -+ AUTHORS COPYING README TODO Documentation/*.txt \ - $PKG/usr/doc/eboard-$VEREBOARD - - ### XBoard -@@ -140,6 +122,8 @@ - find . -perm 555 -exec chmod 755 {} \; - # --infodir is fubar. - zcat $CWD/xboard.infodir.diff.gz | patch -p1 --verbose --backup --suffix=.orig -+# Taken from Debian to fix CVE-2004-2552 -+zcat $CWD/xboard.buffer_overflow_fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - CFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ -@@ -153,6 +137,7 @@ - install -c ./pxboard $PKG/usr/bin/pxboard - install -c -m 644 ./xboard.man $PKG/usr/man/man6/xboard.6 - install -c -m 644 ./zic2xpm.man $PKG/usr/man/man6/zic2xpm.6 -+mkdir -p $PKG/usr/info - install -c -m 644 xboard.info $PKG/usr/info/xboard.info - mkdir -p $PKG/usr/doc/xboard-$VERXBOARD - cp -a \ -@@ -165,8 +150,9 @@ - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - ) - gzip -9 $PKG/usr/man/man?/*.? -+gzip -9 $PKG/usr/info/*.info - mkdir -p $PKG/usr/share/pixmaps --cat $CWD/chess.png > $PKG/usr/share/pixmaps/chess.png -+cp $CWD/chess.png $PKG/usr/share/pixmaps/chess.png - mkdir -p $PKG/usr/share/applications - cat $CWD/eboard.desktop > $PKG/usr/share/applications/eboard.desktop - cat $CWD/xboard.desktop > $PKG/usr/share/applications/xboard.desktop diff --git a/source/xap/gnuchess/gnuchess.gcc4_fix.diff b/source/xap/gnuchess/gnuchess.gcc4_fix.diff deleted file mode 100644 index a68351941..000000000 --- a/source/xap/gnuchess/gnuchess.gcc4_fix.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- gnuchess-5.07/src/input.c 2007-05-08 15:55:16.688003280 +0300 -+++ gnuchess-5.07/src/input.c 2007-05-08 15:55:29.238088685 +0300 -@@ -92,7 +92,7 @@ - fgets(inputstr, MAXSTR, stdin); - } - --static pthread_t input_thread; -+pthread_t input_thread; - - /* Mutex and condition variable for thread communication */ - diff --git a/source/xap/gnuchess/gnuchess.getline.glibc.diff b/source/xap/gnuchess/gnuchess.getline.glibc.diff deleted file mode 100644 index 51a45df1d..000000000 --- a/source/xap/gnuchess/gnuchess.getline.glibc.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- ./src/input.c.orig 2010-02-19 21:34:10.000000000 -0600 -+++ ./src/input.c 2010-02-19 21:36:33.000000000 -0600 -@@ -127,7 +127,7 @@ - (RealGameCnt+1)/2 + 1 ); - } - pthread_mutex_lock(&input_mutex); -- getline(prompt); -+ chess_getline(prompt); - input_status = INPUT_AVAILABLE; - pthread_cond_signal(&input_cond); - pthread_mutex_unlock(&input_mutex); -@@ -173,13 +173,13 @@ - { - #ifdef HAVE_LIBREADLINE - if (isatty(STDIN_FILENO)) { -- getline = getline_readline; -+ chess_getline = getline_readline; - using_history(); - } else { -- getline = getline_standard; -+ chess_getline = getline_standard; - } - #else -- getline = getline_standard; -+ chess_getline = getline_standard; - #endif - /* Start input thread */ - pthread_create(&input_thread, NULL, input_func, NULL); ---- ./src/common.h.orig 2003-06-30 06:28:38.000000000 -0500 -+++ ./src/common.h 2010-02-19 21:35:33.000000000 -0600 -@@ -745,7 +745,7 @@ - * Input routine, initialized to one of the specific - * input routines. The given argument is the prompt. - */ --void (*getline) (char *); -+void (*chess_getline) (char *); - - #define MAXSTR 128 - extern char inputstr[MAXSTR]; diff --git a/source/xap/gnuchess/xboard.desktop b/source/xap/gnuchess/xboard.desktop index 6336cb63a..c1b2a2d3e 100644 --- a/source/xap/gnuchess/xboard.desktop +++ b/source/xap/gnuchess/xboard.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=XBoard GenericName=Chess Game Comment=A graphical chess engine frontend -Exec=xboard +Exec=xboard -fcp gnuchess Icon=/usr/share/pixmaps/chess.png Terminal=false Type=Application |