rpms/rakarrack/devel rakarrack-ChN-buffer-oveflow-fix.diff, NONE, 1.1 rakarrack-configure-1.14-existing-flags.diff, NONE, 1.1 rakarrack.spec, 1.5, 1.6

Thu Jan 7 14:07:41 UTC 2010

Author: dtimms

Update of /cvs/pkgs/rpms/rakarrack/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2923

Modified Files:
	rakarrack.spec 
Added Files:
	rakarrack-ChN-buffer-oveflow-fix.diff 
	rakarrack-configure-1.14-existing-flags.diff 
Log Message:
fix bug 514991 where fedora compile flags and debuginfo is faulty


rakarrack-ChN-buffer-oveflow-fix.diff:
 RecChord.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rakarrack-ChN-buffer-oveflow-fix.diff ---
diff -ur rakarrack-0.3.0.orig/src/RecChord.h rakarrack-0.3.0/src/RecChord.h
--- rakarrack-0.3.0.orig/src/RecChord.h	2008-11-06 00:45:14.000000000 +1100
+++ rakarrack-0.3.0/src/RecChord.h	2010-01-08 00:41:01.000000000 +1100
@@ -101,7 +101,7 @@
     int di2;
     int di3;
     int di4;
-    char Nom[10];
+    char Nom[16];
   } Chord5[67];
 
   int Ch[34][13];


rakarrack-configure-1.14-existing-flags.diff:
 configure.in |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

--- NEW FILE rakarrack-configure-1.14-existing-flags.diff ---
diff -ur rakarrack-0.3.0.orig/configure.in rakarrack-0.3.0/configure.in
--- rakarrack-0.3.0.orig/configure.in	2008-11-14 14:14:37.000000000 +1100
+++ rakarrack-0.3.0/configure.in	2010-01-07 21:02:46.000000000 +1100
@@ -1,5 +1,5 @@
 AC_PREREQ(2.61)
-AC_INIT([rakarrack],[0.3.0],[Josep Andreu <holborn at telefonica.net>]) 
+AC_INIT([rakarrack],[0.4.0],[Josep Andreu <holborn at telefonica.net>]) 
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/main.C])
 AC_CONFIG_HEADER([src/config.h])
@@ -44,6 +44,7 @@
 AC_CHECK_LIB([z], [main])
 AC_CHECK_LIB([jack],main)
 AC_CHECK_LIB([Xpm],[main])
+AC_CHECK_LIB([fftw3],[main])
 
 if test "x$prefix" = "xNONE"; then
 AC_DEFINE_UNQUOTED(PREFIX, "/usr/local", [Install prefix])
@@ -67,21 +68,17 @@
 AC_DEFINE([WEBSITE],["rakarrack.sf.net"],[WEBSITE])
 
 SSE=$(cat /proc/cpuinfo | grep sse2)
-
 if test -z "$SSE"; then
 SSE=""
 else
 SSE="-msse2"
 fi
-
-
 if test -z "$SSE"; then
-
 SSE=$(cat /proc/cpuinfo | grep sse)
 if test -z "$SSE"; then
 SSE=""
 else
-SSE="-msse"
+SSE="-msse -mfpmath=sse"
 fi
 fi
 
@@ -89,8 +86,8 @@
 
 
 
-LIBS="`$FLTKCONFIG --use-images --ldflags` -lasound `pkg-config --libs jack`  -lXpm"
-CXXFLAGS="-O2 -Wall $SSE -fno-rtti -pipe -ffunction-sections -fomit-frame-pointer -Wno-format-y2k -fPIC -fno-exceptions -fno-strict-aliasing `$FLTKCONFIG --use-images --cxxflags` `pkg-config --cflags jack`"
+LIBS="$LIBS `$FLTKCONFIG --use-images --ldflags` -lasound `pkg-config --libs jack` -lfftw3 -lXpm"
+CXXFLAGS="$CXXFLAGS  -Wall $SSE -ffast-math -fno-rtti -pipe -ffunction-sections -fomit-frame-pointer -fsigned-char -Wno-format-y2k -fPIC -fno-exceptions -fno-strict-aliasing `$FLTKCONFIG --use-images --cxxflags` `pkg-config --cflags jack`"
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile data/Makefile icons/Makefile doc/Makefile doc/help/Makefile doc/help/imagenes/Makefile doc/help/css/Makefile])
 AC_OUTPUT
 


Index: rakarrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rakarrack/devel/rakarrack.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rakarrack.spec	23 Sep 2009 04:33:50 -0000	1.5
+++ rakarrack.spec	7 Jan 2010 14:07:41 -0000	1.6
@@ -1,18 +1,25 @@
 Summary: Audio effects processing rack for guitar
 Name:    rakarrack
 Version: 0.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group:   Applications/Multimedia
 URL:     http://%{name}.sourceforge.net/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:  rakarrack-configure-1.14-existing-flags.diff
+Patch1:  rakarrack-ChN-buffer-oveflow-fix.diff
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires: hicolor-icon-theme
 
+# mod of doc dir in configure.in requires autoconf/automake
+BuildRequires: automake
+# not required (https://fedoraproject.org/wiki/Packaging:Guidelines#Exceptions_2)
+# BuildRequires: gcc-c++ # just a reminder
 BuildRequires: jack-audio-connection-kit-devel alsa-lib-devel alsa-utils
 BuildRequires: fltk-devel
 BuildRequires: libXpm-devel libpng-devel libjpeg-devel
+BuildRequires: fftw-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -30,10 +37,10 @@ Nasca is our hero and a continuous inspi
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %{__sed} -i 's|HELPDIR="$prefix/share/doc/${PACKAGE}"|HELPDIR="$prefix/share/doc/${PACKAGE}-%{version}"|' configure.in
-%configure --docdir=%{_docdir}/%{name}-%{version} \
-    --htmldir=%{_docdir}/%{name}-%{version}
 
 %{__sed} -i 's/Icon=icono_rakarrack_128x128/Icon=rakarrack/' data/%{name}.desktop
 %{__sed} -i 's/Guitar Effects Processor/Real-time audio effects processing rack for guitar/' data/%{name}.desktop
@@ -42,15 +49,22 @@ echo "Version=1.0" >> data/%{name}.deskt
 
 
 %build
+%configure --docdir=%{_docdir}/%{name}-%{version} \
+    --htmldir=%{_docdir}/%{name}-%{version} \
+
+# if DFortifySOurce is not passed to compile, try del smp_mflags
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
+file src/rakarrack
 %{__make} DESTDIR=%{buildroot} install
+file src/rakarrack
+file %{buildroot}/usr/bin/rakarrack
 
-# move extra install of docs to build directory
-# to let rpm install it in the right place
+# move extra install of docs to build directory to let rpm install it in
+#     the right place
 %{__mv} %{buildroot}%{_datadir}/doc/rakarrack/html .
 %{__mv} %{buildroot}%{_datadir}/doc/rakarrack/COPYING .
 %{__rm} -rf %{buildroot}%{_datadir}/doc/rakarrack
@@ -73,15 +87,18 @@ desktop-file-install --vendor "" \
   --dir %{buildroot}%{_datadir}/applications \
   %{buildroot}%{_datadir}/applications/rakarrack.desktop
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -101,6 +118,16 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Jan  8 2010 David Timms <iinet.net.au @ dtimms> - 0.3.0-5
+- add patch for buffer overflow captured by fedora compile flags
+- add BR fftw-devel so that new upstream configure.in will build
+- fix being built without proper fedora flags and
+      being built with empty debuginfo using patch to current
+      upstream configure.in
+- add BR automake so that adjusts to configure.in to fix Help|
+      Help Contents,License pointing to non-versioned .../doc/ dir succeed
+- move edit of configure.in to prep
+
 * Wed Sep 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.3.0-4
 - Update desktop file according to F-12 FedoraStudio feature
 - Update scriptlets


