Hello community, here is the log from the commit of package ipsec-tools for openSUSE:Factory checked in at 2013-01-31 14:50:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipsec-tools (Old) and /work/SRC/openSUSE:Factory/.ipsec-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipsec-tools", Maintainer is "jbo...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ipsec-tools/ipsec-tools.changes 2012-11-02 15:12:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ipsec-tools.new/ipsec-tools.changes 2013-01-31 14:50:06.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Jan 31 06:48:18 UTC 2013 - m...@suse.com + +- Add ipsec-tools-linux-3.7-compat.diff(partly from openwrt) + * since pfkeyv2.h moved to include/uapi/linux as + http://lwn.net/Articles/507794/ explained, make the compiler found + header in valid path. there is a discussion about this issue at + https://dev.openwrt.org/ticket/12813 + +------------------------------------------------------------------- New: ---- ipsec-tools-linux-3.7-compat.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.O7Uivw/_old 2013-01-31 14:50:08.000000000 +0100 +++ /var/tmp/diff_new_pack.O7Uivw/_new 2013-01-31 14:50:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ipsec-tools # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ Patch1: racoon.psk.patch Patch2: ipsec-tools-0.7.3-linkerflag.patch Patch3: ipsec-tools-0.7.2-nodevel.patch +Patch4: ipsec-tools-linux-3.7-compat.diff Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -71,6 +72,7 @@ %patch1 -p1 %patch2 %patch3 -p1 +%patch4 -p1 ./bootstrap sed -i 's|-Werror||g' configure @@ -82,6 +84,7 @@ --sysconfdir=/etc/racoon \ --sharedstatedir=/var/run \ --localstatedir=/var/run \ + --with-kernel-headers="/usr/src/linux/include" \ --enable-dpd \ --enable-hybrid \ --enable-frag \ ++++++ ipsec-tools-linux-3.7-compat.diff ++++++ Index: ipsec-tools-0.7.3/configure.ac =================================================================== --- ipsec-tools-0.7.3.orig/configure.ac +++ ipsec-tools-0.7.3/configure.ac @@ -75,9 +75,10 @@ case "$host_os" in [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , - [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, - KERNEL_INCLUDE=/usr/src/linux/include , - [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) + [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, , + [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, + KERNEL_INCLUDE=/usr/src/linux/include , + [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] ) AC_SUBST(KERNEL_INCLUDE) # We need the configure script to run with correct kernel headers. # However we don't want to point to kernel source tree in compile time, @@ -654,7 +655,14 @@ AC_EGREP_CPP(yes, #ifdef SADB_X_EXT_NAT_T_TYPE yes #endif -], [kernel_natt="yes"]) +], [kernel_natt="yes"], [ + AC_EGREP_CPP(yes, + [#include <uapi/linux/pfkeyv2.h> + #ifdef SADB_X_EXT_NAT_T_TYPE + yes + #endif + ], [kernel_natt="yes"]) +]) ;; freebsd*|netbsd*) # NetBSD case Index: ipsec-tools-0.7.3/src/include-glibc/Makefile.am =================================================================== --- ipsec-tools-0.7.3.orig/src/include-glibc/Makefile.am +++ ipsec-tools-0.7.3/src/include-glibc/Makefile.am @@ -1,14 +1,7 @@ - -.includes: ${top_builddir}/config.status - ln -sf $(KERNEL_INCLUDE)/linux - touch .includes - -all: .includes - EXTRA_DIST = \ glibc-bugs.h \ net/pfkeyv2.h \ netinet/ipsec.h \ sys/queue.h -DISTCLEANFILES = .includes linux +DISTCLEANFILES = linux -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
