Upgrade sdr to 2.4a7 (with the TU Dresden Multimedia Reference Center bug

fixes added).

6 files changed, 125 insertions, 129 deletions

diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index c91e49d04f3..9b1016bc41e 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:45 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/06/18 10:45:54 is Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp 
 #
 
-DISTNAME=	sdr.V2.3a1
-PKGNAME=	sdr-2.3a1
+DISTNAME=	sdr.V2.4a7n
+PKGNAME=	sdr-2.4a7-mmrz
 CATEGORIES=	mbone tk80
-MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/sdr/
+MASTER_SITES=	http://north.east.isi.edu/sdr/
 
 MAINTAINER=	is@netbsd.org
 
 DEPENDS+=	tk-8.0p2:../../x11/tk80
 
-RESTRICTED=	"Contains DES encryption"
 MIRROR_DISTFILE=	no
 NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
diff --git a/mbone/sdr/files/md5 b/mbone/sdr/files/md5
index 16ca8bea6b9..70c9e237f68 100644
--- a/mbone/sdr/files/md5
+++ b/mbone/sdr/files/md5
@@ -1 +1 @@
-MD5 (sdr.V2.3a1.tar.gz) = cfb72a33293aa307f3fece21582332ba
+MD5 (sdr.V2.4a7n.tar.gz) = 3131d934134fccaa81662ac951fdb604
diff --git a/mbone/sdr/patches/patch-aa b/mbone/sdr/patches/patch-aa
index add248cf4c7..4006f4b1ded 100644
--- a/mbone/sdr/patches/patch-aa
+++ b/mbone/sdr/patches/patch-aa
@@ -5,117 +5,8 @@ diff -ru ../original/src/Makefile.template ./src/Makefile.template
  $(SDR_UI_FILES): tcl2c
  
  parsed_plugins.tcl: ../src/plugin2tcl.tcl
--	tclsh7.5 ../src/plugin2tcl.tcl
+-	tclsh7.6 ../src/plugin2tcl.tcl
 +	tclsh8.0 ../src/plugin2tcl.tcl
  
  libs.tcl: $(TK_LIBRARY_FILES)
  	cat $(TK_LIBRARY_FILES) | sed '/^[      ]*source[       ]/d' > libs.tcl
-diff -ru ../original/src/iohandler.c ./src/iohandler.c
---- ../original/src/iohandler.c	Tue Oct 29 15:52:25 1996
-+++ ./src/iohandler.c	Tue Nov 18 15:06:30 1997
-@@ -131,7 +131,7 @@
-         }
- 	sockproc[fd] = callback;
- #else
--	Tcl_CreateFileHandler(Tcl_GetFile((ClientData)fd, TCL_UNIX_FD),
-+	Tcl_CreateFileHandler(fd,
- 			      mask, callback, (ClientData)fd);
- #endif
- }
-@@ -144,6 +144,6 @@
- 		(void) WSAAsyncSelect(fd, sockwin, 0, 0);
- 	}
- #else
--	Tcl_DeleteFileHandler(Tcl_GetFile((ClientData)fd, TCL_UNIX_FD));
-+	Tcl_DeleteFileHandler(fd);
- #endif
- }
-diff -ru ../original/src/qfdes/qfDES-memory.c ./src/qfdes/qfDES-memory.c
---- ../original/src/qfdes/qfDES-memory.c	Fri Sep 27 17:23:28 1996
-+++ ./src/qfdes/qfDES-memory.c	Tue Nov 18 16:50:44 1997
-@@ -12,23 +12,34 @@
- 
- #include <stdio.h>
- #include <memory.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include "qfDES.h"
- 
-+#if defined(USE_PERROR)
-+#include <errno.h>
-+#else
- #ifndef DEFINED_ERRLIST
-  extern int sys_nerr;
-  extern char *sys_errlist[];
- #endif
- extern int errno;
-+#endif
- 
--
-+#if defined(USE_PERROR)
-+#if defined(DEBUG)
-+#define ERROR(s_) perror(s_ ", file " __FILE__ ", line " __LINE__)
-+#else
-+#define ERROR(s_) perror(s_)
-+#endif
-+#else
- #if defined(DEBUG)
- #define ERROR(s_) \
-     fprintf(stderr, "%s: errno %d - %s [%s line %d]\n", s_, errno, errno < sys_nerr ? sys_errlist[errno] : "???", __FILE__, __LINE__)
- #else
- #define ERROR(s_) \
-     fprintf(stderr, "%s: errno %d - %s\n", s_, errno, errno < sys_nerr ? sys_errlist[errno] : "???")
-+#endif
- #endif
- 
- extern
-diff -ru ../original/src/sdr.h ./src/sdr.h
---- ../original/src/sdr.h	Fri Nov  1 10:57:45 1996
-+++ ./src/sdr.h	Tue Nov 18 15:06:29 1997
-@@ -8,9 +8,6 @@
- #include <winsock.h>
- #else
- #include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--#include <net/if.h>
- #include <sys/ioctl.h>
- #include <netdb.h>
- #include <pwd.h>
-@@ -18,6 +15,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <ctype.h>
-+#include <netinet/in.h>
-+#include <net/if.h>
-+#include <arpa/inet.h>
- #include <arpa/nameser.h>
- #include <resolv.h>
- #ifdef AIX41
-@@ -26,7 +26,6 @@
- #endif
- #include <tcl.h>
- #include <tk.h>
--#include <malloc.h>
- #include <string.h>
- #include <fcntl.h>
- #include <errno.h>
-@@ -147,10 +146,17 @@
- };
-   
- struct sap_header {
-+#if BYTE_ORDER == BIG_ENDIAN
-   u_int version:3;
-   u_int type:3;
-   u_int enc:1;
-   u_int compress:1;
-+#else
-+  u_int compress:1;
-+  u_int enc:1;
-+  u_int type:3;
-+  u_int version:3;
-+#endif
-   u_int authlen:8;
-   u_int msgid:16;
-   u_int src;
diff --git a/mbone/sdr/patches/patch-ab b/mbone/sdr/patches/patch-ab
index 426691b680f..2040431cd91 100644
--- a/mbone/sdr/patches/patch-ab
+++ b/mbone/sdr/patches/patch-ab
@@ -1,15 +1,6 @@
---- ../../original/src/sip.c	Tue Oct 29 16:37:28 1996
-+++ src/sip.c	Tue Nov 18 17:41:31 1997
-@@ -213,7 +213,7 @@
- #ifndef WIN32
- 	{
- 	  char buf[200];
--	  int ans[500];
-+	  u_int32_t ans[500];
- 	  int ctr;
- 	  char *tstr, *resstr;
- 	  struct dnshdr *dnsa;
-@@ -222,7 +222,7 @@
+--- /tmp/newsdr/src/sip_common.c	Tue Apr 29 23:48:25 1997
++++ src/sip_common.c	Wed Jun 17 16:53:24 1998
+@@ -211,7 +211,7 @@
  	  len=res_mkquery(QUERY, hostname, C_IN, T_MX, NULL, NULL, 
  			  NULL, buf, 200);
  	  if (len==-1) perror("res_mkquery");
@@ -18,7 +9,7 @@
  	  if (len==-1) perror("res_send");
  	  ans[0]=htonl(ans[0]);
  	  ans[1]=htonl(ans[1]);
-@@ -294,7 +294,8 @@
+@@ -283,7 +283,8 @@
  		    } else {
  		      /*it's compressed*/
  		        if(*tstr==0) tstr+=2;
diff --git a/mbone/sdr/patches/patch-ag b/mbone/sdr/patches/patch-ag
new file mode 100644
index 00000000000..a439e784bce
--- /dev/null
+++ b/mbone/sdr/patches/patch-ag
@@ -0,0 +1,20 @@
+--- /tmp/newsdr/src/tcl_nocrypt_modules.h	Fri Jun 13 22:01:40 1997
++++ src/tcl_nocrypt_modules.h	Wed Jun 17 17:05:04 1998
+@@ -12,7 +12,7 @@
+ 
+ #define MAX_TCL_MODULE 10
+ 
+-const char *modname[MAX_TCL_MODULE]=
++char *modname[MAX_TCL_MODULE]=
+ {"tcl_generic", "tcl_www", "tcl_new", "tcl_start_tools",
+  "tcl_parsed_plugins", "tcl_plugins", "tcl_sip", "tcl_sdp", "tcl_cache",
+  "tcl_sdr"};
+@@ -24,7 +24,7 @@
+ 
+ #define MAX_UI_FN 20
+ 
+-const char *ui_fn_name[MAX_UI_FN]=
++char *ui_fn_name[MAX_UI_FN]=
+ {
+   "ui_generate_port",
+   "generate_id",
diff --git a/mbone/sdr/patches/patch-ah b/mbone/sdr/patches/patch-ah
new file mode 100644
index 00000000000..aeece09f841
--- /dev/null
+++ b/mbone/sdr/patches/patch-ah
@@ -0,0 +1,95 @@
+--- /tmp/src/sdr.tcl	Tue Jan 20 22:04:15 1998
++++ src/sdr.tcl	Wed Jun 17 16:05:59 1998
+@@ -2,6 +2,7 @@
+ #Copyright University College London 1995, 1996
+ #see ui_fns.c for information on usage and redistribution of this file
+ #and for a DISCLAIMER OF ALL WARRANTIES.
++#changes for record C.Fleck 12/97
+ 
+ set initWait 400
+ set last_widget foo
+@@ -584,9 +585,9 @@
+ 	  set interval [parse_rpt_time [lindex $repeat($i,$r) 0]]
+ 	  if {$interval>0} {
+ 	      set duration [parse_rpt_time [lindex $repeat($i,$r) 1]]
+-	      # If the duration is longer than or equal to the interval, then it
++	      # If the duration is longer than the interval, then it
+ 	      # effectively means "the whole time".
+-	      if {$duration >= $interval} {
++	      if {$duration > $interval} {
+ 		  # XXX
+ 		  # Need to increment the start of the session by the
+ 		  # first offset if it's not 0.
+@@ -1155,11 +1156,7 @@
+ after 120000 timeout_expired_sessions
+ 
+ proc popdown {aid} {
+-    global ldata
+     set wname .desc$aid
+-    global [set wname].f.visible
+-    unset [set wname].f.visible
+-    set $ldata($aid,is_popped) -1
+     highlight_tag $aid popdown
+     catch "destroy $wname"
+     update
+@@ -1956,10 +1953,10 @@
+ 	  start_recorder $aid $file $rname
+ 	  destroy .record
+ 	} else {
+-	  timedmsgpopup [tt "Recording Prepared"] \
+-	      "[tt "The recording will start at "$ldata($aid,tfrom)" 6000
++# C.Fleck
++          timedmsgpopup [tt "Recording Prepared"] "" 3000
++# end
+ 	  msgpopup [tt "Error"] [tt "feature is not yet implemented - sorry"]
+-	  
+ 	  destroy .record
+ 	}
+     }
+@@ -3130,7 +3127,7 @@
+ 	    incr mon -12
+ 	    incr year
+ 	}
+-#	set cal [exec cal $mon $year]
++	set cal [exec cal $mon $year]
+ 	.cal.f0.c addtag mon$i withtag \
+ 	    [.cal.f0.c create text [expr $i*$fw*32] 0 -anchor nw\
+              -fill $fg -font $font]
+--- /tmp/src/new.tcl	Tue May 13 01:00:32 1997
++++ src/new.tcl	Wed Jun 17 16:00:59 1998
+@@ -3,6 +3,7 @@
+ #new.tcl Copyright (c) 1995 University College London
+ #see ui_fns.c for information on usage and redistribution of this file
+ #and for a DISCLAIMER OF ALL WARRANTIES.
++#changes for scopes scrollbar C.Fleck 12/97
+ 
+ proc new {aid} {
+     global ifstyle ldata
+@@ -380,8 +381,15 @@
+     pack .new.f3.admin.l -side top -anchor w
+     frame .new.f3.admin.f -relief sunken -borderwidth 1
+     pack .new.f3.admin.f -side top -fill both -expand true
+-    text .new.f3.admin.f.lb -width 15 -height 6 -relief flat -wrap none
++# C.Fleck
++    text .new.f3.admin.f.lb -width 35 -height 5 -relief flat\
++         -relief sunken -borderwidth 1 -yscroll ".new.f3.admin.f.sb set" \
++         -highlightthickness 0
++    scrollbar .new.f3.admin.f.sb -borderwidth 1 -command ".new.f3.admin.f.lb yview" \
++         -highlightthickness 0
++    pack .new.f3.admin.f.sb -side right -fill y -expand true
+     pack .new.f3.admin.f.lb -side top -fill both -expand true
++# end
+     for {set i 0} {$i < $zone(no_of_zones)} {incr i} {
+ 	.new.f3.admin.f.lb insert [expr $i+1].0 "$zone(name,$i)"
+ 	.new.f3.admin.f.lb tag add line$i [expr $i+1].0 end-1c
+@@ -431,7 +439,9 @@
+ 
+ Specify the smallest scope that will reach the people you want to communicate with."]
+ 
+-    label .new.f3.rr.l -text [tt "Scope"]
++# C.Fleck
++    label .new.f3.rr.l -text [tt "Scope:"]
++# end
+     radiobutton .new.f3.rr.r1 -relief flat -text [tt "Site"] -variable ttl\
+ 	-highlightthickness 0 \
+ 	-value 15 -command {disable_scope_entry 15}