Date: Sat, 28 Sep 2013 15:34:00 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328583 - in head/security/pulledpork: . files Message-ID: <201309281534.r8SFY0rc053968@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Sep 28 15:33:59 2013 New Revision: 328583 URL: http://svnweb.freebsd.org/changeset/ports/328583 Log: - add stage support - fix so_rules hint Added: head/security/pulledpork/files/patch-so_rules.diff (contents, props changed) Modified: head/security/pulledpork/Makefile Modified: head/security/pulledpork/Makefile ============================================================================== --- head/security/pulledpork/Makefile Sat Sep 28 15:32:24 2013 (r328582) +++ head/security/pulledpork/Makefile Sat Sep 28 15:33:59 2013 (r328583) @@ -33,12 +33,9 @@ PLIST_FILES= bin/pulledpork.pl \ SUB_FILES= pkg-message -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= LICENSE README README.CATEGORIES README.CHANGES README.RULESET README.SHAREDOBJECTS -.endif +PORTDOCS= README README.CATEGORIES README.CHANGES README.RULESET README.SHAREDOBJECTS post-patch: @${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" ${WRKSRC}/pulledpork.pl @@ -51,28 +48,25 @@ post-patch: @${REINPLACE_CMD} -e "s| /usr/bin/perl|${PERL}|" ${WRKSRC}/contrib/oink-conv.pl do-install: - @${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} ${WRKSRC}/etc/modifysid.conf ${ETCDIR}/modifysid.conf.sample - @${MKDIR} ${DATADIR} - @${INSTALL_DATA} ${WRKSRC}/contrib/README.CONTRIB ${DATADIR}/ - @${INSTALL_SCRIPT} ${WRKSRC}/contrib/oink-conv.pl ${DATADIR}/ + @${INSTALL_SCRIPT} ${WRKSRC}/pulledpork.pl ${STAGEDIR}${PREFIX}/bin + @${MKDIR} -m 750 ${STAGEDIR}${ETCDIR} +# pulledpork.conf contains the snort user registration key, do not install world readable + @${INSTALL_DATA} -m 640 ${WRKSRC}/etc/pulledpork.conf ${STAGEDIR}${ETCDIR}/pulledpork.conf.sample + @${INSTALL_DATA} ${WRKSRC}/etc/disablesid.conf ${STAGEDIR}${ETCDIR}/disablesid.conf.sample + @${INSTALL_DATA} ${WRKSRC}/etc/dropsid.conf ${STAGEDIR}${ETCDIR}/dropsid.conf.sample + @${INSTALL_DATA} ${WRKSRC}/etc/enablesid.conf ${STAGEDIR}${ETCDIR}/enablesid.conf.sample + @${INSTALL_DATA} ${WRKSRC}/etc/modifysid.conf ${STAGEDIR}${ETCDIR}/modifysid.conf.sample + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL_DATA} ${WRKSRC}/contrib/README.CONTRIB ${STAGEDIR}${DATADIR}/ + @${INSTALL_SCRIPT} ${WRKSRC}/contrib/oink-conv.pl ${STAGEDIR}${DATADIR}/ .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/README.CATEGORIES ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/README.CHANGES ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/README.RULESET ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/README.SHAREDOBJECTS ${DOCSDIR}/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/README.CATEGORIES ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/README.CHANGES ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/README.RULESET ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/README.SHAREDOBJECTS ${STAGEDIR}${DOCSDIR}/ .endif -post-install: - @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Added: head/security/pulledpork/files/patch-so_rules.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/pulledpork/files/patch-so_rules.diff Sat Sep 28 15:33:59 2013 (r328583) @@ -0,0 +1,41 @@ +Index: etc/pulledpork.conf +=================================================================== +--- etc/pulledpork.conf (revision 268) ++++ etc/pulledpork.conf (working copy) +@@ -121,12 +121,12 @@ + + # Define your distro, this is for the precompiled shared object libs! + # Valid Distro Types: +-# Debian-5-0, Debian-6-0, +-# Ubuntu-8.04, Ubuntu-10-4 +-# Centos-4-8, Centos-5-4 ++# Debian-6-0, ++# Ubuntu-10-4, Ubuntu-12-04 ++# Centos-5-4 + # FC-12, FC-14, RHEL-5-5, RHEL-6-0 +-# FreeBSD-7-3, FreeBSD-8-1 +-# OpenBSD-4-8 ++# FreeBSD-8-1, FreeBSD-9-0 ++# OpenBSD-4-8, OpenBSD-5-2, OpenBSD-5-3 + # Slackware-13-1 + distro=FreeBSD-8.1 + +Index: pulledpork.pl +=================================================================== +--- pulledpork.pl (revision 268) ++++ pulledpork.pl (working copy) +@@ -144,10 +144,10 @@ + -D What Distro are you running on, for the so_rules + For latest supported options see http://www.snort.org/snort-rules/shared-object-rules + Valid Distro Types: +- Debian-5-0, Debian-6-0, Ubuntu-8.04, Ubuntu-10-4 +- Centos-4-8, Centos-5-4, FC-12, FC-14, RHEL-5-5, RHEL-6-0 +- FreeBSD-7-3, FreeBSD-8-1 +- OpenBSD-4-8 ++ Debian-6-0, Ubuntu-10-4, Ubuntu-12-04 ++ Centos-5-4, FC-12, FC-14, RHEL-5-5, RHEL-6-0 ++ FreeBSD-8-1, FreeBSD-9-0 ++ OpenBSD-4-8, OpenBSD-5-2, OpenBSD-5-3 + Slackware-13-1 + -e Where the enablesid config file lives. + -E Write ONLY the enabled rules to the output files.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309281534.r8SFY0rc053968>