> Hi,
>
> I downloaded fwtk and looked at file README :
[ chomp ]
> Has anyone installed the TIS's Firewall Toolkit on Solaris 2.3 ?
> Would this task be heavy ?
>
> /Jean-Marc
>
Hi yourself,
I have been foolish enough (:-) to try and had to make a few changes.
The diffs are attached. Note that I have not yet gone into the tools
properly. I have only compiled the top level stuff. In particular, I
have not looked at the getenv/setenv combination at the end of the diff.
My environment is gcc-2.5.8 and NO BSD compatibility stuff.
Colin
---------------------------- Begin Inclusion -----------------------------------
diff -r fwtk.citec/Makefile fwtk/Makefile
19d18
< CC= gcc
23c22
< ( cd $$a; echo $@: `pwd`; $(MAKE) CC="$(CC)" FLAGS="$(FLAGS)" $@ ); \
---
> ( cd $$a; echo $@: `pwd`; $(MAKE) FLAGS="$(FLAGS)" $@ ); \
diff -r fwtk.citec/firewall.h fwtk/firewall.h
61,62c61,62
< /* extern char *malloc(); */
< extern void *malloc();
---
> extern char *malloc();
> /* extern void *malloc(); */
72,73c72,73
< /* #define LOCK_FLOCK */
< #define LOCK_LOCKF
---
> #define LOCK_FLOCK
> /* #define LOCK_LOCKF */
84,85c84,85
< /* #define USE_F_SETOWN */
< #define USE_SIOCSPGRP
---
> #define USE_F_SETOWN
> /* #define USE_SIOCSPGRP */
104,105c104,105
< /* #define USE_RANDOM */
< #define USE_RAND
---
> #define USE_RANDOM
> /* #define USE_RAND */
123c123
< /* #define USE_UDPSYSLOG */
---
> #define USE_UDPSYSLOG
126,134d125
< /*
< For systems without theses routines, uncomment these definitions.
< */
<
< #define bcopy(from,to,len) (void)memmove((to), (from), (len))
< #define bzero(from,len) (void)memset((from), (char)0, (len))
< #define bcmp memcmp
< #define index strchr
< #define rindex strrchr
Only in fwtk.citec: sysexits.h
diff -r fwtk.citec/auth/Makefile fwtk/auth/Makefile
16d15
< RANLIB= echo
61d59
< LIBS= -lsocket -lnsl
70c68
< $(RANLIB) $@
---
> ranlib $@
73c71
< $(CC) $(CFLAGS) -o $@ authmgr.o $(LIB) $(FWLIB) $(DESLIB) $(LIBS)
---
> cc $(CFLAGS) -o $@ authmgr.o $(LIB) $(FWLIB) $(DESLIB)
76c74
< $(CC) $(CFLAGS) -o $@ authsrv.o $(SRVOBJ) $(LIB) $(FWLIB) $(MODULES) $(DBMLIB) $(LIBS)
---
> cc $(CFLAGS) -o $@ authsrv.o $(SRVOBJ) $(LIB) $(FWLIB) $(MODULES) $(DBMLIB)
80c78
< $(CC) $(CFLAGS) -o $@ authdump.o db.o $(FWLIB) $(DBMLIB) $(LIBS)
---
> cc $(CFLAGS) -o $@ authdump.o db.o $(FWLIB) $(DBMLIB)
83c81
< $(CC) $(CFLAGS) -o $@ authload.o db.o $(FWLIB) $(DBMLIB) $(LIBS)
---
> cc $(CFLAGS) -o $@ authload.o db.o $(FWLIB) $(DBMLIB)
86c84
< $(CC) $(CFLAGS) -o $@ snkkey.o $(DESLIB) $(LIBS)
---
> cc $(CFLAGS) -o $@ snkkey.o $(DESLIB)
89c87
< $(CC) $(CFLAGS) $(SKEYINC) $(SECURINC) -c proto.c
---
> cc $(CFLAGS) $(SKEYINC) $(SECURINC) -c proto.c
92c90
< $(CC) $(CFLAGS) $(DESINC) -c cliio.c
---
> cc $(CFLAGS) $(DESINC) -c cliio.c
95c93
< $(CC) $(CFLAGS) $(DESINC) -c srvio.c
---
> cc $(CFLAGS) $(DESINC) -c srvio.c
98c96
< $(CC) $(CFLAGS) $(DESINC) -c snk.c
---
> cc $(CFLAGS) $(DESINC) -c snk.c
101c99
< $(CC) $(CFLAGS) $(DESINC) -c snkkey.c
---
> cc $(CFLAGS) $(DESINC) -c snkkey.c
104c102
< $(CC) $(CFLAGS) $(SKEYINC) -c skey.c
---
> cc $(CFLAGS) $(SKEYINC) -c skey.c
107c105
< $(CC) $(CFLAGS) $(SECURINC) -c securid.c
---
> cc $(CFLAGS) $(SECURINC) -c securid.c
diff -r fwtk.citec/ftp-gw/Makefile fwtk/ftp-gw/Makefile
19d18
< LIBS= -lsocket -lnsl
24c23
< $(CC) $(CFLAGS) -o $@ ftp-gw.o ../libauth.a ../libfwall.a $(LIBS)
---
> cc $(CFLAGS) -o $@ ftp-gw.o ../libauth.a ../libfwall.a
diff -r fwtk.citec/ftp-gw/ftp-gw.c fwtk/ftp-gw/ftp-gw.c
29,31d28
< /* cdc - begin */
< #include <sys/sockio.h>
< /* cdc - end */
diff -r fwtk.citec/lib/Makefile fwtk/lib/Makefile
15d14
< RANLIB= echo
29c28
< $(RANLIB) $@
---
> ranlib $@
diff -r fwtk.citec/lib/urg.c fwtk/lib/urg.c
21,25d20
< /* cdc - begin */
< #include <sys/sockio.h>
< #include <sys/filio.h>
< /* cdc - end */
<
diff -r fwtk.citec/netacl/Makefile fwtk/netacl/Makefile
18d17
< LIBS= -lsocket -lnsl
26c25
< $(CC) $(CFLAGS) -o $@ netacl.o ../libfwall.a $(RESOLV) $(LIBS)
---
> cc $(CFLAGS) -o $@ netacl.o ../libfwall.a $(RESOLV)
diff -r fwtk.citec/plug-gw/Makefile fwtk/plug-gw/Makefile
19d18
< LIBS= -lsocket -lnsl
24c23
< $(CC) $(CFLAGS) -o $@ plug-gw.o ../libfwall.a $(LIBS)
---
> cc $(CFLAGS) -o $@ plug-gw.o ../libfwall.a
diff -r fwtk.citec/plug-gw/plug-gw.c fwtk/plug-gw/plug-gw.c
24,26d23
< /* cdc - begin */
< #include <sys/sockio.h>
< /* cdc - end */
diff -r fwtk.citec/rlogin-gw/Makefile fwtk/rlogin-gw/Makefile
19d18
< LIBS= -lsocket -lnsl
24c23
< $(CC) $(CFLAGS) -o $@ rlogin-gw.o ../libauth.a ../libfwall.a $(LIBS)
---
> cc $(CFLAGS) -o $@ rlogin-gw.o ../libauth.a ../libfwall.a
diff -r fwtk.citec/rlogin-gw/rlogin-gw.c fwtk/rlogin-gw/rlogin-gw.c
25,27d24
< /* cdc - begin */
< #include <sys/sockio.h>
< /* cdc - end */
diff -r fwtk.citec/smap/Makefile fwtk/smap/Makefile
19d18
< LIBS= -lsocket -lnsl
28c27
< $(CC) $(CFLAGS) -o $@ smap.o ../libfwall.a $(RESOLV) $(LIBS)
---
> cc $(CFLAGS) -o $@ smap.o ../libfwall.a $(RESOLV)
diff -r fwtk.citec/smapd/Makefile fwtk/smapd/Makefile
18d17
< CFLAGS= -I.. $(FLAGS) -g -DUSE_DIRENT
20,21c19
< #CFLAGS= -I.. $(FLAGS) -g -DDIRECT_STRUCT="struct direct" -DSCANBADADDR
< LIBS= -lsocket -lnsl
---
> CFLAGS= -I.. $(FLAGS) -g -DDIRECT_STRUCT="struct direct" -DSCANBADADDR
30c28
< $(CC) $(CFLAGS) -o $@ smapd.o ../libfwall.a $(RESOLV) $(LIBS)
---
> cc $(CFLAGS) -o $@ smapd.o ../libfwall.a $(RESOLV)
diff -r fwtk.citec/smapd/smapd.c fwtk/smapd/smapd.c
23,28d22
< /* cdc - begin */
< /* #include <sys/dir.h> */
< #include <fcntl.h>
< #ifdef USE_DIRENT
< #include <dirent.h>
< #else
30,31d23
< #endif
< /* cdc - end */
39,46c31,32
< /* cdc - begin */
< /* #ifndef DIRECT_STRUCT */
< /* #define DIRECT_STRUCT struct direct */
< /* #endif */
< #ifdef USE_DIRENT
< #define DIRECT_STRUCT struct dirent
< #else
< #define DIRECT_STRUCT struct direct
---
> #ifndef DIRECT_STRUCT
> #define DIRECT_STRUCT struct direct
48d33
< /* cdc - end */
diff -r fwtk.citec/tn-gw/Makefile fwtk/tn-gw/Makefile
19d18
< LIBS= -lsocket -lnsl
24c23
< $(CC) $(CFLAGS) -o $@ tn-gw.o ../libfwall.a ../libauth.a $(LIBS)
---
> cc $(CFLAGS) -o $@ tn-gw.o ../libfwall.a ../libauth.a
diff -r fwtk.citec/tn-gw/tn-gw.c fwtk/tn-gw/tn-gw.c
30,32d29
< /* cdc - begin */
< #include <sys/sockio.h>
< /* cdc - end */
diff -r fwtk.citec/tools/Makefile fwtk/tools/Makefile
4d3
< CC= gcc
8c7
< ( cd $$a; echo $@: `pwd`; $(MAKE) CC=$(CC) FLAGS="$(FLAGS)" $@ ); \
---
> ( cd $$a; echo $@: `pwd`; $(MAKE) FLAGS="$(FLAGS)" $@ ); \
diff -r fwtk.citec/tools/admin/Makefile fwtk/tools/admin/Makefile
7c7
< ( cd $$a; echo $@: `pwd`; $(MAKE) CC=$(CC) FLAGS="$(FLAGS)" $@ ); \
---
> ( cd $$a; echo $@: `pwd`; $(MAKE) FLAGS="$(FLAGS)" $@ ); \
diff -r fwtk.citec/tools/client/Makefile fwtk/tools/client/Makefile
7c7
< ( cd $$a; echo $@: `pwd`; $(MAKE) CC=$(CC) FLAGS="$(FLAGS)" $@ ); \
---
> ( cd $$a; echo $@: `pwd`; $(MAKE) FLAGS="$(FLAGS)" $@ ); \
diff -r fwtk.citec/tools/server/Makefile fwtk/tools/server/Makefile
7c7
< ( cd $$a; echo $@: `pwd`; $(MAKE) CC=$(CC) FLAGS="$(FLAGS)" $@ ); \
---
> ( cd $$a; echo $@: `pwd`; $(MAKE) FLAGS="$(FLAGS)" $@ ); \
diff -r fwtk.citec/tools/server/login-sh/Makefile fwtk/tools/server/login-sh/Makefile
15,16c15
< #SETENV=setenv.o getenv.o
< SETENV=setenv.o
---
> SETENV=setenv.o getenv.o
18d16
< CC=gcc
20d17
<
26c23
< $(CC) $(CFLAGS) -o $@ login-sh.o $(SETENV) ../../../libauth.a ../../../libfwall.a -lsocket -lnsl
---
> cc $(CFLAGS) -o $@ login-sh.o $(SETENV) ../../../libauth.a ../../../libfwall.a
diff -r fwtk.citec/tools/server/login-sh/getenv.c fwtk/tools/server/login-sh/getenv.c
47,48c47
< getenv(char *name)
< /*
---
> getenv(name)
50d48
< */
----------------------------- End Inclusion ------------------------------------
Follow-Ups:
References:
|
|
