diff -ru orig/portsentry-1.1/Makefile portsentry-1.1/Makefile --- orig/portsentry-1.1/Makefile Wed Jul 11 16:57:49 2001 +++ portsentry-1.1/Makefile Fri Dec 7 00:05:06 2001 @@ -37,8 +37,9 @@ #CFLAGS = -pg -O -Wall -DNODAEMON #LIBS = /usr/lib/libefence.a -INSTALLDIR = /usr/local/psionic -CHILDDIR=/portsentry +INSTALLDIR = @PREFIX@ +CHILDDIR = /sbin +CONFDIR = /etc/portsentry all: @echo "Usage: make " @@ -76,13 +77,18 @@ $(INSTALLDIR)$(CHILDDIR); fi @echo "Setting directory permissions" chmod 700 $(INSTALLDIR)$(CHILDDIR) + @echo "Creating config directory $(INSTALLDIR)$(CONFDIR)" + @if [ ! -d $(INSTALLDIR)$(CONFDIR) ]; then /bin/mkdir\ + $(INSTALLDIR)$(CONFDIR); fi + @echo "Setting directory permissions" + chmod 700 $(INSTALLDIR)$(CONFDIR) @echo "Copying files" - cp ./portsentry.conf $(INSTALLDIR)$(CHILDDIR) - cp ./portsentry.ignore $(INSTALLDIR)$(CHILDDIR) + cp ./portsentry.conf $(INSTALLDIR)$(CONFDIR) + cp ./portsentry.ignore $(INSTALLDIR)$(CONFDIR) cp ./portsentry $(INSTALLDIR)$(CHILDDIR) @echo "Setting permissions" - chmod 600 $(INSTALLDIR)$(CHILDDIR)/portsentry.ignore - chmod 600 $(INSTALLDIR)$(CHILDDIR)/portsentry.conf + chmod 600 $(INSTALLDIR)$(CONFDIR)/portsentry.ignore + chmod 600 $(INSTALLDIR)$(CONFDIR)/portsentry.conf chmod 700 $(INSTALLDIR)$(CHILDDIR)/portsentry @echo "" @echo "" diff -ru orig/portsentry-1.1/portsentry.conf portsentry-1.1/portsentry.conf --- orig/portsentry-1.1/portsentry.conf Wed Jul 11 16:57:49 2001 +++ portsentry-1.1/portsentry.conf Fri Dec 7 00:06:15 2001 @@ -80,11 +80,11 @@ ###################### # # Hosts to ignore -IGNORE_FILE="/usr/local/psionic/portsentry/portsentry.ignore" +IGNORE_FILE="@PREFIX@/etc/portsentry/portsentry.ignore" # Hosts that have been denied (running history) -HISTORY_FILE="/usr/local/psionic/portsentry/portsentry.history" +HISTORY_FILE="@PREFIX@/etc/portsentry/portsentry.history" # Hosts that have been denied this session only (temporary until next restart) -BLOCKED_FILE="/usr/local/psionic/portsentry/portsentry.blocked" +BLOCKED_FILE="@PREFIX@/etc/portsentry/portsentry.blocked" ############################## # Misc. Configuration Options# @@ -208,7 +208,7 @@ # For those of you running FreeBSD (and compatible) you can # use their built in firewalling as well. # -#KILL_ROUTE="/sbin/ipfw add 1 deny all from $TARGET$:255.255.255.255 to any" +KILL_ROUTE="/sbin/ipfw add 1 deny all from $TARGET$:255.255.255.255 to any" # # # For those running ipfilt (OpenBSD, etc.) diff -ru orig/portsentry-1.1/portsentry_config.h portsentry-1.1/portsentry_config.h --- orig/portsentry-1.1/portsentry_config.h Wed Jul 11 16:57:49 2001 +++ portsentry-1.1/portsentry_config.h Fri Dec 7 00:07:01 2001 @@ -29,7 +29,7 @@ /* These are probably ok. Be sure you change the Makefile if you */ /* change the path */ -#define CONFIG_FILE "/usr/local/psionic/portsentry/portsentry.conf" +#define CONFIG_FILE "@PREFIX@/etc/portsentry/portsentry.conf" /* The location of Wietse Venema's TCP Wrapper hosts.deny file */ #define WRAPPER_HOSTS_DENY "/etc/hosts.deny"