[arch-commits] Commit in liquidwar/trunk (PKGBUILD liquidwar-5.6.4-ovflfix.patch)

[Eric Bélanger]

    Date: Saturday, October 22, 2011 @ 16:45:01
  Author: eric
Revision: 141060

upgpkg: liquidwar 5.6.4-6

Fix buffer overflow (close FS#26572)

Added:
  liquidwar/trunk/liquidwar-5.6.4-ovflfix.patch
Modified:
  liquidwar/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    8 +++++---
 liquidwar-5.6.4-ovflfix.patch |   18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-22 19:05:29 UTC (rev 141059)
+++ PKGBUILD	2011-10-22 20:45:01 UTC (rev 141060)
@@ -3,7 +3,7 @@
 
 pkgname=liquidwar
 pkgver=5.6.4
-pkgrel=5
+pkgrel=6
 pkgdesc="A unique multiplayer wargame"
 arch=('i686' 'x86_64')
 url="http://www.ufoot.org/liquidwar/"
@@ -12,12 +12,14 @@
 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

Added: liquidwar-5.6.4-ovflfix.patch
===================================================================
--- liquidwar-5.6.4-ovflfix.patch	                        (rev 0)
+++ liquidwar-5.6.4-ovflfix.patch	2011-10-22 20:45:01 UTC (rev 141060)
@@ -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));
+ }
+ 
+ /*------------------------------------------------------------------*/