[arch-commits] Commit in motion/repos (3 files)

[Paul Mattal]

    Date: Saturday, October 3, 2009 @ 14:53:02
  Author: paul
Revision: 53885

Merged revisions 53881 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/motion/trunk

........
  r53881 | paul | 2009-10-03 14:50:09 -0400 (Sat, 03 Oct 2009) | 2 lines
  
  upgpkg: motion 3.2.11-4
      fixed bug FS#14400 applied motion-strerror patch to prevent segfaults
........

Added:
  motion/repos/extra-x86_64/motion-strerror.patch
    (from rev 53881, motion/trunk/motion-strerror.patch)
Modified:
  motion/repos/extra-x86_64/	(properties)
  motion/repos/extra-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   13 ++++++++-----
 motion-strerror.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)


Property changes on: motion/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /motion/trunk:1-43864
   + /motion/trunk:1-53884

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-03 18:52:48 UTC (rev 53884)
+++ extra-x86_64/PKGBUILD	2009-10-03 18:53:02 UTC (rev 53885)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: Paul Mattal <paul at archlinux.org>
+# Maintainer: None
 
 pkgname=motion
 pkgver=3.2.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Motion is a software motion detector. It grabs images from video4linux devices and/or from webcams."
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,14 +12,17 @@
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/motion/${pkgname}-${pkgver}.tar.gz
 	rc.motion
-	motion-3.2.11-offsett.patch)
+	motion-3.2.11-offsett.patch
+	motion-strerror.patch
+	)
 md5sums=('3a26c00f3250eacf6fa93c7a7e0249d9'
          'fc09828564850824f8549d258053e0b6'
-         'b4f9a30cf47d403f8098ade75ed4350f')
-
+         'b4f9a30cf47d403f8098ade75ed4350f'
+         '1d27369e4157acf59d077553bdd31894')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/motion-3.2.11-offsett.patch" || return 1
+  patch -Np1 -i "${srcdir}/motion-strerror.patch" || return 1
   ./configure --prefix=/usr --without-pgsql --without-mysql \
   	--with-libavcodec=/usr/lib/ --sysconfdir=/etc/motion || return 1
 

Copied: motion/repos/extra-x86_64/motion-strerror.patch (from rev 53881, motion/trunk/motion-strerror.patch)
===================================================================
--- extra-x86_64/motion-strerror.patch	                        (rev 0)
+++ extra-x86_64/motion-strerror.patch	2009-10-03 18:53:02 UTC (rev 53885)
@@ -0,0 +1,30 @@
+diff -u motion-3.2.11.broken/motion.c motion-3.2.11/motion.c
+--- motion-3.2.11.broken/motion.c	2008-09-22 01:20:58.000000000 +0200
++++ motion-3.2.11/motion.c	2009-04-13 17:09:40.000000000 +0200
+@@ -2738,9 +2738,6 @@
+ {
+     int errno_save, n;
+     char buf[1024];
+-#if (!defined(BSD))
+-    char msg_buf[100];
+-#endif
+     va_list ap;
+     int threadnr;
+ 
+@@ -2767,16 +2764,7 @@
+     if (errno_flag) {
+         strcat(buf, ": ");
+         n += 2;
+-        /*
+-         * this is bad - apparently gcc/libc wants to use the non-standard GNU
+-         * version of strerror_r, which doesn't actually put the message into
+-         * my buffer :-(.  I have put in a 'hack' to get around this.
+-         */
+-#if (defined(BSD))
+         strerror_r(errno_save, buf + n, sizeof(buf) - n);    /* 2 for the ': ' */
+-#else
+-        strcat(buf, strerror_r(errno_save, msg_buf, sizeof(msg_buf)));
+-#endif
+     }
+     /* If 'level' is not negative, send the message to the syslog */
+     if (level >= 0)