Date: Wednesday, February 21, 2018 @ 23:14:26 Author: arojas Revision: 317370
archrelease: copy trunk to extra-x86_64 Added: sox/repos/extra-x86_64/PKGBUILD (from rev 317369, sox/trunk/PKGBUILD) sox/repos/extra-x86_64/sox-dynamic.patch (from rev 317369, sox/trunk/sox-dynamic.patch) Deleted: sox/repos/extra-x86_64/PKGBUILD sox/repos/extra-x86_64/sox-dynamic.patch -------------------+ PKGBUILD | 116 ++++++++++++++++++++++++++++++---------------------- sox-dynamic.patch | 24 +++++----- 2 files changed, 80 insertions(+), 60 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-02-21 23:13:52 UTC (rev 317369) +++ PKGBUILD 2018-02-21 23:14:26 UTC (rev 317370) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=sox -pkgver=14.4.2 -pkgrel=2 -pkgdesc="The Swiss Army knife of sound processing tools" -arch=('i686' 'x86_64') -url="http://sox.sourceforge.net/" -license=('GPL' 'LGPL') -depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') -makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse' 'opusfile' 'twolame') -checkdepends=('time') -optdepends=('libao: for ao plugin' - 'libmad: for mp3 plugin' - 'libid3tag: for mp3 plugin' - 'wavpack: for wavpack plugin' - 'libpulse: for pulse plugin' - 'opusfile: for opus plugin' - 'twolame: for mp3 plugin') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 sox-dynamic.patch) -sha1sums=('dc9668256b9d81ef25d672f14f12ec026b0b4087' - '9c71fa36596ed127b1bb367cfbab3b52cd2ecb6d') - -prepare() { - cd ${pkgname}-${pkgver} - sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in - patch -p1 -i "${srcdir}/sox-dynamic.patch" - aclocal - automake -} - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-dyn-default --with-distro="Arch Linux" - make -} - -check() { - cd ${pkgname}-${pkgver} - make bindir=. installcheck -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} Copied: sox/repos/extra-x86_64/PKGBUILD (from rev 317369, sox/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-02-21 23:14:26 UTC (rev 317370) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=sox +pkgver=14.4.2 +pkgrel=3 +pkgdesc="The Swiss Army knife of sound processing tools" +arch=('x86_64') +url="http://sox.sourceforge.net/" +license=('GPL' 'LGPL') +depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') +makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse' 'opusfile' 'twolame') +checkdepends=('time') +optdepends=('libao: for ao plugin' + 'libmad: for mp3 plugin' + 'libid3tag: for mp3 plugin' + 'wavpack: for wavpack plugin' + 'libpulse: for pulse plugin' + 'opusfile: for opus plugin' + 'twolame: for mp3 plugin') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 sox-dynamic.patch + CVE-2017-15371.patch::https://github.com/mansr/sox/commit/818bdd0.patch + CVE-2017-11358.patch::https://github.com/mansr/sox/commit/6cb44a4.patch + CVE-2017-15370.patch::https://github.com/mansr/sox/commit/ef3d8be.patch + CVE-2017-11332.patch::https://github.com/mansr/sox/commit/7405bca.patch + CVE-2017-11359.patch::https://github.com/mansr/sox/commit/8b590b3.patch + CVE-2017-15372.patch::https://github.com/mansr/sox/commit/001c337.patch + CVE-2017-15642.patch::https://github.com/mansr/sox/commit/0be259e.patch) + +sha1sums=('dc9668256b9d81ef25d672f14f12ec026b0b4087' + '9c71fa36596ed127b1bb367cfbab3b52cd2ecb6d' + 'e10b3903906eee6e1ac413c985de8deba1089c6c' + '67c701cf7b3b78b167e5c62a2deade5b92c73bf6' + '8cf9cda08e3da1d3cf75fa64d17859b9b2a05b73' + 'dc832d954ea1dcddfdf80719bbcb7b4f187a9901' + '293e4b7942a82c686695d968a2e0b0400ba4f534' + 'd580cfbac8e6562e9150dbd10b36fd66f4011a48' + '23b0012c3e214eade8e6fedeb610548f90527ee4') + +prepare() { + cd ${pkgname}-${pkgver} + sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in + patch -p1 -i "${srcdir}/sox-dynamic.patch" + for _cve in 15371 11358 15370 11332 11359 15372 15642; do + patch -p1 -i ../CVE-2017-$_cve.patch + done + sed -e '/hcom/d' -i src/tests.sh # test fails with CVE-2017-11358.patch + + aclocal + automake +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-dyn-default --with-distro="Arch Linux" + make +} + +check() { + cd ${pkgname}-${pkgver} + make bindir=. installcheck +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Deleted: sox-dynamic.patch =================================================================== --- sox-dynamic.patch 2018-02-21 23:13:52 UTC (rev 317369) +++ sox-dynamic.patch 2018-02-21 23:14:26 UTC (rev 317370) @@ -1,12 +0,0 @@ -diff -Naur sox-14.4.2-orig/src/Makefile.am sox-14.4.2/src/Makefile.am ---- sox-14.4.2-orig/src/Makefile.am 2015-04-08 17:11:09.555343005 -0400 -+++ sox-14.4.2/src/Makefile.am 2015-04-08 17:11:25.115317153 -0400 -@@ -95,7 +95,7 @@ - - libsox_la_CFLAGS = @WARN_CFLAGS@ - libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ -- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' -+ -export-symbols-regex '^(sox_.*|lsx_(error|flush|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' - - if HAVE_WIN32_LTDL - libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h Copied: sox/repos/extra-x86_64/sox-dynamic.patch (from rev 317369, sox/trunk/sox-dynamic.patch) =================================================================== --- sox-dynamic.patch (rev 0) +++ sox-dynamic.patch 2018-02-21 23:14:26 UTC (rev 317370) @@ -0,0 +1,12 @@ +diff -Naur sox-14.4.2-orig/src/Makefile.am sox-14.4.2/src/Makefile.am +--- sox-14.4.2-orig/src/Makefile.am 2015-04-08 17:11:09.555343005 -0400 ++++ sox-14.4.2/src/Makefile.am 2015-04-08 17:11:25.115317153 -0400 +@@ -95,7 +95,7 @@ + + libsox_la_CFLAGS = @WARN_CFLAGS@ + libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \ +- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' ++ -export-symbols-regex '^(sox_.*|lsx_(error|flush|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$' + + if HAVE_WIN32_LTDL + libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h