[arch-commits] Commit in sonic-visualiser/trunk (2 files)

[David Runge]

    Date: Friday, April 24, 2020 @ 09:44:02
  Author: dvzrv
Revision: 619079

upgpkg: sonic-visualiser 4.0.1-3: Security fixes.

Adding full RELRO using upstream patch for autotools.
The patch conveniently also fixes the overlinking issues.
Removing flac and libvorbis as it is actually not required by the package.

Added:
  sonic-visualiser/trunk/sonic-visualiser-4.0.1-ldflags.patch
Modified:
  sonic-visualiser/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   24 ++++++++++++++----------
 sonic-visualiser-4.0.1-ldflags.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-24 09:42:10 UTC (rev 619078)
+++ PKGBUILD	2020-04-24 09:44:02 UTC (rev 619079)
@@ -5,7 +5,7 @@
 _download_id=2607
 pkgname=sonic-visualiser
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A viewer and analyser of music audio files."
 arch=('x86_64')
 url="https://www.sonicvisualiser.org/"
@@ -13,14 +13,16 @@
 groups=('pro-audio')
 depends=('bzip2' 'gcc-libs' 'glibc' 'hicolor-icon-theme' 'libglvnd' 'libid3tag'
 'libmad' 'libogg' 'libx11' 'opusfile' 'qt5-base' 'qt5-svg' 'speex')
-makedepends=('alsa-lib' 'capnproto' 'fftw' 'flac' 'libfishsound' 'liblo'
-'liblrdf' 'liboggz' 'libpulse' 'libsamplerate' 'libsndfile' 'libvorbis'
-'portaudio' 'rubberband' 'serd' 'sord')
+makedepends=('alsa-lib' 'capnproto' 'fftw' 'libfishsound' 'liblo' 'liblrdf'
+'liboggz' 'libpulse' 'libsamplerate' 'libsndfile' 'portaudio' 'rubberband'
+'serd' 'sord')
 source=("https://code.soundsoftware.ac.uk/attachments/download/${_download_id}/${pkgname}-${pkgver}.tar.gz"
         "${pkgname}-4.0.1-remove-werror.patch"
+        "${pkgname}-4.0.1-ldflags.patch"
 )
 sha512sums=('6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220'
-            '1b5873953ec8635a1e10f924cfc2aa8dcdfa856dfcf2b4a06e8f1ab8ed947697e64f3c20147464dcc95b1d836e92e848c57c6480bd04a9d2086547044df606da')
+            '1b5873953ec8635a1e10f924cfc2aa8dcdfa856dfcf2b4a06e8f1ab8ed947697e64f3c20147464dcc95b1d836e92e848c57c6480bd04a9d2086547044df606da'
+            'e0147cde93409ff26af10c2b705f84833061469501a815e6ac321bf7d35857b2fcf366e743e6db194e53218f901aeec34679ebd60aa07f00d40e52eb7eadcfb2')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -29,6 +31,9 @@
   patch -Np1 -i "../${pkgname}-4.0.1-remove-werror.patch"
   # no full RELRO, because LDFLAGS is ignored:
   # https://sourceforge.net/p/sv1/bugs/282/
+  # fix overlinking issues:
+  # https://sourceforge.net/p/sv1/bugs/281/
+  patch -Np1 -i "../${pkgname}-4.0.1-ldflags.patch"
   autoreconf -vfi
 }
 
@@ -39,11 +44,10 @@
 }
 
 package() {
-  depends+=('libasound.so' 'libcapnp.so' 'libFLAC.so' 'libfftw3.so'
-  'libfftw3f.so' 'libfishsound.so' 'libkj.so' 'liblo.so' 'liblrdf.so'
-  'liboggz.so' 'libportaudio.so' 'libpulse.so' 'librubberband.so'
-  'libsamplerate.so' 'libserd-0.so' 'libsndfile.so' 'libsord-0.so'
-  'libvorbis.so' 'libvorbisenc.so')
+  depends+=('libasound.so' 'libcapnp.so' 'libfftw3.so' 'libfftw3f.so'
+  'libfishsound.so' 'libkj.so' 'liblo.so' 'liblrdf.so' 'liboggz.so'
+  'libportaudio.so' 'libpulse.so' 'librubberband.so' 'libsamplerate.so'
+  'libserd-0.so' 'libsndfile.so' 'libsord-0.so')
   cd "${pkgname}-${pkgver}"
   # INSTALL_ROOT used in favor of DESTDIR
   # https://sourceforge.net/p/sv1/bugs/254

Added: sonic-visualiser-4.0.1-ldflags.patch
===================================================================
--- sonic-visualiser-4.0.1-ldflags.patch	                        (rev 0)
+++ sonic-visualiser-4.0.1-ldflags.patch	2020-04-24 09:44:02 UTC (rev 619079)
@@ -0,0 +1,31 @@
+diff -r 7bd874f87f0e configure
+--- a/configure	Wed Apr 22 17:18:49 2020 +0100
++++ b/configure	Fri Apr 24 10:15:07 2020 +0100
+@@ -4508,7 +4508,10 @@
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS_BUILD $SV_DEFINES_BUILD"
+-LDFLAGS="$LDFLAGS_BUILD"
++
++if test x"LDFLAGS" = x; then
++   LDFLAGS="$LDFLAGS_BUILD"
++fi
+ 
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+diff -r 7bd874f87f0e configure.ac
+--- a/configure.ac	Wed Apr 22 17:18:49 2020 +0100
++++ b/configure.ac	Fri Apr 24 10:15:07 2020 +0100
+@@ -87,7 +87,11 @@
+ fi
+ 
+ CXXFLAGS="$CXXFLAGS_BUILD $SV_DEFINES_BUILD"
+-LDFLAGS="$LDFLAGS_BUILD"
++
++# Set our own LDFLAGS only if the user didn't request any
++if test x"LDFLAGS" = x; then
++   LDFLAGS="$LDFLAGS_BUILD"
++fi
+ 
+ SV_MODULE_REQUIRED([bz2],[],[bzlib.h],[bz2],[BZ2_bzReadOpen])
+ SV_MODULE_REQUIRED([fftw3],[fftw3 >= 3.0.0],[fftw3.h],[fftw3],[fftw_execute])