diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-07-13 18:39:17 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-07-13 18:39:17 +0000 |
| commit | 00c9c1fbc843a18083383440151fa501a7c9125b (patch) | |
| tree | c6ccfa651a1f0d4459a02ff89cd881e9bd72a144 /sys-kernel | |
| parent | sync IUSE (-gnome) (Manifest recommit) (diff) | |
| download | gentoo-2-00c9c1fbc843a18083383440151fa501a7c9125b.tar.gz gentoo-2-00c9c1fbc843a18083383440151fa501a7c9125b.tar.bz2 gentoo-2-00c9c1fbc843a18083383440151fa501a7c9125b.zip | |
Added a compile fix for OpenSWAN when debugging is turned off. Closes bug #56822.
Diffstat (limited to 'sys-kernel')
3 files changed, 41 insertions, 2 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog index c76f69ab637a..6484280350ef 100644 --- a/sys-kernel/gentoo-sources/ChangeLog +++ b/sys-kernel/gentoo-sources/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/gentoo-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.79 2004/07/12 19:04:00 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.80 2004/07/13 18:39:17 plasmaroo Exp $ + + 13 Jul 2004; <plasmaroo@gentoo.org> gentoo-sources-2.4.26-r6.ebuild, + +files/gentoo-sources-2.4.26-OpenSWAN-CompileFix.patch: + Added a compile fix for OpenSWAN when debugging is turned off. Closes bug + #56822. *gentoo-sources-2.4.26-r6 (12 Jul 2004) diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.26-OpenSWAN-CompileFix.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.26-OpenSWAN-CompileFix.patch new file mode 100644 index 000000000000..065a1a378f92 --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.26-OpenSWAN-CompileFix.patch @@ -0,0 +1,33 @@ +diff -ur linux-2.4.26-gentoo-r5/include/freeswan/ipsec_rcv.h linux-2.4.26-gentoo-r6/include/freeswan/ipsec_rcv.h +--- linux-2.4.26-gentoo-r5/include/freeswan/ipsec_rcv.h 2004-07-13 17:41:55.589176744 +0100 ++++ linux-2.4.26-gentoo-r6/include/freeswan/ipsec_rcv.h 2004-07-13 17:40:32.749770248 +0100 +@@ -134,8 +134,10 @@ + + #ifdef CONFIG_IPSEC_DEBUG + extern int debug_rcv; ++#define ipsec_rcv_dmp(_x,_y, _z) if (debug_rcv && sysctl_ipsec_debug_verbose) ipsec_dmp(_x,_y,_z) ++#else ++#define ipsec_rcv_dmp(_x,_y, _z) {} + #endif /* CONFIG_IPSEC_DEBUG */ +-#define ipsec_rcv_dmp(_x,_y, _z) if (debug_rcv && sysctl_ipsec_debug_verbose) ipsec_dmp(_x,_y,_z) + + extern int sysctl_ipsec_inbound_policy_check; + #endif /* __KERNEL__ */ +diff -ur linux-2.4.26-gentoo-r5/include/freeswan/ipsec_xmit.h linux-2.4.26-gentoo-r6/include/freeswan/ipsec_xmit.h +--- linux-2.4.26-gentoo-r5/include/freeswan/ipsec_xmit.h 2004-07-09 15:56:33.000000000 +0100 ++++ linux-2.4.26-gentoo-r6/include/freeswan/ipsec_xmit.h 2004-07-13 17:16:15.614288512 +0100 +@@ -127,11 +127,11 @@ + #ifdef CONFIG_IPSEC_DEBUG + extern int debug_tunnel; + extern int sysctl_ipsec_debug_verbose; +-#endif /* CONFIG_IPSEC_DEBUG */ +- + #define debug_xmit debug_tunnel +- + #define ipsec_xmit_dmp(_x,_y, _z) if (debug_xmit && sysctl_ipsec_debug_verbose) ipsec_dmp(_x,_y,_z) ++#else ++#define ipsec_xmit_dmp(_x,_y, _z) {} ++#endif /* CONFIG_IPSEC_DEBUG */ + + extern int sysctl_ipsec_icmp; + extern int sysctl_ipsec_tos; diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r6.ebuild index 0881bfc330ae..8c0dd86df601 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r6.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r6.ebuild,v 1.1 2004/07/12 19:04:00 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r6.ebuild,v 1.2 2004/07/13 18:39:17 plasmaroo Exp $ ETYPE="sources" inherit kernel-2 @@ -11,6 +11,7 @@ UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch + ${FILESDIR}/${P}-OpenSWAN-CompileFix.patch ${DISTDIR}/${PF}.tar.bz2" DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" |