[pkgsrc/trunk]: pkgsrc/multimedia/ggrab Add some patches hidden in the cvs re...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b976b2dc49b0
branches:  trunk
changeset: 516937:b976b2dc49b0
user:      mjl <mjl%pkgsrc.org@localhost>
date:      Tue Aug 01 12:50:23 2006 +0000

description:
Add some patches hidden in the cvs repository but not included
in the source tarball.
Also add a patch to limit the constructed output file name
to some saner length as well as increase the buffer to PATH_MAX.
An overlong EPG data could easily overflow the buffer and crash
the sserver process.

diffstat:

 multimedia/ggrab/distinfo         |   7 ++++-
 multimedia/ggrab/patches/patch-aa |  16 +++++++++-----
 multimedia/ggrab/patches/patch-ac |  13 ++++++++++++
 multimedia/ggrab/patches/patch-ad |  13 ++++++++++++
 multimedia/ggrab/patches/patch-ae |  40 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 81 insertions(+), 8 deletions(-)

diffs (121 lines):

diff -r 8b96a5a22437 -r b976b2dc49b0 multimedia/ggrab/distinfo
--- a/multimedia/ggrab/distinfo Tue Aug 01 12:29:59 2006 +0000
+++ b/multimedia/ggrab/distinfo Tue Aug 01 12:50:23 2006 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.2 2006/04/09 19:35:10 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/08/01 12:50:23 mjl Exp $
 
 SHA1 (ggrab-0.22a-linux.tgz) = bb73e45ad9918e70ee21baadcc0771a6ca55032d
 RMD160 (ggrab-0.22a-linux.tgz) = a272515ac6c40d3c899527e5590bd86893f694e8
 Size (ggrab-0.22a-linux.tgz) = 503296 bytes
-SHA1 (patch-aa) = f1beb04c00e1d40123eda0e058e725d9ee55da5b
+SHA1 (patch-aa) = 224a1a8e8c526c6af539f26a6c2fa75c9972e067
 SHA1 (patch-ab) = c89e69405a1091ed5e8dd8971271adb4c186e739
+SHA1 (patch-ac) = 8542c38501cdc2cfab998ded9e06c4d64011b199
+SHA1 (patch-ad) = 9104006c8bc19624fd3846c47eda2dedf77bf48b
+SHA1 (patch-ae) = 7804a7f7209733497d0f6e74b9b514a8310bb10a
diff -r 8b96a5a22437 -r b976b2dc49b0 multimedia/ggrab/patches/patch-aa
--- a/multimedia/ggrab/patches/patch-aa Tue Aug 01 12:29:59 2006 +0000
+++ b/multimedia/ggrab/patches/patch-aa Tue Aug 01 12:50:23 2006 +0000
@@ -1,13 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2006/04/09 19:35:10 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2006/08/01 12:50:23 mjl Exp $ 
 
---- pesstream.h.orig   2006-04-09 19:32:10.000000000 +0000
-+++ pesstream.h
-@@ -25,7 +25,7 @@ class pesstream {
+--- pesstream.h.orig   2003-01-19 20:07:11.000000000 +0100
++++ pesstream.h        2006-08-01 13:42:44.000000000 +0200
+@@ -25,9 +25,9 @@
        private:
                static int              m_st_nr;
                int                     m_nr;
 -              enum S_TYPE             m_stype;
+-              class CBuffer *         mp_cbuf;
+-              class xlist *           mp_list;
 +              S_TYPE                  m_stype;
-               class CBuffer *         mp_cbuf;
-               class xlist *           mp_list;
++              CBuffer *               mp_cbuf;
++              xlist *         mp_list;
  
+               pthread_t               mh_thread;
+ 
diff -r 8b96a5a22437 -r b976b2dc49b0 multimedia/ggrab/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ggrab/patches/patch-ac Tue Aug 01 12:50:23 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/08/01 12:50:23 mjl Exp $
+
+--- cbuffer.h.orig     2006-08-01 13:39:05.000000000 +0200
++++ cbuffer.h  2006-08-01 13:39:14.000000000 +0200
+@@ -15,7 +15,7 @@
+               CBUFPTR         SearchStreamId(CBUFPTR ptr, int len, unsigned char pattern, unsigned char mask, unsigned char * p_id=0);
+               int             GetByteCount(void);
+               int             CopyBuffer(CBUFPTR ptr, unsigned char * pBuf, int len=16);
+-              int             CBuffer::RemovePadding(CBUFPTR lptr, int len);
++              int             RemovePadding(CBUFPTR lptr, int len);
+               
+ 
+       private:
diff -r 8b96a5a22437 -r b976b2dc49b0 multimedia/ggrab/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ggrab/patches/patch-ad Tue Aug 01 12:50:23 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/08/01 12:50:23 mjl Exp $
+
+--- tools.h.orig       2006-08-01 13:47:07.000000000 +0200
++++ tools.h    2006-08-01 13:47:31.000000000 +0200
+@@ -4,7 +4,7 @@
+ #define AUDIO_FORERUN         4500                    // Audio Vorlauf in 90 kHz
+ #define UDPBASE               30000                   // UDP Base Port
+ #define UDP_MSG_LEN     65536                 // UDP Message-Laenge
+-#define TIMEOUT_QUEUE 3
++#define TIMEOUT_QUEUE 10
+ 
+ extern bool gcore;
+ extern bool gloop;
diff -r 8b96a5a22437 -r b976b2dc49b0 multimedia/ggrab/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ggrab/patches/patch-ae Tue Aug 01 12:50:23 2006 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1 2006/08/01 12:50:23 mjl Exp $
+
+--- sserver.cpp.orig   2006-08-01 13:48:11.000000000 +0200
++++ sserver.cpp        2006-08-01 13:54:45.000000000 +0200
+@@ -52,7 +52,7 @@
+       char a_grabname[256];
+       char a_vpid[20];
+       char a_apid[20];
+-      char a_filename[256];
++      char a_filename[PATH_MAX];
+       char a_path[256]="";
+       char a_host[256];
+       int     i,n;
+@@ -169,7 +169,7 @@
+                                               sprintf(a_vpid,"0x%03x",recdata.vpid);  
+                                               sprintf(a_apid,"0x%03x",recdata.apid);
+ 
+-                                              strcpy (a_filename,a_path);
++                                              strlcpy (a_filename,a_path, sizeof(a_filename));
+                                                       
+                                               if (strlen(a_filename)) {
+                                                       strcat(a_filename,"/");
+@@ -185,7 +185,7 @@
+                                                               }
+                                                       } while (*p_act);
+                                                               
+-                                                      strcat(a_filename, recdata.channelname);
++                                                      strlcat(a_filename, recdata.channelname, 20);
+                                                       strcat(a_filename, "_");
+                                               }
+ 
+@@ -206,7 +206,7 @@
+                                                               }
+                                                       } while (*p_act++);
+                                                       
+-                                                      strcat(a_filename, recdata.epgtitle);
++                                                      strlcat(a_filename, recdata.epgtitle, 80);
+                                                       strcat(a_filename, "_");
+                                               }
+