Ticket #4031: cyrus-sasl2.diff

File cyrus-sasl2.diff, 5.0 KB (added by pguyot (Paul Guyot), 19 years ago)

Patch to update the port and fix the problem.

  • Portfile 

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/security/cyrus-sasl2/Portfile,v
retrieving revision 1.4
diff -u -r1.4 Portfile
     
    33PortSystem      1.0
    44
    55name                    cyrus-sasl2
    6 version                 2.1.20
    7 revision                3
     6version                 2.1.21
    87categories              security net
    98maintainers             jmpp@opendarwin.org landonf@opendarwin.org
    109description             SASL is an authentication library.
    … …  
    2019homepage                http://asg.web.cmu.edu/sasl/
    2120master_sites            http://ftp.andrew.cmu.edu/pub/cyrus-mail/
    2221distname                cyrus-sasl-${version}
    23 checksums               md5 268ead27f4ac39bcfe17d9e38e0f2977
     22checksums               md5 dde02db234dea892bee298390890502e \
     23                                sha1 6449f730c963d29d43600a95373a6e2db52d6d66
     24#                               rmd160 93e0e1868453c5781602b5cce23e746b8823a26b
    2425
    25 depends_lib             port:openssl
     26depends_lib             port:openssl \
     27                                lib:libz:zlib
    2628
    2729patchfiles              patch-Makefile.in \
    28                         patch-configure \
    29                         patch-configure.in \
    3030                        patch-include_Makefile.in \
    3131                        patch-lib_client.c \
    3232                        patch-lib_Makefile.in \
    33                         patch-saslauthd_auth_pam.c \
    34                         patch-utils_Makefile.in
     33                        patch-plugins-ntlm.c \
     34                        patch-plugins-srp.c
    3535
    3636default_variants        +kerberos
    3737

  • files/patch-Makefile.in 

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/security/cyrus-sasl2/files/patch-Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile.in
     
    1 --- ../cyrus-sasl-2.1.20.orig/Makefile.in       Thu Feb  3 14:14:49 2005
    2 +++ Makefile.in Thu Feb  3 14:15:49 2005
    3 @@ -235,7 +235,7 @@
     1--- Makefile.in.orig    2005-05-15 14:58:33.000000000 +0900
     2+++ Makefile.in 2005-08-29 14:59:13.000000000 +0900
     3@@ -239,7 +239,7 @@
    44 @JAVA_TRUE@JAV = java
    55 @JAVA_FALSE@JAV =
    66 @MACOSX_FALSE@INSTALLOSX =
    … …  
    99 
    1010 SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
    1111 EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile
    12 @@ -673,13 +673,7 @@
     12@@ -678,13 +678,7 @@
    1313          echo "* the library should use."; \
    1414          echo "********************************************************"; \
    1515        fi

  • files/patch-include_Makefile.in 

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/security/cyrus-sasl2/files/patch-include_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-include_Makefile.in
     
    1 --- include/Makefile.in.orig    Thu Feb  3 14:18:24 2005
    2 +++ include/Makefile.in Thu Feb  3 14:19:29 2005
    3 @@ -238,9 +238,9 @@
     1--- include/Makefile.in.orig    2005-05-15 14:58:34.000000000 +0900
     2+++ include/Makefile.in 2005-08-29 15:06:26.000000000 +0900
     3@@ -242,9 +242,9 @@
    44 EXTRA_DIST = NTMakefile
    55 DISTCLEANFILES = md5global.h
    66 

  • files/patch-lib_Makefile.in 

    RCS file: /Volumes/src/cvs/od/proj/darwinports/dports/security/cyrus-sasl2/files/patch-lib_Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 patch-lib_Makefile.in
     
    1 --- lib/Makefile.in.orig        Thu Feb  3 14:19:54 2005
    2 +++ lib/Makefile.in     Thu Feb  3 14:20:22 2005
    3 @@ -245,7 +245,7 @@
     1--- lib/Makefile.in.orig        2005-05-15 14:58:38.000000000 +0900
     2+++ lib/Makefile.in     2005-08-29 15:04:37.000000000 +0900
     3@@ -249,7 +249,7 @@
    44 libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
    55 libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
    66 
    … …  
    99 subdir = lib
    1010 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
    1111 CONFIG_HEADER = $(top_builddir)/config.h
    12 @@ -617,10 +617,10 @@
     12@@ -621,10 +621,10 @@
    1313        uninstall-libLTLIBRARIES
    1414 
    1515 @MACOSX_TRUE@install-exec-hook:

  • new file files/patch-plugins-srp.c

    - +  
     1--- plugins/srp.c.orig  2005-08-29 14:54:37.000000000 +0900
     2+++ plugins/srp.c       2005-08-29 14:54:42.000000000 +0900
     3@@ -87,6 +87,7 @@
     4 /* for digest and cipher support */
     5 #include <openssl/evp.h>
     6 #include <openssl/hmac.h>
     7+#include <openssl/md5.h>
     8 
     9 #include <sasl.h>
     10 #define MD5_H  /* suppress internal MD5 */

  • new file files/patch-plugins-ntlm.c

    - +  
     1--- plugins/ntlm.c.orig 2005-08-29 14:55:01.000000000 +0900
     2+++ plugins/ntlm.c      2005-08-29 14:55:03.000000000 +0900
     3@@ -77,6 +77,7 @@
     4 #include <openssl/hmac.h>
     5 #include <openssl/des.h>
     6 #include <openssl/opensslv.h>
     7+#include <openssl/md5.h>
     8 #if (OPENSSL_VERSION_NUMBER >= 0x0090700f) && \
     9      !defined(OPENSSL_ENABLE_OLD_DES_SUPPORT)
     10 # define des_cblock DES_cblock