[feh] Update from BZ#666312
Ignacio Vazquez-Abrams
ivazquez at fedoraproject.org
Tue Jan 4 06:46:33 UTC 2011
commit d00b9408a0746cb3a2d288e7195be4aa9ecadfd2
Author: Ignacio Vazquez-Abrams <ignacio at localhost.localdomain>
Date: Tue Jan 4 01:45:48 2011 -0500
Update from BZ#666312
.gitignore | 1 +
feh-1.10.1-dejavu.patch | 29 ++++
feh-1.10.1-prefix.patch | 19 +++
feh-1.3.4-bz441527.patch | 72 -----------
feh-1.3.4-dejavu.patch | 29 ----
feh-1.3.4-man.patch | 109 ----------------
feh-1.3.4-missing-protos.patch | 43 ------
feh-1.3.4-remove_britney_references.patch | 36 -----
feh-1.3.4-svn-fixes.patch | 198 -----------------------------
feh.spec | 30 ++---
sources | 2 +-
11 files changed, 61 insertions(+), 507 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5639f6e..4fd1798 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
feh-1.3.4.tar.gz
+/feh-1.10.1.tar.bz2
diff --git a/feh-1.10.1-dejavu.patch b/feh-1.10.1-dejavu.patch
new file mode 100644
index 0000000..4f2fcf1
--- /dev/null
+++ b/feh-1.10.1-dejavu.patch
@@ -0,0 +1,29 @@
+diff -up feh-1.10.1/src/feh.h.orig feh-1.10.1/src/feh.h
+--- feh-1.10.1/src/feh.h.orig 2010-12-29 19:42:58.249577910 -0800
++++ feh-1.10.1/src/feh.h 2010-12-29 19:44:18.840802975 -0800
+@@ -80,10 +80,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE
+ #define XY_IN_RECT(x, y, rx, ry, rw, rh) \
+ (((x) >= (rx)) && ((y) >= (ry)) && ((x) < ((rx) + (rw))) && ((y) < ((ry) + (rh))))
+
+-#define DEFAULT_FONT "yudit/11"
+-#define DEFAULT_MENU_FONT "yudit/10"
+-#define DEFAULT_FONT_BIG "yudit/12"
+-#define DEFAULT_FONT_TITLE "yudit/14"
++#define DEFAULT_FONT "DejaVuSans/11"
++#define DEFAULT_MENU_FONT "DejaVuSans/10"
++#define DEFAULT_FONT_BIG "DejaVuSans/12"
++#define DEFAULT_FONT_TITLE "DejaVuSans/14"
+
+ enum mode_type { MODE_NORMAL = 0, MODE_PAN, MODE_ZOOM, MODE_ROTATE, MODE_BLUR, MODE_NEXT
+ };
+diff -up feh-1.10.1/src/imlib.c.orig feh-1.10.1/src/imlib.c
+--- feh-1.10.1/src/imlib.c.orig 2010-12-29 19:45:00.074336772 -0800
++++ feh-1.10.1/src/imlib.c 2010-12-29 19:45:06.425802860 -0800
+@@ -69,6 +69,7 @@ void init_imlib_fonts(void)
+ {
+ /* Set up the font stuff */
+ imlib_add_path_to_font_path(".");
++ imlib_add_path_to_font_path("/usr/share/fonts/dejavu");
+ imlib_add_path_to_font_path(PREFIX "/share/feh/fonts");
+
+ return;
diff --git a/feh-1.10.1-prefix.patch b/feh-1.10.1-prefix.patch
new file mode 100644
index 0000000..79e1d04
--- /dev/null
+++ b/feh-1.10.1-prefix.patch
@@ -0,0 +1,19 @@
+diff -up feh-1.10.1/config.mk.prefixorig feh-1.10.1/config.mk
+--- feh-1.10.1/config.mk.prefixorig 2010-12-29 19:58:31.904106871 -0800
++++ feh-1.10.1/config.mk 2010-12-29 20:08:07.946812680 -0800
+@@ -2,13 +2,13 @@ PACKAGE ?= feh
+ VERSION ?= 1.10.1
+
+ # Prefix for all installed files
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+
+ # Directories for manuals, executables, docs, data, etc.
+ main_dir = ${DESTDIR}${PREFIX}
+ man_dir = ${main_dir}/share/man
+ bin_dir = ${main_dir}/bin
+-doc_dir = ${main_dir}/share/doc/feh
++doc_dir = ${main_dir}/share/doc/feh-${VERSION}
+ image_dir = ${main_dir}/share/feh/images
+ font_dir = ${main_dir}/share/feh/fonts
+
diff --git a/feh.spec b/feh.spec
index f37113a..3ac13b9 100644
--- a/feh.spec
+++ b/feh.spec
@@ -2,21 +2,15 @@
# file names or it just spits out the help.
Name: feh
-Version: 1.3.4
-Release: 13%{?dist}
+Version: 1.10.1
+Release: 1%{?dist}
Summary: Fast command line image viewer using Imlib2
Group: Applications/Multimedia
License: MIT
-URL: http://linuxbrit.co.uk/feh/
-# This is: http://linuxbrit.co.uk/downloads/feh-%{version}.tar.gz with
-# feh-1.3.4/src/menubg_britney.png (which is non free) removed
-Source0: %{name}-%{version}.tar.gz
-Patch0: feh-1.3.4-missing-protos.patch
-Patch1: feh-1.3.4-remove_britney_references.patch
-Patch2: feh-1.3.4-svn-fixes.patch
-Patch3: feh-1.3.4-man.patch
-Patch4: feh-1.3.4-bz441527.patch
-Patch5: feh-1.3.4-dejavu.patch
+URL: https://derf.homelinux.org/projects/feh/
+Source0: http://derf.homelinux.org/projects/feh/feh-1.10.1.tar.bz2
+Patch0: feh-1.10.1-dejavu.patch
+Patch1: feh-1.10.1-prefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: giblib-devel imlib2-devel libjpeg-devel libpng-devel
BuildRequires: libXt-devel
@@ -30,7 +24,7 @@ Requires: dejavu-fonts
feh is a versatile and fast image viewer using imlib2, the
premier image file handling library. feh has many features,
from simple single file viewing, to multiple file modes using
-a slideshow or multiple windows. feh supports the creation of
+a slide-show or multiple windows. feh supports the creation of
montages as index prints with many user-configurable options.
@@ -38,14 +32,8 @@ montages as index prints with many user-configurable options.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
%build
-%configure
make %{?_smp_mflags}
@@ -70,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 29 2010 Andrew Potter <agpotter at gmail.com> 1.10.1-1
+- New upstream release
+- Closes CVE-2010-2246 by removing option -G, --wget-timestamp
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index e6258ec..b11838e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-41e2c4fd921c680fb1897d5f10f2c502 feh-1.3.4.tar.gz
+c2aa2d053bdc195e6e3ab2922d85db4b feh-1.10.1.tar.bz2
More information about the scm-commits
mailing list