- security fix for #200321

- Remove (hopefully) all zero epoch remains.
- Remove trailing spaces and tabs.
- Keep consistency between tabs and spaces.
- Clean up summary.

fbida.CVE-2006-1695.patch

@@ -0,0 +1,14 @@
+diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
+--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
++++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
+@@ -1,8 +1,8 @@
+ #!/bin/bash
+ 
+ # tmp dir
+-DIR="${TMPDIR-/var/tmp}/fbps-$$"
+-mkdir -p $DIR	|| exit 1
++DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
++[ -d $DIR ]  || exit 1
+ trap "rm -rf $DIR" EXIT
+ 
+ # parse options

fbida.spec

@@ -1,24 +1,24 @@
-# $Id: fbida.spec,v 1.5 2005/02/21 17:19:10 thl Exp $
-
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        3
+Release:        12%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
 BuildRequires:  libungif-devel curl-devel
 BuildRequires:  openmotif-devel
+BuildRequires:  libXpm-devel
 Requires:       ImageMagick bitstream-vera-fonts
 
 %description
 fbi displays the specified file(s) on the linux console using the
 framebuffer device. PhotoCD, jpeg, ppm, gif, tiff, xwd, bmp and png
-are supported directly. For other formats fbi tries to use 
+are supported directly. For other formats fbi tries to use
 ImageMagick's convert.
 
 %package ida
@@ -26,7 +26,7 @@ Group: Applications/Multimedia
 Summary: Motif based Imageviewer
 
 %description ida
-This is a X11 application (Motif based) for viewing images. Some basic 
+This is a X11 application (Motif based) for viewing images. Some basic
 editing functions are available too.
 
 %package fbgs
@@ -39,6 +39,11 @@ A wrapper script for viewing ps/pdf files on the framebuffer console using fbi
 
 %prep
 %setup -q
+%patch -p1
+%{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
+%{__sed} -i -e "s,/X11R6,,g" GNUmakefile
+%{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
+%{__sed} -i -e "s,-dSAVER,-dSAFER," fbgs
 
 %build
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -50,9 +55,9 @@ iconv -t UTF-8 -f ISO-8859-1 exiftran.man > exiftran.man.new
 iconv -t UTF-8 -f ISO-8859-1 ida.man > ida.man.new
 iconv -t UTF-8 -f ISO-8859-1 fbgs.man > fbgs.man.new
 %{__mv} fbi.man.new fbi.man
-%{__mv} exiftran.man.new exiftran.man 
-%{__mv} ida.man.new ida.man 
-%{__mv} fbgs.man.new fbgs.man 
+%{__mv} exiftran.man.new exiftran.man
+%{__mv} ida.man.new ida.man
+%{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 
 %clean
@@ -60,7 +65,7 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 
 %files
 %defattr(-, root, root, 0755)
-%doc Changes COPYING README TODO 
+%doc Changes COPYING README TODO
 %doc %{_mandir}/man1/fbi*
 %doc %{_mandir}/man1/exiftran*
 %{_bindir}/fbi
@@ -70,7 +75,7 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/ida*
 %{_bindir}/ida
-%config %{_prefix}/X11R6/lib/X11/app-defaults/Ida
+%config %{_datadir}/X11/app-defaults/Ida
 
 %files fbgs
 %defattr(-, root, root, -)
@@ -78,6 +83,33 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %{_bindir}/fbgs
 
 %changelog
+* Thu Jul 27 2006 Adrian Reber <adrian@lisas.de> - 2.03-12
+- security fix for #200321
+
+* Mon Apr 24 2006 Adrian Reber <adrian@lisas.de> - 2.03-11
+- security fix for #189721
+
+* Mon Feb 13 2006 Adrian Reber <adrian@lisas.de> - 2.03-10
+- rebuilt
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-9
+- this should finally work; also on x86_64
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-8
+- rebuilt
+
+* Wed Jan 18 2006 Adrian Reber <adrian@lisas.de> - 2.03-7
+- moved file Ida to %%{_datadir}/X11/app-defaults
+
+* Thu Nov 24 2005 Adrian Reber <adrian@lisas.de> - 2.03-6
+- updated for modular xorg-x11
+
+* Tue May 10 2005 Adrian Reber <adrian@lisas.de> - 2.03-5
+- fix debuginfo subpackage creation
+
+* Mon Apr 04 2005 Adrian Reber <adrian@lisas.de> - 2.03-4
+- rebuild for new libexif
+
 * Mon Feb 21 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.03-3
 - Fix typo; must be LIB=%%{_lib}; really fixes x86_64