From 100682083c882d12480899d436b9d937590bce61 Mon Sep 17 00:00:00 2001 From: is Date: Tue, 18 Nov 1997 17:21:25 +0000 Subject: - NetBSD RCS ids. - disabled unfinished tools. - make sdr compile & work on NetBSD --- mbone/sdr/patches/patch-aa | 133 +++++++++++++++++++++++++++++++++++++++++---- mbone/sdr/patches/patch-ab | 41 ++++++++++---- mbone/sdr/patches/patch-ac | 40 -------------- mbone/sdr/patches/patch-ad | 19 ------- mbone/sdr/patches/patch-ae | 19 ------- 5 files changed, 151 insertions(+), 101 deletions(-) delete mode 100644 mbone/sdr/patches/patch-ac delete mode 100644 mbone/sdr/patches/patch-ad delete mode 100644 mbone/sdr/patches/patch-ae (limited to 'mbone/sdr/patches') diff --git a/mbone/sdr/patches/patch-aa b/mbone/sdr/patches/patch-aa index b972507313e..add248cf4c7 100644 --- a/mbone/sdr/patches/patch-aa +++ b/mbone/sdr/patches/patch-aa @@ -1,12 +1,121 @@ -*** src/sdr.h.orig Thu Sep 5 14:28:29 1996 ---- src/sdr.h Thu Sep 5 14:28:35 1996 -*************** -*** 21,27 **** - #endif - #include - #include -- #include - #include - #include - #include ---- 21,26 ---- +diff -ru ../original/src/Makefile.template ./src/Makefile.template +--- ../original/src/Makefile.template Tue Oct 1 16:53:30 1996 ++++ ./src/Makefile.template Tue Nov 18 15:06:29 1997 +@@ -97,7 +97,7 @@ + $(SDR_UI_FILES): tcl2c + + parsed_plugins.tcl: ../src/plugin2tcl.tcl +- tclsh7.5 ../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 + #include +-#include ++#include + #include + #include "qfDES.h" + ++#if defined(USE_PERROR) ++#include ++#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 + #else + #include +-#include +-#include +-#include + #include + #include + #include +@@ -18,6 +15,9 @@ + #include + #include + #include ++#include ++#include ++#include + #include + #include + #ifdef AIX41 +@@ -26,7 +26,6 @@ + #endif + #include + #include +-#include + #include + #include + #include +@@ -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 270999c42e0..426691b680f 100644 --- a/mbone/sdr/patches/patch-ab +++ b/mbone/sdr/patches/patch-ab @@ -1,11 +1,30 @@ ---- src/qfdes/qfDES-memory.c.orig Thu Oct 31 14:39:50 1996 -+++ src/qfdes/qfDES-memory.c Thu Oct 31 14:41:52 1996 -@@ -12,7 +12,7 @@ - - #include - #include --#include -+#include - #include - #include "qfDES.h" - +--- ../../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 @@ + 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]); +@@ -294,7 +294,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; + } diff --git a/mbone/sdr/patches/patch-ac b/mbone/sdr/patches/patch-ac deleted file mode 100644 index 3d7ce87d727..00000000000 --- a/mbone/sdr/patches/patch-ac +++ /dev/null @@ -1,40 +0,0 @@ ---- src/sdr.h.orig Wed May 21 22:06:02 1997 -+++ src/sdr.h Wed May 21 22:10:05 1997 -@@ -8,9 +8,6 @@ - #include - #else - #include --#include --#include --#include - #include - #include - #include -@@ -18,6 +15,9 @@ - #include - #include - #include -+#include -+#include -+#include - #include - #include - #ifdef AIX41 -@@ -146,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-ad b/mbone/sdr/patches/patch-ad deleted file mode 100644 index 968741876fe..00000000000 --- a/mbone/sdr/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -*** src/Makefile.template.orig Sat Nov 23 16:41:26 1996 ---- src/Makefile.template Sat Nov 23 16:41:35 1996 -*************** -*** 97,103 **** - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -! tclsh7.5 ../src/plugin2tcl.tcl - - libs.tcl: $(TK_LIBRARY_FILES) - cat $(TK_LIBRARY_FILES) | sed '/^[ ]*source[ ]/d' > libs.tcl ---- 97,103 ---- - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -! tclsh8.0 ../src/plugin2tcl.tcl - - libs.tcl: $(TK_LIBRARY_FILES) - cat $(TK_LIBRARY_FILES) | sed '/^[ ]*source[ ]/d' > libs.tcl diff --git a/mbone/sdr/patches/patch-ae b/mbone/sdr/patches/patch-ae deleted file mode 100644 index 06004bd9c47..00000000000 --- a/mbone/sdr/patches/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ ---- src/iohandler.c.orig Tue Oct 29 06:52:25 1996 -+++ src/iohandler.c Tue Sep 9 15:36:34 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 - } -- cgit v1.2.3