Hello community,

here is the log from the commit of package ladspa for openSUSE:Factory checked 
in at 2013-12-12 11:16:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ladspa (Old)
 and      /work/SRC/openSUSE:Factory/.ladspa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ladspa"

Changes:
--------
--- /work/SRC/openSUSE:Factory/ladspa/ladspa.changes    2012-02-16 
14:57:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ladspa.new/ladspa.changes       2013-12-12 
11:16:47.000000000 +0100
@@ -1,0 +2,14 @@
+Wed Dec  4 15:55:53 CET 2013 - [email protected]
+
+- Merge ladspa-devel.spec into ladspa.spec; back to root, as OBS
+  doesn't like split packages (the submitreq always declined),
+  and the development activity of this package is pretty low, so
+  no worth to resist
+
+-------------------------------------------------------------------
+Thu Sep 26 14:37:25 CEST 2013 - [email protected]
+
+- caps-fix-double-free.diff:
+  Fix double free in destructor of caps plugin (bnc#842420)
+
+-------------------------------------------------------------------

Old:
----
  ladspa-devel.changes
  ladspa-devel.spec

New:
----
  caps-fix-double-free.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ladspa.spec ++++++
--- /var/tmp/diff_new_pack.sAEQfL/_old  2013-12-12 11:16:49.000000000 +0100
+++ /var/tmp/diff_new_pack.sAEQfL/_new  2013-12-12 11:16:49.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ladspa
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -50,16 +50,34 @@
 AutoReq:        on
 Autoprov:       off
 Provides:       ladspa > 1.12.code10.3.1
-Provides:       ladspa-swh-plugins = %{swh_version} ladspa-AMB = 
%{AMB_version} ladspa-FIL = %{FIL_version}
-Provides:       ladspa-REV = %{REV_version} ladspa-VCO = %{VCO_version} 
ladspa-alienwah = %{alienwah_version}
-Provides:       ladspa-caps = %{caps_version} ladspa-pvoc = %{pvoc_version} 
ladspa-tap-plugins = %{tap_version}
-Provides:       ladspa-vlevel = %{vlevel_version} ladspa-vocoder = 
%{vocoder_version} ladspa-blop = %{blop_version}
-Provides:       ladspa-vcf = %{vcf_version} ladspa-MCP = %{MCP_version}
-Obsoletes:      ladspa-swh-plugins < %{swh_version} ladspa-AMB < 
%{AMB_version} ladspa-FIL < %{FIL_version}
-Obsoletes:      ladspa-REV < %{REV_version} ladspa-VCO < %{VCO_version} 
ladspa-alienwah < %{alienwah_version}
-Obsoletes:      ladspa-caps < %{caps_version} ladspa-pvoc < %{pvoc_version} 
ladspa-tap-plugins < %{tap_version}
-Obsoletes:      ladspa-vlevel < %{vlevel_version} ladspa-vocoder < 
%{vocoder_version} ladspa-blop < %{blop_version}
-Obsoletes:      ladspa-vcf < %{vcf_version} ladspa-MCP < %{MCP_version}
+Provides:       ladspa-AMB = %{AMB_version}
+Provides:       ladspa-FIL = %{FIL_version}
+Provides:       ladspa-MCP = %{MCP_version}
+Provides:       ladspa-REV = %{REV_version}
+Provides:       ladspa-VCO = %{VCO_version}
+Provides:       ladspa-alienwah = %{alienwah_version}
+Provides:       ladspa-blop = %{blop_version}
+Provides:       ladspa-caps = %{caps_version}
+Provides:       ladspa-pvoc = %{pvoc_version}
+Provides:       ladspa-swh-plugins = %{swh_version}
+Provides:       ladspa-tap-plugins = %{tap_version}
+Provides:       ladspa-vcf = %{vcf_version}
+Provides:       ladspa-vlevel = %{vlevel_version}
+Provides:       ladspa-vocoder = %{vocoder_version}
+Obsoletes:      ladspa-AMB < %{AMB_version}
+Obsoletes:      ladspa-FIL < %{FIL_version}
+Obsoletes:      ladspa-MCP < %{MCP_version}
+Obsoletes:      ladspa-REV < %{REV_version}
+Obsoletes:      ladspa-VCO < %{VCO_version}
+Obsoletes:      ladspa-alienwah < %{alienwah_version}
+Obsoletes:      ladspa-blop < %{blop_version}
+Obsoletes:      ladspa-caps < %{caps_version}
+Obsoletes:      ladspa-pvoc < %{pvoc_version}
+Obsoletes:      ladspa-swh-plugins < %{swh_version}
+Obsoletes:      ladspa-tap-plugins < %{tap_version}
+Obsoletes:      ladspa-vcf < %{vcf_version}
+Obsoletes:      ladspa-vlevel < %{vlevel_version}
+Obsoletes:      ladspa-vocoder < %{vocoder_version}
 Source1:        ladspa_sdk_1.13.tar.bz2
 Source2:        cmt_src_1.15.tar.bz2
 Source3:        swh-plugins-%{swh_version}.tar.bz2
@@ -116,6 +134,7 @@
 Patch26:        swh-nostatic-lib.diff
 Patch27:        blop-ladspa_dir.diff
 Patch28:        blop-wdautil-fix.diff
+Patch29:        caps-fix-double-free.diff
 Url:            http://www.ladspa.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -125,6 +144,15 @@
 dynamically.  The package contains the LADSPA SDK, the CMT plug-in
 libraries (including Freeverb), and the swh plug-ins.
 
+%package devel
+Summary:        Include Files mandatory for Development
+Group:          Development/Libraries/C and C++
+BuildArch:      noarch
+Provides:       ladspa-devel > 1.12.code10.3.1
+
+%description devel
+This package contains include files to develop LADSPA plugins.
+
 %prep
 #
 # More URLs
@@ -199,6 +227,9 @@
 %patch16
 %patch25
 )
+(cd caps-%{caps_version}
+%patch29 -p1
+)
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
@@ -392,8 +423,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel
 cp -av vlevel-%{vlevel_version}/utils/* 
$RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel
 chmod 644 $RPM_BUILD_ROOT%{_docdir}/%{name}/cmt/plugins.html
-# remove incldue file (already in devel package)
-rm -f $RPM_BUILD_ROOT%{_includedir}/*
+# devel package
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
+cp -av ladspa_sdk/README $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
+cp -av ladspa_sdk/doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-devel
+ln -sf %{_includedir}/ladspa.h 
$RPM_BUILD_ROOT%{_docdir}/%{name}-devel/ladspa.h.txt
+#
 %find_lang %{name} --all-name
 %fdupes -s $RPM_BUILD_ROOT
 
@@ -403,9 +438,13 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/examples
 %{_libdir}/ladspa
 %{_bindir}/*
 %{_datadir}/ladspa
 
+%files devel
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-devel
+%{_includedir}/*
+
 %changelog

++++++ caps-fix-double-free.diff ++++++
---
 interface.cc |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/interface.cc
+++ b/interface.cc
@@ -123,8 +123,12 @@ void _init()
 __attribute__ ((destructor)) 
 void _fini()
 {
-       for (ulong i = 0; i < N; ++i)
-               delete descriptors[i];
+       for (ulong i = 0; i < N; ++i) {
+               if (descriptors[i]) {
+                       delete descriptors[i];
+                       descriptors[i] = NULL;
+               }
+       }
 }
 
 /* /////////////////////////////////////////////////////////////////////// */
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to