[pkgsrc/trunk]: pkgsrc Remove security/cyrus-sasl and security/cy-login. The...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Remove security/cyrus-sasl and security/cy-login. The...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:35:38 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/357b3c4d626f
branches:  trunk
changeset: 491701:357b3c4d626f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 28 09:39:56 2005 +0000

description:
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.

diffstat:

 doc/CHANGES                               |    4 +-
 mail/postfix-current/options.mk           |   23 +-
 mail/postfix/options.mk                   |   26 +-
 mail/sendmail/options.mk                  |   16 +-
 mail/sendmail812/Makefile                 |    4 +-
 misc/kdepim3/Makefile                     |    8 +-
 misc/kdepim3/buildlink3.mk                |    4 +-
 mk/defaults/obsolete.mk                   |    6 +-
 security/Makefile                         |    4 +-
 security/cy-login/DESCR                   |    9 -
 security/cy-login/Makefile                |   32 --
 security/cy-login/PLIST                   |    2 -
 security/cyrus-sasl/DEINSTALL             |   23 -
 security/cyrus-sasl/DESCR                 |   14 -
 security/cyrus-sasl/INSTALL               |   12 -
 security/cyrus-sasl/Makefile              |   57 ----
 security/cyrus-sasl/Makefile.common       |   66 -----
 security/cyrus-sasl/PLIST                 |   56 ----
 security/cyrus-sasl/buildlink3.mk         |   30 --
 security/cyrus-sasl/distinfo              |   23 -
 security/cyrus-sasl/files/sasl-config.in  |  102 -------
 security/cyrus-sasl/files/sasl_pwcheck.sh |   39 --
 security/cyrus-sasl/files/saslauthd.sh    |   45 ---
 security/cyrus-sasl/patches/patch-aa      |   50 ---
 security/cyrus-sasl/patches/patch-ab      |   13 -
 security/cyrus-sasl/patches/patch-ac      |   15 -
 security/cyrus-sasl/patches/patch-ad      |   17 -
 security/cyrus-sasl/patches/patch-ae      |  395 ------------------------------
 security/cyrus-sasl/patches/patch-af      |   26 -
 security/cyrus-sasl/patches/patch-ag      |   64 ----
 security/cyrus-sasl/patches/patch-ah      |   30 --
 security/cyrus-sasl/patches/patch-ai      |   26 -
 security/cyrus-sasl/patches/patch-aj      |   13 -
 security/cyrus-sasl/patches/patch-ak      |   13 -
 security/cyrus-sasl/patches/patch-al      |  148 -----------
 security/cyrus-sasl/patches/patch-am      |   13 -
 security/cyrus-sasl/patches/patch-an      |  114 --------
 security/cyrus-sasl/patches/patch-ao      |   13 -
 security/cyrus-sasl/patches/patch-ap      |   55 ----
 security/cyrus-sasl/patches/patch-aq      |   35 --
 security/cyrus-sasl/patches/patch-ar      |   16 -
 x11/kdebase3/Makefile                     |    8 +-
 x11/kdebase3/buildlink3.mk                |    4 +-
 43 files changed, 28 insertions(+), 1645 deletions(-)

diffs (truncated from 2007 to 300 lines):

diff -r 72c17c559f19 -r 357b3c4d626f doc/CHANGES
--- a/doc/CHANGES       Mon Mar 28 08:57:58 2005 +0000
+++ b/doc/CHANGES       Mon Mar 28 09:39:56 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.9660 2005/03/28 02:02:48 wiz Exp $
+$NetBSD: CHANGES,v 1.9661 2005/03/28 09:39:56 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -1791,3 +1791,5 @@
        Updated p5-Text-Shellwords to 1.07 [wiz 2005-03-27]
        Added shapelib-1.2.10 [wiz 2005-03-27]
        Updated dnstop to 20050203 [wiz 2005-03-27]
+       Removed cyrus-sasl [jlam 2005-03-28]
+       Removed cy-login [jlam 2005-03-28]
diff -r 72c17c559f19 -r 357b3c4d626f mail/postfix-current/options.mk
--- a/mail/postfix-current/options.mk   Mon Mar 28 08:57:58 2005 +0000
+++ b/mail/postfix-current/options.mk   Mon Mar 28 09:39:56 2005 +0000
@@ -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 @@
 ### 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 @@
 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 -r 72c17c559f19 -r 357b3c4d626f mail/postfix/options.mk
--- a/mail/postfix/options.mk   Mon Mar 28 08:57:58 2005 +0000
+++ b/mail/postfix/options.mk   Mon Mar 28 09:39:56 2005 +0000
@@ -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 @@
 .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 @@
 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 -r 72c17c559f19 -r 357b3c4d626f mail/sendmail/options.mk
--- a/mail/sendmail/options.mk  Mon Mar 28 08:57:58 2005 +0000
+++ b/mail/sendmail/options.mk  Mon Mar 28 09:39:56 2005 +0000
@@ -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)
@@ -11,14 +11,6 @@
 .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
 ###
 .if !empty(PKG_OPTIONS:Mdb2)
@@ -38,9 +30,7 @@
 ### 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 -r 72c17c559f19 -r 357b3c4d626f mail/sendmail812/Makefile
--- a/mail/sendmail812/Makefile Mon Mar 28 08:57:58 2005 +0000
+++ b/mail/sendmail812/Makefile Mon Mar 28 09:39:56 2005 +0000
@@ -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 @@
 
 .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
diff -r 72c17c559f19 -r 357b3c4d626f misc/kdepim3/Makefile
--- a/misc/kdepim3/Makefile     Mon Mar 28 08:57:58 2005 +0000
+++ b/misc/kdepim3/Makefile     Mon Mar 28 09:39:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/03/24 05:08:41 markd Exp $
+# $NetBSD: Makefile,v 1.41 2005/03/28 09:39:57 jlam Exp $
 
 DISTNAME=      kdepim-${_KDE_VERSION}
 CATEGORIES=    misc
@@ -11,9 +11,9 @@
 USE_PERL=              run
 USE_GNU_TOOLS+=                awk yacc
 
-PKG_DEFAULT_OPTIONS+=  sasl2
+PKG_DEFAULT_OPTIONS+=  sasl
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kdepim
-PKG_SUPPORTED_OPTIONS= sasl2
+PKG_SUPPORTED_OPTIONS= sasl
 .include "../../mk/bsd.options.mk"
 
 BUILDLINK_DEPENDS.gpgme+=     gpgme>=0.4.5
@@ -37,7 +37,7 @@
 .include "../../meta-pkgs/kde3/kde3.mk"
 BUILDLINK_DEPMETHOD.qt3-tools= full
 
-.if !empty(PKG_OPTIONS:Msasl2)
+.if !empty(PKG_OPTIONS:Msasl)
 .include "../../security/cyrus-sasl2/buildlink3.mk"
 PLIST_SUBST+=  HAVE_SASL=""
 .else
diff -r 72c17c559f19 -r 357b3c4d626f misc/kdepim3/buildlink3.mk
--- a/misc/kdepim3/buildlink3.mk        Mon Mar 28 08:57:58 2005 +0000
+++ b/misc/kdepim3/buildlink3.mk        Mon Mar 28 09:39:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/03/24 05:08:41 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/28 09:39:57 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@
 .include "../../comms/libmal/buildlink3.mk"
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
-.if !empty(PKG_OPTIONS.kdepim:Msasl2)
+.if !empty(PKG_OPTIONS.kdepim:Msasl)
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
 .endif
 .include "../../x11/kdebase3/buildlink3.mk"
diff -r 72c17c559f19 -r 357b3c4d626f mk/defaults/obsolete.mk
--- a/mk/defaults/obsolete.mk   Mon Mar 28 08:57:58 2005 +0000
+++ b/mk/defaults/obsolete.mk   Mon Mar 28 09:39:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.4 2005/03/06 02:43:05 wiz Exp $
+# $NetBSD: obsolete.mk,v 1.5 2005/03/28 09:39:57 jlam Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
@@ -9,7 +9,7 @@
 .endif
 
 ###
-### Set PKG_DEFAULT_OPTIONS based on global variable settings.
+### Set PKG_DEFAULT_OPTIONS based on to-be-deprecated global variables.
 ###
 .if defined(KERBEROS)
 .  if ${KERBEROS} == "4"
@@ -61,7 +61,7 @@
 PKG_DEFAULT_OPTIONS+=  sasl
 .endif
 .if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=  sasl2
+PKG_DEFAULT_OPTIONS+=  sasl
 .endif
 .if defined(USE_SJ3) && !empty(USE_SJ3:M[yY][eE][sS])
 PKG_DEFAULT_OPTIONS+=  sj3
diff -r 72c17c559f19 -r 357b3c4d626f security/Makefile
--- a/security/Makefile Mon Mar 28 08:57:58 2005 +0000
+++ b/security/Makefile Mon Mar 28 09:39:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.231 2005/03/24 17:12:46 agc Exp $
+# $NetBSD: Makefile,v 1.232 2005/03/28 09:39:57 jlam Exp $
 #
 
 COMMENT=       Security tools
@@ -24,7 +24,6 @@
 SUBDIR+=       courier-authlib
 SUBDIR+=       crack
 SUBDIR+=       crypto++
-SUBDIR+=       cy-login
 SUBDIR+=       cy2-anonymous
 SUBDIR+=       cy2-crammd5
 SUBDIR+=       cy2-digestmd5
@@ -34,7 +33,6 @@
 SUBDIR+=       cy2-otp
 SUBDIR+=       cy2-plain
 SUBDIR+=       cy2-sql
-SUBDIR+=       cyrus-sasl
 SUBDIR+=       cyrus-sasl2
 SUBDIR+=       cyrus-saslauthd
 SUBDIR+=       ddos-scan
diff -r 72c17c559f19 -r 357b3c4d626f security/cy-login/DESCR
--- a/security/cy-login/DESCR   Mon Mar 28 08:57:58 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-SASL is a method for adding authentication support to connection-based
-protocols.  To use SASL, a protocol includes a command for identifying and
-authenticating a user to a server and for optionally negotiating protection
-of subsequent protocol interactions.  If its use is negotiated, a security
-layer is inserted between the protocol and the connection.
-
-This is the Cyrus SASL plugin that implements the LOGIN authentication
-mechanism.  It's recommended that it only be used if absolutely necessary
-since it is not a secure authentication scheme.
diff -r 72c17c559f19 -r 357b3c4d626f security/cy-login/Makefile
--- a/security/cy-login/Makefile        Mon Mar 28 08:57:58 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2005/02/07 11:35:47 jlam Exp $
-
-PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy-login/}
-PKGREVISION=   1
-COMMENT=       Cyrus SASL LOGIN authentication plugin
-SASL_PLUGIN=   YES
-
-.include "../cyrus-sasl/Makefile.common"
-
-# We need to configure the PLAIN plugin as well since some of the important
-# build variables for the LOGIN plugin are only set if PLAIN is configured.
-#
-CONFIGURE_ARGS+=       --enable-login          # LOGIN
-CONFIGURE_ARGS+=       --enable-plain          # PLAIN
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.cy-login
-PKG_SUPPORTED_OPTIONS= PAM
-.include "../../mk/bsd.options.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc -cyrus-sasl1 (package removed).
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/html2text Needs gcc3 (for istream). Closes P...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc -cyrus-sasl1 (package removed).
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/html2text Needs gcc3 (for istream). Closes P...
Indexes:
Home | Main Index | Thread Index | Old Index