Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net
In directory vz-cvs-3.sog:/tmp/cvs-serv30359

Modified Files:
        cyrus-sasl2.info cyrus-sasl2.patch 
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
note: dependency-tracking doesn't jive with -shared, so I left it disabled.


Index: cyrus-sasl2.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net/cyrus-sasl2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cyrus-sasl2.patch   11 Jul 2011 04:08:34 -0000      1.1
+++ cyrus-sasl2.patch   24 Nov 2011 05:59:26 -0000      1.2
@@ -1,6 +1,18 @@
+diff -ru cyrus-sasl-2.1.23.orig/lib/Makefile.in 
cyrus-sasl-2.1.23/lib/Makefile.in
+--- cyrus-sasl-2.1.23.orig/lib/Makefile.in     2009-05-07 10:24:53.000000000 
-0400
++++ cyrus-sasl-2.1.23/lib/Makefile.in  2011-07-10 18:56:30.000000000 -0400
+@@ -629,7 +629,7 @@
+ 
+ libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
+       @echo adding static plugins and dependencies
+-      $(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
++      $(AR) cru $@ $(SASL_STATIC_OBJS)
+       @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
+       if test ! -f $$i; then continue; fi; . $$i; \
+       for j in $$dependency_libs foo; do \
 diff -ru cyrus-sasl-2.1.23.orig/lib/client.c cyrus-sasl-2.1.23/lib/client.c
 --- cyrus-sasl-2.1.23.orig/lib/client.c        2009-04-28 11:09:15.000000000 
-0400
-+++ cyrus-sasl-2.1.23/lib/client.c     2010-10-15 18:57:53.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/client.c     2011-07-10 18:54:07.000000000 -0400
 @@ -202,6 +202,9 @@
        { NULL, NULL }
    };
@@ -13,7 +25,7 @@
        /* xxx do something with the callback structure? */
 diff -ru cyrus-sasl-2.1.23.orig/lib/common.c cyrus-sasl-2.1.23/lib/common.c
 --- cyrus-sasl-2.1.23.orig/lib/common.c        2009-04-28 11:09:15.000000000 
-0400
-+++ cyrus-sasl-2.1.23/lib/common.c     2010-10-15 18:57:53.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/common.c     2011-07-10 18:54:07.000000000 -0400
 @@ -107,6 +107,7 @@
    (sasl_realloc_t *) &realloc,
    (sasl_free_t *) &free
@@ -46,7 +58,7 @@
    _sasl_allocation_utils.realloc=r;
 diff -ru cyrus-sasl-2.1.23.orig/lib/saslint.h cyrus-sasl-2.1.23/lib/saslint.h
 --- cyrus-sasl-2.1.23.orig/lib/saslint.h       2009-04-28 11:09:15.000000000 
-0400
-+++ cyrus-sasl-2.1.23/lib/saslint.h    2010-10-15 18:57:53.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/saslint.h    2011-07-10 18:54:07.000000000 -0400
 @@ -300,6 +300,7 @@
  
  extern sasl_allocation_utils_t _sasl_allocation_utils;
@@ -57,7 +69,7 @@
   * checkpw.c
 diff -ru cyrus-sasl-2.1.23.orig/lib/server.c cyrus-sasl-2.1.23/lib/server.c
 --- cyrus-sasl-2.1.23.orig/lib/server.c        2009-04-28 11:09:15.000000000 
-0400
-+++ cyrus-sasl-2.1.23/lib/server.c     2010-10-15 18:57:53.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/server.c     2011-07-10 18:54:07.000000000 -0400
 @@ -698,6 +698,9 @@
        { NULL, NULL }
      };
@@ -70,7 +82,7 @@
        return SASL_BADPARAM;
 diff -ru cyrus-sasl-2.1.23.orig/plugins/digestmd5.c 
cyrus-sasl-2.1.23/plugins/digestmd5.c
 --- cyrus-sasl-2.1.23.orig/plugins/digestmd5.c 2009-04-28 11:09:17.000000000 
-0400
-+++ cyrus-sasl-2.1.23/plugins/digestmd5.c      2010-10-15 18:57:53.000000000 
-0400
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c      2011-07-10 18:54:07.000000000 
-0400
 @@ -2715,7 +2715,7 @@
        "DIGEST-MD5",                   /* mech_name */
  #ifdef WITH_RC4
@@ -91,7 +103,7 @@
        1,
 diff -ru cyrus-sasl-2.1.23.orig/saslauthd/auth_rimap.c 
cyrus-sasl-2.1.23/saslauthd/auth_rimap.c
 --- cyrus-sasl-2.1.23.orig/saslauthd/auth_rimap.c      2009-04-28 
11:09:18.000000000 -0400
-+++ cyrus-sasl-2.1.23/saslauthd/auth_rimap.c   2010-10-15 18:57:53.000000000 
-0400
++++ cyrus-sasl-2.1.23/saslauthd/auth_rimap.c   2011-07-10 18:54:07.000000000 
-0400
 @@ -162,6 +162,7 @@
      num_quotes = 0;
      p1 = s;
@@ -120,7 +132,7 @@
      /* read and parse the LOGIN response */
 diff -ru cyrus-sasl-2.1.23.orig/saslauthd/auth_shadow.c 
cyrus-sasl-2.1.23/saslauthd/auth_shadow.c
 --- cyrus-sasl-2.1.23.orig/saslauthd/auth_shadow.c     2009-04-28 
11:09:18.000000000 -0400
-+++ cyrus-sasl-2.1.23/saslauthd/auth_shadow.c  2010-10-15 18:57:53.000000000 
-0400
++++ cyrus-sasl-2.1.23/saslauthd/auth_shadow.c  2011-07-10 18:54:07.000000000 
-0400
 @@ -1,3 +1,4 @@
 +#define _XOPEN_SOURCE
  #define PWBUFSZ 256 /***SWB***/
@@ -128,7 +140,7 @@
  /* MODULE: auth_shadow */
 diff -ru cyrus-sasl-2.1.23.orig/saslauthd/lak.c 
cyrus-sasl-2.1.23/saslauthd/lak.c
 --- cyrus-sasl-2.1.23.orig/saslauthd/lak.c     2009-04-28 11:09:18.000000000 
-0400
-+++ cyrus-sasl-2.1.23/saslauthd/lak.c  2010-10-15 18:57:53.000000000 -0400
++++ cyrus-sasl-2.1.23/saslauthd/lak.c  2011-07-10 18:54:07.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <openssl/des.h>
  #endif
@@ -139,7 +151,7 @@
  #include <sasl.h>
 diff -ru cyrus-sasl-2.1.23.orig/saslauthd/saslauthd-main.c 
cyrus-sasl-2.1.23/saslauthd/saslauthd-main.c
 --- cyrus-sasl-2.1.23.orig/saslauthd/saslauthd-main.c  2009-04-28 
11:09:18.000000000 -0400
-+++ cyrus-sasl-2.1.23/saslauthd/saslauthd-main.c       2010-10-15 
18:57:53.000000000 -0400
++++ cyrus-sasl-2.1.23/saslauthd/saslauthd-main.c       2011-07-10 
18:54:07.000000000 -0400
 @@ -276,7 +276,7 @@
                exit(1);
        }
@@ -158,9 +170,21 @@
                rc = errno;
                logger(L_ERR, L_FUNC, "could not open pid lock file: %s", 
pid_file_lock);
                logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
+diff -ru cyrus-sasl-2.1.23.orig/sasldb/Makefile.in 
cyrus-sasl-2.1.23/sasldb/Makefile.in
+--- cyrus-sasl-2.1.23.orig/sasldb/Makefile.in  2009-05-07 10:24:59.000000000 
-0400
++++ cyrus-sasl-2.1.23/sasldb/Makefile.in       2011-07-10 18:56:45.000000000 
-0400
+@@ -544,7 +544,7 @@
+ 
+ 
+ libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
+-      $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
++      $(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
 diff -ru cyrus-sasl-2.1.23.orig/sasldb/db_berkeley.c 
cyrus-sasl-2.1.23/sasldb/db_berkeley.c
 --- cyrus-sasl-2.1.23.orig/sasldb/db_berkeley.c        2009-04-28 
11:09:18.000000000 -0400
-+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c     2010-10-15 18:58:37.000000000 
-0400
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c     2011-07-10 18:54:07.000000000 
-0400
 @@ -100,7 +100,7 @@
      ret = db_create(mbdb, NULL, 0);
      if (ret == 0 && *mbdb != NULL)
@@ -172,7 +196,7 @@
        ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
 diff -ru cyrus-sasl-2.1.23.orig/utils/dbconverter-2.c 
cyrus-sasl-2.1.23/utils/dbconverter-2.c
 --- cyrus-sasl-2.1.23.orig/utils/dbconverter-2.c       2003-02-13 
14:56:17.000000000 -0500
-+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c    2010-10-15 19:02:18.000000000 
-0400
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c    2011-07-10 18:54:07.000000000 
-0400
 @@ -214,7 +214,7 @@
      ret = db_create(mbdb, NULL, 0);
      if (ret == 0 && *mbdb != NULL)

Index: cyrus-sasl2.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net/cyrus-sasl2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cyrus-sasl2.info    11 Jul 2011 04:08:34 -0000      1.1
+++ cyrus-sasl2.info    24 Nov 2011 05:59:26 -0000      1.2
@@ -1,7 +1,7 @@
 Info4: <<
 Package: cyrus-sasl2%type_pkg[-64bit]
 Version: 2.1.23
-Revision: 3
+Revision: 4
 Type: -64bit (boolean)
 Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] = 
-64bit ) i386
 Distribution: ( %type_raw[-64bit] = -64bit ) 10.5, ( %type_raw[-64bit] = 
-64bit ) 10.6
@@ -17,7 +17,7 @@
 <<
 Source-MD5: 2eb0e48106f0e9cd8001e654f267ecbc
 PatchFile: %{ni}.patch
-PatchFile-MD5: f8628add63a620ef6271551fc1c3551c
+PatchFile-MD5: 19346938223144a17f41a8ee8e2ab4a9
 PatchScript: <<
   #!/bin/bash -ev
   %{default_script}
@@ -34,6 +34,7 @@
   fi
 <<
 NoSetLDFLAGS: True
+UseMaxBuildJobs: False
 SetLibs: -L%p/%lib
 ConfigureParams: <<
        --disable-dependency-tracking \
@@ -62,7 +63,7 @@
        if [ "%type_raw[-64bit]" == "-64bit" ]; then
                export CC="gcc -m64"
        fi
-       ./configure %c --host=`uname -p`-apple-darwin`uname -r`
+       ./configure %c --host=%m-apple-darwin`uname -r`
        make SASL_DB_LIB="-L%p/%lib -ldb-5.1" LIBTOOL=glibtool
 <<
 InstallScript: <<


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure 
contains a definitive record of customers, application performance, 
security threats, fraudulent activity, and more. Splunk takes this 
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to