diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/bsmtrace3/Makefile | 2 | ||||
-rw-r--r-- | security/clamav-lts/Makefile | 2 | ||||
-rw-r--r-- | security/clamav/Makefile | 2 | ||||
-rw-r--r-- | security/libressl-devel/Makefile | 6 | ||||
-rw-r--r-- | security/libressl/Makefile | 7 | ||||
-rw-r--r-- | security/mbedtls/Makefile | 2 | ||||
-rw-r--r-- | security/openiked-portable/Makefile | 2 | ||||
-rw-r--r-- | security/openssl-devel/Makefile | 4 | ||||
-rw-r--r-- | security/openssl-quictls/Makefile | 5 | ||||
-rw-r--r-- | security/openssl/Makefile | 4 | ||||
-rw-r--r-- | security/openvpn-devel/Makefile | 4 | ||||
-rw-r--r-- | security/openvpn-mbedtls/Makefile | 2 | ||||
-rw-r--r-- | security/openvpn/Makefile | 2 | ||||
-rw-r--r-- | security/putty-gtk2/Makefile | 2 | ||||
-rw-r--r-- | security/putty-nogtk/Makefile | 2 | ||||
-rw-r--r-- | security/putty/Makefile | 2 | ||||
-rw-r--r-- | security/sig2dot/Makefile | 2 | ||||
-rw-r--r-- | security/signing-party/Makefile | 2 |
18 files changed, 22 insertions, 32 deletions
diff --git a/security/bsmtrace3/Makefile b/security/bsmtrace3/Makefile index 27ec38bedf79..9ef05d18d3fa 100644 --- a/security/bsmtrace3/Makefile +++ b/security/bsmtrace3/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libpcre.so:devel/pcre -CONFLICTS_INSTALL= bsmtrace-[0-9]* +CONFLICTS_INSTALL= bsmtrace USE_GITHUB= yes GH_ACCOUNT= openbsm diff --git a/security/clamav-lts/Makefile b/security/clamav-lts/Makefile index 2d9c79ea6a36..968e3f83b826 100644 --- a/security/clamav-lts/Makefile +++ b/security/clamav-lts/Makefile @@ -35,7 +35,7 @@ CFLAGS_i386= -march=i486 # force to use -lthr until it's not fixed. LDFLAGS+= -lthr -CONFLICTS_INSTALL= clamav-[0-9]* +CONFLICTS_INSTALL= clamav SUB_FILES= pkg-deinstall SUB_LIST+= CHMOD=${CHMOD} \ diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 1ba7ad8b2daf..83841129e985 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -25,7 +25,7 @@ CMAKE_ON= ENABLE_EXTERNAL_MSPACK TEST_TARGET= check -CONFLICTS_INSTALL= clamav-[0-9]* +CONFLICTS_INSTALL= clamav-lts SUB_FILES= pkg-message SUB_LIST+= CHMOD=${CHMOD} \ diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index f93262c3cd7a..b88b9c8d7eba 100644 --- a/security/libressl-devel/Makefile +++ b/security/libressl-devel/Makefile @@ -26,10 +26,8 @@ LIBTLS_DESC= Only install libtls (no libcrypto/libssl) MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat -CONFLICTS_INSTALL= libressl-[0-9]* \ - libretls-[0-9]* -default_CONFLICTS_INSTALL= openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl libretls +default_CONFLICTS_INSTALL= openssl openssl-devel .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/libressl/Makefile b/security/libressl/Makefile index f7b96ea29085..4906e5d40014 100644 --- a/security/libressl/Makefile +++ b/security/libressl/Makefile @@ -25,10 +25,9 @@ LIBTLS_DESC= Only install libtls (no libcrypto/libssl) MAN3_DESC= Install API manpages (section 3) NC_DESC= Install TLS-enabled netcat -CONFLICTS_INSTALL= libressl-devel-libtls-[0-9]* -libtls_CONFLICTS_INSTALL= libretls-[0-9]* -default_CONFLICTS_INSTALL= openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl-devel-libtls +libtls_CONFLICTS_INSTALL= libretls +default_CONFLICTS_INSTALL= openssl openssl-devel .if ${FLAVOR:U} == default OPTIONS_EXCLUDE= LIBTLS diff --git a/security/mbedtls/Makefile b/security/mbedtls/Makefile index b3db9e786cce..f50634a5cbed 100644 --- a/security/mbedtls/Makefile +++ b/security/mbedtls/Makefile @@ -18,7 +18,7 @@ MAKE_ENV= SHARED=1 USES= gmake tar:tgz USE_LDCONFIG= yes -CONFLICTS_INSTALL= polarssl13-[0-9]* +CONFLICTS_INSTALL= polarssl13 post-patch: @${RM} ${WRKSRC}/include/mbedtls/*.orig diff --git a/security/openiked-portable/Makefile b/security/openiked-portable/Makefile index 367468a2ddb7..0f97938ac29b 100644 --- a/security/openiked-portable/Makefile +++ b/security/openiked-portable/Makefile @@ -11,7 +11,7 @@ LICENSE= ISCL LIB_DEPENDS= libevent.so:devel/libevent -CONFLICTS_INSTALL= openiked-[0-9]* +CONFLICTS_INSTALL= openiked USES= cmake ssl USE_RC_SUBR= iked diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 804d8eb735c2..a4fa55c20589 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -14,9 +14,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl-[0-9]* \ - libressl-devel-[0-9]* \ - openssl-[0-9]* +CONFLICTS_INSTALL= libressl libressl-devel openssl HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index ca4fdb537716..32bb4d0f040d 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -11,10 +11,7 @@ COMMENT= QUIC capable fork of OpenSSL LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl-[0-9]* \ - libressl-devel-[0-9]* \ - openssl-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl libressl-devel openssl openssl-devel BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 630a02c963ef..93fb54f8b5bc 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -14,9 +14,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= libressl-[0-9]* \ - libressl-devel-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl libressl-devel openssl-devel HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index acb8539bca05..a118648f9e33 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -41,8 +41,8 @@ CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include -DCONFIGURE_GIT_REVISION='\"${GL_COMMIT}\"' -DCONFIGURE_GIT_FLAGS= LDFLAGS+= -L${LOCALBASE}/lib -CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* \ - openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* +CONFLICTS_INSTALL?= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta \ + openvpn-devel openvpn-mbedtls SUB_FILES= openvpn-client pkg-message diff --git a/security/openvpn-mbedtls/Makefile b/security/openvpn-mbedtls/Makefile index dab8f9ea7385..381fa31933a2 100644 --- a/security/openvpn-mbedtls/Makefile +++ b/security/openvpn-mbedtls/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= -mbedtls COMMENT= Secure IP/Ethernet tunnel daemon, mbedTLS-based build -CONFLICTS_INSTALL= openvpn-[0-9].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* +CONFLICTS_INSTALL= openvpn openvpn-beta openvpn-devel OPTIONS_EXCLUDE= OPENSSL PKCS11 X509ALTUSERNAME OPTIONS_SLAVE= MBEDTLS diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 0c571b012fd6..fd1e39226ae9 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-strict # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" -CONFLICTS_INSTALL?= openvpn-2.[!5].* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]* +CONFLICTS_INSTALL?= openvpn-2.[!5].* openvpn-devel openvpn-mbedtls SUB_FILES= pkg-message openvpn-client diff --git a/security/putty-gtk2/Makefile b/security/putty-gtk2/Makefile index 746a40c5ba9e..b608ba950027 100644 --- a/security/putty-gtk2/Makefile +++ b/security/putty-gtk2/Makefile @@ -8,7 +8,7 @@ EXPIRATION_DATE= 2021-12-15 OPTIONS_SLAVE= GTK2 OPTIONS_EXCLUDE= GTK3 -CONFLICTS_INSTALL= pssh-[0-9]* putty-[0-9]* putty-nogtk-[0-9]* +CONFLICTS_INSTALL= pssh putty putty-nogtk MASTERDIR= ${.CURDIR}/../../security/putty diff --git a/security/putty-nogtk/Makefile b/security/putty-nogtk/Makefile index 0f348a9ebf82..9ddb579bcfdb 100644 --- a/security/putty-nogtk/Makefile +++ b/security/putty-nogtk/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= -nogtk OPTIONS_EXCLUDE= GTK2 GTK3 -CONFLICTS_INSTALL= pssh-[0-9]* putty-[0-9]* putty-gtk2-[0-9]* +CONFLICTS_INSTALL= pssh putty putty-gtk2 MASTERDIR= ${.CURDIR}/../../security/putty diff --git a/security/putty/Makefile b/security/putty/Makefile index 6f9b7a6367e8..01e847854e31 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -16,7 +16,7 @@ USES= cpe gmake pkgconfig MAKEFILE= Makefile.gtk MAKE_ARGS+= "prefix=${PREFIX}" -CONFLICTS_INSTALL?= pssh-[0-9]* putty-gtk2-[0-9]* putty-nogtk-[0-9]* +CONFLICTS_INSTALL?= pssh putty-gtk2 putty-nogtk PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/unix diff --git a/security/sig2dot/Makefile b/security/sig2dot/Makefile index cf0442f5eb9d..ba3f33fd18d3 100644 --- a/security/sig2dot/Makefile +++ b/security/sig2dot/Makefile @@ -10,7 +10,7 @@ EXTRACT_SUFX= .pl MAINTAINER= ports@FreeBSD.org COMMENT= GPG/PGP Keyring Graph Generator -CONFLICTS_INSTALL=signing-party-[0-9]* +CONFLICTS_INSTALL=signing-party PLIST_FILES= bin/sig2dot EXTRACT_CMD= ${CP} diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile index bef06bdebd3c..74aee71b3608 100644 --- a/security/signing-party/Makefile +++ b/security/signing-party/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= gpg:security/gnupg \ USES= perl5 python gmake shebangfix SHEBANG_FILES= ${SCRIPTS} BINARY_ALIAS= sed=gsed -CONFLICTS_INSTALL=sig2dot-[0-9]* springgraph-[0-9]* +CONFLICTS_INSTALL=sig2dot springgraph USE_GITLAB= yes GL_SITE= https://salsa.debian.org/ |