summaryrefslogtreecommitdiff
path: root/mbone
diff options
context:
space:
mode:
Diffstat (limited to 'mbone')
-rw-r--r--mbone/sdr/Makefile25
-rw-r--r--mbone/sdr/files/md54
-rw-r--r--mbone/sdr/files/patch-sum24
-rw-r--r--mbone/sdr/patches/patch-aa26
-rw-r--r--mbone/sdr/patches/patch-ab55
-rw-r--r--mbone/sdr/patches/patch-ac45
-rw-r--r--mbone/sdr/patches/patch-ad190
-rw-r--r--mbone/sdr/patches/patch-ae13
-rw-r--r--mbone/sdr/patches/patch-af10
-rw-r--r--mbone/sdr/patches/patch-ag13
-rw-r--r--mbone/sdr/patches/patch-ah11
-rw-r--r--mbone/sdr/patches/patch-aj20
-rw-r--r--mbone/sdr/patches/patch-ak31
-rw-r--r--mbone/sdr/patches/patch-ao15
-rw-r--r--mbone/sdr/patches/patch-ap17
-rw-r--r--mbone/sdr/patches/patch-aq13
-rw-r--r--mbone/sdr/patches/patch-ar12
-rw-r--r--mbone/sdr/patches/patch-as22
-rw-r--r--mbone/sdr/patches/patch-at39
-rw-r--r--mbone/sdr/patches/patch-au31
-rw-r--r--mbone/sdr/patches/patch-av13
21 files changed, 92 insertions, 537 deletions
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 3c0ebc53e1d..055a3844347 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.30 2000/12/16 05:44:09 hubertf Exp $
+# $NetBSD: Makefile,v 1.31 2000/12/17 09:39:53 hubertf Exp $
#
-DISTNAME= sdr-2.7
-PKGNAME= sdr-2.7nb1
+DISTNAME= sdr-3.0
CATEGORIES= mbone tk
-MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.7/
+MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/
MAINTAINER= is@netbsd.org
HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/
DEPENDS+= tk-8.3.2:../../x11/tk
+DEPENDS+= common-mml>=1.2.0:../common-mml
CRYPTO= yes
USE_GMAKE= yes
@@ -24,23 +24,20 @@ MAKE_FLAGS+= EXTRA_FLAGS="${EXTRA_FLAGS}"
.if ${OPSYS} == "SunOS"
SYSDIR= solaris
.else
-SYSDIR= netbsd
+SYSDIR= freebsd
.endif
+WRKSRC= ${WRKDIR}/sdr/${SYSDIR}
+USE_GMAKE= yes
+
do-configure:
- cd ${WRKSRC}/common ; ${SH} ./configure
+ cd ${WRKSRC} ; ${SH} ./configure
.if ${OPSYS} == "SunOS"
+ # Untested for sdr 3.0 !!!
${CAT} ${WRKSRC}/sdr/solaris/Makefile.solaris ${WRKSRC}/sdr/src/Makefile.template > ${WRKSRC}/sdr/solaris/Makefile
-.else
- ${MKDIR} ${WRKSRC}/sdr/netbsd
- ${CAT} ${FILESDIR}/Makefile.netbsd ${WRKSRC}/sdr/src/Makefile.template > ${WRKSRC}/sdr/netbsd/Makefile
.endif
-do-build:
- cd ${WRKSRC}/common ; ${GMAKE}
- cd ${WRKSRC}/sdr/${SYSDIR} ; ${GMAKE}
-
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sdr/${SYSDIR}/sdr ${PREFIX}/bin/sdr
+ ${INSTALL_PROGRAM} ${WRKSRC}/sdr ${PREFIX}/bin/sdr
.include "../../mk/bsd.pkg.mk"
diff --git a/mbone/sdr/files/md5 b/mbone/sdr/files/md5
index 919d2499057..7c5047975ae 100644
--- a/mbone/sdr/files/md5
+++ b/mbone/sdr/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/10/04 20:57:00 is Exp $
+$NetBSD: md5,v 1.6 2000/12/17 09:39:53 hubertf Exp $
-MD5 (sdr-2.7.tar.gz) = da28a7a960007af129673997da945c0d
+MD5 (sdr-3.0.tar.gz) = 905eeb8c4c9ad304e35728c95556fff0
diff --git a/mbone/sdr/files/patch-sum b/mbone/sdr/files/patch-sum
index 9a62f4fcae7..df57c62b980 100644
--- a/mbone/sdr/files/patch-sum
+++ b/mbone/sdr/files/patch-sum
@@ -1,20 +1,6 @@
-$NetBSD: patch-sum,v 1.7 2000/12/16 05:44:09 hubertf Exp $
+$NetBSD: patch-sum,v 1.8 2000/12/17 09:39:53 hubertf Exp $
-MD5 (patch-aa) = b10166bf243215b706006e9b5255f208
-MD5 (patch-ab) = 5d1e2bf629f06344db61bba29d14b555
-MD5 (patch-ac) = 7656af3a62b4d9f484c08f104e6cfbe4
-MD5 (patch-ad) = 0788ed50bc486b8696973cdec15a7fb9
-MD5 (patch-ae) = ac995ca267ba84c0c8ccf1821d701a2f
-MD5 (patch-af) = 57049a2f39ff9704aaf964792c99b8be
-MD5 (patch-ag) = 39d8bba57d173535e94fb16b789fb9dc
-MD5 (patch-ah) = 63512e42ca7b6a2c16e5440841b5f3ed
-MD5 (patch-aj) = c9f0b3d94da841f51c78a5ab7db034c4
-MD5 (patch-ak) = d013192600f69a313d6477ef47fac6de
-MD5 (patch-ao) = 5cbb4d6c6d77e02bd885307fdd406d4c
-MD5 (patch-ap) = c9452823b714e453e5b42350f65c508d
-MD5 (patch-aq) = 98d9f4ac14d74f276ad49be038d27e33
-MD5 (patch-ar) = f290a4b548a2faab4df242e5d9f719e0
-MD5 (patch-as) = ffd7bd7a7fe0586d859dfa991796cdc5
-MD5 (patch-at) = 03c069c0d9480157ba79d179ff13a394
-MD5 (patch-au) = b408b90d8850f29fcdb57c6a0e52393b
-MD5 (patch-av) = 1da26deb87da30fac7a3089514634f1d
+MD5 (patch-aa) = 8448c8d91eef75ddf36d0ea76d9aa1a3
+MD5 (patch-ab) = 498c3c2d4d62335721791851a8a7b8c2
+MD5 (patch-ac) = bfcd00f286db2d5423e7870c8d24d607
+MD5 (patch-ad) = c9d6f5b3248847609f212153e550d144
diff --git a/mbone/sdr/patches/patch-aa b/mbone/sdr/patches/patch-aa
index 9a818c74d48..821ff099c0f 100644
--- a/mbone/sdr/patches/patch-aa
+++ b/mbone/sdr/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.8 1999/10/28 02:40:24 hubertf Exp $
+$NetBSD: patch-aa,v 1.9 2000/12/17 09:39:53 hubertf Exp $
---- sdr/src/polluted.c.orig Tue Jun 22 16:54:15 1999
-+++ sdr/src/polluted.c Sat Oct 2 20:39:08 1999
-@@ -514,7 +514,7 @@
- if (find_key_by_name(argv[6], key)!=-1) {
- strncpy(encstatus, "success", ENCSTATUSLEN);
- strncpy(encmessage,"Des has been successful", ENCMESSAGELEN);
--#ifdef NEVER
-+#ifndef NEVER
- strncpy(argv[8], "des", strlen(argv[8]));
- #else
- strcpy(argv[8], "des");
+--- Makefile.freebsd.orig Mon Sep 4 18:30:29 2000
++++ Makefile.freebsd
+@@ -1,7 +1,7 @@
+ CC = gcc -g -O
+-INCLUDES = -I/usr/X11R6/include -I../../tk-8.0/generic -I../../tcl-8.0/generic -I../../common
+-LIBS = ../../tk-8.0/unix/libtk80.a ../../tcl-8.0/unix/libtcl80.a ../../common/libuclmmbase.a -lm -L/usr/X11R6/lib -lX11 -lz $(ILIBS)
+-CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD -DHAVE_CONFIG_H $(IFLAGS)
++INCLUDES = -I${X11BASE}/include -I${LOCALBASE}/include/tk/generic -I${LOCALBASE}/include/tcl/generic -I${LOCALBASE}/include/common-mml
++LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -ltk83 -ltcl83 -luclmmbase -lm -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lz $(ILIBS)
++CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD -DHAVE_CONFIG_H $(IFLAGS) -DTcl_Eval=sdr_Tcl_Eval
+
+ all:: sdr
+ install:
diff --git a/mbone/sdr/patches/patch-ab b/mbone/sdr/patches/patch-ab
index 2dc09caab9e..c1ab00f7d86 100644
--- a/mbone/sdr/patches/patch-ab
+++ b/mbone/sdr/patches/patch-ab
@@ -1,48 +1,13 @@
-$NetBSD: patch-ab,v 1.8 1999/10/28 02:40:24 hubertf Exp $
+$NetBSD: patch-ab,v 1.9 2000/12/17 09:39:53 hubertf Exp $
---- sdr/src/sip_common.c.orig Thu Jul 15 18:00:03 1999
-+++ sdr/src/sip_common.c Sat Oct 2 20:42:19 1999
-@@ -41,6 +41,9 @@
- #include <sys/uio.h>
- #endif
+--- ../src/Makefile.template.orig Sat Dec 16 09:15:29 2000
++++ ../src/Makefile.template
+@@ -88,7 +88,7 @@
+ $(SDR_UI_FILES): tcl2c
-+#ifdef HAVE_SYS_INTTYPES_H
-+#include <inttypes.h>
-+#endif
- #include "dns.h"
- #include "prototypes.h"
- #include <tcl.h>
-@@ -252,7 +255,7 @@
- addr.s_addr=0;
- len=res_mkquery(QUERY, hostname, C_IN, T_MX, NULL, NULL, NULL, buf, 200);
- if (len==-1) perror("res_mkquery");
-- len=res_send(buf, len, ans, 2000);
-+ len=res_send(buf, len, (u_char *)ans, 2000);
- if (len==-1) perror("res_send");
- ans[0]=htonl(ans[0]);
- ans[1]=htonl(ans[1]);
-@@ -318,8 +321,8 @@
- } else {
- /*it's compressed*/
- if(*tstr==0) tstr+=2;
-- resstr += dn_expand(ans, ans+len, tstr-1, resstr,
-- 200-strlen(resstr));
-+ resstr += dn_expand((u_char *)ans, (u_char *)(ans+len),
-+ tstr-1, resstr, 200-strlen(resstr));
- tstr+=1;
- ctr=0;
- }
-@@ -1251,8 +1254,13 @@
- }
- fprintf (stderr,"clen=%d\n", clen);
- ptr=find_end_of_header(data, len);
-+#ifdef HAVE_SYS_INTTYPES_H
-+ fprintf (stderr,"eoh at %x, start at %x, len: %d\n", (intptr_t)ptr,
-+ (intptr_t)data, len);
-+#else
- fprintf (stderr,"eoh at %x, start at %x, len: %d\n", (unsigned int)ptr,
- (unsigned int)data, len);
-+#endif
-
- if (ptr==NULL) return 0;
+ parsed_plugins.tcl: ../src/plugin2tcl.tcl
+- tclsh8.0 ../src/plugin2tcl.tcl
++ tclsh ../src/plugin2tcl.tcl
+ uweb: $(WWWOBJS)
+ $(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS)
diff --git a/mbone/sdr/patches/patch-ac b/mbone/sdr/patches/patch-ac
index 66c2ddfe9bc..fba1331e116 100644
--- a/mbone/sdr/patches/patch-ac
+++ b/mbone/sdr/patches/patch-ac
@@ -1,26 +1,27 @@
-$NetBSD: patch-ac,v 1.7 1999/10/04 20:57:01 is Exp $
+$NetBSD: patch-ac,v 1.8 2000/12/17 09:39:53 hubertf Exp $
---- sdr/src/iohandler.c.orig Sun Sep 6 11:41:03 1998
-+++ sdr/src/iohandler.c Wed Nov 4 23:42:24 1998
-@@ -43,6 +43,9 @@
- #include <time.h>
- #include <winsock.h>
+--- ../src/tkUnixInit.c.orig Mon Sep 4 18:30:41 2000
++++ ../src/tkUnixInit.c
+@@ -11,3 +11,22 @@
#endif
-+#ifdef HAVE_SYS_INTTYPES_H
-+#include <inttypes.h>
+ return (TCL_OK);
+ }
++
++#ifdef __NetBSD__
++int
++sdr_Tcl_Eval (Tcl_Interp *interp, char *script)
++{
++ char *copy = strdup (script);
++ int ret;
++#ifdef __NetBSD__
++#ifdef Tcl_Eval
++#undef Tcl_Eval
++ int Tcl_Eval (Tcl_Interp *interp, char *script);
+#endif
- #include <tk.h>
- #ifdef WIN32
- #define WM_WSOCK_READY WM_USER+123
-@@ -136,7 +139,11 @@
- }
- sockproc[fd] = callback;
- #else
-+#ifdef HAVE_SYS_INTTYPES_H
-+ Tcl_CreateFileHandler(fd, mask, callback, (ClientData)(intptr_t)fd);
-+#else
- Tcl_CreateFileHandler(fd, mask, callback, (ClientData)fd);
+#endif
- #endif
- }
-
++ if (copy == NULL) abort();
++ ret = Tcl_Eval (interp, copy);
++ free (copy);
++ return ret;
++}
++#endif /* __NetBSD__ */
diff --git a/mbone/sdr/patches/patch-ad b/mbone/sdr/patches/patch-ad
index 4ad5f7bdd7b..3c73abf03d8 100644
--- a/mbone/sdr/patches/patch-ad
+++ b/mbone/sdr/patches/patch-ad
@@ -1,166 +1,30 @@
-$NetBSD: patch-ad,v 1.9 2000/12/16 05:44:09 hubertf Exp $
+$NetBSD: patch-ad,v 1.10 2000/12/17 09:39:53 hubertf Exp $
---- sdr/src/sd_listen.c.orig Fri Jul 16 15:07:27 1999
-+++ sdr/src/sd_listen.c Wed Dec 13 01:45:34 2000
-@@ -55,6 +55,9 @@
- #include <unistd.h>
- #include <fcntl.h>
- #endif
-+#ifdef HAVE_SYS_INTTYPES_H
-+#include <inttypes.h>
-+#endif
- #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" */
-
- if (strncmp(k1, "k=", 2)==0) {
-+#ifdef HAVE_SYS_INTTYPES_H
-+ if ((uintptr_t)k2>=(uintptr_t)k1+2) {
-+ memcpy(key, k1+2, (uintptr_t)k2-((uintptr_t)k1+1));
-+ key[(uintptr_t)k2-((uintptr_t)k1+1)]='\0';
-+ }
-+#else
- if ((u_int)k2>=(u_int)k1+2) {
- memcpy(key, k1+2, (u_int)k2-((u_int)k1+1));
- key[(u_int)k2-((u_int)k1+1)]='\0';
-- } else {
-+ }
-+#endif
-+ else {
- key[0]='\0';
- }
- p=strchr(k1, '\n')+1;
-@@ -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;
+--- ../src/sdr.tcl.orig Mon Sep 4 18:30:39 2000
++++ ../src/sdr.tcl
+@@ -4457,7 +4457,7 @@
+
+ # find where we are installed
+ set app_name $argv0
+-while {[file type $app_name] == "link"} {
++while {([file isfile $app_name]) && ([file type $app_name] == "link")} {
+ # don't worry about recursion since we know app must exist.
+ set app_name [file readlink $app_name]
}
-
-+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);
-+#ifdef HAVE_SYS_INTTYPES_H
-+ Tcl_CreateFileHandler(inChannel, TCL_READABLE, (Tcl_FileProc*)do_cli, (ClientData)(intptr_t) inChannel);
-+#else
- Tcl_CreateFileHandler(inChannel, TCL_READABLE, (Tcl_FileProc*)do_cli, (ClientData) inChannel);
-+#endif
- }
- #endif
-
-@@ -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);*/
+@@ -4470,6 +4470,7 @@
+ $app_home/sdr/plugins \
+ $app_home/plugins \
+ $app_home/../plugins \
++ /usr/pkg/etc/sdr/plugins \
+ /usr/local/etc/sdr/plugins \
+ [resource sdrHome]/plugins \
+ ]
+@@ -4538,7 +4539,7 @@
+
+ # find where we are installed
+ set app_name $argv0
+-while {[file type $app_name] == "link"} {
++while {([file isfile $app_name]) && ([file type $app_name] == "link")} {
+ # don't worry about recursion since we know app must exist.
+ set app_name [file readlink $app_name]
}
- void rebuild_interface()
-@@ -1507,7 +1533,11 @@
- unsigned long src, hfrom;
- unsigned long endtime;
-
-+#ifdef HAVE_SYS_INTTYPES_H
-+ intptr_t ix = rfd2sock[PTOI(fd)];
-+#else
- int ix = rfd2sock[PTOI(fd)];
-+#endif
-
- 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-ae b/mbone/sdr/patches/patch-ae
deleted file mode 100644
index d382bee0ba6..00000000000
--- a/mbone/sdr/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 1999/10/04 20:57:01 is Exp $
-
---- sdr/src/generic_prototypes.h.orig Tue Jan 27 11:56:28 1998
-+++ sdr/src/generic_prototypes.h Wed Nov 4 23:48:53 1998
-@@ -37,7 +37,7 @@
- #endif
-
- /*yeuch - dont use these unless you really know why*/
--#ifdef ALPHA
-+#ifdef __alpha__
- #define PTOI(p) (int)(long)p
- #define ITOP(p) (void *)(long)p
- #else
diff --git a/mbone/sdr/patches/patch-af b/mbone/sdr/patches/patch-af
deleted file mode 100644
index 24db337036b..00000000000
--- a/mbone/sdr/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-af,v 1.4 1999/10/04 20:57:01 is Exp $
-
---- /dev/null Wed Nov 4 23:28:48 1998
-+++ sdr/src/plugins/sdr2.plugin.S53.image.imm Wed Nov 4 23:48:53 1998
-@@ -0,0 +1,5 @@
-+media:image
-+proto:MDP
-+tool:imm
-+fmt:imm
-+flags:-p $(PORT) -i $(ADDRESS) -t $(TTL)
diff --git a/mbone/sdr/patches/patch-ag b/mbone/sdr/patches/patch-ag
deleted file mode 100644
index 8b5ea8e2e1e..00000000000
--- a/mbone/sdr/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.6 1999/10/28 02:40:24 hubertf Exp $
-
---- common/config_unix.h.orig Sat Oct 2 20:58:55 1999
-+++ common/config_unix.h Sat Oct 2 20:58:28 1999
-@@ -73,7 +73,7 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- extern int h_errno;
--#if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__)
-+#if !defined(HPUX) && !defined(Linux) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- #include <stropts.h>
- #include <sys/filio.h>
- #endif /* HPUX */
diff --git a/mbone/sdr/patches/patch-ah b/mbone/sdr/patches/patch-ah
deleted file mode 100644
index 83c4f7ff7ac..00000000000
--- a/mbone/sdr/patches/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ah,v 1.6 1999/10/28 02:40:24 hubertf Exp $
-
---- sdr/src/polluted.c.orig Sat Oct 2 20:39:08 1999
-+++ sdr/src/polluted.c Sat Oct 2 20:45:03 1999
-@@ -1,3 +1,6 @@
-+#ifdef HAVE_SYS_INTTYPES_H
-+#include <inttypes.h>
-+#endif
- #include "sdr.h"
- #include "prototypes.h"
- #include "prototypes_crypt.h"
diff --git a/mbone/sdr/patches/patch-aj b/mbone/sdr/patches/patch-aj
deleted file mode 100644
index 5bf9599dc08..00000000000
--- a/mbone/sdr/patches/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
-$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 Wed Dec 13 01:45:53 2000
-@@ -158,7 +158,7 @@
-
- /*Missing Prototypes*/
-
--#if !defined(WIN32)&&!defined(SGI)&&!defined(AIX41)&&!defined(_HPUX_SOURCE) && !defined(SOLARIS) && !defined(FREEBSD)
-+#if !defined(WIN32)&&!defined(SGI)&&!defined(AIX41)&&!defined(_HPUX_SOURCE) && !defined(SOLARIS) && !defined(FREEBSD) && !defined(__NetBSD__)
- 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-ak b/mbone/sdr/patches/patch-ak
deleted file mode 100644
index ff89d92744e..00000000000
--- a/mbone/sdr/patches/patch-ak
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1999/10/28 02:40:24 hubertf Exp $
-
---- common/configure.orig Mon Jun 21 12:53:35 1999
-+++ common/configure Sat Oct 2 21:51:43 1999
-@@ -53,7 +53,7 @@
-
- echo "Configuring common code library v$VERSION for $OSTYPE"
-
--GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Werror"
-+GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes"
- DEFS=""
-
- AR="ar"
-@@ -120,7 +120,7 @@
- ;;
- NetBSD ) CC="gcc"
- WFLAGS=$GCCWFLAGS
-- INCLUDE="-I/usr/local/include"
-+ INCLUDE="-I${LOCALBASE}/include"
- LDLIBS="-lm"
- DEBUG="-g"
- CHAR="-fsigned-char"
-@@ -130,7 +130,7 @@
- esac
-
- ${ECHO} "Searching for in_addr_t in <netinet/in.h>... \c"
--T1=`grep -c in_addr_t /usr/include/netinet/in.h`
-+T1=`grep -c in_addr_t /usr/include/netinet/in.h /usr/include/machine/endian.h | grep -v :0 | sed 's/.*://'`
- if [ $T1 = 0 ]; then
- DEFS="$DEFS -DNEED_IN_ADDR_T"
- ${ECHO} "no"
diff --git a/mbone/sdr/patches/patch-ao b/mbone/sdr/patches/patch-ao
deleted file mode 100644
index 3a7c3ead9a1..00000000000
--- a/mbone/sdr/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.2 1999/10/28 02:40:24 hubertf Exp $
-
---- common/net_udp.c.original Mon Oct 4 15:10:55 1999
-+++ common/net_udp.c Mon Oct 4 15:12:16 1999
-@@ -341,8 +341,8 @@
- imr.ipv6mr_multiaddr = s->addr6;
- imr.ipv6mr_interface = 0;
-
-- if (SETSOCKOPT(s->fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &imr, sizeof(struct ipv6_mreq)) != 0) {
-- socket_error("setsockopt IPV6_ADD_MEMBERSHIP");
-+ if (SETSOCKOPT(s->fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (char *) &imr, sizeof(struct ipv6_mreq)) != 0) {
-+ socket_error("setsockopt IPV6_JOIN_GROUP");
- abort();
- }
- if (SETSOCKOPT(s->fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &loop, sizeof(loop)) != 0) {
diff --git a/mbone/sdr/patches/patch-ap b/mbone/sdr/patches/patch-ap
deleted file mode 100644
index d43cb949638..00000000000
--- a/mbone/sdr/patches/patch-ap
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2000/09/08 18:58:06 jwise Exp $
-
---- sdr/solaris/Makefile.solaris.orig Mon Mar 13 16:11:46 2000
-+++ sdr/solaris/Makefile.solaris Mon Mar 13 16:13:20 2000
-@@ -1,7 +1,8 @@
- CC = gcc
--INCLUDES = -I/usr/openwin/include -I../../tcl-8.0/generic -I../../tk-8.0/generic -I../../common
--LIBS = ../../tk-8.0/unix/libtk8.0.a ../../tcl-8.0/unix/libtcl8.0.a ../../common/libcommon.a \
-- -L/usr/openwin/lib -lX11 -lm -lnsl -ldl -lsocket -lresolv
-+INCLUDES = -I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tk/generic -I${LOCALBASE}/include/tcl/generic -I../../common
-+LIBS = -L${LOCALBASE}/lib -ltk83 -ltcl83 ../../common/libcommon.a \
-+ -lm -L${X11BASE}/lib -lX11 -lz -lnsl -ldl -lsocket -lresolv \
-+ -Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib
--CFLAGS = -g -O -Wall -Wno-implicit-int $(INCLUDES) -DSOLARIS -DCANT_MCAST_BIND -DNORANDPROTO -DAUTH -DSYSV -DSolaris
-+CFLAGS = -g -O -Wall -Wno-implicit-int $(INCLUDES) -DSOLARIS -DCANT_MCAST_BIND -DNORANDPROTO -DAUTH -DSYSV -DSolaris -DHAVE_ZLIB
-
- all:: sdr
diff --git a/mbone/sdr/patches/patch-aq b/mbone/sdr/patches/patch-aq
deleted file mode 100644
index 853ae23f536..00000000000
--- a/mbone/sdr/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$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 @@
-
- /* Extract the signature and store in files */
-
-- 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
deleted file mode 100644
index 63c6e42f51b..00000000000
--- a/mbone/sdr/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index 35b4d34f7f3..00000000000
--- a/mbone/sdr/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index 940152feac5..00000000000
--- a/mbone/sdr/patches/patch-at
+++ /dev/null
@@ -1,39 +0,0 @@
-$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
deleted file mode 100644
index bf6741d6c46..00000000000
--- a/mbone/sdr/patches/patch-au
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index cd1be134512..00000000000
--- a/mbone/sdr/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 01:22:25 +0000