Update to 2.7nb1 by applying the patches from PR 11019.

Patches by Love <lha@stacken.kth.se>
PR 11019 by Manuel Bouyer <bouyer@antioche.lip6.fr>

10 files changed, 260 insertions, 21 deletions

diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 190b4dbe1f4..3c0ebc53e1d 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2000/09/09 19:40:19 fredb Exp $
+# $NetBSD: Makefile,v 1.30 2000/12/16 05:44:09 hubertf Exp $
 #
 
 DISTNAME=	sdr-2.7
+PKGNAME=	sdr-2.7nb1
 CATEGORIES=	mbone tk
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/
 
diff --git a/mbone/sdr/files/patch-sum b/mbone/sdr/files/patch-sum
index 89840c64e9e..9a62f4fcae7 100644
--- a/mbone/sdr/files/patch-sum
+++ b/mbone/sdr/files/patch-sum
@@ -1,15 +1,20 @@
-$NetBSD: patch-sum,v 1.6 2000/09/08 18:58:06 jwise Exp $
+$NetBSD: patch-sum,v 1.7 2000/12/16 05:44:09 hubertf Exp $
 
 MD5 (patch-aa) = b10166bf243215b706006e9b5255f208
 MD5 (patch-ab) = 5d1e2bf629f06344db61bba29d14b555
 MD5 (patch-ac) = 7656af3a62b4d9f484c08f104e6cfbe4
-MD5 (patch-ad) = 187f5933b17dec6851226c55c3753214
+MD5 (patch-ad) = 0788ed50bc486b8696973cdec15a7fb9
 MD5 (patch-ae) = ac995ca267ba84c0c8ccf1821d701a2f
 MD5 (patch-af) = 57049a2f39ff9704aaf964792c99b8be
 MD5 (patch-ag) = 39d8bba57d173535e94fb16b789fb9dc
 MD5 (patch-ah) = 63512e42ca7b6a2c16e5440841b5f3ed
-MD5 (patch-aj) = 616a9c2ae2efc53196a94d2a89019a8c
+MD5 (patch-aj) = c9f0b3d94da841f51c78a5ab7db034c4
 MD5 (patch-ak) = d013192600f69a313d6477ef47fac6de
 MD5 (patch-ao) = 5cbb4d6c6d77e02bd885307fdd406d4c
 MD5 (patch-ap) = c9452823b714e453e5b42350f65c508d
-MD5 (patch-aq) = 077a08610809ac7f777bf59a0cf58c9e
+MD5 (patch-aq) = 98d9f4ac14d74f276ad49be038d27e33
+MD5 (patch-ar) = f290a4b548a2faab4df242e5d9f719e0
+MD5 (patch-as) = ffd7bd7a7fe0586d859dfa991796cdc5
+MD5 (patch-at) = 03c069c0d9480157ba79d179ff13a394
+MD5 (patch-au) = b408b90d8850f29fcdb57c6a0e52393b
+MD5 (patch-av) = 1da26deb87da30fac7a3089514634f1d
diff --git a/mbone/sdr/patches/patch-ad b/mbone/sdr/patches/patch-ad
index 3d0bb27ee2e..4ad5f7bdd7b 100644
--- a/mbone/sdr/patches/patch-ad
+++ b/mbone/sdr/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.8 1999/10/28 02:40:24 hubertf Exp $
+$NetBSD: patch-ad,v 1.9 2000/12/16 05:44:09 hubertf Exp $
 
 --- sdr/src/sd_listen.c.orig	Fri Jul 16 15:07:27 1999
-+++ sdr/src/sd_listen.c	Sat Oct  2 20:42:45 1999
++++ sdr/src/sd_listen.c	Wed Dec 13 01:45:34 2000
 @@ -55,6 +55,9 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -12,6 +12,15 @@ $NetBSD: patch-ad,v 1.8 1999/10/28 02:40:24 hubertf Exp $
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <setjmp.h>
+@@ -369,7 +372,7 @@
+ /* Note "symm" is asymmetrically and "crypt" is symmetrically encrypted ! */
+ 
+     if (strcmp(argv[2], "symm")==0) {
+-      Tcl_Eval(interp, "pgpstate");
++      sdr_Tcl_Eval(interp, "pgpstate");
+       if (strcmp(interp->result,"1") != 0) {
+         writelog(printf("PGPSTATE != 1: Not loading %s\n",argv[1]);)
+         retval = 0;
 @@ -515,10 +518,18 @@
  /* set p to point to line following "n=....\nk=...\n" */
  
@@ -32,7 +41,61 @@ $NetBSD: patch-ad,v 1.8 1999/10/28 02:40:24 hubertf Exp $
            key[0]='\0';
          }
  	p=strchr(k1, '\n')+1;
-@@ -1383,7 +1394,11 @@
+@@ -698,7 +709,7 @@
+ 
+ /* this is X.509 code and hasn't been checked or tested yet */
+ 
+-	      Tcl_Eval(interp, "x509state");
++	      sdr_Tcl_Eval(interp, "x509state");
+ 	      if (strcmp(interp->result,"1") == 0) {
+                 irand = (lbl_random()&0xffff);
+ 		authstatus= check_x509_authentication(auth_hdr,
+@@ -917,7 +928,7 @@
+ 
+ /* this is for the X.509 encryption and hasn't been checked */
+ 
+-	      Tcl_Eval(interp, "x509state");
++	      sdr_Tcl_Eval(interp, "x509state");
+               if (strcmp(interp->result,"1") == 0) {
+ 	        irand = (lbl_random()&0xffff);
+ 		encstatus_p = \
+@@ -1014,7 +1025,7 @@
+ 
+ /* check whether the x509state variable is on - if not then ignore the auth */
+ 
+-                  Tcl_Eval(interp, "x509state");
++                  sdr_Tcl_Eval(interp, "x509state");
+ 
+                   if (strcmp(interp->result,"1") == 0) {
+ 
+@@ -1110,6 +1121,17 @@
+       return TCL_OK;
+ }
+ 
++int
++sdr_Tcl_Eval (Tcl_Interp *interp, char *script)
++{
++    char *copy = strdup (script);
++    int ret;
++    if (copy == NULL) abort();
++    ret = Tcl_Eval (interp, copy);
++    free (copy);
++    return ret;
++}
++
+ 
+ /* ---------------------------------------------------------------------- */
+ /* main                                                                   */
+@@ -1362,7 +1384,7 @@
+ /* load the cached sessions */
+ 
+     Tcl_CreateCommand(interp, "load_cache_entry", load_cache_entry, 0, 0);
+-    Tcl_Eval(interp, "load_from_cache");
++    sdr_Tcl_Eval(interp, "load_from_cache");
+ 
+     /*register our location with a SIP server (if desired)*/
+     sip_register();
+@@ -1383,7 +1405,11 @@
      if (cli) {
        init_cli();
        inChannel = fileno(stdin);
@@ -44,7 +107,25 @@ $NetBSD: patch-ad,v 1.8 1999/10/28 02:40:24 hubertf Exp $
      }
  #endif
  
-@@ -1507,7 +1522,11 @@
+@@ -1403,7 +1429,7 @@
+ 	    ui_visible=FALSE;
+ 	  }
+       }
+-    Tcl_Eval(interp, "write_cache");
++    sdr_Tcl_Eval(interp, "write_cache");
+     clean_up_and_die();
+     return(0);
+ }
+@@ -1426,7 +1452,7 @@
+ void remove_interface()
+ {
+   ui_visible=FALSE;
+-/*  Tcl_Eval(interp, "write_cache");*/
++/*  sdr_Tcl_Eval(interp, "write_cache");*/
+ /*  signal(SIGPIPE, remove_interface);*/
+ }
+ void rebuild_interface()
+@@ -1507,7 +1533,11 @@
      unsigned long src, hfrom;
      unsigned long endtime;
  
@@ -56,3 +137,30 @@ $NetBSD: patch-ad,v 1.8 1999/10/28 02:40:24 hubertf Exp $
  
      writelog(printf("entered recv_packets\n");)
  
+@@ -1633,7 +1663,7 @@
+ 
+ /* don't try to decrypt it if PGPSTATE isn't set */
+ 
+-          Tcl_Eval(interp, "pgpstate");
++          sdr_Tcl_Eval(interp, "pgpstate");
+           if (strcmp(interp->result,"1") == 0) {
+             if (check_encryption(enc_p,data,length,enc_asym_keyid,encmessage,ENCMESSAGELEN,addata, enctype) != 0) {
+               strcpy(encstatus_p,"failed");
+@@ -1656,7 +1686,7 @@
+ 
+           memcpy(enctype,"x509",4);
+           strcpy(recvkey,"");
+-          Tcl_Eval(interp, "x509state");
++          sdr_Tcl_Eval(interp, "x509state");
+           irand = (lbl_random()&0xffff);
+           if (strcmp(interp->result,"1") == 0) {
+             encstatus_p=check_x509_encryption(enc_p,
+@@ -1806,7 +1836,7 @@
+ 
+ /* PKCS7 authentication used - this hasn't been checked */
+ 
+-        Tcl_Eval(interp, "x509state");
++        sdr_Tcl_Eval(interp, "x509state");
+ 
+         if (strcmp(interp->result,"1") == 0) {
+           irand = (lbl_random()&0xffff);
diff --git a/mbone/sdr/patches/patch-aj b/mbone/sdr/patches/patch-aj
index 0d7f16f22e1..5bf9599dc08 100644
--- a/mbone/sdr/patches/patch-aj
+++ b/mbone/sdr/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.3 1999/10/28 02:40:24 hubertf Exp $
+$NetBSD: patch-aj,v 1.4 2000/12/16 05:44:09 hubertf Exp $
 
 --- sdr/src/sdr.h.orig	Tue May 25 17:59:36 1999
-+++ sdr/src/sdr.h	Sat Oct  2 20:47:38 1999
++++ sdr/src/sdr.h	Wed Dec 13 01:45:53 2000
 @@ -158,7 +158,7 @@
  
  /*Missing Prototypes*/
@@ -11,3 +11,10 @@ $NetBSD: patch-aj,v 1.3 1999/10/28 02:40:24 hubertf Exp $
  int gethostname(char * name, size_t namelen);
  #endif
  
+@@ -299,3 +299,6 @@
+ #undef interface
+ #endif
+ #endif
++
++int
++sdr_Tcl_Eval (Tcl_Interp *interp, char *script);
diff --git a/mbone/sdr/patches/patch-aq b/mbone/sdr/patches/patch-aq
index a6d1f3fd7bc..853ae23f536 100644
--- a/mbone/sdr/patches/patch-aq
+++ b/mbone/sdr/patches/patch-aq
@@ -1,12 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2000/10/21 22:47:25 wiz Exp $
---- sdr/src/Makefile.template.orig	Fri Sep  8 14:19:35 2000
-+++ sdr/src/Makefile.template	Fri Sep  8 14:20:04 2000
-@@ -88,7 +88,7 @@
- $(SDR_UI_FILES): tcl2c
+$NetBSD: patch-aq,v 1.3 2000/12/16 05:44:09 hubertf Exp $
+
+--- sdr/src/pgp_crypt.c.orig	Tue May 25 16:52:35 1999
++++ sdr/src/pgp_crypt.c	Wed Dec 13 01:43:09 2000
+@@ -328,7 +328,7 @@
  
- parsed_plugins.tcl: ../src/plugin2tcl.tcl
--	tclsh8.0 ../src/plugin2tcl.tcl
-+	tclsh ../src/plugin2tcl.tcl
+ /* Extract the signature and store in files */
  
- uweb: $(WWWOBJS)
- 	$(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
+-  Tcl_Eval(interp, "pgpstate");
++  sdr_Tcl_Eval(interp, "pgpstate");
+   if (strcmp(interp->result,"1") == 0) {
+ 
+ /* signature file - irand.sig */
diff --git a/mbone/sdr/patches/patch-ar b/mbone/sdr/patches/patch-ar
new file mode 100644
index 00000000000..63c6e42f51b
--- /dev/null
+++ b/mbone/sdr/patches/patch-ar
@@ -0,0 +1,12 @@
+$NetBSD: patch-ar,v 1.1 2000/12/16 05:44:09 hubertf Exp $
+
+--- sdr/src/plugins.tcl.orig	Thu Jul 15 15:55:13 1999
++++ sdr/src/plugins.tcl	Wed Dec 13 02:17:26 2000
+@@ -84,6 +84,7 @@
+ 	}
+ 	set tag [string trim [lindex [split $line ":"] 0]]
+ 	set value [string trim [join [lrange [split $line ":"] 1 end] ":"]]
++        set value [string map { \$ \\\$ } $value ]
+ 	switch $tag {
+ 
+ 	    "@define" {
diff --git a/mbone/sdr/patches/patch-as b/mbone/sdr/patches/patch-as
new file mode 100644
index 00000000000..35b4d34f7f3
--- /dev/null
+++ b/mbone/sdr/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2000/12/16 05:44:10 hubertf Exp $
+
+--- sdr/src/ui_fns.c.orig	Thu Jul 15 15:55:15 1999
++++ sdr/src/ui_fns.c	Wed Dec 13 01:44:18 2000
+@@ -222,7 +222,7 @@
+   u_int base;
+   char buf[128];
+ 
+-  Tcl_Eval(interp, "clock format [clock seconds] -format %w");
++  sdr_Tcl_Eval(interp, "clock format [clock seconds] -format %w");
+   base = atoi(interp->result);
+   for(i=0;i<7;i++)
+     {
+@@ -234,7 +234,7 @@
+       Tcl_Eval(interp, buf);
+       strncpy(longdaynames[(base + i) % 7], interp->result, 20);
+     }
+-  Tcl_Eval(interp, "clock scan 1/1");
++  sdr_Tcl_Eval(interp, "clock scan 1/1");
+   base = atoi(interp->result);
+   for(i=0;i<12;i++)
+     {
diff --git a/mbone/sdr/patches/patch-at b/mbone/sdr/patches/patch-at
new file mode 100644
index 00000000000..940152feac5
--- /dev/null
+++ b/mbone/sdr/patches/patch-at
@@ -0,0 +1,39 @@
+$NetBSD: patch-at,v 1.1 2000/12/16 05:44:10 hubertf Exp $
+
+--- sdr/src/www_fns.c.orig	Tue May 25 23:28:19 1999
++++ sdr/src/www_fns.c	Wed Dec 13 01:44:31 2000
+@@ -194,7 +194,7 @@
+ 	free(uri);
+ 
+       Tcl_SetVar2(interp, "webstatus", NULL, "Connecting...", TCL_GLOBAL_ONLY);
+-      Tcl_Eval(interp, "webstatus");
++      sdr_Tcl_Eval(interp, "webstatus");
+       while (Tk_DoOneEvent(TK_DONT_WAIT)) ;
+ #ifdef MSG_EOF
+ try_again:
+@@ -335,7 +335,7 @@
+ 		sendmsg(fd, &msg, 0);
+ #endif
+ 		Tcl_SetVar2(interp, "webstatus", NULL, "Receiving...", TCL_GLOBAL_ONLY);
+-		Tcl_Eval(interp, "webstatus");
++		sdr_Tcl_Eval(interp, "webstatus");
+ 		webstate = READING;
+ 		continue;
+ 	      }
+@@ -353,13 +353,13 @@
+ /*  	      sprintf(msg, "Read %d bytes", webdatalen);  */
+ /*	      printf("%s", msg); */
+ /*	      Tcl_SetVar2(interp, "webstatus", NULL, msg, TCL_GLOBAL_ONLY); */
+-/*	      if(Tcl_Eval(interp, "webstatus")!=0) {printf("%s\n", interp->result);} */
++/*	      if(sdr_Tcl_Eval(interp, "webstatus")!=0) {printf("%s\n", interp->result);} */
+ #endif
+-	      Tcl_Eval(interp, "update");
++	      sdr_Tcl_Eval(interp, "update");
+ 	    }
+ 	  else 
+ 	    {
+-	      Tcl_Eval(interp, "show_active");
++	      sdr_Tcl_Eval(interp, "show_active");
+ 	      while (Tk_DoOneEvent(TK_DONT_WAIT)) ;
+ 	    }
+ 	}
diff --git a/mbone/sdr/patches/patch-au b/mbone/sdr/patches/patch-au
new file mode 100644
index 00000000000..bf6741d6c46
--- /dev/null
+++ b/mbone/sdr/patches/patch-au
@@ -0,0 +1,31 @@
+$NetBSD: patch-au,v 1.1 2000/12/16 05:44:10 hubertf Exp $
+
+--- sdr/src/www_ui_init.c.orig	Wed May 19 18:05:10 1999
++++ sdr/src/www_ui_init.c	Wed Dec 13 01:44:54 2000
+@@ -235,7 +235,7 @@
+ 	msg = interp->result;
+     }
+     fprintf(stderr, "%s\n", msg);
+-    Tcl_Eval(interp, errorExitCmd);
++    sdr_Tcl_Eval(interp, errorExitCmd);
+     return 1;			/* Needed only to prevent compiler warnings. */
+ #endif
+ }
+@@ -277,7 +277,7 @@
+     if (count <= 0) {
+ 	if (!gotPartial) {
+ 	    if (tty) {
+-		Tcl_Eval(interp, "exit");
++		sdr_Tcl_Eval(interp, "exit");
+ 		exit(1);
+ 	    } else {
+ 		Tk_DeleteFileHandler(0);
+@@ -366,7 +366,7 @@
+ 	    fputs("% ", stdout);
+ 	}
+     } else {
+-	code = Tcl_Eval(interp, promptCmd);
++	code = sdr_Tcl_Eval(interp, promptCmd);
+ 	if (code != TCL_OK) {
+ 	    Tcl_AddErrorInfo(interp,
+ 		    "\n    (script that generates prompt)");
diff --git a/mbone/sdr/patches/patch-av b/mbone/sdr/patches/patch-av
new file mode 100644
index 00000000000..cd1be134512
--- /dev/null
+++ b/mbone/sdr/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2000/12/16 05:44:10 hubertf Exp $
+
+--- sdr/src/Makefile.template.orig	Wed Dec 13 03:22:58 2000
++++ sdr/src/Makefile.template	Wed Dec 13 03:23:05 2000
+@@ -88,7 +88,7 @@
+ $(SDR_UI_FILES): tcl2c
+ 
+ parsed_plugins.tcl: ../src/plugin2tcl.tcl
+-	tclsh8.0 ../src/plugin2tcl.tcl
++	tclsh ../src/plugin2tcl.tcl
+ 
+ uweb: $(WWWOBJS)
+ 	$(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)