# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2

  01 Aug 2009; Nathan Brink <ohnobinki@gentoo.org> +confuse-2.6-r4.ebuild,

  +files/confuse-2.6-relativeincludes.patch:

  Added relative includes patch

AUX confuse-2.6-relativeincludes.patch 1562 RMD160 099b59694450e377fe057bed1b6150cde1dac24f SHA1 fb53dce15875c34d081cfbb6accf97cf88ba73c8 SHA256 17f23a048492fa6b038c7ec114fb6d477cfc411eefc88ffcc2c7b28dbf460a84

EBUILD confuse-2.6-r4.ebuild 1581 RMD160 37c99b72457bc2a9cbd1fb68d73f8f049eef0859 SHA1 5a39c860d218363d6f35a7e1f1f57b65d6a98199 SHA256 9af50fa8d4d0aecdbed609be27110206d0be934f9f83ca2800a168cb008935ca

MISC ChangeLog 5315 RMD160 2ac751fcab57d0de0e2ddc30201c09f5fb40e783 SHA1 8f827df311f972601a6144339f51bb8cf52355c1 SHA256 c159c0360277a8ab10e5af1bb1746d0b9661a4d3ecbc7a9a1abb5295f3aa1d58

# Copyright 1999-2009 Gentoo Foundation

# Distributed under the terms of the GNU General Public License v2

# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.6-r3.ebuild,v 1.6 2008/12/17 22:09:10 maekke Exp $

inherit eutils autotools

DESCRIPTION="a configuration file parser library"

HOMEPAGE="http://www.nongnu.org/confuse/"

SRC_URI="http://bzero.se/confuse/${P}.tar.gz"

LICENSE="LGPL-2"

SLOT="0"

KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd x86 ~x86-fbsd"

IUSE="nls"

DEPEND="sys-devel/flex

	sys-devel/libtool

	dev-util/pkgconfig

	nls? ( sys-devel/gettext )"

RDEPEND="nls? ( virtual/libintl )"

pkg_setup() {

	ewarn "This copy of confuse has a patch that causes cfg_include"

	ewarn "to include files relative to the file calling cfg_include."

	ewarn "This may break packages designed for vanilla confuse. Please"

	ewarn "bug me at https://ohnopublishing.net/bugs/ if you have problems"

	ewarn "with this."

}

src_unpack() {

	unpack ${A}

	cd "${S}"

	# bug #236347

	epatch "${FILESDIR}"/${P}-O0.patch

	# bug 239020

	epatch "${FILESDIR}"/${P}-solaris.patch

	# don't compile examples:

	epatch "${FILESDIR}"/${P}-noexamples.patch

	#relative cfg_include()s

	epatch "${FILESDIR}"/${P}-relativeincludes.patch

	# drop -Werror, bug #208095

	sed -i -e 's/-Werror//' */Makefile.* || die

	eautoreconf

}

src_compile() {

	econf --enable-shared --disable-examples || die

	emake || die

}

src_install() {

	emake DESTDIR="${D}" install || die

	doman doc/man/man3/*.3

	dodoc AUTHORS NEWS README

	dodoc examples/*.c examples/*.conf

	dohtml doc/html/* || die

}

--- a/src/lexer.l

+++ b/src/lexer.l

@@ -298,12 +298,51 @@ int cfg_lexer_include(cfg_t *cfg, const char *filename)

     cfg_include_stack[cfg_include_stack_ptr].line = cfg->line;

     cfg_include_stack_ptr++;

-    xfilename = cfg_tilde_expand(filename);

+    xfilename = NULL;

+

+    if(filename[0] != '/'

+       && filename[0] != '~'

+       /* ensure that the existing file has directories in it */

+#ifdef _WIN32

+       && (strchr(cfg->filename, '\\')

+	   || strchr(cfg->filename, '/'))

+#else

+       && cfg->filename[0] == '/'

+#endif

+       )

+      /* then this path is relative to the file it was included from */

+      {

+	char *lastslash;

+	size_t prefixlen;

+

+	lastslash = strrchr(cfg->filename, '/');

+#ifdef _WIN32

+	{

+	  char *win32slash;

+

+	  win32slash = strrchr(cfg->filename, '\\');

+	  if(!lastslash

+	     || win32slash > lastslash)

+	    lastslash = win32slash;

+	}

+#endif

+	assert(lastslash);

+	prefixlen = lastslash - cfg->filename + 1; /* length of prefix including slash */

+	xfilename = malloc(prefixlen

+			   + strlen(filename)

+			   + 1); /* NULL terminator */

+	assert(xfilename);

+	strncpy(xfilename, cfg->filename, prefixlen);

+	strcpy(xfilename + prefixlen, filename);

+      }

+

+    if(!xfilename)

+      xfilename = cfg_tilde_expand(filename);

     cfg_yyin = fopen(xfilename, "r");

     if(!cfg_yyin) {

-        cfg_error(cfg, "%s: %s", xfilename, strerror(errno));

+        cfg_error(cfg, "%s (expanded from %s): %s", xfilename, filename, strerror(errno));

         free(xfilename);

         return 1;

     }