diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-05 21:20:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-05 21:20:27 +0200 |
| commit | d4a90e3b6d23543ff45f8e0f37d37b5da329aba5 (patch) | |
| tree | 6114b393db3e82b5cc3358743eb77f19d85befe3 /package/ulogd | |
| parent | 60c3dfe20dc1431b257bf653a080f2ca68244808 (diff) | |
fix uclibc compile
Diffstat (limited to 'package/ulogd')
| -rw-r--r-- | package/ulogd/Makefile | 3 | ||||
| -rw-r--r-- | package/ulogd/patches/autotools.patch | 2371 |
2 files changed, 19 insertions, 2355 deletions
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index af3d4ee5d..a300bb7ed 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ulogd PKG_VERSION:= 2.0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 660516de4b5b1e110c12dae414619e0f PKG_DESCR:= Netfilter userspace logging daemon PKG_SECTION:= firewall @@ -42,6 +42,7 @@ $(eval $(call PKG_template,ULOGD_MOD_PCAP,ulogd-mod-pcap,${PKG_VERSION}-${PKG_RE $(eval $(call PKG_template,ULOGD_MOD_PGSQL,ulogd-mod-pgsql,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_ULOGD_MOD_PGSQL},${PKGSD_ULOGD_MOD_PGSQL},${PKG_SECTION})) $(eval $(call PKG_template,ULOGD_MOD_SQLITE,ulogd-mod-sqlite,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_ULOGD_MOD_SQLITE},${PKGSD_ULOGD_MOD_SQLITE},${PKG_SECTION})) +TARGET_CPPFLAGS+= -D_GNU_SOURCE TARGET_CFLAGS+= -fPIC ifneq (${ADK_PACKAGE_ULOGD_MOD_MYSQL},) diff --git a/package/ulogd/patches/autotools.patch b/package/ulogd/patches/autotools.patch index 226ac5b51..32df817d4 100644 --- a/package/ulogd/patches/autotools.patch +++ b/package/ulogd/patches/autotools.patch @@ -1,55 +1,7 @@ -diff -Nur ulogd-2.0.2.orig/aclocal.m4 ulogd-2.0.2/aclocal.m4 ---- ulogd-2.0.2.orig/aclocal.m4 2013-03-03 22:19:15.825642278 +0100 -+++ ulogd-2.0.2/aclocal.m4 2013-08-21 20:32:36.604741388 +0200 -@@ -1,4 +1,4 @@ --# generated automatically by aclocal 1.11.6 -*- Autoconf -*- -+# generated automatically by aclocal 1.11.3 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -@@ -14,8 +14,8 @@ - - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, --[m4_warning([this file was generated for autoconf 2.69. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -+[m4_warning([this file was generated for autoconf 2.68. - You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) -@@ -198,7 +198,7 @@ - [am__api_version='1.11' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.11.6], [], -+m4_if([$1], [1.11.3], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -214,7 +214,7 @@ - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.11.6])dnl -+[AM_AUTOMAKE_VERSION([1.11.3])dnl - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nur ulogd-2.0.2.orig/config.h.in ulogd-2.0.2/config.h.in --- ulogd-2.0.2.orig/config.h.in 2013-03-03 22:19:17.000000000 +0100 -+++ ulogd-2.0.2/config.h.in 2013-08-21 20:23:41.695466108 +0200 -@@ -58,6 +58,9 @@ - /* Define to 1 if you have the <string.h> header file. */ - #undef HAVE_STRING_H - -+/* Define to 1 if the system has the type `struct tcphdr'. */ -+#undef HAVE_STRUCT_TCPHDR -+ - /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. - */ - #undef HAVE_SYS_DIR_H -@@ -66,6 +69,9 @@ ++++ ulogd-2.0.2/config.h.in 2013-10-05 21:13:00.000000000 +0200 +@@ -66,6 +66,9 @@ */ #undef HAVE_SYS_NDIR_H @@ -59,811 +11,10 @@ diff -Nur ulogd-2.0.2.orig/config.h.in ulogd-2.0.2/config.h.in /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H -@@ -112,11 +118,6 @@ - /* Version number of package */ - #undef VERSION - --/* Enable large inode numbers on Mac OS X 10.5. */ --#ifndef _DARWIN_USE_64_BIT_INODE --# define _DARWIN_USE_64_BIT_INODE 1 --#endif -- - /* Number of bits in a file offset, on hosts where this is settable. */ - #undef _FILE_OFFSET_BITS - -diff -Nur ulogd-2.0.2.orig/config.h.in~ ulogd-2.0.2/config.h.in~ ---- ulogd-2.0.2.orig/config.h.in~ 1970-01-01 01:00:00.000000000 +0100 -+++ ulogd-2.0.2/config.h.in~ 2013-08-21 19:34:34.300519880 +0200 -@@ -0,0 +1,128 @@ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Building nfacct module */ -+#undef BUILD_NFACCT -+ -+/* Building nfct module */ -+#undef BUILD_NFCT -+ -+/* Building nflog module */ -+#undef BUILD_NFLOG -+ -+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_DIRENT_H -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -+#undef HAVE_DOPRNT -+ -+/* Define to 1 if you have the <fcntl.h> header file. */ -+#undef HAVE_FCNTL_H -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the `dbi' library (-ldbi). */ -+#undef HAVE_LIBDBI -+ -+/* Define to 1 if you have the `mysqlclient' library (-lmysqlclient). */ -+#undef HAVE_LIBMYSQLCLIENT -+ -+/* Define to 1 if you have the `pq' library (-lpq). */ -+#undef HAVE_LIBPQ -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ -+#undef HAVE_NDIR_H -+ -+/* Define to 1 if you have the `socket' function. */ -+#undef HAVE_SOCKET -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the `strerror' function. */ -+#undef HAVE_STRERROR -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_DIR_H -+ -+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. -+ */ -+#undef HAVE_SYS_NDIR_H -+ -+/* Define to 1 if you have the <sys/queue.h> header file. */ -+#undef HAVE_SYS_QUEUE_H -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define to 1 if you have the `vprintf' function. */ -+#undef HAVE_VPRINTF -+ -+/* Define to the sub-directory in which libtool stores uninstalled libraries. -+ */ -+#undef LT_OBJDIR -+ -+/* Name of package */ -+#undef PACKAGE -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Define to 1 if your <sys/time.h> declares `struct tm'. */ -+#undef TM_IN_SYS_TIME -+ -+/* Version number of package */ -+#undef VERSION -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+#undef const -+ -+/* Define to `unsigned int' if <sys/types.h> does not define. */ -+#undef size_t diff -Nur ulogd-2.0.2.orig/configure ulogd-2.0.2/configure ---- ulogd-2.0.2.orig/configure 2013-03-03 22:19:16.549654770 +0100 -+++ ulogd-2.0.2/configure 2013-08-21 20:32:54.616514949 +0200 -@@ -1,9 +1,11 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.69 for ulogd 2.0.2. -+# Generated by GNU Autoconf 2.68 for ulogd 2.0.2. - # - # --# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -+# Foundation, Inc. - # - # - # This configure script is free software; the Free Software Foundation -@@ -132,31 +134,6 @@ - # CDPATH. - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - --# Use a proper internal environment variable to ensure we don't fall -- # into an infinite loop, continuously re-executing ourselves. -- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then -- _as_can_reexec=no; export _as_can_reexec; -- # We cannot yet assume a decent shell, so we have to provide a --# neutralization value for shells without unset; and this also --# works around shells that cannot unset nonexistent variables. --# Preserve -v and -x to the replacement shell. --BASH_ENV=/dev/null --ENV=/dev/null --(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV --case $- in # (((( -- *v*x* | *x*v* ) as_opts=-vx ;; -- *v* ) as_opts=-v ;; -- *x* ) as_opts=-x ;; -- * ) as_opts= ;; --esac --exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} --# Admittedly, this is quite paranoid, since all the known shells bail --# out after a failed `exec'. --$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 --as_fn_exit 255 -- fi -- # We don't want this to propagate to other subprocesses. -- { _as_can_reexec=; unset _as_can_reexec;} - if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh -@@ -190,8 +167,7 @@ - else - exitcode=1; echo positional parameters were not saved. - fi --test x\$exitcode = x0 || exit 1 --test -x / || exit 1" -+test x\$exitcode = x0 || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -@@ -244,25 +220,21 @@ - - - if test "x$CONFIG_SHELL" != x; then : -- export CONFIG_SHELL -- # We cannot yet assume a decent shell, so we have to provide a --# neutralization value for shells without unset; and this also --# works around shells that cannot unset nonexistent variables. --# Preserve -v and -x to the replacement shell. --BASH_ENV=/dev/null --ENV=/dev/null --(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV --case $- in # (((( -- *v*x* | *x*v* ) as_opts=-vx ;; -- *v* ) as_opts=-v ;; -- *x* ) as_opts=-x ;; -- * ) as_opts= ;; --esac --exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} --# Admittedly, this is quite paranoid, since all the known shells bail --# out after a failed `exec'. --$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 --exit 255 -+ # We cannot yet assume a decent shell, so we have to provide a -+ # neutralization value for shells without unset; and this also -+ # works around shells that cannot unset nonexistent variables. -+ # Preserve -v and -x to the replacement shell. -+ BASH_ENV=/dev/null -+ ENV=/dev/null -+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+ export CONFIG_SHELL -+ case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+ esac -+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} - fi - - if test x$as_have_required = xno; then : -@@ -364,14 +336,6 @@ - - - } # as_fn_mkdir_p -- --# as_fn_executable_p FILE --# ----------------------- --# Test if FILE is an executable regular file. --as_fn_executable_p () --{ -- test -f "$1" && test -x "$1" --} # as_fn_executable_p - # as_fn_append VAR VALUE - # ---------------------- - # Append the text in VALUE to the end of the definition contained in VAR. Take -@@ -493,10 +457,6 @@ - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - -- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have -- # already done that, so ensure we don't try to do so again and fall -- # in an infinite loop. This has already happened in practice. -- _as_can_reexec=no; export _as_can_reexec - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). -@@ -531,16 +491,16 @@ - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -pR'. -+ # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -pR' -+ as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -pR' -+ as_ln_s='cp -p' - fi - else -- as_ln_s='cp -pR' -+ as_ln_s='cp -p' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -552,8 +512,28 @@ - as_mkdir_p=false - fi - --as_test_x='test -x' --as_executable_p=as_fn_executable_p -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -1290,6 +1270,8 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. -+ If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -1591,9 +1573,9 @@ - if $ac_init_version; then - cat <<\_ACEOF - ulogd configure 2.0.2 --generated by GNU Autoconf 2.69 -+generated by GNU Autoconf 2.68 - --Copyright (C) 2012 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1669,7 +1651,7 @@ - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || -- test -x conftest$ac_exeext -+ $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 - else -@@ -2010,7 +1992,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by ulogd $as_me 2.0.2, which was --generated by GNU Autoconf 2.69. Invocation command line was -+generated by GNU Autoconf 2.68. Invocation command line was - - $ $0 $@ - -@@ -2426,7 +2408,7 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -2595,7 +2577,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2635,7 +2617,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -2686,7 +2668,7 @@ - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do -- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue -+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ -@@ -2739,7 +2721,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3035,7 +3017,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3075,7 +3057,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3128,7 +3110,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3169,7 +3151,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -3227,7 +3209,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3271,7 +3253,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3717,7 +3699,8 @@ - /* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> --struct stat; -+#include <sys/types.h> -+#include <sys/stat.h> - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -3950,7 +3933,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -3994,7 +3977,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4184,7 +4167,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4224,7 +4207,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4277,7 +4260,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4318,7 +4301,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -4376,7 +4359,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4420,7 +4403,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -4616,7 +4599,8 @@ - /* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> --struct stat; -+#include <sys/types.h> -+#include <sys/stat.h> - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); -@@ -5048,7 +5032,7 @@ - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" -- as_fn_executable_p "$ac_path_SED" || continue -+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue - # Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED - case `"$ac_path_SED" --version 2>&1` in -@@ -5124,7 +5108,7 @@ - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -- as_fn_executable_p "$ac_path_GREP" || continue -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP - case `"$ac_path_GREP" --version 2>&1` in -@@ -5190,7 +5174,7 @@ - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -- as_fn_executable_p "$ac_path_EGREP" || continue -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP - case `"$ac_path_EGREP" --version 2>&1` in -@@ -5257,7 +5241,7 @@ - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" -- as_fn_executable_p "$ac_path_FGREP" || continue -+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue - # Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP - case `"$ac_path_FGREP" --version 2>&1` in -@@ -5513,7 +5497,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5557,7 +5541,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -5981,7 +5965,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6021,7 +6005,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6323,7 +6307,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6363,7 +6347,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6466,7 +6450,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6510,7 +6494,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6635,7 +6619,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6675,7 +6659,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6734,7 +6718,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -6774,7 +6758,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7423,7 +7407,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7463,7 +7447,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7543,7 +7527,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7583,7 +7567,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7635,7 +7619,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7675,7 +7659,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7727,7 +7711,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7767,7 +7751,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7819,7 +7803,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7859,7 +7843,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7911,7 +7895,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -7951,7 +7935,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -12812,7 +12796,7 @@ +--- ulogd-2.0.2.orig/configure 2013-03-03 22:19:16.000000000 +0100 ++++ ulogd-2.0.2/configure 2013-10-05 21:12:59.000000000 +0200 +@@ -12812,7 +12812,7 @@ fi @@ -872,397 +23,22 @@ diff -Nur ulogd-2.0.2.orig/configure ulogd-2.0.2/configure do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -@@ -12825,6 +12809,16 @@ - - done - -+ac_fn_c_check_type "$LINENO" "struct tcphdr" "ac_cv_type_struct_tcphdr" "$ac_includes_default" -+if test "x$ac_cv_type_struct_tcphdr" = xyes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_TCPHDR 1 -+_ACEOF -+ -+ -+fi -+ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 - $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -@@ -12837,11 +12831,11 @@ - int - main () - { -- -+/* FIXME: Include the comments suggested by Paul. */ - #ifndef __cplusplus -- /* Ultrix mips cc rejects this sort of thing. */ -+ /* Ultrix mips cc rejects this. */ - typedef int charset[2]; -- const charset cs = { 0, 0 }; -+ const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; -@@ -12858,9 +12852,8 @@ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; -- { /* SCO 3.2v4 cc rejects this sort of thing. */ -- char tx; -- char *t = &tx; -+ { /* SCO 3.2v4 cc rejects this. */ -+ char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -@@ -12876,10 +12869,10 @@ - iptr p = 0; - ++p; - } -- { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying -+ { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -- struct s { int j; const int *ap[3]; } bx; -- struct s *b = &bx; b->j = 5; -+ struct s { int j; const int *ap[3]; }; -+ struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; -@@ -13149,8 +13142,6 @@ - esac - rm -rf conftest* - fi -- -- - fi - - -@@ -13216,7 +13207,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -13259,7 +13250,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 -@@ -14906,16 +14897,16 @@ - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -pR'. -+ # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -- as_ln_s='cp -pR' -+ as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else -- as_ln_s='cp -pR' -+ as_ln_s='cp -p' - fi - else -- as_ln_s='cp -pR' -+ as_ln_s='cp -p' - fi - rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file - rmdir conf$$.dir 2>/dev/null -@@ -14975,16 +14966,28 @@ - as_mkdir_p=false - fi - -- --# as_fn_executable_p FILE --# ----------------------- --# Test if FILE is an executable regular file. --as_fn_executable_p () --{ -- test -f "$1" && test -x "$1" --} # as_fn_executable_p --as_test_x='test -x' --as_executable_p=as_fn_executable_p -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -15006,7 +15009,7 @@ - # values after options handling. - ac_log=" - This file was extended by ulogd $as_me 2.0.2, which was --generated by GNU Autoconf 2.69. Invocation command line was -+generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -15072,10 +15075,10 @@ - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - ulogd config.status 2.0.2 --configured by $0, generated by GNU Autoconf 2.69, -+configured by $0, generated by GNU Autoconf 2.68, - with options \\"\$ac_cs_config\\" - --Copyright (C) 2012 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - -@@ -15166,7 +15169,7 @@ - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' diff -Nur ulogd-2.0.2.orig/configure.ac ulogd-2.0.2/configure.ac ---- ulogd-2.0.2.orig/configure.ac 2013-03-01 16:45:23.285968838 +0100 -+++ ulogd-2.0.2/configure.ac 2013-08-21 20:32:25.404882189 +0200 -@@ -32,7 +32,8 @@ +--- ulogd-2.0.2.orig/configure.ac 2013-03-01 16:45:23.000000000 +0100 ++++ ulogd-2.0.2/configure.ac 2013-10-05 21:12:01.000000000 +0200 +@@ -32,7 +32,7 @@ dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h unistd.h) +AC_CHECK_HEADERS(fcntl.h unistd.h sys/queue.h) -+AC_CHECK_TYPES([struct tcphdr]) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -diff -Nur ulogd-2.0.2.orig/filter/Makefile.in ulogd-2.0.2/filter/Makefile.in ---- ulogd-2.0.2.orig/filter/Makefile.in 2013-03-03 22:19:18.377686312 +0100 -+++ ulogd-2.0.2/filter/Makefile.in 2013-08-21 20:32:59.440454305 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -218,11 +201,6 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -460,6 +438,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -467,8 +446,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -735,10 +712,13 @@ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- $(am__make_dryrun) \ -- || test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -diff -Nur ulogd-2.0.2.orig/filter/packet2flow/Makefile.in ulogd-2.0.2/filter/packet2flow/Makefile.in ---- ulogd-2.0.2.orig/filter/packet2flow/Makefile.in 2013-03-03 22:19:18.409686863 +0100 -+++ ulogd-2.0.2/filter/packet2flow/Makefile.in 2013-08-21 20:32:59.660451539 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,23 +15,6 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -71,11 +54,6 @@ - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ -diff -Nur ulogd-2.0.2.orig/filter/raw2packet/Makefile.in ulogd-2.0.2/filter/raw2packet/Makefile.in ---- ulogd-2.0.2.orig/filter/raw2packet/Makefile.in 2013-03-03 22:19:18.485688175 +0100 -+++ ulogd-2.0.2/filter/raw2packet/Makefile.in 2013-08-21 20:33:00.020447013 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -132,11 +115,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_raw2packet_BASE_la_SOURCES) - DIST_SOURCES = $(ulogd_raw2packet_BASE_la_SOURCES) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -320,6 +298,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -327,8 +306,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } diff -Nur ulogd-2.0.2.orig/filter/raw2packet/ulogd_raw2packet_BASE.c ulogd-2.0.2/filter/raw2packet/ulogd_raw2packet_BASE.c ---- ulogd-2.0.2.orig/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-03-01 16:44:22.124839615 +0100 -+++ ulogd-2.0.2/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-08-22 07:34:06.287221853 +0200 -@@ -44,6 +44,10 @@ - #include <netinet/if_ether.h> - #include <string.h> - -+#ifndef HAVE_STRUCT_TCPHDR -+#include "../../include/linux/tcp.h" -+#endif -+ - enum input_keys { - INKEY_RAW_PCKT, - INKEY_RAW_PCKTLEN, -@@ -588,10 +592,10 @@ +--- ulogd-2.0.2.orig/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-03-01 16:44:22.000000000 +0100 ++++ ulogd-2.0.2/filter/raw2packet/ulogd_raw2packet_BASE.c 2013-10-05 21:12:39.000000000 +0200 +@@ -588,10 +588,10 @@ /* Section 3.1. SCTP Common Header Format */ typedef struct sctphdr { @@ -1277,176 +53,9 @@ diff -Nur ulogd-2.0.2.orig/filter/raw2packet/ulogd_raw2packet_BASE.c ulogd-2.0.2 } __attribute__((packed)) sctp_sctphdr_t; static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, -diff -Nur ulogd-2.0.2.orig/filter/ulogd_filter_PWSNIFF.c ulogd-2.0.2/filter/ulogd_filter_PWSNIFF.c ---- ulogd-2.0.2.orig/filter/ulogd_filter_PWSNIFF.c 2013-03-01 16:44:22.124839615 +0100 -+++ ulogd-2.0.2/filter/ulogd_filter_PWSNIFF.c 2013-08-22 07:35:28.738185303 +0200 -@@ -28,6 +28,10 @@ - #include <netinet/tcp.h> - #include <ulogd/ulogd.h> - -+#ifndef HAVE_STRUCT_TCPHDR -+#include "../include/linux/tcp.h" -+#endif -+ - #ifdef DEBUG_PWSNIFF - #define DEBUGP(x) ulogd_log(ULOGD_DEBUG, x) - #else -diff -Nur ulogd-2.0.2.orig/include/libipulog/Makefile.in ulogd-2.0.2/include/libipulog/Makefile.in ---- ulogd-2.0.2.orig/include/libipulog/Makefile.in 2013-03-03 22:19:18.585689900 +0100 -+++ ulogd-2.0.2/include/libipulog/Makefile.in 2013-08-21 20:33:00.636439268 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -73,11 +56,6 @@ - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - HEADERS = $(noinst_HEADERS) - ETAGS = etags - CTAGS = ctags -diff -Nur ulogd-2.0.2.orig/include/linux/Makefile.in ulogd-2.0.2/include/linux/Makefile.in ---- ulogd-2.0.2.orig/include/linux/Makefile.in 2013-03-03 22:19:18.629690659 +0100 -+++ ulogd-2.0.2/include/linux/Makefile.in 2013-08-21 20:33:00.956435246 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,23 +15,6 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -78,11 +61,6 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -464,10 +442,13 @@ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- $(am__make_dryrun) \ -- || test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -diff -Nur ulogd-2.0.2.orig/include/linux/netfilter/Makefile.in ulogd-2.0.2/include/linux/netfilter/Makefile.in ---- ulogd-2.0.2.orig/include/linux/netfilter/Makefile.in 2013-03-03 22:19:18.661691212 +0100 -+++ ulogd-2.0.2/include/linux/netfilter/Makefile.in 2013-08-21 20:33:01.288431073 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -73,11 +56,6 @@ - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - HEADERS = $(noinst_HEADERS) - ETAGS = etags - CTAGS = ctags diff -Nur ulogd-2.0.2.orig/include/linux/tcp.h ulogd-2.0.2/include/linux/tcp.h --- ulogd-2.0.2.orig/include/linux/tcp.h 1970-01-01 01:00:00.000000000 +0100 -+++ ulogd-2.0.2/include/linux/tcp.h 2013-08-21 20:56:24.858916228 +0200 ++++ ulogd-2.0.2/include/linux/tcp.h 2013-10-05 21:01:46.000000000 +0200 @@ -0,0 +1,34 @@ +struct tcphdr + { @@ -1482,897 +91,9 @@ diff -Nur ulogd-2.0.2.orig/include/linux/tcp.h ulogd-2.0.2/include/linux/tcp.h + u_int16_t urg_ptr; +}; + -diff -Nur ulogd-2.0.2.orig/include/Makefile.in ulogd-2.0.2/include/Makefile.in ---- ulogd-2.0.2.orig/include/Makefile.in 2013-03-03 22:19:18.549689279 +0100 -+++ ulogd-2.0.2/include/Makefile.in 2013-08-21 20:33:00.340442990 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,23 +15,6 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -78,11 +61,6 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -464,10 +442,13 @@ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- $(am__make_dryrun) \ -- || test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -diff -Nur ulogd-2.0.2.orig/include/ulogd/Makefile.in ulogd-2.0.2/include/ulogd/Makefile.in ---- ulogd-2.0.2.orig/include/ulogd/Makefile.in 2013-03-03 22:19:18.705691971 +0100 -+++ ulogd-2.0.2/include/ulogd/Makefile.in 2013-08-21 20:33:01.608427049 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -73,11 +56,6 @@ - am__v_at_0 = @ - SOURCES = - DIST_SOURCES = --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - HEADERS = $(noinst_HEADERS) - ETAGS = etags - CTAGS = ctags -diff -Nur ulogd-2.0.2.orig/input/flow/Makefile.in ulogd-2.0.2/input/flow/Makefile.in ---- ulogd-2.0.2.orig/input/flow/Makefile.in 2013-03-03 22:19:18.789693420 +0100 -+++ ulogd-2.0.2/input/flow/Makefile.in 2013-08-21 20:33:02.340417846 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -134,11 +117,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_inpflow_NFCT_la_SOURCES) - DIST_SOURCES = $(am__ulogd_inpflow_NFCT_la_SOURCES_DIST) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -322,6 +300,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -329,8 +308,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -diff -Nur ulogd-2.0.2.orig/input/Makefile.in ulogd-2.0.2/input/Makefile.in ---- ulogd-2.0.2.orig/input/Makefile.in 2013-03-03 22:19:18.737692523 +0100 -+++ ulogd-2.0.2/input/Makefile.in 2013-08-21 20:33:01.916423177 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,23 +15,6 @@ - - @SET_MAKE@ - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -78,11 +61,6 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -464,10 +442,13 @@ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- $(am__make_dryrun) \ -- || test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -diff -Nur ulogd-2.0.2.orig/input/packet/Makefile.in ulogd-2.0.2/input/packet/Makefile.in ---- ulogd-2.0.2.orig/input/packet/Makefile.in 2013-03-03 22:19:18.841694317 +0100 -+++ ulogd-2.0.2/input/packet/Makefile.in 2013-08-21 20:33:02.772412415 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -152,11 +135,6 @@ - DIST_SOURCES = $(ulogd_inppkt_NFLOG_la_SOURCES) \ - $(ulogd_inppkt_ULOG_la_SOURCES) \ - $(ulogd_inppkt_UNIXSOCK_la_SOURCES) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -346,6 +324,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -353,8 +332,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -diff -Nur ulogd-2.0.2.orig/input/sum/Makefile.in ulogd-2.0.2/input/sum/Makefile.in ---- ulogd-2.0.2.orig/input/sum/Makefile.in 2013-03-03 22:19:18.893695215 +0100 -+++ ulogd-2.0.2/input/sum/Makefile.in 2013-08-21 20:33:03.256406330 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -138,11 +121,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_inpflow_NFACCT_la_SOURCES) - DIST_SOURCES = $(am__ulogd_inpflow_NFACCT_la_SOURCES_DIST) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -327,6 +305,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -334,8 +313,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -diff -Nur ulogd-2.0.2.orig/libipulog/Makefile.in ulogd-2.0.2/libipulog/Makefile.in ---- ulogd-2.0.2.orig/libipulog/Makefile.in 2013-03-03 22:19:18.941696042 +0100 -+++ ulogd-2.0.2/libipulog/Makefile.in 2013-08-21 20:33:03.652401353 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -99,11 +82,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(libipulog_la_SOURCES) - DIST_SOURCES = $(libipulog_la_SOURCES) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -diff -Nur ulogd-2.0.2.orig/Makefile.in ulogd-2.0.2/Makefile.in ---- ulogd-2.0.2.orig/Makefile.in 2013-03-03 22:19:19.401703979 +0100 -+++ ulogd-2.0.2/Makefile.in 2013-08-21 20:33:11.676300478 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -87,11 +70,6 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -386,18 +364,11 @@ - -rm -f libtool config.lt - install-man8: $(man_MANS) - @$(NORMAL_INSTALL) -- @list1=''; \ -- list2='$(man_MANS)'; \ -- test -n "$(man8dir)" \ -- && test -n "`echo $$list1$$list2`" \ -- || exit 0; \ -- echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ -- { for i in $$list1; do echo "$$i"; done; \ -- if test -n "$$list2"; then \ -- for i in $$list2; do echo "$$i"; done \ -- | sed -n '/\.8[a-z]*$$/p'; \ -- fi; \ -+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" -+ @list=''; test -n "$(man8dir)" || exit 0; \ -+ { for i in $$list; do echo "$$i"; done; \ -+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ -+ sed -n '/\.8[a-z]*$$/p'; \ - } | while read p; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; echo "$$p"; \ -@@ -610,10 +581,13 @@ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- $(am__make_dryrun) \ -- || test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -@@ -701,7 +675,7 @@ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -- chmod -R a-w $(distdir); chmod u+w $(distdir) -+ chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) -diff -Nur ulogd-2.0.2.orig/output/dbi/Makefile.in ulogd-2.0.2/output/dbi/Makefile.in ---- ulogd-2.0.2.orig/output/dbi/Makefile.in 2013-03-03 22:19:19.093698665 +0100 -+++ ulogd-2.0.2/output/dbi/Makefile.in 2013-08-21 20:33:04.524390391 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -137,11 +120,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_output_DBI_la_SOURCES) - DIST_SOURCES = $(am__ulogd_output_DBI_la_SOURCES_DIST) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -326,6 +304,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -333,8 +312,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -diff -Nur ulogd-2.0.2.orig/output/Makefile.in ulogd-2.0.2/output/Makefile.in ---- ulogd-2.0.2.orig/output/Makefile.in 2013-03-03 22:19:19.021697423 +0100 -+++ ulogd-2.0.2/output/Makefile.in 2013-08-21 20:33:04.156395017 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -195,11 +178,6 @@ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ -@@ -437,6 +415,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -444,8 +423,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -@@ -690,10 +667,13 @@ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- $(am__make_dryrun) \ -- || test -d "$(distdir)/$$subdir" \ -- || $(MKDIR_P) "$(distdir)/$$subdir" \ -- || exit 1; \ -+ test -d "$(distdir)/$$subdir" \ -+ || $(MKDIR_P) "$(distdir)/$$subdir" \ -+ || exit 1; \ -+ fi; \ -+ done -+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ -diff -Nur ulogd-2.0.2.orig/output/mysql/Makefile.in ulogd-2.0.2/output/mysql/Makefile.in ---- ulogd-2.0.2.orig/output/mysql/Makefile.in 2013-03-03 22:19:19.149699632 +0100 -+++ ulogd-2.0.2/output/mysql/Makefile.in 2013-08-21 20:33:04.964384858 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -137,11 +120,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_output_MYSQL_la_SOURCES) - DIST_SOURCES = $(am__ulogd_output_MYSQL_la_SOURCES_DIST) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -326,6 +304,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -333,8 +312,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -diff -Nur ulogd-2.0.2.orig/output/pcap/Makefile.in ulogd-2.0.2/output/pcap/Makefile.in ---- ulogd-2.0.2.orig/output/pcap/Makefile.in 2013-03-03 22:19:19.197700460 +0100 -+++ ulogd-2.0.2/output/pcap/Makefile.in 2013-08-21 20:33:05.548377516 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -136,11 +119,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_output_PCAP_la_SOURCES) - DIST_SOURCES = $(am__ulogd_output_PCAP_la_SOURCES_DIST) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -325,6 +303,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -332,8 +311,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -diff -Nur ulogd-2.0.2.orig/output/pgsql/Makefile.in ulogd-2.0.2/output/pgsql/Makefile.in ---- ulogd-2.0.2.orig/output/pgsql/Makefile.in 2013-03-03 22:19:19.249701357 +0100 -+++ ulogd-2.0.2/output/pgsql/Makefile.in 2013-08-21 20:33:05.952372439 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -137,11 +120,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_output_PGSQL_la_SOURCES) - DIST_SOURCES = $(am__ulogd_output_PGSQL_la_SOURCES_DIST) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -326,6 +304,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -333,8 +312,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } -diff -Nur ulogd-2.0.2.orig/output/sqlite3/Makefile.in ulogd-2.0.2/output/sqlite3/Makefile.in ---- ulogd-2.0.2.orig/output/sqlite3/Makefile.in 2013-03-03 22:19:19.305702323 +0100 -+++ ulogd-2.0.2/output/sqlite3/Makefile.in 2013-08-21 20:33:06.340367560 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -139,11 +122,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_output_SQLITE3_la_SOURCES) - DIST_SOURCES = $(am__ulogd_output_SQLITE3_la_SOURCES_DIST) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -328,6 +306,7 @@ - $(am__aclocal_m4_deps): - install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) -+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ -@@ -335,8 +314,6 @@ - else :; fi; \ - done; \ - test -z "$$list2" || { \ -- echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } diff -Nur ulogd-2.0.2.orig/output/sqlite3/queue.h ulogd-2.0.2/output/sqlite3/queue.h --- ulogd-2.0.2.orig/output/sqlite3/queue.h 1970-01-01 01:00:00.000000000 +0100 -+++ ulogd-2.0.2/output/sqlite3/queue.h 2013-08-21 19:36:54.118762127 +0200 ++++ ulogd-2.0.2/output/sqlite3/queue.h 2013-10-05 21:01:46.000000000 +0200 @@ -0,0 +1,574 @@ +/* + * Copyright (c) 1991, 1993 @@ -2949,8 +670,8 @@ diff -Nur ulogd-2.0.2.orig/output/sqlite3/queue.h ulogd-2.0.2/output/sqlite3/que + +#endif /* sys/queue.h */ diff -Nur ulogd-2.0.2.orig/output/sqlite3/ulogd_output_SQLITE3.c ulogd-2.0.2/output/sqlite3/ulogd_output_SQLITE3.c ---- ulogd-2.0.2.orig/output/sqlite3/ulogd_output_SQLITE3.c 2012-08-03 16:11:53.275934119 +0200 -+++ ulogd-2.0.2/output/sqlite3/ulogd_output_SQLITE3.c 2013-08-21 19:36:34.143013255 +0200 +--- ulogd-2.0.2.orig/output/sqlite3/ulogd_output_SQLITE3.c 2012-08-03 16:11:53.000000000 +0200 ++++ ulogd-2.0.2/output/sqlite3/ulogd_output_SQLITE3.c 2013-10-05 21:01:46.000000000 +0200 @@ -36,7 +36,11 @@ #include <ulogd/ulogd.h> #include <ulogd/conffile.h> @@ -2963,67 +684,9 @@ diff -Nur ulogd-2.0.2.orig/output/sqlite3/ulogd_output_SQLITE3.c ulogd-2.0.2/out #define CFG_BUFFER_DEFAULT 10 -diff -Nur ulogd-2.0.2.orig/src/Makefile.in ulogd-2.0.2/src/Makefile.in ---- ulogd-2.0.2.orig/src/Makefile.in 2013-03-03 22:19:19.357703221 +0100 -+++ ulogd-2.0.2/src/Makefile.in 2013-08-21 20:33:07.436353782 +0200 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11.6 from Makefile.am. -+# Makefile.in generated by automake 1.11.3 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -16,23 +16,6 @@ - @SET_MAKE@ - - VPATH = @srcdir@ --am__make_dryrun = \ -- { \ -- am__dry=no; \ -- case $$MAKEFLAGS in \ -- *\\[\ \ ]*) \ -- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -- *) \ -- for am__flg in $$MAKEFLAGS; do \ -- case $$am__flg in \ -- *=*|--*) ;; \ -- *n*) am__dry=yes; break;; \ -- esac; \ -- done;; \ -- esac; \ -- test $$am__dry = yes; \ -- } - pkgdatadir = $(datadir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ -@@ -107,11 +90,6 @@ - am__v_GEN_0 = @echo " GEN " $@; - SOURCES = $(ulogd_SOURCES) - DIST_SOURCES = $(ulogd_SOURCES) --am__can_run_installinfo = \ -- case $$AM_UPDATE_INFO_DIR in \ -- n|no|NO) false;; \ -- *) (install-info --version) >/dev/null 2>&1;; \ -- esac - ETAGS = etags - CTAGS = ctags - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -@@ -298,11 +276,8 @@ - $(am__aclocal_m4_deps): - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) -+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" - @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ -- if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ -- fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ diff -Nur ulogd-2.0.2.orig/src/ulogd.c ulogd-2.0.2/src/ulogd.c ---- ulogd-2.0.2.orig/src/ulogd.c 2013-03-01 16:45:23.285968838 +0100 -+++ ulogd-2.0.2/src/ulogd.c 2013-08-22 07:31:39.221070725 +0200 +--- ulogd-2.0.2.orig/src/ulogd.c 2013-03-01 16:45:23.000000000 +0100 ++++ ulogd-2.0.2/src/ulogd.c 2013-10-05 21:01:46.000000000 +0200 @@ -78,7 +78,7 @@ static FILE *logfile = NULL; /* logfile pointer */ static char *ulogd_logfile = NULL; |