diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2001-03-12 18:50:33 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2001-03-12 18:50:33 +0000 |
| commit | 2bc39f17969474d32a63b9e9e2d58ed994d91fec (patch) | |
| tree | 51d04304cb1163681692906e31d734646d3f400a /net-mgmt/scotty3/files/patch-ac | |
| parent | Update to 0.2.2. (diff) | |
A number of changes and fixes:
. build with or without TK (triggered by the NO_X knob)
. build against TCL-8.3 -- with or without stubs
. fix some bugs in the core Scotty code -- most notably
a bug in the icmp-command implementation, where an off-by-one
error in the argument processing loop resulted in random
crashes; all this fixes are grouped into a single file
patch-fixes
. make scotty executable itself as small as it needs to be
Approved by: maintainer
Perhaps, some day the security officer will tell me what _exactly_ is
wrong with regular Scotty (this one is beta of the new version), and
I'll be able to freshen that one up too and remove the FORBIDDEN.
Notes
Notes:
svn path=/head/; revision=39680
Diffstat (limited to 'net-mgmt/scotty3/files/patch-ac')
| -rw-r--r-- | net-mgmt/scotty3/files/patch-ac | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/net-mgmt/scotty3/files/patch-ac b/net-mgmt/scotty3/files/patch-ac index 777ab9f94780..cc564591c641 100644 --- a/net-mgmt/scotty3/files/patch-ac +++ b/net-mgmt/scotty3/files/patch-ac @@ -1,22 +1,23 @@ ---- Makefile.in.orig Thu Feb 17 01:08:00 2000 -+++ Makefile.in Wed Jun 7 16:07:39 2000 -@@ -500,11 +500,11 @@ - pwd=`pwd`; cd $(TNM_TEST_DIR); $$pwd/scotty all.tcl +--- Makefile.in Wed Feb 16 11:08:00 2000 ++++ Makefile.in Thu Mar 8 19:20:25 2001 +@@ -56,7 +56,7 @@ - install: @INSTALL_TARGETS@ -- @echo "" -- @echo "The Tnm extension includes two programs (nmicmpd, nmtrapd)" -- @echo "which require root permissions. Please get root permissions" -- @echo "and type >> make sinstall << to install them setuid root." -- @echo "" -+# @echo "" -+# @echo "The Tnm extension includes two programs (nmicmpd, nmtrapd)" -+# @echo "which require root permissions. Please get root permissions" -+# @echo "and type >> make sinstall << to install them setuid root." -+# @echo "" + # To change the compiler switches, for example to change from -O + # to -g, change the following line: +-CFLAGS = -O ++CFLAGS = @CFLAGS@ - install-bin: tnm-install-bin tki-install-bin + # 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) |