[faad2/el6] (14 commits) ...Merge branch 'el7' into el6
by Nicolas Chauvet
Summary of changes:
39587ae... * Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2 (*)
d2fa534... * Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2 (*)
5525f71... Fix hack (*)
25d6a0d... Fix hack2 (*)
eab58b6... Rebuilt because evr was older in f20> because of the doc sp (*)
b8f7d81... Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mas (*)
1eda60a... Fix rfbz #3787 (*)
4a38cfc... use tabs instead spaces. (*)
ca89392... Clean spec, Vascom patches series, rfbz #4200, add license (*)
41b6395... Bump for dist (*)
a905041... Fix overflow on 2.7 (*)
9382557... Condition xmms (*)
37d2efe... Add missing hunk (*)
7796a12... Merge branch 'el7' into el6
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[faad2/el7] Add missing hunk
by Nicolas Chauvet
commit 37d2efef8496300c6c21e4c605cbf19c8d0fef78
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 7 11:02:34 2019 +0200
Add missing hunk
faad2.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/faad2.spec b/faad2.spec
index 63a1f95..166187c 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -86,7 +86,7 @@ done
%build
%configure \
--disable-static \
- --with-xmms \
+%{?_with_xmms:--with-xmms} \
# --with-drm
# remove rpath from libtool
@@ -98,7 +98,9 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%install
%make_install
%{__rm} %{buildroot}%{_libdir}/libfaad.la
+%{?_with_xmms:
%{__rm} %{buildroot}%{xmmsinputplugindir}/libmp4.la
+}
%{__rm} %{buildroot}%{_includedir}/mp4ff{,int}.h
%{__rm} %{buildroot}%{_libdir}/libmp4ff.a
%{__install} -dm755 %{buildroot}%{_mandir}/man1
4 years, 10 months
[faad2/el7] Condition xmms
by Nicolas Chauvet
commit 93825572fe5c75bc5c79f725a4a0ac086aabac97
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 7 10:55:33 2019 +0200
Condition xmms
faad2.spec | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/faad2.spec b/faad2.spec
index 1845b25..63a1f95 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -8,6 +8,8 @@
%{?el2:%define _without_sysfs 1}
%define xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null)
+%{?el7:%define _with_xmms 1}
+
Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2
Epoch: 1
@@ -25,9 +27,13 @@ Patch1: faad2-fix-overflows.patch
BuildRequires: gcc-c++
BuildRequires: id3lib-devel
%{!?_without_sysfs:BuildRequires: libsysfs-devel}
-BuildRequires: xmms-devel
+%{?_with_xmms:BuildRequires: xmms-devel}
BuildRequires: zlib-devel
+%{!?_with_xmms:
+Obsoletes: %{name}-xmms < %{version}-%{release}
+}
+
%description
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
@@ -54,6 +60,7 @@ written from scratch.
This package contains development files and documentation for libfaad.
+%{?_with_xmms:
%package -n xmms-%{name}
Summary: AAC XMMS Input Plugin
Group: Applications/Multimedia
@@ -66,6 +73,7 @@ FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
written from scratch.
This package contains an input plugin for xmms.
+}
%prep
%autosetup -p1
@@ -116,14 +124,17 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{_includedir}/neaacdec.h
%{_libdir}/libfaad.so
+%{?_with_xmms:
%files -n xmms-%{name}
%doc plugins/xmms/AUTHORS plugins/xmms/NEWS
%doc plugins/xmms/ChangeLog plugins/xmms/README plugins/xmms/TODO
%{xmmsinputplugindir}/libmp4.so
+}
%changelog
* Fri Jun 07 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.7-9
- Fix overflows
+- Conditionalize xmms for el7
* Tue Aug 23 2016 Nicolas Chauvet <nicolas.chauvet(a)kwizart.fr> - 1:2.7-8
- Bump for dist
4 years, 10 months
[faad2/el7] Fix overflow on 2.7
by Nicolas Chauvet
commit a9050414bf59fdecf322cbbf340c348f35b42fee
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 7 10:42:10 2019 +0200
Fix overflow on 2.7
faad2-fix-overflows.patch | 25 +++++++++++++++++++++++++
faad2.spec | 7 ++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/faad2-fix-overflows.patch b/faad2-fix-overflows.patch
new file mode 100644
index 0000000..5a198f8
--- /dev/null
+++ b/faad2-fix-overflows.patch
@@ -0,0 +1,25 @@
+--- faad2/libfaad/bits.c 2007-11-01 13:33:29.000000000 +0100
++++ faad2.new/libfaad/bits.c 2019-03-25 17:29:26.134199188 +0100
+@@ -167,7 +167,10 @@
+ int words = bits >> 5;
+ int remainder = bits & 0x1F;
+
+- ld->bytes_left = ld->buffer_size - words*4;
++ if (ld->buffer_size < words * 4)
++ ld->bytes_left = 0;
++ else
++ ld->bytes_left = ld->buffer_size - words*4;
+
+ if (ld->bytes_left >= 4)
+ {
+--- faad2/libfaad/syntax.c 2019-03-25 17:57:36.930937066 +0100
++++ faad2.new/libfaad/syntax.c 2019-03-25 17:49:26.135368525 +0100
+@@ -2292,6 +2292,8 @@
+ while ((drc->additional_excluded_chns[n-1] = faad_get1bit(ld
+ DEBUGVAR(1,104,"excluded_channels(): additional_excluded_chns"))) == 1)
+ {
++ if (i >= MAX_CHANNELS - num_excl_chan - 7)
++ return n;
+ for (i = num_excl_chan; i < num_excl_chan+7; i++)
+ {
+ drc->exclude_mask[i] = faad_get1bit(ld
diff --git a/faad2.spec b/faad2.spec
index 6ec344b..1845b25 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -12,13 +12,15 @@ Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2
Epoch: 1
Version: 2.7
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.audiocoding.com/faad2.html
Source: http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2
# fix non-PIC objects in libmp4ff.a
Patch0: %{name}-pic.patch
+# Security issue from videolan contribs
+Patch1: faad2-fix-overflows.patch
BuildRequires: gcc-c++
BuildRequires: id3lib-devel
@@ -120,6 +122,9 @@ sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{xmmsinputplugindir}/libmp4.so
%changelog
+* Fri Jun 07 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.7-9
+- Fix overflows
+
* Tue Aug 23 2016 Nicolas Chauvet <nicolas.chauvet(a)kwizart.fr> - 1:2.7-8
- Bump for dist
4 years, 10 months
[faad2/f30] Fix security issue
by Nicolas Chauvet
Summary of changes:
6e1f370... Fix security issue (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 10 months
[vlc] Update to 3.0.7
by Leigh Scott
commit a19807521dcaddbedb66ccfb27324e584becd096
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Jun 7 09:20:21 2019 +0100
Update to 3.0.7
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 22911d7..478c323 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02fe01ec602445745b46b0612456e023 vlc-3.0.7-20190406-0223.tar.xz
+230932ec40185856af28f82ec2e38b8a vlc-3.0.7.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 8c3866e..d5d552d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,6 +1,6 @@
-%global vlc_date 20190406
+#global vlc_date 20190406
#global vlc_rc -rc9
-%global vlc_tag -%{?vlc_date}-0223
+#global vlc_tag -#{?vlc_date}-0223
%if 0%{?vlc_tag:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -43,7 +43,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.7
-Release: 0.1%{?dist}
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -541,6 +541,9 @@ fi || :
%changelog
+* Fri Jun 07 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:3.0.7-1
+- Update to 3.0.7
+
* Sat Apr 06 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.7-0.1
- Update to 20190406
- Rebuilt for live555
4 years, 10 months
[faad2] Fix security issue
by Nicolas Chauvet
commit 6e1f3704c257f236c83c29def8b4d103320c1efc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 7 09:52:52 2019 +0200
Fix security issue
faad2-fix-overflows.patch | 25 +++++++++++++++++++++++++
faad2.spec | 7 ++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/faad2-fix-overflows.patch b/faad2-fix-overflows.patch
new file mode 100644
index 0000000..5a198f8
--- /dev/null
+++ b/faad2-fix-overflows.patch
@@ -0,0 +1,25 @@
+--- faad2/libfaad/bits.c 2007-11-01 13:33:29.000000000 +0100
++++ faad2.new/libfaad/bits.c 2019-03-25 17:29:26.134199188 +0100
+@@ -167,7 +167,10 @@
+ int words = bits >> 5;
+ int remainder = bits & 0x1F;
+
+- ld->bytes_left = ld->buffer_size - words*4;
++ if (ld->buffer_size < words * 4)
++ ld->bytes_left = 0;
++ else
++ ld->bytes_left = ld->buffer_size - words*4;
+
+ if (ld->bytes_left >= 4)
+ {
+--- faad2/libfaad/syntax.c 2019-03-25 17:57:36.930937066 +0100
++++ faad2.new/libfaad/syntax.c 2019-03-25 17:49:26.135368525 +0100
+@@ -2292,6 +2292,8 @@
+ while ((drc->additional_excluded_chns[n-1] = faad_get1bit(ld
+ DEBUGVAR(1,104,"excluded_channels(): additional_excluded_chns"))) == 1)
+ {
++ if (i >= MAX_CHANNELS - num_excl_chan - 7)
++ return n;
+ for (i = num_excl_chan; i < num_excl_chan+7; i++)
+ {
+ drc->exclude_mask[i] = faad_get1bit(ld
diff --git a/faad2.spec b/faad2.spec
index fd691c4..4eeda01 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -4,13 +4,15 @@ Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2
Epoch: 1
Version: 2.8.8
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
URL: http://www.audiocoding.com/faad2.html
Source: http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.gz
# fix non-PIC objects in libmp4ff.a
Patch0: %{name}-pic.patch
Patch1: fix_undefined_version.patch
+# Security issue from videolan contribs
+Patch2: faad2-fix-overflows.patch
BuildRequires: gcc-c++
BuildRequires: id3lib-devel
@@ -98,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
%{xmmsinputplugindir}/libmp4.so
%changelog
+* Fri Jun 07 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.8.8-6
+- Fix overflows
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:2.8.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
4 years, 10 months
[audacity-freeworld] - Update to Audacity 2.3.2 release. - Rebase audacity-2.3.2-libdir.patch.
by David Timms
commit d5b800d0752eceaa057bea80358178d6c9fe7aa4
Author: David Timms <dtimms(a)iinet.net.au>
Date: Thu Jun 6 23:28:02 2019 +1000
- Update to Audacity 2.3.2 release.
- Rebase audacity-2.3.2-libdir.patch.
.gitignore | 3 +--
audacity-2.2.1-libdir.patch | 11 -----------
audacity-2.3.2-libdir.patch | 11 +++++++++++
audacity-freeworld.spec | 15 ++++++++++-----
sources | 2 +-
5 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0aa2de1..e448c42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/audacity-minsrc-2.3.0.tar.xz
-/audacity-minsrc-2.3.1.tar.xz
+/audacity-minsrc-2.3.2.tar.xz
diff --git a/audacity-2.3.2-libdir.patch b/audacity-2.3.2-libdir.patch
new file mode 100644
index 0000000..f286119
--- /dev/null
+++ b/audacity-2.3.2-libdir.patch
@@ -0,0 +1,11 @@
+--- ./src/effects/ladspa/LadspaEffect.cpp 2019-05-05 21:08:56.000000000 +1000
++++ ./src/effects/ladspa/LadspaEffect.cpp.orig 2019-06-03 21:45:30.059886205 +1000
+@@ -358,7 +358,7 @@
+ #else
+
+ pathList.push_back(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".ladspa"));
+- pathList.push_back(wxT("/usr/local/lib/ladspa"));
++ pathList.push_back(wxT("/usr/%{_lib}/ladspa"));
+ pathList.push_back(wxT("/usr/lib/ladspa"));
+ pathList.push_back(wxT(LIBDIR) wxT("/ladspa"));
+
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index e1e57a5..54e4277 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -8,7 +8,7 @@
Name: audacity-freeworld
-Version: 2.3.1
+Version: 2.3.2
Release: 1%{?dist}
Summary: Multitrack audio editor
License: GPLv2
@@ -28,7 +28,7 @@ Source0: http://www.fosshub.com/Audacity.html/%{realname}-minsrc-%{version}.tar.
# manual can be installed from the base Fedora Audacity package.
Patch1: audacity-2.2.1-libmp3lame-default.patch
-Patch2: audacity-2.2.1-libdir.patch
+Patch2: audacity-2.3.2-libdir.patch
# add audio/x-flac
# remove audio/mpeg, audio/x-mp3
# enable startup notification
@@ -62,13 +62,14 @@ BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
#checking for LV2... no
#configure: LV2 libraries are NOT available as system libraries
-#BuildRequires: lv2-devel
+#fresh check for system libraries:
+BuildRequires: lv2-devel
# system portaudio fails to build
# http://rglinuxtech.com/?p=2093
-#BuildRequires: portaudio-devel >= 19-16
+BuildRequires: portaudio-devel >= 19-16
#checking for PORTMIDI... no
#configure: portmidi library is NOT available as system library
-#BuildRequires: portmidi-devel
+BuildRequires: portmidi-devel
BuildRequires: soundtouch-devel
BuildRequires: soxr-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
@@ -224,6 +225,10 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt
%changelog
+* Tue Jun 4 2019 David Timms <iinet.net.au@dtimms> - 2.3.2-1
+- Update to Audacity 2.3.2 release.
+- Rebase audacity-2.3.2-libdir.patch.
+
* Mon Mar 18 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 2.3.1-1
- Update to Audacity 2.3.1 release
- Fixes Audacity 2.3.0 broken release (rfbz#5077)
diff --git a/sources b/sources
index 60631ee..1acec05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2eceb70d6c4263ea2d34bca11f038086 audacity-minsrc-2.3.1.tar.xz
+1ddafe07f4ecb6c650b371bfd016cfa2 audacity-minsrc-2.3.2.tar.xz
4 years, 10 months