From 34945cd32acd54412845bbd79b68fec1bb8d24af Mon Sep 17 00:00:00 2001 From: hasso Date: Fri, 2 Oct 2009 09:50:38 +0000 Subject: Split up the libpreludedb. Approved by agc@. --- security/libpreludedb/Makefile | 29 +++++---------- security/libpreludedb/Makefile.common | 32 +++++++++++++++++ security/libpreludedb/PLIST | 10 ++---- security/libpreludedb/buildlink3.mk | 9 +++-- security/libpreludedb/distinfo | 5 ++- security/libpreludedb/options.mk | 66 ---------------------------------- security/libpreludedb/patches/patch-ab | 22 ++++++++++++ security/libpreludedb/patches/patch-ac | 22 ++++++++++++ security/libpreludedb/patches/patch-ad | 22 ++++++++++++ 9 files changed, 117 insertions(+), 100 deletions(-) create mode 100644 security/libpreludedb/Makefile.common delete mode 100644 security/libpreludedb/options.mk create mode 100644 security/libpreludedb/patches/patch-ab create mode 100644 security/libpreludedb/patches/patch-ac create mode 100644 security/libpreludedb/patches/patch-ad (limited to 'security') diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile index 745aa1bb1d7..3df697a5e59 100644 --- a/security/libpreludedb/Makefile +++ b/security/libpreludedb/Makefile @@ -1,27 +1,16 @@ -# $NetBSD: Makefile,v 1.26 2009/08/24 13:50:03 hasso Exp $ +# $NetBSD: Makefile,v 1.27 2009/10/02 09:50:38 hasso Exp $ # -DISTNAME= libpreludedb-0.9.15.3 -CATEGORIES= security -MASTER_SITES= http://www.prelude-ids.com/download/releases/libpreludedb/ +.include "../../security/libpreludedb/Makefile.common" +.include "../../mk/bsd.prefs.mk" -MAINTAINER= shannonjr@NetBSD.org -HOMEPAGE= http://www.prelude-ids.org/download/releases/ -COMMENT= Provides an interface to the database used to store IDMEF alerts +COMMENT= LibPreludeDB libraries -PKG_DESTDIR_SUPPORT= user-destdir - -USE_PKGLOCALEDIR= yes -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -USE_TOOLS+= make -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -USE_LANGUAGES= c c++ - -.include "options.mk" - -pre-configure: - ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la ${BUILDLINK_DIR}/lib/libltdlc.la +CONFIGURE_ARGS+= --with-perl=no +CONFIGURE_ARGS+= --with-python=no +CONFIGURE_ARGS+= --with-mysql=no +CONFIGURE_ARGS+= --with-postgresql=no +CONFIGURE_ARGS+= --with-sqlite3=no post-install: ${INSTALL_DATA} ${FILESDIR}/addIndices.sql ${DESTDIR}${PREFIX}/share/libpreludedb/classic diff --git a/security/libpreludedb/Makefile.common b/security/libpreludedb/Makefile.common new file mode 100644 index 00000000000..1f618f6708a --- /dev/null +++ b/security/libpreludedb/Makefile.common @@ -0,0 +1,32 @@ +# $NetBSD: Makefile.common,v 1.1 2009/10/02 09:50:38 hasso Exp $ +# +# used by security/libpreludedb/Makefile +# used by security/libpreludedb-mysql/Makefile +# used by security/libpreludedb-perl/Makefile +# used by security/libpreludedb-pgsql/Makefile +# used by security/libpreludedb-python/Makefile +# used by security/libpreludedb-sqlite3/Makefile + +DISTNAME= libpreludedb-${VERSION} +VERSION= 0.9.15.3 +CATEGORIES= security +MASTER_SITES= http://www.prelude-ids.com/download/releases/libpreludedb/ + +MAINTAINER= shannonjr@NetBSD.org +HOMEPAGE= http://www.prelude-ids.org/download/releases/ +COMMENT= Provides an interface to the database used to store IDMEF alerts + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_PKGLOCALEDIR= yes +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +USE_TOOLS+= make +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +USE_LANGUAGES= c c++ + +PKG_OPTIONS_VAR= PKG_OPTIONS.libpreludedb + + +pre-configure: + ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la ${BUILDLINK_DIR}/lib/libltdlc.la diff --git a/security/libpreludedb/PLIST b/security/libpreludedb/PLIST index 3dfd0a03fbf..228cc371699 100644 --- a/security/libpreludedb/PLIST +++ b/security/libpreludedb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2009/08/24 13:50:03 hasso Exp $ +@comment $NetBSD: PLIST,v 1.12 2009/10/02 09:50:38 hasso Exp $ bin/libpreludedb-config bin/preludedb-admin include/libpreludedb/preludedb-error.h @@ -11,12 +11,6 @@ include/libpreludedb/preludedb-version.h include/libpreludedb/preludedb.h lib/libpreludedb.la lib/libpreludedb/plugins/formats/classic.la -${PLIST.mysql}lib/libpreludedb/plugins/sql/mysql.la -${PLIST.pgsql}lib/libpreludedb/plugins/sql/pgsql.la -${PLIST.sqlite3}lib/libpreludedb/plugins/sql/sqlite3.la -${PLIST.python}${PYSITELIB}/_preludedb.so -${PLIST.python}${PYSITELIB}/preludedb.py -${PLIST.python}${PYSITELIB}/preludedb.pyc share/aclocal/libpreludedb.m4 share/gtk-doc/html/libpreludedb/ch01.html share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2 @@ -36,6 +30,7 @@ share/gtk-doc/html/libpreludedb/libpreludedb.devhelp share/gtk-doc/html/libpreludedb/right.png share/gtk-doc/html/libpreludedb/style.css share/gtk-doc/html/libpreludedb/up.png +share/libpreludedb/classic/addIndices.sql share/libpreludedb/classic/mysql-update-14-1.sql share/libpreludedb/classic/mysql-update-14-2.sql share/libpreludedb/classic/mysql-update-14-3.sql @@ -53,7 +48,6 @@ share/libpreludedb/classic/pgsql-update-14-1.sql share/libpreludedb/classic/pgsql-update-14-2.sql share/libpreludedb/classic/pgsql-update-14-3.sql share/libpreludedb/classic/pgsql-update-14-4.sql -share/libpreludedb/classic/addIndices.sql share/libpreludedb/classic/pgsql.sql share/libpreludedb/classic/sqlite.sql share/libpreludedb/classic/sqlite-update-14-4.sql diff --git a/security/libpreludedb/buildlink3.mk b/security/libpreludedb/buildlink3.mk index 20134722b8b..b2e506a0c9d 100644 --- a/security/libpreludedb/buildlink3.mk +++ b/security/libpreludedb/buildlink3.mk @@ -1,16 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:19 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/10/02 09:50:38 hasso Exp $ BUILDLINK_TREE+= libpreludedb .if !defined(LIBPRELUDEDB_BUILDLINK3_MK) LIBPRELUDEDB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libpreludedb+= libpreludedb>=0.9.3 -BUILDLINK_ABI_DEPENDS.libpreludedb?= libpreludedb>=0.9.13nb2 +BUILDLINK_API_DEPENDS.libpreludedb+= libpreludedb>=0.9.15.3 BUILDLINK_PKGSRCDIR.libpreludedb?= ../../security/libpreludedb .include "../../security/libprelude/buildlink3.mk" -.include "../../lang/perl5/buildlink3.mk" -.endif # LIBPRELUDEDB_BUILDLINK3_MK +.include "../../devel/libltdl/buildlink3.mk" +.endif # LIBPRELUDEDB_BUILDLINK3_MK BUILDLINK_TREE+= -libpreludedb diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo index 89f426f0c89..36a8fa97123 100644 --- a/security/libpreludedb/distinfo +++ b/security/libpreludedb/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.14 2009/08/24 13:50:03 hasso Exp $ +$NetBSD: distinfo,v 1.15 2009/10/02 09:50:38 hasso Exp $ SHA1 (libpreludedb-0.9.15.3.tar.gz) = 617ca366401f461380ceff5de037efa7743ca1ec RMD160 (libpreludedb-0.9.15.3.tar.gz) = 70af1692966a6b31d4b18a2342a74991d3e8bfed Size (libpreludedb-0.9.15.3.tar.gz) = 935457 bytes SHA1 (patch-aa) = 11cb4f1353a5dbfc046992d862230849aeb21afa +SHA1 (patch-ab) = 52fe326b51634cdc123d4ccb48ac054c7cf318c4 +SHA1 (patch-ac) = d71fa2d8ec5c84692dc68801e06651bc70628e89 +SHA1 (patch-ad) = abd409d4e955f202796a5cb9da3360a76e8d2855 diff --git a/security/libpreludedb/options.mk b/security/libpreludedb/options.mk deleted file mode 100644 index f34ef701e31..00000000000 --- a/security/libpreludedb/options.mk +++ /dev/null @@ -1,66 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2009/08/24 13:50:03 hasso Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.libpreludedb -PKG_SUPPORTED_OPTIONS= perl python -PKG_OPTIONS_NONEMPTY_SETS= database -PKG_OPTIONS_SET.database= mysql pgsql sqlite3 - -# hmmmm, maybe the user should be forced to select? -PKG_SUGGESTED_OPTIONS= sqlite3 - -.include "../../mk/bsd.options.mk" - -### -### python is needed for prewikka -### - -PLIST_VARS+= python mysql pgsql sqlite3 -.if !empty(PKG_OPTIONS:Mperl) -CONFIGURE_ARGS+= --with-perl=${PERL5:Q} --with-perl-installdirs=vendor -USE_TOOLS+= perl:run - -PERL5_PACKLIST= ${PERL5_VENDORARCH}auto/PreludeDB/.packlist -PERL5_CONFIGURE= no -.include "../../lang/perl5/buildlink3.mk" -.include "../../lang/perl5/module.mk" -.else -CONFIGURE_ARGS+= --with-perl=no -.endif - -.if !empty(PKG_OPTIONS:Mpython) -CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -PYBINMODULE= yes -PLIST.python= yes -PY_PATCHPLIST= yes -.include "../../lang/python/application.mk" -.include "../../lang/python/extension.mk" -.else -CONFIGURE_ARGS+= --with-python=no -.endif - -.if !empty(PKG_OPTIONS:Mmysql) -CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config - -PLIST.mysql= yes -.include "../../mk/mysql.buildlink3.mk" -.else -CONFIGURE_ARGS+= --with-mysql=no -.endif - -.if !empty(PKG_OPTIONS:Mpgsql) -CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX}/bin/pg_config - -PLIST.pgsql= yes -.include "../../mk/pgsql.buildlink3.mk" -.else -CONFIGURE_ARGS+= --with-postgresql=no -.endif - -.if !empty(PKG_OPTIONS:Msqlite3) -CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} - -PLIST.sqlite3= yes -.include "../../databases/sqlite3/buildlink3.mk" -.else -CONFIGURE_ARGS+= --with-sqlite3=no -.endif diff --git a/security/libpreludedb/patches/patch-ab b/security/libpreludedb/patches/patch-ab new file mode 100644 index 00000000000..3d726e9bf35 --- /dev/null +++ b/security/libpreludedb/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2009/10/02 09:50:38 hasso Exp $ + +--- plugins/sql/sqlite3/Makefile.in.orig 2009-09-26 16:38:21 +0200 ++++ plugins/sql/sqlite3/Makefile.in 2009-09-26 16:39:12 +0200 +@@ -121,7 +121,7 @@ + am__installdirs = "$(DESTDIR)$(sqlite3dir)" + LTLIBRARIES = $(sqlite3_LTLIBRARIES) + @HAVE_SQLITE3_TRUE@sqlite3_la_DEPENDENCIES = \ +-@HAVE_SQLITE3_TRUE@ $(top_builddir)/src/libpreludedb.la ++@HAVE_SQLITE3_TRUE@ $(top_builddir)/../.buildlink/lib/libpreludedb.la + am__sqlite3_la_SOURCES_DIST = sqlite3.c + @HAVE_SQLITE3_TRUE@am_sqlite3_la_OBJECTS = sqlite3.lo + sqlite3_la_OBJECTS = $(am_sqlite3_la_OBJECTS) +@@ -590,7 +590,7 @@ + AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @SQLITE3_CFLAGS@ + sqlite3_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@ + @HAVE_SQLITE3_TRUE@sqlite3_la_SOURCES = sqlite3.c +-@HAVE_SQLITE3_TRUE@sqlite3_la_LIBADD = $(top_builddir)/src/libpreludedb.la @LIBPRELUDE_LIBS@ @SQLITE3_LDFLAGS@ ++@HAVE_SQLITE3_TRUE@sqlite3_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludedb.la @LIBPRELUDE_LIBS@ @SQLITE3_LDFLAGS@ + @HAVE_SQLITE3_TRUE@sqlite3dir = $(sql_plugin_dir) + @HAVE_SQLITE3_TRUE@sqlite3_LTLIBRARIES = sqlite3.la + all: all-am diff --git a/security/libpreludedb/patches/patch-ac b/security/libpreludedb/patches/patch-ac new file mode 100644 index 00000000000..6a7d4e43b4f --- /dev/null +++ b/security/libpreludedb/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2009/10/02 09:50:38 hasso Exp $ + +--- plugins/sql/mysql/Makefile.in.orig 2009-09-26 16:39:48 +0200 ++++ plugins/sql/mysql/Makefile.in 2009-09-26 16:40:18 +0200 +@@ -121,7 +121,7 @@ + am__installdirs = "$(DESTDIR)$(mysqldir)" + LTLIBRARIES = $(mysql_LTLIBRARIES) + @HAVE_MYSQL_TRUE@mysql_la_DEPENDENCIES = \ +-@HAVE_MYSQL_TRUE@ $(top_builddir)/src/libpreludedb.la ++@HAVE_MYSQL_TRUE@ $(top_builddir)/../.buildlink/lib/libpreludedb.la + am__mysql_la_SOURCES_DIST = mysql.c + @HAVE_MYSQL_TRUE@am_mysql_la_OBJECTS = mysql.lo + mysql_la_OBJECTS = $(am_mysql_la_OBJECTS) +@@ -590,7 +590,7 @@ + AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @MYSQL_CFLAGS@ + mysql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@ + @HAVE_MYSQL_TRUE@mysql_la_SOURCES = mysql.c +-@HAVE_MYSQL_TRUE@mysql_la_LIBADD = $(top_builddir)/src/libpreludedb.la @LIBPRELUDE_LIBS@ @MYSQL_LDFLAGS@ ++@HAVE_MYSQL_TRUE@mysql_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludedb.la @LIBPRELUDE_LIBS@ @MYSQL_LDFLAGS@ + @HAVE_MYSQL_TRUE@mysqldir = $(sql_plugin_dir) + @HAVE_MYSQL_TRUE@mysql_LTLIBRARIES = mysql.la + all: all-am diff --git a/security/libpreludedb/patches/patch-ad b/security/libpreludedb/patches/patch-ad new file mode 100644 index 00000000000..bac43c44f07 --- /dev/null +++ b/security/libpreludedb/patches/patch-ad @@ -0,0 +1,22 @@ +$NetBSD: patch-ad,v 1.1 2009/10/02 09:50:38 hasso Exp $ + +--- plugins/sql/pgsql/Makefile.in.orig 2009-09-26 16:39:52 +0200 ++++ plugins/sql/pgsql/Makefile.in 2009-09-26 16:40:32 +0200 +@@ -121,7 +121,7 @@ + am__installdirs = "$(DESTDIR)$(pgsqldir)" + LTLIBRARIES = $(pgsql_LTLIBRARIES) + @HAVE_PGSQL_TRUE@pgsql_la_DEPENDENCIES = \ +-@HAVE_PGSQL_TRUE@ $(top_builddir)/src/libpreludedb.la ++@HAVE_PGSQL_TRUE@ $(top_builddir)/../.buildlink/lib/libpreludedb.la + am__pgsql_la_SOURCES_DIST = pgsql.c + @HAVE_PGSQL_TRUE@am_pgsql_la_OBJECTS = pgsql.lo + pgsql_la_OBJECTS = $(am_pgsql_la_OBJECTS) +@@ -590,7 +590,7 @@ + AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing -I$(top_builddir)/libmissing @LIBPRELUDE_CFLAGS@ @POSTGRESQL_CFLAGS@ + pgsql_la_LDFLAGS = -module -avoid-version @LIBPRELUDE_LDFLAGS@ + @HAVE_PGSQL_TRUE@pgsql_la_SOURCES = pgsql.c +-@HAVE_PGSQL_TRUE@pgsql_la_LIBADD = $(top_builddir)/src/libpreludedb.la @LIBPRELUDE_LIBS@ @POSTGRESQL_LDFLAGS@ ++@HAVE_PGSQL_TRUE@pgsql_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludedb.la @LIBPRELUDE_LIBS@ @POSTGRESQL_LDFLAGS@ + @HAVE_PGSQL_TRUE@pgsqldir = $(sql_plugin_dir) + @HAVE_PGSQL_TRUE@pgsql_LTLIBRARIES = pgsql.la + all: all-am -- cgit v1.2.3