[pkgsrc/trunk]: pkgsrc/www/seamonkey seamonkey: remove patch that is already ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a322f4244ee4
branches:  trunk
changeset: 383269:a322f4244ee4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jul 26 11:30:01 2018 +0000

description:
seamonkey: remove patch that is already included in upstream

diffstat:

 www/seamonkey/distinfo                    |   3 +-
 www/seamonkey/patches/patch-CVE-2018-5147 |  79 -------------------------------
 2 files changed, 1 insertions(+), 81 deletions(-)

diffs (98 lines):

diff -r 4fb9539fe50e -r a322f4244ee4 www/seamonkey/distinfo
--- a/www/seamonkey/distinfo    Thu Jul 26 10:48:32 2018 +0000
+++ b/www/seamonkey/distinfo    Thu Jul 26 11:30:01 2018 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.153 2018/07/26 07:34:47 wiz Exp $
+$NetBSD: distinfo,v 1.154 2018/07/26 11:30:01 wiz Exp $
 
 SHA1 (seamonkey-2.49.3.source.tar.xz) = 9a6d681f96d87c12081c75cd7c018b93c68ea9ae
 RMD160 (seamonkey-2.49.3.source.tar.xz) = 75e4058b46d001253b34ba7039af30ce52092854
 SHA512 (seamonkey-2.49.3.source.tar.xz) = f38add67c7528809adda55d2ee165d953c34080b6b75aaebed6f904e82c6f6a1ec243d53b6f4f4b875123fd2c7831758909e1baccdf3d9e58ed4747625d8f59f
 Size (seamonkey-2.49.3.source.tar.xz) = 231547028 bytes
-SHA1 (patch-CVE-2018-5147) = 1c44a5e2f0a81b58ebc8343028019e4681ee246c
 SHA1 (patch-ao) = e466058ed1899a64a9ab5b57290ff2baad1ea03c
 SHA1 (patch-ldap_c-sdk_include_portable.h) = ce0b643fa031b74bf7d74eedc4f3729807aef799
 SHA1 (patch-mail_app_Makefile.in) = da6ac87ffdcff733f11218cb11f8ef316bb1bc18
diff -r 4fb9539fe50e -r a322f4244ee4 www/seamonkey/patches/patch-CVE-2018-5147
--- a/www/seamonkey/patches/patch-CVE-2018-5147 Thu Jul 26 10:48:32 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-$NetBSD: patch-CVE-2018-5147,v 1.1 2018/03/17 00:06:17 maya Exp $
-
-CVE-2018-5147: Prevent out-of-bounds write in codebook decoding.
-
-Codebooks that are not an exact divisor of the partition size are now
-truncated to fit within the partition.
-
---- mozilla/media/libtremor/lib/tremor_codebook.c.orig 2018-02-05 11:49:21.000000000 +0000
-+++ mozilla/media/libtremor/lib/tremor_codebook.c
-@@ -258,7 +258,7 @@ long vorbis_book_decodevs_add(codebook *
-       t[i] = book->valuelist+entry[i]*book->dim;
-       }
-       for(i=0,o=0;i<book->dim;i++,o+=step)
--      for (j=0;j<step;j++)
-+      for (j=0;o+j<n && j<step;j++)
-         a[o+j]+=t[j][i]>>shift;
-     }else{
-       for (i = 0; i < step; i++) {
-@@ -267,7 +267,7 @@ long vorbis_book_decodevs_add(codebook *
-       t[i] = book->valuelist+entry[i]*book->dim;
-       }
-       for(i=0,o=0;i<book->dim;i++,o+=step)
--      for (j=0;j<step;j++)
-+      for (j=0;o+j<n && j<step;j++)
-         a[o+j]+=t[j][i]<<-shift;
-     }
-   }
-@@ -287,7 +287,7 @@ long vorbis_book_decodev_add(codebook *b
-       entry = decode_packed_entry_number(book,b);
-       if(entry==-1)return(-1);
-       t     = book->valuelist+entry*book->dim;
--      for (j=0;j<book->dim;)
-+      for (j=0;i<n && j<book->dim;)
-         a[i++]+=t[j++]>>shift;
-       }
-     }else{
-@@ -295,7 +295,7 @@ long vorbis_book_decodev_add(codebook *b
-       entry = decode_packed_entry_number(book,b);
-       if(entry==-1)return(-1);
-       t     = book->valuelist+entry*book->dim;
--      for (j=0;j<book->dim;)
-+      for (j=0;i<n && j<book->dim;)
-         a[i++]+=t[j++]<<-shift;
-       }
-     }
-@@ -352,15 +352,15 @@ long vorbis_book_decodevv_add(codebook *
-     long i,j,entry;
-     int chptr=0;
-     int shift=point-book->binarypoint;
--    
-+    int m=offset+n;
-     if(shift>=0){
-       
--      for(i=offset;i<offset+n;){
-+      for(i=offset;i<m;){
-       entry = decode_packed_entry_number(book,b);
-       if(entry==-1)return(-1);
-       {
-         const ogg_int32_t *t = book->valuelist+entry*book->dim;
--        for (j=0;j<book->dim;j++){
-+        for (j=0;i<m && j<book->dim;j++){
-           a[chptr++][i]+=t[j]>>shift;
-           if(chptr==ch){
-             chptr=0;
-@@ -371,12 +371,12 @@ long vorbis_book_decodevv_add(codebook *
-       }
-     }else{
-       
--      for(i=offset;i<offset+n;){
-+      for(i=offset;i<m;){
-       entry = decode_packed_entry_number(book,b);
-       if(entry==-1)return(-1);
-       {
-         const ogg_int32_t *t = book->valuelist+entry*book->dim;
--        for (j=0;j<book->dim;j++){
-+        for (j=0;i<m && j<book->dim;j++){
-           a[chptr++][i]+=t[j]<<-shift;
-           if(chptr==ch){
-             chptr=0;