Date: Saturday, October 22, 2011 @ 16:45:31 Author: eric Revision: 141061
archrelease: copy trunk to extra-i686, extra-x86_64 Added: liquidwar/repos/extra-i686/PKGBUILD (from rev 141060, liquidwar/trunk/PKGBUILD) liquidwar/repos/extra-i686/liquidwar-5.6.4-ovflfix.patch (from rev 141060, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch) liquidwar/repos/extra-i686/liquidwar.install (from rev 141060, liquidwar/trunk/liquidwar.install) liquidwar/repos/extra-x86_64/PKGBUILD (from rev 141060, liquidwar/trunk/PKGBUILD) liquidwar/repos/extra-x86_64/liquidwar-5.6.4-ovflfix.patch (from rev 141060, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch) liquidwar/repos/extra-x86_64/liquidwar.install (from rev 141060, liquidwar/trunk/liquidwar.install) Deleted: liquidwar/repos/extra-i686/PKGBUILD liquidwar/repos/extra-i686/liquidwar.install liquidwar/repos/extra-x86_64/PKGBUILD liquidwar/repos/extra-x86_64/liquidwar.install --------------------------------------------+ extra-i686/PKGBUILD | 62 +++++++++++++-------------- extra-i686/liquidwar-5.6.4-ovflfix.patch | 18 +++++++ extra-i686/liquidwar.install | 32 ++++++------- extra-x86_64/PKGBUILD | 62 +++++++++++++-------------- extra-x86_64/liquidwar-5.6.4-ovflfix.patch | 18 +++++++ extra-x86_64/liquidwar.install | 32 ++++++------- 6 files changed, 132 insertions(+), 92 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-10-22 20:45:01 UTC (rev 141060) +++ extra-i686/PKGBUILD 2011-10-22 20:45:31 UTC (rev 141061) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Jeff Mickey <j...@archlinux.org> - -pkgname=liquidwar -pkgver=5.6.4 -pkgrel=5 -pkgdesc="A unique multiplayer wargame" -arch=('i686' 'x86_64') -url="http://www.ufoot.org/liquidwar/" -license=('GPL') -depends=('allegro4') -makedepends=('python2') -install=liquidwar.install -source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz - http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig) -sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' - 'a262967d60e0f04ac5b99693144ef6b0038bb6c4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's/python/python2/' doc/Makefile.in - [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm" - LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS - make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink -} Copied: liquidwar/repos/extra-i686/PKGBUILD (from rev 141060, liquidwar/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-10-22 20:45:31 UTC (rev 141061) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Jeff Mickey <j...@archlinux.org> + +pkgname=liquidwar +pkgver=5.6.4 +pkgrel=6 +pkgdesc="A unique multiplayer wargame" +arch=('i686' 'x86_64') +url="http://www.ufoot.org/liquidwar/" +license=('GPL') +depends=('allegro4') +makedepends=('python2') +install=liquidwar.install +source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz + http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch) +sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' + 'a262967d60e0f04ac5b99693144ef6b0038bb6c4' + 'e2102792c54a01b7cd14adb6d72404044175ec7e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch" + sed -i 's/python/python2/' doc/Makefile.in + [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm" + LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS + make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink +} Copied: liquidwar/repos/extra-i686/liquidwar-5.6.4-ovflfix.patch (from rev 141060, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch) =================================================================== --- extra-i686/liquidwar-5.6.4-ovflfix.patch (rev 0) +++ extra-i686/liquidwar-5.6.4-ovflfix.patch 2011-10-22 20:45:31 UTC (rev 141061) @@ -0,0 +1,18 @@ +--- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 ++++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 +@@ -100,12 +100,12 @@ + + data->privacy = privacy; + data->log = log; +- strncpy (data->metaserver, metaserver, URL_SIZE); ++ strncpy (data->metaserver, metaserver, sizeof(data->metaserver)); + data->port = port; + data->busy_players = busy_players; + data->max_players = max_players; +- strncpy (data->password, password, URL_SIZE); +- strncpy (data->comment, comment, URL_SIZE); ++ strncpy (data->password, password, sizeof(data->password)); ++ strncpy (data->comment, comment, sizeof(data->comment)); + } + + /*------------------------------------------------------------------*/ Deleted: extra-i686/liquidwar.install =================================================================== --- extra-i686/liquidwar.install 2011-10-22 20:45:01 UTC (rev 141060) +++ extra-i686/liquidwar.install 2011-10-22 20:45:31 UTC (rev 141061) @@ -1,16 +0,0 @@ -infodir=usr/share/info -file=(liquidwar.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} Copied: liquidwar/repos/extra-i686/liquidwar.install (from rev 141060, liquidwar/trunk/liquidwar.install) =================================================================== --- extra-i686/liquidwar.install (rev 0) +++ extra-i686/liquidwar.install 2011-10-22 20:45:31 UTC (rev 141061) @@ -0,0 +1,16 @@ +infodir=usr/share/info +file=(liquidwar.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file $infodir/dir 2> /dev/null +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-10-22 20:45:01 UTC (rev 141060) +++ extra-x86_64/PKGBUILD 2011-10-22 20:45:31 UTC (rev 141061) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Jeff Mickey <j...@archlinux.org> - -pkgname=liquidwar -pkgver=5.6.4 -pkgrel=5 -pkgdesc="A unique multiplayer wargame" -arch=('i686' 'x86_64') -url="http://www.ufoot.org/liquidwar/" -license=('GPL') -depends=('allegro4') -makedepends=('python2') -install=liquidwar.install -source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz - http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig) -sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' - 'a262967d60e0f04ac5b99693144ef6b0038bb6c4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's/python/python2/' doc/Makefile.in - [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm" - LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS - make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink -} Copied: liquidwar/repos/extra-x86_64/PKGBUILD (from rev 141060, liquidwar/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-10-22 20:45:31 UTC (rev 141061) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Jeff Mickey <j...@archlinux.org> + +pkgname=liquidwar +pkgver=5.6.4 +pkgrel=6 +pkgdesc="A unique multiplayer wargame" +arch=('i686' 'x86_64') +url="http://www.ufoot.org/liquidwar/" +license=('GPL') +depends=('allegro4') +makedepends=('python2') +install=liquidwar.install +source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz + http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch) +sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' + 'a262967d60e0f04ac5b99693144ef6b0038bb6c4' + 'e2102792c54a01b7cd14adb6d72404044175ec7e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch" + sed -i 's/python/python2/' doc/Makefile.in + [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm" + LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS + make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink +} Copied: liquidwar/repos/extra-x86_64/liquidwar-5.6.4-ovflfix.patch (from rev 141060, liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch) =================================================================== --- extra-x86_64/liquidwar-5.6.4-ovflfix.patch (rev 0) +++ extra-x86_64/liquidwar-5.6.4-ovflfix.patch 2011-10-22 20:45:31 UTC (rev 141061) @@ -0,0 +1,18 @@ +--- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 ++++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 +@@ -100,12 +100,12 @@ + + data->privacy = privacy; + data->log = log; +- strncpy (data->metaserver, metaserver, URL_SIZE); ++ strncpy (data->metaserver, metaserver, sizeof(data->metaserver)); + data->port = port; + data->busy_players = busy_players; + data->max_players = max_players; +- strncpy (data->password, password, URL_SIZE); +- strncpy (data->comment, comment, URL_SIZE); ++ strncpy (data->password, password, sizeof(data->password)); ++ strncpy (data->comment, comment, sizeof(data->comment)); + } + + /*------------------------------------------------------------------*/ Deleted: extra-x86_64/liquidwar.install =================================================================== --- extra-x86_64/liquidwar.install 2011-10-22 20:45:01 UTC (rev 141060) +++ extra-x86_64/liquidwar.install 2011-10-22 20:45:31 UTC (rev 141061) @@ -1,16 +0,0 @@ -infodir=usr/share/info -file=(liquidwar.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} Copied: liquidwar/repos/extra-x86_64/liquidwar.install (from rev 141060, liquidwar/trunk/liquidwar.install) =================================================================== --- extra-x86_64/liquidwar.install (rev 0) +++ extra-x86_64/liquidwar.install 2011-10-22 20:45:31 UTC (rev 141061) @@ -0,0 +1,16 @@ +infodir=usr/share/info +file=(liquidwar.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file $infodir/dir 2> /dev/null +}