packages: openvcpd/openvcpd-ac.patch - updated for 0.4rc2

[hawk]

Author: hawk                         Date: Sat May  2 22:48:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.4rc2

---- Files affected:
packages/openvcpd:
   openvcpd-ac.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/openvcpd/openvcpd-ac.patch
diff -u packages/openvcpd/openvcpd-ac.patch:1.2 packages/openvcpd/openvcpd-ac.patch:1.3
--- packages/openvcpd/openvcpd-ac.patch:1.2	Sat Sep 22 22:58:32 2007
+++ packages/openvcpd/openvcpd-ac.patch	Sun May  3 00:48:39 2009
@@ -1,7 +1,7 @@
---- openvcpd-0.3-rc2/configure.ac~	2007-09-04 21:22:02.000000000 +0200
-+++ openvcpd-0.3-rc2/configure.ac	2007-09-22 01:07:52.000000000 +0200
-@@ -9,13 +9,13 @@
- AC_PROG_CC
+--- openvcpd-0.4rc2/configure.ac.orig	2009-02-07 20:04:17.000000000 +0100
++++ openvcpd-0.4rc2/configure.ac	2009-05-03 00:33:58.000000000 +0200
+@@ -12,12 +12,12 @@
+ AC_PATH_PROG([PKGCONFIG], [pkg-config], [no])
  
  # Checks for libraries.
 +AC_CHECK_LIB([dl], [dlopen])
@@ -9,42 +9,23 @@
  AC_CHECK_LIB([sqlite3], [sqlite3_close], ,[AC_MSG_ERROR([libsqlite3 not found])])
  AC_CHECK_LIB([xml2], [xmlTextReaderRead], ,[AC_MSG_ERROR([libxml2 not found])])
  AC_CHECK_LIB([pcap], [pcap_loop], ,[AC_MSG_ERROR([libpcap not found])])
- AC_CHECK_LIB([iptc], [iptc_init], ,[AC_MSG_ERROR([libiptc (iptables-dev) not found])])
- AC_CHECK_LIB([iptables], [do_command], ,[AC_MSG_ERROR([libiptables (iptables-dev) not found])])
+ AC_CHECK_LIB([iptc], [iptc_init], ,[AC_MSG_ERROR([libiptc (iptables-dev) not found])]) 
 -AC_CHECK_LIB([dl], [dlopen])
  
  AC_ARG_WITH([gnutls],
          [AS_HELP_STRING([--with-gnutls],
-@@ -69,7 +69,7 @@
- fi
- 
- if test "x$with_ipv6" != xno; then
--        CFLAGS+=" -DIPV6_SUPPORT"
-+        CFLAGS="$CFLAGS -DIPV6_SUPPORT"
- fi
- 
- xmlflags=`pkg-config libxml-2.0 --cflags`
-@@ -77,7 +77,7 @@
- 	AC_MSG_ERROR([libxml2 headers not found])
- fi
- 
--CFLAGS+=" $xmlflags"
-+CFLAGS="$CFLAGS $xmlflags"
- 
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
---- openvcpd-0.3-rc2/Makefile.in~	2007-09-22 22:32:36.879983779 +0200
-+++ openvcpd-0.3-rc2/Makefile.in	2007-09-22 22:37:31.549731799 +0200
+--- openvcpd-0.4rc2/Makefile.in.orig	2009-02-07 20:04:17.000000000 +0100
++++ openvcpd-0.4rc2/Makefile.in	2009-05-03 00:35:59.000000000 +0200
 @@ -2,10 +2,11 @@
  bindir = @bindir@
- datadir = @datadir@
+ datadir = @datarootdir@
  sysconfdir = @sysconfdir@
 +sharedstatedir = @sharedstatedir@
- iptablever=`iptables -V |  awk  '{ print $$2 }' | cut -c2-`
  
+ REV:=$(shell svnversion 2>/dev/null | sed 's/M//')
  CC=@CC@
--CFLAGS=@CFLAGS@ @DEFS@ -DOPENVCP_CONFIG=\"$(sysconfdir)/openvcpd.conf\" -DOPENVCP_DATA=\"$(datadir)/openvcpd\" -DIPTABLES_VERSION=\"$(iptablever)\" -Ilib/ -Isrc/ -rdynamic
-+CFLAGS=@CFLAGS@ @DEFS@ -DOPENVCP_CONFIG=\"$(sysconfdir)/openvcpd.conf\" -DOPENVCP_DATA=\"$(sharedstatedir)/openvcpd\" -DIPTABLES_VERSION=\"$(iptablever)\" -Ilib/ -Isrc/ -rdynamic
+-CFLAGS=@CFLAGS@ @DEFS@ -DOPENVCP_CONFIG=\"$(sysconfdir)/openvcpd.conf\" -DOPENVCP_DATA=\"$(datadir)/openvcpd\" -Ilib/ -Isrc/ -rdynamic -DREVISION=\"$(REV)\"
++CFLAGS=@CFLAGS@ @DEFS@ -DOPENVCP_CONFIG=\"$(sysconfdir)/openvcpd.conf\" -DOPENVCP_DATA=\"$(sharedstatedir)/openvcpd\" -Ilib/ -Isrc/ -rdynamic -DREVISION=\"$(REV)\"
  LDFLAGS=@LDFLAGS@
  LIBS=@LIBS@
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openvcpd/openvcpd-ac.patch?r1=1.2&r2=1.3&f=u