[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf rpm/rpmio/ ...
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-Jul-2013 18:55:09
Branch: rpm-5_4 Handle: 2013070516550801
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac devtool.conf
rpm/rpmio rpmsquirrel.c
Log:
- squirrel: uplift to squirrel 3.0.4.
Summary:
RevisionChanges Path
1.3501.2.319+1 -0 rpm/CHANGES
2.472.2.76 +8 -3 rpm/configure.ac
2.365.2.71 +4 -4 rpm/devtool.conf
2.6.4.2 +22 -4 rpm/rpmio/rpmsquirrel.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.318 -r1.3501.2.319 CHANGES
--- rpm/CHANGES 2 Jul 2013 19:55:06 - 1.3501.2.318
+++ rpm/CHANGES 5 Jul 2013 16:55:08 - 1.3501.2.319
@@ -1,4 +1,5 @@
5.4.10 -> 5.4.11:
+- jbj: squirrel: uplift to squirrel 3.0.4.
- jbj: fix: rescusitate --with-uuid with pesky Mac OS X uuid_t typedef
- jbj: preliminaries for db-6.0.19 uplift.
- jbj: lua: fix: drop portability cruft to avoid lua panic..
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.75 -r2.472.2.76 configure.ac
--- rpm/configure.ac 4 Jul 2013 00:27:43 - 2.472.2.75
+++ rpm/configure.ac 5 Jul 2013 16:55:08 - 2.472.2.76
@@ -16,7 +16,7 @@
AC_CONFIG_SRCDIR([rpmqv.c])
AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign tar-ustar])
+AM_INIT_AUTOMAKE([foreign tar-ustar subdir-objects])
AC_REQUIRE_AUX_FILE([install-sh])
AC_REQUIRE_AUX_FILE([mkinstalldirs])
AM_MAINTAINER_MODE
@@ -1722,13 +1722,18 @@
AC_SUBST(WITH_RUBY_VENDORARCHDIR)
-dnl # Squirrel
+dnl # Squirrel (needs -lstdc++)
+LIBSsave="$LIBS"
+LIBS="$LIBS -lstdc++"
RPM_CHECK_LIB(
[Squirrel], [squirrel],
[squirrel], [sq_open], [squirrel.h],
[no,external:none], [],
[
-], [])
+ LIBS="$LIBS -lsqstdlib"
+], [
+ LIBS="$LIBSsave"
+])
dnl # Tcl (should tcl8.4 be supported too?)
WITH_TCL_SUBDIR=""
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.70 -r2.365.2.71 devtool.conf
--- rpm/devtool.conf 4 Jul 2013 00:34:09 - 2.365.2.70
+++ rpm/devtool.conf 5 Jul 2013 16:55:08 - 2.365.2.71
@@ -316,17 +316,17 @@
--without-rc \
--without-js \
--without-gpsee \
---with-python=system \
+--with-python=2.7 \
--with-pythonembed=/usr/lib:/usr/include/python2.7 \
---without-perl \
+--with-perl \
+
--with-perlembed=/opt/local/lib/perl5/5.12.4/darwin-thread-multi-2level/CORE/ \
--without-perl-urpm \
---without-perlembed \
--with-ruby=/opt/local/lib/ruby/1.8 \
--without-selinux \
--without-sepol \
--without-semanage \
--without-libgit2 \
---without-squirrel \
+--with-squirrel \
--with-installed-readline \
--with-valgrind \
--enable-build-warnings \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsquirrel.c
$ cvs diff -u -r2.6.4.1 -r2.6.4.2 rpmsquirrel.c
--- rpm/rpmio/rpmsquirrel.c 15 Apr 2012 21:20:53 - 2.6.4.1
+++ rpm/rpmio/rpmsquirrel.c 5 Jul 2013 16:55:09 - 2.6.4.2
@@ -5,7 +5,14 @@
#ifdef WITH_SQUIRREL
#include
+#include
+#include
+#include
+#include
+#include
+#include
#endif
+
#define _RPMSQUIRREL_INTERNAL
#include "rpmsquirrel.h"
@@ -93,22 +100,32 @@
rpmsquirrelGetPool(_rpmsquirrelPool);
#if defined(WITH_SQUIRREL)
-static const char * _av[] = { "rpmsquirrel", NULL };
+static char * _av[] = { "rpmsquirrel", NULL };
SQInteger stacksize = 1024;
HSQUIRRELVM v = sq_open(stacksize);
int ac;
if (av == NULL) av = _av;
-ac = argvCount(av);
+ac = argvCount((ARGV_t)av);
squirrel->I = v;
sq_setforeignptr(v, squirrel);
-sq_setprintfunc(v, rpmsquirrelPrint);
+sq_setprintfunc(v, rpmsquirrelPrint, NULL);
+
+sq_pushroottable(v);
+
+sqstd_register_bloblib(v);
+sqstd_register_iolib(v);
+sqstd_register_systemlib(v);
+sqstd_reg
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpython.c
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-Jul-2013 18:52:58 Branch: rpm-5_4 Handle: 2013070516525800 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpython.c Log: - python: hide initialization debugging spewage Summary: RevisionChanges Path 2.16.2.6+1 -0 rpm/rpmio/rpmpython.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpython.c $ cvs diff -u -r2.16.2.5 -r2.16.2.6 rpmpython.c --- rpm/rpmio/rpmpython.c 16 Jun 2012 01:11:49 - 2.16.2.5 +++ rpm/rpmio/rpmpython.c 5 Jul 2013 16:52:58 - 2.16.2.6 @@ -96,6 +96,7 @@ const char * s = rpmExpand(_rpmpythonI_init, _pythonI_init, NULL); int ac = argvCount((ARGV_t)av); (void) PySys_SetArgv(ac, (char **)av); +if (_rpmpython_debug) fprintf(stderr, "==\n%s\n==\n", s); (void) rpmpythonRun(python, s, NULL); s = _free(s); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ INSTALL
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-Jul-2013 18:50:58 Branch: rpm-5_4 Handle: 2013070516505800 Modified files: (Branch: rpm-5_4) rpm INSTALL Log: - update versions used. Summary: RevisionChanges Path 2.134.2.3 +15 -15 rpm/INSTALL patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.134.2.2 -r2.134.2.3 INSTALL --- rpm/INSTALL 5 May 2013 15:03:11 - 2.134.2.2 +++ rpm/INSTALL 5 Jul 2013 16:50:58 - 2.134.2.3 @@ -10,12 +10,12 @@ NameType Minimum UsedURL --- - --- --- - CVS mandatory 1.121.12.13 http://www.nongnu.org/cvs/ -Perlmandatory 5.8.0 5.10.1 http://www.perl.com/ +Perlmandatory 5.8.0 5.12.4 http://www.perl.com/ GNU m4 [0] mandatory 1.4.0 1.4.13 http://www.gnu.org/software/m4/ -GNU autoconfmandatory 2.59b 2.63 http://www.gnu.org/software/autoconf/ -GNU automakemandatory 1.8 1.11.1 http://www.gnu.org/software/automake/ -GNU libtool mandatory 1.5 2.2.6a http://www.gnu.org/software/libtool/ -GNU gettext mandatory 0.160.17 http://www.gnu.org/software/gettext/ +GNU autoconfmandatory 2.59b 2.69 http://www.gnu.org/software/autoconf/ +GNU automakemandatory 1.8 1.14 http://www.gnu.org/software/automake/ +GNU libtool mandatory 1.5 2.4.2 http://www.gnu.org/software/libtool/ +GNU gettext mandatory 0.16 0.18.2.1http://www.gnu.org/software/gettext/ GNU makemandatory - - http://www.gnu.org/software/make/ GNU bashoptional - - http://www.gnu.org/software/bash/ --- - --- --- - @@ -29,22 +29,22 @@ --- - --- --- - ISO C Compiler mandatory - - e.g. http://gcc.gnu.org/ POSIX make mandatory - - e.g. http://www.gnu.org/software/make/ -Perlmandatory 5.8.0 5.10.1 http://www.perl.com/ -POPTmandatory 1.151.16http://rpm5.org/files/popt/ +Perlmandatory 5.8.0 5.12.4 http://www.perl.com/ +POPTmandatory 1.151.17http://rpm5.org/files/popt/ BeeCryptmandatory 4.2.0 4.2.1 http://beecrypt.sourceforge.net/ Libtasn.1 mandatory - 2.7 http://www.gnu.org/software/libtasn1/ -Neonmandatory 0.27.0 0.29.4 http://www.webdav.org/neon/ -PCREmandatory 7.0 8.10http://www.pcre.org/ -Mozilla NSS optional 3.113.12.8 http://www.mozilla.org/projects/security/pki/nss/ -OpenSSL optional 0.9.8 1.0.0a http://www.openssl.org/ +Neonmandatory 0.27.0 0.29.6 http://www.webdav.org/neon/ +PCREmandatory 7.0 8.33http://www.pcre.org/ +Mozilla NSS optional 3.113.14.3 http://www.mozilla.org/projects/security/pki/nss/ +OpenSSL optional 0.9.8 1.0.0e http://www.openssl.org/ Berkeley-DB [1] optional 5.3.21 5.3.21 http://www.oracle.com/database/berkeley-db.html SQLite [1] optional 3.3 3.7.0.1 http://www.sqlite.org/ -Lua [2] optional 5.1 5.1.4 http://www.lua.org/ +Lua [2] optional 5.2 5.2.2 http://www.lua.org/ ZLiboptional 1.2 1.2.3 http://www.zlib.net/ Bzip2 optional 1.0 1.0.5 http://www.bzip.org/ -XZ Utils[3] optional 4.999.9 4.999.9 http://tukaani.org/xz/ -File/magic [4] optional 4.005.03ftp://ftp.astron.com/pub/file/ -GNU gettext optional 0.180.18 http://www.gnu.org/software/gettext/ +XZ Utils[3] optional 4.999.9 5.0.4 http://tukaani.org/xz/ +File/magic [4] optional 4.005.14ftp://ftp.astron.com/pub/file/ +GNU gettext optional 0.18 0.18.2.1http://www.gnu.org/software/gettext/ GNU iconv optional 1.111.11 http://www.gnu.org/software/libiconv/ OSSP uuid optional 1.6.0 1.6.2 http://www.ossp.org/pkg/lib/uuid/ XAR [5] optional 1.5.2 1.5.2 http://code.google.com/p/xar/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: ficl/ficlplatform/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: ficl Date: 05-Jul-2013 18:49:50 Branch: HEAD Handle: 2013070516495000 Added files: ficl/ficlplatform .cvsignore Log: - ignore cruft Summary: RevisionChanges Path 1.1 +4 -0 ficl/ficlplatform/.cvsignore patch -p0 <<'@@ .' Index: ficl/ficlplatform/.cvsignore $ cvs diff -u -r0 -r1.1 .cvsignore --- /dev/null 2013-07-05 18:45:36.0 +0200 +++ .cvsignore2013-07-05 18:49:50.332193708 +0200 @@ -0,0 +1,4 @@ +.deps +.dirstamp +.libs +*.lo @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
