packages: motion/motion.spec, motion/motion-ftbfs.patch (NEW), motion/motio...

[blues]

Author: blues                        Date: Sun Jul 19 14:51:06 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel.2 - ftbfs and segv patches from debian.

---- Files affected:
packages/motion:
   motion.spec (1.58 -> 1.59) , motion-ftbfs.patch (NONE -> 1.1)  (NEW), motion-segv.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/motion/motion.spec
diff -u packages/motion/motion.spec:1.58 packages/motion/motion.spec:1.59
--- packages/motion/motion.spec:1.58	Sun Jul 12 15:25:58 2009
+++ packages/motion/motion.spec	Sun Jul 19 16:51:00 2009
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Motion - programowy wykrywacz ruchu
 Name:		motion
 Version:	3.2.11
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/Graphics
 Source0:	http://dl.sourceforge.net/motion/%{name}-%{version}.tar.gz
@@ -17,6 +17,8 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-ftbfs.patch
+PAtch2:		%{name}-segv.patch
 URL:		http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -65,6 +67,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -78,11 +82,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d \
-$RPM_BUILD_ROOT{%{_datadir}/%{name},%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/%{name}} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
-
-install -d $RPM_BUILD_ROOT/var/run/%{name}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name} \
+	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
+	$RPM_BUILD_ROOT/var/run/%{name}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -146,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2009/07/19 14:51:00  blues
+- rel.2 - ftbfs and segv patches from debian.
+
 Revision 1.58  2009/07/12 13:25:58  arekm
 - release 2
 

================================================================
Index: packages/motion/motion-ftbfs.patch
diff -u /dev/null packages/motion/motion-ftbfs.patch:1.1
--- /dev/null	Sun Jul 19 16:51:06 2009
+++ packages/motion/motion-ftbfs.patch	Sun Jul 19 16:51:00 2009
@@ -0,0 +1,11 @@
+--- a/ffmpeg.c
++++ b/ffmpeg.c
+@@ -164,7 +164,7 @@
+     return write(fd, buf, size);
+ }
+ 
+-static offset_t file_seek(URLContext *h, offset_t pos, int whence)
++static int64_t file_seek(URLContext *h, int64_t pos, int whence)
+ {
+     int fd = (size_t)h->priv_data;
+     return lseek(fd, pos, whence);

================================================================
Index: packages/motion/motion-segv.patch
diff -u /dev/null packages/motion/motion-segv.patch:1.1
--- /dev/null	Sun Jul 19 16:51:06 2009
+++ packages/motion/motion-segv.patch	Sun Jul 19 16:51:00 2009
@@ -0,0 +1,11 @@
+--- a/motion.c
++++ b/motion.c
+@@ -2775,7 +2775,7 @@
+ #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)));
++        strncat(buf, sizeof(buf) - n, strerror_r(errno_save, msg_buf, sizeof(msg_buf)));
+ #endif
+     }
+     /* If 'level' is not negative, send the message to the syslog */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/motion/motion.spec?r1=1.58&r2=1.59&f=u