- security fix for #189721

- rebuilt
- this should finally work; also on x86_64
2006-04-24 06:49:04 +00:00 · 2006-02-13 21:01:11 +00:00 · 2006-01-20 09:10:02 +00:00 · 2006-01-19 12:26:45 +00:00 · 2006-01-18 08:16:58 +00:00 · 2005-11-24 08:19:46 +00:00
2 changed files with 39 additions and 2 deletions
--- a/fbida.CVE-2006-1695.patch
+++ b/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
--- a/fbida.spec
+++ b/fbida.spec
@@ -1,16 +1,18 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        5%{?dist}
+Release:        11%{?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
@@ -37,7 +39,10 @@ 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

 %build
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -69,7 +74,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, -)
@@ -77,6 +82,24 @@ lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
 %{_bindir}/fbgs

 %changelog
+* 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
Author	SHA1	Message	Date
Adrian Reber	0f532204ae	- security fix for #189721	2006-04-24 06:49:04 +00:00
Adrian Reber	044a63fb7c	- rebuilt	2006-02-13 21:01:11 +00:00
Adrian Reber	8bd770461a	- this should finally work; also on x86_64	2006-01-20 09:10:02 +00:00
Adrian Reber	5f1ec98be4	- rebuilt	2006-01-19 12:26:45 +00:00
Adrian Reber	dc8109be53	- moved file Ida to %{_datadir}/X11/app-defaults	2006-01-18 08:16:58 +00:00
Adrian Reber	3d9e5d19f9	- updated for modular xorg-x11	2005-11-24 08:19:46 +00:00