[packages/libpreludedb] - new URLs, updated to 1.2.6 - updated lt patch - removed obsolete mysql-innodb patch - added link p

qboosh qboosh at pld-linux.org
Fri Feb 5 19:24:18 CET 2016 

commit 6583ad890b6de5c904b8e75a123bb5c906b2efee
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Feb 5 19:26:52 2016 +0100

    - new URLs, updated to 1.2.6
    - updated lt patch
    - removed obsolete mysql-innodb patch
    - added link patch (fixes libpreludedbcpp linking)
    - added python-install patch (fixes python2+python3 build in PLD)
    - low-level bindings are gone (together with perl-libpreludedb)
    - "easy" bindings introduced (c++, python2/python3)

 libpreludedb-link.patch           |  11 ++
 libpreludedb-lt.patch             |   8 +-
 libpreludedb-mysql-innodb.patch   | 324 --------------------------------------
 libpreludedb-python-install.patch |  24 +++
 libpreludedb.spec                 | 193 ++++++++++++++++-------
 5 files changed, 173 insertions(+), 387 deletions(-)
---
diff --git a/libpreludedb.spec b/libpreludedb.spec
index 26804e0..8d085e0 100644
--- a/libpreludedb.spec
+++ b/libpreludedb.spec
@@ -1,44 +1,48 @@
 #
 # Conditional build:
-%bcond_without	perl		# don't build perl bindings
-%bcond_without	python		# don't build python bindings (needed by prewikka)
-%bcond_without	postgresql	# don't build postgresql plugin
-%bcond_without	mysql		# don't build mysql plugin
-%bcond_without	sqlite3		# don't build sqlite3 plugin
+%bcond_without	python2		# Python 2.x bindings (needed by prewikka)
+%bcond_without	python3		# Python 3.x bindings
+%bcond_without	static_libs	# static library
+%bcond_without	postgresql	# PostgreSQL plugin
+%bcond_without	mysql		# MySQL plugin
+%bcond_without	sqlite3		# SQLite3 plugin
 #
-%include	/usr/lib/rpm/macros.perl
 Summary:	The PreludeDB Library
 Summary(pl.UTF-8):	Biblioteka PreludeDB
 Name:		libpreludedb
-Version:	1.0.0
+Version:	1.2.6
 Release:	1
 License:	GPL v2 or commercial
 Group:		Libraries
-#Source0Download: http://www.prelude-ids.com/developpement/telechargement/index.html
-Source0:	http://www.prelude-ids.com/download/releases/libpreludedb/%{name}-%{version}.tar.gz
-# Source0-md5:	e2b38dfe2efb2008fcb5e2ce51f6638b
-Patch0:		%{name}-mysql-innodb.patch
-Patch1:		%{name}-lt.patch
-URL:		http://www.prelude-ids.com/
+#Source0Download: https://www.prelude-siem.org/projects/prelude/files
+Source0:	https://www.prelude-siem.org/attachments/download/408/%{name}-%{version}.tar.gz
+# Source0-md5:	d11ea3d545135b2b53d257d8917b82de
+Patch0:		%{name}-lt.patch
+Patch1:		%{name}-link.patch
+Patch2:		%{name}-python-install.patch
+URL:		https://www.prelude-siem.org/
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gtk-doc >= 1.0
 BuildRequires:	libprelude-devel >= %{version}
-BuildRequires:	libtool
+BuildRequires:	libprelude-c++-devel >= %{version}
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.5
 %{?with_mysql:BuildRequires:	mysql-devel}
-%{?with_perl:BuildRequires:	perl-devel}
 BuildRequires:	pkgconfig
 %{?with_postgresql:BuildRequires:	postgresql-devel}
-%{?with_python:BuildRequires:	python-devel >= 1:2.5}
-BuildRequires:	rpm-perlprov
+%{?with_python2:BuildRequires:	python-devel >= 1:2.5}
+%{?with_python3:BuildRequires:	python3-devel >= 1:3.2}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 %{?with_sqlite3:BuildRequires:	sqlite3-devel >= 3.0.0}
+BuildRequires:	swig-python
 Requires(post):	/sbin/ldconfig
 Requires:	%{name}(DB_driver) = %{version}-%{release}
 Requires:	libprelude-libs >= %{version}
+Obsoletes:	perl-libpreludedb
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,6 +84,46 @@ Static libpreludedb library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libpreludedb.
 
+%package c++
+Summary:	C++ binding for libpreludedb
+Summary(pl.UTF-8):	Interfejs C++ do libpreludedb
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	libprelude-c++ >= %{version}
+
+%description c++
+C++ binding for libpreludedb.
+
+%description c++ -l pl.UTF-8
+Interfejs C++ do libpreludedb.
+
+%package c++-devel
+Summary:	Header files for libpreludedbcpp
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libpreludedbcpp
+Group:		Development/Libraries
+Requires:	%{name}-c++ = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	libprelude-c++-devel >= %{version}
+Requires:	libstdc++-devel
+
+%description c++-devel
+Header files for libpreludedbcpp.
+
+%description c++-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libpreludedbcpp.
+
+%package c++-static
+Summary:	Static libpreludedbcpp library
+Summary(pl.UTF-8):	Statyczna biblioteka libpreludedbcpp
+Group:		Development/Libraries
+Requires:	%{name}-c++-devel = %{version}-%{release}
+
+%description c++-static
+Static libpreludedbcpp library.
+
+%description c++-static -l pl.UTF-8
+Statyczna biblioteka libpreludedbcpp.
+
 %package pgsql
 Summary:	PostgreSQL backend for libpreludedb
 Summary(pl.UTF-8):	Interfejs do PostgreSQL dla libpreludedb
@@ -119,34 +163,39 @@ SQLite3 backend for libpreludedb
 %description sqlite3 -l pl.UTF-8
 Interfejs do SQLite3 do libpreludedb
 
-%package -n perl-libpreludedb
-Summary:	libpreludedb Perl bindings
-Summary(pl.UTF-8):	Dowiązania Perla do libpreludedb
-Group:		Development/Languages/Perl
-Requires:	%{name} = %{version}-%{release}
-
-%description -n perl-libpreludedb
-libpreludedb Perl bindings.
-
-%description -n perl-libpreludedb -l pl.UTF-8
-Dowiązania Perla do libpreludedb.
-
 %package -n python-libpreludedb
-Summary:	libpreludedb Python bindings
-Summary(pl.UTF-8):	Dowiązania Pythona do libpreludedb
+Summary:	Python 2.x bindings for libpreludedb
+Summary(pl.UTF-8):	Wiązania Pythona 2.x do libpreludedb
 Group:		Development/Languages/Python
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-c++ = %{version}-%{release}
 
 %description -n python-libpreludedb
-libpreludedb Python bindings.
+Python 2.x bindings for libpreludedb.
 
 %description -n python-libpreludedb -l pl.UTF-8
-Dowiązania Pythona do libpreludedb.
+Wiązania Pythona 2.x do libpreludedb.
+
+%package -n python3-libpreludedb
+Summary:	Python 3.x bindings for libpreludedb
+Summary(pl.UTF-8):	Wiązania Pythona 3.x do libpreludedb
+Group:		Development/Languages/Python
+Requires:	%{name}-c++ = %{version}-%{release}
+
+%description -n python3-libpreludedb
+Python 3.x bindings for libpreludedb.
+
+%description -n python3-libpreludedb -l pl.UTF-8
+Wiązania Pythona 3.x do libpreludedb.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+%if %{with python3}
+%{__rm} bindings/python/{_preludedb.cxx,preludedb.py}
+%endif
 
 %build
 %{__libtoolize}
@@ -156,14 +205,14 @@ Dowiązania Pythona do libpreludedb.
 %{__automake}
 %configure \
 	--enable-gtk-doc \
-	--enable-static \
-	--with%{!?with_perl:out}-perl \
-	--with%{!?with_python:out}-python \
-	--with%{!?with_postgresql:out}-postgresql \
-	--with%{!?with_mysql:out}-mysql \
-	--with%{!?with_sqlite3:out}-sqlite3 \
+	%{?with_static_libs:--enable-static} \
 	--with-html-dir=%{_gtkdocdir}/libpreludedb \
-	--with-perl-installdirs=vendor
+	--with-mysql%{!?with_mysql:=no} \
+	--with-postgresql%{!?with_postgresql:=no} \
+	--with-python2%{!?with_python2:=no} \
+	--with-python3%{!?with_python3:=no} \
+	--with-sqlite%{!?with_sqlite3:=no} \
+	--with-swig
 
 %{__make}
 
@@ -171,18 +220,21 @@ Dowiązania Pythona do libpreludedb.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	pythondir=%{py_sitescriptdir} \
+	pyexecdir=%{py_sitedir} \
+	python3dir=%{py3_sitescriptdir} \
+	py3execdir=%{py3_sitedir}
 
 %if %{without postgresql} && %{without mysql} && %{without sqlite3}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/sql
 %endif
 
 # no *.la for plugins
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*.la \
+	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*.a}
 
-%if %{with python}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%if %{with python2}
 %py_postclean
 %endif
 
@@ -204,12 +256,15 @@ fi
 
 %postun	-p /sbin/ldconfig
 
+%post	c++ -p /sbin/ldconfig
+%postun	c++ -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog LICENSE.README NEWS README
 %attr(755,root,root) %{_bindir}/preludedb-admin
 %attr(755,root,root) %{_libdir}/libpreludedb.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpreludedb.so.0
+%attr(755,root,root) %ghost %{_libdir}/libpreludedb.so.7
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/formats
@@ -224,13 +279,33 @@ fi
 %attr(755,root,root) %{_bindir}/libpreludedb-config
 %attr(755,root,root) %{_libdir}/libpreludedb.so
 %{_libdir}/libpreludedb.la
-%{_includedir}/libpreludedb
+%dir %{_includedir}/libpreludedb
+%{_includedir}/libpreludedb/*.h
 %{_aclocaldir}/libpreludedb.m4
 %{_gtkdocdir}/libpreludedb
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpreludedb.a
+%endif
+
+%files c++
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpreludedbcpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpreludedbcpp.so.2
+
+%files c++-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpreludedbcpp.so
+%{_libdir}/libpreludedbcpp.la
+%{_includedir}/libpreludedb/*.hxx
+
+%if %{with static_libs}
+%files c++-static
+%defattr(644,root,root,755)
+%{_libdir}/libpreludedbcpp.a
+%endif
 
 %if %{with postgresql}
 %files pgsql
@@ -255,19 +330,19 @@ fi
 %{_datadir}/%{name}/classic/sqlite*.sql
 %endif
 
-%if %{with perl}
-%files -n perl-libpreludedb
-%defattr(644,root,root,755)
-%{perl_vendorarch}/PreludeDB.pm
-%dir %{perl_vendorarch}/auto/PreludeDB
-%attr(755,root,root) %{perl_vendorarch}/auto/PreludeDB/PreludeDB.so
-%{perl_vendorarch}/auto/PreludeDB/PreludeDB.bs
-%endif
-
-%if %{with python}
+%if %{with python2}
 %files -n python-libpreludedb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_preludedb.so
 %{py_sitedir}/preludedb.py[co]
 %{py_sitedir}/preludedb-*-py*.egg-info
 %endif
+
+%if %{with python3}
+%files -n python3-libpreludedb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/_preludedb.cpython-*.so
+%{py3_sitedir}/preludedb.py
+%{py3_sitedir}/__pycache__/preludedb.cpython-*.py[co]
+%{py3_sitedir}/preludedb-*-py*.egg-info
+%endif
diff --git a/libpreludedb-link.patch b/libpreludedb-link.patch
new file mode 100644
index 0000000..ffdc434
--- /dev/null
+++ b/libpreludedb-link.patch
@@ -0,0 +1,11 @@
+--- libpreludedb-1.2.6/bindings/c++/Makefile.am.orig	2015-08-03 19:25:50.695003748 +0200
++++ libpreludedb-1.2.6/bindings/c++/Makefile.am	2016-02-05 17:28:17.361271644 +0100
+@@ -7,7 +7,7 @@
+ libpreludedbcpp_la_SOURCES = preludedb.cxx preludedb-sql.cxx preludedb-error.cxx
+ 
+ libpreludedbcpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDEDBCPP_SONAME@
+-libpreludedbcpp_la_LIBADD  = $(top_builddir)/src/.libs/libpreludedb.la
++libpreludedbcpp_la_LIBADD  = $(top_builddir)/src/libpreludedb.la -lpreludecpp
+ 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@
+ 
+ endif
diff --git a/libpreludedb-lt.patch b/libpreludedb-lt.patch
index 1993e12..6e473ac 100644
--- a/libpreludedb-lt.patch
+++ b/libpreludedb-lt.patch
@@ -1,9 +1,9 @@
---- libpreludedb-1.0.0/configure.in.orig	2010-03-10 13:45:13.000000000 +0100
-+++ libpreludedb-1.0.0/configure.in	2011-08-10 17:41:34.543209766 +0200
-@@ -75,10 +75,8 @@
+--- libpreludedb-1.2.6/configure.in.orig	2016-02-03 21:48:00.337869380 +0100
++++ libpreludedb-1.2.6/configure.in	2016-02-03 21:48:43.064534253 +0100
+@@ -102,10 +102,8 @@
          # headers.
          AC_MSG_RESULT(Darwin: adding -no-cpp-precomp)
-         AX_C_CHECK_FLAG(-no-cpp-precomp, , , PCFLAGS="$PCFLAGS -no-cpp-precomp")
+         AX_CHECK_COMPILE_FLAG(-no-cpp-precomp, PCFLAGS="$PCFLAGS -no-cpp-precomp")
 -        libext=dylib
          ;;
   *)
diff --git a/libpreludedb-mysql-innodb.patch b/libpreludedb-mysql-innodb.patch
deleted file mode 100644
index 108bfe5..0000000
--- a/libpreludedb-mysql-innodb.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-diff -ur libpreludedb-1.0.0/plugins/format/classic/mysql.sql libpreludedb-1.0.0.new//plugins/format/classic/mysql.sql
---- libpreludedb-1.0.0/plugins/format/classic/mysql.sql	2009-07-13 17:43:26.000000000 +0200
-+++ libpreludedb-1.0.0.new//plugins/format/classic/mysql.sql	2011-08-03 14:26:30.299261304 +0200
-@@ -11,7 +11,7 @@
- CREATE TABLE Prelude_Alert (
-  _ident BIGINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-  messageid VARCHAR(255) NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_alert_messageid ON Prelude_Alert (messageid);
- 
-@@ -25,7 +25,7 @@
-  alertident VARCHAR(255) NOT NULL,
-  analyzerid VARCHAR(255) NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -35,7 +35,7 @@
-  _message_ident BIGINT UNSIGNED NOT NULL PRIMARY KEY,
-  name VARCHAR(255) NOT NULL,
-  command VARCHAR(255) NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -44,7 +44,7 @@
- CREATE TABLE Prelude_CorrelationAlert (
-  _message_ident BIGINT UNSIGNED NOT NULL PRIMARY KEY,
-  name VARCHAR(255) NOT NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -55,7 +55,7 @@
-  program VARCHAR(255) NOT NULL,
-  size INTEGER UNSIGNED NULL,
-  buffer BLOB NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -65,7 +65,7 @@
-  _ident BIGINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-  messageid VARCHAR(255) NULL,
-  heartbeat_interval INTEGER NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -84,7 +84,7 @@
-  ostype VARCHAR(255) NULL,
-  osversion VARCHAR(255) NULL,
-  PRIMARY KEY (_parent_type,_message_ident,_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_analyzer_analyzerid ON Prelude_Analyzer (_parent_type,_index,analyzerid);
- CREATE INDEX prelude_analyzer_index_model ON Prelude_Analyzer (_parent_type,_index,model);
-@@ -97,7 +97,7 @@
-  _message_ident BIGINT UNSIGNED NOT NULL PRIMARY KEY,
-  ident VARCHAR(255) NULL,
-  text VARCHAR(255) NOT NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_classification_index_text ON Prelude_Classification (text(40));
- 
-@@ -113,7 +113,7 @@
-  url VARCHAR(255) NOT NULL,
-  meaning VARCHAR(255) NULL,
-  PRIMARY KEY (_message_ident, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_reference_index_name ON Prelude_Reference (name(40));
- 
-@@ -128,7 +128,7 @@
-  spoofed ENUM("unknown","yes","no") NOT NULL,
-  interface VARCHAR(255) NULL,
-  PRIMARY KEY (_message_ident, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -141,7 +141,7 @@
-  decoy ENUM("unknown","yes","no") NOT NULL,
-  interface VARCHAR(255) NULL,
-  PRIMARY KEY (_message_ident, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -166,7 +166,7 @@
-  fstype ENUM("ufs", "efs", "nfs", "afs", "ntfs", "fat16", "fat32", "pcfs", "joliet", "iso9660") NULL,
-  file_type VARCHAR(255) NULL,
-  PRIMARY KEY (_message_ident, _parent0_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -178,7 +178,7 @@
-  _parent1_index TINYINT NOT NULL,
-  _index TINYINT NOT NULL,
-  PRIMARY KEY (_message_ident, _parent0_index, _parent1_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -192,7 +192,7 @@
-  _index TINYINT NOT NULL,
-  permission VARCHAR(255) NOT NULL,
-  PRIMARY KEY (_message_ident, _parent0_index, _parent1_index, _parent2_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -207,7 +207,7 @@
-  name VARCHAR(255) NOT NULL,
-  path VARCHAR(255) NOT NULL,
-  PRIMARY KEY (_message_ident, _parent0_index, _parent1_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -225,7 +225,7 @@
-  c_major_device INT UNSIGNED NULL,
-  c_minor_device INT UNSIGNED NULL,
-  PRIMARY KEY (_message_ident, _parent0_index, _parent1_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -240,7 +240,7 @@
-  value VARCHAR(255) NOT NULL,
-  checksum_key VARCHAR(255) NULL, # key is a reserved word
-  PRIMARY KEY (_message_ident, _parent0_index, _parent1_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- DROP TABLE IF EXISTS Prelude_Impact;
-@@ -251,7 +251,7 @@
-  severity ENUM("info", "low","medium","high") NULL,
-  completion ENUM("failed", "succeeded") NULL,
-  type ENUM("admin", "dos", "file", "recon", "user", "other") NOT NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_impact_index_severity ON Prelude_Impact (severity);
- CREATE INDEX prelude_impact_index_completion ON Prelude_Impact (completion);
-@@ -267,7 +267,7 @@
-  description VARCHAR(255) NULL,
-  category ENUM("block-installed", "notification-sent", "taken-offline", "other") NOT NULL,
-  PRIMARY KEY (_message_ident, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -277,7 +277,7 @@
-  _message_ident BIGINT UNSIGNED NOT NULL PRIMARY KEY,
-  confidence FLOAT NULL,
-  rating ENUM("low", "medium", "high", "numeric") NOT NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -285,7 +285,7 @@
- 
- CREATE TABLE Prelude_Assessment (
-  _message_ident BIGINT UNSIGNED NOT NULL PRIMARY KEY
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -299,7 +299,7 @@
-  meaning VARCHAR(255) NULL,
-  data BLOB NOT NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -312,7 +312,7 @@
-  usec INTEGER UNSIGNED NOT NULL,
-  gmtoff INTEGER NOT NULL,
-  PRIMARY KEY (_parent_type,_message_ident)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_createtime_index ON Prelude_CreateTime (_parent_type,time);
- 
-@@ -324,7 +324,7 @@
-  time DATETIME NOT NULL,
-  usec INTEGER UNSIGNED NOT NULL,
-  gmtoff INTEGER NOT NULL
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_detecttime_index ON Prelude_DetectTime (time);
- 
-@@ -338,7 +338,7 @@
-  usec INTEGER UNSIGNED NOT NULL,
-  gmtoff INTEGER NOT NULL,
-  PRIMARY KEY (_parent_type, _message_ident)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_analyzertime_index ON Prelude_AnalyzerTime (_parent_type,time);
- 
-@@ -355,7 +355,7 @@
-  location VARCHAR(255) NULL,
-  name VARCHAR(255) NULL,
-  PRIMARY KEY(_parent_type, _message_ident, _parent0_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_node_index_location ON Prelude_Node (_parent_type,_parent0_index,location(20));
- CREATE INDEX prelude_node_index_name ON Prelude_Node (_parent_type,_parent0_index,name(20));
-@@ -376,7 +376,7 @@
-  address VARCHAR(255) NOT NULL,
-  netmask VARCHAR(255) NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_address_index_address ON Prelude_Address (_parent_type,_parent0_index,_index,address(10));
- 
-@@ -391,7 +391,7 @@
-  ident VARCHAR(255) NULL,
-  category ENUM("unknown","application","os-device") NOT NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -410,7 +410,7 @@
-  tty VARCHAR(255) NULL,
-  number INTEGER UNSIGNED NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index, _parent1_index, _parent2_index, _index) # _parent_index1 and _parent2_index will always be zero if parent_type = 'F'
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -425,7 +425,7 @@
-  pid INTEGER UNSIGNED NULL,
-  path VARCHAR(255) NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -438,7 +438,7 @@
-  _index TINYINT NOT NULL,
-  arg VARCHAR(255) NOT NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -451,7 +451,7 @@
-  _index TINYINT NOT NULL,
-  env VARCHAR(255) NOT NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -470,7 +470,7 @@
-  portlist VARCHAR (255) NULL,
-  protocol VARCHAR(255) NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- CREATE INDEX prelude_service_index_protocol_port ON Prelude_Service (_parent_type,_parent0_index,protocol(10),port);
- CREATE INDEX prelude_service_index_protocol_name ON Prelude_Service (_parent_type,_parent0_index,protocol(10),name(10));
-@@ -487,7 +487,7 @@
-  cgi VARCHAR(255) NULL,
-  http_method VARCHAR(255) NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -500,7 +500,7 @@
-  _index TINYINT NOT NULL,
-  arg VARCHAR(255) NOT NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index, _index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
- 
- 
- 
-@@ -519,4 +519,4 @@
-  context_engine_id VARCHAR(255) NULL,
-  command VARCHAR(255) NULL,
-  PRIMARY KEY (_parent_type, _message_ident, _parent0_index)
--) TYPE=InnoDB;
-+) ENGINE=InnoDB;
diff --git a/libpreludedb-python-install.patch b/libpreludedb-python-install.patch
new file mode 100644
index 0000000..ed3100e
--- /dev/null
+++ b/libpreludedb-python-install.patch
@@ -0,0 +1,24 @@
+--- libpreludedb-1.2.6/bindings/python/Makefile.am.orig	2015-08-03 19:25:50.697003748 +0200
++++ libpreludedb-1.2.6/bindings/python/Makefile.am	2016-02-05 19:10:27.281014380 +0100
+@@ -7,17 +7,17 @@
+ 
+ python-build: _preludedb.cxx
+ if HAVE_PYTHON2
+-	CC="$(CXX)" $(PYTHON2) setup.py build
++	CC="$(CXX)" $(PYTHON2) setup.py build --build-base=build-2
+ endif
+ if HAVE_PYTHON3
+-	CC="$(CXX)" $(PYTHON3) setup.py build
++	CC="$(CXX)" $(PYTHON3) setup.py build --build-base=build-3
+ endif
+ install-exec-hook:
+ if HAVE_PYTHON2
+-	$(PYTHON2) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
++	$(PYTHON2) setup.py build --build-base=build-2 install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --skip-build --prefix=$(prefix) --install-purelib=$(pythondir) --install-platlib=$(pyexecdir) --optimize=2
+ endif
+ if HAVE_PYTHON3
+-	$(PYTHON3) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
++	$(PYTHON3) setup.py build --build-base=build-2 install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` --skip-build --prefix=$(prefix) --install-purelib=$(python3dir) --install-platlib=$(py3execdir) --optimize=2
+ endif
+ 
+ uninstall-hook:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libpreludedb.git/commitdiff/6583ad890b6de5c904b8e75a123bb5c906b2efee

More information about the pld-cvs-commit mailing list