FreeBSD Bugzilla – Attachment 23408 Details for
Bug 40288
moving saslv1 includes files to make it easier to add saslv2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 14.29 KB, created by
Mathieu Arnold
on 2002-07-07 13:20:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Mathieu Arnold
Created:
2002-07-07 13:20:01 UTC
Size:
14.29 KB
patch
obsolete
>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 <sasl.h> >-+#include <sasl/sasl.h> >++#include <sasl1/sasl.h> > > #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 <sasl.h> >-+#include <sasl/sasl.h> >++#include <sasl1/sasl.h> > > /* 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 <syslog.h> > #include <fcntl.h> > -#include <sasl.h> >-+#include <sasl/sasl.h> >++#include <sasl1/sasl.h> > #include <netdb.h> > #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 <syslog.h> > #include "xmalloc.h" > -#include <sasl.h> >-+#include <sasl/sasl.h> >++#include <sasl1/sasl.h> > > #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 <sasl.h> >-+#include <sasl/sasl.h> >++#include <sasl1/sasl.h> > > #ifdef HAVE_SSL > #include <openssl/lhash.h> >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 <sasl.h> >-+#include <sasl/sasl.h> >++#include <sasl1/sasl.h> > > 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 <stdlib.h> > > -#include <sasl.h> >-+#include <sasl/sasl.h> >++#include <sasl1/sasl.h> > > #ifdef HAVE_SSL > #include <openssl/ssl.h> >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 <sasl/sasl.h> >-! #include <sasl/saslutil.h> >+! #include <sasl1/sasl.h> >+! #include <sasl1/saslutil.h> > #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 <sasl/sasl.h> >-! #include <sasl/saslutil.h> >+! #include <sasl1/sasl.h> >+! #include <sasl1/saslutil.h> > #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 <sasl.h> > -#include <saslutil.h> >-+#include <sasl/sasl.h> >-+#include <sasl/saslutil.h> >++#include <sasl1/sasl.h> >++#include <sasl1/saslutil.h> > #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 <sasl/sasl.h> >-! #include <sasl/saslutil.h> >+! #include <sasl1/sasl.h> >+! #include <sasl1/saslutil.h> > #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 <sasl/sasl.h> >-! #include <sasl/saslutil.h> >+! #include <sasl1/sasl.h> >+! #include <sasl1/saslutil.h> > #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 <sasl.h> > -#include <saslutil.h> >-+#include <sasl/sasl.h> >-+#include <sasl/saslutil.h> >++#include <sasl1/sasl.h> >++#include <sasl1/saslutil.h> > #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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 40288
: 23408