4 files changed, 45 insertions, 27 deletions
diff --git a/network/p0f/README b/network/p0f/README
index 1971c9d451..4f31089bf4 100644
--- a/network/p0f/README
+++ b/network/p0f/README
@@ -1,12 +1,12 @@
-p0f v2 is a passive operating system fingerprinting tool.  
-It can identify the OS on:
-   - machines that connect to your box (SYN mode),
-   - machines you connect to (SYN+ACK mode),
-   - machines you cannot connect to (RST+ mode),
-   - machines whose communications you can observe.
-
-P0f can also detect or measure the following:
-   - firewall presence, NAT use,
-   - existence of a load balancer setup,
-   - the distance to the remote system and its uptime,
-   - other guy's network hookup (DSL, OC3, avian carriers) and his ISP.
+p0f v2 is a passive operating system fingerprinting tool.
+It can identify the OS on:
+   - machines that connect to your box (SYN mode),
+   - machines you connect to (SYN+ACK mode),
+   - machines you cannot connect to (RST+ mode),
+   - machines whose communications you can observe.
+
+P0f can also detect or measure the following:
+   - firewall presence, NAT use,
+   - existence of a load balancer setup,
+   - the distance to the remote system and its uptime,
+   - other guy's network hookup (DSL, OC3, avian carriers) and his ISP.
diff --git a/network/p0f/p0f.SlackBuild b/network/p0f/p0f.SlackBuild
index 9f3b6d43fc..5d4866d4b3 100644
--- a/network/p0f/p0f.SlackBuild
+++ b/network/p0f/p0f.SlackBuild
@@ -1,23 +1,38 @@
 #!/bin/sh
 
-#   Slackware build script for p0f
-#   Written by David Spencer <nobbutl@yahoo.co.uk>
-#==============================================================================
+# Slackware build script for p0f
+
+# Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by the SlackBuilds.org project
-# Assumed to be public domain per our submission policy
 
 PRGNAM=p0f
-VERSION=2.0.8
+VERSION=${VERSION:-2.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -47,13 +62,16 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar -xzvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-make CFLAGS="$SLKCFLAGS -DUSE_BPF=\\\"pcap-bpf.h\\\" -I/usr/include/pcap" \
-  -f mk/Linux p0f 
+make p0f \
+  CFLAGS="$SLKCFLAGS \
+  -DUSE_BPF=\\\"pcap-bpf.h\\\" \
+  -I/usr/include/pcap" \
+  -f mk/Linux
 
 mkdir -p $PKG/usr/sbin/
 cp -f p0f p0frep $PKG/usr/sbin/
diff --git a/network/p0f/p0f.info b/network/p0f/p0f.info
index 1b3100f586..c1a23d7daf 100644
--- a/network/p0f/p0f.info
+++ b/network/p0f/p0f.info
@@ -6,5 +6,5 @@ MD5SUM="1ccbcd8d4c95ef6dae841120d23c56a5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
-EMAIL="nobbutl@yahoo.co.uk"
+EMAIL="baildon.research@googlemail.com"
 APPROVED="rworkman"
diff --git a/network/p0f/slack-desc b/network/p0f/slack-desc
index f13bbcb700..4be4d5bb54 100644
--- a/network/p0f/slack-desc
+++ b/network/p0f/slack-desc
@@ -3,17 +3,17 @@
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# customary to leave one space after the ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
 p0f: p0f (passive os fingerprint tool)
-p0f: 
+p0f:
 p0f: p0f is a passive operating system fingerprinting tool.  It can 
 p0f: identify the OS on machines that connect to your box, machines you 
 p0f: connect to, machines you cannot connect to, and machines whose 
 p0f: communications you can observe.  It can detect or measure firewall 
 p0f: presence, NAT use, existence of a load balancer setup, the distance 
 p0f: to the remote system, its uptime, and its network hookup and ISP.
-p0f: 
+p0f:
 p0f: Homepage: http://lcamtuf.coredump.cx/p0f.shtml
-p0f: 
+p0f: