View | Details | Raw Unified | Return to bug 40288
Collapse All | Expand All

(-)databases/cyrus-imspd/files/patch-aa (-1 / +1 lines)
Lines 5-11 Link Here
5
 #include "dispatch.h"
5
 #include "dispatch.h"
6
 
6
 
7
-#include <sasl.h>
7
-#include <sasl.h>
8
+#include <sasl/sasl.h>
8
+#include <sasl1/sasl.h>
9
 
9
 
10
 #ifndef HAVE_GETDTABLESIZE
10
 #ifndef HAVE_GETDTABLESIZE
11
 #define getdtablesize() 32
11
 #define getdtablesize() 32
(-)databases/cyrus-imspd/files/patch-ab (-1 / +1 lines)
Lines 5-11 Link Here
5
 #define MAX_BUF 4096
5
 #define MAX_BUF 4096
6
 
6
 
7
-#include <sasl.h>
7
-#include <sasl.h>
8
+#include <sasl/sasl.h>
8
+#include <sasl1/sasl.h>
9
 
9
 
10
 /* a file buffer structure
10
 /* a file buffer structure
11
  */
11
  */
(-)databases/cyrus-imspd/files/patch-ac (-1 / +1 lines)
Lines 5-11 Link Here
5
 #include <syslog.h>
5
 #include <syslog.h>
6
 #include <fcntl.h>
6
 #include <fcntl.h>
7
-#include <sasl.h>
7
-#include <sasl.h>
8
+#include <sasl/sasl.h>
8
+#include <sasl1/sasl.h>
9
 #include <netdb.h>
9
 #include <netdb.h>
10
 #include "version.h"
10
 #include "version.h"
11
 #include "dispatch.h"
11
 #include "dispatch.h"
(-)databases/cyrus-imspd/files/patch-ad (-1 / +1 lines)
Lines 5-11 Link Here
5
 #include <syslog.h>
5
 #include <syslog.h>
6
 #include "xmalloc.h"
6
 #include "xmalloc.h"
7
-#include <sasl.h>
7
-#include <sasl.h>
8
+#include <sasl/sasl.h>
8
+#include <sasl1/sasl.h>
9
 
9
 
10
 #include "util.h"
10
 #include "util.h"
11
 #include "syncdb.h"
11
 #include "syncdb.h"
(-)databases/cyrus-imspd/files/patch-ae (-1 / +1 lines)
Lines 5-11 Link Here
5
 #endif
5
 #endif
6
 
6
 
7
-#include <sasl.h>
7
-#include <sasl.h>
8
+#include <sasl/sasl.h>
8
+#include <sasl1/sasl.h>
9
 
9
 
10
 #ifdef HAVE_SSL
10
 #ifdef HAVE_SSL
11
 #include <openssl/lhash.h>
11
 #include <openssl/lhash.h>
(-)databases/cyrus-imspd/files/patch-af (-1 / +1 lines)
Lines 5-11 Link Here
5
 #define INCLUDED_IMCLIENT_H
5
 #define INCLUDED_IMCLIENT_H
6
 
6
 
7
-#include <sasl.h>
7
-#include <sasl.h>
8
+#include <sasl/sasl.h>
8
+#include <sasl1/sasl.h>
9
 
9
 
10
 struct imclient;
10
 struct imclient;
11
 struct sasl_client; /* to avoid having to include sasl sometimes */
11
 struct sasl_client; /* to avoid having to include sasl sometimes */
(-)databases/cyrus-imspd/files/patch-ag (-1 / +1 lines)
Lines 5-11 Link Here
5
 #include <stdlib.h>
5
 #include <stdlib.h>
6
 
6
 
7
-#include <sasl.h>
7
-#include <sasl.h>
8
+#include <sasl/sasl.h>
8
+#include <sasl1/sasl.h>
9
 
9
 
10
 #ifdef HAVE_SSL
10
 #ifdef HAVE_SSL
11
 #include <openssl/ssl.h>
11
 #include <openssl/ssl.h>
(-)japanese/mutt/files/patch-aj (-1 / +1 lines)
Lines 5-11 Link Here
5
           if test "$with_sasl" != "yes"
5
           if test "$with_sasl" != "yes"
6
           then
6
           then
7
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
7
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
8
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
8
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
9
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
9
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
10
           fi
10
           fi
11
 
11
 
(-)japanese/mutt-devel/files/patch-aj (-1 / +1 lines)
Lines 5-11 Link Here
5
           if test "$with_sasl" != "yes"
5
           if test "$with_sasl" != "yes"
6
           then
6
           then
7
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
7
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
8
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
8
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
9
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
9
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
10
           fi
10
           fi
11
 
11
 
(-)mail/cyrus/files/patch-ac (-1 / +1 lines)
Lines 5-11 Link Here
5
     LIB_SASL="-L$sasldir/lib -lsasl"
5
     LIB_SASL="-L$sasldir/lib -lsasl"
6
     
6
     
7
-    SASLFLAGS="-I$sasldir/include"
7
-    SASLFLAGS="-I$sasldir/include"
8
+    SASLFLAGS="-I$sasldir/include/sasl"
8
+    SASLFLAGS="-I$sasldir/include/sasl1"
9
         
9
         
10
   fi
10
   fi
11
 
11
 
(-)mail/cyrus-imapd/files/patch-ac (-1 / +1 lines)
Lines 7-13 Link Here
7
 	if test -d ${with_sasl}; then
7
 	if test -d ${with_sasl}; then
8
           ac_cv_sasl_where_lib=${with_sasl}/lib
8
           ac_cv_sasl_where_lib=${with_sasl}/lib
9
-          ac_cv_sasl_where_inc=${with_sasl}/include
9
-          ac_cv_sasl_where_inc=${with_sasl}/include
10
+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
10
+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
11
 
11
 
12
 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
12
 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
13
 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
13
 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
(-)mail/mutt/files/patch-configure.in (-1 / +1 lines)
Lines 14-20 Link Here
14
           if test "$with_sasl" != "yes"
14
           if test "$with_sasl" != "yes"
15
           then
15
           then
16
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
16
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
17
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
17
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
18
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
18
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
19
           fi
19
           fi
20
 
20
 
(-)mail/mutt-devel/files/patch-01 (-1 / +1 lines)
Lines 5-10 Link Here
5
           if test "$with_sasl" != "yes"
5
           if test "$with_sasl" != "yes"
6
           then
6
           then
7
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
7
-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
8
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
8
+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
9
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
9
             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
10
           fi
10
           fi
(-)mail/postfix/files/patch-ei (-2 / +2 lines)
Lines 14-21 Link Here
14
    * SASL library.
14
    * SASL library.
15
    */
15
    */
16
  #ifdef USE_SASL_AUTH
16
  #ifdef USE_SASL_AUTH
17
! #include <sasl/sasl.h>
17
! #include <sasl1/sasl.h>
18
! #include <sasl/saslutil.h>
18
! #include <sasl1/saslutil.h>
19
  #endif
19
  #endif
20
  
20
  
21
   /*
21
   /*
(-)mail/postfix/files/patch-ej (-2 / +2 lines)
Lines 14-21 Link Here
14
    * SASL library.
14
    * SASL library.
15
    */
15
    */
16
  #ifdef USE_SASL_AUTH
16
  #ifdef USE_SASL_AUTH
17
! #include <sasl/sasl.h>
17
! #include <sasl1/sasl.h>
18
! #include <sasl/saslutil.h>
18
! #include <sasl1/saslutil.h>
19
  #endif
19
  #endif
20
  
20
  
21
   /*
21
   /*
(-)mail/postfix/files/patch-lmtp.h (-2 / +2 lines)
Lines 6-13 Link Here
6
 #ifdef USE_SASL_AUTH
6
 #ifdef USE_SASL_AUTH
7
-#include <sasl.h>
7
-#include <sasl.h>
8
-#include <saslutil.h>
8
-#include <saslutil.h>
9
+#include <sasl/sasl.h>
9
+#include <sasl1/sasl.h>
10
+#include <sasl/saslutil.h>
10
+#include <sasl1/saslutil.h>
11
 #endif
11
 #endif
12
 
12
 
13
  /*
13
  /*
(-)mail/postfix-current/files/patch-ei (-2 / +2 lines)
Lines 14-21 Link Here
14
    * SASL library.
14
    * SASL library.
15
    */
15
    */
16
  #ifdef USE_SASL_AUTH
16
  #ifdef USE_SASL_AUTH
17
! #include <sasl/sasl.h>
17
! #include <sasl1/sasl.h>
18
! #include <sasl/saslutil.h>
18
! #include <sasl1/saslutil.h>
19
  #endif
19
  #endif
20
  
20
  
21
   /*
21
   /*
(-)mail/postfix-current/files/patch-ej (-2 / +2 lines)
Lines 14-21 Link Here
14
    * SASL library.
14
    * SASL library.
15
    */
15
    */
16
  #ifdef USE_SASL_AUTH
16
  #ifdef USE_SASL_AUTH
17
! #include <sasl/sasl.h>
17
! #include <sasl1/sasl.h>
18
! #include <sasl/saslutil.h>
18
! #include <sasl1/saslutil.h>
19
  #endif
19
  #endif
20
  
20
  
21
   /*
21
   /*
(-)mail/postfix-current/files/patch-lmtp.h (-2 / +2 lines)
Lines 6-13 Link Here
6
 #ifdef USE_SASL_AUTH
6
 #ifdef USE_SASL_AUTH
7
-#include <sasl.h>
7
-#include <sasl.h>
8
-#include <saslutil.h>
8
-#include <saslutil.h>
9
+#include <sasl/sasl.h>
9
+#include <sasl1/sasl.h>
10
+#include <sasl/saslutil.h>
10
+#include <sasl1/saslutil.h>
11
 #endif
11
 #endif
12
 
12
 
13
  /*
13
  /*
(-)mail/sendmail/files/site.config.m4.sasl (-1 / +1 lines)
Lines 1-4 Link Here
1
APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
1
APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
2
APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
2
APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
3
APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
3
APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
4
APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
4
APPENDDEF(`conf_sendmail_LIBS', `-lsasl')
(-)mail/sendmail-old/files/site.config.m4.sasl (-1 / +1 lines)
Lines 1-4 Link Here
1
APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl')
1
APPENDDEF(`conf_sendmail_ENVDEF', `-I%%LOCALBASE%%/include/sasl1')
2
APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
2
APPENDDEF(`conf_sendmail_ENVDEF', `-DSASL')
3
APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS')
3
APPENDDEF(`conf_sendmail_ENVDEF', `-D_FFR_UNSAFE_SASL -D_FFR_SASL_OPTS')
4
APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
4
APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib')
(-)security/cyrus-sasl/Makefile (-1 / +1 lines)
Lines 51-57 Link Here
51
CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
51
CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
52
		--with-plugindir=${PREFIX}/lib/sasl \
52
		--with-plugindir=${PREFIX}/lib/sasl \
53
		--with-dbpath=${PREFIX}/etc/sasldb \
53
		--with-dbpath=${PREFIX}/etc/sasldb \
54
		--includedir=${PREFIX}/include/sasl \
54
		--includedir=${PREFIX}/include/sasl1 \
55
		--enable-static \
55
		--enable-static \
56
		--enable-login \
56
		--enable-login \
57
		--with-pwcheck=/var/pwcheck \
57
		--with-pwcheck=/var/pwcheck \
(-)security/cyrus-sasl/pkg-plist (-7 / +7 lines)
Lines 1-12 Link Here
1
@unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi
1
@unexec if [ -f /var/run/pwcheck.pid ] ; then %D/etc/rc.d/pwcheck.sh stop ; echo " stopped." ; fi
2
etc/rc.d/pwcheck.sh
2
etc/rc.d/pwcheck.sh
3
include/sasl/hmac-md5.h
3
include/sasl1/hmac-md5.h
4
include/sasl/md5.h
4
include/sasl1/md5.h
5
include/sasl/md5global.h
5
include/sasl1/md5global.h
6
include/sasl/sasl.h
6
include/sasl1/sasl.h
7
include/sasl/saslplug.h
7
include/sasl1/saslplug.h
8
include/sasl/saslutil.h
8
include/sasl1/saslutil.h
9
@dirrm include/sasl
9
@dirrm include/sasl1
10
%%JAVASASL%%lib/libjavasasl.a
10
%%JAVASASL%%lib/libjavasasl.a
11
%%JAVASASL%%lib/libjavasasl.so
11
%%JAVASASL%%lib/libjavasasl.so
12
%%JAVASASL%%lib/libjavasasl.so.1
12
%%JAVASASL%%lib/libjavasasl.so.1
(-)security/cyrus-sasl/files/Sendmail.README (-1 / +1 lines)
Lines 3-9 Link Here
3
1) Add the following to  /etc/make.conf:
3
1) Add the following to  /etc/make.conf:
4
4
5
    # Add SMTP AUTH support to Sendmail
5
    # Add SMTP AUTH support to Sendmail
6
    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl -DSASL
6
    SENDMAIL_CFLAGS+=	-I/usr/local/include/sasl1 -DSASL
7
    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
7
    SENDMAIL_LDFLAGS+=	-L/usr/local/lib
8
    SENDMAIL_LDADD+=	-lsasl
8
    SENDMAIL_LDADD+=	-lsasl

Return to bug 40288