diff options
| -rw-r--r-- | ports-mgmt/portaudit-db/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portaudit-db/files/packaudit.sh | 15 | ||||
| -rw-r--r-- | security/portaudit-db/Makefile | 2 | ||||
| -rw-r--r-- | security/portaudit-db/files/packaudit.sh | 15 |
4 files changed, 28 insertions, 6 deletions
diff --git a/ports-mgmt/portaudit-db/Makefile b/ports-mgmt/portaudit-db/Makefile index bae0f1ecd46d..a14df35ecfbc 100644 --- a/ports-mgmt/portaudit-db/Makefile +++ b/ports-mgmt/portaudit-db/Makefile @@ -6,7 +6,7 @@ # PORTNAME= portaudit-db -PORTVERSION= 0.1.1 +PORTVERSION= 0.1.2 CATEGORIES= security DISTFILES= diff --git a/ports-mgmt/portaudit-db/files/packaudit.sh b/ports-mgmt/portaudit-db/files/packaudit.sh index 778f781ca670..0ec066ae7d26 100644 --- a/ports-mgmt/portaudit-db/files/packaudit.sh +++ b/ports-mgmt/portaudit-db/files/packaudit.sh @@ -97,7 +97,18 @@ cd "$TMPDIR" || exit 1 $XSLTPROC $XSLTPROC_EXTRA_ARGS --stringparam baseurl "$BASEURL" "$STYLESHEET" "$VUXMLDIR/vuln.xml" echo "# This part is in the public domain" $XSLTPROC $XSLTPROC_EXTRA_ARGS --stringparam baseurl "$BASEURL" "$STYLESHEET" "$PORTAUDITDBDIR/database/portaudit.xml" - $CAT "$PORTAUDITDBDIR/database/portaudit.txt" + $AWK -F\| ' + /^(#|$)/ { + print + next + } + { + if ($4) + print $1 FS $2 FS "'"$BASEURL"'" $4 ".html" FS $4 + else + print + } + ' "$PORTAUDITDBDIR/database/portaudit.txt" } | $AWK -F\| -v XLIST_FILE="$XLIST_FILE" ' BEGIN { while((getline < XLIST_FILE) > 0) @@ -109,7 +120,7 @@ cd "$TMPDIR" || exit 1 next } { - if (!ignore[$4]) + if (!($4 in ignore)) print $1 "|" $2 "|" $3 }' > auditfile echo "#CHECKSUM: MD5 `$MD5 < auditfile`" >> auditfile diff --git a/security/portaudit-db/Makefile b/security/portaudit-db/Makefile index bae0f1ecd46d..a14df35ecfbc 100644 --- a/security/portaudit-db/Makefile +++ b/security/portaudit-db/Makefile @@ -6,7 +6,7 @@ # PORTNAME= portaudit-db -PORTVERSION= 0.1.1 +PORTVERSION= 0.1.2 CATEGORIES= security DISTFILES= diff --git a/security/portaudit-db/files/packaudit.sh b/security/portaudit-db/files/packaudit.sh index 778f781ca670..0ec066ae7d26 100644 --- a/security/portaudit-db/files/packaudit.sh +++ b/security/portaudit-db/files/packaudit.sh @@ -97,7 +97,18 @@ cd "$TMPDIR" || exit 1 $XSLTPROC $XSLTPROC_EXTRA_ARGS --stringparam baseurl "$BASEURL" "$STYLESHEET" "$VUXMLDIR/vuln.xml" echo "# This part is in the public domain" $XSLTPROC $XSLTPROC_EXTRA_ARGS --stringparam baseurl "$BASEURL" "$STYLESHEET" "$PORTAUDITDBDIR/database/portaudit.xml" - $CAT "$PORTAUDITDBDIR/database/portaudit.txt" + $AWK -F\| ' + /^(#|$)/ { + print + next + } + { + if ($4) + print $1 FS $2 FS "'"$BASEURL"'" $4 ".html" FS $4 + else + print + } + ' "$PORTAUDITDBDIR/database/portaudit.txt" } | $AWK -F\| -v XLIST_FILE="$XLIST_FILE" ' BEGIN { while((getline < XLIST_FILE) > 0) @@ -109,7 +120,7 @@ cd "$TMPDIR" || exit 1 next } { - if (!ignore[$4]) + if (!($4 in ignore)) print $1 "|" $2 "|" $3 }' > auditfile echo "#CHECKSUM: MD5 `$MD5 < auditfile`" >> auditfile |