date:20071227

[CVS] RPM: rpm/ CHANGES macros.in

2007-12-27 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:   27-Dec-2007 10:19:57
  Branch: HEAD Handle: 2007122709195700

  Modified files:
rpm CHANGES macros.in

  Log:
Improve %patch macro implementation: less expansion redundancy by using
additional helper macros and macro namespace collision avoidance by
using __patch instead of patch prefix.

  Summary:
RevisionChanges Path
1.2021  +1  -0  rpm/CHANGES
1.220   +8  -5  rpm/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2020 -r1.2021 CHANGES
  --- rpm/CHANGES   27 Dec 2007 09:11:20 -  1.2020
  +++ rpm/CHANGES   27 Dec 2007 09:19:57 -  1.2021
  @@ -1,4 +1,5 @@
   5.0b3 - 5.0b4:
  +- rse: improve %patch macro implementation: less expansion redundancy 
and macro namespace collision avoidance
   - rse: fix %{uncompress:file.lzo} by passing the required -dc 
options to LZOP's lzop(1)
   - rse: fix %{uncompress:file.lzma} by passing the required -dc 
options to LZMA Utils' lzma(1)
   - rse: support arbitrary hash algorithm via the originally intended 
syntax digest([algorithm:]/path) = hex
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.219 -r1.220 macros.in
  --- rpm/macros.in 22 Dec 2007 11:06:57 -  1.219
  +++ rpm/macros.in 27 Dec 2007 09:19:57 -  1.220
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.219 2007/12/22 11:06:57 rse Exp $
  +# $Id: macros.in,v 1.220 2007/12/27 09:19:57 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
  @@ -392,10 +392,13 @@
   #
   
   %patch(b:p:P:REz:F:d:) \
  -%define patch_file   %{P:%{-P:%{-P*}}%{!-P:0}} \
  -%define patch_suffix %{-b:-b --suffix %{-b*}} %{-z:--suffix %{-z*}} \
  -  echo Patch #%{-P:%{-P*}}%{!-P:0} (%{basename:%patch_file}): \
  -  %{uncompress:%patch_file} | %{__patch} -s %{-p:-p%{-p*}} %{-F:-F%{-F*}} 
%{-d:-d%{-d*}} %patch_suffix %{-R} %{-E}
  +%define __patch_number  %{-P:%{-P*}}%{!-P:0} \
  +%define __patch_file%{P:%{__patch_number}} \
  +%define __patch_suffix  %{-b:-b --suffix %{-b*}} %{-z:--suffix %{-z*}} \
  +%define __patch_options -s %{-p:-p%{-p*}} %{-F:-F%{-F*}} %{-d:-d%{-d*}} 
%{-R} %{-E} %{__patch_suffix} \
  +echo Patch #%{__patch_number} (%{basename:%{__patch_file}}):\
  +%{uncompress:%{__patch_file}} | %{__patch} %{__patch_options}\
  +%{nil}
   
   #
   # Script gets packaged file list on input and buildroot as first parameter.
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

2007-12-27 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:   27-Dec-2007 10:11:21
  Branch: HEAD Handle: 2007122709112001

  Modified files:
rpm CHANGES
rpm/rpmio   macro.c

  Log:
- fix %{uncompress:file.lzo} by passing the required -dc options to
  LZOP's lzop(1)

- fix %{uncompress:file.lzma} by passing the required -dc options to
  LZMA Utils' lzma(1) (we are already assuming to use LZMA Utils' lzma(1)
  during compression, so this is a safe assumption here, too)

  Summary:
RevisionChanges Path
1.2020  +2  -0  rpm/CHANGES
2.161   +2  -2  rpm/rpmio/macro.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2019 -r1.2020 CHANGES
  --- rpm/CHANGES   26 Dec 2007 10:40:44 -  1.2019
  +++ rpm/CHANGES   27 Dec 2007 09:11:20 -  1.2020
  @@ -1,4 +1,6 @@
   5.0b3 - 5.0b4:
  +- rse: fix %{uncompress:file.lzo} by passing the required -dc 
options to LZOP's lzop(1)
  +- rse: fix %{uncompress:file.lzma} by passing the required -dc 
options to LZMA Utils' lzma(1)
   - rse: support arbitrary hash algorithm via the originally intended 
syntax digest([algorithm:]/path) = hex
   - rse: compare MD5 hex value on digest(/path) = hex dependency 
case-insensitive to be less restrictive in syntax
   - rse: merge scripts/lua-dump.lua directly into lua/local/llocal.lua to 
make it always easily available
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.160 -r2.161 macro.c
  --- rpm/rpmio/macro.c 24 Dec 2007 09:00:07 -  2.160
  +++ rpm/rpmio/macro.c 27 Dec 2007 09:11:21 -  2.161
  @@ -1258,10 +1258,10 @@
sprintf(be, %%__unzip -qq '%s', b);
break;
case 4: /* COMPRESSED_LZOP */
  - sprintf(be, %%__lzop '%s', b);
  + sprintf(be, %%__lzop -dc '%s', b);
break;
case 5: /* COMPRESSED_LZMA */
  - sprintf(be, %%__lzma '%s', b);
  + sprintf(be, %%__lzma -dc '%s', b);
break;
}
b = be;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/perl/ Makefile.PL.in

2007-12-27 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:   27-Dec-2007 11:05:49
  Branch: HEAD Handle: 2007122710054900

  Modified files:
rpm/perlMakefile.PL.in

  Log:
explicitly include librpmmisc, to avoid indirect missing symbols from
librpmio

  Summary:
RevisionChanges Path
1.16+1  -1  rpm/perl/Makefile.PL.in
  

  patch -p0 '@@ .'
  Index: rpm/perl/Makefile.PL.in
  
  $ cvs diff -u -r1.15 -r1.16 Makefile.PL.in
  --- rpm/perl/Makefile.PL.in   9 Dec 2007 15:29:01 -   1.15
  +++ rpm/perl/Makefile.PL.in   27 Dec 2007 10:05:49 -  1.16
  @@ -5,7 +5,7 @@
   my @libdir = qw(. build lib popt rpmdb rpmio misc rpmconstant);
   
   my @ldaddp = map { '[EMAIL PROTECTED]@/' . $_ . '/.libs' } @libdir;
  -my @ldadd = map { '-l' . $_ } qw(rpmio rpmbuild rpm popt rpmdb rpmconstant);
  +my @ldadd = map { '-l' . $_ } qw(rpmmisc rpmio rpmbuild rpm popt rpmdb 
rpmconstant);
   
   my @objects = qw(
   rpmxs.o 
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2007-12-27 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:   27-Dec-2007 11:14:36
  Branch: HEAD Handle: 2007122710143600

  Modified files:
rpm devtool.conf

  Log:
%_gnu is now correctly detected by configure

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

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.150 -r2.151 devtool.conf
  --- rpm/devtool.conf  24 Dec 2007 16:38:09 -  2.150
  +++ rpm/devtool.conf  27 Dec 2007 10:14:36 -  2.151
  @@ -1860,7 +1860,6 @@
   # setup default (undetected) configuration, for Mac OS X
   sed -i -e s,${UNIVERSAL_CPP},gcc -E, 
/tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e s,${UNIVERSAL_CC},gcc, /tmp/rpm-root/usr/local/lib/rpm/macros
  -sed -i -e 's,-gnu$,%{nil},' /tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e 's,libtoolize$,glibtoolize,' 
/tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e 's,%{_usr}/doc,%{_usr}/share/doc,' 
/tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e 's,%{_prefix}/etc,/etc,' /tmp/rpm-root/usr/local/lib/rpm/macros
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmconstant/ Makefile.am rpm/tools/ Makefile.am

2007-12-27 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:   27-Dec-2007 11:30:54
  Branch: HEAD Handle: 2007122710305400

  Modified files:
rpm/rpmconstant Makefile.am
rpm/tools   Makefile.am

  Log:
include DB search paths, so that rpmdb.h can find db.h

  Summary:
RevisionChanges Path
1.9 +3  -2  rpm/rpmconstant/Makefile.am
2.105   +1  -0  rpm/tools/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/rpmconstant/Makefile.am
  
  $ cvs diff -u -r1.8 -r1.9 Makefile.am
  --- rpm/rpmconstant/Makefile.am   26 Jul 2007 08:10:32 -  1.8
  +++ rpm/rpmconstant/Makefile.am   27 Dec 2007 10:30:54 -  1.9
  @@ -1,4 +1,4 @@
  -# $Id: Makefile.am,v 1.8 2007/07/26 08:10:32 rse Exp $
  +# $Id: Makefile.am,v 1.9 2007/12/27 10:30:54 afb Exp $
   
   AUTOMAKE_OPTIONS = 1.4 foreign
   
  @@ -13,7 +13,8 @@
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
  - -I$(top_srcdir)/misc
  + -I$(top_srcdir)/misc \
  + @WITH_DB_CPPFLAGS@
   
   bin_PROGRAMS = rpmconstant
   usrlibdir = $(libdir)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tools/Makefile.am
  
  $ cvs diff -u -r2.104 -r2.105 Makefile.am
  --- rpm/tools/Makefile.am 8 Dec 2007 06:31:09 -   2.104
  +++ rpm/tools/Makefile.am 27 Dec 2007 10:30:54 -  2.105
  @@ -8,6 +8,7 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
  + @WITH_DB_CPPFLAGS@ \
@WITH_XAR_CPPFLAGS@
   
   EXTRA_DIST = hashtab.h
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/build/ parseSpec.c rpmspec.h spec.c rpm/ m...

2007-12-27 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:   27-Dec-2007 15:16:12
  Branch: HEAD Handle: 2007122714161100

  Modified files:
rpm CHANGES macros.in
rpm/build   parseSpec.c rpmspec.h spec.c

  Log:
make size of line buffer for .spec file parsing run-time configurable
via macro _spec_line_buffer_size

  Summary:
RevisionChanges Path
1.2022  +1  -0  rpm/CHANGES
2.130   +1  -1  rpm/build/parseSpec.c
2.70+2  -1  rpm/build/rpmspec.h
2.174   +4  -1  rpm/build/spec.c
1.221   +5  -1  rpm/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2021 -r1.2022 CHANGES
  --- rpm/CHANGES   27 Dec 2007 09:19:57 -  1.2021
  +++ rpm/CHANGES   27 Dec 2007 14:16:11 -  1.2022
  @@ -1,4 +1,5 @@
   5.0b3 - 5.0b4:
  +- rse: make size of line buffer for .spec file parsing run-time 
configurable via macro _spec_line_buffer_size
   - rse: improve %patch macro implementation: less expansion redundancy 
and macro namespace collision avoidance
   - rse: fix %{uncompress:file.lzo} by passing the required -dc 
options to LZOP's lzop(1)
   - rse: fix %{uncompress:file.lzma} by passing the required -dc 
options to LZMA Utils' lzma(1)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/parseSpec.c
  
  $ cvs diff -u -r2.129 -r2.130 parseSpec.c
  --- rpm/build/parseSpec.c 20 Dec 2007 23:35:28 -  2.129
  +++ rpm/build/parseSpec.c 27 Dec 2007 14:16:11 -  2.130
  @@ -231,7 +231,7 @@
   
/* Don't expand macros (eg. %define) in false branch of %if clause */
if (spec-readStack-reading 
  - expandMacros(spec, spec-macros, spec-lbuf, sizeof(spec-lbuf))) {
  + expandMacros(spec, spec-macros, spec-lbuf, spec-lbuf_len)) {
rpmlog(RPMLOG_ERR, _(line %d: %s\n),
spec-lineNum, spec-lbuf);
return RPMRC_FAIL;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/rpmspec.h
  
  $ cvs diff -u -r2.69 -r2.70 rpmspec.h
  --- rpm/build/rpmspec.h   18 Dec 2007 19:40:52 -  2.69
  +++ rpm/build/rpmspec.h   27 Dec 2007 14:16:11 -  2.70
  @@ -117,7 +117,8 @@
   
   /[EMAIL PROTECTED]@*/
   struct OpenFileInfo * fileStack;
  -char lbuf[10*BUFSIZ];
  +char *lbuf;
  +size_t lbuf_len;
   /[EMAIL PROTECTED]@*/
   char *lbufPtr;
   char nextpeekc;
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.173 -r2.174 spec.c
  --- rpm/build/spec.c  18 Dec 2007 19:40:52 -  2.173
  +++ rpm/build/spec.c  27 Dec 2007 14:16:11 -  2.174
  @@ -472,7 +472,8 @@
   spec-st = newSt();
   
   spec-fileStack = NULL;
  -spec-lbuf[0] = '\0';
  +spec-lbuf_len = 
(size_t)rpmExpandNumeric(%{?_spec_line_buffer_size}%{!?_spec_line_buffer_size:1});
  +spec-lbuf = (char *)xcalloc(1, spec-lbuf_len);
   spec-line = spec-lbuf;
   spec-nextline = NULL;
   spec-nextpeekc = '\0';
  @@ -527,6 +528,8 @@
   
   if (spec == NULL) return NULL;
   
  +spec-lbuf = _free(spec-lbuf);
  +
   spec-sl = freeSl(spec-sl);
   spec-st = freeSt(spec-st);
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.220 -r1.221 macros.in
  --- rpm/macros.in 27 Dec 2007 09:19:57 -  1.220
  +++ rpm/macros.in 27 Dec 2007 14:16:11 -  1.221
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.220 2007/12/27 09:19:57 rse Exp $
  +# $Id: macros.in,v 1.221 2007/12/27 14:16:11 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
  @@ -530,6 +530,10 @@
   # Colon separated list of permitted arbitrary tag names
   %_arbitrary_tags Class:Track:Trackprog:Foo:Bar:Baz
   
  +#
  +# Byte size of line buffer for .spec file parsing
  +%_spec_line_buffer_size 1
  +
   
#==
   #  Database configuration macros.
   #Macros used to configure Berkley db parameters.
  @@

[CVS] RPM: rpm/ CHANGES configure.ac macros.in

2007-12-27 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:   27-Dec-2007 17:44:14
  Branch: HEAD Handle: 2007122716441300

  Modified files:
rpm CHANGES configure.ac macros.in

  Log:
configure/macroize file extensions (for Darwin and Cygwin)

  Summary:
RevisionChanges Path
1.2023  +1  -0  rpm/CHANGES
2.267   +16 -0  rpm/configure.ac
1.222   +6  -1  rpm/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2022 -r1.2023 CHANGES
  --- rpm/CHANGES   27 Dec 2007 14:16:11 -  1.2022
  +++ rpm/CHANGES   27 Dec 2007 16:44:13 -  1.2023
  @@ -1,4 +1,5 @@
   5.0b3 - 5.0b4:
  +- afb: added %__objext,%__libext,%__shlibext,%__exeext for file 
extensions.
   - rse: make size of line buffer for .spec file parsing run-time 
configurable via macro _spec_line_buffer_size
   - rse: improve %patch macro implementation: less expansion redundancy 
and macro namespace collision avoidance
   - rse: fix %{uncompress:file.lzo} by passing the required -dc 
options to LZOP's lzop(1)
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.266 -r2.267 configure.ac
  --- rpm/configure.ac  14 Dec 2007 23:20:34 -  2.266
  +++ rpm/configure.ac  27 Dec 2007 16:44:13 -  2.267
  @@ -1284,6 +1284,22 @@
   )
   AC_SUBST(usrprefix)
   
  +dnl # Object file suffix (normally o).
  +objext=$ac_cv_objext
  +AC_SUBST(objext)
  +
  +dnl # Static library suffix (normally a).
  +libext=$acl_cv_libext
  +AC_SUBST(libext)
  +
  +dnl # Shared library suffix (normally so).
  +shlibext=$acl_cv_shlibext
  +AC_SUBST(shlibext)
  +
  +dnl # Executable file suffix (normally ).
  +exeext=$ac_exeext
  +AC_SUBST(exeext)
  +
   dnl # determine RPM database directory path
   AC_MSG_CHECKING([for RPM database directory])
   DBPATH=`echo ${varprefix}/lib/rpm`
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.221 -r1.222 macros.in
  --- rpm/macros.in 27 Dec 2007 14:16:11 -  1.221
  +++ rpm/macros.in 27 Dec 2007 16:44:13 -  1.222
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.221 2007/12/27 14:16:11 rse Exp $
  +# $Id: macros.in,v 1.222 2007/12/27 16:44:13 afb 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
  @@ -33,6 +33,11 @@
   %_usrlibrpm  @USRLIBRPM@
   %_etcrpm @SYSCONFIGDIR@
   
  +%__objext@objext@
  +%__libext@libext@
  +%__shlibext  @shlibext@
  +%__exeext@[EMAIL PROTECTED]
  +
   %_rpmhome%{_usrlibrpm}
   
   
#==
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/lib/ poptALL.c

2007-12-27 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:   27-Dec-2007 18:07:09
  Branch: HEAD Handle: 2007122717070900

  Modified files:
rpm CHANGES
rpm/lib poptALL.c

  Log:
To be able to completely disable an RPM Lua part from the CLI one can
AFAIK only write a construct like...

   %__foo_enabled 1
   [...] %{?__foo_enabled:%{lua: code}} [...]

...in an rpmmacros file. To let code now be optionally disabled
under run-time from the CLI one has to configure an rpmpopt containing:

   rpm alias --disable-foo --undefine '__foo_enabled'

So, let us implement rpm --undefine macro as the counterpart to rpm
--define 'macro value' now to support this.

OTOH, even if one could solve the above issue also with other tools, for
consistency reasons it is good to have both --define and --undefine!

  Summary:
RevisionChanges Path
1.2024  +1  -0  rpm/CHANGES
2.67+21 -0  rpm/lib/poptALL.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2023 -r1.2024 CHANGES
  --- rpm/CHANGES   27 Dec 2007 16:44:13 -  1.2023
  +++ rpm/CHANGES   27 Dec 2007 17:07:09 -  1.2024
  @@ -1,4 +1,5 @@
   5.0b3 - 5.0b4:
  +- rse: implement rpm --undefine macro as the counterpart to rpm 
--define 'macro value'
   - afb: added %__objext,%__libext,%__shlibext,%__exeext for file 
extensions.
   - rse: make size of line buffer for .spec file parsing run-time 
configurable via macro _spec_line_buffer_size
   - rse: improve %patch macro implementation: less expansion redundancy 
and macro namespace collision avoidance
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/poptALL.c
  
  $ cvs diff -u -r2.66 -r2.67 poptALL.c
  --- rpm/lib/poptALL.c 25 Dec 2007 19:22:34 -  2.66
  +++ rpm/lib/poptALL.c 27 Dec 2007 17:07:09 -  2.67
  @@ -22,6 +22,7 @@
   #ifdef  DEAD /* XXX remember the previous definition however. */
   #define POPT_RCFILE  -995
   #endif
  +#define POPT_UNDEFINE-994
   
   /[EMAIL PROTECTED] headerTagIndices @*/  /* XXX rpmcliFini */
   /[EMAIL PROTECTED] headerTagTableEntry @*/   /* XXX rpmcliFini */
  @@ -226,6 +227,23 @@
   /[EMAIL PROTECTED]@*/
s = _free(s);
   }break;
  +case POPT_UNDEFINE:
  +{char *s, *t;
  + /* XXX Convert '-' in macro name to underscore, skip leading %. */
  + s = t = xstrdup(arg);
  + while (*t  !xisspace(*t)) {
  + if (*t == '-') *t = '_';
  + t++;
  + }
  + t = s;
  + if (*t == '%') t++;
  +/[EMAIL PROTECTED]@*/
  + rpmcliConfigured();
  + (void) rpmUndefineMacro(NULL, t);
  + (void) rpmUndefineMacro(rpmCLIMacroContext, t);
  +/[EMAIL PROTECTED]@*/
  + s = _free(s);
  +}break;
   case 'E':
rpmcliConfigured();
{   const char *val = rpmExpand(arg, NULL);
  @@ -369,6 +387,9 @@
{ define, 'D', POPT_ARG_STRING, NULL, 'D',
N_(define MACRO with value EXPR),
N_('MACRO EXPR') },
  + { undefine, '\0', POPT_ARG_STRING, NULL, POPT_UNDEFINE,
  + N_(undefine MACRO),
  + N_('MACRO') },
{ eval, 'E', POPT_ARG_STRING, NULL, 'E',
N_(print macro expansion of EXPR),
N_('EXPR') },
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac devtool.conf macros.in

2007-12-27 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:   27-Dec-2007 17:49:03
  Branch: HEAD Handle: 2007122716490300

  Modified files:
rpm configure.ac devtool.conf macros.in

  Log:
detect name of libtoolize, instead of hacking it

  Summary:
RevisionChanges Path
2.268   +3  -0  rpm/configure.ac
2.152   +0  -1  rpm/devtool.conf
1.223   +2  -2  rpm/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.267 -r2.268 configure.ac
  --- rpm/configure.ac  27 Dec 2007 16:44:13 -  2.267
  +++ rpm/configure.ac  27 Dec 2007 16:49:03 -  2.268
  @@ -475,6 +475,9 @@
   AC_PATH_PROG(__OBJDUMP, objdump, %{_bindir}/objdump, $MYPATH)
   AC_PATH_PROG(__STRIP, strip, %{_bindir}/strip, $MYPATH)
   
  +AC_CHECK_PROGS(LIBTOOLIZE, libtoolize glibtoolize, libtoolize)
  +AC_SUBST(LIBTOOLIZE)
  +
   dnl # check for id -u
   AC_MSG_CHECKING(whether id supports -u)
   if ${__ID} -u 21  /dev/null; then
  @@ .
  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.151 -r2.152 devtool.conf
  --- rpm/devtool.conf  27 Dec 2007 10:14:36 -  2.151
  +++ rpm/devtool.conf  27 Dec 2007 16:49:03 -  2.152
  @@ -1860,7 +1860,6 @@
   # setup default (undetected) configuration, for Mac OS X
   sed -i -e s,${UNIVERSAL_CPP},gcc -E, 
/tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e s,${UNIVERSAL_CC},gcc, /tmp/rpm-root/usr/local/lib/rpm/macros
  -sed -i -e 's,libtoolize$,glibtoolize,' 
/tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e 's,%{_usr}/doc,%{_usr}/share/doc,' 
/tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e 's,%{_prefix}/etc,/etc,' /tmp/rpm-root/usr/local/lib/rpm/macros
   sed -i -e 's,%{_prefix}/var,/var/local,' 
/tmp/rpm-root/usr/local/lib/rpm/macros
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.222 -r1.223 macros.in
  --- rpm/macros.in 27 Dec 2007 16:44:13 -  1.222
  +++ rpm/macros.in 27 Dec 2007 16:49:03 -  1.223
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.222 2007/12/27 16:44:13 afb Exp $
  +# $Id: macros.in,v 1.223 2007/12/27 16:49:03 afb 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
  @@ -111,7 +111,7 @@
   %__strip @__STRIP@
   
   # XXX avoid failures if tools are not installed when rpm is built.
  -%__libtoolizelibtoolize
  +%__libtoolize@LIBTOOLIZE@
   %__aclocal   aclocal
   %__autoheaderautoheader
   %__automake  automake
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ librpmio.vers

2007-12-27 Thread Jeff Johnson

  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:   27-Dec-2007 20:05:37
  Branch: HEAD Handle: 2007122719053700

  Modified files:
rpm/rpmio   librpmio.vers

  Log:
- jbj: new syms for the loader map.

  Summary:
RevisionChanges Path
2.30+2  -0  rpm/rpmio/librpmio.vers
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/librpmio.vers
  
  $ cvs diff -u -r2.29 -r2.30 librpmio.vers
  --- rpm/rpmio/librpmio.vers   18 Dec 2007 19:40:54 -  2.29
  +++ rpm/rpmio/librpmio.vers   27 Dec 2007 19:05:37 -  2.30
  @@ -168,6 +168,7 @@
   pgpGetSigtype;
   pgpGetSig;
   pgpGetSiglen;
  +pgpHashAlgoStringToNumber;
   pgpHashTbl;
   pgpImplVecs;
   pgpKeyServerPrefsTbl;
  @@ -307,6 +308,7 @@
   rpmswInit;
   rpmswNow;
   rpmswSub;
  +rpmUndefineMacro;
   rpmxarFree;
   XrpmxarLink;
   rpmxarNew;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

2007-12-27 Thread Jeff Johnson

  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:   27-Dec-2007 21:12:26
  Branch: HEAD Handle: 2007122720122600

  Modified files:
rpm CHANGES
rpm/rpmio   macro.c

  Log:
- convert [EMAIL PROTECTED]:|} to foo|bar|quux tuple. [EMAIL PROTECTED] 
assumes CSV comma.

  Summary:
RevisionChanges Path
1.2025  +1  -0  rpm/CHANGES
2.162   +22 -5  rpm/rpmio/macro.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2024 -r1.2025 CHANGES
  --- rpm/CHANGES   27 Dec 2007 17:07:09 -  1.2024
  +++ rpm/CHANGES   27 Dec 2007 20:12:26 -  1.2025
  @@ -1,4 +1,5 @@
   5.0b3 - 5.0b4:
  +- jbj: convert [EMAIL PROTECTED]:|} to foo|bar|quux tuple. [EMAIL 
PROTECTED] assumes CSV comma.
   - rse: implement rpm --undefine macro as the counterpart to rpm 
--define 'macro value'
   - afb: added %__objext,%__libext,%__shlibext,%__exeext for file 
extensions.
   - rse: make size of line buffer for .spec file parsing run-time 
configurable via macro _spec_line_buffer_size
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.161 -r2.162 macro.c
  --- rpm/rpmio/macro.c 27 Dec 2007 09:11:21 -  2.161
  +++ rpm/rpmio/macro.c 27 Dec 2007 20:12:26 -  2.162
  @@ -1329,6 +1329,7 @@
   int c;
   int rc = 0;
   int negate;
  +int stackarray;
   const char * lastc;
   int chkexist;
   
  @@ -1363,13 +1364,15 @@
g = ge = NULL;
if (mb-depth  1)  /* XXX full expansion for outermost level */
t = mb-t;  /* save expansion pointer for printExpand */
  - negate = 0;
  + stackarray = chkexist = negate = 0;
lastc = NULL;
  - chkexist = 0;
switch ((c = (int) *s)) {
default:/* %name substitution */
  - while (*s != '\0'  strchr(!?, *s) != NULL) {
  + while (*s != '\0'  strchr(!?@, *s) != NULL) {
switch(*s++) {
  + case '@':
  + stackarray = ((stackarray + 1) % 2);
  + /[EMAIL PROTECTED]@*/ break;
case '!':
negate = ((negate + 1) % 2);
/[EMAIL PROTECTED]@*/ break;
  @@ -1429,8 +1432,11 @@
}
f = s+1;/* skip { */
se++;   /* skip } */
  - while (strchr(!?, *f) != NULL) {
  + while (strchr(!?@, *f) != NULL) {
switch(*f++) {
  + case '@':
  + stackarray = ((stackarray + 1) % 2);
  + /[EMAIL PROTECTED]@*/ break;
case '!':
negate = ((negate + 1) % 2);
/[EMAIL PROTECTED]@*/ break;
  @@ -1637,7 +1643,7 @@
s = se;
continue;
}
  - 
  +
if (me == NULL) {   /* leave unknown %... as is */
   #ifndef HACK
   #if DEAD
  @@ -1665,6 +1671,17 @@
continue;
}
   
  + /* XXX Special processing to create a tuple from stack'd values. */
  + if (stackarray) {
  + c = ((g  g  ge) ? *g : ',');
  + do {
  + if (me != *mep) SAVECHAR(mb, c);
  + rc = expandT(mb, me-body, strlen(me-body));
  + } while ((me = me-prev) != NULL);
  + s = se;
  + continue;
  + }
  +
/* Setup args for %name  macros with opts */
if (me  me-opts != NULL) {
if (lastc != NULL) {
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpmrc.c

2007-12-27 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:   28-Dec-2007 00:21:15
  Branch: HEAD Handle: 2007122723211500

  Modified files:
rpm/lib rpmrc.c

  Log:
restore the PowerPC machine sanitation for Darwin (from RPM 4.0.2),
since we're no longer overriding un.machine (earlier OpenDarwin-based
versions of RPM 4.x hardcoded the value to either of ppc or i386)

  Summary:
RevisionChanges Path
2.221   +4  -0  rpm/lib/rpmrc.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.220 -r2.221 rpmrc.c
  --- rpm/lib/rpmrc.c   8 Dec 2007 21:34:53 -   2.220
  +++ rpm/lib/rpmrc.c   27 Dec 2007 23:21:15 -  2.221
  @@ -603,6 +603,10 @@
   }
   #endif
   
  + if (!strncmp(un.machine, Power Macintosh, 15)) {
  + sprintf(un.machine, ppc);
  + }
  +
   #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
/* allow the path to the platforms file be overridden under run-time 
*/
cp = rpmExpand(%{?__platform}, NULL);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

2007-12-27 Thread Jeff Johnson

  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:   28-Dec-2007 02:20:13
  Branch: HEAD Handle: 2007122801201300

  Modified files:
rpm CHANGES
rpm/rpmio   macro.c

  Log:
- jbj: fixup [EMAIL PROTECTED]:, } per rse comments.

  Summary:
RevisionChanges Path
1.2026  +1  -0  rpm/CHANGES
2.163   +19 -5  rpm/rpmio/macro.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2025 -r1.2026 CHANGES
  --- rpm/CHANGES   27 Dec 2007 20:12:26 -  1.2025
  +++ rpm/CHANGES   28 Dec 2007 01:20:13 -  1.2026
  @@ -1,4 +1,5 @@
   5.0b3 - 5.0b4:
  +- jbj: fixup [EMAIL PROTECTED]:, } per rse comments.
   - jbj: convert [EMAIL PROTECTED]:|} to foo|bar|quux tuple. [EMAIL 
PROTECTED] assumes CSV comma.
   - rse: implement rpm --undefine macro as the counterpart to rpm 
--define 'macro value'
   - afb: added %__objext,%__libext,%__shlibext,%__exeext for file 
extensions.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.162 -r2.163 macro.c
  --- rpm/rpmio/macro.c 27 Dec 2007 20:12:26 -  2.162
  +++ rpm/rpmio/macro.c 28 Dec 2007 01:20:13 -  2.163
  @@ -1304,6 +1304,20 @@
   }
   }
   
  +static int expandFIFO(MacroBuf mb, MacroEntry me, const char *g, size_t gn)
  + /[EMAIL PROTECTED]/
  +{
  +int rc = 0;
  +
  +if (me-prev == NULL)
  + return rc;
  +
  +expandFIFO(mb, me-prev, g, gn);
  +if (me-prev-prev)
  + rc = expandT(mb, g, gn);
  +return expandT(mb, me-body, strlen(me-body));
  +}
  +
   /**
* The main macro recursion loop.
* @todo Dynamically reallocate target buffer.
  @@ -1673,11 +1687,11 @@
   
/* XXX Special processing to create a tuple from stack'd values. */
if (stackarray) {
  - c = ((g  g  ge) ? *g : ',');
  - do {
  - if (me != *mep) SAVECHAR(mb, c);
  - rc = expandT(mb, me-body, strlen(me-body));
  - } while ((me = me-prev) != NULL);
  + if (!(g  g  ge)) {
  + g = ,;
  + gn = strlen(g);
  + }
  + rc = expandFIFO(mb, me, g, gn);
s = se;
continue;
}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

2007-12-27 Thread Jeff Johnson

  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:   28-Dec-2007 02:37:35
  Branch: HEAD Handle: 2007122801373500

  Modified files:
rpm CHANGES
rpm/rpmio   macro.c

  Log:
- use \n, not ,, as the default for [EMAIL PROTECTED] expansion.

  Summary:
RevisionChanges Path
1.2027  +1  -0  rpm/CHANGES
2.164   +1  -1  rpm/rpmio/macro.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.2026 -r1.2027 CHANGES
  --- rpm/CHANGES   28 Dec 2007 01:20:13 -  1.2026
  +++ rpm/CHANGES   28 Dec 2007 01:37:35 -  1.2027
  @@ -1,4 +1,5 @@
   5.0b3 - 5.0b4:
  +- jbj: use \n, not ,, as the default for [EMAIL PROTECTED] expansion.
   - jbj: fixup [EMAIL PROTECTED]:, } per rse comments.
   - jbj: convert [EMAIL PROTECTED]:|} to foo|bar|quux tuple. [EMAIL 
PROTECTED] assumes CSV comma.
   - rse: implement rpm --undefine macro as the counterpart to rpm 
--define 'macro value'
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/macro.c
  
  $ cvs diff -u -r2.163 -r2.164 macro.c
  --- rpm/rpmio/macro.c 28 Dec 2007 01:20:13 -  2.163
  +++ rpm/rpmio/macro.c 28 Dec 2007 01:37:35 -  2.164
  @@ -1688,7 +1688,7 @@
/* XXX Special processing to create a tuple from stack'd values. */
if (stackarray) {
if (!(g  g  ge)) {
  - g = ,;
  + g = \n;
gn = strlen(g);
}
rc = expandFIFO(mb, me, g, gn);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ CHANGES macros.in

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

[CVS] RPM: rpm/perl/ Makefile.PL.in

[CVS] RPM: rpm/ devtool.conf

[CVS] RPM: rpm/rpmconstant/ Makefile.am rpm/tools/ Makefile.am

[CVS] RPM: rpm/ CHANGES rpm/build/ parseSpec.c rpmspec.h spec.c rpm/ m...

[CVS] RPM: rpm/ CHANGES configure.ac macros.in

[CVS] RPM: rpm/ CHANGES rpm/lib/ poptALL.c

[CVS] RPM: rpm/ configure.ac devtool.conf macros.in

[CVS] RPM: rpm/rpmio/ librpmio.vers

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

[CVS] RPM: rpm/lib/ rpmrc.c

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

[CVS] RPM: rpm/ CHANGES rpm/rpmio/ macro.c

14 matches

Site Navigation

Mail list logo

Footer information