pkg://tnn-1.77.nk07-521.src.rpm:887342/tnn177.nk07.dif
info downloads
diff -ur 177nk07.orig/contrib/makefile 177nk07/contrib/makefile
--- 177nk07.orig/contrib/makefile Mon Oct 9 20:21:13 2000
+++ 177nk07/contrib/makefile Mon Nov 6 17:16:41 2000
@@ -140,7 +140,7 @@
cp -P $(PRGFILES) $(DISTDIR)
prginstall:
- install -m 0700 $(BIN)/prg $(TNNUSEREXE)/prg
+ install -m 0700 $(BIN)/prg $(DESTDIR)/$(TNNUSEREXE)/prg
else
#
# Hier (fast) das gleiche fuer Dose
diff -ur 177nk07.orig/contrib/msgmsy/makefile 177nk07/contrib/msgmsy/makefile
--- 177nk07.orig/contrib/msgmsy/makefile Mon Oct 9 20:21:13 2000
+++ 177nk07/contrib/msgmsy/makefile Mon Nov 6 17:12:55 2000
@@ -100,9 +100,9 @@
msginstall:
echo $@
- install -m 0700 $(BIN)/msg $(TNNUSEREXE)msg
- install -m 0700 $(BIN)/msy $(TNNSYSEXE)msy
- cp $(MSGMSY)/msg.{usr,sys} $(TNNMSG)
+ install -m 0700 $(BIN)/msg $(DESTDIR)/$(TNNUSEREXE)msg
+ install -m 0700 $(BIN)/msy $(DESTDIR)/$(TNNSYSEXE)msy
+ cp $(MSGMSY)/msg.{usr,sys} $(DESTDIR)/$(TNNMSG)
else
#
# Nun kommt Dose
diff -ur 177nk07.orig/contrib/onlhelp/makefile 177nk07/contrib/onlhelp/makefile
--- 177nk07.orig/contrib/onlhelp/makefile Mon Oct 9 20:21:13 2000
+++ 177nk07/contrib/onlhelp/makefile Mon Nov 6 17:13:45 2000
@@ -81,7 +81,7 @@
helpinstall: $(BIN)/help
echo $@
- install -m 0700 $(BIN)/help $(TNNUSEREXE)help
- cd $(TNNSYSEXE); ln -sf $(TNNUSEREXE)help syshelp
- cp $(HELPTEXT) $(TNNDIR)
+ install -m 0700 $(BIN)/help $(DESTDIR)/$(TNNUSEREXE)help
+ cd $(DESTDIR)/$(TNNSYSEXE); ln -sf $(TNNUSEREXE)help syshelp
+ cp $(HELPTEXT) $(DESTDIR)/$(TNNDIR)
endif
diff -ur 177nk07.orig/contrib/output/makefile 177nk07/contrib/output/makefile
--- 177nk07.orig/contrib/output/makefile Mon Oct 9 20:21:13 2000
+++ 177nk07/contrib/output/makefile Tue Nov 7 09:26:50 2000
@@ -92,7 +92,7 @@
cp -P $(OUTPUTFILES) $(DISTDIR)
outputinstall:
- install -m 0700 $(BIN)/output $(TNNSYSEXE)/output
+ install -m 0700 $(BIN)/output $(DESTDIR)$(TNNSYSEXE)/output
else
#
# Hier (fast) das gleiche fuer Dose
diff -ur 177nk07.orig/contrib/pfhadd/makefile 177nk07/contrib/pfhadd/makefile
--- 177nk07.orig/contrib/pfhadd/makefile Mon Oct 9 20:21:13 2000
+++ 177nk07/contrib/pfhadd/makefile Mon Nov 6 17:14:11 2000
@@ -88,7 +88,7 @@
pfhinstall:
echo $@
- install -m 0700 $(BIN)/pfhadd $(TNNPACSAT)pfhadd
+ install -m 0700 $(BIN)/pfhadd $(DESTDIR)/$(TNNPACSAT)pfhadd
else
#
# Hier (fast) das gleiche fuer Dose
diff -ur 177nk07.orig/makefile 177nk07/makefile
--- 177nk07.orig/makefile Mon Oct 9 20:21:12 2000
+++ 177nk07/makefile Tue Nov 7 08:57:09 2000
@@ -82,17 +82,17 @@
#
# Bei Linux gibt es auch eine Installation in das folgende Hauptverzeichnis
#
-TNNDIR := /usr/local/tnn/
-#TNNDIR := /var/lib/tnn/
+#TNNDIR := /usr/local/tnn/
+TNNDIR := /var/lib/tnn/
#
# Pfad zur Initialisierungsdatei tnn.ini bei Linux
#
-INSTCFG := $(TNNDIR)
-#INSTCFG := /etc/tnn/
+#INSTCFG := $(TNNDIR)
+INSTCFG := /etc/tnn/
#
# Pfad zur aufuehrbaren Datei tnn (fuer Linux)
-INSTBIN := $(TNNDIR)
-#INSTBIN := /usr/bin
+#INSTBIN := $(TNNDIR)
+INSTBIN := /usr/sbin
#
# Die folgenden Unterverzeichnisse zum TNN-Hauptverzeichnis sollten nicht
# geaendert werden.
@@ -354,23 +354,23 @@
#
# install nur fuer Linux-Version - GO32-Version muss von Hand kopiert werden
#
-install: all _install
- install -m 0700 $(BIN)/tnn $(INSTBIN)/tnn
+install: _install
+ install -m 0700 $(BIN)/tnn $(DESTDIR)/$(INSTBIN)/tnn
_install:
- install -m 0700 -d $(TNNDIR)
- install -m 0700 -d $(TNNSYSEXE)
- install -m 0700 -d $(TNNTEXTCMD)
- install -m 0700 -d $(TNNUSEREXE)
- install -m 0700 -d $(TNNPACSAT)
- install -m 0700 -d $(TNNMSG)
-
-baseinstall: install $(TNNINI) $(TNNPAS)
- install -m 0700 -d $(INSTCFG)
- install -m 0600 $(TNNINI) $(INSTCFG)/tnn.ini
- install -m 0600 $(INI)/ax25ip.cfg $(TNNDIR)/ax25ip.cfg
- install -m 0600 $(TNNPAS) $(TNNDIR)/tnn177.pas
- install -m 0600 $(INI)/tnn177.tnb $(TNNDIR)/tnn177.tnb
+ install -m 0700 -d $(DESTDIR)/$(TNNDIR)
+ install -m 0700 -d $(DESTDIR)/$(TNNSYSEXE)
+ install -m 0700 -d $(DESTDIR)/$(TNNTEXTCMD)
+ install -m 0700 -d $(DESTDIR)/$(TNNUSEREXE)
+ install -m 0700 -d $(DESTDIR)/$(TNNPACSAT)
+ install -m 0700 -d $(DESTDIR)/$(TNNMSG)
+
+baseinstall: install $(TNNINI) $(DESTDIR)/$(TNNPAS)
+ install -m 0700 -d $(DESTDIR)/$(INSTCFG)
+ install -m 0600 $(TNNINI) $(DESTDIR)/$(INSTCFG)/tnn.ini
+ install -m 0600 $(INI)/ax25ip.cfg $(DESTDIR)/$(TNNDIR)/ax25ip.cfg
+ install -m 0600 $(TNNPAS) $(DESTDIR)/$(TNNDIR)/tnn177.pas
+ install -m 0600 $(INI)/tnn177.tnb $(DESTDIR)/$(TNNDIR)/tnn177.tnb
$(TNNINI): $(MAKEFILE)
echo $@
diff -ur 177nk07.orig/os/linux/ini/tnnini.all 177nk07/os/linux/ini/tnnini.all
--- 177nk07.orig/os/linux/ini/tnnini.all Mon Oct 9 20:21:12 2000
+++ 177nk07/os/linux/ini/tnnini.all Tue Nov 7 09:59:15 2000
@@ -5,16 +5,16 @@
# use 077 to limit access to the owner of TNN
#perms 077
# Working directory for TNN
-#tnn_dir /usr/local/tnn/
+tnn_dir /var/lib/tnn/
# Unix-Socket for TNT hostmode interface (optional)
-tnn_socket /usr/local/tnn/tnn-socket
+tnn_socket /var/lib/tnn/tnn-socket
# Program to start before using any hardware ports (optional) - don't use
# any parameters!
-tnn_start kill_other_processes
+#tnn_start kill_other_processes
# Number of buffers (optional; default = 10000)
buffers 10000
# file containing process id (mandatory)
-tnn_procfile tnn.pid
+tnn_procfile /var/run/tnn.pid
#-----------------------------------------------------------------------------
# device 1 = Tokenring on /dev/ttyS0; 38400 Bd; Ports 0 and 1
device /dev/ttyS0
diff -ur 177nk07.orig/os/linux/linclude.h 177nk07/os/linux/linclude.h
--- 177nk07.orig/os/linux/linclude.h Mon Oct 9 20:21:10 2000
+++ 177nk07/os/linux/linclude.h Tue Nov 7 08:53:23 2000
@@ -63,7 +63,9 @@
#include <asm/io.h>
#include <linux/ipx.h>
#else
+#if defined __i386__ || defined __x86_64__
#include <sys/io.h>
+#endif
#include <netipx/ipx.h>
#endif
#include <linux/serial.h>
diff -ur 177nk07.orig/src/l7utils.c 177nk07/src/l7utils.c
--- 177nk07.orig/src/l7utils.c Mon Oct 9 20:21:11 2000
+++ 177nk07/src/l7utils.c Mon Nov 6 17:22:46 2000
@@ -445,7 +445,7 @@
case 'a': p = va_arg(param, char *);
putalt(p, mbp);
break;
- case 'u': inum = va_arg(param, UWORD); /* UWORD */
+ case 'u': inum = va_arg(param, int); /* UWORD */
putnum(inum, mbp);
break;
case 'c': p = va_arg(param, char *);