diff --git a/.gitignore b/.gitignore index b657724..63f51bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libdvdread-4.2.0.tar.bz2 +SOURCES/libdvdread-5.0.3.tar.bz2 diff --git a/.libdvdread.metadata b/.libdvdread.metadata index 1bf4093..894bb9e 100644 --- a/.libdvdread.metadata +++ b/.libdvdread.metadata @@ -1 +1 @@ -431bc92195f27673bfdd2be67ce0f58338da8d3b SOURCES/libdvdread-4.2.0.tar.bz2 +3cda64c06ca9b617d976c490651db4391a162e1f SOURCES/libdvdread-5.0.3.tar.bz2 diff --git a/SOURCES/libdvdread-5.0.3-use_after_free.patch b/SOURCES/libdvdread-5.0.3-use_after_free.patch new file mode 100644 index 0000000..3caf6e1 --- /dev/null +++ b/SOURCES/libdvdread-5.0.3-use_after_free.patch @@ -0,0 +1,13 @@ +diff -up wrk/src/ifo_read.c.wrk wrk/src/ifo_read.c +--- wrk/src/ifo_read.c.wrk 2016-05-18 13:53:53.979072295 +0200 ++++ wrk/src/ifo_read.c 2016-05-18 13:54:24.760095439 +0200 +@@ -1118,8 +1118,8 @@ void ifoFree_TT_SRPT(ifo_handle_t *ifofi + + if(ifofile->tt_srpt) { + free(ifofile->tt_srpt->title); +- free(ifofile->tt_srpt); + ifofile->tt_srpt->title = NULL; ++ free(ifofile->tt_srpt); + ifofile->tt_srpt = NULL; + } + } diff --git a/SOURCES/libdvdread-multilib.patch b/SOURCES/libdvdread-multilib.patch deleted file mode 100644 index b5bef38..0000000 --- a/SOURCES/libdvdread-multilib.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up libdvdread-4.1.4/Makefile.multilib libdvdread-4.1.4/Makefile ---- libdvdread-4.1.4/Makefile.multilib 2008-12-31 09:43:03.000000000 +0100 -+++ libdvdread-4.1.4/Makefile 2009-09-27 00:41:34.000000000 +0200 -@@ -131,9 +131,6 @@ distclean: clean - dvdread-config: $(.OBJDIR)/dvdread-config - $(.OBJDIR)/dvdread-config: $(BUILDDEPS) - @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config -- @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config -- @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config -- @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config - @echo >> $(.OBJDIR)/dvdread-config - cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config - chmod 0755 $(.OBJDIR)/dvdread-config -diff -up libdvdread-4.1.4/misc/dvdread-config.sh.multilib libdvdread-4.1.4/misc/dvdread-config.sh ---- libdvdread-4.1.4/misc/dvdread-config.sh.multilib 2008-09-23 11:14:45.000000000 +0200 -+++ libdvdread-4.1.4/misc/dvdread-config.sh 2009-09-27 00:39:39.000000000 +0200 -@@ -1,4 +1,3 @@ --dvdreadlib="-ldvdread" - - usage() - { -@@ -28,7 +27,7 @@ while test $# -gt 0; do - echo_prefix=yes - ;; - --version) -- echo $version -+ echo `pkg-config --modversion dvdread` - ;; - --cflags) - echo_cflags=yes -@@ -44,13 +43,13 @@ while test $# -gt 0; do - done - - if test "$echo_prefix" = "yes"; then -- echo $prefix -+ echo `pkg-config --variable=prefix dvdread` - fi - - if test "$echo_cflags" = "yes"; then -- echo -I$prefix/include $extracflags -+ echo `pkg-config --cflags dvdread` - fi - - if test "$echo_libs" = "yes"; then -- echo -L$libdir $dvdreadlib -+ echo `pkg-config --libs dvdread` - fi diff --git a/SPECS/libdvdread.spec b/SPECS/libdvdread.spec index 267b323..77f10ba 100644 --- a/SPECS/libdvdread.spec +++ b/SPECS/libdvdread.spec @@ -1,15 +1,18 @@ Name: libdvdread -Version: 4.2.0 -Release: 6%{?dist} +Version: 5.0.3 +Release: 3%{?dist} Summary: A library for reading DVD video discs based on Ogle code Group: System Environment/Libraries License: GPLv2+ -Source0: http://dvdnav.mplayerhq.hu/releases/libdvdread-%{version}.tar.bz2 +URL: http://dvdnav.mplayerhq.hu/ +Source0: https://download.videolan.org/pub/videolan/libdvdread/%{version}/libdvdread-%{version}.tar.bz2 +Patch0: libdvdread-5.0.3-use_after_free.patch + +Provides: bundled(md5-gcc) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # dvdread-config: use pkg-config instead of hard-coded # multilib-conflicting values -Patch1: %{name}-multilib.patch %description libdvdread provides a simple foundation for reading DVD video disks. @@ -29,23 +32,17 @@ This package contains development files for libdvdread. %prep %setup -q -%patch1 -p1 -b .multilib +%patch0 -p1 -b .use_after_free %build -./configure2 \ - --disable-opts \ - --disable-static \ - --disable-strip \ - --extra-cflags="%{optflags}" \ - --libdir=%{_libdir} \ - --prefix=%{_prefix} \ - --shlibdir=%{_libdir} \ +%configure --disable-static -%{__make} %{?_smp_mflags} +make V=1 %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +rm %{buildroot}%{_libdir}/libdvdread.la %clean rm -rf %{buildroot} @@ -54,20 +51,33 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig +%define _pkgdocdir /usr/share/doc/libdvdread + %files %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README +%doc %{_pkgdocdir}/AUTHORS +%doc %{_pkgdocdir}/COPYING +%doc %{_pkgdocdir}/NEWS +%doc %{_pkgdocdir}/README %{_libdir}/libdvdread.so.* %files devel %defattr(-,root,root,-) -%doc DEVELOPMENT-POLICY.txt TODO -%{_bindir}/dvdread-config +%doc %{_pkgdocdir}/ChangeLog +%doc %{_pkgdocdir}/TODO %{_includedir}/dvdread %{_libdir}/libdvdread.so %{_libdir}/pkgconfig/dvdread.pc %changelog +* Wed May 18 2016 Frantisek Kluknavsky - 5.0.3-3 +- libdvdread-5.0.3-use_after_free.patch added +- resolves: #1326238 + +* Thu May 12 2016 Frantisek Kluknavsky - 5.0.3-2 +- rebase +- resolves: #1326238 + * Fri Jan 24 2014 Daniel Mach - 4.2.0-6 - Mass rebuild 2014-01-24