Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2019-03-22 15:09:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ulogd" Fri Mar 22 15:09:22 2019 rev:14 rq:687310 version:2.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2018-07-14 20:24:08.316019257 +0200 +++ /work/SRC/openSUSE:Factory/.ulogd.new.25356/ulogd.changes 2019-03-22 15:09:25.489387725 +0100 @@ -1,0 +2,5 @@ +Thu Mar 21 11:32:44 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Add 0001-build-adjust-configure-for-postgresql-10-11.patch + +------------------------------------------------------------------- New: ---- 0001-build-adjust-configure-for-postgresql-10-11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd.spec ++++++ --- /var/tmp/diff_new_pack.8NeVXT/_old 2019-03-22 15:09:26.085387210 +0100 +++ /var/tmp/diff_new_pack.8NeVXT/_new 2019-03-22 15:09:26.089387206 +0100 @@ -1,7 +1,7 @@ # # spec file for package ulogd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -29,6 +29,7 @@ Source: http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2 Source2: http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig Source4: ulogd.service +Patch1: 0001-build-adjust-configure-for-postgresql-10-11.patch Patch4: ulogd-conf.diff BuildRequires: autoconf >= 2.50 @@ -37,17 +38,18 @@ BuildRequires: libpcap-devel BuildRequires: libtool BuildRequires: lksctp-tools-devel -BuildRequires: pkgconfig >= 0.21 -BuildRequires: postgresql-devel +BuildRequires: pkg-config >= 0.21 BuildRequires: sqlite3-devel BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libnetfilter_acct) >= 1.0.1 BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.2 BuildRequires: pkgconfig(libnetfilter_log) >= 1.0.0 BuildRequires: pkgconfig(libnfnetlink) >= 1.0.1 +BuildRequires: pkgconfig(libpq) BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: systemd-rpm-macros Requires(pre): /usr/sbin/useradd +%{?systemd_ordering} %description ulogd is a userspace logging daemon for netfilter/iptables related @@ -88,8 +90,7 @@ SQLite3 output target for ulogd. %prep -%setup -q -%patch -P 4 -p1 +%autosetup -p1 %build autoreconf -fi @@ -97,8 +98,8 @@ make %{?_smp_mflags} %install +%make_install b="%buildroot" -make install DESTDIR="$b" find "$b" -type f -iname "*.la" -delete mkdir -p "$b/var/log/ulogd" mkdir -p "$b/%_sysconfdir" ++++++ 0001-build-adjust-configure-for-postgresql-10-11.patch ++++++ >From 3b1ed1b767b664fdf7040ba9cf6c9d3f071250a0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jeng...@inai.de> Date: Thu, 21 Mar 2019 12:16:45 +0100 Subject: [PATCH] build: adjust configure for postgresql 10/11 The openSUSE PostgreSQL 11 no longer ships the pg_config program. Instead, there exists a .pc file (likewise in pg10), so make use of that, by default. The old --with-pgsql-inc and --with-pgsql-lib option are going away and replaced by the standardized mechanisms pkg-config.m4 has in store for when there is no .pc file or an unusual location: ./configure --with-pgsql pgsql_CFLAGS="-I/opt/pgsql/include" \ pgsql_LIBS="-L/opt/pgsql/lib -lpq" --- acinclude.m4 | 84 ++++------------------------------------ configure.ac | 12 +----- output/pgsql/Makefile.am | 4 +- 3 files changed, 12 insertions(+), 88 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 8388c45..3b8b982 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -14,82 +14,14 @@ dnl @license AllPermissive AC_DEFUN([CT_CHECK_POSTGRES_DB], [ -AC_ARG_WITH(pgsql, - [ --with-pgsql=PREFIX Prefix of your PostgreSQL installation], - [pg_prefix=$withval], [pg_prefix=]) -AC_ARG_WITH(pgsql-inc, - [ --with-pgsql-inc=PATH Path to the include directory of PostgreSQL], - [pg_inc=$withval], [pg_inc=]) -AC_ARG_WITH(pgsql-lib, - [ --with-pgsql-lib=PATH Path to the libraries of PostgreSQL], - [pg_lib=$withval], [pg_lib=]) - - -AC_SUBST(PQINCPATH) -AC_SUBST(PQLIBPATH) -AC_SUBST(PQLIBS) -PQLIBS=-lpq - -if test "$pg_prefix" != "no"; then - -AC_MSG_CHECKING([for PostgreSQL pg_config program]) -for d in $pg_prefix/bin /usr/bin /usr/local/bin /usr/local/pgsql/bin /opt/pgsql/bin /opt/packages/pgsql/bin -do - if test -x $d/pg_config -a "$cross_compiling" = "no"; - then - AC_MSG_RESULT(found pg_config in $d) - PQINCPATH=`$d/pg_config --includedir` - PQLIBPATH=`$d/pg_config --libdir` - break - fi -done - -if test "$PQINCPATH" = ""; then - if test "$pg_prefix" != ""; then - AC_MSG_CHECKING([for PostgreSQL includes in $pg_prefix/include]) - if test -f "$pg_prefix/include/libpq-fe.h" ; then - PQINCPATH="-I$pg_prefix/include" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libpq-fe.h not found) - fi - AC_MSG_CHECKING([for PostgreSQL libraries in $pg_prefix/lib]) - if test -f "$pg_prefix/lib/libpq.so" ; then - PQLIBPATH="-L$pg_prefix/lib" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libpq.so not found) - fi - else - if test "$pg_inc" != ""; then - AC_MSG_CHECKING([for PostgreSQL includes in $pg_inc]) - if test -f "$pg_inc/libpq-fe.h" ; then - PQINCPATH="-I$pg_inc" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libpq-fe.h not found) - fi - fi - if test "$pg_lib" != ""; then - AC_MSG_CHECKING([for PostgreSQL libraries in $pg_lib]) - if test -f "$pg_lib/libpq.so" ; then - PQLIBPATH="-L$pg_lib" - AC_MSG_RESULT([yes]) - else - AC_MSG_WARN(libpq.so not found) - fi - fi - fi -fi - -if test "$PQINCPATH" = "" ; then - AC_CHECK_HEADER([libpq-fe.h], [], AC_MSG_WARN(libpq-fe.h not found)) -fi -if test "$PQLIBPATH" = "" ; then - AC_CHECK_LIB(pq, PQconnectdb, [], AC_MSG_WARN(libpq.so not found)) -fi - -fi +AC_ARG_WITH([pgsql], [AS_HELP_STRING([--without-pgsql], [Build without pgsql output plugin [default=test]])], + [want_pgsql="$withval"], [want_pgsql=auto]) +enable_pgsql=no +AS_IF([test "$want_pgsql" = "auto"], [ + PKG_CHECK_MODULES([pgsql], [libpq], [enable_pgsql=yes], [:]) +], [test "$want_pgsql" != "no"], [ + PKG_CHECK_MODULES([pgsql], [libpq], [enable_pgsql=yes]) +]) ]) diff --git a/configure.ac b/configure.ac index 3aa0624..794cbbb 100644 --- a/configure.ac +++ b/configure.ac @@ -82,16 +82,8 @@ if [! test "x$enable_nfacct" = "xyes"]; then enable_nfacct="no" fi -AC_ARG_WITH([pgsql], AS_HELP_STRING([--without-pgsql], [Build without postgresql output plugin [default=test]])) -AS_IF([test "x$with_pgsql" != "xno"], [ - CT_CHECK_POSTGRES_DB() -]) -AM_CONDITIONAL(HAVE_PGSQL, test "x$PQLIBPATH" != "x") -if test "x$PQLIBPATH" != "x"; then - enable_pgsql="yes" -else - enable_pgsql="no" -fi +CT_CHECK_POSTGRES_DB() +AM_CONDITIONAL([HAVE_PGSQL], [test "$enable_pgsql" = yes]) AC_ARG_WITH([mysql], AS_HELP_STRING([--without-mysql], [Build without mysql output plugin [default=test]])) AS_IF([test "x$with_mysql" != "xno"], [ diff --git a/output/pgsql/Makefile.am b/output/pgsql/Makefile.am index bdaf1d2..6c1d35a 100644 --- a/output/pgsql/Makefile.am +++ b/output/pgsql/Makefile.am @@ -1,5 +1,5 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(PQINCPATH) +AM_CPPFLAGS = -I$(top_srcdir)/include ${pgsql_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} if HAVE_PGSQL @@ -7,7 +7,7 @@ if HAVE_PGSQL pkglib_LTLIBRARIES = ulogd_output_PGSQL.la ulogd_output_PGSQL_la_SOURCES = ulogd_output_PGSQL.c ../../util/db.c -ulogd_output_PGSQL_la_LIBADD = ${PQLIBS} +ulogd_output_PGSQL_la_LIBADD = ${pgsql_LIBS} ulogd_output_PGSQL_la_LDFLAGS = -avoid-version -module endif -- 2.21.0
