diff options
| -rw-r--r-- | security/ap-modsecurity2/Makefile | 38 | ||||
| -rw-r--r-- | security/ap-modsecurity2/distinfo | 10 | ||||
| -rw-r--r-- | security/ap-modsecurity2/patches/patch-aa | 36 |
3 files changed, 45 insertions, 39 deletions
diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile index da48b54d8a6..8f1c4830446 100644 --- a/security/ap-modsecurity2/Makefile +++ b/security/ap-modsecurity2/Makefile @@ -1,16 +1,21 @@ -# $NetBSD: Makefile,v 1.16 2011/03/19 13:31:52 obache Exp $ +# $NetBSD: Makefile,v 1.17 2011/03/19 21:18:06 dholland Exp $ -DISTNAME= modsecurity-apache_2.5.9 +DISTNAME= modsecurity-apache_2.5.13 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//} CATEGORIES= www security MASTER_SITES= http://www.modsecurity.org/download/ +LICENSE= gnu-gpl-v2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.modsecurity.org/ COMMENT= Intrusion detection and prevention engine for web applications +PKG_DESTDIR_SUPPORT= user-destdir + +APACHE_MODULE= yes PKG_APACHE_ACCEPTED= apache2 apache22 -USE_LANGUAGES+= c++ c +USE_APR= yes +USE_LANGUAGES= c++ c .include "../../mk/apache.mk" .include "options.mk" @@ -23,27 +28,30 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/apache2 CONFIGURE_ARGS+= --with-apxs=${APXS} CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre} CONFIGURE_ARGS+= --with-libxml=${BUILDLINK_PREFIX.libxml2} +CONFIGURE_ARGS+= --with-lua=${BUILDLINK_PREFIX.lua} +CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} +CONFIGURE_ARGS+= --with-apu=${BUILDLINK_PREFIX.apr-util} + +INSTALLATION_DIRS+= lib/httpd +INSTALL_ENV+= APACHEPREFIX=${BUILDLINK_PREFIX.apache} +INSTALL_ENV+= DESTDIR=${DESTDIR} -SUBST_CLASSES+= config -SUBST_STAGE.config= post-patch -SUBST_FILES.config= configure -SUBST_SED.config= -e "s|@@PREFIX@@|${PREFIX}|g" -SUBST_MESSAGE.config= Fixing configuration files. +EGDIR= share/examples/ap-modsecurity +DOCDIR= share/doc/ap-modsecurity +INSTALLATION_DIRS+= ${EGDIR} ${DOCDIR} -EGDIR= ${PREFIX}/share/examples/ap-modsecurity -CONF_FILES= ${EGDIR}/modsecurity.conf-minimal \ +CONF_FILES= ${PREFIX}/${EGDIR}/modsecurity.conf-minimal \ ${PKG_SYSCONFDIR}/httpd/modsecurity.conf BUILDLINK_API_DEPENDS.apache+= apache>=2.0.59nb2 post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ap-modsecurity - - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/modsecurity.conf-minimal ${EGDIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/modsecurity.conf-minimal \ + ${DESTDIR}${PREFIX}/${EGDIR} cd ${WRKDIR}/${DISTNAME}/doc && \ - pax -rw . ${PREFIX}/share/doc/ap-modsecurity + pax -rw . ${DESTDIR}${PREFIX}/${DOCDIR} .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" +.include "../../lang/lua/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/ap-modsecurity2/distinfo b/security/ap-modsecurity2/distinfo index 4e41638bba8..7dbef40c4a0 100644 --- a/security/ap-modsecurity2/distinfo +++ b/security/ap-modsecurity2/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2009/03/14 13:45:38 adrianp Exp $ +$NetBSD: distinfo,v 1.7 2011/03/19 21:18:06 dholland Exp $ -SHA1 (modsecurity-apache_2.5.9.tar.gz) = 875919332a918956371fe8e2f7e46d88081857cf -RMD160 (modsecurity-apache_2.5.9.tar.gz) = adab10e5eab50f0d114e3ccb47c343e744119c8f -Size (modsecurity-apache_2.5.9.tar.gz) = 1252295 bytes -SHA1 (patch-aa) = 19642ee3f22bd502208ee868cf24fb050bd2c56d +SHA1 (modsecurity-apache_2.5.13.tar.gz) = dff3dc2b360aeb4a4feebc94ff3d507a4dfad0cf +RMD160 (modsecurity-apache_2.5.13.tar.gz) = 2e7be42d5a755acc888ef28cf44598cc2540a207 +Size (modsecurity-apache_2.5.13.tar.gz) = 1421293 bytes +SHA1 (patch-aa) = 21b8ba084e0a70d4751764433ccb4c09078e057e diff --git a/security/ap-modsecurity2/patches/patch-aa b/security/ap-modsecurity2/patches/patch-aa index b5a531d110a..999f8111a3f 100644 --- a/security/ap-modsecurity2/patches/patch-aa +++ b/security/ap-modsecurity2/patches/patch-aa @@ -1,22 +1,20 @@ -$NetBSD: patch-aa,v 1.6 2009/03/14 13:45:38 adrianp Exp $ +$NetBSD: patch-aa,v 1.7 2011/03/19 21:18:06 dholland Exp $ ---- configure.orig 2009-03-12 06:15:45.000000000 +0000 -+++ configure -@@ -5479,7 +5479,7 @@ fi +destdir support. + +--- Makefile.in~ 2011-03-19 20:34:00.000000000 +0000 ++++ Makefile.in +@@ -81,8 +81,12 @@ distclean: clean + maintainer-clean: distclean + @rm -rf config config.log config.status configure mod_security2_config.h autoscan.log configure.scan build/libtool.m4 build/config.guess build/config.sub build/ltmain.sh - if test -z "${with_apr}"; then - if test -z "${apr_path}"; then -- test_paths="/usr/local/apr /usr/local /usr" -+ test_paths="@@PREFIX@@ /usr/local/apr /usr/local /usr" - else - test_paths="${apr_path}" - fi -@@ -5562,7 +5562,7 @@ fi ++# dholland 20110319 apxs -i currently doesn't know how to cope with DESTDIRs, ++# so hack around it. XXX this is abusive and someone should fix apxs. + install-mods: mod_security2.la +- $(INSTALL_MOD_SHARED) mod_security2.la ++ #$(INSTALL_MOD_SHARED) mod_security2.la ++ ${APACHEPREFIX}/share/httpd/build/instdso.sh SH_LIBTOOL='libtool' \ ++ mod_security2.la ${DESTDIR}${APACHEPREFIX}/lib/httpd - if test -z "${with_apu}"; then - if test -z "${apu_path}"; then -- test_paths="/usr/local/apr-util /usr/local/apu /usr/local/apr /usr/local /usr" -+ test_paths="@@PREFIX@@ /usr/local/apr-util /usr/local/apu /usr/local/apr /usr/local /usr" - else - test_paths="${apu_path}" - fi + ${MOD_SECURITY2:=.slo}: $(MOD_SECURITY2_H) + ${MOD_SECURITY2:=.lo}: $(MOD_SECURITY2_H) |