From: Alec Warner Date: Tue, 23 Jan 2007 03:03:23 +0000 (+0000) Subject: patch the configure.in thanks to code from steven debock and bug # 144154 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f60e22c864a4273e1d56fe55417182cf53b02a34;p=gentoo.git patch the configure.in thanks to code from steven debock and bug # 144154 Package-Manager: portage-2.1.1-r2 --- diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog index 83e8ebce0c7f..66d419f4ed81 100644 --- a/app-admin/ulogd/ChangeLog +++ b/app-admin/ulogd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/ulogd # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.39 2007/01/17 19:40:37 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.40 2007/01/23 03:03:22 antarus Exp $ + + 23 Jan 2007; Alec Warner + +files/configure-fixes.patch, ulogd-1.24.ebuild: + patch the configure.in thanks to code from steven debock and bug # 144154 *ulogd-1.24 (17 Jan 2007) diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest index fb74fc960405..3916f70889c5 100644 --- a/app-admin/ulogd/Manifest +++ b/app-admin/ulogd/Manifest @@ -1,3 +1,7 @@ +AUX configure-fixes.patch 1519 RMD160 b877e8e91d297f3a2c7ffe62ac12216d9febec16 SHA1 ddebd675545dd17ee2d4265cd2381313009cc3ed SHA256 e29b46964f815bf8b30f1dd9a84e32e3d11cb2e28878bea26315f42d9f0b6495 +MD5 85e704e70f596276d72ad8d0f2140466 files/configure-fixes.patch 1519 +RMD160 b877e8e91d297f3a2c7ffe62ac12216d9febec16 files/configure-fixes.patch 1519 +SHA256 e29b46964f815bf8b30f1dd9a84e32e3d11cb2e28878bea26315f42d9f0b6495 files/configure-fixes.patch 1519 AUX ulogd 735 RMD160 2b913c9e679d1f2ab449c814ce849dcd58bd17d8 SHA1 8592dcfd9fba4e290f8aa73aa169bf9203997bcb SHA256 d104ef5e0501bdb2128d75a949b211298df4584dc5227b128989edb688355054 MD5 e5952182c592a721008cff1051d53a9c files/ulogd 735 RMD160 2b913c9e679d1f2ab449c814ce849dcd58bd17d8 files/ulogd 735 @@ -30,14 +34,14 @@ EBUILD ulogd-1.23.ebuild 1398 RMD160 9b4f6bb099d07e0d3e4e1deeb0d62e79f4de18a7 SH MD5 e2da87c0b2f303d7be3dcce44c76a46e ulogd-1.23.ebuild 1398 RMD160 9b4f6bb099d07e0d3e4e1deeb0d62e79f4de18a7 ulogd-1.23.ebuild 1398 SHA256 bc991aa566d701cde3f104fd71344aae690b8e7be4d5c4d9152569733d86dd96 ulogd-1.23.ebuild 1398 -EBUILD ulogd-1.24.ebuild 1392 RMD160 2a8c3a2672fc7388ddf678157d51cbf925fdedab SHA1 f883f3f7bb7c5793aa0f0f0b8bbc9effba9b56f7 SHA256 c713536b6ad6981272c5a006c60ea060a8f7df9d06ab6bb2f37b01169fbd17b7 -MD5 3b18568397d5bea4f84ee688ea0f2f2f ulogd-1.24.ebuild 1392 -RMD160 2a8c3a2672fc7388ddf678157d51cbf925fdedab ulogd-1.24.ebuild 1392 -SHA256 c713536b6ad6981272c5a006c60ea060a8f7df9d06ab6bb2f37b01169fbd17b7 ulogd-1.24.ebuild 1392 -MISC ChangeLog 4853 RMD160 12721ae01676daa761e3f285aab7be3ebf6c3013 SHA1 831b032cfee73df3f587f4e7c3798982d888f5ca SHA256 d159bf80d857f86dfd3dcae17522fd4ac1b5ebc919149fba07f9c4027557c8a3 -MD5 a232cabfb0cbd5123a7ec15064c6a948 ChangeLog 4853 -RMD160 12721ae01676daa761e3f285aab7be3ebf6c3013 ChangeLog 4853 -SHA256 d159bf80d857f86dfd3dcae17522fd4ac1b5ebc919149fba07f9c4027557c8a3 ChangeLog 4853 +EBUILD ulogd-1.24.ebuild 1590 RMD160 3280e376f79877473d89e9bb5a72abccefe84ab7 SHA1 55ee4e66bd7fbe078d29d1b5e5f08133bf254c57 SHA256 88fe82ba1c844ca0f88d7315a32afe143d751a51699f4bb27d00c471da77c8b2 +MD5 852752e204cac7f5320136721a41d098 ulogd-1.24.ebuild 1590 +RMD160 3280e376f79877473d89e9bb5a72abccefe84ab7 ulogd-1.24.ebuild 1590 +SHA256 88fe82ba1c844ca0f88d7315a32afe143d751a51699f4bb27d00c471da77c8b2 ulogd-1.24.ebuild 1590 +MISC ChangeLog 5029 RMD160 029f9c7fa3621351e6810ea0d1fbc49039517db4 SHA1 70f4f0db0de5858ef896587469497357b070c0ce SHA256 fe4e8d3a412cf259b6529c14ffb4f6ba79394e6e1a873721f8173f32e2ec3e38 +MD5 899ea3f6f311b6f39dbd65280d29dc3b ChangeLog 5029 +RMD160 029f9c7fa3621351e6810ea0d1fbc49039517db4 ChangeLog 5029 +SHA256 fe4e8d3a412cf259b6529c14ffb4f6ba79394e6e1a873721f8173f32e2ec3e38 ChangeLog 5029 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160 diff --git a/app-admin/ulogd/files/configure-fixes.patch b/app-admin/ulogd/files/configure-fixes.patch new file mode 100644 index 000000000000..206404445ece --- /dev/null +++ b/app-admin/ulogd/files/configure-fixes.patch @@ -0,0 +1,60 @@ +--- configure.in.orig 2007-01-21 15:37:46.000000000 +0100 ++++ configure.in 2007-01-22 21:23:34.000000000 +0100 +@@ -34,14 +34,14 @@ + dnl + dnl test for MySQL + dnl +-AC_ARG_WITH(mysql, +- --with-mysql= mysql installed in ,[ +-if test $withval != yes +-then ++AC_ARG_WITH(mysql, AS_HELP_STRING([--with-mysql=],[mysql installed in ]),[with_mysql=$withval ++],[with_mysql=no]) ++if test $withval != yes -a $withval != no ; then + dir=$withval + else + dir="/usr/local" + fi ++if test $withval != no; then + mysqldir="" + AC_MSG_CHECKING(for MySQL files) + for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql +@@ -108,8 +108,7 @@ + fi + + fi +-]) +- ++fi + + dnl + dnl Check whether the user wants log IP-addresses as strings rather +@@ -130,14 +129,16 @@ + dnl + dnl test for PostgreSQL + dnl +-AC_ARG_WITH(pgsql, +- --with-pgsql= pgsql installed in ,[ +-if test $withval != yes ++ ++AC_ARG_WITH(pgsql, AS_HELP_STRING([--with-pgsql=],[pgsql installed in ]),[with_mysql=$withval],[with_mysql=no]) ++if test $withval != yes -a $withval != no + then + dir=$withval + else + dir="/usr/local" + fi ++if test $withval = yes ++then + pgsqldir="" + AC_MSG_CHECKING(for PGSQL files) + for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql +@@ -181,7 +182,7 @@ + AC_SUBST(PGSQL_LIB) + + fi +-]) ++fi + + dnl + dnl Check whether the user wants to log IP-addresses as strings rather diff --git a/app-admin/ulogd/ulogd-1.24.ebuild b/app-admin/ulogd/ulogd-1.24.ebuild index 390ee1e7aa28..4ed0ec249614 100644 --- a/app-admin/ulogd/ulogd-1.24.ebuild +++ b/app-admin/ulogd/ulogd-1.24.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24.ebuild,v 1.1 2007/01/17 19:40:37 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.24.ebuild,v 1.2 2007/01/23 03:03:22 antarus Exp $ -inherit eutils flag-o-matic +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" +inherit eutils flag-o-matic autotools DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging" SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2" @@ -21,6 +23,9 @@ src_compile() { # enables logfiles over 2G (#74924) append-lfs-flags + epatch "${FILESDIR}/configure-fixes.patch" + ewarn "Regenerating build system (this may take a bit)..." + eautoconf || die "Autoreconf failed" econf \ $(use_with mysql) \ $(use_with postgres pgsql) \