[pkgsrc/trunk]: pkgsrc/multimedia/ggrab Correct patch to actually do the righ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc706bef8cb6
branches:  trunk
changeset: 517249:bc706bef8cb6
user:      mjl <mjl%pkgsrc.org@localhost>
date:      Sun Aug 06 20:49:52 2006 +0000

description:
Correct patch to actually do the right thing.

diffstat:

 multimedia/ggrab/distinfo         |   4 ++--
 multimedia/ggrab/patches/patch-ae |  37 ++++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diffs (83 lines):

diff -r d89ed9f7117d -r bc706bef8cb6 multimedia/ggrab/distinfo
--- a/multimedia/ggrab/distinfo Sun Aug 06 20:48:33 2006 +0000
+++ b/multimedia/ggrab/distinfo Sun Aug 06 20:49:52 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2006/08/01 12:50:23 mjl Exp $
+$NetBSD: distinfo,v 1.4 2006/08/06 20:49:52 mjl Exp $
 
 SHA1 (ggrab-0.22a-linux.tgz) = bb73e45ad9918e70ee21baadcc0771a6ca55032d
 RMD160 (ggrab-0.22a-linux.tgz) = a272515ac6c40d3c899527e5590bd86893f694e8
@@ -7,4 +7,4 @@
 SHA1 (patch-ab) = c89e69405a1091ed5e8dd8971271adb4c186e739
 SHA1 (patch-ac) = 8542c38501cdc2cfab998ded9e06c4d64011b199
 SHA1 (patch-ad) = 9104006c8bc19624fd3846c47eda2dedf77bf48b
-SHA1 (patch-ae) = 7804a7f7209733497d0f6e74b9b514a8310bb10a
+SHA1 (patch-ae) = 3affb6a88b9d66739428ecad5f0da32d87ce1cca
diff -r d89ed9f7117d -r bc706bef8cb6 multimedia/ggrab/patches/patch-ae
--- a/multimedia/ggrab/patches/patch-ae Sun Aug 06 20:48:33 2006 +0000
+++ b/multimedia/ggrab/patches/patch-ae Sun Aug 06 20:49:52 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2006/08/01 12:50:23 mjl Exp $
+$NetBSD: patch-ae,v 1.2 2006/08/06 20:49:52 mjl Exp $
 
---- sserver.cpp.orig   2006-08-01 13:48:11.000000000 +0200
-+++ sserver.cpp        2006-08-01 13:54:45.000000000 +0200
+--- sserver.cpp.orig   2003-03-07 20:22:13.000000000 +0100
++++ sserver.cpp        2006-08-06 22:45:30.000000000 +0200
 @@ -52,7 +52,7 @@
        char a_grabname[256];
        char a_vpid[20];
@@ -11,7 +11,7 @@
        char a_path[256]="";
        char a_host[256];
        int     i,n;
-@@ -169,7 +169,7 @@
+@@ -169,10 +169,10 @@
                                                sprintf(a_vpid,"0x%03x",recdata.vpid);  
                                                sprintf(a_apid,"0x%03x",recdata.apid);
  
@@ -19,22 +19,37 @@
 +                                              strlcpy (a_filename,a_path, sizeof(a_filename));
                                                        
                                                if (strlen(a_filename)) {
-                                                       strcat(a_filename,"/");
-@@ -185,7 +185,7 @@
+-                                                      strcat(a_filename,"/");
++                                                      strlcat(a_filename, "/", sizeof(a_filename));
+                                               }
+ 
+                                               if (strlen(recdata.channelname) > 0)
+@@ -185,8 +185,8 @@
                                                                }
                                                        } while (*p_act);
                                                                
 -                                                      strcat(a_filename, recdata.channelname);
-+                                                      strlcat(a_filename, recdata.channelname, 20);
-                                                       strcat(a_filename, "_");
+-                                                      strcat(a_filename, "_");
++                                                      strlcat(a_filename, recdata.channelname, sizeof(a_filename));
++                                                      strlcat(a_filename, "_", sizeof(a_filename));
                                                }
  
-@@ -206,7 +206,7 @@
+                                               if (strlen(recdata.epgtitle) > 0)
+@@ -206,13 +206,13 @@
                                                                }
                                                        } while (*p_act++);
                                                        
 -                                                      strcat(a_filename, recdata.epgtitle);
-+                                                      strlcat(a_filename, recdata.epgtitle, 80);
-                                                       strcat(a_filename, "_");
+-                                                      strcat(a_filename, "_");
++                                                      strlcat(a_filename, recdata.epgtitle, sizeof(a_filename));
++                                                      strlcat(a_filename, "_", sizeof(a_filename));
                                                }
  
+                                               t = time (&t);
+-                                              strftime (buf, sizeof(a_filename)-1, "%Y%m%d_%H%M%S", localtime(&t));
+-                                              strcat(a_filename, buf);
++                                              strftime (buf, 20, "%Y%m%d_%H%M%S", localtime(&t));
++                                              strlcat(a_filename, buf, sizeof(a_filename));
+ 
+                                               pid = fork();
+                                               if (pid == -1) {