Ticket #17158: cyrus-sasl2-2.1.22.diff

File cyrus-sasl2-2.1.22.diff, 8.9 KB (added by nox@…, 16 years ago)

  • files/patch-Makefile.in

     
    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 @@
    4  @JAVA_TRUE@JAV = java
    5  @JAVA_FALSE@JAV =
    6  @MACOSX_FALSE@INSTALLOSX =
    7 -@MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
    8 +#@MACOSX_TRUE@INSTALLOSX = install-exec-local-osx
    9  
    10  SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD)
    11  EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile
    12 @@ -678,13 +678,7 @@
    13           echo "* the library should use."; \
    14           echo "********************************************************"; \
    15         fi
    16 -install-exec-local-osx:
    17 -       $(mkinstalldirs) $(framedir)/Versions/A/Headers
    18 -       $(mkinstalldirs) $(framedir)/Versions/A/Resources
    19 -       cd $(framedir)/Versions ; ln -fs A Current
    20 -       cd $(framedir) ; ln -fs Versions/A/Headers .
    21 -       cd $(framedir) ; ln -fs Versions/A/Resources .
    22 -       $(INSTALL_DATA) $(srcdir)/config/Info.plist $(framedir)/Versions/A/Resources
    23 +
    24  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    25  # Otherwise a system limit (for SysV at least) may be exceeded.
    26  .NOEXPORT:

  • 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 */

  • files/patch-include_Makefile.in

     
    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 @@
    4  EXTRA_DIST = NTMakefile
    5  DISTCLEANFILES = md5global.h
    6  
    7 -@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework
    8 -@MACOSX_TRUE@frameheaderdir = $(framedir)/Versions/A/Headers
    9 -@MACOSX_TRUE@frameheader_DATA = $(saslinclude_HEADERS)
    10 +#@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework
    11 +#@MACOSX_TRUE@frameheaderdir = $(framedir)/Versions/A/Headers
    12 +#@MACOSX_TRUE@frameheader_DATA = $(saslinclude_HEADERS)
    13  subdir = include
    14  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
    15  CONFIG_HEADER = $(top_builddir)/config.h

  • files/patch-lib_client.c

     
    1 --- lib/client.c        2003-11-11 08:26:06.000000000 -0800
    2 +++ lib/client.c.new    2005-03-26 13:32:11.000000000 -0800
    3 @@ -61,7 +61,6 @@
    4  
    5  static cmech_list_t *cmechlist; /* global var which holds the list */
    6  
    7 -static sasl_global_callbacks_t global_callbacks;
    8 
    9  static int _sasl_client_active = 0;
    10  

  • files/patch-lib_Makefile.in

     
    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 @@
    4  libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
    5  libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
    6  
    7 -@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework
    8 +#@MACOSX_TRUE@framedir = /Library/Frameworks/SASL2.framework
    9  subdir = lib
    10  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
    11  CONFIG_HEADER = $(top_builddir)/config.h
    12 @@ -621,10 +621,10 @@
    13         uninstall-libLTLIBRARIES
    14  
    15  @MACOSX_TRUE@install-exec-hook:
    16 -@MACOSX_TRUE@  $(mkinstalldirs) $(framedir)/Versions/A
    17 -@MACOSX_TRUE@  ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2
    18 -@MACOSX_TRUE@  cd $(framedir) ; ln -fs Versions/A/SASL2 .
    19 -@MACOSX_FALSE@install-exec-hook:
    20 +#@MACOSX_TRUE@ $(mkinstalldirs) $(framedir)/Versions/A
    21 +#@MACOSX_TRUE@ ln -fs $(libdir)/libsasl2.dylib $(framedir)/Versions/A/SASL2
    22 +#@MACOSX_TRUE@ cd $(framedir) ; ln -fs Versions/A/SASL2 .
    23 +#@MACOSX_FALSE@install-exec-hook:
    24  
    25  libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
    26         @echo adding static plugins and dependencies

  • 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

  • Portfile

     
    33PortSystem      1.0
    44
    55name                    cyrus-sasl2
    6 version                 2.1.21
     6version                 2.1.22
    77categories              security net
    88maintainers             jmpp landonf@macports.org
    99description             SASL is an authentication library.
    … …  
    1919homepage                http://asg.web.cmu.edu/sasl/
    2020master_sites            ftp://ftp.andrew.cmu.edu/pub/cyrus-mail
    2121distname                cyrus-sasl-${version}
    22 checksums               md5 dde02db234dea892bee298390890502e \
    23                         sha1 6449f730c963d29d43600a95373a6e2db52d6d66 \
    24                         rmd160 93e0e1868453c5781602b5cce23e746b8823a26b
    2522
     23checksums       md5     45dde9d19193ae9dd388eb68b2027bc9 \
     24                sha1    d23454ab12054714ab97d229c86cb934ce63fbb1 \
     25                rmd160  086e20d01588cb86decad001244b72a37223354c
     26
    2627depends_lib             port:openssl \
    27                                 lib:libz:zlib
     28                port:zlib
    2829
    29 patchfiles              patch-Makefile.in \
    30                         patch-include_Makefile.in \
    31                         patch-lib_client.c \
    32                         patch-lib_Makefile.in \
    33                         patch-plugins-ntlm.c \
    34                         patch-plugins-srp.c
    35 
    3630default_variants        +kerberos
    3731
    38 configure.args  --sysconfdir=${prefix}/etc \
     32configure.args \
    3933                --mandir=${prefix}/share/man \
    40                 --libexecdir=${prefix}/lib \
    41                 --includedir=${prefix}/include \
    4234                --with-openssl=${prefix} \
    4335                --with-dbpath=${prefix}/etc/sasldb2 \
    4436                --with-plugindir=${prefix}/lib/sasl2 \
    4537                --with-saslauthd=${prefix}/var/state/saslauthd \
    4638                --with-pwcheck=${prefix}/var/pwcheck \
    47                 --enable-checkapop \
    48                 --enable-cram \
    49                 --enable-digest \
    50                 --enable-otp \
     39                --disable-macos-framework \
    5140                --enable-srp \
    5241                --enable-srp-setpass \
    53                 --enable-plain \
    54                 --enable-anon \
    5542                --enable-login \
    56                 --enable-auth-sasldb \
    5743                --enable-ntlm \
    5844                --with-rc4=openssl
    5945
    60 post-configure {
    61         # On darwin, -L/usr/lib pulls in Apple's own non-suitable sasl libraries
    62         reinplace s|-L/usr/lib||g ${worksrcpath}/utils/Makefile
     46use_parallel_build  yes
     47
     48pre-build {
     49    if {[file exists $prefix/lib/libsasl2.dylib]} {
     50        ui_error "cyrus-sasl2 must be deactivated before upgrade."
     51        error "Please run `sudo port deactivate cyrus-sasl2` and try again."
     52    }
    6353}
    6454
     55destroot.keepdirs \
     56    ${destroot}${prefix}/var/state/saslauthd \
     57    ${destroot}${prefix}/var/pwcheck
     58
    6559post-destroot {
    66               xinstall -d -m 755 ${destroot}${prefix}/share/doc
    67               file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
    68               xinstall -d -m 755 ${destroot}${prefix}/var/state/saslauthd
    69               xinstall -d -m 755 ${destroot}${prefix}/var/pwcheck
    70               destroot.keepdirs ${destroot}${prefix}/var/state/saslauthd \
    71               ${destroot}${prefix}/var/pwcheck
     60    xinstall -d \
     61        ${destroot}${prefix}/share/doc \
     62        ${destroot}${prefix}/var/state/saslauthd \
     63            ${destroot}${prefix}/var/pwcheck
     64
     65    file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
    7266}
    7367
    7468platform darwin {}
    7569platform freebsd {}
    76 variant kerberos {
     70variant kerberos description "Enable Kerberos support (default)" {
     71    configure.args-append   --enable-gssapi \
     72                            --enable-keep-db-open
     73
    7774        if {[variant_isset darwin]} {
    78                 configure.args-append --enable-gssapi --with-gss_impl=mit
     75                configure.args-append --with-gss_impl=mit
    7976        }
    8077        if {[variant_isset freebsd]} {
    81                 configure.args-append --enable-gssapi --with-gss_impl=heimdal
     78                configure.args-append --with-gss_impl=heimdal
    8279        }
    8380}
    8481
    85 variant sql     { configure.args-append --enable-sql }
     82variant sql description "Enable SQL support" { configure.args-append --enable-sql }
    8683
    87 variant static  { configure.args-append --enable-static }
     84variant static description "Build static library" { configure.args-append --enable-static }
    8885
    8986livecheck.check regex
    9087livecheck.url   http://ftp.andrew.cmu.edu/pub/cyrus-mail/