[CVS] RPM: rpm/ CHANGES rpm/tests/ thkp.c

2012-03-05 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   05-Mar-2012 15:52:24
  Branch: HEAD Handle: 2012030514522301

  Modified files:
rpm CHANGES
rpm/tests   thkp.c

  Log:
add more Fedorable gpg keys to thkp.c test program

  Summary:
RevisionChanges Path
1.3687  +1  -0  rpm/CHANGES
1.3 +8  -2  rpm/tests/thkp.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3686 -r1.3687 CHANGES
  --- rpm/CHANGES   20 Dec 2011 16:45:56 -  1.3686
  +++ rpm/CHANGES   5 Mar 2012 14:52:23 -   1.3687
  @@ -1,4 +1,5 @@
   HEAD:
  +- devzero2000: add more Fedorable gpg keys to thkp.c test program
   - devzero2000: call with safety some python API that
 can segfault if called with a NULL pointer. 
 Based of the original patch of David Malcom
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/thkp.c
  
  $ cvs diff -u -r1.2 -r1.3 thkp.c
  --- rpm/tests/thkp.c  11 Apr 2011 14:41:35 -  1.2
  +++ rpm/tests/thkp.c  5 Mar 2012 14:52:24 -   1.3
  @@ -52,8 +52,14 @@
   0xfdb36b03,/* Fedora (14-s390x) fed...@fedoraproject.org */
   0x97a1071f,/* Fedora (14) fed...@fedoraproject.org */
   0x069c8460,/* Fedora (15) fed...@fedoraproject.org */
  -0x0608b895,/* EPEL (6) e...@fedoraproject.org */
  -0x217521f6,/* Fedora EPEL e...@fedoraproject.org */
  +0xA82BA4B7,/* Fedora (16) - primary   - fed...@fedoraproject.org 
*/
  +0x10D90A9E,/* Fedora (16) - secondary - fed...@fedoraproject.org 
*/
  +0x1ACA3465,/* Fedora (17) - primary   - fed...@fedoraproject.org 
*/
  +0xF8DF67E6,/* Fedora (17) - secondary - fed...@fedoraproject.org 
*/
  +0x22B3B81A,/* Fedora (18) - primary   - fed...@fedoraproject.org 
*/
  +0x34E166FA,/* Fedora (18) - secondary - fed...@fedoraproject.org 
*/
  +0x0x0608b895,  /* EPEL (6) e...@fedoraproject.org */
  +0x0x217521f6,  /* Fedora EPEL e...@fedoraproject.org */
   /* --- IDMS 2010-05-22 */
   0x1edca302,/* IDMS Linux (Trunk) gpgk...@idms-linux.org */
   /* --- CentOS 5.4 */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/tests/ thkp.c

2012-03-05 Thread Pinto Elia 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Pinto Elia
  Root:   /v/rpm/cvs   Email:  devzero2...@rpm5.org
  Module: rpm  Date:   05-Mar-2012 16:29:45
  Branch: rpm-5_4  Handle: 2012030515294500

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/tests   thkp.c

  Log:
add more Fedorable gpg keys to thkp.c test program

  Summary:
RevisionChanges Path
1.3501.2.221+1  -0  rpm/CHANGES
1.1.4.6 +6  -0  rpm/tests/thkp.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.220 -r1.3501.2.221 CHANGES
  --- rpm/CHANGES   4 Mar 2012 17:02:18 -   1.3501.2.220
  +++ rpm/CHANGES   5 Mar 2012 15:29:45 -   1.3501.2.221
  @@ -1,4 +1,5 @@
   5.4.7 - 5.4.8:
  +- devzero2000: add more Fedorable gpg keys to thkp.c test program
   - jbj: rpmgit: permit --with-libgit2=internal. todo++.
   - jbj: macros: add %__rmdir (and autofu detection) to the pile.
   - jbj: start rpm-5.4.8 development.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/thkp.c
  
  $ cvs diff -u -r1.1.4.5 -r1.1.4.6 thkp.c
  --- rpm/tests/thkp.c  27 Feb 2012 08:31:54 -  1.1.4.5
  +++ rpm/tests/thkp.c  5 Mar 2012 15:29:45 -   1.1.4.6
  @@ -52,6 +52,12 @@
   0xfdb36b03,/* Fedora (14-s390x) fed...@fedoraproject.org */
   0x97a1071f,/* Fedora (14) fed...@fedoraproject.org */
   0x069c8460,/* Fedora (15) fed...@fedoraproject.org */
  +0xA82BA4B7,/* Fedora (16) - primary   - fed...@fedoraproject.org 
*/
  +0x10D90A9E,/* Fedora (16) - secondary - fed...@fedoraproject.org 
*/
  +0x1ACA3465,/* Fedora (17) - primary   - fed...@fedoraproject.org 
*/
  +0xF8DF67E6,/* Fedora (17) - secondary - fed...@fedoraproject.org 
*/
  +0x22B3B81A,/* Fedora (18) - primary   - fed...@fedoraproject.org 
*/
  +0x34E166FA,/* Fedora (18) - secondary - fed...@fedoraproject.org 
*/
   0x0608b895,/* EPEL (6) e...@fedoraproject.org */
   0x217521f6,/* Fedora EPEL e...@fedoraproject.org */
   /* --- IDMS 2010-05-22 */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/misc/ Makefile.am

2012-03-05 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Mar-2012 17:45:37
  Branch: rpm-5_4  Handle: 2012030516453700

  Modified files:   (Branch: rpm-5_4)
rpm/miscMakefile.am

  Log:
- misc: re-enable -lrc linkage now that there's a loader map in place.

  Summary:
RevisionChanges Path
1.56.2.6+2  -0  rpm/misc/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/misc/Makefile.am
  
  $ cvs diff -u -r1.56.2.5 -r1.56.2.6 Makefile.am
  --- rpm/misc/Makefile.am  4 Mar 2012 20:34:17 -   1.56.2.5
  +++ rpm/misc/Makefile.am  5 Mar 2012 16:45:37 -   1.56.2.6
  @@ -41,6 +41,7 @@
@WITH_NEON_LDFLAGS@ \
@WITH_PCRE_LDFLAGS@ \
@WITH_POPT_LDFLAGS@ \
  + @WITH_RC_LDFLAGS@ \
@WITH_SYCK_LDFLAGS@ \
@WITH_XAR_LDFLAGS@ \
@WITH_XZ_LDFLAGS@ \
  @@ -57,6 +58,7 @@
@WITH_NEON_LIBS@ \
@WITH_PCRE_LIBS@ \
@WITH_POPT_LIBS@ \
  + @WITH_RC_LIBS@ \
@WITH_SYCK_LIBS@ \
@WITH_XAR_LIBS@ \
@WITH_XZ_LIBS@ \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ CHANGES Makefile.am autogen.sh configure.ac d...

2012-03-05 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Mar-2012 17:53:58
  Branch: rpm-5_4  Handle: 2012030516535700

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES Makefile.am autogen.sh configure.ac
devtool.conf

  Log:
- rpmjs: permit --with-gpsee=internal. todo++.

  Summary:
RevisionChanges Path
1.3501.2.222+1  -0  rpm/CHANGES
2.263.2.11  +1  -0  rpm/Makefile.am
2.110.2.4   +1  -1  rpm/autogen.sh
2.472.2.49  +4  -1  rpm/configure.ac
2.365.2.30  +13 -1  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.221 -r1.3501.2.222 CHANGES
  --- rpm/CHANGES   5 Mar 2012 15:29:45 -   1.3501.2.221
  +++ rpm/CHANGES   5 Mar 2012 16:53:57 -   1.3501.2.222
  @@ -1,4 +1,5 @@
   5.4.7 - 5.4.8:
  +- jbj: rpmjs: permit --with-gpsee=internal. todo++.
   - devzero2000: add more Fedorable gpg keys to thkp.c test program
   - jbj: rpmgit: permit --with-libgit2=internal. todo++.
   - jbj: macros: add %__rmdir (and autofu detection) to the pile.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.10 -r2.263.2.11 Makefile.am
  --- rpm/Makefile.am   4 Mar 2012 18:17:17 -   2.263.2.10
  +++ rpm/Makefile.am   5 Mar 2012 16:53:57 -   2.263.2.11
  @@ -44,6 +44,7 @@
@WITH_BEECRYPT_SUBDIR@ \
@WITH_NEON_SUBDIR@ \
@WITH_SPIDERMONKEY_SUBDIR@ \
  + @WITH_GPSEE_SUBDIR@ \
@WITH_LIBGIT2_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
@WITH_BASH_SUBDIR@ \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/autogen.sh
  
  $ cvs diff -u -r2.110.2.3 -r2.110.2.4 autogen.sh
  --- rpm/autogen.sh4 Mar 2012 21:24:36 -   2.110.2.3
  +++ rpm/autogen.sh5 Mar 2012 16:53:57 -   2.110.2.4
  @@ -40,7 +40,7 @@
   [ `libtoolize --version | head -1` != $LTV ]  echo $USAGE #  exit 1
   [ `gettextize --version | head -1 | sed -e 's;^.*/\\(gettextize\\);\\1;'` 
!= $GTT ]  echo $USAGE #  exit 1
   
  -for dir in bash beecrypt file libgit2 neon pcre popt rc syck xar xz; do
  +for dir in bash beecrypt file gpsee libgit2 neon pcre popt rc syck xar xz; do
   
 [ -d $dir ] || continue
 echo === $dir
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.48 -r2.472.2.49 configure.ac
  --- rpm/configure.ac  4 Mar 2012 18:17:17 -   2.472.2.48
  +++ rpm/configure.ac  5 Mar 2012 16:53:57 -   2.472.2.49
  @@ -1740,11 +1740,14 @@
   AC_SUBST(WITH_JS_SUBDIR)
   
   dnl # GPSEE
  +dnl # XXX hotwire the GPSEE - JS dependency implictly
   RPM_CHECK_LIB(
   [GPSEE], [gpsee],
   [gpsee], [gpsee_createInterpreter], [gpsee.h],
  -[no,external:none], [gpsee],
  +[no,external:internal:none], [gpsee],
   [ AC_DEFINE(WITH_GPSEE, 1, [Define to 1 if to use GPSEE as the embedded 
JS interpreter])
  +  CPPFLAGS=$CPPFLAGS -I${includedir}/js
  +  LIBS=$LIBS -ljs
 if test .$RPM_CHECK_LIB_LOCATION = .internal; then
 AC_DEFINE(HAVE_GPSEE_H, 1, [Define to 1 if you have gpsee.h])
  AC_DEFINE(HAVE_LIBGPSEE, 1, [Define to 1 if you have the 'gpsee' 
library (-ljs).])
  @@ .
  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.29 -r2.365.2.30 devtool.conf
  --- rpm/devtool.conf  4 Mar 2012 21:39:04 -   2.365.2.29
  +++ rpm/devtool.conf  5 Mar 2012 16:53:57 -   2.365.2.30
  @@ -3,12 +3,13 @@
   ##
   
   %common
  -MODULE_NAMES=beecrypt libgit2 lua neon popt rc syck
  +MODULE_NAMES=beecrypt gpsee libgit2 lua neon popt rc syck
   MODULE_TAG_BASH=   # XXX bash is GPLv2 and cannot be 
bundled w RPM
   MODULE_TAG_BEECRYPT=rpm-5_4
   MODULE_TAG_DB=
   MODULE_TAG_FICL=
   MODULE_TAG_FILE=
  +MODULE_TAG_GPSEE=
   MODULE_TAG_JS_SRC=
   MODULE_TAG_LIBGIT2=
   MODULE_TAG_LUA=rpm-5_4
  @@ -34,6 +35,17 @@
   ( cd ${DEVTOOL_SRCDIR}  ${gitcmd} )
fi
   ;;
  +  gpsee)
  +if [ -d ${DEVTOOL_SRCDIR}/${name}/.hg ]; then
  + cmd=hg fetch
  +echo === ${name} (${cmd})
  +( cd ${DEVTOOL_SRCDIR}/${name}  ${cmd} )
  +

[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2012-03-05 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Mar-2012 17:57:32
  Branch: rpm-5_4  Handle: 2012030516573100

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
- harwich: add --with-gpseee=internal to enable.

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

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.30 -r2.365.2.31 devtool.conf
  --- rpm/devtool.conf  5 Mar 2012 16:53:57 -   2.365.2.30
  +++ rpm/devtool.conf  5 Mar 2012 16:57:31 -   2.365.2.31
  @@ -478,7 +478,7 @@
   --without-bash \
   --with-rc \
   --without-js \
  ---without-gpsee \
  +--with-gpsee=internal \
   --with-python \
   --with-pythonembed=/usr/lib:/usr/include/python2.6 \
   --with-perl \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ configure.ac

2012-03-05 Thread Jeff Johnson 
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   05-Mar-2012 19:26:35
  Branch: rpm-5_4  Handle: 2012030518263500

  Modified files:   (Branch: rpm-5_4)
rpm configure.ac

  Log:
- fix: -lmozjs185 instead of -ljs for GPSEE linkage.

  Summary:
RevisionChanges Path
2.472.2.50  +1  -1  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.49 -r2.472.2.50 configure.ac
  --- rpm/configure.ac  5 Mar 2012 16:53:57 -   2.472.2.49
  +++ rpm/configure.ac  5 Mar 2012 18:26:35 -   2.472.2.50
  @@ -1747,7 +1747,7 @@
   [no,external:internal:none], [gpsee],
   [ AC_DEFINE(WITH_GPSEE, 1, [Define to 1 if to use GPSEE as the embedded 
JS interpreter])
 CPPFLAGS=$CPPFLAGS -I${includedir}/js
  -  LIBS=$LIBS -ljs
  +  LIBS=$LIBS -lmozjs185
 if test .$RPM_CHECK_LIB_LOCATION = .internal; then
 AC_DEFINE(HAVE_GPSEE_H, 1, [Define to 1 if you have gpsee.h])
  AC_DEFINE(HAVE_LIBGPSEE, 1, [Define to 1 if you have the 'gpsee' 
library (-ljs).])
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org