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: 10-Apr-2011 01:11:22
Branch: rpm-5_3 Handle: 2011040923112101
Modified files: (Branch: rpm-5_3)
rpm CHANGES rpmpopt.in
rpm/macros macros.in
Log:
backport from HEAD:
- add a --nofsync popt alias (caveat: experimental & risky).
Summary:
Revision Changes Path
1.3296.2.203+2 -0 rpm/CHANGES
1.28.2.19 +3 -2 rpm/macros/macros.in
2.86.2.6 +4 -16 rpm/rpmpopt.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.202 -r1.3296.2.203 CHANGES
--- rpm/CHANGES 6 Apr 2011 23:34:35 -0000 1.3296.2.202
+++ rpm/CHANGES 9 Apr 2011 23:11:21 -0000 1.3296.2.203
@@ -1,4 +1,6 @@
5.3.10 -> 5.3.11
+ - jbj: add a --nofsync popt alias (caveat: experimental & risky).
+ - jbj: checksig: check explictly for per-item failures after iterating.
- jbj: build: fix: resurrect %description -l XY yet again.
- jbj: build: fix: attempt arbitrary '%foo' tag iff '%' is seen.
- mdawkins: tagged 5.3.10 release in configure.ac
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.28.2.18 -r1.28.2.19 macros.in
--- rpm/macros/macros.in 1 Apr 2011 05:22:45 -0000 1.28.2.18
+++ rpm/macros/macros.in 9 Apr 2011 23:11:22 -0000 1.28.2.19
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.28.2.18 2011/04/01 05:22:45 pkarlsen Exp $
+# $Id: macros.in,v 1.28.2.19 2011/04/09 23:11:22 pkarlsen 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
@@ -297,7 +297,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.86.2.5 -r2.86.2.6 rpmpopt.in
--- rpm/rpmpopt.in 24 Feb 2011 19:33:49 -0000 2.86.2.5
+++ rpm/rpmpopt.in 9 Apr 2011 23:11:21 -0000 2.86.2.6
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.86.2.5 2011/02/24 19:33:49 pkarlsen Exp $
+# $Id: rpmpopt.in,v 2.86.2.6 2011/04/09 23:11:21 pkarlsen 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 <option> for build" \
- --POPTargs=$"<option>"
-rpmb alias --without --define "_without_!#:+ --without-!#:+" \
- --POPTdesc=$"disable configure <option> for build" \
- --POPTargs=$"<option>"
-#==============================================================================
rpmbuild alias --dbpath --define '_dbpath !#:+' \
--POPTdesc=$"use database in DIRECTORY" \
--POPTargs=$"DIRECTORY"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
