rpms/libnetfilter_log/devel libnetfilter_log-configure.patch, NONE, 1.1 libnetfilter_log-sysheader.patch, NONE, 1.1 libnetfilter_log.spec, 1.4, 1.5
Paul P Komkoff Jr (stingray)
fedora-extras-commits at redhat.com
Fri Apr 4 23:39:05 UTC 2008
- Previous message (by thread): rpms/galeon/devel sources,1.11,1.12 .cvsignore,1.10,1.11
- Next message (by thread): rpms/jna/devel jna-3.0.2-dynlink-and-cflags.patch, NONE, 1.1 jna-3.0.2-loadlibrary.patch, NONE, 1.1 jna.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: stingray
Update of /cvs/extras/rpms/libnetfilter_log/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23335
Modified Files:
libnetfilter_log.spec
Added Files:
libnetfilter_log-configure.patch
libnetfilter_log-sysheader.patch
Log Message:
libnetfilter_log-0.0.13-6
libnetfilter_log-configure.patch:
--- NEW FILE libnetfilter_log-configure.patch ---
diff --git a/configure.in b/configure.in
index e9d1e1b..11a1bb7 100644
--- a/configure.in
+++ b/configure.in
@@ -18,8 +18,16 @@ case $target in
*) AC_MSG_ERROR([Linux only, dude!]);;
esac
-AC_CHECK_LIB(nfnetlink, nfnl_subsys_open, AC_MSG_RESULT(found), AC_MSG_ERROR([libnfnetlink 0.0.16 or later needed]))
-AC_CHECK_HEADER([libnfnetlink/linux_nfnetlink.h], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([libnfnetlink 0.0.16 or later needed])])
+dnl Dependencies
+LIBNFNETLINK_REQUIRED=0.0.16
+
+PKG_CHECK_MODULES(LIBNFNETLINK, libnfnetlink >= $LIBNFNETLINK_REQUIRED,,
+ AC_MSG_ERROR(Cannot find libnfnetlink >= $LIBNFNETLINK_REQUIRED))
+
+CFLAGS="$CFLAGS $LIBNFNETLINK_CFLAGS"
+LIBNFLOG_LIBS="$LIBNFNETLINK_LIBS"
+
+AC_SUBST(LIBNFLOG_LIBS)
dnl Output the makefile
AC_OUTPUT(Makefile src/Makefile include/Makefile include/libnetfilter_log/Makefile utils/Makefile libnetfilter_log.pc)
diff --git a/src/Makefile.am b/src/Makefile.am
index ba135b7..6e5183d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@
LIBVERSION=2:0:1
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS=-fPIC -Wall
-LIBS=
+AM_CFLAGS = -fPIC -Wall
+LIBS = @LIBNFLOG_LIBS@
lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
libnetfilter_log-sysheader.patch:
--- NEW FILE libnetfilter_log-sysheader.patch ---
diff --git a/include/libnetfilter_log/Makefile.am b/include/libnetfilter_log/Makefile.am
index fe934f1..7c026fe 100644
--- a/include/libnetfilter_log/Makefile.am
+++ b/include/libnetfilter_log/Makefile.am
@@ -1,3 +1 @@
-
-pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
-
+pkginclude_HEADERS = libnetfilter_log.h libipulog.h
diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
index 5615daf..3a184af 100644
--- a/include/libnetfilter_log/libnetfilter_log.h
+++ b/include/libnetfilter_log/libnetfilter_log.h
@@ -9,7 +9,11 @@
#ifndef __LIBNETFILTER_LOG_H
#define __LIBNETFILTER_LOG_H
-#include <libnetfilter_log/linux_nfnetlink_log.h>
+#ifndef aligned_be64
+#define aligned_be64 __be64 __attribute__((aligned(8)))
+#endif
+
+#include <linux/netfilter/nfnetlink_log.h>
struct nflog_handle;
struct nflog_g_handle;
diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h
deleted file mode 100644
index 12787e7..0000000
--- a/include/libnetfilter_log/linux_nfnetlink_log.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef _NFNETLINK_LOG_H
-#define _NFNETLINK_LOG_H
-
-#ifndef aligned_u64
-#define aligned_u64 unsigned long long __attribute__((aligned(8)))
-#endif
-
-/* This file describes the netlink messages (i.e. 'protocol packets'),
- * and not any kind of function definitions. It is shared between kernel and
- * userspace. Don't put kernel specific stuff in here */
-
-#include <linux/types.h>
-#include <libnfnetlink/linux_nfnetlink.h>
-
-enum nfulnl_msg_types {
- NFULNL_MSG_PACKET, /* packet from kernel to userspace */
- NFULNL_MSG_CONFIG, /* connect to a particular queue */
-
- NFULNL_MSG_MAX
-};
-
-struct nfulnl_msg_packet_hdr {
- u_int16_t hw_protocol; /* hw protocol (network order) */
- u_int8_t hook; /* netfilter hook */
- u_int8_t _pad;
-} __attribute__ ((packed));
-
-struct nfulnl_msg_packet_hw {
- u_int16_t hw_addrlen;
- u_int16_t _pad;
- u_int8_t hw_addr[8];
-} __attribute__ ((packed));
-
-struct nfulnl_msg_packet_timestamp {
- aligned_u64 sec;
- aligned_u64 usec;
-} __attribute__ ((packed));
-
-#define NFULNL_PREFIXLEN 30 /* just like old log target */
-
-enum nfulnl_attr_type {
- NFULA_UNSPEC,
- NFULA_PACKET_HDR,
- NFULA_MARK, /* u_int32_t nfmark */
- NFULA_TIMESTAMP, /* nfulnl_msg_packet_timestamp */
- NFULA_IFINDEX_INDEV, /* u_int32_t ifindex */
- NFULA_IFINDEX_OUTDEV, /* u_int32_t ifindex */
- NFULA_IFINDEX_PHYSINDEV, /* u_int32_t ifindex */
- NFULA_IFINDEX_PHYSOUTDEV, /* u_int32_t ifindex */
- NFULA_HWADDR, /* nfulnl_msg_packet_hw */
- NFULA_PAYLOAD, /* opaque data payload */
- NFULA_PREFIX, /* string prefix */
- NFULA_UID, /* user id of socket */
- NFULA_SEQ, /* instance-local sequence number */
- NFULA_SEQ_GLOBAL, /* global sequence number */
-
- __NFULA_MAX
-};
-#define NFULA_MAX (__NFULA_MAX - 1)
-
-enum nfulnl_msg_config_cmds {
- NFULNL_CFG_CMD_NONE,
- NFULNL_CFG_CMD_BIND,
- NFULNL_CFG_CMD_UNBIND,
- NFULNL_CFG_CMD_PF_BIND,
- NFULNL_CFG_CMD_PF_UNBIND,
-};
-
-struct nfulnl_msg_config_cmd {
- u_int8_t command; /* nfulnl_msg_config_cmds */
-} __attribute__ ((packed));
-
-struct nfulnl_msg_config_mode {
- u_int32_t copy_range;
- u_int8_t copy_mode;
- u_int8_t _pad;
-} __attribute__ ((packed));
-
-enum nfulnl_attr_config {
- NFULA_CFG_UNSPEC,
- NFULA_CFG_CMD, /* nfulnl_msg_config_cmd */
- NFULA_CFG_MODE, /* nfulnl_msg_config_mode */
- NFULA_CFG_NLBUFSIZ, /* u_int32_t buffer size */
- NFULA_CFG_TIMEOUT, /* u_int32_t in 1/100 s */
- NFULA_CFG_QTHRESH, /* u_int32_t */
- NFULA_CFG_FLAGS, /* u_int16_t */
- __NFULA_CFG_MAX
-};
-#define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
-
-#define NFULNL_COPY_NONE 0x00
-#define NFULNL_COPY_META 0x01
-#define NFULNL_COPY_PACKET 0x02
-
-#define NFULNL_CFG_F_SEQ 0x0001
-#define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
-
-#endif /* _NFNETLINK_LOG_H */
diff --git a/src/libnetfilter_log.c b/src/libnetfilter_log.c
index 95537d8..4b64d4a 100644
--- a/src/libnetfilter_log.c
+++ b/src/libnetfilter_log.c
@@ -26,8 +26,6 @@
#include <netinet/in.h>
#include <sys/socket.h>
-#include <libnetfilter_log/linux_nfnetlink_log.h>
-
#include <libnfnetlink/libnfnetlink.h>
#include <libnetfilter_log/libnetfilter_log.h>
Index: libnetfilter_log.spec
===================================================================
RCS file: /cvs/extras/rpms/libnetfilter_log/devel/libnetfilter_log.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnetfilter_log.spec 20 Feb 2008 03:23:26 -0000 1.4
+++ libnetfilter_log.spec 4 Apr 2008 23:38:28 -0000 1.5
@@ -1,14 +1,17 @@
Name: libnetfilter_log
Version: 0.0.13
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Netfilter logging userspace library
Group: System Environment/Libraries
License: GPL
URL: http://netfilter.org
Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
+Patch0: libnetfilter_log-configure.patch
+Patch1: libnetfilter_log-sysheader.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libnfnetlink-devel, pkgconfig
+BuildRequires: libnfnetlink-devel, pkgconfig, kernel-headers
+BuildRequires: autoconf, automake, libtool
%description
libnetfilter_log is a userspace library providing interface to packets that
@@ -22,7 +25,7 @@
%package devel
Summary: Netfilter logging userspace library
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig
+Requires: %{name} = %{version}-%{release}, pkgconfig, kernel-headers
%description devel
libnetfilter_log is a userspace library providing interface to packets that
@@ -35,14 +38,14 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+
+autoreconf -i --force
%build
%configure --disable-static --disable-rpath
-# kill the rpaths
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
make %{?_smp_mflags}
%install
@@ -69,6 +72,9 @@
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sat Apr 5 2008 Paul P Komkoff Jr <i at stingr.net> - 0.0.13-6
+- update to latest svn and to use system netfilter header (fixes the build)
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.0.13-5
- Autorebuild for GCC 4.3
- Previous message (by thread): rpms/galeon/devel sources,1.11,1.12 .cvsignore,1.10,1.11
- Next message (by thread): rpms/jna/devel jna-3.0.2-dynlink-and-cflags.patch, NONE, 1.1 jna-3.0.2-loadlibrary.patch, NONE, 1.1 jna.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list