aboutsummaryrefslogtreecommitdiff
path: root/net/scotty3/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/scotty3/files')
-rw-r--r--net/scotty3/files/patch-aa12
-rw-r--r--net/scotty3/files/patch-ab15
-rw-r--r--net/scotty3/files/patch-ac46
-rw-r--r--net/scotty3/files/patch-ad71
-rw-r--r--net/scotty3/files/patch-ae8
-rw-r--r--net/scotty3/files/patch-af20
-rw-r--r--net/scotty3/files/patch-fixes38
-rw-r--r--net/scotty3/files/patch-unix:nmicmpd.c17
-rw-r--r--net/scotty3/files/scotty.c27
9 files changed, 0 insertions, 254 deletions
diff --git a/net/scotty3/files/patch-aa b/net/scotty3/files/patch-aa
deleted file mode 100644
index de3a255d2b03..000000000000
--- a/net/scotty3/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- tkined.sh.in~ Fri Sep 13 09:30:41 1996
-+++ tkined.sh.in Fri Sep 13 09:26:21 1996
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.4.10 @PREFIX@/lib/tnm2.1.10"
-+exec @PREFIX@/bin/tkined1.4.10 $*
---- scotty.sh.in~ Fri Sep 13 09:30:41 1996
-+++ scotty.sh.in Fri Sep 13 09:26:21 1996
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+export TCLLIBPATH="@PREFIX@/lib/tnm3.0.0"
-+exec @PREFIX@/bin/scotty3.0.0
diff --git a/net/scotty3/files/patch-ab b/net/scotty3/files/patch-ab
deleted file mode 100644
index a441e9db4ce8..000000000000
--- a/net/scotty3/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../tkined/apps/snmp_monitor.tcl.orig Thu Feb 3 23:11:40 2000
-+++ ../tkined/apps/snmp_monitor.tcl Wed Jun 7 16:02:39 2000
-@@ -517,8 +517,11 @@
-
- set args $ip
- set i 0
-+ set snmpconfig [ined attribute $id "SNMP:Config"]
- foreach if $iflist {
-- lappend args [CreateChart $id [expr 30+$i] [expr 30+$i]]
-+ set nid [CreateChart $id [expr 30+$i] [expr 30+$i]]
-+ lappend args $nid
-+ ined -noupdate attribute $nid "SNMP:Config" $snmpconfig
- lappend args $if
- incr i
- }
diff --git a/net/scotty3/files/patch-ac b/net/scotty3/files/patch-ac
deleted file mode 100644
index cc564591c641..000000000000
--- a/net/scotty3/files/patch-ac
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.in Wed Feb 16 11:08:00 2000
-+++ Makefile.in Thu Mar 8 19:20:25 2001
-@@ -56,7 +56,7 @@
-
- # To change the compiler switches, for example to change from -O
- # to -g, change the following line:
--CFLAGS = -O
-+CFLAGS = @CFLAGS@
-
- # NMICMPD should contain the full path to the installed nmicmpd binary.
- NMICMPD = $(BIN_INSTALL_DIR)/nmicmpd
-@@ -473,7 +473,7 @@
- $(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
-
- tnm$(SHLIB_SUFFIX): $(TNM_OBJS)
-- $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS)
-+ $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) @NEED_TCL_LIB@ $(LIBS)
-
- tkined: tkined$(SHLIB_SUFFIX) $(UNIX_DIR)/tkined.in
- @sed -e 's+%WISH%+$(TK_WISH)+' \
-@@ -528,7 +528,7 @@
- @$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
- @$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
- @chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
-- @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
-+ @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
-
- tnm-install-man:
- @for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN8_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
-@@ -708,10 +708,14 @@
- fi; \
- done;
- @echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
-- @$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+ @$(INSTALL_DATA) -m 555 tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
-+ @sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
-+ @sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
-+ @$(INSTALL_DATA) -m 555 tkined.sh ${BIN_INSTALL_DIR}/tkined
-+ @$(INSTALL_DATA) -m 555 scotty.sh ${BIN_INSTALL_DIR}/scotty
- @$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
- @chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
-- @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
-+ @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
- @$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
-
- tki-install-man:
diff --git a/net/scotty3/files/patch-ad b/net/scotty3/files/patch-ad
deleted file mode 100644
index e09d45dc0d54..000000000000
--- a/net/scotty3/files/patch-ad
+++ /dev/null
@@ -1,71 +0,0 @@
---- configure Wed Feb 16 11:08:00 2000
-+++ configure Thu Mar 8 19:22:52 2001
-@@ -749,9 +749,14 @@
- LD_FLAGS=$TCL_LD_FLAGS
- LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
- TCL_EXEC_PREFIX=$TCL_EXEC_PREFIX
--TCL_INCLUDES=-I$TCL_PREFIX/include
-+TCL_INCLUDES=-I$TCL_PREFIX/include/tcl$TCL_VERSION
- TK_EXEC_PREFIX=$TK_EXEC_PREFIX
-
-+if /usr/bin/ldd ${prefix}/bin/tclsh$TCL_VERSION | fgrep -qv libtcl; then
-+ CFLAGS="$CFLAGS -DUSE_TCL_STUBS"
-+ NEED_TCL_LIB=$TCL_LIB_SPEC
-+fi
-+
- if test $TCL_SHARED_BUILD -ne 1 ; then
- { echo "configure: error: Tcl is not configured with --enable-shared" 1>&2; exit 1; }
- fi
-@@ -763,8 +767,8 @@
- echo $ac_n "checking for tcl version""... $ac_c" 1>&6
- echo "configure:765: checking for tcl version" >&5
- echo "$ac_t"""$TCL_VERSION"" 1>&6
--if test "$TCL_VERSION" != "8.2" ; then
-- { echo "configure: error: "Tcl version 8.2 needed"" 1>&2; exit 1; }
-+if test "$TCL_VERSION" \< "8.2" ; then
-+ { echo "configure: error: "Tcl version at least 8.2 needed"" 1>&2; exit 1; }
- fi
-
- BUILD_TARGETS="$BUILD_TARGETS scotty"
-@@ -821,6 +825,7 @@
- fi
-
-
-+if test x$tnm_path_tk_config != xno; then
- dirs="$tnm_path_tk_config $wish_prefix/lib $prefix/lib /usr/local/lib"
-
- found=0
-@@ -842,7 +847,7 @@
- echo "configure: warning: "will not build tkined"" 1>&2
- else
- . $tnm_cv_path_tk_config/tkConfig.sh
-- TK_INCLUDES=-I$TK_PREFIX/include
-+ TK_INCLUDES=-I$TK_PREFIX/include/tk$TK_VERSION
- if test "$TK_INCLUDES" = "$TCL_INCLUDES" ; then
- TK_INCLUDES=""
- fi
-@@ -850,13 +855,14 @@
- echo $ac_n "checking for tk version""... $ac_c" 1>&6
- echo "configure:852: checking for tk version" >&5
- echo "$ac_t"""$TK_VERSION"" 1>&6
-- if test "$TK_VERSION" != "8.2" ; then
-- { echo "configure: error: "Tk version 8.2 needed"" 1>&2; exit 1; }
-+ if test "$TK_VERSION" \< "8.2" ; then
-+ { echo "configure: error: "Tk version at least 8.2 needed"" 1>&2; exit 1; }
- fi
-
- BUILD_TARGETS="$BUILD_TARGETS tkined"
- INSTALL_TARGETS="$INSTALL_TARGETS tki-install"
- fi
-+fi # --with-tk=<something other than ``no''>
-
- #----------------------------------------------------------------------------
- # Check for some basic stuff. We don't check for the compiler.
-@@ -3318,6 +3324,7 @@
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-+s%@NEED_TCL_LIB@%$NEED_TCL_LIB%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
diff --git a/net/scotty3/files/patch-ae b/net/scotty3/files/patch-ae
deleted file mode 100644
index 95bd9e1a0721..000000000000
--- a/net/scotty3/files/patch-ae
+++ /dev/null
@@ -1,8 +0,0 @@
---- tkined.sh.in.orig Tue Jun 6 05:14:19 2000
-+++ tkined.sh.in Tue Jun 6 05:13:12 2000
-@@ -1,3 +1,3 @@
- #!/bin/sh
--export TCLLIBPATH="@PREFIX@/lib/tkined1.4.10 @PREFIX@/lib/tnm2.1.10"
--exec @PREFIX@/bin/tkined1.4.10 $*
-+export TCLLIBPATH="@PREFIX@/lib/tkined1.5.0 @PREFIX@/lib/tnm3.0.0"
-+exec @PREFIX@/bin/tkined1.5.0 $*
diff --git a/net/scotty3/files/patch-af b/net/scotty3/files/patch-af
deleted file mode 100644
index 19ba69fd4144..000000000000
--- a/net/scotty3/files/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../tnm/generic/tnmInt.h.orig Tue Sep 21 14:17:18 1999
-+++ ../tnm/generic/tnmInt.h Tue Dec 9 00:06:26 2003
-@@ -54,11 +54,16 @@
- */
-
- #define TnmGetTime TclpGetTime
-+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 4
-+#define TnmCreateDirectory(p) mkdir (p, 0777)
-+#define TnmStat stat
-+#else
- #define TnmCreateDirectory TclpCreateDirectory
--#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 8 && TCL_RELEASE_SERIAL > 2
-+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 3 && TCL_RELEASE_SERIAL > 2
- #define TnmStat TclStat
- #else
- #define TnmStat stat
-+#endif
- #endif
-
- EXTERN void
diff --git a/net/scotty3/files/patch-fixes b/net/scotty3/files/patch-fixes
deleted file mode 100644
index 0940c7e0c6cd..000000000000
--- a/net/scotty3/files/patch-fixes
+++ /dev/null
@@ -1,38 +0,0 @@
-This patches fix actual BUGS in the Scotty code:
- . any Tcl above 8.2 will also work fine;
- . icmp.test no longer causes crashes -- an off-by-one
- error in argument parsing code was the reason for
- occasional segfaults
- . TUBS-REGISTRATION was renamed to TUBS-SMI, but the
- mibs.test did not know about it
-There still are some test failures, but I think (hope), they are due to
-mistakes in the tests themselves.
-
- -mi
-
---- ../tnm/generic/tnmInit.c Wed Oct 6 05:35:57 1999
-+++ ../tnm/generic/tnmInit.c Thu Mar 8 19:49:33 2001
-@@ -431,3 +431,3 @@
- #ifdef USE_TCL_STUBS
-- if (Tcl_InitStubs(interp, "8.2", 1) == NULL) {
-+ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
- return TCL_ERROR;
---- ../tnm/generic/tnmIcmp.c Wed Oct 6 05:07:04 1999
-+++ ../tnm/generic/tnmIcmp.c Fri Mar 9 17:58:05 2001
-@@ -273,6 +273,6 @@
- * Parse the options.
- */
-
-- while (1) {
-+ while (x < objc) {
- code = TnmGetTableKeyFromObj(interp, icmpOptionTable,
- objv[x], "option");
---- ../tnm/tests/mib.test Fri Feb 11 14:43:38 2000
-+++ ../tnm/tests/mib.test Fri Mar 9 18:25:48 2001
-@@ -30,1 +30,1 @@
--lappend tnm(mibs) TUBS-REGISTRATION TUBS-IBR-TEST-MIB
-+lappend tnm(mibs) TUBS-SMI TUBS-IBR-TEST-MIB
-@@ -689,2 +689,2 @@
- mib info files *SMI
--} {RFC1155-SMI SNMPv2-SMI}
-+} {RFC1155-SMI SNMPv2-SMI TUBS-SMI}
diff --git a/net/scotty3/files/patch-unix:nmicmpd.c b/net/scotty3/files/patch-unix:nmicmpd.c
deleted file mode 100644
index 6432fa8643d7..000000000000
--- a/net/scotty3/files/patch-unix:nmicmpd.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- nmicmpd.c.orig Tue Feb 6 15:34:03 2001
-+++ nmicmpd.c Tue Feb 6 15:44:53 2001
-@@ -924,6 +924,14 @@
-
- if (rc != size) {
- if (rc < 0) {
-+ /*
-+ * If we get an EHOSTDOWN error, this probably means that
-+ * the the pending ARP entry has timed out for the host.
-+ * Just ignore the error, and attempt a normal retry.
-+ */
-+ if (errno == EHOSTDOWN)
-+ return 0;
-+
- PosixError("sendto failed");
- }
- job->status = ICMP_STATUS_GENERROR;
diff --git a/net/scotty3/files/scotty.c b/net/scotty3/files/scotty.c
deleted file mode 100644
index 375cd2a7529e..000000000000
--- a/net/scotty3/files/scotty.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* All that's needed for bin/scotty, really... -mi */
-
-#include "tnmInt.h"
-
-static int
-Tcl_AppInit(interp)
- Tcl_Interp *interp;
-{
- if (Tcl_Init(interp) != TCL_OK) {
- return TCL_ERROR;
- }
-
- if (Tcl_PkgRequire(interp, "Tnm", TNM_VERSION, 1) == NULL) {
- return TCL_ERROR;
- }
-
- Tcl_SetVar(interp, "tcl_rcFileName", "~/.tclshrc", TCL_GLOBAL_ONLY);
- return TCL_OK;
-}
-
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
- Tcl_Main(argc, argv, Tcl_AppInit);
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-22 12:22:58 +0000