Fix building with sys-devel/bison-3* (bug #485914, patch by Charlie Gehlin).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 47 insertions, 11 deletions

diff --git a/net-analyzer/libnasl/ChangeLog b/net-analyzer/libnasl/ChangeLog
index 3d0409f1f275..c64829fe2639 100644
--- a/net-analyzer/libnasl/ChangeLog
+++ b/net-analyzer/libnasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/libnasl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/ChangeLog,v 1.95 2014/10/12 10:21:12 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/ChangeLog,v 1.96 2015/03/16 06:42:41 jer Exp $
+
+  16 Mar 2015; Jeroen Roovers <jer@gentoo.org> libnasl-2.2.9-r1.ebuild,
+  +files/libnasl-2.2.9-bison3.patch:
+  Fix building with sys-devel/bison-3* (bug #485914, patch by Charlie Gehlin).
 
   12 Oct 2014; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove short <longdescription>.
diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
index 2c912f22e764..d53009ce8ed4 100644
--- a/net-analyzer/libnasl/Manifest
+++ b/net-analyzer/libnasl/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libnasl-2.2.9-bison3.patch 596 SHA256 55bead62fa79fe13fadbec2b5d8e2350388405a6d3390c6feccd43984e5491e4 SHA512 29d03681ffac9b050ff8bc5aa5641c70ebfd6523810e22941e7b262bb1591e3c2d59b3c863725e9dd5ff696ad1a5f2d2b573784607022afd62d33fcaee5822c4 WHIRLPOOL 6fef0e20d1589534152856a3d3fd836f04640c863e2657f569675cffd30cd7e533ccb3b8bc756ff7369230eea5c95456e5ba2fad040f5e6aa6fcd2ef754f7806
 AUX libnasl-2.2.9-gentoo.patch 929 SHA256 3eb28fdcd664b2b88b055d85a9b27a102d426c179a74bad332b7fb04a1dfdc79 SHA512 7d4fe54240b771f30f1b80e35be828868428ad24b3654aedb91ef5da42f2bde379347a4730e71f04edb373ab9d7a6be981769eef7aa3514d4275177391f7290f WHIRLPOOL 8b02b2986c1293b87d7d40a18f291dae5cb90c4717fcf1f3f0580ca813b1ae6741e1cd17b6dfada5ae21d8e47dd11d511041a817ae318c01e15f461986f10d27
 AUX libnasl-2.2.9-openssl-1.patch 844 SHA256 b277cc237d1920d424c9c51c10609829550cf5dfce2915a45ec63c76288cabd1 SHA512 d39c7d89166aa2274dead9378e5b8c763672830aaa7ae7ee9166137aa984aa9d2497ebdfaf6312356c78c95404a763e3b6b9ab58a460cc1bfc8a9c8d1db8590e WHIRLPOOL 78383fc29afa2184d23788b31679c61e4d33d902da2ee6bf3f3e40ea5268d1764faa62f6eabd4990c4db98fb4a2fb4d39191d015aad95391d97a988f416182fe
 DIST libnasl-2.2.9.tar.gz 366960 SHA256 2d9cebfe69e40963d790295993e096697a0bed37774b66ee8b14e48c2231fa93 SHA512 74a637d39f0d61c9e0f692d3a6754000ef635690a61b05c88608fd5bbee438ce720597babe25af80bccd4fca52f22531b3fc913820a13147c179f8a16c034e03 WHIRLPOOL 3d02768d18451c0a648f56bb55a118587c77598c1cefb1fba4db538b9266016f76710038e714813bfbce392a3054115a2345413269cbb58246519baee9338f83
-EBUILD libnasl-2.2.9-r1.ebuild 1062 SHA256 76b61c46e71a3fb1961e402c580ed26ef46382d3b47d53db37f2ecca83de7111 SHA512 7efbad5ec82ac8d67bd9de5d8b8d1e16d68b1737c263447747ecc129bc8d4e08e27cb1f4e05a94fc51a6cefc3937e045de5a8dae8aa31fc52423e1299b93c164 WHIRLPOOL 2822d9d26c34efd86b5df2bb15c7182ddd22b8d0cacef18e9afa5acb637487d5e0388b90e521d8afce5fc80a7b628321cca24eaa1cb38d53daaf84e720d87d13
-MISC ChangeLog 12659 SHA256 6d4f28b758a82dcecfd8d1d3b58771d31f25f66101f9a299801b0f819dac08d5 SHA512 388fee411c9dc20f712a365f114f54eb4f04be1c5f018f50303e5aa7941cedd0f536e16c4ee070acac74519d9d0b4896ff8fe5f31ea619d4396046b9241ece2c WHIRLPOOL 98fd6ac20cbb9ef46cb42108c0dd93c586de2ce525f0829bf28de9ab9f2c2cda9c4f3857524928df74f82edd39efee8da01072c60018da479d621fb69c678686
+EBUILD libnasl-2.2.9-r1.ebuild 1099 SHA256 08208074e69ceee80504a26334a319ac4ec22a3ea2626edaa723fd95896c7970 SHA512 83c31b6ec7b55b3a67eaf19e30b235f841a6f9c23696cc2a12f2e863c333005ed45d612644ef13f6712421a98ff0ae4f1b089b2c90642523356dfa9379a415b9 WHIRLPOOL 4340910f19f8a2ac40737796d67dab978235ac94655264b9b8d350a4b075c379cad1ca38dce323eb9a4dd9b2762c2d8452a5fe235ae6ba6dde285ff1632c677a
+MISC ChangeLog 12848 SHA256 32332a94b38402a0d297d3978470cfcbbba8f2a9c75a82b612a256e4ed171bcc SHA512 a6cafbf9331369b2bc220be6deac08ac52c669a8e67ec4e0ddde6bf6799a944b4b76f737f77e2cc5ff02b5a50b9d847f9724d5364c9a566381919792f288562c WHIRLPOOL 84ed5b106b3ae96e98381644e812e55ec0ccd0a0866a9b7b5e701bb553e4a97b946446ab8cd785f983deca15a44ee24b02661c19530cb895f42af9e965b7741f
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ6VhkACgkQVWmRsqeSphPAEgCdFUhjNreQSxW5/w/QNdtvH69B
-GsEAn2MThRUm5zCG/vxotRJd9RSwreKV
-=u7rb
+iEYEAREIAAYFAlUGe2MACgkQVWmRsqeSphMMdACfTsWY5zYzaHNhlILj4/SVdwZx
++KsAn1E9163ZelHFDHFVmRGtO8btAB7N
+=jTnl
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
new file mode 100644
index 000000000000..91f91fa38e09
--- /dev/null
+++ b/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
@@ -0,0 +1,29 @@
+--- a/nasl/nasl_grammar.y
++++ b/nasl/nasl_grammar.y
+@@ -1,4 +1,6 @@
+-%pure_parser
++%pure-parser
++%parse-param {naslctxt * parm}
++%lex-param {naslctxt * parm}
+ %expect 1
+ %{
+ /* Nessus Attack Scripting Language version 2
+@@ -31,7 +33,7 @@
+ #include "nasl_lex_ctxt.h"
+ #include "nasl_debug.h"
+ 
+-static void naslerror(const char *);
++static void naslerror(naslctxt *, const char *);
+ #define YYERROR_VERBOSE
+ %}
+ 
+@@ -465,8 +467,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-static void 
+-naslerror(const char *s)
++static void naslerror(naslctxt *parm, const char *s)
+ {
+   fputs(s, stderr);
+ }
diff --git a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
index 913aa4347cd8..a9c034721879 100644
--- a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
+++ b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild,v 1.5 2014/07/13 13:10:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild,v 1.6 2015/03/16 06:42:41 jer Exp $
 
 EAPI=5
-
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A remote security scanner for Linux (libnasl)"
@@ -28,10 +27,13 @@ S=${WORKDIR}/${PN}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-openssl-1.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-bison3.patch
+
 	sed \
 		-e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
 		-i nasl.tmpl.in || die
+
 	tc-export CC
 }