diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/barnyard2-sguil/Makefile | 2 | ||||
-rw-r--r-- | security/barnyard2/Makefile | 2 | ||||
-rw-r--r-- | security/certmgr/Makefile | 2 | ||||
-rw-r--r-- | security/cowrie/Makefile | 2 | ||||
-rw-r--r-- | security/dirmngr/Makefile | 2 | ||||
-rw-r--r-- | security/gnupg/Makefile | 2 | ||||
-rw-r--r-- | security/gpgdir/Makefile | 2 | ||||
-rw-r--r-- | security/heimdal/Makefile | 3 | ||||
-rw-r--r-- | security/idea/Makefile | 2 | ||||
-rw-r--r-- | security/keychain/Makefile | 2 | ||||
-rw-r--r-- | security/krb5-117/Makefile | 3 | ||||
-rw-r--r-- | security/krb5-118/Makefile | 3 | ||||
-rw-r--r-- | security/krb5-119/Makefile | 3 | ||||
-rw-r--r-- | security/krb5-devel/Makefile | 3 | ||||
-rw-r--r-- | security/openssl-devel/Makefile | 2 | ||||
-rw-r--r-- | security/openssl/Makefile | 2 | ||||
-rw-r--r-- | security/outguess/Makefile | 2 | ||||
-rw-r--r-- | security/pear-Crypt_GPG/Makefile | 2 | ||||
-rw-r--r-- | security/signing-party/Makefile | 2 |
19 files changed, 28 insertions, 15 deletions
diff --git a/security/barnyard2-sguil/Makefile b/security/barnyard2-sguil/Makefile index 960a54753aae..55d52f5270f7 100644 --- a/security/barnyard2-sguil/Makefile +++ b/security/barnyard2-sguil/Makefile @@ -5,4 +5,6 @@ MASTERDIR= ${.CURDIR}/../barnyard2 # enable tcl binding for sguil SLAVE= yes +CONFLICTS_INSTALL= barnyard2 + .include "${MASTERDIR}/Makefile" diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile index 71e5f8057f14..da6371b85b7a 100644 --- a/security/barnyard2/Makefile +++ b/security/barnyard2/Makefile @@ -14,6 +14,8 @@ USES= autoreconf libtool USE_GITHUB= yes GH_ACCOUNT= firnsy +CONFLICTS_INSTALL?= barnyard2-sguil # bin/barnyard2 + OPTIONS_DEFINE= 64BIT ARUBA GRE IPV6 MPLS PORT_PCAP DOCS EXAMPLES OPTIONS_RADIO= DATABASE OPTIONS_RADIO_DATABASE= MYSQL MYSQL_SSL ODBC PGSQL diff --git a/security/certmgr/Makefile b/security/certmgr/Makefile index 17677ae8e0dc..981bca3e7628 100644 --- a/security/certmgr/Makefile +++ b/security/certmgr/Makefile @@ -45,6 +45,8 @@ GH_TUPLE= beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \ spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \ spf13:viper:v1.4.0:spf13_viper/vendor/github.com/spf13/viper +CONFLICTS_INSTALL= mono mono[0-9]* # bin/certmgr + GO_TARGET= ./certmgr SUB_FILES= certmgr.yaml.sample pkg-message diff --git a/security/cowrie/Makefile b/security/cowrie/Makefile index 439d04593f5b..28cc0c00cf6b 100644 --- a/security/cowrie/Makefile +++ b/security/cowrie/Makefile @@ -28,6 +28,8 @@ SHEBANG_FILES= bin/cowrie USE_GITHUB= yes USE_PYTHON= distutils noflavors autoplist +CONFLICTS_INSTALL= py*-asciinema # bin/asciinema + NO_ARCH= yes .include <bsd.port.mk> diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index be4a7e83dd43..139052da9628 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -28,6 +28,8 @@ CONFIGURE_ARGS+= --docdir=${DOCSDIR} LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -fcommon +CONFLICTS_INSTALL= gnupg # bin/dirmngr bin/dirmngr-client + OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index f95068570253..5862cb1f4bed 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= pinentry:security/pinentry USES= compiler:c11 cpe gmake iconv makeinfo pkgconfig readline sqlite tar:bzip2 -CONFLICTS= gnupg-2.0.* dirmngr +CONFLICTS= dirmngr CPE_VENDOR= gnupg CONFIGURE_ARGS= --disable-ntbtls --enable-gpg-is-gpg2 --enable-symcryptrun diff --git a/security/gpgdir/Makefile b/security/gpgdir/Makefile index 044c27f46161..922e7d1cfdf5 100644 --- a/security/gpgdir/Makefile +++ b/security/gpgdir/Makefile @@ -21,6 +21,8 @@ USES= perl5 shebangfix USE_PERL5= run SHEBANG_FILES= gpgdir +CONFLICTS_INSTALL= signing-party # bin/gpgdir + PLIST_FILES= bin/gpgdir man/man1/gpgdir.1.gz do-install: diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 892d3f72bc5a..1e28b4f8ae86 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -12,8 +12,7 @@ COMMENT= Popular BSD-licensed implementation of Kerberos 5 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= krb4 krb5 krb5-maint srp \ - wu-ftpd wu-ftpd+ipv6 +CONFLICTS= krb5 krb5-* USES= cpe gettext-runtime gssapi:bootstrap,heimdal libtool pathfix \ pkgconfig readline makeinfo ssl diff --git a/security/idea/Makefile b/security/idea/Makefile index c6f182772cff..5cfc7d5d2a7a 100644 --- a/security/idea/Makefile +++ b/security/idea/Makefile @@ -12,6 +12,8 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= ehaupt@FreeBSD.org COMMENT= Command-line IDEA encryption and decryption utility +CONFLICTS_INSTALL= intellij intellij-ultimate # bin/idea + WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS diff --git a/security/keychain/Makefile b/security/keychain/Makefile index 68581b055cf4..04e1739f6bf8 100644 --- a/security/keychain/Makefile +++ b/security/keychain/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt USE_GITHUB= yes GH_ACCOUNT= funtoo +CONFLICTS_INSTALL= py*-pycoin # bin/keychain + OPTIONS_DEFINE= DOCS NO_BUILD= yes diff --git a/security/krb5-117/Makefile b/security/krb5-117/Makefile index b480c012ce50..4e87fe7afa05 100644 --- a/security/krb5-117/Makefile +++ b/security/krb5-117/Makefile @@ -19,8 +19,7 @@ EXPIRATION_DATE= 2022-02-01 LICENSE= MIT -CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel +CONFLICTS= heimdal krb5 krb5-* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile index 789c17e75af0..0f818530bdbb 100644 --- a/security/krb5-118/Makefile +++ b/security/krb5-118/Makefile @@ -16,8 +16,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT -CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel +CONFLICTS= heimdal krb5 krb5-* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index 59da2eed06b3..47080d6e47ad 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -16,8 +16,7 @@ COMMENT= MIT implementation of RFC 4120 network authentication service LICENSE= MIT -CONFLICTS= heimdal srp krb5-11[3-6] \ - krb5-1.[0-9]* krb5-devel +CONFLICTS= heimdal krb5 krb5-* CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-devel/Makefile b/security/krb5-devel/Makefile index f4ae9cea0160..c83cdaa086f8 100644 --- a/security/krb5-devel/Makefile +++ b/security/krb5-devel/Makefile @@ -20,8 +20,7 @@ LICENSE= MIT USE_GITHUB= yes GH_TAGNAME= ${HASH} -CONFLICTS= heimdal srp krb5-11[345] \ - krb5-1.[0-9]* +CONFLICTS= heimdal krb5 krb5-* KERBEROSV_URL= http://web.mit.edu/kerberos/ USE_PERL5= build diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile index 1bff35bc34a6..8648b1c35820 100644 --- a/security/openssl-devel/Makefile +++ b/security/openssl-devel/Makefile @@ -18,7 +18,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS_INSTALL= libressl libressl-devel openssl +CONFLICTS_INSTALL= libressl libressl-devel openssl openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/openssl/Makefile b/security/openssl/Makefile index dcac89a98972..01d4eb2b8efe 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -14,7 +14,7 @@ COMMENT= TLSv1.3 capable SSL and crypto library LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS_INSTALL= libressl libressl-devel openssl-devel +CONFLICTS_INSTALL= libressl libressl-devel openssl-devel openssl-quictls HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config diff --git a/security/outguess/Makefile b/security/outguess/Makefile index 69047e6dd8fb..4fa188c277bb 100644 --- a/security/outguess/Makefile +++ b/security/outguess/Makefile @@ -18,7 +18,7 @@ LICENSE= BSD4CLAUSE DEPRECATED= Abandonware, dead upstream and last release in 2001 EXPIRATION_DATE=2022-03-31 -CONFLICTS_INSTALL= csound +CONFLICTS_INSTALL= csound libextractor # bin/extract GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/outguess diff --git a/security/pear-Crypt_GPG/Makefile b/security/pear-Crypt_GPG/Makefile index 922661e9e098..2ed4096f2435 100644 --- a/security/pear-Crypt_GPG/Makefile +++ b/security/pear-Crypt_GPG/Makefile @@ -15,6 +15,8 @@ RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.1.10:devel/pear-Console USES= pear USE_PHP= mbstring posix +CONFLICTS_INSTALL= php*-pear-Crypt_GPG # bin/crypt-gpg-pinentry + NO_ARCH= yes .include <bsd.port.mk> diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile index 74aee71b3608..406e8ed60242 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 springgraph +CONFLICTS_INSTALL= pgpdir sig2dot springgraph # bin/gpgdir bin/sig2dot bin/springgraph USE_GITLAB= yes GL_SITE= https://salsa.debian.org/ |