[CVS] RPM: rpm/ devtool.conf

2008-09-02 Thread Ralf S. Engelschall 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   02-Sep-2008 10:08:51
  Branch: HEAD Handle: 2008090208085100

  Modified files:
rpm devtool.conf

  Log:
step up to latest LibXML 2.7.1

  Summary:
RevisionChanges Path
2.245   +1  -1  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.244 -r2.245 devtool.conf
  --- rpm/devtool.conf  31 Aug 2008 08:44:54 -  2.244
  +++ rpm/devtool.conf  2 Sep 2008 08:08:51 -   2.245
  @@ -304,7 +304,7 @@
   v_lua="5.1.4"
   v_file="4.26"
   v_popt="1.14"
  -v_libxml2="2.7.0"
  +v_libxml2="2.7.1"
   v_xar="1.5.2"
   v_pcre="7.7"
   v_uuid="1.6.2"
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: db-4_5_20: db/sequence/ sequence.c

2008-09-02 Thread Elan Ruusam�e 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Elan Ruusamäe
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: db   Date:   03-Sep-2008 05:14:56
  Branch: db-4_5_20Handle: 2008090303145500

  Modified files:   (Branch: db-4_5_20)
db/sequence sequence.c

  Log:
- apply upstream patch.4.5.20.1

  Summary:
RevisionChanges Path
1.6.4.1 +8  -0  db/sequence/sequence.c
  

  patch -p0 <<'@@ .'
  Index: db/sequence/sequence.c
  
  $ cvs diff -u -r1.6 -r1.6.4.1 sequence.c
  --- db/sequence/sequence.c1 Oct 2006 20:19:36 -   1.6
  +++ db/sequence/sequence.c3 Sep 2008 03:14:55 -   1.6.4.1
  @@ -228,6 +228,9 @@
seq->seq_data.ulen = seq->seq_data.size = sizeof(seq->seq_record);
seq->seq_rp = &seq->seq_record;
   
  + if ((ret = __dbt_usercopy(dbenv, keyp)) != 0)
  + goto err;
  +
memset(&seq->seq_key, 0, sizeof(DBT));
if ((ret = __os_malloc(dbenv, keyp->size, &seq->seq_key.data)) != 0)
goto err;
  @@ -365,6 +368,7 @@
ret = t_ret;
   
ENV_LEAVE(dbenv, ip);
  + __dbt_userfree(dbenv, keyp, NULL, NULL);
return (ret);
   }
   
  @@ -765,6 +769,10 @@
   {
SEQ_ILLEGAL_BEFORE_OPEN(seq, "DB_SEQUENCE->get_key");
   
  + if (F_ISSET(key, DB_DBT_USERCOPY))
  + return (__db_retcopy(seq->seq_dbp->dbenv, key,
  + seq->seq_key.data, seq->seq_key.size, NULL, 0));
  +
key->data = seq->seq_key.data;
key->size = key->ulen = seq->seq_key.size;
key->flags = seq->seq_key.flags;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: db-4_5_20: db/rep/ rep_method.c rep_record.c

2008-09-02 Thread Elan Ruusam�e 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Elan Ruusamäe
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: db   Date:   03-Sep-2008 05:15:57
  Branch: db-4_5_20Handle: 2008090303155700

  Modified files:   (Branch: db-4_5_20)
db/rep  rep_method.c rep_record.c

  Log:
- apply upstream patch.4.5.20.2

  Summary:
RevisionChanges Path
1.11.4.1+5  -2  db/rep/rep_method.c
1.12.4.1+9  -0  db/rep/rep_record.c
  

  patch -p0 <<'@@ .'
  Index: db/rep/rep_method.c
  
  $ cvs diff -u -r1.11 -r1.11.4.1 rep_method.c
  --- db/rep/rep_method.c   1 Oct 2006 20:19:35 -   1.11
  +++ db/rep/rep_method.c   3 Sep 2008 03:15:57 -   1.11.4.1
  @@ -526,10 +526,12 @@
 * will allow the client to either perform recovery or
 * simply join in.
 */
  - if (announce)
  + if (announce) {
  + if ((ret = __dbt_usercopy(dbenv, dbt)) != 0)
  + goto err;
(void)__rep_send_message(dbenv,
DB_EID_BROADCAST, REP_NEWCLIENT, NULL, dbt, 0, 0);
  - else
  + } else
(void)__rep_send_message(dbenv,
DB_EID_BROADCAST, REP_ALIVE_REQ, NULL, NULL, 0, 0);
}
  @@ -553,6 +555,7 @@
}
if (pending_event != DB_EVENT_NO_SUCH_EVENT)
DB_EVENT(dbenv, pending_event, NULL);
  + __dbt_userfree(dbenv, dbt, NULL, NULL);
return (ret);
   }
   
  @@ .
  patch -p0 <<'@@ .'
  Index: db/rep/rep_record.c
  
  $ cvs diff -u -r1.12 -r1.12.4.1 rep_record.c
  --- db/rep/rep_record.c   1 Oct 2006 20:19:35 -   1.12
  +++ db/rep/rep_record.c   3 Sep 2008 03:15:57 -   1.12.4.1
  @@ -163,6 +163,14 @@
return (EINVAL);
}
   
  + if ((ret = __dbt_usercopy(dbenv, control)) != 0 ||
  + (ret = __dbt_usercopy(dbenv, rec)) != 0) {
  + __dbt_userfree(dbenv, control, rec, NULL);
  + __db_errx(dbenv,
  + "DB_ENV->rep_process_message: error retrieving DBT contents");
  + return ret;
  + }
  +
ret = 0;
db_rep = dbenv->rep_handle;
rep = db_rep->region;
  @@ -621,6 +629,7 @@
*ret_lsnp = rp->lsn;
ret = DB_REP_NOTPERM;
}
  + __dbt_userfree(dbenv, control, rec, NULL);
return (ret);
   }
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org