- added ac264.patch

Changed files:
    ac264.patch -> 1.1
    arpwatch.spec -> 1.68

diff --git a/ac264.patch b/ac264.patch
new file mode 100644 (file)
index 0000000..f54dd43
--- /dev/null
+++ b/ac264.patch
@@ -0,0 +1,91 @@
+based on http://github.com/mcr/libpcap/commit/d1a3a92fab103210ab5f61780a731bce9a8909b5
+--- configure.in.orig  2010-04-08 14:13:14.128949704 +0200
++++ configure.in       2010-04-08 14:08:22.642391622 +0200
+@@ -21,6 +21,8 @@
+ 
+ AC_CANONICAL_SYSTEM
+ 
++AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS)
++AC_PROG_CC
+ AC_LBL_C_INIT(V_CCOPT, V_INCLS)
+ AC_LBL_C_INLINE
+ AC_C___ATTRIBUTE__
+--- aclocal.m4.orig    2010-04-08 14:16:43.134795418 +0200
++++ aclocal.m4 2010-04-08 14:19:50.183311589 +0200
+@@ -23,29 +23,22 @@
+ dnl
+ 
+ dnl
+-dnl Determine which compiler we're using (cc or gcc)
+-dnl If using gcc, determine the version number
+-dnl If using cc, require that it support ansi prototypes
+-dnl If using gcc, use -O2 (otherwise use -O)
+-dnl If using cc, explicitly specify /usr/local/include
+-dnl
+-dnl usage:
+-dnl
++dnl Do whatever AC_LBL_C_INIT work is necessary before using AC_PROG_CC.
+ dnl   AC_LBL_C_INIT(copt, incls)
+ dnl
+-dnl results:
+-dnl
+-dnl   $1 (copt set)
+-dnl   $2 (incls set)
+-dnl   CC
+-dnl   LDFLAGS
+-dnl   LBL_CFLAGS
++dnl It appears that newer versions of autoconf (2.64 and later) will,
++dnl if you use AC_TRY_COMPILE in a macro, stick AC_PROG_CC at the
++dnl beginning of the macro, even if the macro itself calls AC_PROG_CC.
++dnl See section 20.8 "Expanded Before Required" in the Autoconf
++dnl documentation.
++dnl
++dnl This causes a steaming heap of fail in our case, as we were, in
++dnl AC_LBL_C_INIT, doing the tests we now do in AC_LBL_C_PREPARE,
++dnl calling AC_PROG_CC, and then doing the tests we now do in
++dnl AC_LBL_C_INIT.
+ dnl
+-AC_DEFUN(AC_LBL_C_INIT,
+-    [AC_PREREQ(2.12)
+-    AC_BEFORE([$0], [AC_PROG_CC])
+-    AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
+-    AC_BEFORE([$0], [AC_LBL_DEVEL])
++AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
++[
+     AC_ARG_WITH(gcc, [  --without-gcc           don't use gcc])
+     $2=""
+     if test "${srcdir}" != "." ; then
+@@ -70,7 +63,32 @@
+           CC=cc
+           export CC
+     fi
+-    AC_PROG_CC
++])
++
++dnl
++dnl Determine which compiler we're using (cc or gcc)
++dnl If using gcc, determine the version number
++dnl If using cc, require that it support ansi prototypes
++dnl If using gcc, use -O2 (otherwise use -O)
++dnl If using cc, explicitly specify /usr/local/include
++dnl
++dnl usage:
++dnl
++dnl   AC_LBL_C_INIT(copt, incls)
++dnl
++dnl results:
++dnl
++dnl   $1 (copt set)
++dnl   $2 (incls set)
++dnl   CC
++dnl   LDFLAGS
++dnl   ac_cv_lbl_gcc_vers
++dnl   LBL_CFLAGS
++dnl
++AC_DEFUN(AC_LBL_C_INIT,
++    [AC_PREREQ(2.50)
++    AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
++    AC_BEFORE([$0], [AC_LBL_DEVEL])
+     if test "$GCC" != yes ; then
+           AC_MSG_CHECKING(that $CC handles ansi prototypes)
+           AC_CACHE_VAL(ac_cv_lbl_cc_ansi_prototypes,

diff --git a/arpwatch.spec b/arpwatch.spec
index 3cae85098d1899f21a55976a6fa0315c635cc7b4..9d22fa53c7cac4c9ac4f008355563657318a6265 100644 (file)
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -1,6 +1,3 @@
-# TODO
-# - grab diff from this commit:
-#   http://github.com/mcr/libpcap/commit/d1a3a92fab103210ab5f61780a731bce9a8909b5
 Summary:       Arpwatch monitors changes in ethernet/ip address pairings
 Summary(pl.UTF-8):     Arpwatch monitoruje zmiany w parach adresów ethernet/ip
 Summary(ru.UTF-8):     Инструмент для отслеживания IP адресов в локальной сети
@@ -34,6 +31,7 @@ Patch21:      %{name}-debian_22secure_tempfile.patch
 Patch22:       %{name}-debian_24from_field.patch
 Patch23:       %{name}-debian_25ignore_zero_ip.patch
 Patch24:       %{name}-debian_26unconf_iface.patch
+Patch25:       ac264.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libpcap-devel
@@ -81,6 +79,7 @@ Dodatkowo tworzona jest baza par adresów ethernet/IP.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p0
 
 %build
 cp -f /usr/share/automake/config.sub .