Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
863cb27a31 | ||
|
e5f5d96362 | ||
|
34e993605b | ||
|
|
80d58e4266 | ||
|
99cc08bed7 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/libpreludedb-5.2.0.tar.gz
|
libpreludedb-0.9.11.1.tar.gz
|
||||||
|
|||||||
@ -1,282 +0,0 @@
|
|||||||
Description: Add pkg-config file
|
|
||||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
|
||||||
Last-Update: Mon, 14 Aug 2017
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.ac | 1 +
|
|
||||||
m4/pkg.m4 | 199 +++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
src/Makefile.am | 5 +-
|
|
||||||
src/libpreludedb.pc.in | 13 ++++
|
|
||||||
4 files changed, 217 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100644 m4/pkg.m4
|
|
||||||
create mode 100644 src/libpreludedb.pc.in
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 9c7e026..f589aa1 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -333,6 +333,12 @@
|
|
||||||
AC_SUBST(sql_plugin_dir)
|
|
||||||
AC_SUBST(format_plugin_dir)
|
|
||||||
AC_SUBST(format_schema_dir)
|
|
||||||
+
|
|
||||||
+AC_SUBST(CFLAGS)
|
|
||||||
+AC_SUBST(CPPFLAGS)
|
|
||||||
+AC_SUBST(LDFLAGS)
|
|
||||||
+AC_SUBST(LIBPRELUDEDB_LIBS)
|
|
||||||
+AC_SUBST(LIBPRELUDEDB_CFLAGS)
|
|
||||||
AC_SUBST(LIBPRELUDEDB_VERSION)
|
|
||||||
AC_SUBST(LIBPRELUDEDB_MAJOR_VERSION)
|
|
||||||
AC_SUBST(LIBPRELUDEDB_MINOR_VERSION)
|
|
||||||
@@ -350,6 +350,7 @@ libmissing/Makefile
|
|
||||||
libmissing/tests/Makefile
|
|
||||||
|
|
||||||
src/Makefile
|
|
||||||
+src/libpreludedb.pc
|
|
||||||
src/include/Makefile
|
|
||||||
src/include/preludedb-version.h
|
|
||||||
|
|
||||||
diff --git a/m4/pkg.m4 b/m4/pkg.m4
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..f26f84c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/m4/pkg.m4
|
|
||||||
@@ -0,0 +1,199 @@
|
|
||||||
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
|
||||||
+# serial 1 (pkg-config-0.24)
|
|
||||||
+#
|
|
||||||
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
|
||||||
+#
|
|
||||||
+# This program is free software; you can redistribute it and/or modify
|
|
||||||
+# it under the terms of the GNU General Public License as published by
|
|
||||||
+# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+# (at your option) any later version.
|
|
||||||
+#
|
|
||||||
+# This program is distributed in the hope that it will be useful, but
|
|
||||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
+# General Public License for more details.
|
|
||||||
+#
|
|
||||||
+# You should have received a copy of the GNU General Public License
|
|
||||||
+# along with this program; if not, write to the Free Software
|
|
||||||
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
+#
|
|
||||||
+# As a special exception to the GNU General Public License, if you
|
|
||||||
+# distribute this file as part of a program that contains a
|
|
||||||
+# configuration script generated by Autoconf, you may include it under
|
|
||||||
+# the same distribution terms that you use for the rest of that program.
|
|
||||||
+
|
|
||||||
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
|
||||||
+# ----------------------------------
|
|
||||||
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
|
||||||
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
|
||||||
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
|
||||||
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
|
|
||||||
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
|
|
||||||
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
|
|
||||||
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
|
|
||||||
+
|
|
||||||
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
|
||||||
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
|
||||||
+fi
|
|
||||||
+if test -n "$PKG_CONFIG"; then
|
|
||||||
+ _pkg_min_version=m4_default([$1], [0.9.0])
|
|
||||||
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
|
|
||||||
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
|
|
||||||
+ AC_MSG_RESULT([yes])
|
|
||||||
+ else
|
|
||||||
+ AC_MSG_RESULT([no])
|
|
||||||
+ PKG_CONFIG=""
|
|
||||||
+ fi
|
|
||||||
+fi[]dnl
|
|
||||||
+])# PKG_PROG_PKG_CONFIG
|
|
||||||
+
|
|
||||||
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
|
||||||
+#
|
|
||||||
+# Check to see whether a particular set of modules exists. Similar
|
|
||||||
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
|
|
||||||
+#
|
|
||||||
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
+# only at the first occurence in configure.ac, so if the first place
|
|
||||||
+# it's called might be skipped (such as if it is within an "if", you
|
|
||||||
+# have to call PKG_CHECK_EXISTS manually
|
|
||||||
+# --------------------------------------------------------------
|
|
||||||
+AC_DEFUN([PKG_CHECK_EXISTS],
|
|
||||||
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
|
||||||
+if test -n "$PKG_CONFIG" && \
|
|
||||||
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
|
||||||
+ m4_default([$2], [:])
|
|
||||||
+m4_ifvaln([$3], [else
|
|
||||||
+ $3])dnl
|
|
||||||
+fi])
|
|
||||||
+
|
|
||||||
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
|
||||||
+# ---------------------------------------------
|
|
||||||
+m4_define([_PKG_CONFIG],
|
|
||||||
+[if test -n "$$1"; then
|
|
||||||
+ pkg_cv_[]$1="$$1"
|
|
||||||
+ elif test -n "$PKG_CONFIG"; then
|
|
||||||
+ PKG_CHECK_EXISTS([$3],
|
|
||||||
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
|
|
||||||
+ test "x$?" != "x0" && pkg_failed=yes ],
|
|
||||||
+ [pkg_failed=yes])
|
|
||||||
+ else
|
|
||||||
+ pkg_failed=untried
|
|
||||||
+fi[]dnl
|
|
||||||
+])# _PKG_CONFIG
|
|
||||||
+
|
|
||||||
+# _PKG_SHORT_ERRORS_SUPPORTED
|
|
||||||
+# -----------------------------
|
|
||||||
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
|
||||||
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
||||||
+ _pkg_short_errors_supported=yes
|
|
||||||
+else
|
|
||||||
+ _pkg_short_errors_supported=no
|
|
||||||
+fi[]dnl
|
|
||||||
+])# _PKG_SHORT_ERRORS_SUPPORTED
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
|
||||||
+# [ACTION-IF-NOT-FOUND])
|
|
||||||
+#
|
|
||||||
+#
|
|
||||||
+# Note that if there is a possibility the first call to
|
|
||||||
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
|
||||||
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
|
||||||
+#
|
|
||||||
+#
|
|
||||||
+# --------------------------------------------------------------
|
|
||||||
+AC_DEFUN([PKG_CHECK_MODULES],
|
|
||||||
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
|
||||||
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
|
||||||
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
|
||||||
+
|
|
||||||
+pkg_failed=no
|
|
||||||
+AC_MSG_CHECKING([for $1])
|
|
||||||
+
|
|
||||||
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
|
||||||
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
|
||||||
+
|
|
||||||
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
|
||||||
+and $1[]_LIBS to avoid the need to call pkg-config.
|
|
||||||
+See the pkg-config man page for more details.])
|
|
||||||
+
|
|
||||||
+if test $pkg_failed = yes; then
|
|
||||||
+ AC_MSG_RESULT([no])
|
|
||||||
+ _PKG_SHORT_ERRORS_SUPPORTED
|
|
||||||
+ if test $_pkg_short_errors_supported = yes; then
|
|
||||||
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
|
||||||
+ else
|
|
||||||
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
|
||||||
+ fi
|
|
||||||
+ # Put the nasty error message in config.log where it belongs
|
|
||||||
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
|
||||||
+
|
|
||||||
+ m4_default([$4], [AC_MSG_ERROR(
|
|
||||||
+[Package requirements ($2) were not met:
|
|
||||||
+
|
|
||||||
+$$1_PKG_ERRORS
|
|
||||||
+
|
|
||||||
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
||||||
+installed software in a non-standard prefix.
|
|
||||||
+
|
|
||||||
+_PKG_TEXT])[]dnl
|
|
||||||
+ ])
|
|
||||||
+elif test $pkg_failed = untried; then
|
|
||||||
+ AC_MSG_RESULT([no])
|
|
||||||
+ m4_default([$4], [AC_MSG_FAILURE(
|
|
||||||
+[The pkg-config script could not be found or is too old. Make sure it
|
|
||||||
+is in your PATH or set the PKG_CONFIG environment variable to the full
|
|
||||||
+path to pkg-config.
|
|
||||||
+
|
|
||||||
+_PKG_TEXT
|
|
||||||
+
|
|
||||||
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
|
||||||
+ ])
|
|
||||||
+else
|
|
||||||
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
|
||||||
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
|
||||||
+ AC_MSG_RESULT([yes])
|
|
||||||
+ $3
|
|
||||||
+fi[]dnl
|
|
||||||
+])# PKG_CHECK_MODULES
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+# PKG_INSTALLDIR(DIRECTORY)
|
|
||||||
+# -------------------------
|
|
||||||
+# Substitutes the variable pkgconfigdir as the location where a module
|
|
||||||
+# should install pkg-config .pc files. By default the directory is
|
|
||||||
+# $libdir/pkgconfig, but the default can be changed by passing
|
|
||||||
+# DIRECTORY. The user can override through the --with-pkgconfigdir
|
|
||||||
+# parameter.
|
|
||||||
+AC_DEFUN([PKG_INSTALLDIR],
|
|
||||||
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
|
|
||||||
+m4_pushdef([pkg_description],
|
|
||||||
+ [pkg-config installation directory @<:@]pkg_default[@:>@])
|
|
||||||
+AC_ARG_WITH([pkgconfigdir],
|
|
||||||
+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
|
|
||||||
+ [with_pkgconfigdir=]pkg_default)
|
|
||||||
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
|
|
||||||
+m4_popdef([pkg_default])
|
|
||||||
+m4_popdef([pkg_description])
|
|
||||||
+]) dnl PKG_INSTALLDIR
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
|
|
||||||
+# -------------------------
|
|
||||||
+# Substitutes the variable noarch_pkgconfigdir as the location where a
|
|
||||||
+# module should install arch-independent pkg-config .pc files. By
|
|
||||||
+# default the directory is $datadir/pkgconfig, but the default can be
|
|
||||||
+# changed by passing DIRECTORY. The user can override through the
|
|
||||||
+# --with-noarch-pkgconfigdir parameter.
|
|
||||||
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
|
|
||||||
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
|
|
||||||
+m4_pushdef([pkg_description],
|
|
||||||
+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
|
|
||||||
+AC_ARG_WITH([noarch-pkgconfigdir],
|
|
||||||
+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
|
|
||||||
+ [with_noarch_pkgconfigdir=]pkg_default)
|
|
||||||
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
|
|
||||||
+m4_popdef([pkg_default])
|
|
||||||
+m4_popdef([pkg_description])
|
|
||||||
+]) dnl PKG_NOARCH_INSTALLDIR
|
|
||||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
||||||
index 7b9accd..80df82c 100644
|
|
||||||
--- a/src/Makefile.am
|
|
||||||
+++ b/src/Makefile.am
|
|
||||||
@@ -31,8 +31,11 @@ AM_YFLAGS = -d
|
|
||||||
AM_LFLAGS = --header-file=preludedb-path-selection-parser.lex.h
|
|
||||||
LEX_OUTPUT_ROOT = lex._preludedbyy
|
|
||||||
|
|
||||||
+pkgconfigdir = $(libdir)/pkgconfig
|
|
||||||
+pkgconfig_DATA = libpreludedb.pc
|
|
||||||
+
|
|
||||||
noinst_HEADERS = preludedb-path-selection-parser.lex.h
|
|
||||||
-DISTCLEANFILES = preludedb-path-selection-parser.lex.h preludedb-path-selection-parser.lex.c preludedb-path-selection-parser.yac.h preludedb-path-selection-parser.yac.c
|
|
||||||
+DISTCLEANFILES = $(pkgconfig_DATA) preludedb-path-selection-parser.lex.h preludedb-path-selection-parser.lex.c preludedb-path-selection-parser.yac.h preludedb-path-selection-parser.yac.c
|
|
||||||
|
|
||||||
|
|
||||||
libpreludedb_la_SOURCES = \
|
|
||||||
diff --git a/src/libpreludedb.pc.in b/src/libpreludedb.pc.in
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..63eb32f
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/src/libpreludedb.pc.in
|
|
||||||
@@ -0,0 +1,13 @@
|
|
||||||
+prefix=@prefix@
|
|
||||||
+exec_prefix=@exec_prefix@
|
|
||||||
+libdir=@libdir@
|
|
||||||
+includedir=@includedir@
|
|
||||||
+
|
|
||||||
+threadlib=@LIBMULTITHREAD@
|
|
||||||
+
|
|
||||||
+Name: LibPreludeDB
|
|
||||||
+Description: The Prelude DB Library provide API for accessing IDMEF alerts.
|
|
||||||
+Version: @VERSION@
|
|
||||||
+Libs: -L${libdir} -lpreludedb
|
|
||||||
+Libs.private: @LIBPRELUDEDB_LIBS@ @LIBMULTITHREAD@
|
|
||||||
+Cflags: @LIBPRELUDEDB_CFLAGS@
|
|
||||||
--
|
|
||||||
2.13.3
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
Description: Clean libpreludedb-config
|
|
||||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
|
||||||
Last-Update: 2020-09-20
|
|
||||||
|
|
||||||
--- a/libpreludedb-config.in 2020-09-09 16:36:50.110000000 +0200
|
|
||||||
+++ b/libpreludedb-config.in 2020-09-20 23:30:02.097649400 +0200
|
|
||||||
@@ -3,6 +3,7 @@
|
|
||||||
prefix=@prefix@
|
|
||||||
exec_prefix=@exec_prefix@
|
|
||||||
exec_prefix_set=no
|
|
||||||
+cpp_set=no
|
|
||||||
want_cflags=no
|
|
||||||
want_libs=no
|
|
||||||
thread_set=no
|
|
||||||
@@ -54,6 +55,10 @@
|
|
||||||
echo @LIBPRELUDE_LDFLAGS@
|
|
||||||
;;
|
|
||||||
|
|
||||||
+ --c++)
|
|
||||||
+ cpp_set=yes
|
|
||||||
+ ;;
|
|
||||||
+
|
|
||||||
--libs)
|
|
||||||
want_libs=yes
|
|
||||||
;;
|
|
||||||
@@ -90,7 +95,14 @@
|
|
||||||
|
|
||||||
|
|
||||||
if test $want_libs = yes; then
|
|
||||||
- libdirs=-L@libdir@
|
|
||||||
+ libdirs=
|
|
||||||
+ if test @libdir@ != /usr/lib -a @libdir@ != /usr/lib64 ; then
|
|
||||||
+ libdirs=-L@libdir@
|
|
||||||
+ fi
|
|
||||||
+ cpplibs=""
|
|
||||||
+ if test $cpp_set = yes; then
|
|
||||||
+ cpplibs="-lpreludedbcpp"
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
if test $thread_set = yes; then
|
|
||||||
thrlibs=@LTLIBMULTITHREAD@
|
|
||||||
@@ -98,7 +110,7 @@
|
|
||||||
thrlibs=@LTLIBTHREAD@
|
|
||||||
fi
|
|
||||||
|
|
||||||
- echo $libdirs -lpreludedb @LIBPRELUDE_LIBS@ $thrlibs
|
|
||||||
+ echo $cpplibs $libdirs -lpreludedb $thrlibs
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
Description: Fix test-rwlock1 when --as-needed is the default.
|
|
||||||
Author: Michael Hudson-Doyle <michael.hudson@ubuntu.com>
|
|
||||||
Forwarded: no
|
|
||||||
Last-Update: 2018-07-25
|
|
||||||
---
|
|
||||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
|
||||||
--- a/libmissing/tests/test-rwlock1.c
|
|
||||||
+++ b/libmissing/tests/test-rwlock1.c
|
|
||||||
@@ -54,7 +54,10 @@
|
|
||||||
|
|
||||||
#define SUCCEED() exit (0)
|
|
||||||
#define FAILURE() exit (1)
|
|
||||||
-#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d\n", n), abort ())
|
|
||||||
+/* The pointless reference to errno below is to ensure that the test binary
|
|
||||||
+ * gets a DT_NEEDED for libpthread even if the link is done with --as-needed
|
|
||||||
+ * (which is the default in Ubuntu) */
|
|
||||||
+#define UNEXPECTED(n) (fprintf (stderr, "Unexpected outcome %d errno %d\n", n, errno), abort ())
|
|
||||||
|
|
||||||
/* The main thread creates the waiting writer and the requesting reader threads
|
|
||||||
in the default way; this guarantees that they have the same priority.
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
Description: Fix building with gtk-doc 1.32
|
|
||||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
|
||||||
Last-Update: 2019-09-13
|
|
||||||
|
|
||||||
--- a/docs/api/libpreludedb-docs.xml 2019-09-17 18:49:45.721227852 -0400
|
|
||||||
+++ b/docs/api/libpreludedb-docs.xml2 2019-09-30 04:06:36.973341933 -0400
|
|
||||||
@@ -26,10 +26,6 @@
|
|
||||||
<xi:include href="xml/preludedb-sql-settings.xml"/>
|
|
||||||
|
|
||||||
</chapter>
|
|
||||||
- <chapter id="object-tree">
|
|
||||||
- <title>Object Hierarchy</title>
|
|
||||||
- <xi:include href="xml/tree_index.sgml"/>
|
|
||||||
- </chapter>
|
|
||||||
<index id="api-index-full">
|
|
||||||
<title>API Index</title>
|
|
||||||
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- ./bindings/python/_preludedb.cxx 2019-07-13 08:39:59.744285379 +0200
|
|
||||||
+++ ./bindings/python/_preludedb.cxx 2019-07-13 08:41:47.364117843 +0200
|
|
||||||
@@ -3133,7 +3133,7 @@
|
|
||||||
|
|
||||||
SWIGINTERN void
|
|
||||||
SwigPyStaticVar_dealloc(PyDescrObject *descr) {
|
|
||||||
- _PyObject_GC_UNTRACK(descr);
|
|
||||||
+ PyObject_GC_UnTrack(descr);
|
|
||||||
Py_XDECREF(PyDescr_TYPE(descr));
|
|
||||||
Py_XDECREF(PyDescr_NAME(descr));
|
|
||||||
PyObject_GC_Del(descr);
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
Description: Fix libmissing thread create test
|
|
||||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
|
||||||
Last-Update: 2019-10-11
|
|
||||||
|
|
||||||
--- a/libmissing/tests/test-thread_create.c 2019-09-17 19:29:40.129501083 -0400
|
|
||||||
+++ b/libmissing/tests/test-thread_create.c 2019-10-11 17:32:48.182372602 -0400
|
|
||||||
@@ -68,7 +68,7 @@
|
|
||||||
else
|
|
||||||
{
|
|
||||||
#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
|
|
||||||
- fputs ("glthread_create failed\n", stderr);
|
|
||||||
+ fprintf (stderr, "glthread_create failed with errno %d\n", errno);
|
|
||||||
return 1;
|
|
||||||
#else
|
|
||||||
fputs ("Skipping test: multithreading not enabled\n", stderr);
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
Description: Force preludedb-admin to use python3
|
|
||||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
|
||||||
Last-Update: 2019-09-20
|
|
||||||
|
|
||||||
--- a/preludedb-admin 2019-09-17 19:29:40.157500525 -0400
|
|
||||||
+++ b/preludedb-admin 2019-09-22 08:41:53.217541434 -0400
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/env python
|
|
||||||
+#!/usr/bin/env python3
|
|
||||||
#
|
|
||||||
# Copyright (C) 2019-2020 CS GROUP - France. All Rights Reserved.
|
|
||||||
# Author: Yoann Vandoorselaere <yoannv@gmail.com>
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
--- ./bindings/c++/Makefile.in 2016-09-15 08:59:47.230000884 +0200
|
|
||||||
+++ ./bindings/c++/Makefile.in.n 2017-01-10 22:40:52.430934642 +0100
|
|
||||||
@@ -986,7 +986,7 @@
|
|
||||||
@HAVE_EASY_BINDINGS_TRUE@lib_LTLIBRARIES = libpreludedbcpp.la
|
|
||||||
@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_ladir = ${prefix}/lib
|
|
||||||
@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_SOURCES = preludedb.cxx preludedb-sql.cxx preludedb-error.cxx
|
|
||||||
-@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDEDBCPP_SONAME@
|
|
||||||
+@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDEDBCPP_SONAME@ @LIBPRELUDE_LDFLAGS@ @LIBPRELUDECPP_LDFLAGS@
|
|
||||||
@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_LIBADD = $(top_builddir)/src/.libs/libpreludedb.la
|
|
||||||
@HAVE_EASY_BINDINGS_TRUE@libpreludedbcpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include @LIBPRELUDE_CFLAGS@
|
|
||||||
all: all-recursive
|
|
||||||
--- ./configure 2016-09-15 08:59:45.293000884 +0200
|
|
||||||
+++ ./configure 2017-01-11 07:17:38.116104467 +0100
|
|
||||||
@@ -1450,6 +1450,7 @@
|
|
||||||
LIBPRELUDE_PREFIX
|
|
||||||
LIBPRELUDE_LIBS
|
|
||||||
LIBPRELUDE_LDFLAGS
|
|
||||||
+LIBPRELUDECPP_LDFLAGS
|
|
||||||
LIBPRELUDE_PTHREAD_CFLAGS
|
|
||||||
LIBPRELUDE_CFLAGS
|
|
||||||
LIBPRELUDE_CONFIG
|
|
||||||
@@ -17062,6 +17063,7 @@
|
|
||||||
else
|
|
||||||
LIBPRELUDE_CFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --cflags`
|
|
||||||
LIBPRELUDE_LDFLAGS=`$LIBPRELUDE_CONFIG $libprelude_config_args --ldflags`
|
|
||||||
+ LIBPRELUDECPP_LDFLAGS='-lpreludecpp'
|
|
||||||
LIBPRELUDE_LIBS=`$LIBPRELUDE_CONFIG $libprelude_config_args --libs`
|
|
||||||
LIBPRELUDE_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --prefix`
|
|
||||||
LIBPRELUDE_CONFIG_PREFIX=`$LIBPRELUDE_CONFIG $libprelude_config_args --config-prefix`
|
|
||||||
@ -1,548 +0,0 @@
|
|||||||
Description: Update m4/ax_lib_postgresql.m4 #892868
|
|
||||||
Author: Thomas Andrejak <thomas.andrejak@gmail.com>
|
|
||||||
Last-Update: 2019-09-20
|
|
||||||
|
|
||||||
--- a/m4/ax_lib_postgresql.m4 2019-09-17 18:49:46.185218603 -0400
|
|
||||||
+++ b/m4/ax_lib_postgresql.m4 2019-09-22 09:09:22.356777373 -0400
|
|
||||||
@@ -1,10 +1,10 @@
|
|
||||||
# ===========================================================================
|
|
||||||
-# http://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
|
|
||||||
+# https://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html
|
|
||||||
# ===========================================================================
|
|
||||||
#
|
|
||||||
# SYNOPSIS
|
|
||||||
#
|
|
||||||
-# AX_LIB_POSTGRESQL([MINIMUM-VERSION])
|
|
||||||
+# AX_LIB_POSTGRESQL([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
|
|
||||||
#
|
|
||||||
# DESCRIPTION
|
|
||||||
#
|
|
||||||
@@ -23,133 +23,225 @@
|
|
||||||
# should be in the PATH)
|
|
||||||
#
|
|
||||||
# path - complete path to pg_config utility, use this option if pg_config
|
|
||||||
-# can't be found in the PATH
|
|
||||||
+# can't be found in the PATH (You could set also PG_CONFIG variable)
|
|
||||||
#
|
|
||||||
# This macro calls:
|
|
||||||
#
|
|
||||||
-# AC_SUBST(POSTGRESQL_CFLAGS)
|
|
||||||
+# AC_SUBST(POSTGRESQL_CPPFLAGS)
|
|
||||||
# AC_SUBST(POSTGRESQL_LDFLAGS)
|
|
||||||
+# AC_SUBST(POSTGRESQL_LIBS)
|
|
||||||
# AC_SUBST(POSTGRESQL_VERSION)
|
|
||||||
#
|
|
||||||
# And sets:
|
|
||||||
#
|
|
||||||
# HAVE_POSTGRESQL
|
|
||||||
#
|
|
||||||
+# It execute if found ACTION-IF-FOUND (empty by default) and
|
|
||||||
+# ACTION-IF-NOT-FOUND (AC_MSG_FAILURE by default) if not found.
|
|
||||||
+#
|
|
||||||
# LICENSE
|
|
||||||
#
|
|
||||||
# Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
|
|
||||||
+# Copyright (c) 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
|
|
||||||
+# Copyright (c) 2018 Bastien Roucaries <rouca@debian.org>
|
|
||||||
#
|
|
||||||
# Copying and distribution of this file, with or without modification, are
|
|
||||||
# permitted in any medium without royalty provided the copyright notice
|
|
||||||
# and this notice are preserved. This file is offered as-is, without any
|
|
||||||
# warranty.
|
|
||||||
|
|
||||||
-#serial 9
|
|
||||||
+#serial 22
|
|
||||||
+
|
|
||||||
+AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
|
|
||||||
+ found_postgresql="no"
|
|
||||||
+ _AX_LIB_POSTGRESQL_OLD_fail="no"
|
|
||||||
+ while true; do
|
|
||||||
+ AC_CACHE_CHECK([for the pg_config program], [ac_cv_path_PG_CONFIG],
|
|
||||||
+ [AC_PATH_PROGS_FEATURE_CHECK([PG_CONFIG], [pg_config],
|
|
||||||
+ [[ac_cv_path_PG_CONFIG="";$ac_path_PG_CONFIG --includedir > /dev/null \
|
|
||||||
+ && ac_cv_path_PG_CONFIG=$ac_path_PG_CONFIG ac_path_PG_CONFIG_found=:]],
|
|
||||||
+ [ac_cv_path_PG_CONFIG=""])])
|
|
||||||
+ PG_CONFIG=$ac_cv_path_PG_CONFIG
|
|
||||||
+ AS_IF([test "X$PG_CONFIG" = "X"],[break])
|
|
||||||
+
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
|
|
||||||
+ [ac_cv_POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
|
|
||||||
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
|
|
||||||
+ POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
|
|
||||||
+
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
|
|
||||||
+ [ac_cv_POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" || _AX_LIB_POSTGRESQL_OLD_fail=yes])
|
|
||||||
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
|
|
||||||
+ POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
|
|
||||||
+
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
|
|
||||||
+ [ac_cv_POSTGRESQL_LIBS="-lpq"])
|
|
||||||
+ POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
|
|
||||||
+
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
|
|
||||||
+ [
|
|
||||||
+ ac_cv_POSTGRESQL_VERSION=`$PG_CONFIG --version | sed "s/^PostgreSQL[[[:space:]]][[[:space:]]]*\([[0-9.]][[0-9.]]*\).*/\1/"` \
|
|
||||||
+ || _AX_LIB_POSTGRESQL_OLD_fail=yes
|
|
||||||
+ ])
|
|
||||||
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_OLD_fail" = "Xyes"],[break])
|
|
||||||
+ POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ dnl
|
|
||||||
+ dnl Check if required version of PostgreSQL is available
|
|
||||||
+ dnl
|
|
||||||
+ AS_IF([test X"$postgresql_version_req" != "X"],[
|
|
||||||
+ AC_MSG_CHECKING([if PostgreSQL version $POSTGRESQL_VERSION is >= $postgresql_version_req])
|
|
||||||
+ AX_COMPARE_VERSION([$POSTGRESQL_VERSION],[ge],[$postgresql_version_req],
|
|
||||||
+ [found_postgresql_req_version=yes],[found_postgresql_req_version=no])
|
|
||||||
+ AC_MSG_RESULT([$found_postgresql_req_version])
|
|
||||||
+ ])
|
|
||||||
+ AS_IF([test "Xfound_postgresql_req_version" = "Xno"],[break])
|
|
||||||
+
|
|
||||||
+ found_postgresql="yes"
|
|
||||||
+ break
|
|
||||||
+ done
|
|
||||||
+])
|
|
||||||
+
|
|
||||||
+AC_DEFUN([_AX_LIB_POSTGRESQL_PKG_CONFIG],
|
|
||||||
+[
|
|
||||||
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
|
||||||
+ found_postgresql=no
|
|
||||||
+
|
|
||||||
+ while true; do
|
|
||||||
+ PKG_PROG_PKG_CONFIG
|
|
||||||
+ AS_IF([test X$PKG_CONFIG = X],[break])
|
|
||||||
+
|
|
||||||
+ _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=no;
|
|
||||||
+ AS_IF([test "X$postgresql_version_req" = "X"],
|
|
||||||
+ [PKG_CHECK_EXISTS([libpq],[found_postgresql_pkg_config=yes],[found_postgresql=no])],
|
|
||||||
+ [PKG_CHECK_EXISTS([libpq >= "$postgresql_version_req"],
|
|
||||||
+ [found_postgresql=yes],[found_postgresql=no])])
|
|
||||||
+ AS_IF([test "X$found_postgresql" = "no"],[break])
|
|
||||||
+
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL libraries CPPFLAGS],[ac_cv_POSTGRESQL_CPPFLAGS],
|
|
||||||
+ [ac_cv_POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags-only-I`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
|
|
||||||
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
|
|
||||||
+ POSTGRESQL_CPPFLAGS="$ac_cv_POSTGRESQL_CPPFLAGS"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL libraries LDFLAGS],[ac_cv_POSTGRESQL_LDFLAGS],
|
|
||||||
+ [ac_cv_POSTGRESQL_LDFLAGS="`$PKG_CONFIG libpq --libs-only-L --libs-only-other`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
|
|
||||||
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
|
|
||||||
+ POSTGRESQL_LDFLAGS="$ac_cv_POSTGRESQL_LDFLAGS"
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL libraries LIBS],[ac_cv_POSTGRESQL_LIBS],
|
|
||||||
+ [ac_cv_POSTGRESQL_LIBS="`$PKG_CONFIG libpq --libs-only-l`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=ye])
|
|
||||||
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
|
|
||||||
+ POSTGRESQL_LIBS="$ac_cv_POSTGRESQL_LIBS"
|
|
||||||
+
|
|
||||||
+ dnl already checked by exist but need to be recovered
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL version],[ac_cv_POSTGRESQL_VERSION],
|
|
||||||
+ [ac_cv_POSTGRESQL_VERSION="`$PKG_CONFIG libpq --modversion`" || _AX_LIB_POSTGRESQL_PKG_CONFIG_fail=yes])
|
|
||||||
+ AS_IF([test "X$_AX_LIB_POSTGRESQL_PKG_CONFIG_fail" = "Xyes"],[break])
|
|
||||||
+ POSTGRESQL_VERSION="$ac_cv_POSTGRESQL_VERSION"
|
|
||||||
+
|
|
||||||
+ found_postgresql=yes
|
|
||||||
+ break;
|
|
||||||
+ done
|
|
||||||
+
|
|
||||||
+])
|
|
||||||
+
|
|
||||||
+
|
|
||||||
|
|
||||||
AC_DEFUN([AX_LIB_POSTGRESQL],
|
|
||||||
[
|
|
||||||
AC_ARG_WITH([postgresql],
|
|
||||||
- AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
|
|
||||||
- [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
|
|
||||||
- ),
|
|
||||||
- [
|
|
||||||
- if test "$withval" = "no"; then
|
|
||||||
- want_postgresql="no"
|
|
||||||
- elif test "$withval" = "yes"; then
|
|
||||||
- want_postgresql="yes"
|
|
||||||
- else
|
|
||||||
- want_postgresql="yes"
|
|
||||||
- PG_CONFIG="$withval"
|
|
||||||
- fi
|
|
||||||
- ],
|
|
||||||
- [want_postgresql="yes"]
|
|
||||||
+ AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@],
|
|
||||||
+ [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config]
|
|
||||||
+ ),
|
|
||||||
+ [
|
|
||||||
+ AS_CASE([$withval],
|
|
||||||
+ [[[nN]][[oO]]],[want_postgresql="no"],
|
|
||||||
+ [[[yY]][[eE]][[sS]]],[want_postgresql="yes"],
|
|
||||||
+ [
|
|
||||||
+ want_postgresql="yes"
|
|
||||||
+ PG_CONFIG="$withval"
|
|
||||||
+ ])
|
|
||||||
+ ],
|
|
||||||
+ [want_postgresql="yes"]
|
|
||||||
)
|
|
||||||
|
|
||||||
- POSTGRESQL_CFLAGS=""
|
|
||||||
- POSTGRESQL_LDFLAGS=""
|
|
||||||
- POSTGRESQL_VERSION=""
|
|
||||||
+ AC_ARG_VAR([POSTGRESQL_CPPFLAGS],[cpp flags for PostgreSQL overriding detected flags])
|
|
||||||
+ AC_ARG_VAR([POSTGRESQL_LIBFLAGS],[libs for PostgreSQL overriding detected flags])
|
|
||||||
+ AC_ARG_VAR([POSTGRESQL_LDFLAGS],[linker flags for PostgreSQL overriding detected flags])
|
|
||||||
+
|
|
||||||
+ # populate cache
|
|
||||||
+ AS_IF([test "X$POSTGRESQL_CPPFLAGS" != X],[ac_cv_POSTGRESQL_CPPFLAGS="$POSTGRESQL_CPPFLAGS"])
|
|
||||||
+ AS_IF([test "X$POSTGRESQL_LDFLAGS" != X],[ac_cv_POSTGRESQL_LDFLAGS="$POSTGRESQL_LDFLAGS"])
|
|
||||||
+ AS_IF([test "X$POSTGRESQL_LIBS" != X],[ac_cv_POSTGRESQL_LIBS="$POSTGRESQL_LIBS"])
|
|
||||||
|
|
||||||
- dnl
|
|
||||||
- dnl Check PostgreSQL libraries (libpq)
|
|
||||||
- dnl
|
|
||||||
+ postgresql_version_req=ifelse([$1], [], [], [$1])
|
|
||||||
+ found_postgresql="no"
|
|
||||||
|
|
||||||
- if test "$want_postgresql" = "yes"; then
|
|
||||||
- AC_MSG_CHECKING([for $PG_CONFIG])
|
|
||||||
- if test -z "$PG_CONFIG" -o test; then
|
|
||||||
- AC_PATH_PROG([PG_CONFIG], [pg_config], [])
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- if test ! -x "$PG_CONFIG"; then
|
|
||||||
- AC_MSG_RESULT([$PG_CONFIG does not exist or it is not an exectuable file])
|
|
||||||
- PG_CONFIG="no"
|
|
||||||
- found_postgresql="no"
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- if test "$PG_CONFIG" != "no"; then
|
|
||||||
- AC_MSG_CHECKING([for PostgreSQL libraries])
|
|
||||||
-
|
|
||||||
- POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
|
|
||||||
- POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir` -lpq"
|
|
||||||
-
|
|
||||||
- POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'`
|
|
||||||
-
|
|
||||||
- AC_DEFINE([HAVE_POSTGRESQL], [1],
|
|
||||||
- [Define to 1 if PostgreSQL libraries are available])
|
|
||||||
-
|
|
||||||
- found_postgresql="yes"
|
|
||||||
- AC_MSG_RESULT([yes])
|
|
||||||
- else
|
|
||||||
- found_postgresql="no"
|
|
||||||
- AC_MSG_RESULT([no])
|
|
||||||
- fi
|
|
||||||
- fi
|
|
||||||
+ POSTGRESQL_VERSION=""
|
|
||||||
|
|
||||||
dnl
|
|
||||||
- dnl Check if required version of PostgreSQL is available
|
|
||||||
+ dnl Check PostgreSQL libraries (libpq)
|
|
||||||
dnl
|
|
||||||
+ AS_IF([test X"$want_postgresql" = "Xyes"],[
|
|
||||||
+ _AX_LIB_POSTGRESQL_PKG_CONFIG
|
|
||||||
|
|
||||||
|
|
||||||
- postgresql_version_req=ifelse([$1], [], [], [$1])
|
|
||||||
-
|
|
||||||
- if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then
|
|
||||||
-
|
|
||||||
- AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req])
|
|
||||||
+ AS_IF([test X"$found_postgresql" = "Xno"],
|
|
||||||
+ [_AX_LIB_POSTGRESQL_OLD])
|
|
||||||
|
|
||||||
- dnl Decompose required version string of PostgreSQL
|
|
||||||
- dnl and calculate its number representation
|
|
||||||
- postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'`
|
|
||||||
- postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
|
|
||||||
- postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
|
|
||||||
- if test "x$postgresql_version_req_micro" = "x"; then
|
|
||||||
- postgresql_version_req_micro="0"
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \
|
|
||||||
- \+ $postgresql_version_req_minor \* 1000 \
|
|
||||||
- \+ $postgresql_version_req_micro`
|
|
||||||
-
|
|
||||||
- dnl Decompose version string of installed PostgreSQL
|
|
||||||
- dnl and calculate its number representation
|
|
||||||
- postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'`
|
|
||||||
- postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
|
|
||||||
- postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
|
|
||||||
- if test "x$postgresql_version_micro" = "x"; then
|
|
||||||
- postgresql_version_micro="0"
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
- postgresql_version_number=`expr $postgresql_version_major \* 1000000 \
|
|
||||||
- \+ $postgresql_version_minor \* 1000 \
|
|
||||||
- \+ $postgresql_version_micro`
|
|
||||||
-
|
|
||||||
- postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number`
|
|
||||||
- if test "$postgresql_version_check" = "1"; then
|
|
||||||
- AC_MSG_RESULT([yes])
|
|
||||||
- else
|
|
||||||
- AC_MSG_RESULT([no])
|
|
||||||
- fi
|
|
||||||
- fi
|
|
||||||
+ AS_IF([test X"$found_postgresql" = Xyes],[
|
|
||||||
+ _AX_LIB_POSTGRESQL_OLD_CPPFLAGS="$CPPFLAGS"
|
|
||||||
+ CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS"
|
|
||||||
+ _AX_LIB_POSTGRESQL_OLD_LDFLAGS="$LDFLAGS"
|
|
||||||
+ LDFLAGS="$LDFLAGS $POSTGRESQL_LDFLAGS"
|
|
||||||
+ _AX_LIB_POSTGRESQL_OLD_LIBS="$LIBS"
|
|
||||||
+ LIBS="$LIBS $POSTGRESQL_LIBS"
|
|
||||||
+ while true; do
|
|
||||||
+ dnl try to compile
|
|
||||||
+ AC_CHECK_HEADER([libpq-fe.h],[],[found_postgresql=no])
|
|
||||||
+ AS_IF([test "X$found_postgresql" = "Xno"],[break])
|
|
||||||
+ dnl try now to link
|
|
||||||
+ AC_CACHE_CHECK([for the PostgreSQL library linking is working],[ac_cv_postgresql_found],
|
|
||||||
+ [
|
|
||||||
+ AC_LINK_IFELSE([
|
|
||||||
+ AC_LANG_PROGRAM(
|
|
||||||
+ [
|
|
||||||
+ #include <libpq-fe.h>
|
|
||||||
+ ],
|
|
||||||
+ [[
|
|
||||||
+ char conninfo[]="dbname = postgres";
|
|
||||||
+ PGconn *conn;
|
|
||||||
+ conn = PQconnectdb(conninfo);
|
|
||||||
+ ]]
|
|
||||||
+ )
|
|
||||||
+ ],[ac_cv_postgresql_found=yes],
|
|
||||||
+ [ac_cv_postgresql_found=no])
|
|
||||||
+ ])
|
|
||||||
+ found_postgresql="$ac_cv_postgresql_found"
|
|
||||||
+ AS_IF([test "X$found_postgresql" = "Xno"],[break])
|
|
||||||
+ break
|
|
||||||
+ done
|
|
||||||
+ CPPFLAGS="$_AX_LIB_POSTGRESQL_OLD_CPPFLAGS"
|
|
||||||
+ LDFLAGS="$_AX_LIB_POSTGRESQL_OLD_LDFLAGS"
|
|
||||||
+ LIBS="$_AX_LIB_POSTGRESQL_OLD_LIBS"
|
|
||||||
+ ])
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ AS_IF([test "x$found_postgresql" = "xyes"],[
|
|
||||||
+ AC_DEFINE([HAVE_POSTGRESQL], [1],
|
|
||||||
+ [Define to 1 if PostgreSQL libraries are available])])
|
|
||||||
+ ])
|
|
||||||
|
|
||||||
AC_SUBST([POSTGRESQL_VERSION])
|
|
||||||
- AC_SUBST([POSTGRESQL_CFLAGS])
|
|
||||||
+ AC_SUBST([POSTGRESQL_CPPFLAGS])
|
|
||||||
AC_SUBST([POSTGRESQL_LDFLAGS])
|
|
||||||
+ AC_SUBST([POSTGRESQL_LIBS])
|
|
||||||
+
|
|
||||||
+ AS_IF([test "x$found_postgresql" = "xyes"],
|
|
||||||
+ [ifelse([$2], , :, [$2])],
|
|
||||||
+ [ifelse([$3], , AS_IF([test X"$want_postgresql" = "Xyes"],[AC_MSG_ERROR([Library requirements (PostgreSQL) not met.])],[:]), [$3])])
|
|
||||||
+
|
|
||||||
])
|
|
||||||
--- a/configure.ac 2019-09-17 19:29:40.041502837 -0400
|
|
||||||
+++ b/configure.ac 2019-09-22 09:28:50.905561338 -0400
|
|
||||||
@@ -158,7 +158,7 @@
|
|
||||||
dnl ********************************************************
|
|
||||||
dnl * Check for the PostgreSQL library (PostgreSQL plugin) *
|
|
||||||
dnl ********************************************************
|
|
||||||
-AX_LIB_POSTGRESQL()
|
|
||||||
+AX_LIB_POSTGRESQL([9.0])
|
|
||||||
|
|
||||||
with_pgsql="no"
|
|
||||||
if test x$POSTGRESQL_VERSION != x; then
|
|
||||||
--- /dev/null 2019-09-21 09:30:35.976000000 -0400
|
|
||||||
+++ b/m4/ax_compare_version.m4 2019-09-22 09:56:48.116239566 -0400
|
|
||||||
@@ -0,0 +1,177 @@
|
|
||||||
+# ===========================================================================
|
|
||||||
+# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
|
|
||||||
+# ===========================================================================
|
|
||||||
+#
|
|
||||||
+# SYNOPSIS
|
|
||||||
+#
|
|
||||||
+# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
|
|
||||||
+#
|
|
||||||
+# DESCRIPTION
|
|
||||||
+#
|
|
||||||
+# This macro compares two version strings. Due to the various number of
|
|
||||||
+# minor-version numbers that can exist, and the fact that string
|
|
||||||
+# comparisons are not compatible with numeric comparisons, this is not
|
|
||||||
+# necessarily trivial to do in a autoconf script. This macro makes doing
|
|
||||||
+# these comparisons easy.
|
|
||||||
+#
|
|
||||||
+# The six basic comparisons are available, as well as checking equality
|
|
||||||
+# limited to a certain number of minor-version levels.
|
|
||||||
+#
|
|
||||||
+# The operator OP determines what type of comparison to do, and can be one
|
|
||||||
+# of:
|
|
||||||
+#
|
|
||||||
+# eq - equal (test A == B)
|
|
||||||
+# ne - not equal (test A != B)
|
|
||||||
+# le - less than or equal (test A <= B)
|
|
||||||
+# ge - greater than or equal (test A >= B)
|
|
||||||
+# lt - less than (test A < B)
|
|
||||||
+# gt - greater than (test A > B)
|
|
||||||
+#
|
|
||||||
+# Additionally, the eq and ne operator can have a number after it to limit
|
|
||||||
+# the test to that number of minor versions.
|
|
||||||
+#
|
|
||||||
+# eq0 - equal up to the length of the shorter version
|
|
||||||
+# ne0 - not equal up to the length of the shorter version
|
|
||||||
+# eqN - equal up to N sub-version levels
|
|
||||||
+# neN - not equal up to N sub-version levels
|
|
||||||
+#
|
|
||||||
+# When the condition is true, shell commands ACTION-IF-TRUE are run,
|
|
||||||
+# otherwise shell commands ACTION-IF-FALSE are run. The environment
|
|
||||||
+# variable 'ax_compare_version' is always set to either 'true' or 'false'
|
|
||||||
+# as well.
|
|
||||||
+#
|
|
||||||
+# Examples:
|
|
||||||
+#
|
|
||||||
+# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
|
|
||||||
+# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
|
|
||||||
+#
|
|
||||||
+# would both be true.
|
|
||||||
+#
|
|
||||||
+# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
|
|
||||||
+# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
|
|
||||||
+#
|
|
||||||
+# would both be false.
|
|
||||||
+#
|
|
||||||
+# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
|
|
||||||
+#
|
|
||||||
+# would be true because it is only comparing two minor versions.
|
|
||||||
+#
|
|
||||||
+# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
|
|
||||||
+#
|
|
||||||
+# would be true because it is only comparing the lesser number of minor
|
|
||||||
+# versions of the two values.
|
|
||||||
+#
|
|
||||||
+# Note: The characters that separate the version numbers do not matter. An
|
|
||||||
+# empty string is the same as version 0. OP is evaluated by autoconf, not
|
|
||||||
+# configure, so must be a string, not a variable.
|
|
||||||
+#
|
|
||||||
+# The author would like to acknowledge Guido Draheim whose advice about
|
|
||||||
+# the m4_case and m4_ifvaln functions make this macro only include the
|
|
||||||
+# portions necessary to perform the specific comparison specified by the
|
|
||||||
+# OP argument in the final configure script.
|
|
||||||
+#
|
|
||||||
+# LICENSE
|
|
||||||
+#
|
|
||||||
+# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
|
|
||||||
+#
|
|
||||||
+# Copying and distribution of this file, with or without modification, are
|
|
||||||
+# permitted in any medium without royalty provided the copyright notice
|
|
||||||
+# and this notice are preserved. This file is offered as-is, without any
|
|
||||||
+# warranty.
|
|
||||||
+
|
|
||||||
+#serial 13
|
|
||||||
+
|
|
||||||
+dnl #########################################################################
|
|
||||||
+AC_DEFUN([AX_COMPARE_VERSION], [
|
|
||||||
+ AC_REQUIRE([AC_PROG_AWK])
|
|
||||||
+
|
|
||||||
+ # Used to indicate true or false condition
|
|
||||||
+ ax_compare_version=false
|
|
||||||
+
|
|
||||||
+ # Convert the two version strings to be compared into a format that
|
|
||||||
+ # allows a simple string comparison. The end result is that a version
|
|
||||||
+ # string of the form 1.12.5-r617 will be converted to the form
|
|
||||||
+ # 0001001200050617. In other words, each number is zero padded to four
|
|
||||||
+ # digits, and non digits are removed.
|
|
||||||
+ AS_VAR_PUSHDEF([A],[ax_compare_version_A])
|
|
||||||
+ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
|
|
||||||
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
|
|
||||||
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
|
||||||
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
|
||||||
+ -e 's/[[^0-9]]//g'`
|
|
||||||
+
|
|
||||||
+ AS_VAR_PUSHDEF([B],[ax_compare_version_B])
|
|
||||||
+ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
|
|
||||||
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
|
|
||||||
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
|
||||||
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
|
|
||||||
+ -e 's/[[^0-9]]//g'`
|
|
||||||
+
|
|
||||||
+ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
|
|
||||||
+ dnl # then the first line is used to determine if the condition is true.
|
|
||||||
+ dnl # The sed right after the echo is to remove any indented white space.
|
|
||||||
+ m4_case(m4_tolower($2),
|
|
||||||
+ [lt],[
|
|
||||||
+ ax_compare_version=`echo "x$A
|
|
||||||
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
|
|
||||||
+ ],
|
|
||||||
+ [gt],[
|
|
||||||
+ ax_compare_version=`echo "x$A
|
|
||||||
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
|
|
||||||
+ ],
|
|
||||||
+ [le],[
|
|
||||||
+ ax_compare_version=`echo "x$A
|
|
||||||
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
|
|
||||||
+ ],
|
|
||||||
+ [ge],[
|
|
||||||
+ ax_compare_version=`echo "x$A
|
|
||||||
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
|
|
||||||
+ ],[
|
|
||||||
+ dnl Split the operator from the subversion count if present.
|
|
||||||
+ m4_bmatch(m4_substr($2,2),
|
|
||||||
+ [0],[
|
|
||||||
+ # A count of zero means use the length of the shorter version.
|
|
||||||
+ # Determine the number of characters in A and B.
|
|
||||||
+ ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
|
|
||||||
+ ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
|
|
||||||
+
|
|
||||||
+ # Set A to no more than B's length and B to no more than A's length.
|
|
||||||
+ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
|
|
||||||
+ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
|
|
||||||
+ ],
|
|
||||||
+ [[0-9]+],[
|
|
||||||
+ # A count greater than zero means use only that many subversions
|
|
||||||
+ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
|
|
||||||
+ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
|
|
||||||
+ ],
|
|
||||||
+ [.+],[
|
|
||||||
+ AC_WARNING(
|
|
||||||
+ [invalid OP numeric parameter: $2])
|
|
||||||
+ ],[])
|
|
||||||
+
|
|
||||||
+ # Pad zeros at end of numbers to make same length.
|
|
||||||
+ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
|
|
||||||
+ B="$B`echo $A | sed 's/./0/g'`"
|
|
||||||
+ A="$ax_compare_version_tmp_A"
|
|
||||||
+
|
|
||||||
+ # Check for equality or inequality as necessary.
|
|
||||||
+ m4_case(m4_tolower(m4_substr($2,0,2)),
|
|
||||||
+ [eq],[
|
|
||||||
+ test "x$A" = "x$B" && ax_compare_version=true
|
|
||||||
+ ],
|
|
||||||
+ [ne],[
|
|
||||||
+ test "x$A" != "x$B" && ax_compare_version=true
|
|
||||||
+ ],[
|
|
||||||
+ AC_WARNING([invalid OP parameter: $2])
|
|
||||||
+ ])
|
|
||||||
+ ])
|
|
||||||
+
|
|
||||||
+ AS_VAR_POPDEF([A])dnl
|
|
||||||
+ AS_VAR_POPDEF([B])dnl
|
|
||||||
+
|
|
||||||
+ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
|
|
||||||
+ if test "$ax_compare_version" = "true" ; then
|
|
||||||
+ m4_ifvaln([$4],[$4],[:])dnl
|
|
||||||
+ m4_ifvaln([$5],[else $5])dnl
|
|
||||||
+ fi
|
|
||||||
+]) dnl AX_COMPARE_VERSION
|
|
||||||
--- a/configure.ac 2019-09-17 19:29:40.041502837 -0400
|
|
||||||
+++ b/configure.ac 2019-09-22 10:13:22.432485117 -0400
|
|
||||||
@@ -170,7 +170,7 @@
|
|
||||||
LIBS=$LIBS_bkp;
|
|
||||||
|
|
||||||
CPPFLAGS_bkp=$CPPFLAGS
|
|
||||||
- CPPFLAGS="$POSTGRESQL_CFLAGS"
|
|
||||||
+ CPPFLAGS="$POSTGRESQL_CPPFLAGS"
|
|
||||||
AC_CHECK_HEADER(libpq-fe.h, with_pgsql=yes, with_pgsql=no)
|
|
||||||
CPPFLAGS=$CPPFLAGS_bkp;
|
|
||||||
fi
|
|
||||||
--- a/plugins/sql/pgsql/Makefile.am 2019-09-17 18:49:46.257217168 -0400
|
|
||||||
+++ b/plugins/sql/pgsql/Makefile.am 2019-09-22 10:15:40.613739821 -0400
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CFLAGS@
|
|
||||||
+AM_CPPFLAGS=@PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CPPFLAGS@
|
|
||||||
pgsql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@
|
|
||||||
|
|
||||||
if HAVE_PGSQL
|
|
||||||
50
libpreludedb-x86_64-sqlite3.patch
Normal file
50
libpreludedb-x86_64-sqlite3.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
--- libpreludedb-0.9.11/configure.in.lib64 2006-12-21 02:51:35.000000000 +0900
|
||||||
|
+++ libpreludedb-0.9.11/configure.in 2007-01-02 00:54:27.000000000 +0900
|
||||||
|
@@ -212,7 +212,10 @@
|
||||||
|
for dir in $default_path; do
|
||||||
|
AC_CHECK_FILE($dir/lib/libsqlite3.so, SQLITE3_LIBS="-L$dir -lsqlite3")
|
||||||
|
if test -z "$SQLITE3_LIBS"; then
|
||||||
|
- continue
|
||||||
|
+ AC_CHECK_FILE($dir/lib64/libsqlite3.so, SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3")
|
||||||
|
+ if test -z "$SQLITE3_LIBS"; then
|
||||||
|
+ continue
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_FILE($dir/include/sqlite3.h, SQLITE3_CFLAGS="-I$dir")
|
||||||
|
--- libpreludedb-0.9.11/configure.lib64 2006-12-21 02:53:18.000000000 +0900
|
||||||
|
+++ libpreludedb-0.9.11/configure 2007-01-02 00:57:35.000000000 +0900
|
||||||
|
@@ -27318,7 +27318,32 @@
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -z "$SQLITE3_LIBS"; then
|
||||||
|
- continue
|
||||||
|
+ as_ac_File=`echo "ac_cv_file_$dir/lib64/libsqlite3.so" | $as_tr_sh`
|
||||||
|
+{ echo "$as_me:$LINENO: checking for $dir/lib64/libsqlite3.so" >&5
|
||||||
|
+echo $ECHO_N "checking for $dir/lib64/libsqlite3.so... $ECHO_C" >&6; }
|
||||||
|
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||||
|
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
+else
|
||||||
|
+ test "$cross_compiling" = yes &&
|
||||||
|
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
|
||||||
|
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
|
||||||
|
+ { (exit 1); exit 1; }; }
|
||||||
|
+if test -r "$dir/lib64/libsqlite3.so"; then
|
||||||
|
+ eval "$as_ac_File=yes"
|
||||||
|
+else
|
||||||
|
+ eval "$as_ac_File=no"
|
||||||
|
+fi
|
||||||
|
+fi
|
||||||
|
+ac_res=`eval echo '${'$as_ac_File'}'`
|
||||||
|
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
|
||||||
|
+echo "${ECHO_T}$ac_res" >&6; }
|
||||||
|
+if test `eval echo '${'$as_ac_File'}'` = yes; then
|
||||||
|
+ SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3"
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
+ if test -z "$SQLITE3_LIBS"; then
|
||||||
|
+ continue
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
as_ac_File=`echo "ac_cv_file_$dir/include/sqlite3.h" | $as_tr_sh`
|
||||||
@ -1,406 +1,171 @@
|
|||||||
# API version for libpreludedb
|
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
|
||||||
%global major 7
|
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||||
# API version for libpreludedb c++ binding
|
|
||||||
%global cppmajor 2
|
|
||||||
|
|
||||||
Name: libpreludedb
|
Name: libpreludedb
|
||||||
Version: 5.2.0
|
Version: 0.9.14.1
|
||||||
Release: 11%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Framework for easy access to the IDMEF database
|
Summary: Provide the framework for easy access to the Prelude database
|
||||||
# Prelude is GPL-2.0+
|
Group: System Environment/Libraries
|
||||||
# libmissing is LGPL-2.1+
|
License: GPL
|
||||||
License: GPLv2+
|
URL: http://prelude-ids.org/
|
||||||
URL: https://www.prelude-siem.org/
|
Source0: http://prelude-ids.org/download/releases/%{name}-%{version}.tar.gz
|
||||||
Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
# https://www.prelude-siem.org/issues/867
|
Patch0: %{name}-x86_64-sqlite3.patch
|
||||||
Patch0: libpreludedb-5.2.0-undefined_non_weak_symbol.patch
|
BuildRequires: libprelude-devel >= 0.9.16
|
||||||
Patch1: libpreludedb-5.2.0-fix_gtkdoc_1.32.patch
|
BuildRequires: mysql-devel, postgresql-devel, python-devel, sqlite-devel, perl-devel
|
||||||
Patch2: libpreludedb-5.2.0-force_preludedb_admin_with_py3.patch
|
|
||||||
Patch3: libpreludedb-5.2.0-update_m4_postgresql.patch
|
|
||||||
Patch4: libpreludedb-5.2.0-Add-pkg-config-file.patch
|
|
||||||
Patch5: libpreludedb-5.2.0-fix-test_rwlock1.patch
|
|
||||||
Patch6: libpreludedb-5.2.0-fix_thread_create.patch
|
|
||||||
Patch7: libpreludedb-5.2.0-Clean_libpreludedb-config.patch
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: bison
|
|
||||||
BuildRequires: chrpath
|
|
||||||
BuildRequires: flex
|
|
||||||
BuildRequires: gtk-doc
|
|
||||||
BuildRequires: glib2-devel
|
|
||||||
BuildRequires: swig
|
|
||||||
BuildRequires: pkgconfig(gnutls)
|
|
||||||
BuildRequires: libgpg-error-devel
|
|
||||||
BuildRequires: mariadb-connector-c-devel
|
|
||||||
BuildRequires: libpq-devel
|
|
||||||
BuildRequires: pkgconfig(sqlite3)
|
|
||||||
BuildRequires: pkgconfig(libprelude) >= %{version}
|
|
||||||
BuildRequires: pkgconfig(openssl)
|
|
||||||
BuildRequires: perl-devel
|
|
||||||
BuildRequires: perl-generators
|
|
||||||
BuildRequires: python3-devel
|
|
||||||
BuildRequires: pkgconfig(zlib)
|
|
||||||
|
|
||||||
%ifnarch s390
|
|
||||||
BuildRequires: valgrind
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Suggests: preludedb-mysql
|
|
||||||
Suggests: preludedb-pgsql
|
|
||||||
Suggests: preludedb-sqlite3
|
|
||||||
|
|
||||||
# Upstream do not use explicit version of gnulib, just checkout
|
|
||||||
# and update files. In libprelude 5.2.0, the checkout has been done
|
|
||||||
# on 2018-09-03
|
|
||||||
Provides: bundled(gnulib) = 20180903
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The PreludeDB Library provides an abstraction layer upon the type and the
|
The PreludeDB Library provides an abstraction layer upon the type and the
|
||||||
format of the database used to store IDMEF alerts. It allows developers to use
|
format of the database used to store IDMEF alerts. It allows developers
|
||||||
the Prelude IDMEF database easily and efficiently without worrying about SQL,
|
to use the Prelude IDMEF database easily and efficiently without
|
||||||
and to access the database independently of the type/format of the database.
|
worrying about SQL, and to access the database independently of the
|
||||||
|
type/format of the database.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Libraries and headers for PreludeDB
|
Summary: Libraries and headers for PreludeDB
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Group: System Environment/Libraries
|
||||||
|
Requires: libpreludedb = %{version}-%{release}, libprelude-devel, automake
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Libraries and headers you can use to access Prelude database using the Prelude
|
The PreludeDB Library provides an abstraction layer upon the type
|
||||||
Library. The PreludeDB Library provides an abstraction layer upon the type and
|
and the format of the database used to store IDMEF alerts. It
|
||||||
the format of the database used to store IDMEF alerts. It allows developers to
|
allows developers to use the Prelude IDMEF database easily and
|
||||||
use the Prelude IDMEF database easily and efficiently without worrying about
|
efficiently wi thout worrying about SQL, and to access the
|
||||||
SQL, and to access the database independently of the type/format of the
|
database independently of the type/format of the database.
|
||||||
database.
|
|
||||||
|
|
||||||
%package -n preludedb-tools
|
%package mysql
|
||||||
Summary: Command-line tools for %{name}
|
Summary: Plugin to use prelude with a mysql database
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Group: System Environment/Libraries
|
||||||
|
Requires: libpreludedb = %{version}-%{release}, mysql, mysql-server
|
||||||
|
|
||||||
%description -n preludedb-tools
|
%description mysql
|
||||||
Provides a convenient interface for accessing Prelude alerts.
|
This plugin authorise prelude to store alerts into a mysql database.
|
||||||
|
|
||||||
%package -n python3-preludedb
|
%package pgsql
|
||||||
Summary: Python 3 bindings for preludedb
|
Summary: Plugin to use prelude with a pgsql database
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Group: System Environment/Libraries
|
||||||
%{?python_provide:%python_provide python3-prelude}
|
Requires: libpreludedb = %{version}-%{release}, postgresql-server
|
||||||
Requires: python3-prelude
|
|
||||||
|
|
||||||
%description -n python3-preludedb
|
%description pgsql
|
||||||
Provides python 3 bindings for preludedb.
|
This plugin authorise prelude to store alerts into a pgsql database.
|
||||||
|
|
||||||
%package -n preludedb-mysql
|
%package sqlite
|
||||||
Summary: Plugin to use prelude with a MySQL database
|
Summary: Plugin to use prelude with a sqlite database
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Group: System Environment/Libraries
|
||||||
|
Requires: libpreludedb = %{version}-%{release}, sqlite
|
||||||
|
|
||||||
%description -n preludedb-mysql
|
%description sqlite
|
||||||
This plugin authorize prelude to store alerts into a MySQL
|
This plugin authorise prelude to store alerts into a sqlite database.
|
||||||
database.
|
|
||||||
|
|
||||||
%package -n preludedb-pgsql
|
%package python
|
||||||
Summary: Plugin to use prelude with a PostgreSQL database
|
Summary: Python bindings for libpreludedb
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Group: System Environment/Libraries
|
||||||
|
Requires: libpreludedb = %{version}-%{release}
|
||||||
|
|
||||||
%description -n preludedb-pgsql
|
%description python
|
||||||
This plugin authorize prelude to store alerts into a PostgreSQL
|
Python bindings for libpreludedb.
|
||||||
database.
|
|
||||||
|
|
||||||
%package -n preludedb-sqlite3
|
%package perl
|
||||||
Summary: Plugin to use prelude with a SQLite3 database
|
Summary: Perl bindings for libpreludedb
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Group: System Environment/Libraries
|
||||||
|
Requires: libpreludedb = %{version}-%{release}
|
||||||
|
|
||||||
%description -n preludedb-sqlite3
|
%description perl
|
||||||
This plugin authorize prelude to store alerts into a SQLite3
|
Perl bindings for libpreludedb.
|
||||||
database.
|
|
||||||
|
|
||||||
%package doc
|
|
||||||
Summary: Documentation for preludedb
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description doc
|
|
||||||
Provides documentation for preludedb generated by gtk-doc.
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure --with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
|
||||||
--disable-rpath \
|
--disable-static
|
||||||
--disable-static \
|
|
||||||
--enable-shared \
|
# removing rpath
|
||||||
--includedir=%{_includedir}/%{name} \
|
sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile
|
||||||
--with-swig \
|
|
||||||
--with-perl-installdirs=vendor \
|
make
|
||||||
--without-python2 \
|
|
||||||
--with-python3 \
|
|
||||||
--enable-gtk-doc \
|
|
||||||
--with-html-dir=%{_docdir}/%{name}-devel
|
|
||||||
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
|
|
||||||
%make_build
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
rm -rf %{buildroot}
|
||||||
|
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
|
||||||
|
mkdir -p %{buildroot}%{perl_vendorarch}
|
||||||
|
make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
|
||||||
|
cp -p ChangeLog README NEWS COPYING LICENSE.README HACKING.README \
|
||||||
|
%{buildroot}%{_defaultdocdir}/%{name}-%{version}
|
||||||
|
mv %{buildroot}%{perl_sitearch}/* %{buildroot}%{perl_vendorarch}
|
||||||
|
rm -f %{buildroot}/%{perl_archlib}/perllocal.pod
|
||||||
|
rm -f %{buildroot}/%{_libdir}/%{name}.la
|
||||||
|
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/formats/classic.la
|
||||||
|
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/mysql.la
|
||||||
|
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/pgsql.la
|
||||||
|
rm -f %{buildroot}/%{_libdir}/%{name}/plugins/sql/sqlite3.la
|
||||||
|
rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/.packlist
|
||||||
|
rm -f %{buildroot}/%{perl_vendorarch}/auto/PreludeDB/PreludeDB.bs
|
||||||
|
|
||||||
chrpath -d %{buildroot}%{_libdir}/*.so.*
|
%clean
|
||||||
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
find %{buildroot} -name '*.la' -delete
|
%post -p /sbin/ldconfig
|
||||||
find %{buildroot} -name 'perllocal.pod' -delete
|
|
||||||
find %{buildroot} -name '.packlist' -delete
|
|
||||||
|
|
||||||
chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2pgsql.sh
|
%postun -p /sbin/ldconfig
|
||||||
chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh
|
|
||||||
|
|
||||||
# Enable test again after fixing #1629893
|
|
||||||
#%check
|
|
||||||
#%make_build check
|
|
||||||
|
|
||||||
%ldconfig_scriptlets -n %{name}
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_libdir}/%{name}.so.%{major}
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/%{name}.so.%{major}.*
|
|
||||||
%{_libdir}/%{name}cpp.so.%{cppmajor}
|
|
||||||
%{_libdir}/%{name}cpp.so.%{cppmajor}.*
|
|
||||||
%dir %{_libdir}/%{name}/
|
|
||||||
%dir %{_libdir}/%{name}/plugins
|
|
||||||
%dir %{_libdir}/%{name}/plugins/formats
|
|
||||||
%dir %{_libdir}/%{name}/plugins/sql
|
|
||||||
%{_libdir}/%{name}/plugins/formats/classic.so
|
|
||||||
%license COPYING LICENSE.README HACKING.README
|
|
||||||
%doc README NEWS
|
|
||||||
|
|
||||||
%files devel
|
|
||||||
%{_datadir}/%{name}
|
|
||||||
%{_bindir}/%{name}-config
|
|
||||||
%{_libdir}/%{name}.so
|
|
||||||
%{_libdir}/%{name}cpp.so
|
|
||||||
%{_includedir}/%{name}
|
|
||||||
%{_datadir}/aclocal/%{name}.m4
|
|
||||||
%{_mandir}/man1/%{name}-config.1.gz
|
|
||||||
|
|
||||||
%files -n preludedb-tools
|
|
||||||
%{_bindir}/preludedb-admin
|
%{_bindir}/preludedb-admin
|
||||||
|
%dir %{_libdir}/%{name}/
|
||||||
|
%{_libdir}/%{name}*.so.*
|
||||||
|
%dir %{_libdir}/%{name}/plugins/
|
||||||
|
%dir %{_libdir}/%{name}/plugins/formats/
|
||||||
|
%{_libdir}/%{name}/plugins/formats/*
|
||||||
|
%dir %{_defaultdocdir}/%{name}-%{version}/
|
||||||
|
%doc %{_defaultdocdir}/%{name}-%{version}/[A-Z]*
|
||||||
|
%dir %{_libdir}/%{name}/plugins/sql/
|
||||||
|
%dir %{_datadir}/%{name}
|
||||||
|
%dir %{_datadir}/%{name}/classic/
|
||||||
%{_mandir}/man1/preludedb-admin.1.gz
|
%{_mandir}/man1/preludedb-admin.1.gz
|
||||||
|
|
||||||
%files -n python3-preludedb
|
%files devel
|
||||||
%{python3_sitearch}/_preludedb.*so
|
%defattr(-,root,root)
|
||||||
%{python3_sitearch}/__pycache__/preludedb.cpython-%{python3_version_nodots}.*pyc
|
%{_bindir}/%{name}-config
|
||||||
%{python3_sitearch}/preludedb-%{version}-py%{python3_version}.egg-info
|
%{_libdir}/%{name}*.so
|
||||||
%{python3_sitearch}/preludedb.py
|
%dir %{_includedir}/%{name}/
|
||||||
|
%{_includedir}/%{name}/*
|
||||||
|
%{_datadir}/aclocal/libpreludedb.m4
|
||||||
|
%doc %{_defaultdocdir}/%{name}-%{version}/html/
|
||||||
|
|
||||||
%files -n preludedb-mysql
|
%files python
|
||||||
|
%{python_sitearch}/*
|
||||||
|
|
||||||
|
%files perl
|
||||||
|
%defattr(0755,root,root)
|
||||||
|
%{perl_vendorarch}/auto/*
|
||||||
|
%attr(0644,root,root) %{perl_vendorarch}/PreludeDB.pm
|
||||||
|
|
||||||
|
%files mysql
|
||||||
|
%defattr(0755,root,root)
|
||||||
%{_libdir}/%{name}/plugins/sql/mysql.so
|
%{_libdir}/%{name}/plugins/sql/mysql.so
|
||||||
%dir %{_datadir}/%{name}/classic
|
%attr(0644,root,root) %{_datadir}/%{name}/classic/mysql*.sql
|
||||||
%{_datadir}/%{name}/classic/mysql*.sql
|
%attr(0755,root,root) %{_datadir}/%{name}/classic/*.sh
|
||||||
|
|
||||||
%files -n preludedb-pgsql
|
%files sqlite
|
||||||
%{_libdir}/%{name}/plugins/sql/pgsql.so
|
%defattr(-,root,root)
|
||||||
%dir %{_datadir}/%{name}/classic
|
|
||||||
%{_datadir}/%{name}/classic/pgsql*.sql
|
|
||||||
|
|
||||||
%files -n preludedb-sqlite3
|
|
||||||
%{_libdir}/%{name}/plugins/sql/sqlite3.so
|
%{_libdir}/%{name}/plugins/sql/sqlite3.so
|
||||||
%dir %{_datadir}/%{name}/classic
|
%{_datadir}/%{name}/classic/sqlite*
|
||||||
%{_datadir}/%{name}/classic/sqlite*.sql
|
|
||||||
|
%files pgsql
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_libdir}/%{name}/plugins/sql/pgsql.so
|
||||||
|
%{_datadir}/%{name}/classic/pgsql*
|
||||||
|
|
||||||
%files doc
|
|
||||||
%{_docdir}/%{name}-devel
|
|
||||||
%license COPYING LICENSE.README HACKING.README
|
|
||||||
%doc ChangeLog README NEWS
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.2.0-9
|
|
||||||
- Rebuilt for Python 3.11
|
|
||||||
|
|
||||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.2.0-6
|
|
||||||
- Rebuilt for Python 3.10
|
|
||||||
|
|
||||||
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 5.2.0-5
|
|
||||||
- rebuild for libpq ABI fix rhbz#1908268
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Sep 21 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-3
|
|
||||||
- Fix libpreludedb-config
|
|
||||||
|
|
||||||
* Fri Sep 18 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-2
|
|
||||||
- Clean libpreludedb-config
|
|
||||||
|
|
||||||
* Thu Sep 17 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-1
|
|
||||||
- Bump version 5.2.0
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 5.1.0-4
|
|
||||||
- Rebuilt for Python 3.9
|
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Nov 10 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.0-2
|
|
||||||
- Add missing patches
|
|
||||||
|
|
||||||
* Fri Nov 08 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.1.0-1
|
|
||||||
- Bump version 5.1.0
|
|
||||||
|
|
||||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.0.0-5
|
|
||||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
|
||||||
|
|
||||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 5.0.0-4
|
|
||||||
- Rebuilt for Python 3.8
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 13 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.0.0-2
|
|
||||||
- Fix FTBFS with Python 3.8 (#1706207)
|
|
||||||
|
|
||||||
* Tue Feb 26 2019 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.0.0-1
|
|
||||||
- Bump version 5.0.0
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Sep 23 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-5
|
|
||||||
- Remove Python2 packages
|
|
||||||
|
|
||||||
* Tue Jul 24 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-4
|
|
||||||
- Fix FTBFS, #1604645
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.1.0-2
|
|
||||||
- Rebuilt for Python 3.7
|
|
||||||
|
|
||||||
* Tue Mar 20 2018 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.1.0-1
|
|
||||||
- Bump version 4.1.0
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Sep 23 2017 Thomas Andrejak <thomas.andrejak@gmail.com> - 4.0.0-1
|
|
||||||
- Bump version 4.0.0
|
|
||||||
- Fix #1493632
|
|
||||||
|
|
||||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jan 9 2017 Thomas Andrejak <thomas.andrejak@gmail.com> - 3.1.0-1
|
|
||||||
- Bump version
|
|
||||||
|
|
||||||
* Sun Mar 10 2013 Steve Grubb <sgrubb@redhat.com> - 1:1.0.0-16
|
|
||||||
- Add -i to autoreconf to add missing test-driver
|
|
||||||
- Add libtool as build dependency
|
|
||||||
|
|
||||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-15
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Sep 06 2012 Steve Grubb <sgrubb@redhat.com> - 1:1.0.0-14
|
|
||||||
- Add provides bundled gnulib
|
|
||||||
|
|
||||||
* Wed Aug 08 2012 Petr Pisar <ppisar@redhat.com> - 1:1.0.0-13
|
|
||||||
- Fix building with glibc-2.16.6 (bug #839607)
|
|
||||||
|
|
||||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-12
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Jun 10 2012 Petr Pisar <ppisar@redhat.com> - 1:1.0.0-11
|
|
||||||
- Perl 5.16 rebuild
|
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jun 17 2011 Marcela Maslanova <mmaslano@redhat.com> - 1:1.0.0-9
|
|
||||||
- Perl mass rebuild
|
|
||||||
|
|
||||||
* Fri Jun 10 2011 Marcela Maslanova <mmaslano@redhat.com> - 1:1.0.0-8
|
|
||||||
- Perl 5.14 mass rebuild
|
|
||||||
|
|
||||||
* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1:1.0.0-7
|
|
||||||
- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
|
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.0-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1:1.0.0-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
|
||||||
|
|
||||||
* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 1:1.0.0-4
|
|
||||||
- Mass rebuild with perl-5.12.0
|
|
||||||
|
|
||||||
* Sun May 02 2010 Steve Grubb <sgrubb@redhat.com> 1.0.0-3
|
|
||||||
- Fix requires
|
|
||||||
|
|
||||||
* Fri Apr 30 2010 Steve Grubb <sgrubb@redhat.com> 1.0.0-2
|
|
||||||
- new upstream release
|
|
||||||
|
|
||||||
* Sat Jan 30 2010 Steve Grubb <sgrubb@redhat.com> 1.0.0rc1-1
|
|
||||||
- new upstream bugfix release
|
|
||||||
|
|
||||||
* Thu Dec 17 2009 Steve Grubb <sgrubb@redhat.com> 0.9.15.3-1
|
|
||||||
- new upstream bugfix release
|
|
||||||
|
|
||||||
* Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 0.9.15.1-6
|
|
||||||
- rebuild against perl 5.10.1
|
|
||||||
|
|
||||||
* Tue Aug 25 2009 Steve Grubb <sgrubb@redhat.com> - 0.9.15.1-5
|
|
||||||
- rebuild for new openssl
|
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.15.1-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 0.9.15.1-3
|
|
||||||
- rebuild for dependencies
|
|
||||||
|
|
||||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.9.15.1-2
|
|
||||||
- Rebuild for Python 2.6
|
|
||||||
|
|
||||||
* Sun Sep 14 2008 Steve Grubb <sgrubb@redhat.com> 0.9.15.1-1
|
|
||||||
- new upstream bugfix release
|
|
||||||
|
|
||||||
* Wed Aug 27 2008 Steve Grubb <sgrubb@redhat.com> 0.9.15-1
|
|
||||||
- new upstream release
|
|
||||||
|
|
||||||
* Fri Jul 04 2008 Steve Grubb <sgrubb@redhat.com> - 0.9.14.1-4
|
|
||||||
- Fix perl bindings (#453935)
|
|
||||||
|
|
||||||
* Wed Jun 25 2008 Tomas Mraz <tmraz@redhat.com> - 0.9.14.1-3
|
|
||||||
- rebuild with new gnutls
|
|
||||||
- fix install of perl bindings
|
|
||||||
|
|
||||||
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.14.1-2
|
|
||||||
- Autorebuild for GCC 4.3
|
|
||||||
|
|
||||||
* Mon Jan 14 2008 Steve Grubb <sgrubb@redhat.com> 0.9.14.1-1
|
* Mon Jan 14 2008 Steve Grubb <sgrubb@redhat.com> 0.9.14.1-1
|
||||||
- new upstream version 0.9.14.1
|
- new upstream version 0.9.14.1
|
||||||
|
|
||||||
* Sun Dec 09 2007 <alexlan at fedoraproject dot org> - 0.9.11.1-4
|
|
||||||
- Add missing BR: perl-devel
|
|
||||||
|
|
||||||
* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 0.9.11.1-3
|
|
||||||
- Rebuild for deps
|
|
||||||
|
|
||||||
* Fri Jan 05 2007 Thorsten Scherf <tscherf@redhat.com> 0.9.11.1-2
|
* Fri Jan 05 2007 Thorsten Scherf <tscherf@redhat.com> 0.9.11.1-2
|
||||||
- moved to new upstream version 0.9.11.1
|
- moved to new upstream version 0.9.11.1
|
||||||
|
|
||||||
@ -430,3 +195,4 @@ chmod +x %{buildroot}%{_datadir}/%{name}/classic/mysql2sqlite.sh
|
|||||||
* Tue Oct 24 2006 Thorsten Scherf <tscherf@redhat.com> 0.9.10-1
|
* Tue Oct 24 2006 Thorsten Scherf <tscherf@redhat.com> 0.9.10-1
|
||||||
- New fedora build based on release 0.9.10
|
- New fedora build based on release 0.9.10
|
||||||
- New fedora build based on release 0.9.10
|
- New fedora build based on release 0.9.10
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user