From a7b2991a70462027a07c1a54e70c4b0d71a96e64 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 1 Jan 2018 10:23:04 +0000 Subject: apache22: remove, it was eol'd in June 2017 Remove packages that only work with apache22. Remove apache22 references. --- security/Makefile | 3 +-- security/ap-modsecurity2/Makefile | 3 +-- security/otptool/DESCR | 2 -- security/otptool/Makefile | 39 -------------------------------- security/otptool/PLIST | 3 --- security/otptool/distinfo | 7 ------ security/otptool/patches/patch-configure | 24 -------------------- 7 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 security/otptool/DESCR delete mode 100644 security/otptool/Makefile delete mode 100644 security/otptool/PLIST delete mode 100644 security/otptool/distinfo delete mode 100644 security/otptool/patches/patch-configure (limited to 'security') diff --git a/security/Makefile b/security/Makefile index 760d2d09b83..4069ea86a5d 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.663 2017/12/21 07:12:39 jnemeth Exp $ +# $NetBSD: Makefile,v 1.664 2018/01/01 10:23:04 wiz Exp $ # COMMENT= Security tools @@ -231,7 +231,6 @@ SUBDIR+= openvas-libraries SUBDIR+= openvas-plugins SUBDIR+= openvas-server SUBDIR+= otpCalc -SUBDIR+= otptool SUBDIR+= p0f SUBDIR+= p11-kit SUBDIR+= p5-AuthCAS diff --git a/security/ap-modsecurity2/Makefile b/security/ap-modsecurity2/Makefile index 58e86107fd1..520243f75b1 100644 --- a/security/ap-modsecurity2/Makefile +++ b/security/ap-modsecurity2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2017/08/24 20:03:38 adam Exp $ +# $NetBSD: Makefile,v 1.37 2018/01/01 10:23:04 wiz Exp $ DISTNAME= modsecurity-apache_2.7.7 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/apache_//} @@ -12,7 +12,6 @@ COMMENT= Intrusion detection and prevention engine for web applications LICENSE= apache-2.0 APACHE_MODULE= yes -PKG_APACHE_ACCEPTED= apache22 apache24 USE_APR= yes USE_LANGUAGES= c++ c diff --git a/security/otptool/DESCR b/security/otptool/DESCR deleted file mode 100644 index 1005b9e378c..00000000000 --- a/security/otptool/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -Otptool is a client utility for two-factor authentication using one-time -passwords (OTP) generated via the HOTP/OATH algorithm defined in RFC 4226. diff --git a/security/otptool/Makefile b/security/otptool/Makefile deleted file mode 100644 index 26681eaf874..00000000000 --- a/security/otptool/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# $NetBSD: Makefile,v 1.9 2017/08/01 17:40:15 wiz Exp $ - -DISTNAME= mod_authn_otp-${DISTVERS} -PKGNAME= otptool-${DISTVERS} -PKGREVISION= 3 -CATEGORIES= security -#MASTER_SITES= http://mod-authn-otp.googlecode.com/files/ -LICENSE= apache-2.0 - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://mod-authn-otp.googlecode.com/ -COMMENT= One-Time Password command line utility - -PKG_APACHE_ACCEPTED= apache22 - -USE_LIBTOOL= yes - -.include "../../mk/apache.mk" - -DISTVERS= 1.1.6 - -SBINDIR= ${PREFIX}/sbin - -SUBST_CLASSES+= paths -SUBST_FILES.paths= configure -SUBST_VARS.paths+= SBINDIR -SUBST_STAGE.paths= post-patch - -GNU_CONFIGURE=yes - -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/otptool ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/otptool.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - -.include "../../www/apache22/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/security/otptool/PLIST b/security/otptool/PLIST deleted file mode 100644 index 2f932028144..00000000000 --- a/security/otptool/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2012/11/10 22:13:47 pettai Exp $ -bin/otptool -man/man1/otptool.1 diff --git a/security/otptool/distinfo b/security/otptool/distinfo deleted file mode 100644 index 0b5d3cee486..00000000000 --- a/security/otptool/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 01:17:53 agc Exp $ - -SHA1 (mod_authn_otp-1.1.6.tar.gz) = 80e283bca7decb0f5e7b98c7a3afa33f0c2e2e13 -RMD160 (mod_authn_otp-1.1.6.tar.gz) = e312523737835c56f6b7d175d0b8102da3642eae -SHA512 (mod_authn_otp-1.1.6.tar.gz) = a0fb4703eec7d87ce041501bd6cd78bf23fade767c7a00827a4648c1136afc707e1bca7bac41ffabe70675d819b0de0009025c9d1cf7ed645d35110ae9206739 -Size (mod_authn_otp-1.1.6.tar.gz) = 99838 bytes -SHA1 (patch-configure) = 011c00235c1d215bab48512f886776422bb55d63 diff --git a/security/otptool/patches/patch-configure b/security/otptool/patches/patch-configure deleted file mode 100644 index df8156d5a12..00000000000 --- a/security/otptool/patches/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2012/11/10 22:13:47 pettai Exp $ - -Make configure detect apxs(2) - ---- configure.orig 2012-11-10 21:27:13.000000000 +0000 -+++ configure -@@ -3666,7 +3666,7 @@ else - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin -+for as_dir in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin @SBINDIR@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -@@ -3707,7 +3707,7 @@ else - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin -+for as_dir in /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin /usr/local/apache/bin @SBINDIR@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- cgit v1.2.3