packages: collectd/collectd.spec, collectd/libnotify.patch (NEW), collectd/...
wiget
wiget at pld-linux.org
Wed Apr 13 22:03:34 CEST 2011
Author: wiget Date: Wed Apr 13 20:03:34 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- start update to 5.0.0
- added netfilter.patch (use system libiptc, but need more work)
- added libnotify.patch (fix build with libnotify 0.7.x)
Compiles but %files NFY
---- Files affected:
packages/collectd:
collectd.spec (1.99 -> 1.100) , libnotify.patch (NONE -> 1.1) (NEW), netfilter.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/collectd/collectd.spec
diff -u packages/collectd/collectd.spec:1.99 packages/collectd/collectd.spec:1.100
--- packages/collectd/collectd.spec:1.99 Thu Mar 31 20:10:07 2011
+++ packages/collectd/collectd.spec Wed Apr 13 22:03:28 2011
@@ -67,12 +67,12 @@
Summary: Collects system information in RRD files
Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD
Name: collectd
-Version: 4.10.2
-Release: 2
+Version: 5.0.0
+Release: 0.1
License: GPL v2
Group: Daemons
Source0: http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 85d9d8d0a1327782661e3c89800aa70e
+# Source0-md5: 7bfea6e82d35b36f16d1da2c71397213
Source1: %{name}.conf
Source2: %{name}.init
Source3: %{name}-http.conf
@@ -81,6 +81,8 @@
Source11: %{name}-rrdtool.conf
Patch0: %{name}-collection.patch
Patch1: compile.patch
+Patch2: netfilter.patch
+Patch3: libnotify.patch
URL: http://collectd.org/
%{?with_ipmi:BuildRequires: OpenIPMI-devel >= 2.0.14-3}
BuildRequires: autoconf
@@ -94,7 +96,7 @@
BuildRequires: libmemcached-devel
BuildRequires: libnetlink-devel
%{?with_netlink:BuildRequires: libnetlink-devel}
-%{?with_notify:BuildRequires: libnotify-devel}
+%{?with_notify:BuildRequires: libnotify-devel >= 0.7.0}
%{?with_ping:BuildRequires: liboping-devel}
%{?with_dns:BuildRequires: libpcap-devel}
BuildRequires: libstatgrab-devel >= 0.12
@@ -1103,6 +1105,8 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%{__libtoolize}
@@ -1112,29 +1116,36 @@
%{__automake}
%configure \
+ c_cv_have_libperl=yes \
--with-libstatgrab=/usr \
--with-lm-sensors=/usr \
--with-libmysql=/usr \
- --%{?with_dns:en}%{!?with_dns:dis}able-dns \
- --%{?with_ipmi:en}%{!?with_ipmi:dis}able-ipmi \
- --%{?with_iptables:en}%{!?with_iptables:dis}able-iptables \
- --%{?with_multimeter:en}%{!?with_multimeter:dis}able-multimeter \
- --%{?with_mysql:en}%{!?with_mysql:dis}able-mysql \
- --%{?with_netlink:en}%{!?with_netlink:dis}able-netlink \
- --%{?with_notify:en}%{!?with_notify:dis}able-notify_desktop \
- --%{?with_libesmtp:en}%{!?with_libesmtp:dis}able-notify_email \
- --%{?with_ups:en}%{!?with_ups:dis}able-nut \
- --%{?with_ping:en}%{!?with_ping:dis}able-ping \
- --%{?with_pgsql:en}%{!?with_pgsql:dis}able-postgresql \
- --%{?with_rrd:en}%{!?with_rrd:dis}able-rrdtool \
- --%{?with_sensors:en}%{!?with_sensors:dis}able-sensors \
- --%{?with_snmp:en}%{!?with_snmp:dis}able-snmp \
- --%{?with_xmms:en}%{!?with_xmms:dis}able-xmms \
- %{!?with_curl:--disable-{apache,ascent,bind,curl,nginx}} \
- %{!?with_xml:--disable-{ascent,bind,libvirt}} \
- --disable-ipvs \
+ --enable-perl \
+ %{__enable_disable dns} \
+ %{__enable_disable ipmi} \
+ %{__enable_disable iptables} \
+ %{__enable_disable multimeter} \
+ %{__enable_disable mysql} \
+ %{__enable_disable netlink} \
+ %{__enable_disable notify notify_desktop} \
+ %{__enable_disable libesmtp notify_email} \
+ %{__enable_disable ups nut} \
+ %{__enable_disable ping} \
+ %{__enable_disable pgsql postgresql} \
+ %{__enable_disable rrd rrdtool} \
+ %{__enable_disable sensors} \
+ %{__enable_disable snmp} \
+ %{__enable_disable xmms} \
+ %{__enable_disable curl} \
+ %{__enable_disable curl apache} \
+ %{__enable_disable curl ngix} \
+ %{__enable_disable curl ascent} \
+ %{__disable curl ascent} \
+ %{__disable curl bind} \
+ %{__disable xml ascent} \
+ %{__disable xml bind} \
--disable-libvirt \
- --disable-perl
+ --disable-ipvs
%{__make} LDFLAGS="%{rpmldflags} -lstatgrab" \
@@ -1822,6 +1833,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.100 2011/04/13 20:03:28 wiget
+- start update to 5.0.0
+- added netfilter.patch (use system libiptc, but need more work)
+- added libnotify.patch (fix build with libnotify 0.7.x)
+
+Compiles but %files NFY
+
Revision 1.99 2011/03/31 18:10:07 arekm
- release 2
================================================================
Index: packages/collectd/libnotify.patch
diff -u /dev/null packages/collectd/libnotify.patch:1.1
--- /dev/null Wed Apr 13 22:03:34 2011
+++ packages/collectd/libnotify.patch Wed Apr 13 22:03:29 2011
@@ -0,0 +1,11 @@
+--- collectd-5.0.0/src/notify_desktop.c.wiget 2011-04-13 18:20:49.328905159 +0200
++++ collectd-5.0.0/src/notify_desktop.c 2011-04-13 18:21:41.933248544 +0200
+@@ -95,7 +95,7 @@ static int c_notify (const notification_
+ : (NOTIF_WARNING == n->severity) ? "WARNING"
+ : (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
+
+- notification = notify_notification_new (summary, n->message, NULL, NULL);
++ notification = notify_notification_new (summary, n->message, NULL);
+ if (NULL == notification) {
+ log_err ("Failed to create a new notification.");
+ return -1;
================================================================
Index: packages/collectd/netfilter.patch
diff -u /dev/null packages/collectd/netfilter.patch:1.1
--- /dev/null Wed Apr 13 22:03:34 2011
+++ packages/collectd/netfilter.patch Wed Apr 13 22:03:29 2011
@@ -0,0 +1,5436 @@
+commit 99364c70a7039ed496dbe429fb86ee41e464fc76
+Author: Florian Forster <octo at collectd.org>
+Date: Sun Apr 3 09:17:26 2011 -0700
+
+ iptables plugin: Remove the shipped version of libiptc.
+
+ Since libiptc is now publicly available as a shared library, we don't really
+ have any need to ship it with collectd anymore.
+
+diff --git a/configure.in b/configure.in
+index 8db24ca..8043d9a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1764,21 +1764,16 @@ AM_CONDITIONAL(BUILD_WITH_LIBGCRYPT, test "x$with_libgcrypt" = "xyes")
+ # }}}
+
+ # --with-libiptc {{{
+-with_own_libiptc="no"
+ AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
+ [
+- if test "x$withval" = "xshipped"
+- then
+- with_own_libiptc="yes"
+- with_libiptc="yes"
+- else if test "x$withval" != "xno" && test "x$withval" != "xyes"
++ if test "x$withval" != "xno" && test "x$withval" != "xyes"
+ then
+ LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS -I$withval/include"
+ LIBIPTC_LDFLAGS="$LIBIPTC_LDFLAGS -L$withval/lib"
+ with_libiptc="yes"
+ else
+ with_libiptc="$withval"
+- fi; fi
++ fi
+ ],
+ [
+ if test "x$ac_system" = "xLinux"
+@@ -1793,32 +1788,22 @@ SAVE_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $LIBIPTC_CPPFLAGS"
+ LDFLAGS="$LDFLAGS $LIBIPTC_LDFLAGS"
+ # check whether the header file for libiptc is available.
+-if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
++if test "x$with_libiptc" = "xyes"
+ then
+ AC_CHECK_HEADERS(libiptc/libiptc.h,
+- [
+- AC_DEFINE(HAVE_LIBIPTC_LIBIPTC_H, 1, [Define to 1 if you have the <libiptc/libiptc.h> header file.])
+- ],
+- [
+- with_libiptc="yes"
+- with_own_libiptc="yes"
+- ])
++ [with_libiptc="yes"],
++ [with_libiptc="no (libiptc/libiptc.h not found)"])
+ fi
+-if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
++if test "x$with_libiptc" = "xyes"
+ then
+ AC_CHECK_HEADERS(libiptc/libip6tc.h,
+- [
+- AC_DEFINE(HAVE_LIBIPTC_LIBIP6TC_H, 1, [Define to 1 if you have the <libiptc/libip6tc.h> header file.])
+- ],
+- [
+- with_libiptc="yes"
+- with_own_libiptc="yes"
+- ])
++ [with_libiptc="yes"],
++ [with_libiptc="no (libiptc/libip6tc.h not found)"])
+ fi
+ # If the header file is available, check for the required type declaractions.
+ # They may be missing in old versions of libiptc. In that case, they will be
+ # declared in the iptables plugin.
+-if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
++if test "x$with_libiptc" = "xyes"
+ then
+ AC_CHECK_TYPES([iptc_handle_t, ip6tc_handle_t], [], [],
+ [
+@@ -1832,32 +1817,13 @@ then
+ ])
+ fi
+ # Check for the iptc_init symbol in the library.
+-if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
++if test "x$with_libiptc" = "xyes"
+ then
+ AC_CHECK_LIB(iptc, iptc_init,
+- [
+- AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
+- ],
+- [
+- with_libiptc="yes"
+- with_own_libiptc="yes"
+- ])
+-fi
+-# The system wide version failed for some reason. Check if we have the required
+-# headers to build the shipped version.
+-if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xyes"
+-then
+- AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h linux/netfilter/x_tables.h, [],
+- [
+- with_libiptc="no (Linux iptables headers not found)"
+- with_own_libiptc="no"
+- ],
+- [
+-#include "$srcdir/src/owniptc/ipt_kernel_headers.h"
+- ])
++ [with_libiptc="yes"],
++ [with_libiptc="no (symbol 'iptc_init' not found)"])
+ fi
+ AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
+-AM_CONDITIONAL(BUILD_WITH_OWN_LIBIPTC, test "x$with_own_libiptc" = "xyes")
+ if test "x$with_libiptc" = "xyes"
+ then
+ BUILD_WITH_LIBIPTC_CPPFLAGS="$LIBIPTC_CPPFLAGS"
+@@ -1865,10 +1831,6 @@ then
+ AC_SUBST(BUILD_WITH_LIBIPTC_CPPFLAGS)
+ AC_SUBST(BUILD_WITH_LIBIPTC_LDFLAGS)
+ fi
+-if test "x$with_own_libiptc" = "xyes"
+-then
+- AC_DEFINE(OWN_LIBIPTC, 1, [Define to 1 if we use the shipped iptc library.])
+-fi
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ LDFLAGS="$SAVE_LDFLAGS"
+ # }}}
+@@ -4859,11 +4821,6 @@ then
+ with_librrd="yes (warning: librrd is not thread-safe)"
+ fi
+
+-if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xyes"
+-then
+- with_libiptc="yes (shipped version)"
+-fi
+-
+ if test "x$with_libperl" = "xyes"
+ then
+ with_libperl="yes (version `$perl_interpreter -MConfig -e 'print $Config{version};'`)"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5728144..795de57 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,4 @@
+ SUBDIRS = libcollectdclient
+-if BUILD_WITH_OWN_LIBIPTC
+-SUBDIRS += owniptc
+-endif
+ if BUILD_WITH_OWN_LIBOCONFIG
+ SUBDIRS += liboconfig
+ endif
+@@ -440,12 +437,7 @@ pkglib_LTLIBRARIES += iptables.la
+ iptables_la_SOURCES = iptables.c
+ iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
+ iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
+-if BUILD_WITH_OWN_LIBIPTC
+-iptables_la_LIBADD = owniptc/libiptc.la
+-iptables_la_DEPENDENCIES = owniptc/libiptc.la
+-else
+ iptables_la_LIBADD = -liptc
+-endif
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la
+ endif
+diff --git a/src/iptables.c b/src/iptables.c
+index c39aff8..49454f0 100644
+--- a/src/iptables.c
++++ b/src/iptables.c
+@@ -31,16 +31,8 @@
+
+ #include <sys/socket.h>
+
+-#if OWN_LIBIPTC
+-# include "owniptc/libiptc.h"
+-# include "owniptc/libip6tc.h"
+-
+-# define HAVE_IPTC_HANDLE_T 1
+-# define HAVE_IP6TC_HANDLE_T 1
+-
+-#else /* if !OWN_LIBIPTC */
+-# include <libiptc/libiptc.h>
+-# include <libiptc/libip6tc.h>
++#include <libiptc/libiptc.h>
++#include <libiptc/libip6tc.h>
+
+ /*
+ * iptc_handle_t was available before libiptc was officially available as a
+@@ -54,13 +46,12 @@
+ * this is somewhat hacky, I didn't find better way to solve that :-/
+ * -tokkee
+ */
+-# ifndef HAVE_IPTC_HANDLE_T
++#ifndef HAVE_IPTC_HANDLE_T
+ typedef struct iptc_handle iptc_handle_t;
+-# endif
+-# ifndef HAVE_IP6TC_HANDLE_T
++#endif
++#ifndef HAVE_IP6TC_HANDLE_T
+ typedef struct ip6tc_handle ip6tc_handle_t;
+-# endif
+-#endif /* !OWN_LIBIPTC */
++#endif
+
+ /*
+ * (Module-)Global variables
+diff --git a/src/owniptc/Makefile.am b/src/owniptc/Makefile.am
+deleted file mode 100644
+index d51e993..0000000
+--- a/src/owniptc/Makefile.am
++++ /dev/null
+@@ -1,14 +0,0 @@
+-AUTOMAKE_OPTIONS = foreign no-dependencies
+-
+-EXTRA_DIST = libiptc.c README.collectd
+-
+-if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
+-endif
+-
+-noinst_LTLIBRARIES = libiptc.la
+-
+-libiptc_la_SOURCES = libip4tc.c libip6tc.c \
+- ipt_kernel_headers.h libip6tc.h libiptc.h linux_list.h \
+- xtables.h libxtc.h
+-
+diff --git a/src/owniptc/README.collectd b/src/owniptc/README.collectd
+deleted file mode 100644
+index adb53b0..0000000
+--- a/src/owniptc/README.collectd
++++ /dev/null
+@@ -1,25 +0,0 @@
+- libiptc (IPTables Chains) in collectd
+-=======================================
+-http://netfilter.org/
+-http://collectd.org/
+-
+-About
+------
+-
+- This is libiptc taken from the iptables source distribution. As it is not
+- meant to be a public interface by upstream it is not shipped in some binary
+- distributions. Thus, collectd ships its own copy as a fall-back.
+-
+- The presently available version was imported from iptables 1.4.1.1.
+-
+-Changes to the iptables upstream sources:
+------------------------------------------
+-
+- * Added copyright headers mentioning the "Netfilter Core Team" as copyright
+- holder.
+-
+- * Changed "libiptc/*" includes to "*".
+-
+- * Use the shipped copy of "xtables.h" instead of the one possibly available
+- on the system.
+-
+diff --git a/src/owniptc/ipt_kernel_headers.h b/src/owniptc/ipt_kernel_headers.h
+deleted file mode 100644
+index bf81f6e..0000000
+--- a/src/owniptc/ipt_kernel_headers.h
++++ /dev/null
+@@ -1,45 +0,0 @@
+-/**
+- * This file was imported from the iptables sources.
+- * Copyright (C) 1999-2008 Netfilter Core Team
+- *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by the
+- * Free Software Foundation; only version 2 of the License is applicable.
+- *
+- * This program is distributed in the hope that it will be useful, but
+- * WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with this program; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+- */
+-
+-/* This is the userspace/kernel interface for Generic IP Chains,
+- required for libc6. */
+-#ifndef _FWCHAINS_KERNEL_HEADERS_H
+-#define _FWCHAINS_KERNEL_HEADERS_H
+-
+-#include <limits.h>
+-
+-#if defined(__GLIBC__) && __GLIBC__ == 2
+-#include <netinet/ip.h>
+-#include <netinet/in.h>
+-#include <netinet/ip_icmp.h>
+-#include <netinet/tcp.h>
+-#include <netinet/udp.h>
+-#include <net/if.h>
+-#include <sys/types.h>
+-#else /* libc5 */
+-#include <sys/socket.h>
+-#include <linux/ip.h>
+-#include <linux/in.h>
+-#include <linux/if.h>
+-#include <linux/icmp.h>
+-#include <linux/tcp.h>
+-#include <linux/udp.h>
+-#include <linux/types.h>
+-#include <linux/in6.h>
+-#endif
+-#endif
+diff --git a/src/owniptc/libip4tc.c b/src/owniptc/libip4tc.c
+deleted file mode 100644
+index bf7327c..0000000
+--- a/src/owniptc/libip4tc.c
++++ /dev/null
+@@ -1,517 +0,0 @@
+-/**
+- * This file was imported from the iptables sources.
+- * Copyright (C) 1999-2008 Netfilter Core Team
+- *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by the
+- * Free Software Foundation; only version 2 of the License is applicable.
+- *
+- * This program is distributed in the hope that it will be useful, but
+- * WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with this program; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+- */
+-
+-/* Library which manipulates firewall rules. Version 0.1. */
+-
+-/* Architecture of firewall rules is as follows:
+- *
+- * Chains go INPUT, FORWARD, OUTPUT then user chains.
+- * Each user chain starts with an ERROR node.
+- * Every chain ends with an unconditional jump: a RETURN for user chains,
+- * and a POLICY for built-ins.
+- */
+-
+-/* (C)1999 Paul ``Rusty'' Russell - Placed under the GNU GPL (See
+- COPYING for details). */
+-
+-#include <assert.h>
+-#include <string.h>
+-#include <errno.h>
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <unistd.h>
+-
+-#ifdef DEBUG_CONNTRACK
+-#define inline
+-#endif
+-
+-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
+-typedef unsigned int socklen_t;
+-#endif
+-
+-#include "libiptc.h"
+-
+-#define IP_VERSION 4
+-#define IP_OFFSET 0x1FFF
+-
+-#define HOOK_PRE_ROUTING NF_IP_PRE_ROUTING
+-#define HOOK_LOCAL_IN NF_IP_LOCAL_IN
+-#define HOOK_FORWARD NF_IP_FORWARD
+-#define HOOK_LOCAL_OUT NF_IP_LOCAL_OUT
+-#define HOOK_POST_ROUTING NF_IP_POST_ROUTING
+-#ifdef NF_IP_DROPPING
+-#define HOOK_DROPPING NF_IP_DROPPING
+-#endif
+-
+-#define STRUCT_ENTRY_TARGET struct ipt_entry_target
+-#define STRUCT_ENTRY struct ipt_entry
+-#define STRUCT_ENTRY_MATCH struct ipt_entry_match
+-#define STRUCT_GETINFO struct ipt_getinfo
+-#define STRUCT_GET_ENTRIES struct ipt_get_entries
+-#define STRUCT_COUNTERS struct ipt_counters
+-#define STRUCT_COUNTERS_INFO struct ipt_counters_info
+-#define STRUCT_STANDARD_TARGET struct ipt_standard_target
+-#define STRUCT_REPLACE struct ipt_replace
+-
+-#define STRUCT_TC_HANDLE struct iptc_handle
+-#define TC_HANDLE_T iptc_handle_t
+-
+-#define ENTRY_ITERATE IPT_ENTRY_ITERATE
+-#define TABLE_MAXNAMELEN IPT_TABLE_MAXNAMELEN
+-#define FUNCTION_MAXNAMELEN IPT_FUNCTION_MAXNAMELEN
+-
+-#define GET_TARGET ipt_get_target
+-
+-#define ERROR_TARGET IPT_ERROR_TARGET
+-#define NUMHOOKS NF_IP_NUMHOOKS
+-
+-#define IPT_CHAINLABEL ipt_chainlabel
+-
+-#define TC_DUMP_ENTRIES dump_entries
+-#define TC_IS_CHAIN iptc_is_chain
+-#define TC_FIRST_CHAIN iptc_first_chain
+-#define TC_NEXT_CHAIN iptc_next_chain
+-#define TC_FIRST_RULE iptc_first_rule
+-#define TC_NEXT_RULE iptc_next_rule
+-#define TC_GET_TARGET iptc_get_target
+-#define TC_BUILTIN iptc_builtin
+-#define TC_GET_POLICY iptc_get_policy
+-#define TC_INSERT_ENTRY iptc_insert_entry
+-#define TC_REPLACE_ENTRY iptc_replace_entry
+-#define TC_APPEND_ENTRY iptc_append_entry
+-#define TC_DELETE_ENTRY iptc_delete_entry
+-#define TC_DELETE_NUM_ENTRY iptc_delete_num_entry
+-#define TC_CHECK_PACKET iptc_check_packet
+-#define TC_FLUSH_ENTRIES iptc_flush_entries
+-#define TC_ZERO_ENTRIES iptc_zero_entries
+-#define TC_READ_COUNTER iptc_read_counter
+-#define TC_ZERO_COUNTER iptc_zero_counter
+-#define TC_SET_COUNTER iptc_set_counter
+-#define TC_CREATE_CHAIN iptc_create_chain
+-#define TC_GET_REFERENCES iptc_get_references
+-#define TC_DELETE_CHAIN iptc_delete_chain
+-#define TC_RENAME_CHAIN iptc_rename_chain
+-#define TC_SET_POLICY iptc_set_policy
+-#define TC_GET_RAW_SOCKET iptc_get_raw_socket
+-#define TC_INIT iptc_init
+-#define TC_FREE iptc_free
+-#define TC_COMMIT iptc_commit
+-#define TC_STRERROR iptc_strerror
+-#define TC_NUM_RULES iptc_num_rules
+-#define TC_GET_RULE iptc_get_rule
+-
+-#define TC_AF AF_INET
+-#define TC_IPPROTO IPPROTO_IP
+-
+-#define SO_SET_REPLACE IPT_SO_SET_REPLACE
+-#define SO_SET_ADD_COUNTERS IPT_SO_SET_ADD_COUNTERS
+-#define SO_GET_INFO IPT_SO_GET_INFO
+-#define SO_GET_ENTRIES IPT_SO_GET_ENTRIES
+-#define SO_GET_VERSION IPT_SO_GET_VERSION
+-
+-#define STANDARD_TARGET IPT_STANDARD_TARGET
+-#define LABEL_RETURN IPTC_LABEL_RETURN
+-#define LABEL_ACCEPT IPTC_LABEL_ACCEPT
+-#define LABEL_DROP IPTC_LABEL_DROP
+-#define LABEL_QUEUE IPTC_LABEL_QUEUE
+-
+-#define ALIGN IPT_ALIGN
+-#define RETURN IPT_RETURN
+-
+-#include "libiptc.c"
+-
+-#define IP_PARTS_NATIVE(n) \
+-(unsigned int)((n)>>24)&0xFF, \
+-(unsigned int)((n)>>16)&0xFF, \
+-(unsigned int)((n)>>8)&0xFF, \
+-(unsigned int)((n)&0xFF)
+-
+-#define IP_PARTS(n) IP_PARTS_NATIVE(ntohl(n))
+-
+-int
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/collectd.spec?r1=1.99&r2=1.100&f=u
More information about the pld-cvs-commit
mailing list