From owner-freebsd-ports Sun Jul 7 5:20:32 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3407E37B400 for ; Sun, 7 Jul 2002 05:20:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7105943E31 for ; Sun, 7 Jul 2002 05:20:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g67CK2JU014444 for ; Sun, 7 Jul 2002 05:20:02 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g67CK2Fs014443; Sun, 7 Jul 2002 05:20:02 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A155F37B405; Sun, 7 Jul 2002 05:18:07 -0700 (PDT) Received: from mail.absolight.net (lmtp1.absolight.com [212.43.217.36]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8188843E31; Sun, 7 Jul 2002 05:18:06 -0700 (PDT) (envelope-from root@mx2.absolight.net) Received: by mail.absolight.net (Postfix, from userid 0) id 0A36A2A94; Sun, 7 Jul 2002 14:18:04 +0200 (CEST) Message-Id: <20020707121804.0A36A2A94@mail.absolight.net> Date: Sun, 7 Jul 2002 14:18:04 +0200 (CEST) From: Mathieu Arnold Reply-To: Mathieu Arnold To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org, hetzels@westbend.net, khera@kciLink.com, obrien@FreeBSD.org, shuna@pop16.odn.ne.jp, udo.schweigert@siemens.com, ume@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/40288: moving saslv1 includes files to make it easier to add saslv2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 40288 >Category: ports >Synopsis: moving saslv1 includes files to make it easier to add saslv2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Jul 07 05:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Mathieu Arnold >Release: FreeBSD 4.6-RELEASE i386 >Organization: Absolight >Environment: System: FreeBSD lmtp1.absolight.com 4.6-RELEASE FreeBSD 4.6-RELEASE #0: Tue Jun 11 06:14:12 GMT 2002 murray@builder.freebsdmall.com:/usr/src/sys/compile/GENERIC i386 >Description: SASL v2 Installs its include files into /usr/local/include/sasl. SASL v1 originaly installs its into /usr/local/include, but the SASL v1 port changed it to use /usr/local/include/sasl. It should be better if the SASL v2 goes unaltered into /usr/local/include/sasl, so existing SASL v1 port should use /usr/local/include/sasl1. This PR provides a patch to update the SASL v1 port and all ports using it. >How-To-Repeat: >Fix: Here is the patch Index: databases/cyrus-imspd/files/patch-aa =================================================================== RCS file: /home/ncvs/ports/databases/cyrus-imspd/files/patch-aa,v retrieving revision 1.1 diff -u -r1.1 patch-aa --- databases/cyrus-imspd/files/patch-aa 30 Mar 2002 10:23:57 -0000 1.1 +++ databases/cyrus-imspd/files/patch-aa 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ #include "dispatch.h" -#include -+#include ++#include #ifndef HAVE_GETDTABLESIZE #define getdtablesize() 32 Index: databases/cyrus-imspd/files/patch-ab =================================================================== RCS file: /home/ncvs/ports/databases/cyrus-imspd/files/patch-ab,v retrieving revision 1.1 diff -u -r1.1 patch-ab --- databases/cyrus-imspd/files/patch-ab 30 Mar 2002 10:23:57 -0000 1.1 +++ databases/cyrus-imspd/files/patch-ab 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ #define MAX_BUF 4096 -#include -+#include ++#include /* a file buffer structure */ Index: databases/cyrus-imspd/files/patch-ac =================================================================== RCS file: /home/ncvs/ports/databases/cyrus-imspd/files/patch-ac,v retrieving revision 1.1 diff -u -r1.1 patch-ac --- databases/cyrus-imspd/files/patch-ac 30 Mar 2002 10:23:57 -0000 1.1 +++ databases/cyrus-imspd/files/patch-ac 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ #include #include -#include -+#include ++#include #include #include "version.h" #include "dispatch.h" Index: databases/cyrus-imspd/files/patch-ad =================================================================== RCS file: /home/ncvs/ports/databases/cyrus-imspd/files/patch-ad,v retrieving revision 1.1 diff -u -r1.1 patch-ad --- databases/cyrus-imspd/files/patch-ad 30 Mar 2002 10:23:57 -0000 1.1 +++ databases/cyrus-imspd/files/patch-ad 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ #include #include "xmalloc.h" -#include -+#include ++#include #include "util.h" #include "syncdb.h" Index: databases/cyrus-imspd/files/patch-ae =================================================================== RCS file: /home/ncvs/ports/databases/cyrus-imspd/files/patch-ae,v retrieving revision 1.1 diff -u -r1.1 patch-ae --- databases/cyrus-imspd/files/patch-ae 30 Mar 2002 10:23:57 -0000 1.1 +++ databases/cyrus-imspd/files/patch-ae 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ #endif -#include -+#include ++#include #ifdef HAVE_SSL #include Index: databases/cyrus-imspd/files/patch-af =================================================================== RCS file: /home/ncvs/ports/databases/cyrus-imspd/files/patch-af,v retrieving revision 1.1 diff -u -r1.1 patch-af --- databases/cyrus-imspd/files/patch-af 30 Mar 2002 10:23:57 -0000 1.1 +++ databases/cyrus-imspd/files/patch-af 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ #define INCLUDED_IMCLIENT_H -#include -+#include ++#include struct imclient; struct sasl_client; /* to avoid having to include sasl sometimes */ Index: databases/cyrus-imspd/files/patch-ag =================================================================== RCS file: /home/ncvs/ports/databases/cyrus-imspd/files/patch-ag,v retrieving revision 1.1 diff -u -r1.1 patch-ag --- databases/cyrus-imspd/files/patch-ag 30 Mar 2002 10:23:57 -0000 1.1 +++ databases/cyrus-imspd/files/patch-ag 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ #include -#include -+#include ++#include #ifdef HAVE_SSL #include Index: japanese/mutt/files/patch-aj =================================================================== RCS file: /home/ncvs/ports/japanese/mutt/files/patch-aj,v retrieving revision 1.1 diff -u -r1.1 patch-aj --- japanese/mutt/files/patch-aj 23 Jun 2002 22:56:15 -0000 1.1 +++ japanese/mutt/files/patch-aj 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ if test "$with_sasl" != "yes" then - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" -+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1" LDFLAGS="$LDFLAGS -L$with_sasl/lib" fi Index: japanese/mutt-devel/files/patch-aj =================================================================== RCS file: /home/ncvs/ports/japanese/mutt-devel/files/patch-aj,v retrieving revision 1.1 diff -u -r1.1 patch-aj --- japanese/mutt-devel/files/patch-aj 23 Jun 2002 23:12:59 -0000 1.1 +++ japanese/mutt-devel/files/patch-aj 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ if test "$with_sasl" != "yes" then - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" -+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1" LDFLAGS="$LDFLAGS -L$with_sasl/lib" fi Index: mail/cyrus/files/patch-ac =================================================================== RCS file: /home/ncvs/ports/mail/cyrus/files/patch-ac,v retrieving revision 1.1 diff -u -r1.1 patch-ac --- mail/cyrus/files/patch-ac 13 May 2000 17:20:06 -0000 1.1 +++ mail/cyrus/files/patch-ac 2 Jul 2002 14:41:12 -0000 @@ -5,7 +5,7 @@ LIB_SASL="-L$sasldir/lib -lsasl" - SASLFLAGS="-I$sasldir/include" -+ SASLFLAGS="-I$sasldir/include/sasl" ++ SASLFLAGS="-I$sasldir/include/sasl1" fi Index: mail/cyrus-imapd/files/patch-ac =================================================================== RCS file: /home/ncvs/ports/mail/cyrus-imapd/files/patch-ac,v retrieving revision 1.2 diff -u -r1.2 patch-ac --- mail/cyrus-imapd/files/patch-ac 13 Mar 2001 11:15:12 -0000 1.2 +++ mail/cyrus-imapd/files/patch-ac 2 Jul 2002 14:41:12 -0000 @@ -7,7 +7,7 @@ if test -d ${with_sasl}; then ac_cv_sasl_where_lib=${with_sasl}/lib - ac_cv_sasl_where_inc=${with_sasl}/include -+ ac_cv_sasl_where_inc=${with_sasl}/include/sasl ++ ac_cv_sasl_where_inc=${with_sasl}/include/sasl1 SASLFLAGS="-I$ac_cv_sasl_where_inc" LIB_SASL="-L$ac_cv_sasl_where_lib" Index: mail/mutt/files/patch-configure.in =================================================================== RCS file: /home/ncvs/ports/mail/mutt/files/patch-configure.in,v retrieving revision 1.2 diff -u -r1.2 patch-configure.in --- mail/mutt/files/patch-configure.in 22 Jun 2002 00:15:41 -0000 1.2 +++ mail/mutt/files/patch-configure.in 2 Jul 2002 14:41:12 -0000 @@ -14,7 +14,7 @@ if test "$with_sasl" != "yes" then - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" -+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1" LDFLAGS="$LDFLAGS -L$with_sasl/lib" fi Index: mail/mutt-devel/files/patch-01 =================================================================== RCS file: /home/ncvs/ports/mail/mutt-devel/files/patch-01,v retrieving revision 1.17 diff -u -r1.17 patch-01 --- mail/mutt-devel/files/patch-01 31 Mar 2002 13:42:22 -0000 1.17 +++ mail/mutt-devel/files/patch-01 2 Jul 2002 14:41:12 -0000 @@ -5,6 +5,6 @@ if test "$with_sasl" != "yes" then - CPPFLAGS="$CPPFLAGS -I$with_sasl/include" -+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl" ++ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1" LDFLAGS="$LDFLAGS -L$with_sasl/lib" fi Index: mail/postfix/files/patch-ei =================================================================== RCS file: /home/ncvs/ports/mail/postfix/files/patch-ei,v retrieving revision 1.1 diff -u -r1.1 patch-ei --- mail/postfix/files/patch-ei 4 Mar 2001 19:34:58 -0000 1.1 +++ mail/postfix/files/patch-ei 2 Jul 2002 14:41:12 -0000 @@ -14,8 +14,8 @@ * SASL library. */ #ifdef USE_SASL_AUTH -! #include -! #include +! #include +! #include #endif /* Index: mail/postfix/files/patch-ej =================================================================== RCS file: /home/ncvs/ports/mail/postfix/files/patch-ej,v retrieving revision 1.1 diff -u -r1.1 patch-ej --- mail/postfix/files/patch-ej 4 Mar 2001 19:34:58 -0000 1.1 +++ mail/postfix/files/patch-ej 2 Jul 2002 14:41:12 -0000 @@ -14,8 +14,8 @@ * SASL library. */ #ifdef USE_SASL_AUTH -! #include -! #include +! #include +! #include #endif /* Index: mail/postfix/files/patch-lmtp.h =================================================================== RCS file: /home/ncvs/ports/mail/postfix/files/patch-lmtp.h,v retrieving revision 1.1 diff -u -r1.1 patch-lmtp.h --- mail/postfix/files/patch-lmtp.h 4 Mar 2001 19:34:59 -0000 1.1 +++ mail/postfix/files/patch-lmtp.h 2 Jul 2002 14:41:12 -0000 @@ -6,8 +6,8 @@ #ifdef USE_SASL_AUTH -#include -#include -+#include -+#include ++#include ++#include #endif /* Index: mail/postfix-current/files/patch-ei =================================================================== RCS file: /home/ncvs/ports/mail/postfix-current/files/patch-ei,v retrieving revision 1.2 diff -u -r1.2 patch-ei --- mail/postfix-current/files/patch-ei 1 Nov 2000 04:53:30 -0000 1.2 +++ mail/postfix-current/files/patch-ei 2 Jul 2002 14:41:12 -0000 @@ -14,8 +14,8 @@ * SASL library. */ #ifdef USE_SASL_AUTH -! #include -! #include +! #include +! #include #endif /* Index: mail/postfix-current/files/patch-ej =================================================================== RCS file: /home/ncvs/ports/mail/postfix-current/files/patch-ej,v retrieving revision 1.2 diff -u -r1.2 patch-ej --- mail/postfix-current/files/patch-ej 1 Nov 2000 04:53:30 -0000 1.2 +++ mail/postfix-current/files/patch-ej 2 Jul 2002 14:41:12 -0000 @@ -14,8 +14,8 @@ * SASL library. */ #ifdef USE_SASL_AUTH -! #include -! #include +! #include +! #include #endif /* Index: mail/postfix-current/files/patch-lmtp.h =================================================================== RCS file: /home/ncvs/ports/mail/postfix-current/files/patch-lmtp.h,v retrieving revision 1.1 diff -u -r1.1 patch-lmtp.h --- mail/postfix-current/files/patch-lmtp.h 5 Feb 2001 02:46:43 -0000 1.1 +++ mail/postfix-current/files/patch-lmtp.h 2 Jul 2002 14:41:12 -0000 @@ -6,8 +6,8 @@ #ifdef USE_SASL_AUTH -#include -#include -+#include -+#include ++#include ++#include #endif /* Index: mail/sendmail/files/site.config.m4.sasl =================================================================== RCS file: /home/ncvs/ports/mail/sendmail/files/site.config.m4.sasl,v retrieving revision 1.3 diff -u -r1.3 site.config.m4.sasl --- mail/sendmail/files/site.config.m4.sasl 7 Oct 2001 06:40:42 -0000 1.3 +++ mail/sendmail/files/site.config.m4.sasl 2 Jul 2002 14:41:12 -0000 @@ -1,4 +1,4 @@ -APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl') +APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1') APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL') APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib') APPENDDEF(`conf_sendmail_LIBS', `-lsasl') Index: mail/sendmail-old/files/site.config.m4.sasl =================================================================== RCS file: /home/ncvs/ports/mail/sendmail-old/files/site.config.m4.sasl,v retrieving revision 1.2 diff -u -r1.2 site.config.m4.sasl --- mail/sendmail-old/files/site.config.m4.sasl 11 Mar 2001 07:03:34 -0000 1.2 +++ mail/sendmail-old/files/site.config.m4.sasl 2 Jul 2002 14:41:12 -0000 @@ -1,4 +1,4 @@ -APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl') +APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1') APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL') APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS') APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib') Index: security/cyrus-sasl/Makefile =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/Makefile,v retrieving revision 1.43 diff -u -r1.43 Makefile --- security/cyrus-sasl/Makefile 26 Jun 2002 18:49:21 -0000 1.43 +++ security/cyrus-sasl/Makefile 2 Jul 2002 14:41:13 -0000 @@ -51,7 +51,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-plugindir=${PREFIX}/lib/sasl \ --with-dbpath=${PREFIX}/etc/sasldb \ - --includedir=${PREFIX}/include/sasl \ + --includedir=${PREFIX}/include/sasl1 \ --enable-static \ --enable-login \ --with-pwcheck=/var/pwcheck \ Index: security/cyrus-sasl/pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/pkg-plist,v retrieving revision 1.14 diff -u -r1.14 pkg-plist --- security/cyrus-sasl/pkg-plist 2 Feb 2002 04:09:27 -0000 1.14 +++ security/cyrus-sasl/pkg-plist 2 Jul 2002 14:41:13 -0000 @@ -1,12 +1,12 @@ @unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi etc/rc.d/pwcheck.sh -include/sasl/hmac-md5.h -include/sasl/md5.h -include/sasl/md5global.h -include/sasl/sasl.h -include/sasl/saslplug.h -include/sasl/saslutil.h -@dirrm include/sasl +include/sasl1/hmac-md5.h +include/sasl1/md5.h +include/sasl1/md5global.h +include/sasl1/sasl.h +include/sasl1/saslplug.h +include/sasl1/saslutil.h +@dirrm include/sasl1 %%JAVASASL%%lib/libjavasasl.a %%JAVASASL%%lib/libjavasasl.so %%JAVASASL%%lib/libjavasasl.so.1 Index: security/cyrus-sasl/files/Sendmail.README =================================================================== RCS file: /home/ncvs/ports/security/cyrus-sasl/files/Sendmail.README,v retrieving revision 1.5 diff -u -r1.5 Sendmail.README --- security/cyrus-sasl/files/Sendmail.README 18 Jun 2002 06:16:47 -0000 1.5 +++ security/cyrus-sasl/files/Sendmail.README 2 Jul 2002 14:41:13 -0000 @@ -3,7 +3,7 @@ 1) Add the following to /etc/make.conf: # Add SMTP AUTH support to Sendmail - SENDMAIL_CFLAGS+= -I/usr/local/include/sasl -DSASL + SENDMAIL_CFLAGS+= -I/usr/local/include/sasl1 -DSASL SENDMAIL_LDFLAGS+= -L/usr/local/lib SENDMAIL_LDADD+= -lsasl >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message