From e8b16d2e6ef064fdbdb21aac700820ea155a78f6 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 28 Mar 2005 09:39:56 +0000 Subject: Remove security/cyrus-sasl and security/cy-login. These packages tracked the Cyrus SASL 1.5.x releases, which are no longer maintained. Adjust packages to use security/cyrus-sasl2 instead for SASL support. This closes PR pkg/28218 and PR pkg/29736. --- mail/postfix-current/options.mk | 23 ++--------------------- mail/postfix/options.mk | 26 +++----------------------- mail/sendmail/options.mk | 16 +++------------- mail/sendmail812/Makefile | 4 +--- 4 files changed, 9 insertions(+), 60 deletions(-) (limited to 'mail') diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index 137fe82c7da..77f23e9ef8a 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2004/11/17 19:37:07 xtraeme Exp $ +# $NetBSD: options.mk,v 1.8 2005/03/28 09:39:57 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postfix #PKG_SUPPORTED_OPTIONS= inet6 ldap mysql mysql4 pcre pgsql sasl tls @@ -104,8 +104,7 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ### explicitly specified, then build with SASLv2. ### .if !empty(PKG_OPTIONS:Msasl) -. if !defined(USE_SASL2) && !defined(USE_SASL) -. include "../../security/cyrus-sasl2/buildlink3.mk" +. include "../../security/cyrus-sasl2/buildlink3.mk" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl SASLLIBDIR= ${PREFIX}/lib/sasl2 PWCHECK_METHOD= auxprop @@ -113,24 +112,6 @@ CCARGS+= -DUSE_SASL_AUTH AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 -. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -. include "../../security/cyrus-sasl2/buildlink3.mk" -BUILDLINK_INCDIRS.cyrus-sasl= include/sasl -SASLLIBDIR= ${PREFIX}/lib/sasl2 -PWCHECK_METHOD= auxprop -CCARGS+= -DUSE_SASL_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl2 -. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -. include "../../security/cyrus-sasl/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl -PWCHECK_METHOD= sasldb -CCARGS+= -DUSE_SASL_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl -. endif PLIST_SRC+= ${PKGDIR}/PLIST.sasl MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index 677ec47b0ca..2639aa27560 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.18 2005/03/28 08:53:07 jlam Exp $ +# $NetBSD: options.mk,v 1.19 2005/03/28 09:39:57 jlam Exp $ # Global and legacy options @@ -81,12 +81,10 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ .endif ### -### SASL support for SMTP authentication. If neither SASLv1 or SASLv2 is -### explicitly specified, then build with SASLv2. +### SASL support for SMTP authentication. ### .if !empty(PKG_OPTIONS:Msasl) -. if !defined(USE_SASL2) && !defined(USE_SASL) -. include "../../security/cyrus-sasl2/buildlink3.mk" +. include "../../security/cyrus-sasl2/buildlink3.mk" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl SASLLIBDIR= ${PREFIX}/lib/sasl2 PWCHECK_METHOD= auxprop @@ -94,24 +92,6 @@ CCARGS+= -DUSE_SASL_AUTH AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 -. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -. include "../../security/cyrus-sasl2/buildlink3.mk" -BUILDLINK_INCDIRS.cyrus-sasl= include/sasl -SASLLIBDIR= ${PREFIX}/lib/sasl2 -PWCHECK_METHOD= auxprop -CCARGS+= -DUSE_SASL_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl2 -. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -. include "../../security/cyrus-sasl/buildlink3.mk" -SASLLIBDIR= ${PREFIX}/lib/sasl -PWCHECK_METHOD= sasldb -CCARGS+= -DUSE_SASL_AUTH -AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ - -lsasl -. endif PLIST_SUBST+= SASL= MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk index 8a6d258c469..98facd7a9ab 100644 --- a/mail/sendmail/options.mk +++ b/mail/sendmail/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2005/01/02 11:59:36 adrianp Exp $ +# $NetBSD: options.mk,v 1.5 2005/03/28 09:39:57 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail -PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl sasl2 starttls tcpwrappers \ +PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl starttls tcpwrappers \ socketmap .if !defined(PKG_OPTIONS.sendmail) @@ -10,14 +10,6 @@ PKG_DEFAULT_OPTIONS+= tcpwrappers .include "../../mk/bsd.options.mk" -### -### Can't support SASLv1 and SASLv2 -### -.if !empty(PKG_OPTIONS:Msasl) && !empty(PKG_OPTIONS:Msasl2) -PKG_FAIL_REASON+= "SASLv1 and SASLv2 cannot both be compiled in." \ - "Please change ${PKG_OPTIONS_VAR} to one or the other." -.endif - ### ### Berkeley DB version 2/4 format for on disk databases e.g. aliases ### @@ -38,9 +30,7 @@ PKG_FAIL_REASON+= "SASLv1 and SASLv2 cannot both be compiled in." \ ### Use SASL/v2 for SMTP AUTH ### .if !empty(PKG_OPTIONS:Msasl) -. include "../../security/cyrus-sasl/buildlink3.mk" -. elif !empty(PKG_OPTIONS:Msasl2) -. include "../../security/cyrus-sasl2/buildlink3.mk" +. include "../../security/cyrus-sasl2/buildlink3.mk" .endif ### diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile index 585e77165f7..1054fceeaac 100644 --- a/mail/sendmail812/Makefile +++ b/mail/sendmail812/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/10/03 00:12:54 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/03/28 09:39:57 jlam Exp $ .include "../../mail/sendmail812/Makefile.common" @@ -28,8 +28,6 @@ USE_DB2?= NO .if defined(USE_SASL2) && ${USE_SASL2} == YES .include "../../security/cyrus-sasl2/buildlink3.mk" -.elif defined(USE_SASL) && ${USE_SASL} == YES -.include "../../security/cyrus-sasl/buildlink3.mk" .endif .if defined(USE_STARTTLS) && ${USE_STARTTLS} == YES -- cgit v1.2.3