From e3d3703a56d0341414c2c3eeafbc91e17f7d035c Mon Sep 17 00:00:00 2001 From: Renat Lumpau Date: Wed, 4 Oct 2006 04:38:08 +0000 Subject: Fix bug #146237, bug #146193. (Portage version: 2.1.2_pre1) --- app-admin/webalizer/ChangeLog | 7 +- .../webalizer/files/digest-webalizer-2.01.10-r14 | 12 ++ app-admin/webalizer/webalizer-2.01.10-r14.ebuild | 144 +++++++++++++++++++++ 3 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 app-admin/webalizer/files/digest-webalizer-2.01.10-r14 create mode 100644 app-admin/webalizer/webalizer-2.01.10-r14.ebuild (limited to 'app-admin/webalizer') diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog index 085293e58612..da8de50176d7 100644 --- a/app-admin/webalizer/ChangeLog +++ b/app-admin/webalizer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/webalizer # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.58 2006/07/09 20:26:47 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.59 2006/10/04 04:38:08 rl03 Exp $ + +*webalizer-2.01.10-r14 (04 Oct 2006) + + 04 Oct 2006; Renat Lumpau +webalizer-2.01.10-r14.ebuild: + Fix bug #146237, bug #146193. 09 Jul 2006; Renat Lumpau webalizer-2.01.10-r12.ebuild, webalizer-2.01.10-r13.ebuild: diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r14 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r14 new file mode 100644 index 000000000000..767ec88b914a --- /dev/null +++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r14 @@ -0,0 +1,12 @@ +MD5 570bf2717be8981678dc9b4af2d321fb geolizer_2.01-10-patch.20050520.tar.bz2 35836 +RMD160 b4abd8498b64c0298e6875ee802cdbeec9086806 geolizer_2.01-10-patch.20050520.tar.bz2 35836 +SHA256 0914ec2a2401e8f8ae2735984d18714f5331d864c03347ca56ac3c22fb860378 geolizer_2.01-10-patch.20050520.tar.bz2 35836 +MD5 57a3ccd7fe35c945f913a5d8b90b1946 webalizer-2.01-10-RB16-patch.tar.gz 51133 +RMD160 0d7be87cf50f83df7d9b4ecfec9192a0c57ebc6a webalizer-2.01-10-RB16-patch.tar.gz 51133 +SHA256 47a300dd7433e3021c96cc99768860307366f93c3d3219c9f8d639bec9c202bf webalizer-2.01-10-RB16-patch.tar.gz 51133 +MD5 26d0a3c142423678daed2d6f579525d8 webalizer-2.01-10-src.tar.bz2 252664 +RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 webalizer-2.01-10-src.tar.bz2 252664 +SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262 webalizer-2.01-10-src.tar.bz2 252664 +MD5 896ffc3eb54f42611b2412eafdf87cfc webalizer.conf.gz 8986 +RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 webalizer.conf.gz 8986 +SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71 webalizer.conf.gz 8986 diff --git a/app-admin/webalizer/webalizer-2.01.10-r14.ebuild b/app-admin/webalizer/webalizer-2.01.10-r14.ebuild new file mode 100644 index 000000000000..acb932e240d5 --- /dev/null +++ b/app-admin/webalizer/webalizer-2.01.10-r14.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r14.ebuild,v 1.1 2006/10/04 04:38:08 rl03 Exp $ + +# uses webapp.eclass to create directories with right permissions +# probably slight overkill but works well +inherit eutils webapp db-use autotools + +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" + +MY_PV=${PV/.10/-10} +MY_P=${PN}-${MY_PV} +S=${WORKDIR}/${MY_P} +XTENDED_VER="RB16" +XTENDED_URL="rb16" +DESCRIPTION="Webserver log file analyzer" +HOMEPAGE="http://www.mrunix.net/webalizer/" +SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2 + geoip? ( http://sysd.org/proj/geolizer_${MY_PV}-patch.20050520.tar.bz2 ) + xtended? ( + http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/${PN}-${MY_PV}-${XTENDED_VER}-patch.tar.gz ) + mirror://gentoo/${PN}.conf.gz +" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="apache2 geoip nls xtended" + +DEPEND="!geoip? ( >=sys-libs/db-4.2 ) + >=sys-libs/zlib-1.1.4 + >=media-libs/libpng-1.2 + >=media-libs/gd-1.8.3 + geoip? ( dev-libs/geoip )" + +pkg_setup() { + webapp_pkg_setup + + # prevents "undefined reference" errors... see bug #65163 + if ! built_with_use media-libs/gd png; then + ewarn "media-libs/gd must be built with png for this package" + ewarn "to function." + die "recompile gd with USE=\"png\"" + fi + + # USE=nls has no real meaning if LINGUAS isn't set + if use nls && [ -z "${LINGUAS}" ]; then + ewarn "you must set LINGUAS in /etc/make.conf" + ewarn "if you want to USE=nls" + die "please either set LINGUAS or do not use nls" + fi +} + +src_unpack() { + unpack ${A} ; cd ${S} + + if use geoip; then + epatch ${WORKDIR}/geolizer_${MY_PV}-patch/geolizer.patch || die + use xtended && elog "Xtended doesn't work with geolizer, skipping" + else + epatch ${FILESDIR}/${PN}-db4.2.patch || die + if use xtended; then + epatch ${WORKDIR}/${PN}-${MY_PV}-${XTENDED_VER}-patch || die + fi + fi + + # bug 121816: prevent truncated useragent fields + sed -i -e 's:^#define MAXAGENT 64:#define MAXAGENT 128:' webalizer.h +} + +src_compile() { + local myconf=" --enable-dns \ + --with-db=$(db_includedir) \ + --with-dblib=$(db_libname)" + use geoip && myconf="${myconf} --enable-geoip" + + # really dirty hack; necessary due to a really gross ./configure + # basically, it just sets the natural language the program uses + # unfortunatly, this program only allows for one lang, so only the first + # entry in LINGUAS is used + if use nls; then + local longlang + longlang="$(grep ^${LINGUAS:0:2} ${FILESDIR}/webalizer-language-list.txt)" + myconf="${myconf} --with-language=${longlang:3}" + else + myconf="${myconf} --with-language=english" + fi + + # stupid broken configuration file + eautoreconf + + econf ${myconf} || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + webapp_src_preinst + + into /usr + dobin webalizer + dosym webalizer /usr/bin/webazolver + doman webalizer.1 + + insinto /etc + doins ${WORKDIR}/${PN}.conf + use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf + + dodoc *README* CHANGES Copyright sample.conf ${FILESDIR}/apache.webalizer + webapp_src_install +} + +pkg_postinst(){ + elog + elog "It is suggested that you restart apache before using webalizer" + elog "You may want to review /etc/webalizer.conf and ensure that" + elog "OutputDir is set correctly" + elog + elog "Then just type webalizer to generate your stats." + elog "You can also use cron to generate them e.g. every day." + elog "They can be accessed via http://localhost/webalizer" + elog + elog "A sample Apache config file has been installed into" + elog "/usr/share/doc/${PF}/apache.webalizer" + elog "Please edit and install it as necessary" + elog + + if [ ${#LINGUAS} -gt 2 ] && use nls; then + ewarn + ewarn "You have more than one language in LINGUAS" + ewarn "Due to the limitations of this packge, it was built" + ewarn "only with ${LINGUAS:0:2} support. If this is not what" + ewarn "you intended, please place the language you desire" + ewarn "_first_ in the list of LINGUAS in /etc/make.conf" + ewarn + fi + + if use xtended; then + elog "Read http://www.irc.unizh.ch/users/pfrei/webalizer/${XTENDED_URL}/INSTALL" + elog "if you are switching from stock webalizer to xtended" + fi + + webapp_pkg_postinst +} -- cgit v1.2.3-65-gdbad