Fix usage of kernel headers from /usr/src, wrt bug #285376. Thanks to Coacher <itumaykin AT gmail.com> for patch

(Portage version: 2.2.0_alpha168/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

4 files changed, 28 insertions, 5 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 798fd6138c37..915e620161c5 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.72 2013/03/20 13:23:57 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.73 2013/03/21 09:07:11 pinkbyte Exp $
+
+  21 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> ulogd-1.23-r1.ebuild,
+  +files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch,
+  ulogd-1.24-r2.ebuild:
+  Fix usage of kernel headers from /usr/src, wrt bug #285376. Thanks to Coacher
+  <itumaykin AT gmail.com> for patch
 
   20 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> ulogd-2.0.2.ebuild:
   Fix a typo in sed statement, wrt bug #426868, thanks to Coacher <itumaykin AT
diff --git a/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch b/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch
new file mode 100644
index 000000000000..163d49e6d3ff
--- /dev/null
+++ b/app-admin/ulogd/files/ulogd-1.23-fix-include-in-libipulog-Makefile.patch
@@ -0,0 +1,11 @@
+--- libipulog/Makefile.in.orig	2013-03-20 19:18:05.000692936 +0400
++++ libipulog/Makefile.in	2013-03-20 19:18:12.987692835 +0400
+@@ -1,7 +1,7 @@
+ #
+ 
+ include @top_srcdir@/Rules.make
+-CFLAGS+=-Iinclude -I/usr/src/linux/include
++CFLAGS+=-Iinclude
+ 
+ libipulog.a: libipulog.o
+ 	$(LD) -i $< -o $@
diff --git a/app-admin/ulogd/ulogd-1.23-r1.ebuild b/app-admin/ulogd/ulogd-1.23-r1.ebuild
index ca00c6b5f43d..743997975bfb 100644
--- a/app-admin/ulogd/ulogd-1.23-r1.ebuild
+++ b/app-admin/ulogd/ulogd-1.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.9 2011/07/02 10:27:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.23-r1.ebuild,v 1.10 2013/03/21 09:07:11 pinkbyte Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,6 +25,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-gcc41.patch"
 	EPATCH_OPTS="-F3" \
 		epatch "${WORKDIR}/${PN}-glsa-200701.patch"
+
+	# bug #285376
+	epatch "${FILESDIR}/${P}-fix-include-in-libipulog-Makefile.patch"
 }
 
 src_compile() {
diff --git a/app-admin/ulogd/ulogd-1.24-r2.ebuild b/app-admin/ulogd/ulogd-1.24-r2.ebuild
index 14ca42b1aa21..fc77e9ae4432 100644
--- a/app-admin/ulogd/ulogd-1.24-r2.ebuild
+++ b/app-admin/ulogd/ulogd-1.24-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.6 2012/05/31 03:00:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24-r2.ebuild,v 1.7 2013/03/21 09:07:11 pinkbyte Exp $
 
 EAPI="1"
 
@@ -48,6 +48,9 @@ src_unpack() {
 		sed -i -e 's/$(LD)/$(CC) -nostartfiles/' $f || die "failed to update $f"
 	done
 
+	# bug #285376
+	epatch "${FILESDIR}/${PN}-1.23-fix-include-in-libipulog-Makefile.patch"
+
 	eautoconf
 }