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

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

2017-07-20 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:   20-Jul-2017 14:20:14
  Branch: rpm-5_4  Handle: 2017072012201202

  Added files:  (Branch: rpm-5_4)
rpm/rpmio   rpmjs45shim.cpp
  Modified files:   (Branch: rpm-5_4)
rpm CHANGES Makefile.am autogen.sh configure.ac
devtool.conf
rpm/js  rpmjs45shim.cpp
rpm/js/src  js-confdefs.h js45shim.cpp
rpm/miscMakefile.am
rpm/rpmio   Makefile.am macro.c

  Log:
- lzo: stub in AutoFU detection.
- rpmjs: resurrect mozjs on CentOS7.

  Summary:
RevisionChanges Path
1.3501.2.586+2  -0  rpm/CHANGES
2.263.2.49  +9  -1  rpm/Makefile.am
2.110.2.20  +2  -0  rpm/autogen.sh
2.472.2.181 +111 -1 rpm/configure.ac
2.365.2.115 +33 -10 rpm/devtool.conf
1.1.2.3 +3  -0  rpm/js/rpmjs45shim.cpp
1.1.2.2 +1  -0  rpm/js/src/js-confdefs.h
1.1.2.2 +3  -0  rpm/js/src/js45shim.cpp
1.56.2.19   +2  -0  rpm/misc/Makefile.am
1.293.2.107 +8  -7  rpm/rpmio/Makefile.am
2.249.2.50  +5  -2  rpm/rpmio/macro.c
1.1.2.1 +29 -0  rpm/rpmio/rpmjs45shim.cpp
  

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.585 -r1.3501.2.586 CHANGES
  --- rpm/CHANGES   16 Jul 2017 13:46:46 -  1.3501.2.585
  +++ rpm/CHANGES   20 Jul 2017 12:20:12 -  1.3501.2.586
  @@ -1,4 +1,6 @@
   5.4.17 -> 5.4.18:
  +- jbj: lzo: stub in AutoFU detection.
  +- jbj: rpmjs: resurrect mozjs on CentOS7.
   - jbj: zstd: fix: handle read/decompress EOF correctly.
   - jbj: bdb: upgrade to db-6.2.32.
   - jbj: i18n: update PO files (Translation Project).
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/Makefile.am
  
  $ cvs diff -u -r2.263.2.48 -r2.263.2.49 Makefile.am
  --- rpm/Makefile.am   16 Jul 2017 18:15:41 -  2.263.2.48
  +++ rpm/Makefile.am   20 Jul 2017 12:20:13 -  2.263.2.49
  @@ -48,7 +48,7 @@
   --with-attr \
   --with-acl \
   --without-xar \
  ---with-popt=external \
  +--with-popt=internal \
   --with-keyutils \
   --with-pthreads \
   --with-libelf \
  @@ -106,7 +106,14 @@
$(srcdir)/js/rpmjsfile.msg \
$(srcdir)/js/v8.cc \
$(srcdir)/js/*.[ch] \
  + $(srcdir)/js/*.cpp \
  + $(srcdir)/js/*.sh \
$(srcdir)/js/tscripts/*.js \
  + $(srcdir)/js/src/Makefile.* \
  + $(srcdir)/js/src/*.[ch] \
  + $(srcdir)/js/src/*.cpp \
  + $(srcdir)/js/src/*.inp \
  + $(srcdir)/js/src/shell/*.cpp \
$(srcdir)/lua/COPYRIGHT \
$(srcdir)/lua/HISTORY \
$(srcdir)/lua/Makefile.* \
  @@ -188,6 +195,7 @@
@WITH_ZLIB_SUBDIR@ \
@WITH_ZSTD_SUBDIR@ \
@WITH_LZ4_SUBDIR@ \
  + @WITH_LZO_SUBDIR@ \
@WITH_SNAPPY_SUBDIR@ \
@WITH_BROTLI_SUBDIR@ \
@WITH_LZFSE_SUBDIR@ \
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/autogen.sh
  
  $ cvs diff -u -r2.110.2.19 -r2.110.2.20 autogen.sh
  --- rpm/autogen.sh16 Jul 2017 18:15:41 -  2.110.2.19
  +++ rpm/autogen.sh20 Jul 2017 12:20:13 -  2.110.2.20
  @@ -1385,6 +1385,8 @@
   ;;
 lz4)
   ;;
  +  lzo)
  +;;
 snappy)
   ( cd $dir && sh ./autogen.sh )
   ;;
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.180 -r2.472.2.181 configure.ac
  --- rpm/configure.ac  16 Jul 2017 19:07:02 -  2.472.2.180
  +++ rpm/configure.ac  20 Jul 2017 12:20:13 -  2.472.2.181
  @@ -2433,6 +2433,7 @@
   AC_CHECK_FUNCS(BrotliDecoderSetParameter)
   AC_CHECK_FUNCS(BrotliDecoderTakeOutput)
   AC_CHECK_FUNCS(BrotliDecoderVersion)
  +  HAVE_RPM_COMPRESSION=yes 
   ], [])
   
   dnl # Google Snappy
  @@ -2446,6 +2447,7 @@
   AC_CHECK_FUNCS(snappy_uncompress)
   AC_CHECK_FUNCS(snappy_uncompressed_length)
   AC_CHECK_FUNCS(snappy_validate_compressed_buffer)
  +  HAVE_RPM_COMPRESSION=yes 
   ], [])
   
   dnl # Apple Lzfse
  @@ -2473,6 +2475,7 @@
   AC_CHECK_FUNCS(lzvn_encode)
   AC_CHECK_FUNCS(lzvn_encode_buffer)
   AC_CHECK_FUNCS(lzvn_encode_scratch_size)
  +

[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/ CHANGES Makefile.am autogen.sh configure.ac d...

2012-03-04 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:   04-Mar-2012 18:02:20
  Branch: rpm-5_4  Handle: 2012030417021802

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

  Log:
- rpmgit: permit --with-libgit2=internal. todo++.

  Summary:
RevisionChanges Path
1.3501.2.220+1  -0  rpm/CHANGES
2.263.2.8   +1  -0  rpm/Makefile.am
2.110.2.1   +11 -5  rpm/autogen.sh
2.472.2.46  +4  -1  rpm/configure.ac
2.365.2.28  +20 -4  rpm/devtool.conf
1.56.2.4+2  -0  rpm/misc/Makefile.am
1.293.2.6   +1  -0  rpm/rpmio/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.219 -r1.3501.2.220 CHANGES
  --- rpm/CHANGES   4 Mar 2012 15:48:11 -   1.3501.2.219
  +++ rpm/CHANGES   4 Mar 2012 17:02:18 -   1.3501.2.220
  @@ -1,4 +1,5 @@
   5.4.7 - 5.4.8:
  +- 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/Makefile.am
  
  $ cvs diff -u -r2.263.2.7 -r2.263.2.8 Makefile.am
  --- rpm/Makefile.am   20 Feb 2012 13:20:30 -  2.263.2.7
  +++ rpm/Makefile.am   4 Mar 2012 17:02:19 -   2.263.2.8
  @@ -44,6 +44,7 @@
@WITH_BEECRYPT_SUBDIR@ \
@WITH_NEON_SUBDIR@ \
@WITH_SPIDERMONKEY_SUBDIR@ \
  + @WITH_LIBGIT2_SUBDIR@ \
@WITH_FILE_SUBDIR@ \
@WITH_BASH_SUBDIR@ \
@WITH_RC_SUBDIR@ \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/autogen.sh
  
  $ cvs diff -u -r2.110 -r2.110.2.1 autogen.sh
  --- rpm/autogen.sh2 Nov 2010 16:55:53 -   2.110
  +++ rpm/autogen.sh4 Mar 2012 17:02:19 -   2.110.2.1
  @@ -40,13 +40,19 @@
   [ `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 neon pcre popt rc syck xar xz; do
  +for dir in bash beecrypt file libgit2 neon pcre popt rc syck xar xz; do
   
  -  if [ -d $dir ]; then
  -echo === $dir
  +  [ -d $dir ] || continue
  +  echo === $dir
  +  case $dir in
  +  libgit2)
  +( mkdir -p $dir/build  cd $dir/build  cmake .. )
  +;;
  +  *)
   ( cd $dir  sh ./autogen.sh --noconfigure $@ )
  -echo === $dir
  -fi
  +;;
  +  esac
  +  echo === $dir
   done
   
   echo === rpm
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.45 -r2.472.2.46 configure.ac
  --- rpm/configure.ac  4 Mar 2012 15:48:11 -   2.472.2.45
  +++ rpm/configure.ac  4 Mar 2012 17:02:19 -   2.472.2.46
  @@ -1489,8 +1489,11 @@
   RPM_CHECK_LIB(
   [Libgit2], [libgit2],
   [git2], [git_repository_open], [git2.h],
  -[no,external:none], [],
  +[no,internal:external:none], [build:include],
   [ AC_DEFINE(WITH_LIBGIT2, 1, [Define if building with Libgit2])
  +  if test .$RPM_CHECK_LIB_LOCATION = .internal; then
  +  AC_DEFINE(HAVE_GIT2_H, 1, [Define to 1 if you have git2.h])
  +  fi
   ], [])
   
   # APR
  @@ .
  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.27 -r2.365.2.28 devtool.conf
  --- rpm/devtool.conf  29 Feb 2012 05:07:20 -  2.365.2.27
  +++ rpm/devtool.conf  4 Mar 2012 17:02:19 -   2.365.2.28
  @@ -3,13 +3,14 @@
   ##
   
   %common
  -MODULE_NAMES=beecrypt lua neon popt syck
  +MODULE_NAMES=beecrypt 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_JS_SRC=
  +MODULE_TAG_LIBGIT2=
   MODULE_TAG_LUA=rpm-5_4
   MODULE_TAG_NEON=rpm-5_4
   MODULE_TAG_PCRE=
  @@ -21,6 +22,19 @@
   
   %checkout
   for name in $MODULE_NAMES $@; do
  +  case ${name} in
  +  libgit2)
  +if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
  +

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

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

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

3 matches

Site Navigation

Mail list logo

Footer information