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

Modified Files:
        cyrus-sasl2.info cyrus-sasl2.patch postfix.info 
Log Message:
New upstream version and switch to db53-aes.


Index: cyrus-sasl2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/cyrus-sasl2.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cyrus-sasl2.patch   17 Nov 2011 03:28:22 -0000      1.5
+++ cyrus-sasl2.patch   18 Jan 2012 23:59:56 -0000      1.6
@@ -1,7 +1,7 @@
-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 @@
+diff -ru cyrus-sasl-2.1.25.orig/lib/Makefile.in 
cyrus-sasl-2.1.25/lib/Makefile.in
+--- cyrus-sasl-2.1.25.orig/lib/Makefile.in     2011-09-07 09:29:23.000000000 
-0400
++++ cyrus-sasl-2.1.25/lib/Makefile.in  2012-01-18 10:04:42.000000000 -0500
+@@ -676,7 +676,7 @@
  
  libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
        @echo adding static plugins and dependencies
@@ -10,182 +10,22 @@
        @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     2011-07-10 18:54:07.000000000 -0400
-@@ -202,6 +202,9 @@
-       { NULL, NULL }
-   };
- 
-+  /* lock allocation type */
-+  _sasl_allocation_locked++;
-+  
-   if(_sasl_client_active) {
-       /* We're already active, just increase our refcount */
-       /* 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     2011-07-10 18:54:07.000000000 -0400
-@@ -107,6 +107,7 @@
-   (sasl_realloc_t *) &realloc,
-   (sasl_free_t *) &free
- };
-+int _sasl_allocation_locked = 0;
- 
- #define SASL_ENCODEV_EXTRA  4096
- 
-@@ -152,6 +153,12 @@
- void sasl_set_mutex(sasl_mutex_alloc_t *n, sasl_mutex_lock_t *l,
-                   sasl_mutex_unlock_t *u, sasl_mutex_free_t *d)
- {
-+      /* Disallow mutex function changes once sasl_client_init
-+         and/or sasl_server_init is called */
-+      if (_sasl_server_cleanup_hook || _sasl_client_cleanup_hook) {
-+              return;
-+      }
-+
-   _sasl_mutex_utils.alloc=n;
-   _sasl_mutex_utils.lock=l;
-   _sasl_mutex_utils.unlock=u;
-@@ -637,6 +644,8 @@
-              sasl_realloc_t *r,
-              sasl_free_t *f)
- {
-+  if (_sasl_allocation_locked++)  return;
-+
-   _sasl_allocation_utils.malloc=m;
-   _sasl_allocation_utils.calloc=c;
-   _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    2011-07-10 18:54:07.000000000 -0400
-@@ -300,6 +300,7 @@
- 
- extern sasl_allocation_utils_t _sasl_allocation_utils;
- extern sasl_mutex_utils_t _sasl_mutex_utils;
-+extern int _sasl_allocation_locked;
- 
- /*
-  * 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     2011-07-10 18:54:07.000000000 -0400
-@@ -698,6 +698,9 @@
-       { NULL, NULL }
-     };
- 
-+    /* lock allocation type */
-+    _sasl_allocation_locked++;
-+
-     /* we require the appname (if present) to be short enough to be a path */
-     if (appname != NULL && strlen(appname) >= PATH_MAX)
-       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      2011-07-10 18:54:07.000000000 
-0400
-@@ -2715,7 +2715,7 @@
-       "DIGEST-MD5",                   /* mech_name */
- #ifdef WITH_RC4
-       128,                            /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else 
-       1,
-@@ -4034,7 +4034,7 @@
-       "DIGEST-MD5",
- #ifdef WITH_RC4                               /* mech_name */
-       128,                            /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
-       112,
- #else
-       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   2011-07-10 18:54:07.000000000 
-0400
-@@ -162,6 +162,7 @@
-     num_quotes = 0;
-     p1 = s;
-     while ((p1 = strchr(p1, '"')) != NULL) {
-+      p1++;
-       num_quotes++;
-     }
-     
-@@ -438,7 +439,7 @@
-       syslog(LOG_WARNING, "auth_rimap: writev: %m");
-       memset(qlogin, 0, strlen(qlogin));
-       free(qlogin);
--      memset(qpass, 0, strlen(qlogin));
-+      memset(qpass, 0, strlen(qpass));
-       free(qpass);
-       (void)close(s);
-       return strdup(RESP_IERROR);
-@@ -447,7 +448,7 @@
-     /* don't need these any longer */
-     memset(qlogin, 0, strlen(qlogin));
-     free(qlogin);
--    memset(qpass, 0, strlen(qlogin));
-+    memset(qpass, 0, strlen(qpass));
-     free(qpass);
- 
-     /* 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  2011-07-10 18:54:07.000000000 
-0400
-@@ -1,3 +1,4 @@
-+#define _XOPEN_SOURCE
- #define PWBUFSZ 256 /***SWB***/
- 
- /* 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  2011-07-10 18:54:07.000000000 -0400
-@@ -55,6 +55,7 @@
- #include <openssl/des.h>
- #endif
- 
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #include <lber.h>
- #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       2011-07-10 
18:54:07.000000000 -0400
-@@ -276,7 +276,7 @@
-               exit(1);
-       }
- 
--      umask(077);
-+      umask(0077);
- 
-       pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
-       if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
-@@ -287,7 +287,7 @@
-       strlcpy(pid_file_lock, run_path, pid_file_size);
-       strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
- 
--      if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 
644)) < 0) {
-+      if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 
0644)) < 0) {
-               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 @@
+diff -ru cyrus-sasl-2.1.25.orig/sasldb/Makefile.in 
cyrus-sasl-2.1.25/sasldb/Makefile.in
+--- cyrus-sasl-2.1.25.orig/sasldb/Makefile.in  2011-09-07 09:29:24.000000000 
-0400
++++ cyrus-sasl-2.1.25/sasldb/Makefile.in       2012-01-18 10:05:33.000000000 
-0500
+@@ -592,7 +592,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     2011-07-10 18:54:07.000000000 
-0400
-@@ -100,7 +100,7 @@
+diff -ru cyrus-sasl-2.1.25.orig/sasldb/db_berkeley.c 
cyrus-sasl-2.1.25/sasldb/db_berkeley.c
+--- cyrus-sasl-2.1.25.orig/sasldb/db_berkeley.c        2011-09-02 
08:58:02.000000000 -0400
++++ cyrus-sasl-2.1.25/sasldb/db_berkeley.c     2012-01-18 10:06:22.000000000 
-0500
+@@ -101,7 +101,7 @@
      ret = db_create(mbdb, NULL, 0);
      if (ret == 0 && *mbdb != NULL)
      {
@@ -194,9 +34,9 @@
        ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
  #else
        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    2011-07-10 18:54:07.000000000 
-0400
+diff -ru cyrus-sasl-2.1.25.orig/utils/dbconverter-2.c 
cyrus-sasl-2.1.25/utils/dbconverter-2.c
+--- cyrus-sasl-2.1.25.orig/utils/dbconverter-2.c       2003-02-13 
14:56:17.000000000 -0500
++++ cyrus-sasl-2.1.25/utils/dbconverter-2.c    2012-01-18 10:07:04.000000000 
-0500
 @@ -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/net/cyrus-sasl2.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cyrus-sasl2.info    17 Nov 2011 03:28:22 -0000      1.9
+++ cyrus-sasl2.info    18 Jan 2012 23:59:56 -0000      1.10
@@ -1,13 +1,13 @@
 Info4: <<
 Package: cyrus-sasl2%type_pkg[-64bit]
-Version: 2.1.23
-Revision: 4
+Version: 2.1.25
+Revision: 1
 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
 Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
 Depends: %N-shlibs (= %v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu
-BuildDepends: system-openssl-dev, db51-aes%type_pkg[-64bit] | 
db51%type_pkg[-64bit] , fink (>= 0.26.2), libtool2
+BuildDepends: system-openssl-dev, db53-aes%type_pkg[-64bit], fink (>= 0.26.2), 
libtool2
 Conflicts: cyrus-sasl2, cyrus-sasl2-64bit
 Replaces: cyrus-sasl2, cyrus-sasl2-64bit
 Source: mirror:custom:cyrus-sasl-%v.tar.gz
@@ -15,14 +15,14 @@
   Primary: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
   Secondary: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
 <<
-Source-MD5: 2eb0e48106f0e9cd8001e654f267ecbc
+Source-MD5: 341cffe829a4d71f2a6503d669d5a946
 PatchFile: %{ni}.patch
-PatchFile-MD5: 19346938223144a17f41a8ee8e2ab4a9
+PatchFile-MD5: 6117bb8fb8d4c9017a8231ebc7fe2944
 PatchScript: <<
   #!/bin/bash -ev
   %{default_script}
-  #Use db51
-  perl -pi -e 's/db-4.4/db-5.1/g' configure
+  #Use db53
+  perl -pi -e 's/db-4.4/db-5.3/g' configure
   #This is only needed for the -64bit variant
   perl -pi -e 's,lib/sasl2,%lib/sasl2,g' Makefile.in plugins/Makefile.in
   #Fix bug in configure on 10.6
@@ -63,20 +63,18 @@
                export CC="gcc -m64"
        fi
        ./configure %c --host=%m-apple-darwin`uname -r`
-       make SASL_DB_LIB="-L%p/%lib -ldb-5.1" LIBTOOL=glibtool
+       make SASL_DB_LIB="-L%p/lib -ldb-5.3" LIBTOOL=glibtool
 <<
 InstallScript: <<
 mkdir -p %i/share/man/man8
 mkdir -p %i/var/saslauthd
 make install DESTDIR=%d LIBTOOL=glibtool
-#No need for dependency_libs in .la files if not building static libs
-perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/%lib/*.la 
%i/%lib/sasl2/*.la
 cd utils; cp sasldblistusers2.8 saslpasswd2.8 %i/share/man/man8
 <<
 DocFiles: AUTHORS COPYING NEWS README ChangeLog doc/TODO doc/*.html doc/*.txt
 SplitOff: <<
   Package: %N-shlibs
-  Depends: db51-aes%type_pkg[-64bit]-shlibs | db51%type_pkg[-64bit]-shlibs, ( 
%type_raw[-64bit] = -64bit ) 64bit-cpu
+  Depends: db53-aes%type_pkg[-64bit]-shlibs, ( %type_raw[-64bit] = -64bit ) 
64bit-cpu
   Replaces: %N-dev (<< 2.1.21-14)
   Files: %lib/*.*.dylib %lib/sasl2/*.*.so %lib/sasl2/*.la
   Shlibs: %p/%lib/libsasl2.2.dylib 3.0.0 %n (>= 2.1.13-12) %type_num[-64bit]

Index: postfix.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/postfix.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- postfix.info        11 May 2011 08:55:35 -0000      1.20
+++ postfix.info        18 Jan 2012 23:59:56 -0000      1.21
@@ -1,7 +1,7 @@
 Info2: <<
 Package: postfix%type_pkg[-mysql]%type_pkg[-ldap]
-Version: 2.7.1
-Revision: 110
+Version: 2.8.7
+Revision: 1
 Type: -mysql (boolean), -ldap (boolean)
 Distribution: 10.5, 10.6
 
@@ -67,14 +67,14 @@
 Depends: <<
        cyrus-sasl2-shlibs,
        daemonic,
-       db51-aes-shlibs | db51-shlibs,
+       db53-aes-shlibs,
        (%type_raw[-mysql] = -mysql) mysql-unified-shlibs,
        (%type_raw[-ldap] = -ldap) openldap24-shlibs,
        pcre-shlibs
 <<
 BuildDepends: <<
        cyrus-sasl2-dev,
-       db51-aes | db51,
+       db53-aes,
        fink (>= 0.24.12),
        (%type_raw[-mysql] = -mysql) mysql-unified-dev,
        (%type_raw[-ldap] = -ldap) openldap24-dev,
@@ -106,7 +106,7 @@
 Recommends: cyrus-sasl2
 
 Source: 
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%v.tar.gz
-Source-MD5: b7a5c3ccd309156a65d6f8d2683d4fa1
+Source-MD5: b3ff47a38db920fc15bb207f42da53db
 
 PatchFile: %{ni}.patch
 PatchFile-MD5: d19fd5501c36dace5c67bbba391cbc73


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to