OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web openpkg$ Date:   04-Jul-2003 10:14:03
  Branch: HEAD                             Handle: 2003070409140102

  Modified files:
    openpkg-re/vcheck       vc.sasl
    openpkg-src/sasl        sasl.patch sasl.spec
    openpkg-web             news.txt

  Log:
    upgrading package: sasl 2.1.13 -> 2.1.14

  Summary:
    Revision    Changes     Path
    1.15        +1  -1      openpkg-re/vcheck/vc.sasl
    1.8         +15 -23     openpkg-src/sasl/sasl.patch
    1.82        +2  -2      openpkg-src/sasl/sasl.spec
    1.5207      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.sasl
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 vc.sasl
  --- openpkg-re/vcheck/vc.sasl 16 Apr 2003 05:55:30 -0000      1.14
  +++ openpkg-re/vcheck/vc.sasl 4 Jul 2003 08:14:01 -0000       1.15
  @@ -2,7 +2,7 @@
   }
   
   prog sasl = {
  -  version   = 2.1.13
  +  version   = 2.1.14
     url       = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
     regex     = cyrus-sasl-(\d+\.\d+\.\d+)\.tar\.gz
   }
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sasl/sasl.patch
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 sasl.patch
  --- openpkg-src/sasl/sasl.patch       15 Apr 2003 08:48:23 -0000      1.7
  +++ openpkg-src/sasl/sasl.patch       4 Jul 2003 08:14:03 -0000       1.8
  @@ -1,5 +1,5 @@
  ---- plugins/mysql.c.dist     Fri Mar  7 13:26:42 2003
  -+++ plugins/mysql.c  Fri Apr  4 16:55:38 2003
  +--- plugins/mysql.c.orig     Wed May 14 20:46:02 2003
  ++++ plugins/mysql.c  Fri Jul  4 10:11:16 2003
   @@ -254,6 +254,7 @@
        MYSQL mysql,*sock = NULL;
        MYSQL_RES *result;
  @@ -8,23 +8,15 @@
        
        /* setup the settings */
        settings = (struct mysql_settings *)glob_context;
  -@@ -325,8 +326,15 @@
  -         sparams->utils->log(NULL, SASL_LOG_WARN,
  +@@ -326,6 +327,7 @@
                                "mysql plugin try and connect to %s\n",
                                cur_host);
  -+#ifdef HAVE_MYSQL_REAL_CONNECT
  -+    mysql_init(&mysql);
  -+    sock = mysql_real_connect(&mysql,cur_host,settings->mysql_user,
  -+                         settings->mysql_passwd,
  -+                 NULL,0,NULL,CLIENT_COMPRESS);
  -+#else
  -     sock = mysql_connect(&mysql,cur_host,settings->mysql_user,
  -                          settings->mysql_passwd);
  -+#endif
  -     if (sock) break;
  -     
  -     cur_host = db_host;
  -@@ -405,8 +413,10 @@
  + 
  ++    mysql_init(&mysql);
  +     sock = mysql_real_connect(&mysql,cur_host,
  +                               settings->mysql_user,
  +                               settings->mysql_passwd,
  +@@ -408,8 +410,10 @@
        /* now get the result set value and value_len */
        /* we only fetch one becuse we dont car about the rest */
        row = mysql_fetch_row(result);
  @@ -37,10 +29,10 @@
        
        sparams->utils->prop_set(sparams->propctx, cur->name,
                                 value, value_len);
  ---- lib/server.c.dist        Mon Apr  7 16:48:41 2003
  -+++ lib/server.c     Mon Apr  7 16:52:27 2003
  -@@ -379,18 +379,9 @@
  -   char *c;
  +--- lib/server.c.orig        Wed Apr 16 21:36:01 2003
  ++++ lib/server.c     Fri Jul  4 10:07:52 2003
  +@@ -390,18 +390,9 @@
  +   unsigned path_len;
      char *config_filename=NULL;
      int len;
   -  const sasl_callback_t *getpath_cb=NULL;
  @@ -58,5 +50,5 @@
   +  result = SASL_OK;
   +  path_to_config = "@l_sysconfdir@";
    
  -   if ((c = strchr(path_to_config, PATHS_DELIMITER))) {
  -       *c = '\0';
  +   c = strchr(path_to_config, PATHS_DELIMITER);
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sasl/sasl.spec
  ============================================================================
  $ cvs diff -u -r1.81 -r1.82 sasl.spec
  --- openpkg-src/sasl/sasl.spec        28 Jun 2003 15:00:27 -0000      1.81
  +++ openpkg-src/sasl/sasl.spec        4 Jul 2003 08:14:03 -0000       1.82
  @@ -32,8 +32,8 @@
   Distribution: OpenPKG [PLUS]
   Group:        Cryptography
   License:      BSD
  -Version:      2.1.13
  -Release:      20030628
  +Version:      2.1.14
  +Release:      20030704
   
   #   package options
   %option       with_fsl    yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5206 -r1.5207 news.txt
  --- openpkg-web/news.txt      4 Jul 2003 08:05:32 -0000       1.5206
  +++ openpkg-web/news.txt      4 Jul 2003 08:14:02 -0000       1.5207
  @@ -1,3 +1,4 @@
  +04-Jul-2003: Upgraded package: P<sasl-2.1.14-20030704>
   04-Jul-2003: Upgraded package: P<rrdtool-1.0.43-20030704>
   04-Jul-2003: Upgraded package: P<graphviz-1.10-20030704>
   04-Jul-2003: Upgraded package: P<nessus-tool-2.0.7-20030704>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to