summaryrefslogtreecommitdiff
path: root/media-libs/libsndfile
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/libsndfile')
-rw-r--r--media-libs/libsndfile/Manifest14
-rw-r--r--media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch35
-rw-r--r--media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch25
-rw-r--r--media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch50
-rw-r--r--media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch28
-rw-r--r--media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch64
-rw-r--r--media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch2
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.28-r1.ebuild62
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild2
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild (renamed from media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild)8
-rw-r--r--media-libs/libsndfile/libsndfile-9999.ebuild28
11 files changed, 233 insertions, 85 deletions
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 033d07fa1ca6..a2b6864b3bbb 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,9 +1,13 @@
AUX libsndfile-1.0.28-CVE-2017-12562.patch 4360 BLAKE2B d668fa5c114e3510ff51e2331593d040e0a69476472d55d2a784ceccc71d880cdcc4cda53210d8e2c62abb2397f13d8129162567df8f5528489190ce7c102172 SHA512 8f07edf06652c56877dc5bc478daf494bcfaa45fa1d5a655719aaa8b363edffb749c4878ca11a7dac602ac5658b17eea9397ad824e2c3be38e9fe6c51cea0c63
-AUX libsndfile-1.0.28-CVE-2018-13139.patch 920 BLAKE2B ac10209a6fa2f0f28b5d36dae9bd4e1afde90ae4db55163c42ea99bd20292c1e2df74f3130030982da13a16df11a1fc10b0138ecebc304351efd1b7852084d72 SHA512 b6a04575730de5a9bf2d1b531d585961a4bb822fbb2441d1cebf75519aa3744eddb3a322fc3b4f8aaf92cbf6fafee24eab6b26fa97d49bd2cbc0e3aec1aea66a
+AUX libsndfile-1.0.28-CVE-2017-14634.patch 1295 BLAKE2B 07d4d12db67151dbd4ad3141c0c0cf4de3ab8110a9e0aea3f21a29bc78f761e36fe997f6155d37f3d7839c1f51507b06813fdce41835f2fea429cb288025738c SHA512 5c8ecd05b85ba12fe4f0f0f423a2a1d2652f7469fbc72b0475f7bd9dce8d3c4e880c5a80ded3a2dffa84d41a7e76bb2d813cde1bd2f9474c5ab42d954cd90f2f
+AUX libsndfile-1.0.28-CVE-2017-6892.patch 868 BLAKE2B e90aa5a20b0bce3f2b41240b4289627ab38d87728e30b5cc59b58bf34a9c18eee07a6242ccae6ae5cdb42bd9a49558f2529ddae7f087784cdc6cb2f5f03fe08d SHA512 9183b79cc9a1c1a6de5826d67d7172010d2c57a1a600cabb3763066277e84dfd44225ff9916fb08639ec90514bebadb46634dac5b7e757f5938bee9755e472cc
+AUX libsndfile-1.0.28-CVE-2017-8362.patch 1951 BLAKE2B bf0e1a9c9cd53b61884a861a3284d9fe02ee6411c16f06000fa56794859f6ce96d4d135723a8cffed10801e04be9c94342501fbf2c4caf4078a0a4b5d5b68ad9 SHA512 dfd4b5f1c7471fc416eed5c6040580a020543f145de9103751adaad6ce1c5c6a22abc1cf0ffd381aed3072644cd5ee03ba3598265aa7d202d63167da251cb595
+AUX libsndfile-1.0.28-CVE-2017-8363.patch 857 BLAKE2B 9b053a582aed746fd00efd11f6887cc81d2ef4130533b75e859bb4bed494a29b9918cf07837b6fbc0e60421c659394a9c4c3e79a8bf76c20cc1304a57ef31bfc SHA512 5ce56647b19721dd60157007d3657444c7901e8ead856fa08b6fef0d74ac39e93295294bd21c43c90a3d305750f270f806ed760cd61c93b04e90d9c53357a56e
+AUX libsndfile-1.0.28-CVE-2017-8365.patch 2577 BLAKE2B 3e9af3996f9e859717281b1e59015df64797cd757bef0ccb280c86990ca8eae2ec2550da35e71fc498bfa119c1912f391372bb4a8ffcf7abe1e82e7dc3320ff1 SHA512 f98c40696fca3e7bca867df993de55bb4145c23428e65d1a669182eb2293046478ac727ae7f94bb77123ef0355c3c53be4f9d6a432665c90c74687d8d3afd9e3
+AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee40441671a623f4ba91a03c059babc4a7a49eb4903bde38d52333335749fd6a0f6501bf524add119658226f6b169565a579b8f2d SHA512 33817e7c85180635fa239e4ea38973b18312878522639f43071188a995f0e1a35dbca6d133555fb0875292b4b609950ae38e747a6b1949f8ae840db9dc3a2805
AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
-EBUILD libsndfile-1.0.28-r1.ebuild 1663 BLAKE2B 7c6a0c188b0ffba2b67b87c117ef186e0bbc12dadc61cd4d1e58e8f4d02be44bb63d1244fb41ec1520d66b230c66d7d4a466ada116e1cd3ce7551995353db113 SHA512 9ad9784b4dfddb8f4d1b3f70cc47965e35fa2e3b4469e3906dec6be2dc53841f102603f37cb078438148d6fdecace56696038f04c02ace9c14d0c26ec6a12825
-EBUILD libsndfile-1.0.28-r2.ebuild 1721 BLAKE2B 7239131284eae7494988647171fc30680de5a6d3a916c179f0c56818c1ce9adddf827089bae208c4f1d6aa2e1f42b0e74914756a30ad56653ac211e43e6f5cd7 SHA512 5aa47d7d321bd9b94c5c8f4f8b1cbf604f826bd0c3cd309310de2943711f869c7fc10218a9518bfacafcf78428e6ac915e4c3b3cf86156742ff6474eda8969d2
-EBUILD libsndfile-1.0.28-r3.ebuild 1756 BLAKE2B 71b84e1a3779276f11176d0e15f1bfc064f8bdb2f2e2a31df542c44b3d836af416da9f9b1aa697b808dd8522eec692ab1ab52fe36266989e57f6fe525cb85069 SHA512 229ec31c9ebc6d147e725dac6ea87c98fb8ef5784cadb7dad34ea6cc5017e7cb7365160b070ebb83f27eb103b71169b744c2c5a969fe1ca587d7fbbca2264f36
-EBUILD libsndfile-9999.ebuild 1745 BLAKE2B 597955cb2733c8ba88cbea8c0b6a8539cc3e4cbf4360244cafe669c85068c9a4f5b7fb152ffaf390344629d12909a8d514b06372afb6bed01aa90247e5470ed6 SHA512 37a4087046ba8fe41abd09bc16f485e8ca9ce1938021281ff09a5b2b953ed88f935389d13a9b1f6286bd3d35ebf727b4708cb117c7510ef4067f6fb39758adc7
+EBUILD libsndfile-1.0.28-r3.ebuild 1755 BLAKE2B 84df10cc6ee06a0604c0a764a41c3aec77aa78d8c500f79333b39d1f3948850ef9d508b29d3329927fdd967b74b55f916d59a6be40c9b5a80cd20dc4e0030027 SHA512 827aeb22ee8219e15501b6b5e3695989ec23afc6dbc3655a95369d8ccefb3cb63af36abb46429b6610283cb730b1aefee06225127ece017331cfd3f41ef9ea0d
+EBUILD libsndfile-1.0.28-r4.ebuild 1882 BLAKE2B 8dc9b02cc32ed2f5626a2bcb1f7740e33bef58610e94146d08eb7ed41bc8bee5b8cb73685d59c0a86cc33bc11ce6cfa9ec889b21262bb90641cf4478e0fc8c41 SHA512 8b824843434bdec455fbed944a9fb9ba1b40105b21ca94dd8f29dc8733af981e9f5fbda2ab071f8f812603f23d17199327a88d541bde6135cd8e512234f3f3a5
+EBUILD libsndfile-9999.ebuild 1772 BLAKE2B ca1c5369618ff9a92681c7899722248dd3c2ac13960838f8e7eae709dcc0ddbe2ab7ee935de136e409c5b96f2899c54959b90512b7d01491b062e66146b33e01 SHA512 82049c5932e75b23d14909128b3d051da1857df7d96059b2035d24940641aad37c6e00a39868bae417114fed754744a1aecd7dcaaa39da9143f97553b6e41814
MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch
new file mode 100644
index 000000000000..9eab370aac47
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-14634.patch
@@ -0,0 +1,35 @@
+From 85c877d5072866aadbe8ed0c3e0590fbb5e16788 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Thu, 28 Sep 2017 12:15:04 +0200
+Subject: [PATCH] double64_init: Check psf->sf.channels against upper bound
+
+This prevents division by zero later in the code.
+
+While the trivial case to catch this (i.e. sf.channels < 1) has already
+been covered, a crafted file may report a number of channels that is
+so high (i.e. > INT_MAX/sizeof(double)) that it "somehow" gets
+miscalculated to zero (if this makes sense) in the determination of the
+blockwidth. Since we only support a limited number of channels anyway,
+make sure to check here as well.
+
+CVE-2017-14634
+
+Closes: https://github.com/erikd/libsndfile/issues/318
+Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
+---
+ src/double64.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/double64.c b/src/double64.c
+index b318ea86..78dfef7f 100644
+--- a/src/double64.c
++++ b/src/double64.c
+@@ -91,7 +91,7 @@ int
+ double64_init (SF_PRIVATE *psf)
+ { static int double64_caps ;
+
+- if (psf->sf.channels < 1)
++ if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS)
+ { psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ;
+ return SFE_INTERNAL ;
+ } ;
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch
new file mode 100644
index 000000000000..d5ccf726684a
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-6892.patch
@@ -0,0 +1,25 @@
+From f833c53cb596e9e1792949f762e0b33661822748 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Tue, 23 May 2017 20:15:24 +1000
+Subject: [PATCH] src/aiff.c: Fix a buffer read overflow
+
+Secunia Advisory SA76717.
+
+Found by: Laurent Delosieres, Secunia Research at Flexera Software
+---
+ src/aiff.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/aiff.c b/src/aiff.c
+index 5b5f9f53..45864b76 100644
+--- a/src/aiff.c
++++ b/src/aiff.c
+@@ -1759,7 +1759,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword)
+ psf_binheader_readf (psf, "j", dword - bytesread) ;
+
+ if (map_info->channel_map != NULL)
+- { size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ;
++ { size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xffff) * sizeof (psf->channel_map [0]) ;
+
+ free (psf->channel_map) ;
+
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch
new file mode 100644
index 000000000000..54fbfb44c3b1
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8362.patch
@@ -0,0 +1,50 @@
+From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Fri, 14 Apr 2017 15:19:16 +1000
+Subject: [PATCH] src/flac.c: Fix a buffer read overflow
+
+A file (generated by a fuzzer) which increased the number of channels
+from one frame to the next could cause a read beyond the end of the
+buffer provided by libFLAC. Only option is to abort the read.
+
+Closes: https://github.com/erikd/libsndfile/issues/231
+---
+ src/flac.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/flac.c b/src/flac.c
+index 5a4f8c21..e4f9aaa0 100644
+--- a/src/flac.c
++++ b/src/flac.c
+@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf)
+ const int32_t* const *buffer = pflac->wbuffer ;
+ unsigned i = 0, j, offset, channels, len ;
+
++ if (psf->sf.channels != (int) frame->header.channels)
++ { psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n"
++ "Nothing to do but to error out.\n" ,
++ psf->sf.channels, frame->header.channels) ;
++ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
++ return 0 ;
++ } ;
++
+ /*
+ ** frame->header.blocksize is variable and we're using a constant blocksize
+ ** of FLAC__MAX_BLOCK_SIZE.
+@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf)
+ return 0 ;
+ } ;
+
+-
+ len = SF_MIN (pflac->len, frame->header.blocksize) ;
+
+ if (pflac->remain % channels != 0)
+@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
+ { case FLAC__METADATA_TYPE_STREAMINFO :
+ if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
+ { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
+- "Nothing to be but to error out.\n" ,
++ "Nothing to do but to error out.\n" ,
+ psf->sf.channels, metadata->data.stream_info.channels) ;
+ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
+ return ;
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch
new file mode 100644
index 000000000000..d0aa400bdd95
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8363.patch
@@ -0,0 +1,28 @@
+From cd7da8dbf6ee4310d21d9e44b385d6797160d9e8 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Wed, 12 Apr 2017 20:19:34 +1000
+Subject: [PATCH] src/flac.c: Fix another memory leak
+
+When the FLAC decoder was passed a malformed file, the associated
+`FLAC__StreamDecoder` object was not getting released.
+
+Closes: https://github.com/erikd/libsndfile/issues/233
+---
+ src/flac.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/flac.c b/src/flac.c
+index 986a7b8f..5a4f8c21 100644
+--- a/src/flac.c
++++ b/src/flac.c
+@@ -841,7 +841,9 @@ flac_read_header (SF_PRIVATE *psf)
+
+ psf_log_printf (psf, "End\n") ;
+
+- if (psf->error == 0)
++ if (psf->error != 0)
++ FLAC__stream_decoder_delete (pflac->fsd) ;
++ else
+ { FLAC__uint64 position ;
+
+ FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch
new file mode 100644
index 000000000000..1dc5b57f1d39
--- /dev/null
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2017-8365.patch
@@ -0,0 +1,64 @@
+From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd@mega-nerd.com>
+Date: Wed, 12 Apr 2017 19:45:30 +1000
+Subject: [PATCH] FLAC: Fix a buffer read overrun
+
+Buffer read overrun occurs when reading a FLAC file that switches
+from 2 channels to one channel mid-stream. Only option is to
+abort the read.
+
+Closes: https://github.com/erikd/libsndfile/issues/230
+---
+ src/common.h | 1 +
+ src/flac.c | 13 +++++++++++++
+ src/sndfile.c | 1 +
+ 3 files changed, 15 insertions(+)
+
+diff --git a/src/common.h b/src/common.h
+index 0bd810c3..e2669b6a 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -725,6 +725,7 @@ enum
+ SFE_FLAC_INIT_DECODER,
+ SFE_FLAC_LOST_SYNC,
+ SFE_FLAC_BAD_SAMPLE_RATE,
++ SFE_FLAC_CHANNEL_COUNT_CHANGED,
+ SFE_FLAC_UNKOWN_ERROR,
+
+ SFE_WVE_NOT_WVE,
+diff --git a/src/flac.c b/src/flac.c
+index 84de0e26..986a7b8f 100644
+--- a/src/flac.c
++++ b/src/flac.c
+@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
+
+ switch (metadata->type)
+ { case FLAC__METADATA_TYPE_STREAMINFO :
++ if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
++ { psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
++ "Nothing to be but to error out.\n" ,
++ psf->sf.channels, metadata->data.stream_info.channels) ;
++ psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
++ return ;
++ } ;
++
++ if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate)
++ { psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n"
++ "Carrying on as if nothing happened.",
++ psf->sf.samplerate, metadata->data.stream_info.sample_rate) ;
++ } ;
+ psf->sf.channels = metadata->data.stream_info.channels ;
+ psf->sf.samplerate = metadata->data.stream_info.sample_rate ;
+ psf->sf.frames = metadata->data.stream_info.total_samples ;
+diff --git a/src/sndfile.c b/src/sndfile.c
+index 41875610..e2a87be8 100644
+--- a/src/sndfile.c
++++ b/src/sndfile.c
+@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] =
+ { SFE_FLAC_INIT_DECODER , "Error : problem with initialization of the flac decoder." },
+ { SFE_FLAC_LOST_SYNC , "Error : flac decoder lost sync." },
+ { SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." },
++ { SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." },
+ { SFE_FLAC_UNKOWN_ERROR , "Error : unknown error in flac decoder." },
+
+ { SFE_WVE_NOT_WVE , "Error : not a WVE file." },
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
index 18e6ae76e62c..f75843267b0b 100644
--- a/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
+++ b/media-libs/libsndfile/files/libsndfile-1.0.28-CVE-2018-13139.patch
@@ -28,4 +28,4 @@ index 53660310..225b4d54 100644
+
state.channels = sfinfo.channels ;
sfinfo.channels = 1 ;
- \ No newline at end of file
+
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r1.ebuild
deleted file mode 100644
index f4a3b0b1d8fe..000000000000
--- a/media-libs/libsndfile/libsndfile-1.0.28-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit python-any-r1 multilib-minimal
-
-MY_P=${P/_pre/pre}
-
-DESCRIPTION="A C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-if [[ ${MY_P} == ${P} ]]; then
- SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
-else
- SRC_URI="http://www.mega-nerd.com/tmp/${MY_P}b.tar.gz"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa minimal sqlite static-libs test"
-
-RDEPEND="
- !minimal? (
- >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib )
- sqlite? ( >=dev-db/sqlite-3.2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-arm-varargs-failure.patch )
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-octave \
- --enable-gcc-pipe \
- --enable-gcc-opt \
- $(use_enable static-libs static) \
- $(use_enable !minimal external-libs) \
- $(multilib_native_enable full-suite) \
- $(multilib_native_use_enable alsa) \
- $(multilib_native_use_enable sqlite)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # package provides .pc files
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild
index e1bbd26e1f3b..23a9c0f9b706 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r3.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa minimal sqlite static-libs test"
RDEPEND="
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index fb59074ec723..a4b36932a335 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r2.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa minimal sqlite static-libs test"
RDEPEND="
@@ -40,6 +40,10 @@ S=${WORKDIR}/${MY_P}
PATCHES=(
"${FILESDIR}"/${P}-arm-varargs-failure.patch
"${FILESDIR}"/${P}-CVE-2017-12562.patch
+ "${FILESDIR}"/${P}-CVE-2018-13139.patch
+ "${FILESDIR}"/${P}-CVE-2017-6892.patch
+ "${FILESDIR}"/${P}-CVE-2017-836{3,5,2}.patch
+ "${FILESDIR}"/${P}-CVE-2017-14634.patch
)
pkg_setup() {
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index eb28af81fd55..1b23d4798036 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -1,26 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-inherit python-any-r1 multilib-minimal
-
-DESCRIPTION="A C library for reading and writing files containing sampled sound"
-HOMEPAGE="http://www.mega-nerd.com/libsndfile"
-
if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
-
- DEPEND="
- ${PYTHON_DEPS}
- sys-devel/autogen"
else
SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -34,11 +29,16 @@ RDEPEND="
)
alsa? ( media-libs/alsa-lib )
sqlite? ( >=dev-db/sqlite-3.2 )"
-DEPEND="
- ${DEPEND}
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
test? ( ${PYTHON_DEPS} )"
+if [[ ${PV} == *9999 ]]; then
+ BDEPEND="
+ ${PYTHON_DEPS}
+ sys-devel/autogen
+ "
+fi
pkg_setup() {
if use test || [[ ${PV} == *9999 ]]; then
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 13:36:51 +0000