diff --git a/.gitignore b/.gitignore index b390470..09eb5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ gnome-subtitles-1.0.tar.gz +/gnome-subtitles-1.1.tar.gz diff --git a/0001-Fixed-RedHat-bug-638384-CVE-2010-3357-CVE-2010-3357-.patch b/0001-Fixed-RedHat-bug-638384-CVE-2010-3357-CVE-2010-3357-.patch deleted file mode 100644 index 0dd389b..0000000 --- a/0001-Fixed-RedHat-bug-638384-CVE-2010-3357-CVE-2010-3357-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 44370dc2a87f7fa0d6c9730979514bd407a37c65 Mon Sep 17 00:00:00 2001 -From: Pedro Castro -Date: Sat, 2 Oct 2010 00:32:13 +0100 -Subject: [PATCH] Fixed RedHat bug #638384 - (CVE-2010-3357) CVE-2010-3357 gnome-subtitles: insecure library loading vulnerability - ---- - src/GnomeSubtitles/Execution/gnome-subtitles.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/GnomeSubtitles/Execution/gnome-subtitles.in b/src/GnomeSubtitles/Execution/gnome-subtitles.in -index 698fe4a..6689357 100644 ---- a/src/GnomeSubtitles/Execution/gnome-subtitles.in -+++ b/src/GnomeSubtitles/Execution/gnome-subtitles.in -@@ -6,7 +6,7 @@ libdir=@libdir@ - - sublibdir=@SUBLIB_DLL_DIR@ - --export LD_LIBRARY_PATH="$libdir/gnome-subtitles:$LD_LIBRARY_PATH" -+export LD_LIBRARY_PATH=$libdir/gnome-subtitles${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - export MONO_PATH=$sublibdir:$MONO_PATH - exec -a gnome-subtitles @MONO@ $libdir/gnome-subtitles/gnome-subtitles.exe "$@" - --- -1.7.2.3 - diff --git a/gnome-subtitles.spec b/gnome-subtitles.spec index 69106be..e05e703 100644 --- a/gnome-subtitles.spec +++ b/gnome-subtitles.spec @@ -1,6 +1,6 @@ Name: gnome-subtitles -Version: 1.0 -Release: 3%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Subtitle editor for Gnome Group: Applications/Multimedia @@ -8,7 +8,6 @@ Group: Applications/Multimedia License: GPLv2+ and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: http://gnome-subtitles.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: 0001-Fixed-RedHat-bug-638384-CVE-2010-3357-CVE-2010-3357-.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -42,7 +41,6 @@ translation and synchronization. %prep %setup -q -%patch0 -p1 -b .cve20103357 %build @@ -96,6 +94,10 @@ update-desktop-database &> /dev/null || : %changelog +* Sun Oct 31 2010 Julian Sikorski - 1.1-1 +- Updated to 1.1 +- Dropped security fix, it is now included in the source + * Sun Oct 03 2010 Julian Sikorski - 1.0-3 - Switched to upstreams approach for the security fix - Use the new macros properly diff --git a/sources b/sources index 056a6dc..5e7ea4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19d0beabc063abe86d8fe32913dc7aeb gnome-subtitles-1.0.tar.gz +9bcaea4b9de9439ab95522755569ced5 gnome-subtitles-1.1.tar.gz