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

2007-06-29 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:   29-Jun-2007 13:56:06
  Branch: HEAD Handle: 2007062912560600

  Modified files:
rpm CHANGES
rpm/lib depends.c

  Log:
Nuke antique Red Hat Linux reference baddeps list (in lib/depends.c)

Submitted by: Panu Matilainen [EMAIL PROTECTED]
Obtained from: http://hg.rpm.org/rpm?cs=3dea73f31815

  Summary:
RevisionChanges Path
1.1414  +1  -0  rpm/CHANGES
1.331   +0  -22 rpm/lib/depends.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1413 -r1.1414 CHANGES
  --- rpm/CHANGES   28 Jun 2007 15:52:05 -  1.1413
  +++ rpm/CHANGES   29 Jun 2007 11:56:06 -  1.1414
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- pmatilaj: nuke antique Red Hat Linux reference baddeps list (in 
lib/depends.c)
   - rse: allow one to explicitly select the RPM DB API with 
--with-dbapi={db,sqlite}
   - rse: provide automatically Autoconf chosen RPM DB API selection and 
configuration
   - rse: allow one to build an SQLite-only RPM with --without-db 
--with-sqlite=external
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/depends.c
  
  $ cvs diff -u -r1.330 -r1.331 depends.c
  --- rpm/lib/depends.c 19 Jun 2007 02:32:42 -  1.330
  +++ rpm/lib/depends.c 29 Jun 2007 11:56:06 -  1.331
  @@ -1380,28 +1380,6 @@
   /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char * pname;
   /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ const char * qname;
   } badDeps[] = {
  -{ libtermcap, bash },
  -{ modutils, vixie-cron },
  -{ ypbind, yp-tools },
  -{ ghostscript-fonts, ghostscript },
  -/* 7.2 only */
  -{ libgnomeprint15, gnome-print },
  -{ nautilus, nautilus-mozilla },
  -/* 7.1 only */
  -{ arts, kdelibs-sound },
  -/* 7.0 only */
  -{ pango-gtkbeta-devel, pango-gtkbeta },
  -{ XFree86, Mesa },
  -{ compat-glibc, db2 },
  -{ compat-glibc, db1 },
  -{ pam, initscripts },
  -{ initscripts, sysklogd },
  -/* 6.2 */
  -{ egcs-c++, libstdc++ },
  -/* 6.1 */
  -{ pilot-link-devel, pilot-link },
  -/* 5.2 */
  -{ pam, pamconfig },
   { NULL, NULL }
   };
   #else
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


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

2007-06-29 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:   29-Jun-2007 14:28:41
  Branch: HEAD Handle: 2007062913284001

  Modified files:
rpm CHANGES
rpm/lib rpmrc.c

  Log:
Correctly restore SIGILL signal handler in machine detection code.

Submitted by: OpenSUSE via Panu Matilainen at rpm.org
Obtained from: http://hg.rpm.org/rpm?cs=8a1bbb5918b9

  Summary:
RevisionChanges Path
1.1415  +1  -0  rpm/CHANGES
2.199   +10 -2  rpm/lib/rpmrc.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1414 -r1.1415 CHANGES
  --- rpm/CHANGES   29 Jun 2007 11:56:06 -  1.1414
  +++ rpm/CHANGES   29 Jun 2007 12:28:40 -  1.1415
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rse: correctly restore SIGILL signal handler in machine detection 
code. 
   - pmatilaj: nuke antique Red Hat Linux reference baddeps list (in 
lib/depends.c)
   - rse: allow one to explicitly select the RPM DB API with 
--with-dbapi={db,sqlite}
   - rse: provide automatically Autoconf chosen RPM DB API selection and 
configuration
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmrc.c
  
  $ cvs diff -u -r2.198 -r2.199 rpmrc.c
  --- rpm/lib/rpmrc.c   19 Jun 2007 06:49:49 -  2.198
  +++ rpm/lib/rpmrc.c   29 Jun 2007 12:28:41 -  2.199
  @@ -1149,19 +1149,27 @@
   {
int cpu;
unsigned int tfms, junk, cap, capamd;
  + struct sigaction oldsa;

  + sigaction(SIGILL, NULL, oldsa);
signal(SIGILL, model3);

  - if (sigsetjmp(jenv, 1))
  + if (sigsetjmp(jenv, 1)) {
  + sigaction(SIGILL, oldsa, NULL);
return 3;
  + }

  - if (cpuid_eax(0x0)==0)
  + if (cpuid_eax(0x0)==0) {
  + sigaction(SIGILL, oldsa, NULL);
return 4;
  + }
   
cpuid(0x0001, tfms, junk, junk, cap);
cpuid(0x8001, junk, junk, junk, capamd);

cpu = (tfms8)15;
  +
  + sigaction(SIGILL, oldsa, NULL);

if (cpu  6)
return cpu;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ macros.in

2007-06-29 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:   29-Jun-2007 13:59:14
  Branch: HEAD Handle: 2007062912591400

  Modified files:
rpm macros.in

  Log:
remove one more vendor-specific dependency thing

  Summary:
RevisionChanges Path
1.168   +1  -2  rpm/macros.in
  

  patch -p0 '@@ .'
  Index: rpm/macros.in
  
  $ cvs diff -u -r1.167 -r1.168 macros.in
  --- rpm/macros.in 28 Jun 2007 16:41:51 -  1.167
  +++ rpm/macros.in 29 Jun 2007 11:59:14 -  1.168
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.167 2007/06/28 16:41:51 rse Exp $
  +# $Id: macros.in,v 1.168 2007/06/29 11:59:14 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
  @@ -905,7 +905,6 @@
glibcnscd
   
   %_dependency_whiteout\
  - libtermcapbash \
%{?_dependency_whiteout_caos_core} \
%{?_dependency_whiteout_system} \
%{nil}
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/rpmio/ rpmpgp.c

2007-06-29 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:   29-Jun-2007 14:33:08
  Branch: HEAD Handle: 2007062913330800

  Modified files:
rpm/rpmio   rpmpgp.c

  Log:
nuke hard-coded but dead Red Hat keys from the code

  Summary:
RevisionChanges Path
2.53+0  -71 rpm/rpmio/rpmpgp.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmpgp.c
  
  $ cvs diff -u -r2.52 -r2.53 rpmpgp.c
  --- rpm/rpmio/rpmpgp.c24 Jun 2007 10:37:59 -  2.52
  +++ rpm/rpmio/rpmpgp.c29 Jun 2007 12:33:08 -  2.53
  @@ -24,77 +24,6 @@
   /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
   static pgpDigParams _digp = NULL;
   
  -#ifdef   DYING
  -/* This is the unarmored RPM-GPG-KEY public key. */
  -const char * redhatPubKeyDSA = \
  -mQGiBDfqVDgRBADBKr3Bl6PO8BQ0H8sJoD6p9U7Yyl7pjtZqioviPwXP+DCWd4u8\n\
  -HQzcxAZ57m8ssA1LK1Fx93coJhDzM130+p5BG9mYSWShLabR3N1KXdXQYYcowTOM\n\
  -GxdwYRGr1Spw8QydLhjVfU1VSl4xt6bupPbWJbyjkg5Z3P7BlUOUJmrx3wCgobNV\n\
  -EDGaWYJcch5z5B1of/41G8kEAKii6q7Gu/vhXXnLS6m15oNnPVybyngiw/23dKjS\n\
  -ZVG7rKANEK2mxg1VB+vc/uUc4k49UxJJfCZg1gu1sPFV3GSa+Y/7jsiLktQvCiLP\n\
  -lncQt1dV+ENmHR5BdIDPWDzKBVbgWnSDnqQ6KrZ7T6AlZ74VMpjGxxkWU6vV2xsW\n\
  -XCLPA/9P/vtImA8CZN3jxGgtK5GGtDNJ/cMhhuv5tnfwFg4b/VGo2Jr8mhLUqoIb\n\
  -E6zeGAmZbUpdckDco8D5fiFmqTf5+++pCEpJLJkkzel/32N2w4qzPrcRMCiBURES\n\
  -PjCLd4Y5rPoU8E4kOHc/4BuHN903tiCsCPloCrWsQZ7UdxfQ5LQiUmVkIEhhdCwg\n\
  -SW5jIDxzZWN1cml0eUByZWRoYXQuY29tPohVBBMRAgAVBQI36lQ4AwsKAwMVAwID\n\
  -FgIBAheAAAoJECGRgM3bQqYOsBQAnRVtg7B25Hm11PHcpa8FpeddKiq2AJ9aO8sB\n\
  -XmLDmPOEFI75mpTrKYHF6rkCDQQ36lRyEAgAokgI2xJ+3bZsk8jRA8ORIX8DH05U\n\
  -lMH27qFYzLbT6npXwXYIOtVn0K2/iMDj+oEB1Aa2au4OnddYaLWp06v3d+XyS0t+\n\
  -5ab2ZfIQzdh7wCwxqRkzR+/H5TLYbMG+hvtTdylfqIX0WEfoOXMtWEGSVwyUsnM3\n\
  -Jy3LOi48rQQSCKtCAUdV20FoIGWhwnb/gHU1BnmES6UdQujFBE6EANqPhp0coYoI\n\
  -hHJ2oIO8ujQItvvNaU88j/s/izQv5e7MXOgVSjKe/WX3s2JtB/tW7utpy12wh1J+\n\
  -JsFdbLV/t8CozUTpJgx5mVA3RKlxjTA+On+1IEUWioB+iVfT7Ov/0kcAzwADBQf9\n\
  -E4SKCWRand8K0XloMYgmipxMhJNnWDMLkokvbMNTUoNpSfRoQJ9EheXDxwMpTPwK\n\
  -ti/PYrrL2J11P2ed0x7zm8v3gLrY0cue1iSba+8glY+p31ZPOr5ogaJw7ZARgoS8\n\
  -BwjyRymXQp+8Dete0TELKOL2/itDOPGHW07SsVWOR6cmX4VlRRcWB5KejaNvdrE5\n\
  -4XFtOd04NMgWI63uqZc4zkRa+kwEZtmbz3tHSdRCCE+Y7YVP6IUf/w6YPQFQriWY\n\
  -FiA6fD10eB+BlIUqIw80VgjsBKmCwvKkn4jg8kibXgj4/TzQSx77uYokw1EqQ2wk\n\
  -OZoaEtcubsNMquuLCMWijYhGBBgRAgAGBQI36lRyAAoJECGRgM3bQqYOhyYAnj7h\n\
  -VDY/FJAGqmtZpwVp9IlitW5tAJ4xQApr/jNFZCTksnI+4O1765F7tA==\n\
  -;
  -
  -/* This is the unarmored RPM-PGP-KEY public key. */
  -const char * redhatPubKeyRSA = \
  -mQCNAzEpXjUAAAEEAKG4/V9oUSiDc9wIge6Bmg6erDGCLzmFyioAho8kDIJSrcmi\n\
  -F9qTdPq+fj726pgW1iSb0Y7syZn9Y2lgQm5HkPODfNi8eWyTFSxbr8ygosLRClTP\n\
  -xqHVhtInGrfZNLoSpv1LdWOme0yOpOQJnghdOMzKXpgf5g84vaUg6PHLopv5AAUR\n\
  -tCpSZWQgSGF0IFNvZnR3YXJlLCBJbmMuIDxyZWRoYXRAcmVkaGF0LmNvbT6JAJUD\n\
  -BRAyA5tUoyDApfg4JKEBAUzSA/9QdcVsu955vVyZDk8uvOXWV0X3voT9B3aYMFvj\n\
  -UNHUD6F1VFruwQHVKbGJEq1o5MOA6OXKR3vJZStXEMF47TWXJfQaflgl8ywZTH5W\n\
  -+eMlKau6Nr0labUV3lmsAE4Vsgu8NCkzIrp2wNVbeW2ZAXtrKswV+refLquUhp7l\n\
  -wMpH9IkAdQMFEDGttkRNdXhbO1TgGQEBAGoC/j6C22PqXIyqZc6fG6J6Jl/T5kFG\n\
  -xH1pKIzua5WCDDugAgnuOJgywa4pegT4UqwEZiMTAlwT6dmG1CXgKB+5V7lnCjDc\n\
  -JZLni0iztoe08ig6fJrjNGXljf7KYXzgwBftQokAlQMFEDMQzo2MRVM9rfPulQEB\n\
  -pLoD/1/MWv3u0Paiu14XRvDrBaJ7BmG2/48bA5vKOzpvvoNRO95YS7ZEtqErXA7Y\n\
  -DRO8+C8f6PAILMk7kCk4lNMscS/ZRzu5+J8cv4ejsFvxgJBBU3Zgp8AWdWOpvZ0I\n\
  -wW//HoDUGhOxlEtymljIMFBkj4SysHWhCBUfA9Xy86kouTJQiQCVAwUQMxDOQ50a\n\
  -feTWLUSJAQFnYQQAkt9nhMTeioREB1DvJt+vsFyOj//o3ThqK5ySEP3dgj62iaQp\n\
  -JrBmAe5XZPw25C/TXAf+x27H8h2QbKgq49VtsElFexc6wO+uq85fAPDdyE+2XyNE\n\
  -njGZkY/TP2F/jTB0sAwJO+xFCHmSYkcBjzxK/2LMD+O7rwp2UCUhhl9QhhqJAJUD\n\
  -BRAx5na6pSDo8cuim/kBARmjA/4lDVnV2h9KiNabp9oE38wmGgu5m5XgUHW8L6du\n\
  -iQDnwO5IgXN2vDpKGxbgtwv6iYYmGd8IRQ66uJvOsxSv3OR7J7LkCHuI2b/s0AZn\n\
  -c79DZaJ2ChUCZlbNQBMeEdrFWif9NopY+d5+2tby1onu9XOFMMvomxL3NhctElYR\n\
  -HC8Xw4kAlQMFEDHmdTtURTdEKY1MpQEBEtEEAMZbp1ZFrjiHkj2aLFC1S8dGRbSH\n\
  -GUdnLP9qLPFgmWekp9E0o8ZztALGVdqPfPF3N/JJ+AL4IMrfojd7+eZKw36Mdvtg\n\
  -dPI+Oz4sxHDbDynZ2qspD9Om5yYuxuz/Xq+9nO2IlsAnEYw3ag3cxat0kvxpOPRe\n\
  -Yy+vFpgfDNizr3MgiQBVAwUQMXNMXCjtrosVMemRAQEDnwH7BsJrnnh91nI54LAK\n\
  -Gcq3pr8ld0PAtWJmNRGQvUlpEMXUSnu59j2P1ogPNjL3PqKdVxk5Jqgcr8TPQMf3\n\
  -V4fqXokAlQMFEDFy+8YiEmsRQ3LyzQEB+TwD/03QDslXLg5F3zj4zf0yI6ikT0be\n\
  -5OhZv2pnkb80qgdHzFRxBOYmSoueRKdQJASd8F9ue4b3bmf/Y7ikiY0DblvxcXB2\n\
  -sz1Pu8i2Zn9u8SKuxNIoVvM8/STRVkgPfvL5QjAWMHT9Wvg81XcI2yXJzrt/2f2g\n\
  

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

2007-06-29 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:   29-Jun-2007 14:38:49
  Branch: HEAD Handle: 2007062913384900

  Modified files:
rpm CHANGES
rpm/lib verify.c

  Log:
Add errno information to be more informative in error message when
lstat(2) on verification fails.

Submitted by: OpenSUSE via Panu Matilainen from rpm.org
Obtained from: http://hg.rpm.org/rpm?cs=45b8d8cfd07e

  Summary:
RevisionChanges Path
1.1416  +1  -0  rpm/CHANGES
2.166   +4  -0  rpm/lib/verify.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1415 -r1.1416 CHANGES
  --- rpm/CHANGES   29 Jun 2007 12:28:40 -  1.1415
  +++ rpm/CHANGES   29 Jun 2007 12:38:49 -  1.1416
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rse: add errno information to be more informative in error message 
when lstat(2) on verification fails.
   - rse: correctly restore SIGILL signal handler in machine detection 
code. 
   - pmatilaj: nuke antique Red Hat Linux reference baddeps list (in 
lib/depends.c)
   - rse: allow one to explicitly select the RPM DB API with 
--with-dbapi={db,sqlite}
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/verify.c
  
  $ cvs diff -u -r2.165 -r2.166 verify.c
  --- rpm/lib/verify.c  21 Jun 2007 11:17:51 -  2.165
  +++ rpm/lib/verify.c  29 Jun 2007 12:38:49 -  2.166
  @@ -311,6 +311,10 @@
 (fflags  RPMFILE_README)  ? 'r' : ' '),
rpmfiFN(fi));
te += strlen(te);
  +if ((verifyResult  RPMVERIFY_LSTATFAIL) != 0  errno != 
ENOENT) {
  +sprintf(te,  (%s), strerror(errno));
  +te += strlen(te);
  +}
ec = rc;
}
} else if (verifyResult || rpmIsVerbose()) {
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


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

2007-06-29 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:   29-Jun-2007 15:11:50
  Branch: HEAD Handle: 2007062914115000

  Modified files:
rpm/rpmio   rpmio.c

  Log:
Return an error if Fileno() is called with a NULL instead of segfaulting.

Submitted by: OpenSUSE via rpm.org
Obtained from: http://hg.rpm.org/rpm?cs=703434a82f3b

  Summary:
RevisionChanges Path
1.86+2  -0  rpm/rpmio/rpmio.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmio.c
  
  $ cvs diff -u -r1.85 -r1.86 rpmio.c
  --- rpm/rpmio/rpmio.c 27 Jun 2007 09:03:01 -  1.85
  +++ rpm/rpmio/rpmio.c 29 Jun 2007 13:11:50 -  1.86
  @@ -3651,6 +3651,8 @@
   {
   int i, rc = -1;
   
  +if (fd == NULL)
  +return -1;
   if (fd-req != NULL)
rc = 123456789; /* HACK: https has no steenkin fileno. */
   else
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ CHANGES rpm/rpmio/sexp/ .cvsignore .splintrc Makefile....

2007-06-29 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:   29-Jun-2007 15:39:14
  Branch: HEAD Handle: 2007062914391201

  Modified files:
rpm CHANGES
  Removed files:
rpm/rpmio/sexp  .cvsignore .splintrc Makefile.am autogen.sh
configure.ac sexp-basic.c sexp-input.c sexp-main.c
sexp-output.c sexp.h
rpm/rpmio/sexp/tests.cvsignore Makefile.am chk-samples sexp-sample-a
sexp-sample-b sexp-sample-c sexp-sample.exp

  Log:
Remove the old and fully unused SEXP (LISP-style S-EXPressions)
sub-library which stayed in rpmio/sexp/. Should this (nice but in the
times of the all-dancing-all-singing XML perhaps already too ancient ;-)
stuff ever be needed for RPM 5 it can be resurrected easily from Attic.
Until this times come, just nuke this sub-tree at all.

  Summary:
RevisionChanges Path
1.1417  +1  -0  rpm/CHANGES
1.3 +0  -32 rpm/rpmio/sexp/.cvsignore
1.6 +0  -55 rpm/rpmio/sexp/.splintrc
1.4 +0  -22 rpm/rpmio/sexp/Makefile.am
1.2 +0  -25 rpm/rpmio/sexp/autogen.sh
1.3 +0  -27 rpm/rpmio/sexp/configure.ac
1.12+0  -302rpm/rpmio/sexp/sexp-basic.c
1.16+0  -597rpm/rpmio/sexp/sexp-input.c
1.13+0  -195rpm/rpmio/sexp/sexp-main.c
1.15+0  -642rpm/rpmio/sexp/sexp-output.c
1.15+0  -303rpm/rpmio/sexp/sexp.h
1.2 +0  -3  rpm/rpmio/sexp/tests/.cvsignore
1.2 +0  -14 rpm/rpmio/sexp/tests/Makefile.am
1.2 +0  -19 rpm/rpmio/sexp/tests/chk-samples
1.2 +0  -20 rpm/rpmio/sexp/tests/sexp-sample-a
1.2 +0  -1  rpm/rpmio/sexp/tests/sexp-sample-b
1.2 +0  -1  rpm/rpmio/sexp/tests/sexp-sample-c
1.2 +0  -33 rpm/rpmio/sexp/tests/sexp-sample.exp
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.1416 -r1.1417 CHANGES
  --- rpm/CHANGES   29 Jun 2007 12:38:49 -  1.1416
  +++ rpm/CHANGES   29 Jun 2007 13:39:12 -  1.1417
  @@ -1,4 +1,5 @@
   4.5 - 5.0:
  +- rse: remove unused rpmio/sexp/ sub-library
   - rse: add errno information to be more informative in error message 
when lstat(2) on verification fails.
   - rse: correctly restore SIGILL signal handler in machine detection 
code. 
   - pmatilaj: nuke antique Red Hat Linux reference baddeps list (in 
lib/depends.c)
  @@ .
  rm -f rpm/rpmio/sexp/.cvsignore '@@ .'
  Index: rpm/rpmio/sexp/.cvsignore
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/.splintrc '@@ .'
  Index: rpm/rpmio/sexp/.splintrc
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/Makefile.am '@@ .'
  Index: rpm/rpmio/sexp/Makefile.am
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/autogen.sh '@@ .'
  Index: rpm/rpmio/sexp/autogen.sh
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/configure.ac '@@ .'
  Index: rpm/rpmio/sexp/configure.ac
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/sexp-basic.c '@@ .'
  Index: rpm/rpmio/sexp/sexp-basic.c
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/sexp-input.c '@@ .'
  Index: rpm/rpmio/sexp/sexp-input.c
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/sexp-main.c '@@ .'
  Index: rpm/rpmio/sexp/sexp-main.c
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  rm -f rpm/rpmio/sexp/sexp-output.c '@@ .'
  Index: rpm/rpmio/sexp/sexp-output.c
  
  [NO CHANGE 

[CVS] RPM: rpm/ acinclude.m4

2007-06-29 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:   29-Jun-2007 17:57:53
  Branch: HEAD Handle: 2007062916575300

  Modified files:
rpm acinclude.m4

  Log:
Fix acinclude.m4 to allow you to run configure in a build directory instead
of the src directory.  This fixes some comparisons for internal/external
items.  (Note, the internal items need to be in the 'src' location!)

  Summary:
RevisionChanges Path
2.16+16 -11 rpm/acinclude.m4
  

  patch -p0 '@@ .'
  Index: rpm/acinclude.m4
  
  $ cvs diff -u -r2.15 -r2.16 acinclude.m4
  --- rpm/acinclude.m4  28 Jun 2007 06:12:33 -  2.15
  +++ rpm/acinclude.m4  29 Jun 2007 15:57:53 -  2.16
  @@ -146,9 +146,9 @@
   m4_define([__rcl_subdir],
 [m4_if(m4_index([$7], [:]), -1, [$7],
m4_substr([$7], 0, m4_index([$7], 
[:])))])
  -if test -d __rcl_subdir; then
  +if test -d ${srcdir}/__rcl_subdir; then
   AC_MSG_VERBOSE([-- activating local sub-directory: 
__rcl_subdir])
  -if test -f __rcl_subdir/configure; then
  +if test -f ${srcdir}/__rcl_subdir/configure; then
   AC_CONFIG_SUBDIRS(__rcl_subdir)
   fi
   dnl # NOTICE: an internal copy of the third-party 
library is a tricky thing
  @@ -175,32 +175,37 @@
   AC_MSG_VERBOSE([++ post-adjustments for --with-$2 
(${__rcl_location_$2})])
   __rcl_dirs_inc=`echo '$7' | sed -e 's/^[[^:]]*://' 
-e 's/:[[^:]]*[$]//'`
   __rcl_dirs_lib=`echo '$7' | sed -e 
's/^[[^:]]*:[[^:]]*://'`
  -
__rcl_basedir=\[$](top_srcdir)/\[$](WITH_[]m4_translit([$2],[a-z],[A-Z])[]_SUBDIR)
  +
__rcl_srcdir=\[$](top_srcdir)/\[$](WITH_[]m4_translit([$2],[a-z],[A-Z])[]_SUBDIR)
  +
__rcl_builddir=\[$](top_builddir)/\[$](WITH_[]m4_translit([$2],[a-z],[A-Z])[]_SUBDIR)
   __rcl_firstlib=m4_if(m4_index([$3], [ ]), -1, [$3], 
m4_substr([$3], 0, m4_index([$3], [ ])))
   if test .${__rcl_dirs_inc} != .$7; then
   __rcl_IFS=${IFS}; IFS=,
   for __rcl_dir in ${__rcl_dirs_inc}; do
   IFS=${__rcl_IFS}
   test .${__rcl_dir} = .  continue
  -AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: 
-I${__rcl_basedir}/${__rcl_dir}])
  -
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS=${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_basedir}/${__rcl_dir}
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: 
-I${__rcl_srcdir}/${__rcl_dir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS=${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_srcdir}/${__rcl_dir}
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: 
-I${__rcl_builddir}/${__rcl_dir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS=${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_builddir}/${__rcl_dir}
   done
   IFS=${__rcl_IFS}
   fi
  -AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: -I${__rcl_basedir}])
  -
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS=${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_basedir}
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: -I${__rcl_srcdir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS=${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_srcdir}
  +AC_MSG_VERBOSE([-- extending 
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS: -I${__rcl_builddir}])
  +
WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS=${WITH_[]m4_translit([$2],[a-z],[A-Z])[]_CPPFLAGS}
 -I${__rcl_builddir}
   if test .${__rcl_dirs_lib} != .$7; then