date:20080103

[CVS] RPM: rpm/ VENDOR

2008-01-03 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:   03-Jan-2008 09:50:20
  Branch: HEAD Handle: 2008010308502000

  Modified files:
rpm VENDOR

  Log:
remove extra blank lines

  Summary:
RevisionChanges Path
2.31+0  -2  rpm/VENDOR
  

  patch -p0 <<'@@ .'
  Index: rpm/VENDOR
  
  $ cvs diff -u -r2.30 -r2.31 VENDOR
  --- rpm/VENDOR2 Jan 2008 21:45:45 -   2.30
  +++ rpm/VENDOR3 Jan 2008 08:50:20 -   2.31
  @@ -252,7 +252,6 @@
slower but more flexible linear search based on
fnmatch(3) instead of a binary search based on
strcasecmp(3).
  -

   
Change: no-auto-verbose-increase-for-track-and-fetch
  @@ -293,7 +292,6 @@
files directly from the upstream vendor. Hence we
want that RPM is able to download from the original
location, too.
  -

   
Change: explicit-source-fetch-cli-option
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ rpmqv.c

2008-01-03 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:   03-Jan-2008 10:01:32
  Branch: HEAD Handle: 2008010309013200

  Modified files:
rpm rpmqv.c

  Log:
fix id so this hunk can be found when VENDOR is read

  Summary:
RevisionChanges Path
1.138   +1  -1  rpm/rpmqv.c
  

  patch -p0 <<'@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.137 -r1.138 rpmqv.c
  --- rpm/rpmqv.c   2 Jan 2008 16:57:36 -   1.137
  +++ rpm/rpmqv.c   3 Jan 2008 09:01:32 -   1.138
  @@ -841,7 +841,7 @@
/[EMAIL PROTECTED]@*/ break;
case 's':
ba->buildAmount |= RPMBUILD_PACKAGESOURCE;
  -#if defined(RPM_VENDOR_OPENPKG) /* no-deps-on-build-srpms */
  +#if defined(RPM_VENDOR_OPENPKG) /* no-deps-on-building-srpms */
/* enforce no dependency checking when rolling a source RPM */
ba->noDeps = 1;
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ VENDOR

2008-01-03 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:   03-Jan-2008 10:07:38
  Branch: HEAD Handle: 2008010309073800

  Modified files:
rpm VENDOR

  Log:
remember my wish: I want to see a DEPS_XXX based bitmask, not a
boolean value

  Summary:
RevisionChanges Path
2.32+17 -1  rpm/VENDOR
  

  patch -p0 <<'@@ .'
  Index: rpm/VENDOR
  
  $ cvs diff -u -r2.31 -r2.32 VENDOR
  --- rpm/VENDOR3 Jan 2008 08:50:20 -   2.31
  +++ rpm/VENDOR3 Jan 2008 09:07:38 -   2.32
  @@ -72,7 +72,23 @@
just rolling a source RPM package.
Hint:   (jbj) There is a benefit if you want digest(...) and/or
signature(...) verification of build elements before
  - inclusion in *.src.rpm.
  + inclusion in *.src.rpm. 
  + (rse) Yes, This is something we really want, OTOH
  + we really do NEVER want to have to install all
  + BuildPreReq _packages_ just to roll a SRPM. OTOH
  + "-bs --nodeps" then also skipps the wished checks.
  + Hmmm... we would need to replace the boolean
  + "noDeps" with DEPS_NONE, DEPS_INTEGRITY and
  + DEPS_ALL. DEPS_NONE is the old "noDeps = 1",
  + DEPS_ALL is the old "noDeps = 1" and DEPS_INTEGRITY
  + is new and would lead to the checking of only
  + those BuildRequires/BuildPreReqs which ensure the
  + integrity of the rolled SRPMS (currently AFAIK
  + "digest(...)", "signature(...)", "gnupg(...)", etc)
  + and especially skip the dependencies to installed
  + packages. Or even better: make DEPS_XXX bits of a
  + bitmask and allow one to assemble what one really
  + wished to be checked.

   
Change: always-remove-tempfiles
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/scripts/ rpm2flatpkg

2008-01-03 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   03-Jan-2008 11:27:54
  Branch: HEAD Handle: 2008010310275400

  Modified files:
rpm/scripts rpm2flatpkg

  Log:
surprisingly, RPM must come before PKG in the XAR archive

  Summary:
RevisionChanges Path
1.4 +1  -1  rpm/scripts/rpm2flatpkg
  

  patch -p0 <<'@@ .'
  Index: rpm/scripts/rpm2flatpkg
  
  $ cvs diff -u -r1.3 -r1.4 rpm2flatpkg
  --- rpm/scripts/rpm2flatpkg   2 Jan 2008 22:36:35 -   1.3
  +++ rpm/scripts/rpm2flatpkg   3 Jan 2008 10:27:54 -   1.4
  @@ -73,7 +73,7 @@
   pkgpart="PackageInfo Bom Payload"
   rpmpart="Lead Signature Header Payload"
   
  -( cd $TMPDIR; $XAR -xf $xarpath; $XAR -xf $pkgpath; $XAR -cf $pkgpath 
--no-compress=Payload $pkgpart $rpmpart)
  +( cd $TMPDIR; $XAR -xf $xarpath; $XAR -xf $pkgpath; $XAR -cf $pkgpath 
--no-compress=Payload $rpmpart $pkgpart )
   
   #
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES macros.in

2008-01-03 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:   03-Jan-2008 11:55:39
  Branch: HEAD Handle: 2008010310553900

  Modified files:
rpm CHANGES macros.in

  Log:
Fix database configuration for recently added indices "Nvra" and
"Sourcepkgid".

  Summary:
RevisionChanges Path
1.2051  +1  -0  rpm/CHANGES
1.226   +8  -4  rpm/macros.in
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2050 -r1.2051 CHANGES
  --- rpm/CHANGES   2 Jan 2008 21:45:45 -   1.2050
  +++ rpm/CHANGES   3 Jan 2008 10:55:39 -   1.2051
  @@ -1,4 +1,5 @@
   5.0b4 -> 5.0.0:
  +- rse: fix database configuration for recently added indices "Nvra" and 
"Sourcepkgid"
   - jbj: differentiate %warn and %error (now stops) behavior (from 
openpkg).
   - jbj: merge %{realpath:...}. won't hurt a thing (from openpkg).
   - jbj: set macro_BUFSIZ as 16K independent of BUFSIZ (from openpkg).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.225 -r1.226 macros.in
  --- rpm/macros.in 1 Jan 2008 02:00:16 -   1.225
  +++ rpm/macros.in 3 Jan 2008 10:55:39 -   1.226
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.225 2008/01/01 02:00:16 mej Exp $
  +# $Id: macros.in,v 1.226 2008/01/03 10:55:39 rse 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
  @@ -679,7 +679,7 @@
   
   # database tag configuration
   %_dbi_tags  %{expand:%%{_dbi_tags_%{_dbapi_used}}}
  -%_dbi_tags_3
Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Foo:Bar:Baz
  +%_dbi_tags_3
Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid
   %_dbi_tags_4
Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid
   
   # database configuration: Berkeley-DB [dbapi 3 hooks]
  @@ -703,7 +703,8 @@
   %_dbi_config_3_Triggername  %{_dbi_btconfig}
   %_dbi_config_3_Packages %{_dbi_btconfig} lockdbfd
   %_dbi_config_3_Depends  %{_dbi_btconfig} temporary private
  -%_dbi_config_3_Nvra  %{_dbi_btconfig} noload
  +%_dbi_config_3_Nvra %{_dbi_btconfig} noload
  +%_dbi_config_3_Sourcepkgid  %{_dbi_btconfig}
   
   # database configuration: SQLite [dbapi 4 hooks]
   %_dbi_config_4  %{_dbi_sqlconfig}
  @@ -726,7 +727,8 @@
   %_dbi_config_4_Triggername  %{_dbi_sqlconfig}
   %_dbi_config_4_Packages %{_dbi_sqlconfig}
   %_dbi_config_4_Depends  %{_dbi_sqlconfig} temporary private
  -%_dbi_config_4_Nvra  %{_dbi_btconfig} noload
  +%_dbi_config_4_Nvra %{_dbi_sqlconfig} noload
  +%_dbi_config_4_Sourcepkgid  %{_dbi_sqlconfig}
   
   # database configuration [code entry hooks]
   %_dbi_config%{expand:%%{_dbi_config_%{_dbapi_used}}}
  @@ -749,6 +751,8 @@
   %_dbi_config_Triggername
%{expand:%%{_dbi_config_%{_dbapi_used}_Triggername}}
   %_dbi_config_Packages   
%{expand:%%{_dbi_config_%{_dbapi_used}_Packages}}
   %_dbi_config_Depends
%{expand:%%{_dbi_config_%{_dbapi_used}_Depends}}
  +%_dbi_config_Nvra   %{expand:%%{_dbi_config_%{_dbapi_used}_Nvra}}
  +%_dbi_config_Sourcepkgid
%{expand:%%{_dbi_config_%{_dbapi_used}_Sourcepkgid}}
   
   # Database API configuration:
   #
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpminstall.c rpm/ rpmqv.c

2008-01-03 Thread Mark Hatle

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

  Server: rpm5.org Name:   Mark Hatle
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   03-Jan-2008 18:57:35
  Branch: HEAD Handle: 2008010317573400

  Modified files:
rpm CHANGES rpmqv.c
rpm/lib rpminstall.c

  Log:
Submitted by: Wind River Systems
Reviewed by: jbj on IRC

- mgh: allow --ignoresize when doing an erase

Workaround for an issue where you may have slow or broken NFS mounts that
can hang an erase operation.

  Summary:
RevisionChanges Path
1.2052  +1  -0  rpm/CHANGES
1.189   +2  -1  rpm/lib/rpminstall.c
1.139   +0  -5  rpm/rpmqv.c
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2051 -r1.2052 CHANGES
  --- rpm/CHANGES   3 Jan 2008 10:55:39 -   1.2051
  +++ rpm/CHANGES   3 Jan 2008 17:57:34 -   1.2052
  @@ -1,4 +1,5 @@
   5.0b4 -> 5.0.0:
  +- mgh: allow --ignoresize when doing an erase
   - rse: fix database configuration for recently added indices "Nvra" and 
"Sourcepkgid"
   - jbj: differentiate %warn and %error (now stops) behavior (from 
openpkg).
   - jbj: merge %{realpath:...}. won't hurt a thing (from openpkg).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpminstall.c
  
  $ cvs diff -u -r1.188 -r1.189 rpminstall.c
  --- rpm/lib/rpminstall.c  8 Dec 2007 19:21:55 -   1.188
  +++ rpm/lib/rpminstall.c  3 Jan 2008 17:57:34 -   1.189
  @@ -625,7 +625,8 @@
/* Drop added/available package indices and dependency sets. */
rpmtsClean(ts);
   
  - numPackages = rpmtsRun(ts, NULL, 0);
  + numPackages = rpmtsRun(ts, NULL, 
  + ia->probFilter & 
(RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES));
ps = rpmtsProblems(ts);
if (rpmpsNumProblems(ps) > 0)
rpmpsPrint(NULL, ps);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmqv.c
  
  $ cvs diff -u -r1.138 -r1.139 rpmqv.c
  --- rpm/rpmqv.c   3 Jan 2008 09:01:32 -   1.138
  +++ rpm/rpmqv.c   3 Jan 2008 17:57:34 -   1.139
  @@ -608,11 +608,6 @@
argerror(_("--ignoreos may only be specified during package "
   "installation"));
   
  -if (bigMode != MODE_INSTALL &&
  - (ia->probFilter & (RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES)))
  - argerror(_("--ignoresize may only be specified during package "
  -"installation"));
  -
   if ((ia->installInterfaceFlags & INSTALL_ALLMATCHES) && bigMode != 
MODE_ERASE)
argerror(_("--allmatches may only be specified during package "
   "erasure"));
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2008-01-03 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:   03-Jan-2008 20:28:05
  Branch: HEAD Handle: 2008010319280500

  Modified files:
rpm devtool.conf

  Log:
we need the usual workaround under Solaris also for RPM

  Summary:
RevisionChanges Path
2.165   +2  -0  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.164 -r2.165 devtool.conf
  --- rpm/devtool.conf  2 Jan 2008 17:33:43 -   2.164
  +++ rpm/devtool.conf  3 Jan 2008 19:28:05 -   2.165
  @@ -855,6 +855,7 @@
   CPPFLAGS=""
   LDFLAGS=""
   LIBS=""
  +GREP="grep"
   if [ ".$RPM_VENDOR_OPENPKG" != . ]; then
   CPPFLAGS="$CPPFLAGS -DRPM_VENDOR_OPENPKG"
   RPM_INTEGRITY_FP=`cat scripts/integrity.fp`
  @@ -873,6 +874,7 @@
   export CPPFLAGS
   export LDFLAGS
   export LIBS
  +export GREP
   OPTION=""
   OPTION="$OPTION --prefix=\"$prefix\""
   OPTION="$OPTION --mandir=\"$prefix/man\""
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2008-01-03 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   03-Jan-2008 23:03:48
  Branch: HEAD Handle: 2008010322034800

  Modified files:
rpm devtool.conf

  Log:
macosx: remove libtool libraries from python too

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

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.165 -r2.166 devtool.conf
  --- rpm/devtool.conf  3 Jan 2008 19:28:05 -   2.165
  +++ rpm/devtool.conf  3 Jan 2008 22:03:48 -   2.166
  @@ -1563,6 +1563,7 @@
   strip -S /tmp/rpm-root/usr/local/lib/rpm/db_*
   strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib
   rm -f /tmp/rpm-root/usr/local/lib/librpm*.la
  +rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la
   
   # test drive (version only, should set up a local dbpath)
   DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:$DYLD_LIBRARY_PATH 
/tmp/rpm-root/usr/local/bin/rpm --version
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2008-01-03 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   03-Jan-2008 23:18:08
  Branch: HEAD Handle: 2008010322180800

  Modified files:
rpm devtool.conf

  Log:
macosx: remove more internal junk

  Summary:
RevisionChanges Path
2.167   +3  -0  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.166 -r2.167 devtool.conf
  --- rpm/devtool.conf  3 Jan 2008 22:03:48 -   2.166
  +++ rpm/devtool.conf  3 Jan 2008 22:18:08 -   2.167
  @@ -1542,6 +1542,9 @@
   # copy required popt.h library header to internal headers
   cp -p "$basemac/bin/popt-${v_popt}/popt.h" 
/tmp/rpm-root/usr/local/include/rpm
   
  +# don't leak private search paths, libraries and arch'es
  +perl -ni -e "print unless /^Libs.private/" 
/tmp/rpm-root/usr/local/lib/pkgconfig/rpm.pc
  +
   # copy the internal txar tool over, for testing purposes
   cp -p tools/.libs/txar /tmp/rpm-root/usr/local/lib/rpm
   strip -S /tmp/rpm-root/usr/local/lib/rpm/txar
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2008-01-03 Thread Anders F. Bjï¿½rklund

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

  Server: rpm5.org Name:   Anders F. BjÃ¶rklund
  Root:   /v/rpm/cvs   Email:  [EMAIL PROTECTED]
  Module: rpm  Date:   03-Jan-2008 23:29:09
  Branch: HEAD Handle: 2008010322290900

  Modified files:
rpm devtool.conf

  Log:
macosx: more debugging symbol stripping

  Summary:
RevisionChanges Path
2.168   +7  -0  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.167 -r2.168 devtool.conf
  --- rpm/devtool.conf  3 Jan 2008 22:18:08 -   2.167
  +++ rpm/devtool.conf  3 Jan 2008 22:29:09 -   2.168
  @@ -1561,10 +1561,17 @@
   
   # strip debugging symbols, and remove libtool files (.la)
   strip -S /tmp/rpm-root/usr/local/bin/rpm
  +strip -S /tmp/rpm-root/usr/local/bin/rpm2cpio
   strip -S /tmp/rpm-root/usr/local/bin/rpmbuild
   strip -S /tmp/rpm-root/usr/local/bin/rpmconstant
  +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcache
  +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcmp
  +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdeps
  +strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdigest
   strip -S /tmp/rpm-root/usr/local/lib/rpm/db_*
   strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib
  +strip -S 
/tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle
  +strip -S /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.so
   rm -f /tmp/rpm-root/usr/local/lib/librpm*.la
   rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ VENDOR

[CVS] RPM: rpm/ rpmqv.c

[CVS] RPM: rpm/ VENDOR

[CVS] RPM: rpm/scripts/ rpm2flatpkg

[CVS] RPM: rpm/ CHANGES macros.in

[CVS] RPM: rpm/ CHANGES rpm/lib/ rpminstall.c rpm/ rpmqv.c

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/ devtool.conf

10 matches

Site Navigation

Mail list logo

Footer information