pkg://fpac-3.25-179.src.rpm:242998/fpac325.dif  info  downloads

diff -Nur ../fpac325-orig/Makefile ./Makefile
--- ../fpac325-orig/Makefile	2002-04-15 22:48:55.000000000 +0200
+++ ./Makefile	2002-12-06 17:01:15.000000000 +0100
@@ -70,9 +70,10 @@
 	touch $(VAR_DIR)/fpac/loggedin
 	touch $(VAR_DIR)/flex/gateways
 	touch $(VAR_DIR)/flex/destinations
-	install -m 744	-o bin	-g bin	-d		$(LOCALFPAC)
-	install -m 744	-o bin	-g bin	-s $(BINS)	$(LOCALFPAC)
-	install	-m 744	-o bin	-g bin	fpac.sh		$(LOCALFPAC)
+	install -m 744	-o bin	-g bin	-d		$(DESTDIR)/bin
+	install -m 744	-o bin	-g bin	-d		$(DESTDIR)/usr/sbin
+	install -m 744	-o bin	-g bin	-s $(BINS)	$(DESTDIR)/usr/sbin
+	install	-m 744	-o bin	-g bin	fpac.sh		$(DESTDIR)/usr/sbin
 	install -m 744	-o root	-g root	-d		$(VAR_DIR)/fpac
 
 installhelp:
diff -Nur ../fpac325-orig/cfg/fpaccfg.c ./cfg/fpaccfg.c
--- ../fpac325-orig/cfg/fpaccfg.c	2001-11-01 23:25:27.000000000 +0100
+++ ./cfg/fpaccfg.c	2002-12-06 14:56:37.000000000 +0100
@@ -16,6 +16,7 @@
 #include <signal.h>
 #include <syslog.h>
 #include <ctype.h>
+#include <time.h>
 
 #include <time.h>
 #include <sys/types.h>
diff -Nur ../fpac325-orig/lib/Makefile ./lib/Makefile
--- ../fpac325-orig/lib/Makefile	2001-11-01 23:25:27.000000000 +0100
+++ ./lib/Makefile	2002-12-06 15:08:06.000000000 +0100
@@ -8,6 +8,10 @@
 all:	\
 	libfpac.a
 
+.SUFFIXES: .so
+.c.so:
+	$(CC) $(CFLAGS) -fPIC -c $< -o $@
+
 libfpac.a:	libwp.o libcfg.o libmd.o md5.o procutils.o
 	$(AR) rcs libfpac.a libwp.o libcfg.o libmd.o md5.o procutils.o
 
@@ -15,7 +19,7 @@
 	$(CPP) $(CFLAGS) -M *.c > .depend
 
 clean:
-	rm -f *.o core
+	rm -f *.o .so core
 
 strip:
 
diff -Nur ../fpac325-orig/lib/ax25compat.h ./lib/ax25compat.h
--- ../fpac325-orig/lib/ax25compat.h	2001-11-01 23:25:27.000000000 +0100
+++ ./lib/ax25compat.h	2002-12-06 14:59:35.000000000 +0100
@@ -1,6 +1,6 @@
-#include "linux/ax25.h"
-#include "linux/rose.h"
-#include "linux/netrom.h"
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
+#include <netrom/netrom.h>
 
 #ifdef OLD_AX25
 
diff -Nur ../fpac325-orig/lib/fpac.h ./lib/fpac.h
--- ../fpac325-orig/lib/fpac.h	2001-11-02 13:43:33.000000000 +0100
+++ ./lib/fpac.h	2002-12-06 15:17:52.000000000 +0100
@@ -22,8 +22,8 @@
 #define FPACNODE "fpacnode"
 
 #include <sys/time.h>
-#include <linux/ax25.h>
-#include <linux/rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 
 typedef struct dniclu_d
 {
diff -Nur ../fpac325-orig/lib/wp.h ./lib/wp.h
--- ../fpac325-orig/lib/wp.h	2002-01-06 15:52:49.000000000 +0100
+++ ./lib/wp.h	2002-12-06 14:59:56.000000000 +0100
@@ -2,8 +2,8 @@
 #define __WP_H
 
 #include <netinet/in.h>
-#include <linux/ax25.h>
-#include <linux/rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <sys/socket.h>
 
 #define WP_VECTOR_SIZE	16
diff -Nur ../fpac325-orig/make.defs ./make.defs
--- ../fpac325-orig/make.defs	2002-01-16 21:53:38.000000000 +0100
+++ ./make.defs	2002-12-06 16:48:06.000000000 +0100
@@ -14,15 +14,13 @@
 DOC_DIR   = /usr/doc
 VAR_DIR   = /var/ax25
 
-LOCALFPAC = /usr/local/fpac
-LIBAX25   = /usr/local/lib
-INCAX25   = /usr/local/include
-# INCAX25   = /usr/local/include/ax25
+LOCALFPAC = /usr/lib/fpac
+INCAX25   = /usr/include/netax25
 
-CFLAGS    = -Wall -Wstrict-prototypes -I../lib -I$(INCAX25) -g -O2
-# CFLAGS    = -Wall -Wstrict-prototypes -I../lib -I$(INCAX25) -g -O2 -DOLD_AX25
-LDFLAGS   = -L../lib -L$(LIBAX25) -L/usr/X11R6/lib
-SHLDFLAGS = -L../lib -L$(LIBAX25) -L/usr/X11R6/lib
+OPTFLAGS  = 
+CFLAGS    = -Wall -Wstrict-prototypes -I../lib -I$(INCAX25) $(OPTFLAGS)
+LDFLAGS   = -L../lib
+SHLDFLAGS = -L../lib
 
 LIBS      = -lfpac -lax25 -lz
 SHLIBS    = -lfpac -lax25 -lz
diff -Nur ../fpac325-orig/node/node.h ./node/node.h
--- ../fpac325-orig/node/node.h	2001-11-02 12:35:31.000000000 +0100
+++ ./node/node.h	2002-12-06 15:01:48.000000000 +0100
@@ -9,9 +9,9 @@
  *                                                    *
  ******************************************************/
 
-#include <linux/ax25.h>
-#include <linux/netrom.h>
-#include <linux/rose.h>
+#include <netax25/ax25.h>
+#include <netrom/netrom.h>
+#include <netrose/rose.h>
 
 #include "../version.h"
 #include "fpac.h"
@@ -42,8 +42,8 @@
 #define PERM_TELNET (PERM_TELNET_LOCAL & PERM_TELNET_AMPR & PERM_TELNET_INET)
 
 #include <sys/ipc.h>	/* for key_t */
-#include <linux/ax25.h>
-#include <linux/rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 
 
 struct cmd {