RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Jan-2008 22:20:44
Branch: HEAD Handle: 2008010221204301
Modified files:
rpm CHANGES VENDOR
rpm/rpmio macro.c
Log:
- jbj: set macro_BUFSIZ as 16K independent of BUFSIZ (from openpkg).
Summary:
Revision Changes Path
1.2048 +1 -0 rpm/CHANGES
2.28 +0 -8 rpm/VENDOR
2.168 +0 -7 rpm/rpmio/macro.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2047 -r1.2048 CHANGES
--- rpm/CHANGES 2 Jan 2008 15:54:31 -0000 1.2047
+++ rpm/CHANGES 2 Jan 2008 21:20:43 -0000 1.2048
@@ -1,4 +1,5 @@
5.0b4 -> 5.0.0:
+ - jbj: set macro_BUFSIZ as 16K independent of BUFSIZ (from openpkg).
- rse: add RPM Lua function util.rsplit() for flexibly splitting strings
into tokens based on regex
- rse: add rpmlogGetCallback() function to allow one to restore the
complete rpmlog() callback information
- rse: add rpmluaGetGlobalState() function to allow foreign code to
further extend the RPM Lua environment
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.27 -r2.28 VENDOR
--- rpm/VENDOR 2 Jan 2008 19:10:13 -0000 2.27
+++ rpm/VENDOR 2 Jan 2008 21:20:43 -0000 2.28
@@ -210,14 +210,6 @@
rpm -qa for the case of public keys.
________________________________________________________________________
- Change: fixed-size-macro-buffer
- Purpose: Use a fixed 16KB buffer for macro expansion.
- Reason: Don't use the stdio variable BUFSIZ because it is of
- unknown size. Usually, it is just 1024 on some
- platforms but on Linux it can be even 8192. Use a
- fixed 16KB buffer in OpenPKG for now.
- ________________________________________________________________________
-
Change: stop-on-error-macro
Purpose: Make sure that an %{error:<msg>} macro really stops
further
processing. Else it would be nothing more than a
%{warn:<msg>}.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.167 -r2.168 macro.c
--- rpm/rpmio/macro.c 2 Jan 2008 19:10:14 -0000 2.167
+++ rpm/rpmio/macro.c 2 Jan 2008 21:20:44 -0000 2.168
@@ -130,14 +130,7 @@
#define MACRO_CHUNK_SIZE 16
/* Size of expansion buffers. */
-#if defined(RPM_VENDOR_OPENPKG) /* fixed-size-macro-buffer */
-/* Don't use the stdio variable BUFSIZ because it is of unknown size.
- Usually, it is just 1024 on some platforms but on Linux it can be
- even 8192. Use a fixed 16KB buffer in OpenPKG for now. */
static size_t _macro_BUFSIZ = 16 * 1024;
-#else
-static size_t _macro_BUFSIZ = 4 * BUFSIZ;
-#endif
/* forward ref */
static int expandMacro(MacroBuf mb)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
