diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 11:35:50 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-10-28 11:35:50 -0300 |
| commit | 8856e6fe26ce35b4caf6beeac324f583ec1b6133 (patch) | |
| tree | c42a03e2b7610a39d167af36357607399aa40045 /extra/liquidwar | |
| parent | 5100458465d1ed420073c3213349bf430075ddbc (diff) | |
| parent | 0424b5fc47f106db6498c4cda3476e1d49fe0f82 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/esmtp/PKGBUILD
community/geany-plugins/PKGBUILD
community/giggle/PKGBUILD
community/guichan/PKGBUILD
community/mxml/PKGBUILD
community/ruby-gtk2/PKGBUILD
core/libtool/PKGBUILD
core/mkinitcpio-busybox/PKGBUILD
core/udev/PKGBUILD
extra/audacious/PKGBUILD
extra/conky/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/kino/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/poppler/PKGBUILD
extra/postfix/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/qtcurve-gtk2/PKGBUILD
extra/transmission/PKGBUILD
extra/xfburn/PKGBUILD
extra/xfce4-xkb-plugin/PKGBUILD
extra/xorg-server/PKGBUILD
extra/yelp/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine/wine.install
Diffstat (limited to 'extra/liquidwar')
| -rw-r--r-- | extra/liquidwar/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/liquidwar/liquidwar-5.6.4-ovflfix.patch | 18 |
2 files changed, 24 insertions, 4 deletions
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD index 5f12019fc..1b7022396 100644 --- a/extra/liquidwar/PKGBUILD +++ b/extra/liquidwar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140692 2011-10-18 03:46:14Z eric $ +# $Id: PKGBUILD 141061 2011-10-22 20:45:31Z eric $ # Maintainer: Jeff Mickey <jeff@archlinux.org> pkgname=liquidwar pkgver=5.6.4 -pkgrel=5 +pkgrel=6 pkgdesc="A unique multiplayer wargame" arch=('i686' 'x86_64' 'mips64el') url="http://www.ufoot.org/liquidwar/" @@ -12,12 +12,14 @@ 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) + http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch) sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' - 'a262967d60e0f04ac5b99693144ef6b0038bb6c4') + '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 diff --git a/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch new file mode 100644 index 000000000..446385624 --- /dev/null +++ b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch @@ -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)); + } + + /*------------------------------------------------------------------*/ |