[svn] r6178 - in trunk/rpms: buffer directfb dkms-r8168 fuse gaim
gstreamer-plugins-extras imlib2 iperf libmpeg3 lighttpd
lockstat miro mod_suphp mpack ndisgtk nsupdate-gss nvi
openobex-utils pdns perl-CGI-Persistent perl-Courier-Filter
psi rrdtool streamdvd subversion tn5250 usbsink viruskiller
x264 xmms zope
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Feb 26 16:24:22 CET 2008
Author: dag
Date: 2008-02-26 15:23:06 +0000 (Tue, 26 Feb 2008)
New Revision: 6178
Added:
trunk/rpms/buffer/buffer-1.19-build.patch
trunk/rpms/buffer/buffer-1.19-destdir.patch
trunk/rpms/directfb/DirectFB-0.9.25.1-linux-compiler.patch
trunk/rpms/directfb/DirectFB-0.9.25.1-ppc.patch
trunk/rpms/directfb/DirectFB-0.9.25.1-sysfs.patch
trunk/rpms/directfb/DirectFB-0.9.25.1-types.patch
trunk/rpms/dkms-r8168/r8168-8.004.00-makefile.patch
trunk/rpms/dkms-r8168/r8168-8.004.00-modversions.patch
trunk/rpms/fuse/fuse-udev_rules.patch
trunk/rpms/gaim/gaim-1.0.1-naive-gnome-check.patch
trunk/rpms/gstreamer-plugins-extras/gst-plugins-0.8.6-dvdread.patch
trunk/rpms/imlib2/imlib2-1.2.1-X11-path.patch
trunk/rpms/imlib2/imlib2-1.3.0-loader_overflows.patch
trunk/rpms/imlib2/imlib2-1.3.0-multilib.patch
trunk/rpms/iperf/iperf-2.0.2-noyield.patch
trunk/rpms/libmpeg3/libmpeg3-1.5.2-gnustack.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-boostrap.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_autotools.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_hacking.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-fix_commented.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-makefile.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-memcpy.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-pkgconfig.in.patch
trunk/rpms/libmpeg3/libmpeg3-1.7-spec_in.patch
trunk/rpms/lighttpd/lighttpd-1.4.17-defaultconf.patch
trunk/rpms/lockstat/lockstat-1.4.11-time.patch
trunk/rpms/miro/miro-0.9.9.1-svn.patch
trunk/rpms/mod_suphp/suphp-0.6.0-handler.patch
trunk/rpms/mod_suphp/suphp-0.6.0-handler2.patch
trunk/rpms/mpack/mpack-1.6-buildfix.patch
trunk/rpms/ndisgtk/ndisgtk-0.8-centos.patch
trunk/rpms/nsupdate-gss/nsupdate-gss-ad-sites2.patch
trunk/rpms/nvi/build.patch
trunk/rpms/openobex-utils/openobex-apps-1.0.0-gcc3.4.patch
trunk/rpms/pdns/pdns-2.9.21-avoid-version.patch
trunk/rpms/pdns/pdns-2.9.21-fixinit.patch
trunk/rpms/perl-CGI-Persistent/perl-CGI-Persistent-1.00-relpath.patch
trunk/rpms/perl-Courier-Filter/Courier-Filter-0.17-message.patch
trunk/rpms/psi/psi-0.9.2-strip.patch
trunk/rpms/rrdtool/rrdtool-1.0.50-configure.patch
trunk/rpms/streamdvd/streamdvd-0.4-gcc41.patch
trunk/rpms/streamdvd/streamdvd-0.4-gui.patch
trunk/rpms/streamdvd/streamdvd-0.4-lsdvd.patch
trunk/rpms/streamdvd/streamdvd-0.4-makefile.patch
trunk/rpms/streamdvd/streamdvd-0.4-streamdvd.patch
trunk/rpms/subversion/subversion-1.4.4-macropen.patch
trunk/rpms/subversion/subversion-1.4.4-swig1333.patch
trunk/rpms/tn5250/tn5250-0.16.5-bhc.patch
trunk/rpms/tn5250/tn5250-0.17.3-multilib.patch
trunk/rpms/usbsink/usbsink-utils.patch
trunk/rpms/viruskiller/viruskiller-1.0-makefile.patch
trunk/rpms/x264/x264-snapshot-20070529-2245-glibc232.patch
trunk/rpms/xmms/xmms-1.2.10-configfile-safe-write.patch
trunk/rpms/xmms/xmms-1.2.10-crossfade-0.3.9.patch
trunk/rpms/xmms/xmms-1.2.10-gcc4.patch
trunk/rpms/xmms/xmms-1.2.10-joycrash.patch
trunk/rpms/xmms/xmms-1.2.10-multidevel.patch
trunk/rpms/xmms/xmms-1.2.10-pls-188603.patch
trunk/rpms/xmms/xmms-1.2.10-reposition.patch
trunk/rpms/xmms/xmms-1.2.10-ubuntu-CVE-2007-0653.patch
trunk/rpms/xmms/xmms-cd-mountpoint.patch
trunk/rpms/zope/zope-2.7.3-config.patch
trunk/rpms/zope/zope-2.8.3-pythonwarning.patch
Log:
Added missing patches.
Added: trunk/rpms/buffer/buffer-1.19-build.patch
===================================================================
--- trunk/rpms/buffer/buffer-1.19-build.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/buffer/buffer-1.19-build.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,97 @@
+--- Makefile
++++ Makefile
+@@ -32,7 +32,7 @@
+ install: buffer
+ rm -f $(INSTBIN)/buffer
+ cp buffer $(INSTBIN)/buffer
+- chmod 111 $(INSTBIN)/buffer
++ chmod 755 $(INSTBIN)/buffer
+ rm -f $(INSTMAN)/buffer.$S
+ cp buffer.man $(INSTMAN)/buffer.$S
+ chmod 444 $(INSTMAN)/buffer.$S
+--- buffer.c
++++ buffer.c
+@@ -111,6 +111,8 @@
+ */
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <fcntl.h>
+ #include <errno.h>
+@@ -126,10 +128,6 @@
+ static char *rcsid = "$Header: /a/swan/home/swan/staff/csg/lmjm/src/buffer/RCS/buffer.c,v 1.19 1995/08/24 17:46:28 lmjm Exp lmjm $";
+ #endif
+
+-#ifndef __alpha
+-extern char *shmat();
+-#endif /* __alpha */
+-
+ /* General macros */
+ #define TRUE 1
+ #define FALSE 0
+@@ -430,7 +428,7 @@
+
+ /* The interrupt handler */
+ void
+-shutdown()
++shutdown(int dummy)
+ {
+ static int shutting;
+ if( shutting ){
+@@ -447,7 +445,7 @@
+
+ /* Shutdown because the child has ended */
+ void
+-child_shutdown()
++child_shutdown(int dummy)
+ {
+ /* Find out which child has died. (They may not be my
+ * children if buffer was exec'd on top of something that had
+@@ -507,7 +505,7 @@
+ get_buffer();
+
+ if( debug )
+- fprintf( stderr, "%s pbuffer is 0x%08x, buffer_size is %d [%d x %d]\n",
++ fprintf( stderr, "%s pbuffer is %p, buffer_size is %d [%d x %d]\n",
+ proc_string,
+ (char *)pbuffer, buffer_size, blocks, blocksize );
+
+--- sem.c
++++ sem.c
+@@ -27,6 +27,7 @@
+ * semaphores */
+
+ #include <stdio.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ipc.h>
+@@ -34,7 +35,7 @@
+ #include <errno.h>
+ #include "sem.h"
+
+-#if defined(SYS5) || defined(ultrix) || defined(_AIX)
++#if defined(SYS5) || defined(ultrix) || defined(_AIX) || defined _SEM_SEMUN_UNDEFINED
+ union semun {
+ int val;
+ struct semid_ds *buf;
+@@ -95,7 +96,7 @@
+ return sem;
+ }
+
+-static
++static void
+ do_sem( sem_id, pbuf, err )
+ int sem_id;
+ struct sembuf *pbuf;
+@@ -152,7 +153,7 @@
+ if( sem_id == -1 )
+ return;
+
+- if( semctl( sem_id, 0, IPC_RMID, NULL ) == -1 ){
++ if( semctl( sem_id, 0, IPC_RMID, (union semun)0 ) == -1 ){
+ report_proc();
+ perror( "internal error, failed to remove semaphore" );
+ }
Added: trunk/rpms/buffer/buffer-1.19-destdir.patch
===================================================================
--- trunk/rpms/buffer/buffer-1.19-destdir.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/buffer/buffer-1.19-destdir.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,16 @@
+--- Makefile 2007-11-09 14:38:56.364663016 +0100
++++ Makefile.destdir 1999-08-27 16:01:29.000000000 +0200
+@@ -13,10 +13,10 @@
+ CFLAGS=-Wall
+
+ # Where to install buffer and its manual pages
+-INSTBIN=/usr/local/bin
+-INSTMAN=/usr/man/manl
++INSTBIN=$(DESTDIR)/usr/bin
++INSTMAN=$(DESTDIR)/usr/share/man/man1
+ # The manual page section (normally l or 1)
+-S=l
++S=1
+
+ RM=/bin/rm
+ ALL=README buffer.man Makefile buffer.c sem.c sem.h COPYING
Added: trunk/rpms/directfb/DirectFB-0.9.25.1-linux-compiler.patch
===================================================================
--- trunk/rpms/directfb/DirectFB-0.9.25.1-linux-compiler.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/directfb/DirectFB-0.9.25.1-linux-compiler.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+diff -Naupr DirectFB-0.9.25.1.orig/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c DirectFB-0.9.25.1/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c
+--- DirectFB-0.9.25.1.orig/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c 2006-05-03 09:22:37.000000000 +0200
++++ DirectFB-0.9.25.1/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_v4l.c 2006-09-14 14:50:43.000000000 +0200
+@@ -44,7 +44,6 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+
+-#include <linux/compiler.h>
+ #include "videodev.h"
+
+ #include <directfb.h>
Added: trunk/rpms/directfb/DirectFB-0.9.25.1-ppc.patch
===================================================================
--- trunk/rpms/directfb/DirectFB-0.9.25.1-ppc.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/directfb/DirectFB-0.9.25.1-ppc.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,27 @@
+diff -Naupr DirectFB-0.9.25.1.orig/lib/direct/ppcasm_memcpy_cachable.S DirectFB-0.9.25.1/lib/direct/ppcasm_memcpy_cachable.S
+--- DirectFB-0.9.25.1.orig/lib/direct/ppcasm_memcpy_cachable.S 2005-10-19 01:14:16.000000000 +0200
++++ DirectFB-0.9.25.1/lib/direct/ppcasm_memcpy_cachable.S 2006-09-15 15:38:17.000000000 +0200
+@@ -11,8 +11,6 @@
+
+ #define __ASSEMBLY__
+
+-#include <linux/config.h>
+-
+ #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
+ #define L1_CACHE_LINE_SIZE 16
+ #define LG_L1_CACHE_LINE_SIZE 4
+diff -Naupr DirectFB-0.9.25.1.orig/lib/direct/system.c DirectFB-0.9.25.1/lib/direct/system.c
+--- DirectFB-0.9.25.1.orig/lib/direct/system.c 2006-05-03 09:22:37.000000000 +0200
++++ DirectFB-0.9.25.1/lib/direct/system.c 2006-09-15 15:56:46.000000000 +0200
+@@ -33,11 +33,7 @@
+ #include <direct/build.h>
+ #include <direct/system.h>
+
+-#if HAVE_ASM_PAGE_H
+-#include <asm/page.h>
+-#else
+ #define PAGE_SIZE sysconf( _SC_PAGESIZE )
+-#endif
+
+
+ #if DIRECT_BUILD_GETTID && defined(HAVE_LINUX_UNISTD_H)
Added: trunk/rpms/directfb/DirectFB-0.9.25.1-sysfs.patch
===================================================================
--- trunk/rpms/directfb/DirectFB-0.9.25.1-sysfs.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/directfb/DirectFB-0.9.25.1-sysfs.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,20 @@
+--- DirectFB-0.9.25.1/directfb.pc.in.orig 2006-07-27 02:09:28.000000000 +0200
++++ DirectFB-0.9.25.1/directfb.pc.in 2006-07-27 02:09:37.000000000 +0200
+@@ -7,5 +7,5 @@
+ Description: Graphics and windowing library for the Linux frame buffer device
+ Version: @VERSION@
+ Requires: fusion direct
+-Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
++Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@ @OSX_LIBS@
+ Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
+--- DirectFB-0.9.25.1/directfb-config.in.orig 2006-07-27 02:08:17.000000000 +0200
++++ DirectFB-0.9.25.1/directfb-config.in 2006-07-27 02:09:02.000000000 +0200
+@@ -300,7 +300,7 @@
+ libs=-L at libdir@
+
+ if test "$lib_directfb" = "yes"; then
+- libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@"
++ libs="$libs -ldirectfb -lfusion -ldirect @THREADLIB@ @ZLIB_LIBS@ @SYSFS_LIBS@"
+
+ if test -z "$echo_static"; then
+ libs="$libs @DYNLIB@"
Added: trunk/rpms/directfb/DirectFB-0.9.25.1-types.patch
===================================================================
--- trunk/rpms/directfb/DirectFB-0.9.25.1-types.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/directfb/DirectFB-0.9.25.1-types.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+diff -Naupr DirectFB-0.9.25.1.orig/include/dfb_types.h DirectFB-0.9.25.1/include/dfb_types.h
+--- DirectFB-0.9.25.1.orig/include/dfb_types.h 2005-10-19 01:14:12.000000000 +0200
++++ DirectFB-0.9.25.1/include/dfb_types.h 2006-09-14 14:48:26.000000000 +0200
+@@ -1,6 +1,7 @@
+ #ifndef __DFB_TYPES_H__
+ #define __DFB_TYPES_H__
+
++#include <asm/types.h>
+ #include <sys/types.h>
+
+ #ifndef USE_KOS
Added: trunk/rpms/dkms-r8168/r8168-8.004.00-makefile.patch
===================================================================
--- trunk/rpms/dkms-r8168/r8168-8.004.00-makefile.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/dkms-r8168/r8168-8.004.00-makefile.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- r8168-8.004.00/src/Makefile.orig 2007-11-21 03:39:11.000000000 +0200
++++ r8168-8.004.00/src/Makefile 2008-02-06 16:21:07.000000000 +0200
+@@ -35,7 +35,7 @@ modules:
+ ifeq ($(KFLAG),24x)
+ $(MAKE) -f Makefile_linux24x
+ else
+- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD)/src modules
++ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+ strip --strip-debug r8168.$(KEXT)
+ endif
+
Added: trunk/rpms/dkms-r8168/r8168-8.004.00-modversions.patch
===================================================================
--- trunk/rpms/dkms-r8168/r8168-8.004.00-modversions.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/dkms-r8168/r8168-8.004.00-modversions.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,12 @@
+--- r8168-8.004.00/src/Makefile_linux24x.orig 2007-11-21 03:39:11.000000000 +0200
++++ r8168-8.004.00/src/Makefile_linux24x 2008-02-06 14:18:34.000000000 +0200
+@@ -14,7 +14,8 @@ endif
+ #standard flags for module builds
+ MODCFLAGS += -DLINUX -D__KERNEL__ -DMODULE -O2 -pipe -Wall
+ MODCFLAGS += -I$(KSRC)/include -I.
+-MODCFLAGS += -DMODVERSIONS -DEXPORT_SYMTAB -include $(KSRC)/include/linux/modversions.h
++MODCFLAGS += -DEXPORT_SYMTAB
++
+ ifeq ($(RTL_IOCTL),y)
+ SOURCE := r8168_n.c rtl_ioctl.c
+ else
Added: trunk/rpms/fuse/fuse-udev_rules.patch
===================================================================
--- trunk/rpms/fuse/fuse-udev_rules.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/fuse/fuse-udev_rules.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,5 @@
+--- util/udev.rules 2005-11-03 19:38:05.000000000 +0100
++++ util/udev.rules 2005-11-03 19:38:13.000000000 +0100
+@@ -1 +1 @@
+-KERNEL=="fuse", MODE="0666"
++KERNEL=="fuse", NAME="%k", MODE="0660",OWNER="root",GROUP="fuse"
Added: trunk/rpms/gaim/gaim-1.0.1-naive-gnome-check.patch
===================================================================
--- trunk/rpms/gaim/gaim-1.0.1-naive-gnome-check.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/gaim/gaim-1.0.1-naive-gnome-check.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,17 @@
+--- gaim-1.0.1/src/gtkutils.c.orig 2004-10-07 18:07:35.363545624 -1000
++++ gaim-1.0.1/src/gtkutils.c 2004-10-07 18:08:00.153994668 -1000
+@@ -1274,11 +1274,12 @@
+ gboolean
+ gaim_running_gnome(void)
+ {
+- if ((g_getenv("GNOME_DESKTOP_SESSION_ID") != NULL) &&
++ /* This check is naive and wrong */
++ /*if ((g_getenv("GNOME_DESKTOP_SESSION_ID") != NULL) &&
+ (g_find_program_in_path("gnome-open") != NULL))
+ {
+ return TRUE;
+- }
++ }*/
+
+ return FALSE;
+ }
Added: trunk/rpms/gstreamer-plugins-extras/gst-plugins-0.8.6-dvdread.patch
===================================================================
--- trunk/rpms/gstreamer-plugins-extras/gst-plugins-0.8.6-dvdread.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/gstreamer-plugins-extras/gst-plugins-0.8.6-dvdread.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,12 @@
+--- gst-plugins-0.8.6/ext/dvdread/dvdreadsrc.h.orig 2007-03-26 02:52:38.431625920 +0200
++++ gst-plugins-0.8.6/ext/dvdread/dvdreadsrc.h 2007-03-26 02:53:03.637794000 +0200
+@@ -22,6 +22,9 @@
+ #define __DVDREADSRC_H__
+
+
++#include <inttypes.h>
++//#include <dvdread/ifo_types.h>
++
+ #include <gst/gst.h>
+
+
Added: trunk/rpms/imlib2/imlib2-1.2.1-X11-path.patch
===================================================================
--- trunk/rpms/imlib2/imlib2-1.2.1-X11-path.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/imlib2/imlib2-1.2.1-X11-path.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,12 @@
+diff -Nur imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c imlib2-1.2.1/src/modules/loaders/loader_xpm.c
+--- imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c 2005-05-18 07:26:16.000000000 +0200
++++ imlib2-1.2.1/src/modules/loaders/loader_xpm.c 2005-09-21 08:55:11.000000000 +0200
+@@ -66,7 +66,7 @@
+ /* look in rgb txt database */
+ if (!rgb_txt)
+ #ifndef __EMX__
+- rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r");
++ rgb_txt = fopen("/usr/share/X11/rgb.txt", "r");
+ #else
+ rgb_txt = fopen(__XOS2RedirRoot("/XFree86/lib/X11/rgb.txt"), "rt");
+ #endif
Added: trunk/rpms/imlib2/imlib2-1.3.0-loader_overflows.patch
===================================================================
--- trunk/rpms/imlib2/imlib2-1.3.0-loader_overflows.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/imlib2/imlib2-1.3.0-loader_overflows.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,98 @@
+diff -Nur imlib2-1.2.1/src/modules/loaders/loader_argb.c imlib2-1.2.1.new/src/modules/loaders/loader_argb.c
+--- imlib2-1.2.1/src/modules/loaders/loader_argb.c 2006-11-06 01:27:59.000000000 -0800
++++ imlib2-1.2.1.new/src/modules/loaders/loader_argb.c 2006-11-06 01:30:41.000000000 -0800
+@@ -23,7 +23,7 @@
+ load(ImlibImage * im, ImlibProgressFunction progress,
+ char progress_granularity, char immediate_load)
+ {
+- int w, h, alpha;
++ int w=0, h=0, alpha=0;
+ FILE *f;
+
+ if (im->data)
+@@ -36,6 +36,8 @@
+ {
+ char buf[256], buf2[256];
+
++ memset(buf, 0, sizeof(buf));
++ memset(buf2, 0, sizeof(buf));
+ if (!fgets(buf, 255, f))
+ {
+ fclose(f);
+diff -Nur imlib2-1.2.1/src/modules/loaders/loader_jpeg.c imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c
+--- imlib2-1.2.1/src/modules/loaders/loader_jpeg.c 2006-11-06 01:27:59.000000000 -0800
++++ imlib2-1.2.1.new/src/modules/loaders/loader_jpeg.c 2006-11-06 01:33:01.000000000 -0800
+@@ -104,8 +104,9 @@
+ im->w = w = cinfo.output_width;
+ im->h = h = cinfo.output_height;
+
+- if (cinfo.rec_outbuf_height > 16)
++ if (cinfo.rec_outbuf_height > 16 || w < 1 || h < 1 || w > 16383 || h > 16383)
+ {
++ im->w = im->h = 0;
+ jpeg_destroy_decompress(&cinfo);
+ fclose(f);
+ return 0;
+diff -Nur imlib2-1.2.1/src/modules/loaders/loader_lbm.c imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c
+--- imlib2-1.2.1/src/modules/loaders/loader_lbm.c 2006-11-06 01:27:59.000000000 -0800
++++ imlib2-1.2.1.new/src/modules/loaders/loader_lbm.c 2006-11-06 01:30:41.000000000 -0800
+@@ -453,6 +453,7 @@
+ }
+ }
+ if (!full || !ok) {
++ im->w = im->h = 0;
+ freeilbm(&ilbm);
+ return ok;
+ }
+@@ -467,12 +468,13 @@
+ cancel = 0;
+ plane[0] = NULL;
+
++ n = ilbm.depth;
++ if (ilbm.mask == 1) n++;
++
+ im->data = malloc(im->w * im->h * sizeof(DATA32));
+- if (im->data) {
+- n = ilbm.depth;
+- if (ilbm.mask == 1) n++;
++ plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
++ if (im->data && plane[0]) {
+
+- plane[0] = malloc(((im->w + 15) / 16) * 2 * n);
+ for (i = 1; i < n; i++) plane[i] = plane[i - 1] + ((im->w + 15) / 16) * 2;
+
+ z = ((im->w + 15) / 16) * 2 * n;
+@@ -511,6 +513,7 @@
+ * the memory for im->data.
+ *----------*/
+ if (!ok) {
++ im->w = im->h = 0;
+ if (im->data) free(im->data);
+ im->data = NULL;
+ }
+diff -Nur imlib2-1.2.1/src/modules/loaders/loader_pnm.c imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c
+--- imlib2-1.2.1/src/modules/loaders/loader_pnm.c 2006-11-06 01:27:59.000000000 -0800
++++ imlib2-1.2.1.new/src/modules/loaders/loader_pnm.c 2006-11-06 01:30:41.000000000 -0800
+@@ -80,7 +80,7 @@
+ int i = 0;
+
+ /* read numbers */
+- while (c != EOF && !isspace(c))
++ while (c != EOF && i+1 < sizeof(buf) && !isspace(c))
+ {
+ buf[i++] = c;
+ c = fgetc(f);
+diff -Nur imlib2-1.2.1/src/modules/loaders/loader_tga.c imlib2-1.2.1.new/src/modules/loaders/loader_tga.c
+--- imlib2-1.2.1/src/modules/loaders/loader_tga.c 2006-11-06 01:27:59.000000000 -0800
++++ imlib2-1.2.1.new/src/modules/loaders/loader_tga.c 2006-11-06 01:30:41.000000000 -0800
+@@ -365,7 +369,9 @@
+ else
+ dataptr = im->data + (y * im->w);
+
+- for (x = 0; x < im->w; x++) /* for each pixel in the row */
++ for (x = 0;
++ x < im->w && bufptr+bpp/8 < bufend;
++ x++) /* for each pixel in the row */
+ {
+ switch (bpp)
+ {
Added: trunk/rpms/imlib2/imlib2-1.3.0-multilib.patch
===================================================================
--- trunk/rpms/imlib2/imlib2-1.3.0-multilib.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/imlib2/imlib2-1.3.0-multilib.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,34 @@
+--- imlib2-1.3.0/configure.in~ 2006-10-27 00:18:39.000000000 +0200
++++ imlib2-1.3.0/configure.in 2006-10-27 00:18:39.000000000 +0200
+@@ -190,7 +190,7 @@
+ AC_PATH_XTRA
+ x_dir=${x_dir:-/usr/X11R6}
+ x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++ x_libs="-lX11 -lXext"
+ AM_CONDITIONAL(BUILD_X11, true)
+ AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+--- imlib2-1.3.0/configure~ 2006-10-27 00:18:25.000000000 +0200
++++ imlib2-1.3.0/configure 2006-10-27 00:18:25.000000000 +0200
+@@ -23117,7 +23117,7 @@
+
+ x_dir=${x_dir:-/usr/X11R6}
+ x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++ x_libs="-lX11 -lXext"
+
+
+ if true; then
+--- imlib2-1.3.0/imlib2-config.in~ 2006-10-27 00:17:29.000000000 +0200
++++ imlib2-1.3.0/imlib2-config.in 2006-10-27 00:17:29.000000000 +0200
+@@ -45,8 +45,7 @@
+ echo $includes
+ ;;
+ --libs)
+- libdirs=-L at libdir@
+- echo $libdirs -lImlib2 @my_libs@
++ echo -lImlib2 @my_libs@
+ ;;
+ *)
+ echo "${usage}" 1>&2
Added: trunk/rpms/iperf/iperf-2.0.2-noyield.patch
===================================================================
--- trunk/rpms/iperf/iperf-2.0.2-noyield.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/iperf/iperf-2.0.2-noyield.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,98 @@
+fix iperf locking - it was burning CPU time while polling
+unnecessarily, instead of using the proper wait primitives.
+
+Signed-off-by: Ingo Molnar
+---
+ compat/Thread.c | 3 ---
+ src/Reporter.c | 13 +++++++++----
+ src/main.cpp | 2 ++
+ 3 files changed, 11 insertions(+), 7 deletions(-)
+
+Index: iperf-2.0.2/compat/Thread.c
+===================================================================
+--- iperf-2.0.2.orig/compat/Thread.c
++++ iperf-2.0.2/compat/Thread.c
+@@ -405,9 +405,6 @@ int thread_numuserthreads( void ) {
+ void thread_rest ( void ) {
+ #if defined( HAVE_THREAD )
+ #if defined( HAVE_POSIX_THREAD )
+- // TODO add checks for sched_yield or pthread_yield and call that
+- // if available
+- usleep( 0 );
+ #else // Win32
+ SwitchToThread( );
+ #endif
+Index: iperf-2.0.2/src/Reporter.c
+===================================================================
+--- iperf-2.0.2.orig/src/Reporter.c
++++ iperf-2.0.2/src/Reporter.c
+@@ -111,6 +111,7 @@ report_statistics multiple_reports[kRepo
+ char buffer[64]; // Buffer for printing
+ ReportHeader *ReportRoot = NULL;
+ extern Condition ReportCond;
++extern Condition ReportDoneCond;
+ int reporter_process_report ( ReportHeader *report );
+ void process_report ( ReportHeader *report );
+ int reporter_handle_packet( ReportHeader *report );
+@@ -338,7 +339,7 @@ void ReportPacket( ReportHeader* agent,
+ // item
+ while ( index == 0 ) {
+ Condition_Signal( &ReportCond );
+- thread_rest();
++ Condition_Wait( &ReportDoneCond );
+ index = agent->reporterindex;
+ }
+ agent->agentindex = 0;
+@@ -346,7 +347,7 @@ void ReportPacket( ReportHeader* agent,
+ // Need to make sure that reporter is not about to be "lapped"
+ while ( index - 1 == agent->agentindex ) {
+ Condition_Signal( &ReportCond );
+- thread_rest();
++ Condition_Wait( &ReportDoneCond );
+ index = agent->reporterindex;
+ }
+
+@@ -553,6 +554,7 @@ void reporter_spawn( thread_Settings *th
+ }
+ Condition_Unlock ( ReportCond );
+
++again:
+ if ( ReportRoot != NULL ) {
+ ReportHeader *temp = ReportRoot;
+ //Condition_Unlock ( ReportCond );
+@@ -575,9 +577,12 @@ void reporter_spawn( thread_Settings *th
+ // finished with report so free it
+ free( temp );
+ Condition_Unlock ( ReportCond );
++ Condition_Signal( &ReportDoneCond );
++ if (ReportRoot)
++ goto again;
+ }
+- // yield control of CPU is another thread is waiting
+- thread_rest();
++ Condition_Signal( &ReportDoneCond );
++ usleep(10000);
+ } else {
+ //Condition_Unlock ( ReportCond );
+ }
+Index: iperf-2.0.2/src/main.cpp
+===================================================================
+--- iperf-2.0.2.orig/src/main.cpp
++++ iperf-2.0.2/src/main.cpp
+@@ -96,6 +96,7 @@ extern "C" {
+ // records being accessed in a report and also to
+ // serialize modification of the report list
+ Condition ReportCond;
++ Condition ReportDoneCond;
+ }
+
+ // global variables only accessed within this file
+@@ -141,6 +142,7 @@ int main( int argc, char **argv ) {
+
+ // Initialize global mutexes and conditions
+ Condition_Initialize ( &ReportCond );
++ Condition_Initialize ( &ReportDoneCond );
+ Mutex_Initialize( &groupCond );
+ Mutex_Initialize( &clients_mutex );
+
+-
Added: trunk/rpms/libmpeg3/libmpeg3-1.5.2-gnustack.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.5.2-gnustack.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.5.2-gnustack.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,22 @@
+diff -ru libmpeg3-1.5.2.orig/video/mmxidct.S libmpeg3-1.5.2/video/mmxidct.S
+--- libmpeg3-1.5.2.orig/video/mmxidct.S 2006-04-24 23:13:14.000000000 +0200
++++ libmpeg3-1.5.2/video/mmxidct.S 2006-04-24 23:13:47.000000000 +0200
+@@ -673,3 +673,7 @@
+ ret
+ .Lfe1:
+ .size IDCT_mmx,.Lfe1-IDCT_mmx
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -ru libmpeg3-1.5.2.orig/video/reconmmx.s libmpeg3-1.5.2/video/reconmmx.s
+--- libmpeg3-1.5.2.orig/video/reconmmx.s 2006-04-24 23:13:14.000000000 +0200
++++ libmpeg3-1.5.2/video/reconmmx.s 2006-04-24 23:13:20.000000000 +0200
+@@ -298,4 +298,6 @@
+ pop esi
+ ret
+
+-
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-boostrap.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-boostrap.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-boostrap.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+diff -uNr libmpeg3-1.7-bootstrap/bootstrap libmpeg3-1.7/bootstrap
+--- libmpeg3-1.7-bootstrap/bootstrap 1970-01-01 01:00:00.000000000 +0100
++++ libmpeg3-1.7/bootstrap 2007-09-14 00:27:39.000000000 +0200
+@@ -0,0 +1,7 @@
++#!/bin/sh
++set -x
++aclocal
++libtoolize --force --copy
++autoheader
++automake --add-missing --copy
++autoconf
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_autotools.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_autotools.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_autotools.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,213 @@
+diff -uNr libmpeg3-1.7/audio/ac3.c libmpeg3-cinelerra/audio/ac3.c
+--- libmpeg3-1.7/audio/ac3.c 2006-01-11 05:42:23.000000000 +0100
++++ libmpeg3-cinelerra/audio/ac3.c 2007-07-05 00:42:40.000000000 +0200
+@@ -1,7 +1,7 @@
+ #include <stdint.h>
+ #include <stdio.h>
+
+-#include "a52.h"
++#include <a52dec/a52.h>
+ #include "mpeg3private.h"
+ #include "mpeg3protos.h"
+
+diff -uNr libmpeg3-1.7/audio/Makefile.am libmpeg3-cinelerra/audio/Makefile.am
+--- libmpeg3-1.7/audio/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ libmpeg3-cinelerra/audio/Makefile.am 2007-07-05 00:42:40.000000000 +0200
+@@ -0,0 +1,12 @@
++noinst_LTLIBRARIES = libmpeg3_audio.la
++libmpeg3_audio_la_SOURCES = ac3.c dct.c huffman.c layer2.c layer3.c mpeg3audio.c pcm.c synthesizers.c tables.c
++libmpeg3_audio_la_LDFLAGS =
++
++noinst_HEADERS = ac3.h huffman.h mpeg3audio.h tables.h
++
++AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
++AM_CXXFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
++INCLUDES=-I$(srcdir)/..
++
++LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
++
+diff -uNr libmpeg3-1.7/configure.in libmpeg3-cinelerra/configure.in
+--- libmpeg3-1.7/configure.in 1970-01-01 01:00:00.000000000 +0100
++++ libmpeg3-cinelerra/configure.in 2007-09-08 23:27:17.000000000 +0200
+@@ -0,0 +1,83 @@
++# Process this file with autoconf to produce a configure script.
++AC_INIT(libmpeg3, 1.7)
++AM_INIT_AUTOMAKE([dist-bzip2])
++AC_PREREQ(2.53)
++AM_CONFIG_HEADER([config.h])
++AM_PROG_AS
++AC_DISABLE_SHARED
++AC_ENABLE_STATIC
++AC_PROG_LIBTOOL
++
++LIBMPEG3_VERSION_CURRENT=1
++LIBMPEG3_VERSION_REVISION=0
++LIBMPEG3_VERSION_AGE=0
++LIBMPEG3_VERSION_INFO=$LIBMPEG3_VERSION_CURRENT:$LIBMPEG3_VERSION_REVISION:$LIBMPEG3_VERSION_AGE
++AC_SUBST(LIBMPEG3_VERSION_INFO)
++
++# Checks for programs.
++AC_PROG_CC
++
++# hack for using nasm for .S files
++CCAS="nasm --tag=$CC"
++AC_SUBST(CCAS)
++AC_SUBST(CCASFLAGS)
++
++############## MMX
++
++AC_ARG_ENABLE(mmx,
++ AC_HELP_STRING([--enable-mmx], [enables support for mmx (default is autodetect)]),
++ [ enable_mmx=$enableval ],[ enable_mmx=auto ])
++case "$target_cpu" in
++i586 | i686)
++ test "x$enable_mmx" = "xauto" && enable_mmx=yes
++
++ CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS"
++
++ if test "x$enable_mmx" = "xyes"; then
++ CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS" # -D_MMX_ doesn't work
++ enable_mmx32=yes
++ fi
++;;
++x86_64)
++ test "x$enable_mmx" = "xauto" && enable_mmx=yes
++ CPU_CFLAGS="-DX86_CPU $CPU_CFLAGS"
++ if test "x$enable_mmx" = "xyes"; then
++ CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS"
++
++ fi
++;;
++esac
++
++test "x$enable_mmx" = "xauto" && enable_mmx=no
++
++AM_CONDITIONAL(USEMMX, test "x$enable_mmx" = "xyes")
++AM_CONDITIONAL(USEMMX32, test "x$enable_mmx32" = "xyes")
++AM_CONDITIONAL(TARGET_BUILTIN_VECTOR,test "x$enable_mmx" = "xyes")
++AC_SUBST(LIBDECORE_LIBADD)
++AC_SUBST(CPU_CFLAGS)
++
++############## END OF MMX
++
++LARGEFILE_CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
++AC_SUBST(LARGEFILE_CFLAGS)
++
++# Checks for header files.
++AC_HEADER_STDC
++AC_CHECK_HEADERS([stdlib.h string.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++AC_C_INLINE
++AC_STRUCT_TM
++
++# Checks for libraries.
++
++AC_CONFIG_FILES([
++Makefile
++audio/Makefile
++video/Makefile
++libmpeg3.spec
++libmpeg3.pc
++])
++AC_OUTPUT
++
+diff -uNr libmpeg3-1.7/Makefile.am libmpeg3-cinelerra/Makefile.am
+--- libmpeg3-1.7/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ libmpeg3-cinelerra/Makefile.am 2007-09-08 22:58:17.000000000 +0200
+@@ -0,0 +1,61 @@
++lib_LTLIBRARIES = libmpeg3.la
++AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
++libmpeg3_la_LDFLAGS = -version-info @LIBMPEG3_VERSION_INFO@
++libmpeg3_la_LIBADD = -la52 video/libmpeg3_video.la audio/libmpeg3_audio.la -lm \
++ -lpthread
++libmpeg3_la_SOURCES = libmpeg3.c mpeg3bits.c mpeg3atrack.c mpeg3css.c \
++ mpeg3demux.c \
++ mpeg3ifo.c \
++ mpeg3io.c \
++ mpeg3strack.c \
++ mpeg3title.c \
++ mpeg3tocutil.c \
++ mpeg3vtrack.c \
++ workarounds.c
++
++bin_PROGRAMS = mpeg3dump mpeg3peek mpeg3toc mpeg3cat # mpeg2qt
++mpeg3dump_SOURCES = mpeg3dump.c
++mpeg3dump_LDADD = libmpeg3.la
++mpeg3dump_CFLAGS = $(AM_CFLAGS)
++mpeg3peek_SOURCES = mpeg3peek.c
++mpeg3peek_LDADD = libmpeg3.la
++mpeg3peek_CFLAGS = $(AM_CFLAGS)
++mpeg3toc_SOURCES = mpeg3toc.c
++mpeg3toc_LDADD = libmpeg3.la
++mpeg3toc_CFLAGS = $(AM_CFLAGS)
++mpeg3cat_SOURCES = mpeg3cat.c
++mpeg3cat_LDADD = libmpeg3.la
++mpeg3cat_CFLAGS = $(AM_CFLAGS)
++#mpeg2qt_SOURCES = mpeg2qt.c # disabled to prevent circle dependencies
++#mpeg2qt_LDADD = libmpeg3.la -lpng -lz -ldl -lquicktime4linux
++#mpeg2qt_CFLAGS = $(AM_CFLAGS) -I$(includedir)/quicktime4linux
++
++SUBDIRS = audio video
++
++EXTRA_DIST = docs
++
++noinst_HEADERS = bitstream.h \
++ ifo.h \
++ libmpeg3.h \
++ mpeg3atrack.h \
++ mpeg3css.h \
++ mpeg3css_fake.c \
++ mpeg3demux.h \
++ mpeg3io.h \
++ mpeg3private.h \
++ mpeg3private.inc \
++ mpeg3protos.h \
++ mpeg3title.h \
++ mpeg3vtrack.h \
++ timecode.h \
++ workarounds.h
++
++dist_noinst_SCRIPTS = bootstrap
++
++pkgincludedir=$(includedir)/mpeg3
++pkginclude_HEADERS=libmpeg3.h mpeg3private.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = libmpeg3.pc
++
++LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
+diff -uNr libmpeg3-1.7/video/Makefile.am libmpeg3-cinelerra/video/Makefile.am
+--- libmpeg3-1.7/video/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ libmpeg3-cinelerra/video/Makefile.am 2007-07-05 00:42:40.000000000 +0200
+@@ -0,0 +1,29 @@
++noinst_LTLIBRARIES = libmpeg3_video.la
++libmpeg3_video_la_SOURCES = getpicture.c headers.c idct.c macroblocks.c mmxtest.c motion.c \
++ mpeg3cache.c \
++ mpeg3video.c \
++ output.c \
++ reconstruct.c \
++ seek.c \
++ slice.c \
++ subtitle.c \
++ vlc.c
++
++if USEMMX
++libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
++else
++libmpeg3_video_la_SOURCES +=
++endif
++
++noinst_HEADERS = idct.h \
++ layerdata.h \
++ mpeg3video.h \
++ mpeg3videoprotos.h \
++ slice.h \
++ vlc.h
++
++libmpeg3_video_la_LDFLAGS=
++AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS)
++INCLUDES=-I$(srcdir)/..
++
++LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_hacking.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_hacking.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-cinelerra_hacking.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,57 @@
+diff -uNr libmpeg3-1.7/libmpeg3.c libmpeg3-cinelerra/libmpeg3.c
+--- libmpeg3-1.7/libmpeg3.c 2006-03-29 06:14:26.000000000 +0200
++++ libmpeg3-cinelerra/libmpeg3.c 2007-07-05 00:42:40.000000000 +0200
+@@ -181,6 +181,7 @@
+ strncasecmp(ext, ".mpg", 4) &&
+ strncasecmp(ext, ".vob", 4) &&
+ strncasecmp(ext, ".mpeg", 4) &&
++ strncasecmp(ext, ".m2t", 4) &&
+ strncasecmp(ext, ".ac3", 4))
+ result = 0;
+ }
+diff -uNr libmpeg3-1.7/libmpeg3.h libmpeg3-cinelerra/libmpeg3.h
+--- libmpeg3-1.7/libmpeg3.h 2006-03-29 06:14:26.000000000 +0200
++++ libmpeg3-cinelerra/libmpeg3.h 2007-07-05 00:42:40.000000000 +0200
+@@ -5,6 +5,7 @@
+ extern "C" {
+ #endif
+
++// FIXME: don't include private definitions in external header
+ #include "mpeg3private.h"
+
+
+diff -uNr libmpeg3-1.7/mpeg3toc.c libmpeg3-cinelerra/mpeg3toc.c
+--- libmpeg3-1.7/mpeg3toc.c 2005-12-23 23:54:55.000000000 +0100
++++ libmpeg3-cinelerra/mpeg3toc.c 2007-07-05 00:42:40.000000000 +0200
+@@ -574,7 +574,7 @@
+ if(j == vtracks - 1 && l == frame_count - 1)
+ {
+ total_frames += frame_count;
+- fprintf(stderr, "Video: title=%lld total_frames=%d ", title_number, total_frames);
++ fprintf(stderr, "Video: title=%lld total_frames=%d (%.1f \%)", title_number, total_frames,100*((float)position)/((float) mpeg3demux_movie_size(demuxer)));
+ }
+ }
+ }
+
+diff -uNr libmpeg3-1.7/video/output.c libmpeg3-cinelerra/video/output.c
+--- libmpeg3-1.7/video/output.c 2006-01-07 10:55:56.000000000 +0100
++++ libmpeg3-cinelerra/video/output.c 2007-07-05 00:42:40.000000000 +0200
+@@ -104,7 +104,7 @@
+ *data++ = 0;
+
+ #define STORE_PIXEL_RGB565 \
+- *((unsigned short*)data) = \
++ *(*(unsigned short**)(&data))++ = \
+ ((CLIP(r_l) & 0xf8) << 8) | \
+ ((CLIP(g_l) & 0xfc) << 3) | \
+ ((CLIP(b_l) & 0xf8) >> 3); \
+diff -uNr libmpeg3-1.7/video/vlc.c libmpeg3-cinelerra/video/vlc.c
+--- libmpeg3-1.7/video/vlc.c 2005-04-21 05:59:42.000000000 +0200
++++ libmpeg3-cinelerra/video/vlc.c 2007-07-05 00:42:40.000000000 +0200
+@@ -1,3 +1,6 @@
++// FIXME: vlc.h redefines ERROR to 99 if and only if error is defined.
++#define ERROR
++
+ #include "mpeg3private.h"
+ #include "mpeg3protos.h"
+ #include "vlc.h"
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-fix_commented.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-fix_commented.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-fix_commented.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,12 @@
+diff -up libmpeg3-1.7/mpeg3protos.h.commented libmpeg3-1.7/mpeg3protos.h
+--- libmpeg3-1.7/mpeg3protos.h.commented 2006-03-29 06:14:26.000000000 +0200
++++ libmpeg3-1.7/mpeg3protos.h 2007-09-11 18:20:08.000000000 +0200
+@@ -390,7 +390,7 @@ int mpeg3demux_open_title(mpeg3_demuxer_
+ /* Go to the absolute byte given */
+ int mpeg3demux_seek_byte(mpeg3_demuxer_t *demuxer, int64_t byte);
+
+-/* Seek to the title and cell containing the absolute byte of the
++/* Seek to the title and cell containing the absolute byte of the */
+ /* demuxer. */
+ /* Called at the beginning of every packet. */
+ int mpeg3_seek_phys(mpeg3_demuxer_t *demuxer);
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-makefile.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-makefile.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-makefile.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,163 @@
+diff -up libmpeg3-1.7/Makefile.makefile libmpeg3-1.7/Makefile
+--- libmpeg3-1.7/Makefile.makefile 2006-02-15 06:09:31.000000000 +0100
++++ libmpeg3-1.7/Makefile 2007-09-08 03:16:05.000000000 +0200
+@@ -9,6 +9,10 @@ ifeq ("$(PREFIX)", "")
+ PREFIX=/usr
+ endif
+
++ifeq ("$(LIBDIR)", "")
++LIBDIR=$(PREFIX)/lib
++endif
++
+ ifeq ($(origin CFLAGS), environment)
+ HAVE_CFLAGS := y
+ else
+@@ -16,36 +20,13 @@ HAVE_CFLAGS := n
+ endif
+
+
++ifeq ("$(OBJDIR)", "")
+ OBJDIR := $(shell uname --machine)
+-
+-
+-
+-
+-ifeq ($(OBJDIR), alpha)
+- USE_MMX = 0
+- ifneq ($(HAVE_CFLAGS), y)
+- CFLAGS := -O4 -arch ev67 -ieee -accept c99_keywords -gcc_messages
+- endif
+-endif
+-
+-ifeq ($(OBJDIR), i686)
+- USE_MMX = 1
+- ifneq ($(HAVE_CFLAGS), y)
+- CFLAGS := -O2 -fomit-frame-pointer -falign-loops=2 -falign-jumps=2 -falign-functions=2 -I/usr/local/include
+- endif
+- CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-endif
+-
+-ifeq ($(OBJDIR), x86_64)
+- ifneq ($(HAVE_CFLAGS), y)
+- CFLAGS := -O2 -fomit-frame-pointer -I/usr/local/include
+- endif
+- CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-
+-
+ endif
+
+
++CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
++
+
+ ifeq ($(USE_CSS), 1)
+ CFLAGS += -DHAVE_CSS
+@@ -64,8 +45,7 @@ endif
+
+ CFLAGS += \
+ -I. \
+- -I$(A52DIR)/include \
+- -I$(A52DIR)/liba52
++ -I/usr/include/a52dec
+
+
+
+@@ -136,9 +116,9 @@ DIRS := \
+ $(OBJDIR)/audio \
+ $(OBJDIR)/video
+
+-include Makefile.a52
++#include Makefile.a52
+
+-DIRS += $(A52DIRS)
++#DIRS += $(A52DIRS)
+
+
+ OUTPUT = $(OBJDIR)/libmpeg3.a
+@@ -147,40 +127,40 @@ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mp
+ #$(OBJDIR)/mpeg3split
+
+
+-LIBS = -lm -lpthread
++LIBS = -lm -lpthread -la52
+
+ $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
+
+-$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+-$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
+-$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
++#(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
++#$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
++#$(shell echo $(OBJS) $(ASMOBJS) $(NASMOBJS) > $(OBJDIR)/objs)
+ $(shell mkdir -p $(DIRS) )
+
+ all: $(OUTPUT) $(UTILS)
+
+
+-$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
+- ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
++$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
++ ar rcs $(OUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS)
+
+
+
+ $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c
+- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
++ $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
+
+ $(OBJDIR)/mpeg3peek: $(OUTPUT) mpeg3peek.c
+- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3peek mpeg3peek.c $(OUTPUT) $(LIBS)
++ $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3peek mpeg3peek.c $(OUTPUT) $(LIBS)
+
+ $(OBJDIR)/mpeg3toc: $(OUTPUT) mpeg3toc.c
+- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS)
++ $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS)
+
+ $(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c
+- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS)
++ $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS)
+
+ #$(OBJDIR)/mpeg3split: $(OUTPUT)
+-# $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
++# $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
+
+ $(OBJDIR)/mpeg2qt: $(OUTPUT)
+- $(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
++ $(CC) $(CFLAGS) -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
+ $(OUTPUT) \
+ $(LIBS) \
+ -I. \
+@@ -191,9 +171,12 @@ $(OBJDIR)/mpeg2qt: $(OUTPUT)
+ -ldl
+
+ install:
+- cp $(UTILS) $(PREFIX)/bin
+-# cp $(OUTPUT) $(PREFIX)/lib
+-# cp libmpeg3.h mpeg3private.h $(PREFIX)/include
++ mkdir -p $(DESTDIR)$(PREFIX)/bin
++ cp $(UTILS) $(DESTDIR)$(PREFIX)/bin
++ mkdir -p $(DESTDIR)$(LIBDIR)
++ cp $(OUTPUT) $(DESTDIR)$(LIBDIR)
++ mkdir -p $(DESTDIR)$(PREFIX)/include
++ cp libmpeg3.h mpeg3private.h $(DESTDIR)$(PREFIX)/include
+
+ clean:
+ rm -rf $(OBJDIR)
+@@ -206,13 +189,13 @@ wc:
+ cat *.c *.h audio/*.c audio/*.h video/*.c video/*.h | wc
+
+ $(OBJS):
+- $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
++ $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
+ $(ASMOBJS):
+- $(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
++ $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.S) -o $*.o
+ $(NASMOBJS):
+ $(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
+-$(A52OBJS):
+- $(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
++#(A52OBJS):
++# $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
+
+ $(OBJDIR)/libmpeg3.o: libmpeg3.c
+ $(OBJDIR)/mpeg3atrack.o: mpeg3atrack.c
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-memcpy.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-memcpy.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-memcpy.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,23 @@
+diff -ur libmpeg3-1.7.orig/audio/mpeg3audio.c libmpeg3-1.7/audio/mpeg3audio.c
+--- libmpeg3-1.7.orig/audio/mpeg3audio.c 2006-02-19 13:43:27.000000000 +0200
++++ libmpeg3-1.7/audio/mpeg3audio.c 2007-08-17 18:06:37.000000000 +0300
+@@ -3,7 +3,7 @@
+
+ #include <math.h>
+ #include <stdlib.h>
+-
++#include <string.h>
+
+
+
+diff -ur libmpeg3-1.7.orig/video/subtitle.c libmpeg3-1.7/video/subtitle.c
+--- libmpeg3-1.7.orig/video/subtitle.c 2006-02-27 06:14:00.000000000 +0200
++++ libmpeg3-1.7/video/subtitle.c 2007-08-17 18:07:00.000000000 +0300
+@@ -2,6 +2,7 @@
+ #include "mpeg3protos.h"
+
+ #include <stdlib.h>
++#include <string.h>
+
+ static unsigned char get_nibble(unsigned char **ptr, int *nibble)
+ {
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-pkgconfig.in.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-pkgconfig.in.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-pkgconfig.in.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,16 @@
+diff -uNr libmpeg3-1.7_spec/libmpeg3.pc.in libmpeg3-1.7/libmpeg3.pc.in
+--- libmpeg3-1.7_spec/libmpeg3.pc.in 1970-01-01 01:00:00.000000000 +0100
++++ libmpeg3-1.7/libmpeg3.pc.in 2007-09-11 22:08:28.000000000 +0200
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@/mpeg3
++
++Name: @PACKAGE@
++Description: Decoder of various derivatives of MPEG standards
++Version: @VERSION@
++Requires:
++Conflicts:
++Libs: -L${libdir} -lmpeg3 -lpthread -la52
++Cflags: -I${includedir}
Added: trunk/rpms/libmpeg3/libmpeg3-1.7-spec_in.patch
===================================================================
--- trunk/rpms/libmpeg3/libmpeg3-1.7-spec_in.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/libmpeg3/libmpeg3-1.7-spec_in.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,164 @@
+diff -uNr libmpeg3-1.7_spec/libmpeg3.spec.in libmpeg3-1.7/libmpeg3.spec.in
+--- libmpeg3-1.7_spec/libmpeg3.spec.in 1970-01-01 01:00:00.000000000 +0100
++++ libmpeg3-1.7/libmpeg3.spec.in 2007-09-11 21:34:13.000000000 +0200
+@@ -0,0 +1,160 @@
++Summary: Decoder of various derivatives of MPEG standards
++Name: libmpeg3
++Version: @VERSION@
++Release: 1%{?dist}
++License: GPLv2+
++Group: System Environment/Libraries
++URL: http://heroinewarrior.com/libmpeg3.php3
++Source: http://dl.sf.net/heroines/libmpeg3-%{version}-src.tar.bz2
++BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
++#BuildRequires: nasm
++#BuildRequires: a52dec-devel
++
++#BuildRequires: autoconf, libtool, automake
++
++%description
++LibMPEG3 decodes the many many derivatives of MPEG standards into
++uncompressed data suitable for editing and playback.
++
++libmpeg3 currently decodes:
++ - MPEG-1 Layer II/III Audio and program streams
++ - MPEG-2 Layer III Audio, program streams and transport streams
++ - MPEG-1 and MPEG-2 Video
++ - AC3 Audio
++ - IFO files
++ - VOB files
++
++
++%package utils
++Summary: Utilities from libmpeg3
++Group: Applications/Multimedia
++Requires: %{name} = %{version}-%{release}
++
++%description utils
++LibMPEG3 decodes the many many derivatives of MPEG standards into
++uncompressed data suitable for editing and playback.
++
++This package contains utility programs based on libmpeg3.
++
++
++%package devel
++Summary: Development files for libmpeg3
++Group: Development/Libraries
++Requires: %{name} = %{version}-%{release}
++
++%description devel
++LibMPEG3 decodes the many many derivatives of MPEG standards into
++uncompressed data suitable for editing and playback.
++
++This package contains files needed to build applications that will use
++libmpeg3.
++
++
++%prep
++%setup -q
++
++
++
++
++%build
++%configure --enable-shared --enable-static
++%ifarch i686 x86_64
++# --enable-mmx \
++%endif
++
++make %{?_smp_mflags}
++
++
++
++%install
++%{__rm} -rf %{buildroot}
++
++%{__make} install \
++ LIBDIR=%{_libdir} \
++ DESTDIR=%{buildroot} \
++ INSTALL="install -c -p"
++
++%{__rm} -rf %{buildroot}%{_libdir}/*.la
++
++
++%clean
++%{__rm} -rf %{buildroot}
++
++
++%post -p /sbin/ldconfig
++
++%postun -p /sbin/ldconfig
++
++
++%files
++%defattr(-, root, root, -)
++%doc COPYING
++%{_libdir}/*.so.*
++
++%files utils
++%defattr(-, root, root, -)
++%{_bindir}/mpeg3cat
++%{_bindir}/mpeg3dump
++%{_bindir}/mpeg3peek
++%{_bindir}/mpeg3toc
++#{_bindir}/mpeg2qt
++
++%files devel
++%defattr(-, root, root,-)
++%doc docs/*
++%{_libdir}/*.so
++%{_libdir}/*.a
++%{_includedir}/mpeg3/
++%{_libdir}/pkgconfig/*.pc
++
++
++%changelog
++* Sun Sep 9 2007 kwizart < kwizart at gmail.com > - 1.7-4
++- Add autotools support (default is still static )
++- Remove internal css
++- Build with our cflags (-fPIC is no more necessary )
++
++* Fri Sep 7 2007 kwizart < kwizart at gmail.com > - 1.7-3
++- Add dist tag
++- modified patch for Makefile
++- Add BR's
++
++* Wed Sep 20 2006 Matthias Saou <http://freshrpms.net/> 1.7-2
++- Run make twice since there is an EOF error that makes the first run abort.
++
++* Mon Jul 3 2006 Matthias Saou <http://freshrpms.net/> 1.7-1
++- Update to 1.7.
++
++* Fri Mar 17 2006 Matthias Saou <http://freshrpms.net/> 1.6-2
++- Add -fPIC to the CFLAGS to fix transcode build on x86_64.
++
++* Thu Jan 19 2006 Matthias Saou <http://freshrpms.net/> 1.6-1
++- Update to 1.6.
++- Split "main" into "utils" (bin) and "devel" (the static lib).
++- Add Makefile patch to ease install and get our CFLAGS used.
++- Don't enable MMX on x86_64, the x86 asm fails.
++
++* Mon Aug 15 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-5
++- Force __USE_LARGEFILE64 to fix FC4 ppc build.
++
++* Fri Apr 22 2005 Matthias Saou <http://freshrpms.net/> 1.5.4-4
++- Add gcc4 patch.
++
++* Thu Nov 4 2004 Matthias Saou <http://freshrpms.net/> 1.5.4-3
++- Remove unneeded /usr/bin fix, since we don't use "make install".
++- Replace -O? with -O1 in optflags since build fails with O2 and gcc 3.4.
++- Make nasm mandatory : The configure script won't run without it anyway.
++- Use libdir/*.* in order to not catch all debuginfo files too.
++- Added -devel provides for now.
++
++* Sat Jun 26 2004 Dag Wieers <dag at wieers.com> - 1.5.4-2
++- Fixes for x86_64.
++
++* Wed Apr 07 2004 Dag Wieers <dag at wieers.com> - 1.5.4-1
++- Updated to release 1.5.4.
++
++* Mon Sep 08 2003 Dag Wieers <dag at wieers.com> - 1.5.2-0
++- Updated to release 1.5.2.
++
++* Wed Feb 12 2003 Dag Wieers <dag at wieers.com> - 1.4-0
++- Initial package. (using DAR)
Added: trunk/rpms/lighttpd/lighttpd-1.4.17-defaultconf.patch
===================================================================
--- trunk/rpms/lighttpd/lighttpd-1.4.17-defaultconf.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/lighttpd/lighttpd-1.4.17-defaultconf.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,51 @@
+diff -Naupr lighttpd-1.4.17.orig/doc/lighttpd.conf lighttpd-1.4.17/doc/lighttpd.conf
+--- lighttpd-1.4.17.orig/doc/lighttpd.conf 2007-08-14 21:05:57.000000000 +0200
++++ lighttpd-1.4.17/doc/lighttpd.conf 2007-09-05 13:08:33.000000000 +0200
+@@ -37,7 +37,7 @@ server.modules = (
+
+ ## a static document-root, for virtual-hosting take look at the
+ ## server.virtual-* options
+-server.document-root = "/srv/www/htdocs/"
++server.document-root = "/srv/www/lighttpd/"
+
+ ## where to send error-messages to
+ server.errorlog = "/var/log/lighttpd/error.log"
+@@ -51,6 +51,7 @@ index-file.names = ( "index.p
+
+ # mimetype mapping
+ mimetype.assign = (
++ ".rpm" => "application/x-rpm",
+ ".pdf" => "application/pdf",
+ ".sig" => "application/pgp-signature",
+ ".spl" => "application/futuresplash",
+@@ -147,7 +148,7 @@ static-file.exclude-extensions = ( ".php
+ #server.error-handler-404 = "/error-handler.php"
+
+ ## to help the rc.scripts
+-#server.pid-file = "/var/run/lighttpd.pid"
++server.pid-file = "/var/run/lighttpd.pid"
+
+
+ ###### virtual hosts
+@@ -186,10 +187,10 @@ static-file.exclude-extensions = ( ".php
+ #server.chroot = "/"
+
+ ## change uid to <uid> (default: don't care)
+-#server.username = "wwwrun"
++server.username = "lighttpd"
+
+ ## change uid to <uid> (default: don't care)
+-#server.groupname = "wwwrun"
++server.groupname = "lighttpd"
+
+ #### compress module
+ #compress.cache-dir = "/var/cache/lighttpd/compress/"
+@@ -213,7 +214,7 @@ static-file.exclude-extensions = ( ".php
+ # ( "localhost" =>
+ # (
+ # "socket" => "/var/run/lighttpd/php-fastcgi.socket",
+-# "bin-path" => "/usr/local/bin/php-cgi"
++# "bin-path" => "/usr/bin/php-cgi"
+ # )
+ # )
+ # )
Added: trunk/rpms/lockstat/lockstat-1.4.11-time.patch
===================================================================
--- trunk/rpms/lockstat/lockstat-1.4.11-time.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/lockstat/lockstat-1.4.11-time.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,12 @@
+diff -ur lockstat/lockstat.c lockstat.new/lockstat.c
+--- lockstat/lockstat.c 2004-09-13 19:01:41.000000000 -0400
++++ lockstat.new/lockstat.c 2007-10-08 20:34:13.000000000 -0400
+@@ -36,7 +36,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include <linux/lockmeter.h>
+
+ extern void closeFiles(void);
Added: trunk/rpms/miro/miro-0.9.9.1-svn.patch
===================================================================
--- trunk/rpms/miro/miro-0.9.9.1-svn.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/miro/miro-0.9.9.1-svn.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- platform/gtk-x11/setup.py.orig 2007-11-16 03:27:04.364443136 +0100
++++ platform/gtk-x11/setup.py 2007-11-16 03:27:13.173104016 +0100
+@@ -342,7 +342,7 @@
+ def install_app_config(self):
+ source = os.path.join(resource_dir, 'app.config.template')
+ dest = '/usr/share/miro/resources/app.config'
+- revision = util.queryRevision(root_dir)
++ revision = None
+ if revision is None:
+ revision = "unknown"
+ revisionurl = "unknown"
Added: trunk/rpms/mod_suphp/suphp-0.6.0-handler.patch
===================================================================
--- trunk/rpms/mod_suphp/suphp-0.6.0-handler.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/mod_suphp/suphp-0.6.0-handler.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,14 @@
+--- src/apache/mod_suphp.c.orig 2005-08-12 06:28:50.526855736 +0200
++++ src/apache/mod_suphp.c 2005-08-12 06:29:21.277180976 +0200
+@@ -249,9 +249,9 @@
+ {"suPHP_UserGroup", suphp_handle_cmd_user_group, NULL,
+ RSRC_CONF|ACCESS_CONF, TAKE2, "User and group scripts shall be run as"},
+ #endif
+- {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF,
++ {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF|ACCESS_CONF,
+ ITERATE, "Tells mod_suphp to handle these MIME-types"},
+- {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF,
++ {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF|ACCESS_CONF,
+ ITERATE, "Tells mod_suphp not to handle these MIME-types"},
+ {NULL}
+ };
Added: trunk/rpms/mod_suphp/suphp-0.6.0-handler2.patch
===================================================================
--- trunk/rpms/mod_suphp/suphp-0.6.0-handler2.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/mod_suphp/suphp-0.6.0-handler2.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,14 @@
+diff -urN ../suphp-0.6.1.orig/src/apache2/mod_suphp.c ./src/apache2/mod_suphp.c
+--- ../suphp-0.6.1.orig/src/apache2/mod_suphp.c 2005-11-26 14:45:49.000000000 -0500
++++ ./src/apache2/mod_suphp.c 2006-02-26 01:28:44.941407805 -0500
+@@ -313,8 +313,8 @@
+ AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF,
+ "User and group scripts shall be run as"),
+ #endif
+- AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
+- AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
++ AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF|ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
++ AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF|ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
+ {NULL}
+ };
+
Added: trunk/rpms/mpack/mpack-1.6-buildfix.patch
===================================================================
--- trunk/rpms/mpack/mpack-1.6-buildfix.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/mpack/mpack-1.6-buildfix.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,22 @@
+diff -urN mpack-1.6.orig/unixos.c mpack-1.6/unixos.c
+--- mpack-1.6.orig/unixos.c 2003-07-22 00:54:05 +0400
++++ mpack-1.6/unixos.c 2005-01-25 14:23:46 +0300
+@@ -39,7 +39,6 @@
+ #endif
+
+ extern int errno;
+-extern char *malloc();
+ extern char *getenv();
+
+ int overwrite_files = 0;
+diff -urN mpack-1.6.orig/xmalloc.c mpack-1.6/xmalloc.c
+--- mpack-1.6.orig/xmalloc.c 2003-07-22 00:35:31 +0400
++++ mpack-1.6/xmalloc.c 2005-01-25 14:23:40 +0300
+@@ -24,7 +24,6 @@
+ */
+ #include <stdio.h>
+ #include <string.h>
+-extern char *malloc(), *realloc();
+
+ char *xmalloc (int size)
+ {
Added: trunk/rpms/ndisgtk/ndisgtk-0.8-centos.patch
===================================================================
--- trunk/rpms/ndisgtk/ndisgtk-0.8-centos.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/ndisgtk/ndisgtk-0.8-centos.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,14 @@
+--- ndisgtk 2007-10-03 10:34:33.000000000 -0500
++++ ndisgtk-centos 2007-10-03 17:16:18.000000000 -0500
+@@ -257,10 +257,7 @@
+ Opens the network configuration tool.
+ """
+
+- if self.kde:
+- subprocess.Popen(["kcmshell", "kcm_knetworkconfmodule"])
+- else:
+- subprocess.Popen(["network-admin"])
++ subprocess.Popen(["system-config-network"])
+
+ def install_driver_open(self, *args):
+ """
Added: trunk/rpms/nsupdate-gss/nsupdate-gss-ad-sites2.patch
===================================================================
--- trunk/rpms/nsupdate-gss/nsupdate-gss-ad-sites2.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/nsupdate-gss/nsupdate-gss-ad-sites2.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,71 @@
+--- nsupdate-gss.orig 2006-01-23 06:35:10.000000000 +0100
++++ nsupdate-gss 2007-08-01 17:30:35.000000000 +0200
+@@ -5,6 +5,9 @@
+ # jmruiz at animatika.net
+ # updated, 2004-Enero
+
++# dag at wieers.com
++# updated, 2007-EMC
++
+
+ # See draft-ietf-dnsext-gss-tsig-02, RFC2845 and RFC2930
+
+@@ -20,21 +23,22 @@
+
+ # Integrity of the arguments
+
+-if ($#ARGV != 3) {
++if ($#ARGV < 3) {
+ print "
+-Usage: nsupdate-gss.pl HOST DOMAIN IP TTL
++Usage: nsupdate-gss.pl HOST DOMAIN IP TTL [NS]
+ ";
+ exit 1;
+ }
+
+
+
+-
+-my $host = $ARGV[0];
+-my $domain = $ARGV[1];
+-my $ip = $ARGV[2];
++### FIXME: Fill in all information automatically
++my $host = $ARGV[0]; # hostname -s
++my $domain = $ARGV[1]; # domainname
++my $ip = $ARGV[2]; # ifconfig
+ my $ttl = $ARGV[3];
+ my $alg = "gss.microsoft.com";
++my $ns = $ARGV[4] if ($#ARGV >= 4);
+
+
+
+@@ -229,7 +233,11 @@
+ # find the nameservers
+ my $nameserver = find_nameservers("$domain.");
+
+-print "Found nameserver $nameserver\n";
++$nameserver->nameservers($ns) if (defined($ns));
++#print $nameserver->print;
++
++#print "Found nameserver $nameserver\n";
++print "Found ".$nameserver->nameservers." nameserver(s)\n";
+
+ if (!defined($nameserver) || $nameserver->{'errorstring'} ne 'NOERROR') {
+ print "Failed to find a nameserver for domain $domain\n";
+@@ -238,12 +246,16 @@
+
+ # find the name of the DNS server
+ my $server_name = find_server_name($domain);
++$server_name = $ns if (defined($ns));
++
+ if (!defined($server_name)) {
+ print "Failed to find a DNS server name for $domain\n";
+ exit 1;
+ }
+ print "Using DNS server name $server_name\n";
+
++$nameserver->nameservers($server_name);
++
+ # use a long random key name
+ my $key_name = int(rand 10000000000000);
+
Added: trunk/rpms/nvi/build.patch
===================================================================
--- trunk/rpms/nvi/build.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/nvi/build.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,142 @@
+--- build/Makefile.in.orig 2008-01-10 16:18:46.000000000 +1100
++++ build/Makefile.in 2008-01-10 17:30:12.000000000 +1100
+@@ -76,45 +76,35 @@
+
+ install: all install_common
+ @echo "Installing vi, ex, view: $(bindir) ..."
+- [ -d $(bindir) ] || \
+- ($(mkdir) $(bindir) && $(chmod) $(dmode) $(bindir))
+- cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+- $(cp) nvi $(bindir)/`echo vi | sed '$(transform)'`
+- cd $(bindir) && [ -f $(strip) ] && \
++ [ -d $(DESTDIR)$(bindir) ] || \
++ ($(mkdir) $(DESTDIR)$(bindir) && $(chmod) $(dmode) $(DESTDIR)$(bindir))
++ cd $(DESTDIR)$(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
++ $(cp) nvi $(DESTDIR)$(bindir)/`echo vi | sed '$(transform)'`
++ cd $(DESTDIR)$(bindir) && [ -f $(strip) ] && \
+ $(strip) `echo vi | sed '$(transform)'`
+- cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
+- cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+- cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+- cd $(bindir) && $(ln) \
++ cd $(DESTDIR)$(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
++ cd $(DESTDIR)$(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
++ cd $(DESTDIR)$(bindir) && $(rm) -f `echo view | sed '$(transform)'`
++ cd $(DESTDIR)$(bindir) && $(ln) \
+ `echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
+- cd $(bindir) && $(ln) \
++ cd $(DESTDIR)$(bindir) && $(ln) \
+ `echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
+- [ -d $(mandir) ] || \
+- ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
+- [ -d $(mandir)/cat1 ] || \
+- ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
+- @echo "Installing man pages: $(mandir) ..."
+- cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+- $(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
+- $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(ln) \
+- `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(ln) \
+- `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
+- [ -d $(mandir)/man1 ] || \
+- ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
+- cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
++ [ -d $(DESTDIR)$(mandir) ] || \
++ ($(mkdir) $(DESTDIR)$(mandir) && $(chmod) $(dmode) $(DESTDIR)$(mandir))
++ [ -d $(DESTDIR)$(mandir)/cat1 ] || \
++ ($(mkdir) $(DESTDIR)$(mandir)/cat1 && $(chmod) $(dmode) $(DESTDIR)$(mandir)/cat1)
++ @echo "Installing man pages: $(DESTDIR)$(mandir) ..."
++ [ -d $(DESTDIR)$(mandir)/man1 ] || \
++ ($(mkdir) $(DESTDIR)$(mandir)/man1 && $(chmod) $(dmode) $(DESTDIR)$(mandir)/man1)
++ cd $(DESTDIR)$(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+ $(cp) $(srcdir)/docs/USD.doc/vi.man/vi.1 \
+- $(mandir)/man1/`echo vi.1 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(ln) \
++ $(DESTDIR)$(mandir)/man1/`echo vi.1 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/man1 && $(ln) \
+ `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(ln) \
++ cd $(DESTDIR)$(mandir)/man1 && $(ln) \
+ `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
+
+ cat= dutch english french german ru_SU.KOI8-R spanish swedish
+@@ -124,44 +114,34 @@
+ [ -f $(ln) ]
+ [ -f $(mkdir) ]
+ [ -f $(rm) ]
+- [ -d $(prefix) ] || \
+- ($(mkdir) $(prefix) && $(chmod) $(dmode) $(prefix))
++ [ -d $(DESTDIR)$(prefix) ] || \
++ ($(mkdir) $(DESTDIR)$(prefix) && $(chmod) $(dmode) $(DESTDIR)$(prefix))
+ [ -d $(exec_prefix) ] || \
+- ($(mkdir) $(exec_prefix) && $(chmod) $(dmode) $(exec_prefix))
+- [ -d $(datadir) ] || \
+- ($(mkdir) $(datadir) && $(chmod) $(dmode) $(datadir))
+- $(rm) -rf $(datadir)/vi
+- $(mkdir) $(datadir)/vi && $(chmod) $(dmode) $(datadir)/vi
+- @echo "Installing message catalogs: $(datadir)/vi/catalog ..."
+- $(mkdir) $(datadir)/vi/catalog && \
+- $(chmod) $(dmode) $(datadir)/vi/catalog
+- (cd $(srcdir)/catalog && $(cp) $(cat) $(datadir)/vi/catalog && \
+- cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
+- @echo "Installing Perl scripts: $(datadir)/vi/perl ..."
+- $(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
+- [ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
+- cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
+- (cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
+- cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
+- @echo "Installing Tcl scripts: $(datadir)/vi/tcl ..."
+- $(mkdir) $(datadir)/vi/tcl && $(chmod) $(dmode) $(datadir)/vi/tcl
+- (cd $(srcdir)/tcl_scripts && $(cp) *.tcl $(datadir)/vi/tcl && \
+- cd $(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl)
+- @echo "Installing recover script: $(datadir)/vi/recover ..."
+- ($(cp) recover $(datadir)/vi/recover && \
+- $(chmod) $(emode) $(datadir)/vi/recover)
++ ($(mkdir) $(DESTDIR)$(exec_prefix) && $(chmod) $(dmode) $(DESTDIR)$(exec_prefix))
++ [ -d $(DESTDIR)$(datadir) ] || \
++ ($(mkdir) $(DESTDIR)$(datadir) && $(chmod) $(dmode) $(DESTDIR)$(datadir))
++ $(rm) -rf $(DESTDIR)$(datadir)/vi
++ $(mkdir) $(DESTDIR)$(datadir)/vi && $(chmod) $(dmode) $(DESTDIR)$(datadir)/vi
++ @echo "Installing message catalogs: $(DESTDIR)$(datadir)/vi/catalog ..."
++ $(mkdir) $(DESTDIR)$(datadir)/vi/catalog && \
++ $(chmod) $(dmode) $(DESTDIR)$(datadir)/vi/catalog
++ (cd $(srcdir)/catalog && $(cp) $(cat) $(DESTDIR)$(datadir)/vi/catalog && \
++ cd $(DESTDIR)$(datadir)/vi/catalog && $(chmod) $(fmode) *)
++ @echo "Installing recover script: $(DESTDIR)$(datadir)/vi/recover ..."
++ ($(cp) recover $(DESTDIR)$(datadir)/vi/recover && \
++ $(chmod) $(emode) $(DESTDIR)$(datadir)/vi/recover)
+
+ uninstall:
+- $(rm) -rf $(datadir)/vi
+- cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+- cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+- cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+- cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+- cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
++ $(rm) -rf $(DESTDIR)$(datadir)/vi
++ cd $(DESTDIR)$(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
++ cd $(DESTDIR)$(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
++ cd $(DESTDIR)$(bindir) && $(rm) -f `echo view | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
++ cd $(DESTDIR)$(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+
+ docs:
+ cd $(srcdir)/docs/USD.doc/vi.ref && $(MAKE)
Added: trunk/rpms/openobex-utils/openobex-apps-1.0.0-gcc3.4.patch
===================================================================
--- trunk/rpms/openobex-utils/openobex-apps-1.0.0-gcc3.4.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/openobex-utils/openobex-apps-1.0.0-gcc3.4.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,156 @@
+diff -ruN openobex-apps-1.0.0/src/obex_put_common.c openobex-apps-1.0.0-gcc3.4/src/obex_put_common.c
+--- openobex-apps-1.0.0/src/obex_put_common.c 2002-12-01 18:34:41.000000000 +0100
++++ ./src/obex_put_common.c 2005-10-15 14:16:57.000000000 +0200
+@@ -82,7 +82,7 @@
+ break;
+
+ default:
+- printf(__FUNCTION__ "() Skipped header %02x\n", hi);
++ printf("%s() Skipped header %02x\n", __func__, hi);
+ }
+ }
+ if(!body) {
+@@ -123,7 +123,7 @@
+ OBEX_ObjectSetRsp(object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS);
+ break;
+ default:
+- printf(__FUNCTION__ "() Denied %02x request\n", cmd);
++ printf("%s() Denied %02x request\n", __func__, cmd);
+ OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED);
+ break;
+ }
+diff -ruN openobex-apps-1.0.0/src/obex_test_cable.h openobex-apps-1.0.0-gcc3.4/src/obex_test_cable.h
+--- openobex-apps-1.0.0/src/obex_test_cable.h 2002-12-01 18:34:41.000000000 +0100
++++ ./src/obex_test_cable.h 2005-10-15 14:16:59.000000000 +0200
+@@ -38,7 +38,7 @@
+ #include <openobex/obex.h>
+
+ #ifdef CABLE_DEBUG
+-#define CDEBUG(args...) printf(__FUNCTION__ "() " args)
++#define CDEBUG(args...) printf("%s() %s", __func__, args)
+ #else
+ #define CDEBUG(args...)
+ #endif
+diff -ruN openobex-apps-1.0.0/src/obex_test_client.c openobex-apps-1.0.0-gcc3.4/src/obex_test_client.c
+--- openobex-apps-1.0.0/src/obex_test_client.c 2002-12-01 18:34:41.000000000 +0100
++++ ./src/obex_test_client.c 2005-10-15 14:16:57.000000000 +0200
+@@ -370,13 +370,13 @@
+
+ while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) {
+ if(hi == OBEX_HDR_BODY) {
+- printf(__FUNCTION__ "() Found body\n");
++ printf("%s() Found body\n", __func__);
+ body = hv.bs;
+ body_len = hlen;
+ break;
+ }
+ else {
+- printf(__FUNCTION__ "() Skipped header %02x\n", hi);
++ printf("%s() Skipped header %02x\n", __func__, hi);
+ }
+ }
+
+diff -ruN openobex-apps-1.0.0/src/obex_test_server.c openobex-apps-1.0.0-gcc3.4/src/obex_test_server.c
+--- openobex-apps-1.0.0/src/obex_test_server.c 2002-12-01 18:34:41.000000000 +0100
++++ ./src/obex_test_server.c 2005-10-15 14:16:57.000000000 +0200
+@@ -54,17 +54,17 @@
+ char *name = NULL;
+ char *namebuf = NULL;
+
+- printf(__FUNCTION__ "()\n");
++ printf("%s()\n", __func__);
+
+ while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) {
+ switch(hi) {
+ case OBEX_HDR_BODY:
+- printf(__FUNCTION__ "() Found body\n");
++ printf("%s() Found body\n", __func__);
+ body = hv.bs;
+ body_len = hlen;
+ break;
+ case OBEX_HDR_NAME:
+- printf(__FUNCTION__ "() Found name\n");
++ printf("%s() Found name\n", __func__);
+ if( (namebuf = malloc(hlen / 2))) {
+ OBEX_UnicodeToChar(namebuf, hv.bs, hlen);
+ name = namebuf;
+@@ -72,7 +72,7 @@
+ break;
+
+ default:
+- printf(__FUNCTION__ "() Skipped header %02x\n", hi);
++ printf("%s() Skipped header %02x\n", __func__, hi);
+ }
+ }
+ if(!body) {
+@@ -103,12 +103,12 @@
+ char *name = NULL;
+ char *namebuf = NULL;
+
+- printf(__FUNCTION__ "()\n");
++ printf("%s()\n", __func__);
+
+ while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) {
+ switch(hi) {
+ case OBEX_HDR_NAME:
+- printf(__FUNCTION__ "() Found name\n");
++ printf("%s() Found name\n", __func__);
+ if( (namebuf = malloc(hlen / 2))) {
+ OBEX_UnicodeToChar(namebuf, hv.bs, hlen);
+ name = namebuf;
+@@ -116,16 +116,16 @@
+ break;
+
+ default:
+- printf(__FUNCTION__ "() Skipped header %02x\n", hi);
++ printf("%s() Skipped header %02x\n", __func__, hi);
+ }
+ }
+
+ if(!name) {
+- printf(__FUNCTION__ "() Got a GET without a name-header!\n");
++ printf("%s() Got a GET without a name-header!\n", __func__);
+ OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_FOUND, OBEX_RSP_NOT_FOUND);
+ return;
+ }
+- printf(__FUNCTION__ "() Got a request for %s\n", name);
++ printf("%s() Got a request for %s\n", __func__, name);
+
+ buf = easy_readfile(name, &file_size);
+ if(buf == NULL) {
+@@ -154,7 +154,7 @@
+
+ const uint8_t *who = NULL;
+ int who_len = 0;
+- printf(__FUNCTION__ "()\n");
++ printf("%s()\n", __func__);
+
+ while(OBEX_ObjectGetNextHeader(handle, object, &hi, &hv, &hlen)) {
+ if(hi == OBEX_HDR_WHO) {
+@@ -162,7 +162,7 @@
+ who_len = hlen;
+ }
+ else {
+- printf(__FUNCTION__ "() Skipped header %02x\n", hi);
++ printf("%s() Skipped header %02x\n", __func__, hi);
+ }
+ }
+ if (who_len == 6) {
+@@ -199,7 +199,7 @@
+ OBEX_ObjectSetRsp(object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS);
+ break;
+ default:
+- printf(__FUNCTION__ "() Denied %02x request\n", cmd);
++ printf("%s() Denied %02x request\n", __func__, cmd);
+ OBEX_ObjectSetRsp(object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED);
+ break;
+ }
+@@ -224,7 +224,7 @@
+ break;
+
+ default:
+- printf(__FUNCTION__ "() Command (%02x) has now finished\n", obex_cmd);
++ printf("%s() Command (%02x) has now finished\n", __func__, obex_cmd);
+ break;
+ }
+ }
Added: trunk/rpms/pdns/pdns-2.9.21-avoid-version.patch
===================================================================
--- trunk/rpms/pdns/pdns-2.9.21-avoid-version.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/pdns/pdns-2.9.21-avoid-version.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,66 @@
+--- pdns-2.9.21/modules/ldapbackend/Makefile.in.avoid-version 2007-04-24 09:02:39.000000000 +0200
++++ pdns-2.9.21/modules/ldapbackend/Makefile.in 2007-04-24 09:04:35.000000000 +0200
+@@ -214,7 +214,7 @@
+ EXTRA_DIST = OBJECTFILES OBJECTLIBS
+ libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh \
+ powerldap.hh powerldap.cc utils.hh
+-
++libldapbackend_la_LDFLAGS = -avoid-version
+ libldapbackend_la_LIBADD = -lldap
+ all: all-am
+
+--- pdns-2.9.21/modules/pipebackend/Makefile.in.avoid-version 2007-04-24 09:04:56.000000000 +0200
++++ pdns-2.9.21/modules/pipebackend/Makefile.in 2007-04-24 09:05:12.000000000 +0200
+@@ -217,7 +217,7 @@
+ EXTRA_DIST = OBJECTFILES OBJECTLIBS backend.pl
+ lib_LTLIBRARIES = libpipebackend.la
+ libpipebackend_la_SOURCES = pipebackend.cc pipebackend.hh coprocess.cc coprocess.hh
+-libpipebackend_la_LDFLAGS = -module
++libpipebackend_la_LDFLAGS = -module -avoid-version
+ all: all-am
+
+ .SUFFIXES:
+--- pdns-2.9.21/modules/gpgsqlbackend/Makefile.in.avoid-version 2007-04-24 09:00:43.000000000 +0200
++++ pdns-2.9.21/modules/gpgsqlbackend/Makefile.in 2007-04-24 09:01:19.000000000 +0200
+@@ -217,7 +217,7 @@
+ spgsql.hh spgsql.cc
+
+ libgpgsqlbackend_la_LDFLAGS = @PGSQL_lib@ -Wl,-Bstatic -lpq \
+- -Wl,-Bdynamic
++ -Wl,-Bdynamic -avoid-version
+
+ libgpgsqlbackend_la_LIBADD = -lssl -lcrypt -lcrypto
+ all: all-am
+--- pdns-2.9.21/modules/gmysqlbackend/Makefile.in.avoid-version 2007-04-24 09:00:14.000000000 +0200
++++ pdns-2.9.21/modules/gmysqlbackend/Makefile.in 2007-04-24 09:00:34.000000000 +0200
+@@ -216,7 +216,7 @@
+ libgmysqlbackend_la_SOURCES = gmysqlbackend.cc gmysqlbackend.hh \
+ smysql.hh smysql.cc
+
+-libgmysqlbackend_la_LDFLAGS = -module -lmysqlclient
++libgmysqlbackend_la_LDFLAGS = -module -lmysqlclient -avoid-version
+ all: all-am
+
+ .SUFFIXES:
+--- pdns-2.9.21/modules/gsqlite3backend/Makefile.in.avoid-version 2007-04-24 09:02:09.000000000 +0200
++++ pdns-2.9.21/modules/gsqlite3backend/Makefile.in 2007-04-24 09:02:24.000000000 +0200
+@@ -216,7 +216,7 @@
+ libgsqlite3backend_la_SOURCES = gsqlite3backend.cc gsqlite3backend.hh \
+ ssqlite3.hh ssqlite3.cc
+
+-libgsqlite3backend_la_LDFLAGS = -module -lsqlite3
++libgsqlite3backend_la_LDFLAGS = -module -lsqlite3 -avoid-version
+ all: all-am
+
+ .SUFFIXES:
+--- pdns-2.9.21/modules/geobackend/Makefile.in.avoid-version 2007-04-24 08:58:20.000000000 +0200
++++ pdns-2.9.21/modules/geobackend/Makefile.in 2007-04-24 08:59:44.000000000 +0200
+@@ -213,7 +213,7 @@
+ EXTRA_DIST = OBJECTFILES OBJECTLIBS
+ lib_LTLIBRARIES = libgeobackend.la
+ libgeobackend_la_SOURCES = geobackend.cc geobackend.hh ippreftree.cc ippreftree.hh
+-libgeobackend_la_LDFLAGS = -module
++libgeobackend_la_LDFLAGS = -module -avoid-version
+ all: all-am
+
+ .SUFFIXES:
Added: trunk/rpms/pdns/pdns-2.9.21-fixinit.patch
===================================================================
--- trunk/rpms/pdns/pdns-2.9.21-fixinit.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/pdns/pdns-2.9.21-fixinit.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,26 @@
+--- pdns-2.9.20/pdns/pdns.in.fixinit 2006-12-17 18:14:14.000000000 +0100
++++ pdns-2.9.20/pdns/pdns.in 2006-12-17 18:15:42.000000000 +0100
+@@ -47,6 +47,7 @@
+ if test "$NOTRUNNING" = "0"
+ then
+ doPC quit
++ rm -f /var/lock/subsys/pdns
+ echo $ret
+ else
+ echo "not running"
+@@ -57,6 +58,7 @@
+ force-stop)
+ echo -n "Stopping PowerDNS authoritative nameserver: "
+ killall -v -9 pdns_server
++ rm -f /var/lock/subsys/pdns
+ echo "killed"
+ ;;
+
+@@ -69,6 +71,7 @@
+ $pdns_server --daemon --guardian=yes
+ if test "$?" = "0"
+ then
++ touch /var/lock/subsys/pdns
+ echo "started"
+ fi
+ fi
Added: trunk/rpms/perl-CGI-Persistent/perl-CGI-Persistent-1.00-relpath.patch
===================================================================
--- trunk/rpms/perl-CGI-Persistent/perl-CGI-Persistent-1.00-relpath.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/perl-CGI-Persistent/perl-CGI-Persistent-1.00-relpath.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,63 @@
+Index: formmagick/lib/CGI/Persistent.pm
+diff -u formmagick/lib/CGI/Persistent.pm:1.1.1.1 formmagick/lib/CGI/Persistent.pm:1.2
+--- formmagick/lib/CGI/Persistent.pm:1.1.1.1 Mon Jul 22 13:42:19 2002
++++ formmagick/lib/CGI/Persistent.pm Fri Aug 16 14:34:05 2002
+@@ -14,22 +14,25 @@
+ use Persistence::Object::Simple;
+ use vars qw(@ISA $VERSION);
+ use Data::Dumper;
+- at ISA = qw( CGI ); ( $VERSION ) = '$Revision: 1.00 $' =~ /(\d+\.\d+)/;
++use File::Basename;
++ at ISA = qw( CGI ); ( $VERSION ) = '$Revision: 1.00 $' =~ /(\d+\.\d+)/;
+
+ sub new {
+
+ my ( $class, $dope, $id ) = @_ ;
+ $dope = "." unless $dope;
+ my $cgi = new CGI; # print $cgi->header ();
+- my $fn = $cgi->param( '.id' ) || $id;
++ $cgi->{sessiondir} = dirname($id) if $id;
++ my $fn = basename($cgi->param( '.id' ) || $id);
+
+ unless ( $fn ) {
+ my $po = new Persistence::Object::Simple ( __Dope => $dope );
+- $cgi->append( -name => '.id', -values => $po->{ __Fn } );
+- $fn = $po->{ __Fn }; undef $po;
++ $cgi->append( -name => '.id', -values => basename $po->{ __Fn } );
++ $fn = basename $po->{ __Fn }; undef $po;
+ }
+
+- my $po = new Persistence::Object::Simple __Fn => $fn;
++ my $po = new Persistence::Object::Simple __Fn =>
++ join "/", ($cgi->{sessiondir},$fn);
+ $po->{ __DOPE } = undef;
+ my @names = $cgi->param ();
+
+@@ -51,7 +54,7 @@
+ sub delete {
+
+ my ( $self, $param ) = @_;
+- my $fn = $self->param( '.id' );
++ my $fn = join "/", ($self->{sessiondir},$self->param( '.id' ));
+ my $po = new Persistence::Object::Simple __Fn => $fn;
+ delete $po->{ $param }; $po->commit ();
+ $self->SUPER::delete ( $param ); # delete, is like, overloaded.
+@@ -61,7 +64,7 @@
+ sub delete_all {
+
+ my ( $self ) = shift;
+- $fn = $self->param( '.id' );
++ $fn = join "/", ($self->{sessiondir},$self->param( '.id' ));
+ my $po = new Persistence::Object::Simple __Fn => $fn;
+ $po->expire;
+ $self->SUPER::delete_all ();
+@@ -99,7 +102,7 @@
+
+ }
+
+-"True Value";
++1;
+
+ =head1 NAME
+
+
Added: trunk/rpms/perl-Courier-Filter/Courier-Filter-0.17-message.patch
===================================================================
--- trunk/rpms/perl-Courier-Filter/Courier-Filter-0.17-message.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/perl-Courier-Filter/Courier-Filter-0.17-message.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- lib/Courier/Message.pm.orig 2008-01-26 04:11:08.302317808 +0100
++++ lib/Courier/Message.pm 2008-01-26 04:11:29.775053456 +0100
+@@ -627,7 +627,7 @@
+
+ $decoded_word = Encode::decode($char_enc, $chunk);
+ }
+- except {
++ otherwise {
+ # The chunk contains invalid characters, leave the encoded word as is:
+ $decoded_word = $encoded_word;
+ };
Added: trunk/rpms/psi/psi-0.9.2-strip.patch
===================================================================
--- trunk/rpms/psi/psi-0.9.2-strip.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/psi/psi-0.9.2-strip.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,10 @@
+--- ./src/src.pro.strip 2004-06-10 11:40:59.254407224 +0200
++++ ./src/src.pro 2004-06-10 11:41:10.358719112 +0200
+@@ -5,6 +5,7 @@
+ # Configuration
+ TEMPLATE = app
+ CONFIG += qt thread x11
++QMAKE_STRIP = true
+
+ #CONFIG += debug
+ #CONFIG += use_crash
Added: trunk/rpms/rrdtool/rrdtool-1.0.50-configure.patch
===================================================================
--- trunk/rpms/rrdtool/rrdtool-1.0.50-configure.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/rrdtool/rrdtool-1.0.50-configure.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- configure.orig 2005-11-27 18:00:00.117013352 +0100
++++ configure 2005-11-27 18:00:33.385955704 +0100
+@@ -3592,7 +3592,7 @@
+ # This must be Linux ELF.
+ linux*)
+ case $host_cpu in
+- alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
++ alpha* | hppa* | i*86 | x86_64 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+ lt_cv_deplibs_check_method=pass_all ;;
+ *)
+ # glibc up to 2.1.1 does not perform some relocations on ARM
Added: trunk/rpms/streamdvd/streamdvd-0.4-gcc41.patch
===================================================================
--- trunk/rpms/streamdvd/streamdvd-0.4-gcc41.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/streamdvd/streamdvd-0.4-gcc41.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- StreamDVD-0.4/mplex/zalphastrm.hpp 2004-03-08 23:10:53.000000000 +0100
++++ StreamDVD-0.4.new/mplex/zalphastrm.hpp 2006-01-23 13:26:31.000000000 +0100
+@@ -45,7 +45,7 @@
+ virtual bool AUBufferNeedsRefill();
+ virtual void NextDTSPTS( clockticks &DTS, clockticks &PTS);
+ virtual void ScanFirstSeqHeader();
+- bool ZAlphaStream::RunOutComplete();
++ bool RunOutComplete();
+
+ private:
+ float z_min;
Added: trunk/rpms/streamdvd/streamdvd-0.4-gui.patch
===================================================================
--- trunk/rpms/streamdvd/streamdvd-0.4-gui.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/streamdvd/streamdvd-0.4-gui.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,10 @@
+--- Gui/StreamDVD/Streams.pm.orig 2005-06-14 17:16:06.000000000 +0200
++++ Gui/StreamDVD/Streams.pm 2005-06-14 17:16:12.000000000 +0200
+@@ -1,6 +1,6 @@
+ # Part of the StreamDVD project
+
+-package StreamDVD::Audio;
++package StreamDVD::Streams;
+
+ use strict;
+ use vars qw($VERSION @ISA @EXPORT);
Added: trunk/rpms/streamdvd/streamdvd-0.4-lsdvd.patch
===================================================================
--- trunk/rpms/streamdvd/streamdvd-0.4-lsdvd.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/streamdvd/streamdvd-0.4-lsdvd.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,62 @@
+--- contrib/lsdvd/lsdvd.c.orig 2005-06-14 17:25:19.000000000 +0200
++++ contrib/lsdvd/lsdvd.c 2005-06-14 17:31:58.000000000 +0200
+@@ -32,6 +32,14 @@
+ printf("%s => ", name); \
+ printf(x); printf(",\n"); \
+ }
++#define HASHI(name) { \
++ INDENT; \
++ (name ? \
++ printf((_lvl ? "%d => {\n" : "our %%%d = (\n"), name) : \
++ printf("{\n")); \
++ _lvl++; _lvl_type[_lvl] = 0; \
++}
++
+ #define HASH(name) { \
+ INDENT; \
+ (name ? \
+@@ -287,7 +295,7 @@
+ pgc = vts_pgcit->pgci_srp[ifo[title_set_nr]->vts_ptt_srpt->title[vts_ttn - 1].ptt[0].pgcn - 1].pgc;
+
+ if (opt_p) {
+- HASH(0);
++ HASHI(0);
+ DEF("ix", "%d", j+1);
+ DEF("length", "%.3f", dvdtime2msec(&pgc->playback_time)/1000.0);
+ DEF("vts_id", "'%.12s'", vtsi_mat->vts_identifier);
+@@ -343,7 +351,7 @@
+ audio_attr = &vtsi_mat->vts_audio_attr[i];
+ sprintf(lang_code, "%c%c", audio_attr->lang_code>>8, audio_attr->lang_code & 0xff);
+ if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; }
+- HASH(0);
++ HASHI(0);
+ DEF("ix", "%d", i+1);
+ DEF("langcode", "'%s'", lang_code);
+ DEF("language", "'%s'", lang_name(lang_code));
+@@ -390,7 +398,7 @@
+ ms = ms + dvdtime2msec(&pgc->cell_playback[cell].playback_time);
+ cell++;
+ }
+- HASH(0);
++ HASHI(0);
+ DEF("ix", "%d", i+1);
+ DEF("length", "%.3f", ms/1000.0);
+ DEF("startcell", "%d", pgc->program_map[i]);
+@@ -427,7 +435,7 @@
+ ARRAY("cell");
+ for (i=0; i<pgc->nr_of_cells; i++)
+ {
+- HASH(0);
++ HASHI(0);
+ DEF("ix", "%d", i+1);
+ DEF("length", "%.3f", dvdtime2msec(&pgc->cell_playback[i].playback_time)/1000.0);
+ RETURN;
+@@ -452,7 +460,7 @@
+ sprintf(lang_code, "%c%c", subp_attr->lang_code>>8, subp_attr->lang_code & 0xff);
+ if (!lang_code[0]) { lang_code[0] = 'x'; lang_code[1] = 'x'; }
+
+- HASH(0);
++ HASHI(0);
+ DEF("ix", "%d", i+1);
+ DEF("langcode", "'%s'", lang_code);
+ DEF("language", "'%s'", lang_name(lang_code));
Added: trunk/rpms/streamdvd/streamdvd-0.4-makefile.patch
===================================================================
--- trunk/rpms/streamdvd/streamdvd-0.4-makefile.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/streamdvd/streamdvd-0.4-makefile.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,27 @@
+--- Makefile.orig 2005-06-14 08:43:53.000000000 +0200
++++ Makefile 2005-06-14 08:47:18.000000000 +0200
+@@ -1,16 +1,17 @@
+-INSTALLDIR = /usr/local/bin/
++INSTALLDIR=/usr/local/bin
++CFLAGS=
+
+ all:
+- g++ -g -Wall -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp
++ g++ -g -Wall $(CFLAGS) -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp
+
+ addon:
+- gcc -g -Wall -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c
+- gcc -g -Wall -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c
++ gcc -g -Wall $(CFLAGS) -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c
++ gcc -g -Wall $(CFLAGS) -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c
+
+ gui:
+- g++ -g -Wall -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp
+- gcc -g -Wall -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c
+- gcc -g -Wall -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c
++ g++ -g -Wall $(CFLAGS) -ldvdread -lm -o streamdvd -I. -Implex streamdvd.c requant.c mplex/*.c mplex/*.cpp
++ gcc -g -Wall $(CFLAGS) -ldvdread -o streamanalyze contrib/StreamAnalyze/streamanalyze.c
++ gcc -g -Wall $(CFLAGS) -ldvdread -DVERSION=\"0.9\" -o lsdvd contrib/lsdvd/lsdvd.c
+
+ clean:
+ rm -f streamdvd streamanalyze lsdvd
Added: trunk/rpms/streamdvd/streamdvd-0.4-streamdvd.patch
===================================================================
--- trunk/rpms/streamdvd/streamdvd-0.4-streamdvd.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/streamdvd/streamdvd-0.4-streamdvd.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,35 @@
+--- streamdvd.c.orig 2005-06-14 17:33:13.000000000 +0200
++++ streamdvd.c 2005-06-14 17:34:12.000000000 +0200
+@@ -173,7 +173,7 @@
+ }
+
+ pts_diff = ( (double)v_pts/90000. ) - ( (double)a_pts/90000. );
+- gl->av_delay = pts_diff * 1000.;
++ gl->av_delay = (int)(pts_diff * 1000.);
+
+ fprintf(stderr, "AV Delay: %d ms\n", gl->av_delay);
+ }
+--- requant.c.orig 2005-06-14 17:36:50.000000000 +0200
++++ requant.c 2005-06-14 17:41:47.000000000 +0200
+@@ -1308,10 +1308,10 @@
+ #define NEXT_MACROBLOCK \
+ do { \
+ h_offset += 16; \
+- if (h_offset == horizontal_size_value) \
++ if (h_offset == (int)horizontal_size_value) \
+ { \
+ v_offset += 16; \
+- if (v_offset > (vertical_size_value - 16)) return; \
++ if (v_offset > (int)(vertical_size_value - 16)) return; \
+ h_offset = 0; \
+ } \
+ } while (0)
+@@ -1431,7 +1431,7 @@
+ v_offset += 16;
+ }
+
+- if (v_offset > (vertical_size_value - 16)) return 1;
++ if (v_offset > (int)(vertical_size_value - 16)) return 1;
+
+ return 0;
+
Added: trunk/rpms/subversion/subversion-1.4.4-macropen.patch
===================================================================
--- trunk/rpms/subversion/subversion-1.4.4-macropen.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/subversion/subversion-1.4.4-macropen.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,184 @@
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/uuids-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/uuids-table.c
+@@ -47,7 +47,7 @@
+ BDB_ERR(db_create(&uuids, env, 0));
+ BDB_ERR(uuids->set_re_len(uuids, APR_UUID_FORMATTED_LENGTH));
+
+- error = uuids->open(SVN_BDB_OPEN_PARAMS(uuids, NULL),
++ error = (uuids->open)(SVN_BDB_OPEN_PARAMS(uuids, NULL),
+ "uuids", 0, DB_RECNO,
+ open_flags, 0666);
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/strings-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/strings-table.c
+@@ -44,10 +44,10 @@
+ BDB_ERR(db_create(&strings, env, 0));
+
+ /* Enable duplicate keys. This allows the data to be spread out across
+- multiple records. Note: this must occur before ->open(). */
++ multiple records. Note: this must occur before (->open)(). */
+ BDB_ERR(strings->set_flags(strings, DB_DUP));
+
+- BDB_ERR(strings->open(SVN_BDB_OPEN_PARAMS(strings, NULL),
++ BDB_ERR((strings->open)(SVN_BDB_OPEN_PARAMS(strings, NULL),
+ "strings", 0, DB_BTREE,
+ open_flags, 0666));
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/changes-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/changes-table.c
+@@ -51,10 +51,10 @@
+ BDB_ERR(db_create(&changes, env, 0));
+
+ /* Enable duplicate keys. This allows us to store the changes
+- one-per-row. Note: this must occur before ->open(). */
++ one-per-row. Note: this must occur before (->open)(). */
+ BDB_ERR(changes->set_flags(changes, DB_DUP));
+
+- BDB_ERR(changes->open(SVN_BDB_OPEN_PARAMS(changes, NULL),
++ BDB_ERR((changes->open)(SVN_BDB_OPEN_PARAMS(changes, NULL),
+ "changes", 0, DB_BTREE,
+ open_flags, 0666));
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/lock-tokens-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
+@@ -43,7 +43,7 @@
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&lock_tokens, env, 0));
+- error = lock_tokens->open(SVN_BDB_OPEN_PARAMS(lock_tokens, NULL),
++ error = (lock_tokens->open)(SVN_BDB_OPEN_PARAMS(lock_tokens, NULL),
+ "lock-tokens", 0, DB_BTREE,
+ open_flags, 0666);
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/env.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/env.c
+@@ -626,7 +626,7 @@
+ flags |= DB_THREAD;
+ #endif
+ SVN_ERR(convert_bdb_error
+- (bdb, bdb->env->open(bdb->env, bdb->path_bdb, flags, mode)));
++ (bdb, (bdb->env->open)(bdb->env, bdb->path_bdb, flags, mode)));
+
+ #if SVN_BDB_AUTO_COMMIT
+ /* Assert the BDB_AUTO_COMMIT flag on the opened environment. This
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/copies-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/copies-table.c
+@@ -43,7 +43,7 @@
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&copies, env, 0));
+- BDB_ERR(copies->open(SVN_BDB_OPEN_PARAMS(copies, NULL),
++ BDB_ERR((copies->open)(SVN_BDB_OPEN_PARAMS(copies, NULL),
+ "copies", 0, DB_BTREE,
+ open_flags, 0666));
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/nodes-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/nodes-table.c
+@@ -50,7 +50,7 @@
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&nodes, env, 0));
+- BDB_ERR(nodes->open(SVN_BDB_OPEN_PARAMS(nodes, NULL),
++ BDB_ERR((nodes->open)(SVN_BDB_OPEN_PARAMS(nodes, NULL),
+ "nodes", 0, DB_BTREE,
+ open_flags, 0666));
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/locks-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/locks-table.c
+@@ -44,7 +44,7 @@
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&locks, env, 0));
+- error = locks->open(SVN_BDB_OPEN_PARAMS(locks, NULL),
++ error = (locks->open)(SVN_BDB_OPEN_PARAMS(locks, NULL),
+ "locks", 0, DB_BTREE,
+ open_flags, 0666);
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/txn-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/txn-table.c
+@@ -51,7 +51,7 @@
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&txns, env, 0));
+- BDB_ERR(txns->open(SVN_BDB_OPEN_PARAMS(txns, NULL),
++ BDB_ERR((txns->open)(SVN_BDB_OPEN_PARAMS(txns, NULL),
+ "transactions", 0, DB_BTREE,
+ open_flags, 0666));
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/reps-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/reps-table.c
+@@ -44,7 +44,7 @@
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&reps, env, 0));
+- BDB_ERR(reps->open(SVN_BDB_OPEN_PARAMS(reps, NULL),
++ BDB_ERR((reps->open)(SVN_BDB_OPEN_PARAMS(reps, NULL),
+ "representations", 0, DB_BTREE,
+ open_flags, 0666));
+
+--- subversion-1.4.4/subversion/libsvn_fs_base/bdb/rev-table.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs_base/bdb/rev-table.c
+@@ -40,7 +40,7 @@
+
+ BDB_ERR(svn_fs_bdb__check_version());
+ BDB_ERR(db_create(&revisions, env, 0));
+- BDB_ERR(revisions->open(SVN_BDB_OPEN_PARAMS(revisions, NULL),
++ BDB_ERR((revisions->open)(SVN_BDB_OPEN_PARAMS(revisions, NULL),
+ "revisions", 0, DB_RECNO,
+ open_flags, 0666));
+
+--- subversion-1.4.4/subversion/libsvn_ra/ra_loader.c.macropen
++++ subversion-1.4.4/subversion/libsvn_ra/ra_loader.c
+@@ -291,8 +291,8 @@
+ session->pool = pool;
+
+ /* Ask the library to open the session. */
+- SVN_ERR(vtable->open(session, repos_URL, callbacks, callback_baton,
+- config, pool));
++ SVN_ERR((vtable->open)(session, repos_URL, callbacks, callback_baton,
++ config, pool));
+
+ *session_p = session;
+ return SVN_NO_ERROR;
+--- subversion-1.4.4/subversion/tests/libsvn_ra_local/ra-local-test.c.macropen
++++ subversion-1.4.4/subversion/tests/libsvn_ra_local/ra-local-test.c
+@@ -95,7 +95,7 @@
+ SVN_ERR(current_directory_url(&url, repos_name, pool));
+
+ /* Open an RA session into this repository. */
+- SVN_ERR((*plugin)->open(session, url, cbtable, NULL, NULL, pool));
++ SVN_ERR(((*plugin)->open)(session, url, cbtable, NULL, NULL, pool));
+
+ return SVN_NO_ERROR;
+ }
+--- subversion-1.4.4/subversion/libsvn_fs/fs-loader.c.macropen
++++ subversion-1.4.4/subversion/libsvn_fs/fs-loader.c
+@@ -364,7 +364,7 @@
+
+ SVN_ERR(fs_library_vtable(&vtable, path, pool));
+ *fs_p = svn_fs_new(fs_config, pool);
+- SVN_ERR(vtable->open(*fs_p, path, pool));
++ SVN_ERR((vtable->open)(*fs_p, path, pool));
+ return serialized_init(*fs_p, pool);
+ }
+
+@@ -423,7 +423,7 @@
+ fs_library_vtable_t *vtable;
+
+ SVN_ERR(fs_library_vtable(&vtable, path, fs->pool));
+- SVN_ERR(vtable->open(fs, path, fs->pool));
++ SVN_ERR((vtable->open)(fs, path, fs->pool));
+ return serialized_init(fs, fs->pool);
+ }
+
+--- subversion-1.4.4/build/generator/swig/header_wrappers.py.macropen
++++ subversion-1.4.4/build/generator/swig/header_wrappers.py
+@@ -103,7 +103,7 @@
+ self.ofile.write(
+ "static svn_error_t *%s_invoke_%s(\n" % (struct[:-2], name) +
+ " %s *_obj, %s) {\n" % (struct, params) +
+- " return _obj->%s(%s);\n" % (name, param_names) +
++ " return (_obj->%s)(%s);\n" % (name, param_names) +
+ "}\n\n")
+
+ self.ofile.write("%}\n")
Added: trunk/rpms/subversion/subversion-1.4.4-swig1333.patch
===================================================================
--- trunk/rpms/subversion/subversion-1.4.4-swig1333.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/subversion/subversion-1.4.4-swig1333.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,21 @@
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=453166
+
+# For some reason, rubyhead.swg is included without being needed (at least
+# for the current swig 1.3.33 version). This leads to a redefinition of
+# _mSWIG. The documentation of SWIG only talks about including just
+# the external_runtime file, not any additional includes. Also, the other
+# bindings do not include anything from SWIG apart from the external
+# runtime. So I think this patch should suffice.
+#
+# -- Torsten Landschoff
+
+Index: subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
+===================================================================
+--- subversion-1.4.4/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.swig133
++++ subversion-1.4.4/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
+@@ -1,4 +1,3 @@
+-#include "rubyhead.swg"
+ #include "swig_ruby_external_runtime.swg"
+ #include "swigutil_rb.h"
+ #include <st.h>
Added: trunk/rpms/tn5250/tn5250-0.16.5-bhc.patch
===================================================================
--- trunk/rpms/tn5250/tn5250-0.16.5-bhc.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/tn5250/tn5250-0.16.5-bhc.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,23 @@
+--- tn5250-0.16.5/linux/Makefile.in.bhc 2003-03-19 16:33:23.000000000 +0100
++++ tn5250-0.16.5/linux/Makefile.in 2003-03-19 16:34:04.000000000 +0100
+@@ -252,20 +252,12 @@
+ @( good=no ; \
+ if [ "$$(uname -s)" = "Linux" ]; then \
+ if which tic >/dev/null 2>&1 ; then \
+- if [ "`whoami`" = "root" ]; then \
+ rm -f /usr/share/terminfo/x/xterm-5250 ; \
+ rm -f /usr/share/terminfo/5/5250 ; \
+ rm -f /usr/lib/terminfo/x/xterm-5250 ; \
+ rm -f /usr/lib/terminfo/5/5250 ; \
+ good=yes ; \
+ tic $(srcdir)/5250.terminfo || good=no ; \
+- else \
+- mkdir -p ~/.terminfo || exit $$? ; \
+- rm -f ~/.terminfo/x/xterm-5250 ; \
+- rm -f ~/.terminfo/5/5250 ; \
+- good=yes ; \
+- tic $(srcdir)/5250.terminfo || good=no ; \
+- fi ; \
+ fi ; \
+ else \
+ good=yes ; \
Added: trunk/rpms/tn5250/tn5250-0.17.3-multilib.patch
===================================================================
--- trunk/rpms/tn5250/tn5250-0.17.3-multilib.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/tn5250/tn5250-0.17.3-multilib.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,376 @@
+--- tn5250-0.17.3/configure.multilib 2006-05-23 10:12:22.000000000 +0200
++++ tn5250-0.17.3/configure 2006-05-23 10:12:44.000000000 +0200
+@@ -23642,363 +23642,6 @@
+ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6
+
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
+-if test "${ac_cv_sizeof_long+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$ac_cv_type_long" = yes; then
+- # The cast to unsigned long works around a bug in the HP C Compiler
+- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+- # This bug is HP SR number 8606223364.
+- if test "$cross_compiling" = yes; then
+- # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=0 ac_mid=0
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=-1 ac_mid=-1
+- while :; do
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_lo=$ac_mid; break
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+- if test $ac_mid -le $ac_hi; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- done
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo= ac_hi=
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+-test_array [0] = 0
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_hi=$ac_mid
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; } ;;
+-esac
+-else
+- if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+- FILE *f = fopen ("conftest.val", "w");
+- if (! f)
+- exit (1);
+- if (((long) (sizeof (long))) < 0)
+- {
+- long i = longval ();
+- if (i != ((long) (sizeof (long))))
+- exit (1);
+- fprintf (f, "%ld\n", i);
+- }
+- else
+- {
+- unsigned long i = ulongval ();
+- if (i != ((long) (sizeof (long))))
+- exit (1);
+- fprintf (f, "%lu\n", i);
+- }
+- exit (ferror (f) || fclose (f) != 0);
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_sizeof_long=`cat conftest.val`
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.val
+-else
+- ac_cv_sizeof_long=0
+-fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG $ac_cv_sizeof_long
+-_ACEOF
+-
+-
+
+ cat >>confdefs.h <<_ACEOF
+ #define SOCKET_TYPE int
+--- tn5250-0.17.3/configure.in.multilib 2006-05-23 10:12:34.000000000 +0200
++++ tn5250-0.17.3/configure.in 2006-05-23 10:12:45.000000000 +0200
+@@ -294,7 +294,6 @@
+
+ AC_CHECK_SIZEOF(short, 2)
+ AC_CHECK_SIZEOF(int, 4)
+-AC_CHECK_SIZEOF(long, 4)
+
+ dnl * True for anything other than Windoze.
+ AC_DEFINE_UNQUOTED(SOCKET_TYPE,int)
Added: trunk/rpms/usbsink/usbsink-utils.patch
===================================================================
--- trunk/rpms/usbsink/usbsink-utils.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/usbsink/usbsink-utils.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- src/utils.cc 2007-04-30 12:30:18.000000000 -0800
++++ utils.cc 2007-09-04 01:10:29.000000000 -0800
+@@ -53,7 +53,7 @@
+ static const guint64 KILOBYTE = 1024;
+ static const guint64 MEGABYTE = 1048576; // 1024 * 1024;
+ static const guint64 GIGABYTE = 1073741824; // 1024 * 1024 * 1024;
+-static const guint64 TERABYTE = 1099511627776; // 1024 * 1024 * 1024 * 1024;
++//static const guint64 TERABYTE = 1099511627776; // 1024 * 1024 * 1024 * 1024;
+
+ Glib::ustring
+ i18n_printf(const Glib::ustring& format, ...)
Added: trunk/rpms/viruskiller/viruskiller-1.0-makefile.patch
===================================================================
--- trunk/rpms/viruskiller/viruskiller-1.0-makefile.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/viruskiller/viruskiller-1.0-makefile.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,54 @@
+--- makefile.orig 2005-05-21 19:03:45.000000000 +0200
++++ makefile 2008-01-11 02:40:22.556181856 +0100
+@@ -7,19 +7,17 @@
+ RELEASE = 1
+ USEPAK = 1
+
+-PREFIX=$(DESTDIR)/usr
++PREFIX = $(DESTDIR)/usr
+ BINDIR = $(PREFIX)/games/
+-DATADIR = $(PREFIX)/share/games/parallelrealities/
+-DOCDIR = $(PREFIX)/share/doc/$(PROG)-$(VERSION)-$(RELEASE)/
+-ICONDIR = $(PREFIX)/share/icons/
+-KDE = $(PREFIX)/share/applnk/Games/Arcade/
+-GNOME = $(PREFIX)/share/gnome/apps/Games/
++DATADIR = $(PREFIX)/share/games/viruskiller/
++ICONDIR = $(PREFIX)/share/pixmaps/
++GNOME = $(PREFIX)/share/applications/
+
+ SAFEDIR = /tmp/
+
+-CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
++CFLAGS += $(OPTFLAGS) `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
+ CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DSAFEDIR=\"$(SAFEDIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)manual.html\" -Wall
+-LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf
++LIBS = `sdl-config --libs` -lz -lSDL_mixer -lSDL_image -lSDL_ttf
+
+ OBJS += CAudio.o
+ OBJS += CBase.o
+@@ -75,21 +73,10 @@
+ install:
+
+ ./pak data gfx music sound $(PAKNAME)
+- mkdir -p $(BINDIR)
+- mkdir -p $(DATADIR)
+- mkdir -p $(DOCDIR)
+ mkdir -p $(ICONDIR)
+- mkdir -p $(ICONDIR)mini
+- mkdir -p $(ICONDIR)large
+- mkdir -p $(KDE)
+ mkdir -p $(GNOME)
+
+- strip $(PROG)
+- install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)
+- install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
+- cp $(DOCS) $(DOCDIR)
+- cp $(ICONS)$(PROG).png $(ICONDIR)
+- cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png
+- cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png
+- cp $(ICONS)$(PROG).desktop $(KDE)
+- cp $(ICONS)$(PROG).desktop $(GNOME)
++ install -Dp -m0755 $(PROG) $(BINDIR)$(PROG)
++ install -Dp -m0644 $(PAKNAME) $(DATADIR)$(PAKNAME)
++ install -Dp -m0644 $(ICONS)$(PROG).png $(ICONDIR)$(PROG).png
++ install -Dp -m0644 $(ICONS)$(PROG).desktop $(GNOME)$(PROG).desktop
Added: trunk/rpms/x264/x264-snapshot-20070529-2245-glibc232.patch
===================================================================
--- trunk/rpms/x264/x264-snapshot-20070529-2245-glibc232.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/x264/x264-snapshot-20070529-2245-glibc232.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,11 @@
+--- /dar/build/x264-snapshot-20070529-2245/common/cpu.c.orig 2007-06-03 22:48:45.000000000 +0200
++++ /dar/build/x264-snapshot-20070529-2245/common/cpu.c 2007-06-03 22:49:22.000000000 +0200
+@@ -217,7 +217,7 @@
+ int np;
+ cpu_set_t p_aff;
+ memset( &p_aff, 0, sizeof(p_aff) );
+- sched_getaffinity( 0, sizeof(p_aff), &p_aff );
++ sched_getaffinity( 0, &p_aff );
+ for( np = 0, bit = 0; bit < sizeof(p_aff); bit++ )
+ np += (((uint8_t *)&p_aff)[bit / 8] >> (bit % 8)) & 1;
+ return np;
Added: trunk/rpms/xmms/xmms-1.2.10-configfile-safe-write.patch
===================================================================
--- trunk/rpms/xmms/xmms-1.2.10-configfile-safe-write.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/xmms/xmms-1.2.10-configfile-safe-write.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,72 @@
+--- xmms-1.2.10/libxmms/configfile.c.bak 2003-05-20 00:22:07.000000000 +0300
++++ xmms-1.2.10/libxmms/configfile.c 2006-12-30 15:08:31.045540619 +0200
+@@ -123,12 +123,27 @@ gboolean xmms_cfg_write_file(ConfigFile
+ GList *section_list, *line_list;
+ ConfigSection *section;
+ ConfigLine *line;
++ gchar *tmpfn;
++ int tmpfnfd;
+
+ g_return_val_if_fail(cfg != NULL, FALSE);
+ g_return_val_if_fail(filename != NULL, FALSE);
+
+- if (!(file = fopen(filename, "w")))
++ tmpfn = g_strconcat(filename, ".XXXXXX", NULL);
++ if (!tmpfn)
+ return FALSE;
++ tmpfnfd = mkstemp(tmpfn);
++ if (tmpfnfd == -1) {
++ free (tmpfn);
++ return FALSE;
++ }
++ file = fdopen(tmpfnfd, "w");
++ if (!file) {
++ unlink (tmpfn);
++ g_free (tmpfn);
++ close (tmpfnfd);
++ return FALSE;
++ }
+
+ section_list = cfg->sections;
+ while (section_list)
+@@ -136,20 +151,36 @@ gboolean xmms_cfg_write_file(ConfigFile
+ section = (ConfigSection *) section_list->data;
+ if (section->lines)
+ {
+- fprintf(file, "[%s]\n", section->name);
++ if (fprintf(file, "[%s]\n", section->name) < 0)
++ goto err;
+ line_list = section->lines;
+ while (line_list)
+ {
+ line = (ConfigLine *) line_list->data;
+- fprintf(file, "%s=%s\n", line->key, line->value);
++ if (fprintf(file, "%s=%s\n", line->key, line->value) < 0)
++ goto err;
+ line_list = g_list_next(line_list);
+ }
+- fprintf(file, "\n");
++ if (fprintf(file, "\n") < 0)
++ goto err;
+ }
+ section_list = g_list_next(section_list);
+ }
+- fclose(file);
++ if (fflush (file) == EOF)
++ goto err;
++ if (fsync (tmpfnfd) == -1) /* dir not synced */
++ goto err;
++ if (fclose(file) == EOF)
++ goto err;
++ if (rename (tmpfn, filename) == -1)
++ goto err;
+ return TRUE;
++
++err:
++ fclose(file);
++ unlink(tmpfn);
++ g_free (tmpfn);
++ return FALSE;
+ }
+
+ gboolean xmms_cfg_write_default_file(ConfigFile * cfg)
Added: trunk/rpms/xmms/xmms-1.2.10-crossfade-0.3.9.patch
===================================================================
--- trunk/rpms/xmms/xmms-1.2.10-crossfade-0.3.9.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/xmms/xmms-1.2.10-crossfade-0.3.9.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,101 @@
+diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c
+--- xmms-1.2.10/xmms/input.c 2003-08-08 19:10:44.000000000 +0200
++++ xmms-1.2.10.patched/xmms/input.c 2005-11-25 00:12:36.000000000 +0100
+@@ -285,6 +285,14 @@
+ }
+ }
+
++gboolean input_stopped_for_restart = FALSE; /* crossfade */
++void input_stop_for_restart() /* crossfade */
++{
++ input_stopped_for_restart = TRUE;
++ input_stop();
++ input_stopped_for_restart = FALSE;
++}
++
+ void input_stop(void)
+ {
+ if (ip_data->playing && get_current_input_plugin())
+diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h
+--- xmms-1.2.10/xmms/input.h 2000-02-16 22:05:57.000000000 +0100
++++ xmms-1.2.10.patched/xmms/input.h 2005-11-25 00:12:36.000000000 +0100
+@@ -34,6 +34,7 @@
+ gboolean input_check_file(gchar * filename);
+ void input_play(char *filename);
+ void input_stop(void);
++void input_stop_for_restart(void);
+ void input_pause(void);
+ int input_get_time(void);
+ void input_set_eq(int on, float preamp, float *bands);
+diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c
+--- xmms-1.2.10/xmms/main.c 2004-02-23 21:31:43.000000000 +0100
++++ xmms-1.2.10.patched/xmms/main.c 2005-11-25 00:12:36.000000000 +0100
+@@ -881,8 +881,10 @@
+ mainwin_set_shade(!cfg.player_shaded);
+ }
+
++gboolean is_quitting = FALSE; /* crossfade */
+ void mainwin_quit_cb(void)
+ {
++ is_quitting = TRUE; /* crossfade */
+ input_stop();
+ gtk_widget_hide(equalizerwin);
+ gtk_widget_hide(playlistwin);
+@@ -1523,7 +1525,8 @@
+ int *pos;
+
+ if (get_input_playing())
+- input_stop();
++ input_stop_for_restart();
++
+ pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data));
+ playlist_set_position(*pos);
+ playlist_play();
+diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c
+--- xmms-1.2.10/xmms/playlist.c 2004-02-23 21:31:43.000000000 +0100
++++ xmms-1.2.10.patched/xmms/playlist.c 2005-11-25 00:12:36.000000000 +0100
+@@ -124,7 +124,7 @@
+ if (get_input_playing())
+ {
+ PL_UNLOCK();
+- input_stop();
++ input_stop_for_restart();
+ PL_LOCK();
+ *restart_playing = TRUE;
+ }
+@@ -570,7 +570,7 @@
+ }
+
+ if (get_input_playing())
+- input_stop();
++ input_stop_for_restart();
+
+ vis_clear_data(mainwin_vis);
+ vis_clear_data(playlistwin_vis);
+@@ -668,7 +668,7 @@
+ {
+ /* We need to stop before changing playlist_position */
+ PL_UNLOCK();
+- input_stop();
++ input_stop_for_restart();
+ PL_LOCK();
+ restart_playing = TRUE;
+ }
+@@ -723,7 +723,7 @@
+ {
+ /* We need to stop before changing playlist_position */
+ PL_UNLOCK();
+- input_stop();
++ input_stop_for_restart();
+ PL_LOCK();
+ restart_playing = TRUE;
+ }
+@@ -852,7 +852,7 @@
+ {
+ /* We need to stop before changing playlist_position */
+ PL_UNLOCK();
+- input_stop();
++ input_stop_for_restart();
+ PL_LOCK();
+ restart_playing = TRUE;
+ }
Added: trunk/rpms/xmms/xmms-1.2.10-gcc4.patch
===================================================================
--- trunk/rpms/xmms/xmms-1.2.10-gcc4.patch 2008-02-26 10:55:57 UTC (rev 6177)
+++ trunk/rpms/xmms/xmms-1.2.10-gcc4.patch 2008-02-26 15:23:06 UTC (rev 6178)
@@ -0,0 +1,24 @@
+--- xmms-1.2.10/General/ir/ir.h.orig 2001-03-05 23:17:44.000000000 +1000
++++ xmms-1.2.10/General/ir/ir.h 2005-03-24 20:48:31.000000000 +1000
+@@ -49,8 +49,6 @@
+ }
+ irConfig;
+
+-extern pthread_t irapp_thread;
+-extern gboolean keepGoing;
+ extern irConfig irc