- update pulledpork to version 0.5.0

 - replace pkg-descr text with feature list from README
 - update my email address

Approved by:	glarkin (maintainer, implicit)

4 files changed, 37 insertions, 46 deletions

diff --git a/security/pulledpork/Makefile b/security/pulledpork/Makefile
index bc6ec4928f5b..2622708eae3c 100644
--- a/security/pulledpork/Makefile
+++ b/security/pulledpork/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	pulledpork
-PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
-MAINTAINER=	ohauer@gmx.de
+MAINTAINER=	ohauer@FreeBSD.org
 COMMENT=	Script to update snort-2.8+ rules
 
-RUN_DEPENDS=	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
-		p5-Crypt-SSLeay>=0.57:${PORTSDIR}/security/p5-Crypt-SSLeay
+RUN_DEPENDS=	p5-Crypt-SSLeay>=0.57:${PORTSDIR}/security/p5-Crypt-SSLeay \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
 LICENSE=	GPLv2
 
@@ -27,7 +26,10 @@ PLIST_FILES=	bin/pulledpork.pl \
 		%%ETCDIR%%/disablesid.conf.sample \
 		%%ETCDIR%%/dropsid.conf.sample \
 		%%ETCDIR%%/enablesid.conf.sample \
-		%%ETCDIR%%/pulledpork.conf.sample
+		%%ETCDIR%%/modifysid.conf.sample \
+		%%ETCDIR%%/pulledpork.conf.sample \
+		%%DATADIR%%/contrib/README.CONTRIB \
+		%%DATADIR%%/contrib/oink-conv.pl
 
 SUB_FILES=	pkg-message
 
@@ -46,17 +48,23 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|snort/enablesid.conf|pulledpork/enablesid.conf|g' \
 		-e 's|snort/dropsid.conf|pulledpork/dropsid.conf|g' \
 		-e 's|snort/disablesid.conf|pulledpork/disablesid.conf|g' \
+		-e 's|snort/modifysid.conf|pulledpork/modifysid.conf|g' \
 		-e "s|/usr/local/lib/snort_dynamicrules/|${PREFIX}/etc/snort/so_rules/|g" \
 		${WRKSRC}/etc/pulledpork.conf
+	@${REINPLACE_CMD} -e "s| /usr/bin/perl|${PERL}|" ${WRKSRC}/contrib/oink-conv.pl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/pulledpork.pl ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/pulledpork.pl ${PREFIX}/bin
 	@${MKDIR} -m 750 ${ETCDIR}
 	# pulledpork.conf contains the snort user registration key, do not install world readable
-	${INSTALL_DATA} -m 440 ${WRKSRC}/etc/pulledpork.conf ${ETCDIR}/pulledpork.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/etc/disablesid.conf ${ETCDIR}/disablesid.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/etc/dropsid.conf    ${ETCDIR}/dropsid.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/etc/enablesid.conf  ${ETCDIR}/enablesid.conf.sample
+	@${INSTALL_DATA} -m 440 ${WRKSRC}/etc/pulledpork.conf ${ETCDIR}/pulledpork.conf.sample
+	@${INSTALL_DATA} ${WRKSRC}/etc/disablesid.conf ${ETCDIR}/disablesid.conf.sample
+	@${INSTALL_DATA} ${WRKSRC}/etc/dropsid.conf    ${ETCDIR}/dropsid.conf.sample
+	@${INSTALL_DATA} ${WRKSRC}/etc/enablesid.conf  ${ETCDIR}/enablesid.conf.sample
+	@${INSTALL_DATA} ${WRKSRC}/etc/modifysid.conf  ${ETCDIR}/modifysid.conf.sample
+	@${MKDIR} ${DATADIR}/contrib
+	@${INSTALL_DATA} ${WRKSRC}/contrib/README.CONTRIB ${DATADIR}/contrib/
+	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/oink-conv.pl ${DATADIR}/contrib/
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/security/pulledpork/distinfo b/security/pulledpork/distinfo
index 8c6296e6da28..d8d24ae39e0c 100644
--- a/security/pulledpork/distinfo
+++ b/security/pulledpork/distinfo
@@ -1,3 +1,2 @@
-MD5 (pulledpork-0.4.2.tar.gz) = d11b9d884f940a0df293718a4d4b3913
-SHA256 (pulledpork-0.4.2.tar.gz) = 3491b8c3c99c621cfd6467da2c43866f33ede1d096538e4a497cdf52b49ad677
-SIZE (pulledpork-0.4.2.tar.gz) = 24678
+SHA256 (pulledpork-0.5.0.tar.gz) = 9e69873d737e4fc8dfd9b3a98316e4ff41bd8c4accda72f18036b96568c48872
+SIZE (pulledpork-0.5.0.tar.gz) = 29958
diff --git a/security/pulledpork/files/pkg-message.in b/security/pulledpork/files/pkg-message.in
index abf9f13bb5f1..352dd96fe769 100644
--- a/security/pulledpork/files/pkg-message.in
+++ b/security/pulledpork/files/pkg-message.in
@@ -6,7 +6,7 @@ In order to use pulled pork, adjust the config files located in
 
 Important Note:
 
-Snort change the way rules are published. In June 2010 Snort will
+Snort changed the way rules are published. Since June 2010 Snort
 stop offering rules in the "snortrules-snapshot-CURRENT" format.
 
 Instead, rules will be released for specific Snort versions.
diff --git a/security/pulledpork/pkg-descr b/security/pulledpork/pkg-descr
index fed727c880c2..5ecd224cba21 100644
--- a/security/pulledpork/pkg-descr
+++ b/security/pulledpork/pkg-descr
@@ -1,37 +1,21 @@
 pulledpork is a Perl script which helps to update your Snort 2.8+ rules.
 
-The sample config file comes predefined with the new settings for
-snort.org downloads, which will change in June 2010.
+-= Features and Capabilities =-
 
-BE SURE to read through the master pulledpork.conf file thoroughly,
-as there are many changes as of snort 2.8.6.0 that WILL affect you,
-even if you are NOT yet running 2.8.6.0!
-
-Features:
-    * Flowbit tracking!
-    * capability to specify base ruleset (see README.RULESETS) in master
-      pulledpork.conf file.
-    * Handle preprocessor and sensitive-information rulesets
-    * Ability to define sid ranges in any of the sid modification .conf files
-    * Ability to specify references in any of the sid modification .conf files
-    * Ability to ignore entire rule categories (i.e. not include them)
-    * Specify locally stored rules files that need their meta data included
-      in sid-msg.map
-    * Ability to specify your arch for so_rules
-    * Rules are written to only two distinct files
-    * Support metadata based VRT recommended rulesets
-    * Maintain an optional rule changelog
-    * Support for setting rules to Drop
-    * Support for multi-line rules
-    * Rule modification, i.e. disabling of specific rules within rule sets
-    * Outputs changes in rules files if any rules have been added / modified
-    * Compares new rules files with current rule sets
-    * Automated retrieval of certain variables (Distro, Snort Version.. etc)
-    * Downloads latest rules file
-    * Verifies MD5 of local rules file
-    * If MD5 has not changed from snort.org.. doesn't fetch files again
-    * handle both rules and so_rules
-    * Capability to generate stub files
+ * Automated downloading, parsing, state modification and rule
+   modification for all of your snort rulesets.
+ * Checksum verification for all major rule downloads
+ * Automatic generation of updated sid-msg.map file
+ * Capability to include your local.rules in sid-msg.map file
+ * Capability to pull rules tarballs from custom urls
+ * Complete Shared Object support
+ * Capability to download multiple disparate rulesets at once
+ * Maintains accurate changelog
+ * Capability to HUP processes after rules download
+ * Aids in tuning of rulesets
+ * Verbose output so that you know EXACTLY what is happening
+ * Minimal Perl Module dependencies
+ * A sweet smokey flavor throughout the pork!
 
 
 WWW: http://code.google.com/p/pulledpork/