date:20110324

[CVS] RPM: rpm-5_3: rpm/ configure.ac

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 23:44:31
  Branch: rpm-5_3  Handle: 2011032422443100

  Modified files:   (Branch: rpm-5_3)
rpm configure.ac

  Log:
isolate darwin hack which break ossp-uuid support on other platforms

  Summary:
RevisionChanges Path
2.432.2.49  +8  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.432.2.48 -r2.432.2.49 configure.ac
  --- rpm/configure.ac  2 Mar 2011 15:48:54 -   2.432.2.48
  +++ rpm/configure.ac  24 Mar 2011 22:44:31 -  2.432.2.49
  @@ -1723,8 +1723,12 @@
   
   dnl # OSSP uuid
   dnl XXX hack-o-round typedef __darwin_uuid_t uuid_t; in Mac OS X 
  +case "$host" in
  +*-*-darwin* )
   mv confdefs.h confdefs.h-SAVE
   grep -v 'define HAVE_UNISTD_H' confdefs.h-SAVE > confdefs.h
  +;;
  +esac
   RPM_CHECK_LIB(
   [OSSP uuid], [uuid],
   [ossp-uuid uuid], [uuid_import], [uuid.h],
  @@ -1734,7 +1738,10 @@
 WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_UUID"
 fi
   ], [])
  -mv confdefs.h-SAVE confdefs.h
  +case "$host" in
  +*-*-darwin* )
  +mv confdefs.h-SAVE confdefs.h;;
  +esac
   
   dnl # Syck
   RPM_CHECK_LIB(
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ configure.ac

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 23:44:02
  Branch: rpm-5_4  Handle: 2011032422440200

  Modified files:   (Branch: rpm-5_4)
rpm configure.ac

  Log:
isolate darwin hack which break ossp-uuid support on other platforms

  Summary:
RevisionChanges Path
2.472.2.9   +8  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.8 -r2.472.2.9 configure.ac
  --- rpm/configure.ac  25 Feb 2011 09:26:34 -  2.472.2.8
  +++ rpm/configure.ac  24 Mar 2011 22:44:02 -  2.472.2.9
  @@ -1748,8 +1748,12 @@
   
   dnl # OSSP uuid
   dnl XXX hack-o-round typedef __darwin_uuid_t uuid_t; in Mac OS X 
  +case "$host" in
  +*-*-darwin* )
   mv confdefs.h confdefs.h-SAVE
   grep -v 'define HAVE_UNISTD_H' confdefs.h-SAVE > confdefs.h
  +;;
  +esac
   RPM_CHECK_LIB(
   [OSSP uuid], [uuid],
   [ossp-uuid uuid], [uuid_import], [uuid.h],
  @@ -1759,7 +1763,10 @@
 WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_UUID"
 fi
   ], [])
  -mv confdefs.h-SAVE confdefs.h
  +case "$host" in
  +*-*-darwin* )
  +mv confdefs.h-SAVE confdefs.h;;
  +esac
   
   dnl # Syck
   RPM_CHECK_LIB(
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 23:42:54
  Branch: HEAD Handle: 2011032422425400

  Modified files:
rpm configure.ac

  Log:
isolate darwin hack which break ossp-uuid support on other platforms

  Summary:
RevisionChanges Path
2.480   +8  -1  rpm/configure.ac
  

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.479 -r2.480 configure.ac
  --- rpm/configure.ac  23 Mar 2011 15:09:32 -  2.479
  +++ rpm/configure.ac  24 Mar 2011 22:42:54 -  2.480
  @@ -1751,8 +1751,12 @@
   
   dnl # OSSP uuid
   dnl XXX hack-o-round typedef __darwin_uuid_t uuid_t; in Mac OS X 
  +case "$host" in
  +*-*-darwin* )
   mv confdefs.h confdefs.h-SAVE
   grep -v 'define HAVE_UNISTD_H' confdefs.h-SAVE > confdefs.h
  +;;
  +esac
   RPM_CHECK_LIB(
   [OSSP uuid], [uuid],
   [ossp-uuid uuid], [uuid_import], [uuid.h],
  @@ -1762,7 +1766,10 @@
 WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_UUID"
 fi
   ], [])
  -mv confdefs.h-SAVE confdefs.h
  +case "$host" in
  +*-*-darwin* )
  +mv confdefs.h-SAVE confdefs.h;;
  +esac
   
   dnl # Syck
   RPM_CHECK_LIB(
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/tests/ Makefile.am

2011-03-24 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 23:29:44
  Branch: rpm-5_4  Handle: 2011032422294400

  Modified files:   (Branch: rpm-5_4)
rpm/tests   Makefile.am

  Log:
--tests: rework the Verify-FOO target to use --root.
- tests: add --nofdigests and nofsync to increase performance

  Summary:
RevisionChanges Path
1.95.2.19   +24 -16 rpm/tests/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.95.2.18 -r1.95.2.19 Makefile.am
  --- rpm/tests/Makefile.am 23 Mar 2011 14:20:13 -  1.95.2.18
  +++ rpm/tests/Makefile.am 24 Mar 2011 22:29:44 -  1.95.2.19
  @@ -720,13 +720,18 @@
   #@-mkdir -p $(&1 | tee -a $(&1 | tee -a $( ${ " $$F; \
  -   ${rpm} -U --justdb --stats \
  - -D '_dbpath $(testdir)/$(&1 || : ; \
  -   ${rpm} -Va --nofiles --noaid \
  - -D '_dbpath $(testdir)/$(&1 || : ; \
  -   ${rpm} -e --justdb \
  - -D '_dbpath $(testdir)/$(&1 || : ; \
done | tee -a $(http://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.in rpm/ rpmpopt.in

2011-03-24 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 22:26:14
  Branch: rpm-5_4  Handle: 2011032421261400

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES rpmpopt.in
rpm/macros  macros.in

  Log:
- add a --nofsync popt alias (caveat: experimental & risky).

  Summary:
RevisionChanges Path
1.3501.2.75 +2  -0  rpm/CHANGES
1.39.2.5+3  -2  rpm/macros/macros.in
2.92.2.2+4  -16 rpm/rpmpopt.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.74 -r1.3501.2.75 CHANGES
  --- rpm/CHANGES   23 Mar 2011 20:49:45 -  1.3501.2.74
  +++ rpm/CHANGES   24 Mar 2011 21:26:14 -  1.3501.2.75
  @@ -1,4 +1,6 @@
   5.4.0 -> 5.4.1:
  +- jbj: add a --nofsync popt alias (caveat: experimental & risky).
  +- jbj: checksig: check explictly for per-item failures after iterating.
   - proyvind: always run %clean so it won't be required in .spec file.
   - jbj: install: check explictly for per-item failures after iterating.
   - jbj: rpmgi: save per-item failures separately from iteration returns.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.39.2.4 -r1.39.2.5 macros.in
  --- rpm/macros/macros.in  10 Feb 2011 21:13:52 -  1.39.2.4
  +++ rpm/macros/macros.in  24 Mar 2011 21:26:14 -  1.39.2.5
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.39.2.4 2011/02/10 21:13:52 pkarlsen Exp $
  +# $Id: macros.in,v 1.39.2.5 2011/03/24 21:26:14 jbj Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -298,7 +298,8 @@
   #==
   
   # Use Berkeley DB transaction logging for rpmdb ACID behavior.
  -%__dbi_txn  create lock log mpool txn auto_commit thread thread_count=64
  +# XXX the %{?__nofsync} is passed from the --nofsync popt alias on the rpm 
cli.
  +%__dbi_txn  create %{?__nofsync:nofsync} lock log mpool txn auto_commit 
thread thread_count=64
   
   %__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_txn}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmpopt.in
  
  $ cvs diff -u -r2.92.2.1 -r2.92.2.2 rpmpopt.in
  --- rpm/rpmpopt.in24 Feb 2011 19:33:15 -  2.92.2.1
  +++ rpm/rpmpopt.in24 Mar 2011 21:26:14 -  2.92.2.2
  @@ -2,7 +2,7 @@
   # \verbatim
   #
   # @USRLIBRPM@/@configure_input@
  -# $Id: rpmpopt.in,v 2.92.2.1 2011/02/24 19:33:15 pkarlsen Exp $
  +# $Id: rpmpopt.in,v 2.92.2.2 2011/03/24 21:26:14 jbj Exp $
   #
   # This file *should not be modified*. Local customizations
   # belong in /etc/popt, not here. This file will be replaced
  @@ -387,6 +387,9 @@
   rpm  alias --rebuilddbapi --define '_dbapi_rebuild !#:+'
   rpm  alias --rebuilddbpath--define '_dbpath_rebuild !#:+'
   
  +# permit fsync disabling of Berkeley DB (caveat: experimental & risky)
  +rpm  alias --nofsync --define '__nofsync nofsync'
  +
   
#==
   #[--dbpath DIRECTORY""use database in DIRECTORY"
   rpm  alias --dbpath  --define '_dbpath !#:+'
  @@ -426,21 +429,6 @@
   rpm  alias --arch --qf '%-34{=NAME}\t%{ARCH}\n' \
--POPTdesc=$"list package architecture"
   
#==
  -rpmb alias --dbpath  --define '_dbpath !#:+' \
  - --POPTdesc=$"use database in DIRECTORY" \
  - --POPTargs=$"DIRECTORY"
  -rpmb alias --ftpport --define '_ftpport !#:+'
  -rpmb alias --ftpproxy--define '_ftpproxy !#:+'
  -rpmb alias --httpport--define '_httpport !#:+'
  -rpmb alias --httpproxy   --define '_httpproxy !#:+'
  -rpmb alias --timecheck   --define '_timecheck !#:+'
  -rpmb alias --with--define "_with_!#:+   --with-!#:+" \
  - --POPTdesc=$"enable configure  for build" \
  - --POPTargs=$""
  -rpmb alias --without --define "_without_!#:+--without-!#:+" \
  - --POPTdesc=$"disable configure  for build" \
  - --POPTargs=$""
  
-#==
   rpmbuild

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/ rpmpopt.in

2011-03-24 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 22:25:50
  Branch: HEAD Handle: 2011032421254901

  Modified files:
rpm CHANGES rpmpopt.in
rpm/macros  macros.in

  Log:
- add a --nofsync popt alias (caveat: experimental & risky).

  Summary:
RevisionChanges Path
1.3575  +1  -0  rpm/CHANGES
1.44+3  -2  rpm/macros/macros.in
2.94+4  -16 rpm/rpmpopt.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3574 -r1.3575 CHANGES
  --- rpm/CHANGES   24 Mar 2011 13:34:23 -  1.3574
  +++ rpm/CHANGES   24 Mar 2011 21:25:49 -  1.3575
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +- jbj: add a --nofsync popt alias (caveat: experimental & risky).
   - devzero2000: drop borken test on change a directory with a symlink
   - proyvind: always run %clean so it won't be required in .spec file.
   - devzero2000: permit in configure phase to enable the 
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.in
  
  $ cvs diff -u -r1.43 -r1.44 macros.in
  --- rpm/macros/macros.in  10 Feb 2011 21:13:06 -  1.43
  +++ rpm/macros/macros.in  24 Mar 2011 21:25:50 -  1.44
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.43 2011/02/10 21:13:06 pkarlsen Exp $
  +# $Id: macros.in,v 1.44 2011/03/24 21:25:50 jbj Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -298,7 +298,8 @@
   #==
   
   # Use Berkeley DB transaction logging for rpmdb ACID behavior.
  -%__dbi_txn  create lock log mpool txn auto_commit thread thread_count=64
  +# XXX the %{?__nofsync} is passed from the --nofsync popt alias on the rpm 
cli.
  +%__dbi_txn  create %{?__nofsync:nofsync} lock log mpool txn auto_commit 
thread thread_count=64
   
   %__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_txn}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmpopt.in
  
  $ cvs diff -u -r2.93 -r2.94 rpmpopt.in
  --- rpm/rpmpopt.in24 Feb 2011 19:31:23 -  2.93
  +++ rpm/rpmpopt.in24 Mar 2011 21:25:49 -  2.94
  @@ -2,7 +2,7 @@
   # \verbatim
   #
   # @USRLIBRPM@/@configure_input@
  -# $Id: rpmpopt.in,v 2.93 2011/02/24 19:31:23 pkarlsen Exp $
  +# $Id: rpmpopt.in,v 2.94 2011/03/24 21:25:49 jbj Exp $
   #
   # This file *should not be modified*. Local customizations
   # belong in /etc/popt, not here. This file will be replaced
  @@ -387,6 +387,9 @@
   rpm  alias --rebuilddbapi --define '_dbapi_rebuild !#:+'
   rpm  alias --rebuilddbpath--define '_dbpath_rebuild !#:+'
   
  +# permit fsync disabling of Berkeley DB (caveat: experimental & risky)
  +rpm  alias --nofsync --define '__nofsync nofsync'
  +
   
#==
   #[--dbpath DIRECTORY""use database in DIRECTORY"
   rpm  alias --dbpath  --define '_dbpath !#:+'
  @@ -426,21 +429,6 @@
   rpm  alias --arch --qf '%-34{=NAME}\t%{ARCH}\n' \
--POPTdesc=$"list package architecture"
   
#==
  -rpmb alias --dbpath  --define '_dbpath !#:+' \
  - --POPTdesc=$"use database in DIRECTORY" \
  - --POPTargs=$"DIRECTORY"
  -rpmb alias --ftpport --define '_ftpport !#:+'
  -rpmb alias --ftpproxy--define '_ftpproxy !#:+'
  -rpmb alias --httpport--define '_httpport !#:+'
  -rpmb alias --httpproxy   --define '_httpproxy !#:+'
  -rpmb alias --timecheck   --define '_timecheck !#:+'
  -rpmb alias --with--define "_with_!#:+   --with-!#:+" \
  - --POPTdesc=$"enable configure  for build" \
  - --POPTargs=$""
  -rpmb alias --without --define "_without_!#:+--without-!#:+" \
  - --POPTdesc=$"disable configure  for build" \
  - --POPTargs=$""
  
-#==
   rpmbuild alias --dbpath  --define '_dbpath !#:+' \
--POPTdesc=$"use database in DIRECTORY" \
--POPTargs=$"DIRECTORY"
  @@ .
_

[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.in

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 17:59:22
  Branch: rpm-5_3  Handle: 2011032416592200

  Modified files:   (Branch: rpm-5_3)
rpm/macros  mandriva.in

  Log:
add distsuffix fallback for PLF (from Anssi)

  Summary:
RevisionChanges Path
1.1.2.12+1  -1  rpm/macros/mandriva.in
  

  patch -p0 <<'@@ .'
  Index: rpm/macros/mandriva.in
  
  $ cvs diff -u -r1.1.2.11 -r1.1.2.12 mandriva.in
  --- rpm/macros/mandriva.in24 Mar 2011 16:56:24 -  1.1.2.11
  +++ rpm/macros/mandriva.in24 Mar 2011 16:59:22 -  1.1.2.12
  @@ -31,7 +31,7 @@
   # %release with such.
   %evr_tuple_select1234
   %evr_tuple_order EVRD
  -%disttag mdv
  +%disttag %{!?distsuffix:mdv}%{?distsuffix}
   %distepoch   %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
   
   # Dynamic EVRD tags macro for use with versioned provides/requires in place 
of
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.in

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 17:56:24
  Branch: rpm-5_3  Handle: 2011032416562400

  Modified files:   (Branch: rpm-5_3)
rpm/macros  mandriva.in

  Log:
change log level of dependency loops

  Summary:
RevisionChanges Path
1.1.2.11+2  -0  rpm/macros/mandriva.in
  

  patch -p0 <<'@@ .'
  Index: rpm/macros/mandriva.in
  
  $ cvs diff -u -r1.1.2.10 -r1.1.2.11 mandriva.in
  --- rpm/macros/mandriva.in22 Feb 2011 16:55:57 -  1.1.2.10
  +++ rpm/macros/mandriva.in24 Mar 2011 16:56:24 -  1.1.2.11
  @@ -71,4 +71,6 @@
   # mdvbz#61851
   %__tar_wildcards   --wildcards
   
  +%_loop_detection_loglevel 3
  +
   %{load:/etc/rpm/macros.d/*.macros}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 17:55:06
  Branch: rpm-5_3  Handle: 2011032416550600

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
commit fire-file-triggers-only-once patch from mandriva under #ifdef

  Summary:
RevisionChanges Path
2.394.2.7   +21 -0  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.6 -r2.394.2.7 psm.c
  --- rpm/lib/psm.c 24 Mar 2011 16:47:31 -  2.394.2.6
  +++ rpm/lib/psm.c 24 Mar 2011 16:55:06 -  2.394.2.7
  @@ -1476,11 +1476,32 @@
/*@innercontinue@*/ continue;
rc |= handleOneTrigger(psm, fi->h, triggeredH, arg2);
prev = instance;
  +
  +#if !defined(RPM_VENDOR_MANDRIVA)
  + /*
  +  * FIXME: 'instances' is never really used for anything later,
  +  * and seems to have some bug making it eat it all memory
  +  */
xx = argiAdd(&instances, -1, instance);
xx = argiSort(instances, NULL);
  +#else
  + /* As no filenames or anything is passed to the trigger script,
  +  * there doesn't seem to be any reason to fire the same trigger
  +  * over and over..
  +  */
  + if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES)
  + break;
  + xx = argiAdd(&instances, -1, instance);
  + xx = argiSort(instances, NULL);
  +#endif
}
   
mi = rpmmiFree(mi);
  +#if defined(RPM_VENDOR_MANDRIVA)
  + /* again don't fire same trigger over and over.. */
  + if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES)
  + break;
  +#endif
   }
   
   instances = argiFree(instances);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/rpmdb/ rpmdb.c

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 17:51:17
  Branch: rpm-5_3  Handle: 2011032416511700

  Modified files:   (Branch: rpm-5_3)
rpm/rpmdb   rpmdb.c

  Log:
commit distepoch-pattern-hack patch from mandriva under #ifdef

  Summary:
RevisionChanges Path
1.386.2.11  +17 -0  rpm/rpmdb/rpmdb.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmdb.c
  
  $ cvs diff -u -r1.386.2.10 -r1.386.2.11 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 16 Feb 2011 18:56:28 -  1.386.2.10
  +++ rpm/rpmdb/rpmdb.c 24 Mar 2011 16:51:17 -  1.386.2.11
  @@ -2446,6 +2446,23 @@
/* XXX Special case #4: gather primary keys with patterns. */
rpmRC rc;
   
  +#if defined(RPM_VENDOR_MANDRIVA)
  + /*
  +  * ugly hack to workaround disttag/distepoch pattern matching issue to 
buy some
  +  * time to come up with better pattern fix..
  +  */
  + const char *tmp = strstr(keyp, "-mdv2011.0");
  + if(tmp) {
  + const char *origkeyp = keyp;
  + size_t klen = strlen(keyp);
  + keyp = alloca(klen);
  + memset((void*)keyp, klen, 0);
  + klen = tmp-origkeyp+1;
  + snprintf((char*)keyp, klen, "%s", origkeyp);
  + if(strlen(tmp) > sizeof("-mdv2011.0")-1)
  + stpcpy((char*)keyp+(klen-1), &tmp[sizeof("-mdv2011.0")-1]);
  + }
  +#endif
rc = dbiFindMatches(dbi, keyp, &set);
   
if ((rc  && rc != RPMRC_NOTFOUND) || set == NULL || set->count < 1) { 
/* error or empty set */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ transaction.c

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 17:48:03
  Branch: rpm-5_3  Handle: 2011032416480300

  Modified files:   (Branch: rpm-5_3)
rpm/lib transaction.c

  Log:
commit no-doc-conflicts patch from mandriva under #ifdef

  Summary:
RevisionChanges Path
1.428.2.6   +40 -0  rpm/lib/transaction.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/transaction.c
  
  $ cvs diff -u -r1.428.2.5 -r1.428.2.6 transaction.c
  --- rpm/lib/transaction.c 1 Feb 2011 13:54:08 -   1.428.2.5
  +++ rpm/lib/transaction.c 24 Mar 2011 16:48:03 -  1.428.2.6
  @@ -68,6 +68,24 @@
   /*@access IDTX @*/
   /*@access FD_t @*/
   
  +#if defined(RPM_VENDOR_MANDRIVA)
  +static int is_a_doc_conflict(rpmfi fi)
  +{
  +const char *ignorelist[] = {
  + "/usr/share/man/",
  + "/usr/share/gtk-doc/html/",
  + "/usr/share/gnome/html/",
  + NULL
  +};
  +const char *fn = rpmfiFN(fi);
  +const char **dnp;
  +for (dnp = ignorelist; *dnp != NULL; dnp++)
  + if (strstr(fn, *dnp) == fn) return 1;
  +
  +return 0;
  +}
  +#endif
  +
   static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
   Header otherHeader, rpmfi otherFi,
   int beingRemoved)
  @@ -117,6 +135,17 @@
}
}
   
  +#if defined(RPM_VENDOR_MANDRIVA)
  + if(rpmExpandNumeric("%{?_legacy_compat_no_doc_conflicts}")) {
  + /* HACK: always install latest (arch-independent) man
  +pages and gtk/gnome html doc files. */
  + if (rConflicts && is_a_doc_conflict(fi)) {
  + fi->actions[fx] = FA_CREATE;
  + rConflicts = 0;
  + }
  + }
  +#endif
  +
if (rConflicts) {
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmps ps = rpmtsProblems(ts);
  @@ -381,6 +410,17 @@
done = 1;
}
   
  +#if defined(RPM_VENDOR_MANDRIVA)
  + if(rpmExpandNumeric("%{?_legacy_compat_no_doc_conflicts}")) {
  + /* HACK: always install latest (arch-independent) man
  +pages and gtk/gnome html doc files. */
  + if (rConflicts && is_a_doc_conflict(fi)) {
  + fi->actions[i] = FA_CREATE;
  + rConflicts = 0;
  + }
  + }
  +#endif
  +
if (rConflicts) {
rpmpsAppend(ps, RPMPROB_NEW_FILE_CONFLICT,
rpmteNEVR(p), rpmteKey(p),
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 17:47:31
  Branch: rpm-5_3  Handle: 2011032416473100

  Modified files:   (Branch: rpm-5_3)
rpm/lib psm.c

  Log:
commit non-pre-scripts-dont-fail patch from mandriva under #ifdef

  Summary:
RevisionChanges Path
2.394.2.6   +12 -8  rpm/lib/psm.c
  

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  
  $ cvs diff -u -r2.394.2.5 -r2.394.2.6 psm.c
  --- rpm/lib/psm.c 29 Dec 2010 15:04:06 -  2.394.2.5
  +++ rpm/lib/psm.c 24 Mar 2011 16:47:31 -  2.394.2.6
  @@ -2178,6 +2178,10 @@
   rpmRC rc = psm->rc;
   int saveerrno;
   int xx;
  +int non_pre_scripts_dont_fail = 0;
  +#if defined(RPM_VENDOR_MANDRIVA)
  +non_pre_scripts_dont_fail = 
rpmExpandNumeric("%{?_legacy_compat_non_pre_scripts_dont_fail}");
  +#endif
   
   /* XXX hackery to assert(!scareMem) in rpmfiNew. */
   /*@-castexpose@*/
  @@ -2399,11 +2403,11 @@
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERUN)) {
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
   
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
}
   
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPREUN))
  @@ -2743,16 +2747,16 @@
   
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOST)) {
rc = rpmpsmNext(psm, PSM_SCRIPT);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
}
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERIN)) {
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
   
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
}
   
/*
  @@ -2785,17 +2789,17 @@
   
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) {
rc = rpmpsmNext(psm, PSM_SCRIPT);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
}
   
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) {
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
   
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
  - if (rc) break;
  + if(rc && !non_pre_scripts_dont_fail) break;
}
   
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_APPLYONLY))
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/rpmdb/ db3.c

2011-03-24 Thread Per ï¿½yvind Karlsen

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Per Ãyvind Karlsen
  Root:   /v/rpm/cvs   Email:  pkarl...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 17:46:13
  Branch: rpm-5_3  Handle: 2011032416461300

  Modified files:   (Branch: rpm-5_3)
rpm/rpmdb   db3.c

  Log:
add set-default-bdb-log-dir patch from cooker under mandriva #ifdef

  Summary:
RevisionChanges Path
1.150.2.10  +14 -0  rpm/rpmdb/db3.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/db3.c
  
  $ cvs diff -u -r1.150.2.9 -r1.150.2.10 db3.c
  --- rpm/rpmdb/db3.c   25 Jan 2011 14:53:16 -  1.150.2.9
  +++ rpm/rpmdb/db3.c   24 Mar 2011 16:46:13 -  1.150.2.10
  @@ -920,6 +920,20 @@
   }
   
   /*  Logging: */
  +#if defined(RPM_VENDDOR_MANDRIVA) /* set-default-bdb-log-dir */
  +const char *logdir;
  +
  +logdir = rpmGetPath(dbhome, "/", "log", NULL);
  +/*
  + * Create the /var/lib/rpm/log directory if it doesn't exist (root only).
  + */
  +rpmioMkpath(logdir, 0755, getuid(), getgid());
  +
  +xx = dbenv->set_lg_dir(dbenv, logdir);
  +xx = cvtdberr(dbi, "dbenv->set_lg_dir", xx, _debug);
  +
  +_free(logdir);
  +#endif
   
   /*  Memory pool: */
   if (eflags & DB_INIT_MPOOL) {
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: mancoosi/buildbot/custom/ SystemArchitecture.png

2011-03-24 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: mancoosi Date:   24-Mar-2011 17:06:33
  Branch: HEAD Handle: 2011032416063300

  Modified files:
mancoosi/buildbot/custom
SystemArchitecture.png

  Log:
- updated diagream.

  Summary:
RevisionChanges Path
1.2 BLOBmancoosi/buildbot/custom/SystemArchitecture.png
  

  (cd mancoosi/buildbot/custom && \
   uudecode <<'@@ .' && \
   mv SystemArchitecture.png SystemArchitecture.png.orig && \
   xdelta patch SystemArchitecture.png.xdelta SystemArchitecture.png.orig 
SystemArchitecture.png && \
   rm -f SystemArchitecture.png.orig SystemArchitecture.png.xdelta)
  Index: mancoosi/buildbot/custom/SystemArchitecture.png
  
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES

2011-03-24 Thread Pinto Elia

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 14:34:24
  Branch: HEAD Handle: 2011032413342300

  Modified files:
rpm CHANGES

  Log:
populate CHANGES for drop borken test on change a directory with a
symlink

  Summary:
RevisionChanges Path
1.3574  +1  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3573 -r1.3574 CHANGES
  --- rpm/CHANGES   23 Mar 2011 20:48:40 -  1.3573
  +++ rpm/CHANGES   24 Mar 2011 13:34:23 -  1.3574
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +- devzero2000: drop borken test on change a directory with a symlink
   - proyvind: always run %clean so it won't be required in .spec file.
   - devzero2000: permit in configure phase to enable the 
 --enable-rpm-lua-extensions-based-on-rpmlib used by OpenPKG today
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/tests/ test-change-dir-to-symlink-1.1.spec test-change-...

2011-03-24 Thread Pinto Elia

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   24-Mar-2011 14:32:52
  Branch: HEAD Handle: 2011032413325100

  Removed files:
rpm/tests   test-change-dir-to-symlink-1.1.spec
test-change-dir-to-symlink-1.2.spec

  Log:
drop borken test on change a directory with a symlink

  Summary:
RevisionChanges Path
1.2 +0  -40 rpm/tests/test-change-dir-to-symlink-1.1.spec
1.4 +0  -110rpm/tests/test-change-dir-to-symlink-1.2.spec
  

  rm -f rpm/tests/test-change-dir-to-symlink-1.1.spec <<'@@ .'
  Index: rpm/tests/test-change-dir-to-symlink-1.1.spec
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/tests/test-change-dir-to-symlink-1.2.spec <<'@@ .'
  Index: rpm/tests/test-change-dir-to-symlink-1.2.spec
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/ configure.ac

[CVS] RPM: rpm-5_4: rpm/ configure.ac

[CVS] RPM: rpm/ configure.ac

[CVS] RPM: rpm-5_4: rpm/tests/ Makefile.am

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.in rpm/ rpmpopt.in

[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.in rpm/ rpmpopt.in

[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.in

[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.in

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

[CVS] RPM: rpm-5_3: rpm/rpmdb/ rpmdb.c

[CVS] RPM: rpm-5_3: rpm/lib/ transaction.c

[CVS] RPM: rpm-5_3: rpm/lib/ psm.c

[CVS] RPM: rpm-5_3: rpm/rpmdb/ db3.c

[CVS] RPM: mancoosi/buildbot/custom/ SystemArchitecture.png

[CVS] RPM: rpm/ CHANGES

[CVS] RPM: rpm/tests/ test-change-dir-to-symlink-1.1.spec test-change-...

16 matches

Site Navigation

Mail list logo

Footer information