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: 16-Jan-2017 19:58:06
Branch: rpm-5_4 Handle: 2017011618580600
Modified files: (Branch: rpm-5_4)
rpm .cvsignore CHANGES INSTALL Makefile.am autogen.sh
configure.ac
rpm/lib Makefile.am
rpm/misc Makefile.am librpmmisc.vers
Log:
- flatcc: AutoFU added.
Summary:
Revision Changes Path
1.40.2.10 +1 -0 rpm/.cvsignore
1.3501.2.521+1 -0 rpm/CHANGES
2.134.2.31 +23 -7 rpm/INSTALL
2.263.2.46 +1 -0 rpm/Makefile.am
2.110.2.17 +10 -1 rpm/autogen.sh
2.472.2.157 +25 -2 rpm/configure.ac
2.203.2.18 +26 -0 rpm/lib/Makefile.am
1.56.2.17 +2 -0 rpm/misc/Makefile.am
1.35.2.14 +8 -0 rpm/misc/librpmmisc.vers
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/.cvsignore
============================================================================
$ cvs diff -u -r1.40.2.9 -r1.40.2.10 .cvsignore
--- rpm/.cvsignore 17 Jun 2016 05:30:22 -0000 1.40.2.9
+++ rpm/.cvsignore 16 Jan 2017 18:58:06 -0000 1.40.2.10
@@ -38,6 +38,7 @@
gpsee
install-sh
intl
+flatcc
libgit2
lib-rpmrc
libtool
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.520 -r1.3501.2.521 CHANGES
--- rpm/CHANGES 27 Dec 2016 12:26:17 -0000 1.3501.2.520
+++ rpm/CHANGES 16 Jan 2017 18:58:06 -0000 1.3501.2.521
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+ - jbj: flatcc: AutoFU added.
- jbj: mongoc: disable openssl if 1.1.0.
- jbj: openssl: port to 1.1.0 API, retrofit getters/setters to 1.0.2.
- jbj: make peace with gcc-6.3.1.
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
============================================================================
$ cvs diff -u -r2.134.2.30 -r2.134.2.31 INSTALL
--- rpm/INSTALL 23 Dec 2016 16:53:26 -0000 2.134.2.30
+++ rpm/INSTALL 16 Jan 2017 18:58:06 -0000 2.134.2.31
@@ -28,8 +28,8 @@
Name Type Minimum Used URL
--------------- --------- ------- -------
-------------------------------------
ISO C Compiler mandatory - - e.g. http://gcc.gnu.org/
- GCC optional - 6.2.1 http://gcc.gnu.org/
- LLVM optional - 3.8.0 http://llvm.org
+ GCC optional - 6.3.1 http://gcc.gnu.org/
+ LLVM optional - 3.9.0 http://llvm.org
POSIX make mandatory - 4.1 e.g.
http://www.gnu.org/software/make/
Perl mandatory 5.8.0 5.24.0 http://www.perl.com/
POPT mandatory 1.15 1.17 http://rpm5.org/files/popt/
@@ -39,10 +39,10 @@
PCRE mandatory 7.0 8.39 http://www.pcre.org/
Berkeley-DB [1] mandatory 6.1.23 6.2.23
http://www.oracle.com/database/berkeley-db.html
Mozilla NSS optional 3.11 3.27.0
http://www.mozilla.org/projects/security/pki/nss/
-OpenSSL optional 0.9.8 1.0.2j http://www.openssl.org/
+OpenSSL optional 0.9.8 1.1.0c http://www.openssl.org/
OpenSSL-FIPS[7] optional 2.0.5 2.0.9 http://www.openssl.org/
LibTomCrypt optional 1.17 1.17 http://www.libtom.org/
-LibGcrypt [6] optional 1.6.0 1.7.1 http://www.gnupg.org/
+LibGcrypt [6] optional 1.6.0 1.7.5 http://www.gnupg.org/
SQLite [1] optional 3.3 3.14.2 http://www.sqlite.org/
Lua [2] optional 5.2 5.3.2 http://www.lua.org/
ZLib optional 1.2 1.2.8 http://www.zlib.net/
@@ -71,15 +71,31 @@
jsmn bundled - 572ace5 https://github.com/zserge/jsmn
microjson bundled 0.3 0.3+
http://thyrsus.com/gitweb/?p=microjson.git
gnulib bundled - 3a0b7b7 git://git.savannah.gnu.org/gnulib
+flatcc bundled - - git://github.com/rpm5/flatcc
--------------- --------- ------- -------
-------------------------------------
[0] m4: NOTICE: Do not use GNU m4 1.4.10, it breaks GNU autoconf.
[1] db/sqlite: Berkeley-DB used by RPM.
Note that there is a regression between db-6.1.23 -> db-6.1.26
- with no currently known solution.
- Building RPM against anything _EXCEPT_ db-6.1.23
- external Berkeley-DB is not officially supported
+ There is a 1-line patch to db-6.1.26/db-6.2.23 needed:
+---------------
+diff -up db-6.2.23/src/env/env_failchk.c.jbj db-6.2.23/src/env/env_failchk.c
+--- db-6.2.23/src/env/env_failchk.c.jbj 2016-03-28 15:45:54.000000000 -0400
++++ db-6.2.23/src/env/env_failchk.c 2016-05-08 14:03:58.153742935 -0400
+@@ -528,7 +528,11 @@ __env_set_state(env, ipp, state)
+ DB_ASSERT(env, ip != NULL && ip->dbth_state != THREAD_OUT);
+ if (ipp != NULL)
+ *ipp = ip;
++#ifdef NOTYET
+ if (ip == NULL || ip->dbth_state == THREAD_OUT)
++#else
++ if (ip == NULL) /* The control block wasn't found */
++#endif
+ return (USR_ERR(env, EINVAL));
+ else
+ return (0);
+---------------
(but any version of Berkeley-DB since db-4.5.20 will "work").
[2] lua: Modified Lua copy bundled with RPM.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.263.2.45 -r2.263.2.46 Makefile.am
--- rpm/Makefile.am 23 Dec 2016 16:51:37 -0000 2.263.2.45
+++ rpm/Makefile.am 16 Jan 2017 18:58:06 -0000 2.263.2.46
@@ -178,6 +178,7 @@
endif
SUBDIRS += \
gnulib \
+ @WITH_FLATCC_SUBDIR@ \
@WITH_DB_SUBDIR@ \
@WITH_ZLIB_SUBDIR@ \
@WITH_PCRE_SUBDIR@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/autogen.sh
============================================================================
$ cvs diff -u -r2.110.2.16 -r2.110.2.17 autogen.sh
--- rpm/autogen.sh 23 Dec 2016 16:51:37 -0000 2.110.2.16
+++ rpm/autogen.sh 16 Jan 2017 18:58:06 -0000 2.110.2.17
@@ -1349,7 +1349,7 @@
gnulib_tool=.gnulib/gnulib-tool
-for dir in .gnulib bash beecrypt file gpsee libtpm libgit2 neon pcre popt rc
syck xar xz; do
+for dir in .gnulib bash beecrypt file flatcc gpsee libtpm libgit2 neon pcre
popt rc syck xar xz; do
[ -d $dir ] || continue
echo "===> $dir"
@@ -1372,6 +1372,15 @@
--avoid fflush \
--import $gnulib_modules
;;
+ flatcc)
+ ( cd $dir && cmake . &&
+ echo "check: test" >> Makefile &&
+ echo "distclean: clean" >> Makefile
+ cp *.la lib/
+ mkdir lib/.libs
+ ln -sf ../libflatccrt.a lib/.libs/libflatccrt.a
+ )
+ ;;
libgit2)
( cd $dir && cmake . &&
echo "check: test" >> Makefile &&
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.156 -r2.472.2.157 configure.ac
--- rpm/configure.ac 29 Dec 2016 21:52:49 -0000 2.472.2.156
+++ rpm/configure.ac 16 Jan 2017 18:58:06 -0000 2.472.2.157
@@ -2165,6 +2165,20 @@
esac
])
+dnl # Pth
+dnl RPM_CHECK_LIB(
+dnl [PTH], [pth],
+dnl [pth], [pth_init], [pth.h],
+dnl [no,external:no], [],
+dnl [], [])
+
+dnl # nPth
+dnl RPM_CHECK_LIB(
+dnl [nPth], [npth],
+dnl [npth], [npth_init], [npth.h],
+dnl [no,external:no], [],
+dnl [], [])
+
dnl # Libsasl2 (for mongoc)
RPM_CHECK_LIB(
[Cyrus Libsasl2], [sasl2],
@@ -2344,8 +2358,6 @@
dnl # Berkeley-DB & SQLite
DBLIBSRCS=""
-# XXX won't handle --includedir override
-CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
[db-6.2], [db_create], [db.h],
@@ -2542,7 +2554,18 @@
], [])
fi
+dnl # Flatcc
+dnl # XXX -with-flatcc=internal todo++
+AC_PATH_PROG(__FLATCC, flatcc, /bin/true, $PATH)
+RPM_CHECK_LIB(
+ [Flatcc], [flatcc],
+ [flatccrt], [flatcc_builder_init], [flatcc/flatcc.h],
+ [no,external:none], [flatcc:include:lib],
+ [ AC_DEFINE(WITH_FLATCC, 1, [Define to 1 if you want flatcc])
+ ], [])
+
dnl # Flatbuffers
+AC_PATH_PROG(__FLATC, flatc, /bin/true, $PATH)
AC_LANG_PUSH([C++])
RPM_CHECK_LIB(
[Flatbuffers], [flatbuffers],
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.203.2.17 -r2.203.2.18 Makefile.am
--- rpm/lib/Makefile.am 25 Jun 2016 09:49:39 -0000 2.203.2.17
+++ rpm/lib/Makefile.am 16 Jan 2017 18:58:06 -0000 2.203.2.18
@@ -150,6 +150,16 @@
check-local:
+clean-local:
+ rm -f *_builder.h
+ rm -f *_verifier.h
+ rm -f *_reader.h
+ rm -f *_json_parser.h
+ rm -f *_json_printer.h
+ rm -f *.bfbs
+ rm -f *.fbs.d
+ rm -rf tmp/rpmdb
+
distclean-local:
rm -f .syntastic_c_config
@@ -158,6 +168,22 @@
rpmlib.lcd: Makefile.am ${librpm_la_SOURCES} ${pkginc_HEADERS}
${noinst_HEADERS}
-lclint ${DEFS} ${INCLUDES} ${librpm_la_SOURCES} -dump $@ 2>/dev/null
+EXTRA_PROGRAMS += thdr
+FLATCC = @__FLATCC@ -ad --json --schema
+FLATCC_RPMTAG_FILES = \
+ rpmtag_builder.h \
+ rpmtag_reader.h \
+ rpmtag_verifier.h \
+ rpmtag_json_printer.h \
+ rpmtag_json_parser.h \
+ rpmtag.fbs.d \
+ rpmtag.bfbs
+BUILT_SOURCES += $(FLATCC_RPMTAG_FILES)
+$(FLATCC_RPMTAG_FILES): $(top_srcdir)/rpmdb/rpmtag.fbs
+ $(FLATCC) $<
+thdr_SOURCES = thdr.c
+thdr_LDADD = $(RPM_LDADD_COMMON)
+
BUILT_SOURCES += .syntastic_c_config
.syntastic_c_config: Makefile
@echo $(COMPILE) | tr ' ' '\n' | sed -e '1d' > $@
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.56.2.16 -r1.56.2.17 Makefile.am
--- rpm/misc/Makefile.am 19 Jun 2016 08:53:46 -0000 1.56.2.16
+++ rpm/misc/Makefile.am 16 Jan 2017 18:58:06 -0000 1.56.2.17
@@ -45,6 +45,7 @@
librpmmisc_la_LDFLAGS += \
@WITH_DB_LDFLAGS@ \
@WITH_FILE_LDFLAGS@ \
+ @WITH_FLATCC_LDFLAGS@ \
@WITH_BEECRYPT_LDFLAGS@ \
@WITH_FICL_LDFLAGS@ \
@WITH_GPSEE_LDFLAGS@ \
@@ -65,6 +66,7 @@
@WITH_DB_LIBS@ \
@WITH_FICL_LIBS@ \
@WITH_FILE_LIBS@ \
+ @WITH_FLATCC_LIBS@ \
@WITH_BEECRYPT_LIBS@ \
@WITH_GPSEE_LIBS@ \
@WITH_LIBTPM_LIBS@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/librpmmisc.vers
============================================================================
$ cvs diff -u -r1.35.2.13 -r1.35.2.14 librpmmisc.vers
--- rpm/misc/librpmmisc.vers 25 Jun 2016 20:50:13 -0000 1.35.2.13
+++ rpm/misc/librpmmisc.vers 16 Jan 2017 18:58:06 -0000 1.35.2.14
@@ -23,6 +23,14 @@
finiproctitle;
initproctitle;
setproctitle;
+ cmetrohash64_*;
+ error_ref_sym;
+ fb_*;
+ __flatcc_*;
+ flatcc_*;
+ grisu3_diy_fp_encode_double;
+ ptr_set_*;
+ str_set_*;
glob64;
globfree64;
gpsee_*;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
