[PR PATCH] vorbis-tools: update to 1.4.2.

[PR PATCH] vorbis-tools: update to 1.4.2.

[ailiop-git]

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

There is a new pull request by ailiop-git against master on the void-packages repository

https://github.com/ailiop-git/void-packages vorbis-tools
https://github.com/void-linux/void-packages/pull/28653

vorbis-tools: update to 1.4.2.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28653.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vorbis-tools-28653.patch --]
[-- Type: text/x-diff, Size: 7907 bytes --]

From 7ac5f6b78292f553c2719d53230827c2c2288b25 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Wed, 10 Feb 2021 22:47:38 +0100
Subject: [PATCH] vorbis-tools: update to 1.4.2.

---
 .../CVE-2014-9639-and-CVE-2014-9638.patch     | 84 -------------------
 .../vorbis-tools/patches/CVE-2014-9640.patch  | 25 ------
 .../vorbis-tools/patches/CVE-2015-6749.patch  | 42 ----------
 srcpkgs/vorbis-tools/template                 | 15 ++--
 4 files changed, 6 insertions(+), 160 deletions(-)
 delete mode 100644 srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch
 delete mode 100644 srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch
 delete mode 100644 srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch

diff --git a/srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch b/srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch
deleted file mode 100644
index 975cc4054d2..00000000000
--- a/srcpkgs/vorbis-tools/patches/CVE-2014-9639-and-CVE-2014-9638.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Petter Reinholdtsen <pere@debian.org>
-Date: Tue, 22 Sep 2015 15:14:06 +0200
-Subject: oggenc: validate count of channels in the header (CVE-2014-9638 &
- CVE-2014-9639)
-
-Author: Kamil Dudka <kdudka@redhat.com>
-Origin: http://lists.xiph.org/pipermail/vorbis-dev/2015-February/020423.html
-Bug: https://trac.xiph.org/ticket/2136
-Bug: https://trac.xiph.org/ticket/2137
-Bug-Debian: https://bugs.debian.org/776086
-Forwarded: not-needed
-Reviewed-By: Petter Reinholdtsen <pere@hungry.com>
-Last-Update: 2015-09-22
----
- oggenc/audio.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 05e42b3..1b3f179 100644
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -13,6 +13,7 @@
- #include <config.h>
- #endif
- 
-+#include <limits.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -251,6 +252,7 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-     int i;
-+    long channels;
- 
-     if(buf[11]=='C')
-         aifc=1;
-@@ -277,11 +279,16 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
-         return 0;
-     }
- 
--    format.channels = READ_U16_BE(buffer);
-+    format.channels = channels = READ_U16_BE(buffer);
-     format.totalframes = READ_U32_BE(buffer+2);
-     format.samplesize = READ_U16_BE(buffer+6);
-     format.rate = (int)read_IEEE80(buffer+8);
- 
-+    if(channels <= 0L || SHRT_MAX < channels)
-+    {
-+        fprintf(stderr, _("Warning: Unsupported count of channels in AIFF header\n"));
-+        return 0;
-+    }
-     aiff->bigendian = 1;
- 
-     if(aifc)
-@@ -412,6 +419,7 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
-     wav_fmt format;
-     wavfile *wav = malloc(sizeof(wavfile));
-     int i;
-+    long channels;
- 
-     /* Ok. At this point, we know we have a WAV file. Now we have to detect
-      * whether we support the subtype, and we have to find the actual data
-@@ -449,12 +457,18 @@ int wav_open(FILE *in, oe_enc_opt *opt, unsigned char *oldbuf, int buflen)
-     }
- 
-     format.format =      READ_U16_LE(buf);
--    format.channels =    READ_U16_LE(buf+2);
-+    format.channels = channels = READ_U16_LE(buf+2);
-     format.samplerate =  READ_U32_LE(buf+4);
-     format.bytespersec = READ_U32_LE(buf+8);
-     format.align =       READ_U16_LE(buf+12);
-     format.samplesize =  READ_U16_LE(buf+14);
- 
-+    if(channels <= 0L || SHRT_MAX < channels)
-+    {
-+        fprintf(stderr, _("Warning: Unsupported count of channels in WAV header\n"));
-+        return 0;
-+    }
-+
-     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
-     {
-       if(len<40)
-
diff --git a/srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch b/srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch
deleted file mode 100644
index 96543f99030..00000000000
--- a/srcpkgs/vorbis-tools/patches/CVE-2014-9640.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/oggenc/oggenc.c
-+++ b/oggenc/oggenc.c
-@@ -98,4 +98,6 @@
-               0,0,0.f,
-               0, 0, 0, 0, 0};
-+    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
-+      N_("RAW file reader")};
- 
-     int i;
-@@ -240,6 +242,4 @@
-         if(opt.rawmode)
-         {
--            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
--                N_("RAW file reader")};
- 
-             enc_opts.rate=opt.raw_samplerate;
---- a/oggenc/skeleton.h
-+++ b/oggenc/skeleton.h
-@@ -42,5 +42,5 @@
-     ogg_int64_t start_granule;                             /* start granule value */
-     ogg_uint32_t preroll;                                   /* preroll */
--    unsigned char granule_shift; // a 8-bit field           /* 1 byte value holding the granule shift */
-+    unsigned char granule_shift;                            /* 1 byte value holding the granule shift */
-     char *message_header_fields;                            /* holds all the message header fields */
-     /* current total size of the message header fields, for realloc purpose, initially zero */
diff --git a/srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch b/srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch
deleted file mode 100644
index b6c5589f5d5..00000000000
--- a/srcpkgs/vorbis-tools/patches/CVE-2015-6749.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001
-From: Mark Harris <mark.hsj@gmail.com>
-Date: Sun, 30 Aug 2015 05:54:46 -0700
-Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input
-
-Fixes #2212
----
- oggenc/audio.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/oggenc/audio.c b/oggenc/audio.c
-index 477da8c..4921fb9 100644
-
-Index: oggenc/audio.c
-===================================================================
---- a/oggenc/audio.c
-+++ b/oggenc/audio.c
-@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] =
- int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
- {
-     int aifc; /* AIFC or AIFF? */
--    unsigned int len;
--    unsigned char *buffer;
-+    unsigned int len, readlen;
-+    unsigned char buffer[22];
-     unsigned char buf2[8];
-     aiff_fmt format;
-     aifffile *aiff = malloc(sizeof(aifffile));
-@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
-         return 0; /* Weird common chunk */
-     }
- 
--    buffer = alloca(len);
--
--    if(fread(buffer,1,len,in) < len)
-+    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
-+    if(fread(buffer,1,readlen,in) < readlen ||
-+       (len > readlen && !seek_forward(in, len-readlen)))
-     {
-         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
-         return 0;
-
diff --git a/srcpkgs/vorbis-tools/template b/srcpkgs/vorbis-tools/template
index d4589762f4d..9afe9502b95 100644
--- a/srcpkgs/vorbis-tools/template
+++ b/srcpkgs/vorbis-tools/template
@@ -1,16 +1,13 @@
 # Template file for 'vorbis-tools'
 pkgname=vorbis-tools
-version=1.4.0
-revision=4
-patch_args="-Np1"
+version=1.4.2
+revision=1
+build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libogg-devel libvorbis-devel libao-devel libflac-devel libcurl-devel speex-devel"
-build_style=gnu-configure
+short_desc="Tools for Vorbis-Codecs e.g. oggenc and oggdec"
 maintainer="Philipp Hirsch <itself@hanspolo.net>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.vorbis.com/"
 distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz"
-checksum=a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc
-short_desc="Tools for Vorbis-Codecs e.g. oggenc and oggdec"
-
-LDFLAGS="-lm"
+checksum=db7774ec2bf2c939b139452183669be84fda5774d6400fc57fde37f77624f0b0

Re: [PR PATCH] [Closed]: vorbis-tools: update to 1.4.2.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1441 bytes --]

There's a closed pull request on the void-packages repository

vorbis-tools: update to 1.4.2.
https://github.com/void-linux/void-packages/pull/28653

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->