#121816: make the useragent field larger

Package-Manager: portage-2.1_pre5-r4

4 files changed, 183 insertions, 7 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 5c394a617b02..5a86605ac7a2 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.51 2006/02/27 01:38:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.52 2006/03/08 19:41:40 smithj Exp $
+
+*webalizer-2.01.10-r13 (08 Mar 2006)
+
+  08 Mar 2006; <smithj@gentoo.org> +webalizer-2.01.10-r13.ebuild:
+  #121816: make the useragent field larger
 
   27 Feb 2006; Jeroen Roovers <jer@gentoo.org> webalizer-2.01.10-r12.ebuild:
   Stable on hppa (bug #106621).
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 73ec3015b7b4..ea5777975818 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 77ed7bdb6e2dcea7033bb3ad829477c6 ChangeLog 7532
-RMD160 80bc2cf7505deca6f32d0bc03ae47a0171c6e270 ChangeLog 7532
-SHA256 3f5fa7c0dfe74350078411f36830f2eea41889d670a4582d4b9df96503a2f305 ChangeLog 7532
+MD5 9230210c10f8444190e2a83656d6e82e ChangeLog 7683
+RMD160 efdca1f1ded990a8fc7a755d8a0c30ed1324e5d5 ChangeLog 7683
+SHA256 f9bcb8c5044ecdddd024c7f4ab56e375e372dd70c750cf87279da8591c401132 ChangeLog 7683
 MD5 f04ad397866d35f9ede71fc6da2392ed files/2.01.10/apache.webalizer 306
 RMD160 cc7e820da4aef6fa5f4078558407b7fe00e6146c files/2.01.10/apache.webalizer 306
 SHA256 3b6107aaa3898b875bc0af0f9addf9b3e077570a210908179e0257562bf52353 files/2.01.10/apache.webalizer 306
@@ -13,6 +13,9 @@ SHA256 768fe5472a89d1338785948416fd4e1d9f3de60bfd5c09a27a3816f093c99d9f files/2.
 MD5 4b57ddf404077972cb8500151be066bd files/digest-webalizer-2.01.10-r12 1319
 RMD160 7ca1db406fcdee6d97f2c2301b726beaf854fe9a files/digest-webalizer-2.01.10-r12 1319
 SHA256 8d25ea7f8a46b22fc68875e96be12c2b738f7f758245aa63d1ab032af972cc19 files/digest-webalizer-2.01.10-r12 1319
+MD5 4b57ddf404077972cb8500151be066bd files/digest-webalizer-2.01.10-r13 1319
+RMD160 7ca1db406fcdee6d97f2c2301b726beaf854fe9a files/digest-webalizer-2.01.10-r13 1319
+SHA256 8d25ea7f8a46b22fc68875e96be12c2b738f7f758245aa63d1ab032af972cc19 files/digest-webalizer-2.01.10-r13 1319
 MD5 556575fd11faab14758f71662b90b6b1 files/digest-webalizer-2.01.10-r4 494
 RMD160 2b32b82dd4ec281f9b232fde987d923fbf9a140b files/digest-webalizer-2.01.10-r4 494
 SHA256 4fb4bcfa97512dd4d7ed1e63e8445ace85ff968b02752ae4ece374dbc885f1ec files/digest-webalizer-2.01.10-r4 494
@@ -37,6 +40,9 @@ SHA256 9406913dbd824f7e31267676defffda846fda6a02ac643a45740cb88219b7a79 metadata
 MD5 a24099a81b51ebe4bab712c3b0466cb1 webalizer-2.01.10-r12.ebuild 4348
 RMD160 9f06490e0d51de6296bd4d2cf70d4dba7f1ac224 webalizer-2.01.10-r12.ebuild 4348
 SHA256 b5a56bf76fabcd1dfc62fc92bbeac9bc41a29fea77ddd45061ee05b2385736d6 webalizer-2.01.10-r12.ebuild 4348
+MD5 a8ad97da99ea81aa9cdb2d3347a119cf webalizer-2.01.10-r13.ebuild 4474
+RMD160 01034bc5a1fcc5bf99ac6dbf177bc9584a23dd2c webalizer-2.01.10-r13.ebuild 4474
+SHA256 f635c6c55b032210ebedb3122a583afbe2788934411fe45df2902a679024d19a webalizer-2.01.10-r13.ebuild 4474
 MD5 4b6414b221213a91af1cbe2553f6f458 webalizer-2.01.10-r4.ebuild 2044
 RMD160 e9373d85bea2783e8e240d575bdc751988cc6a11 webalizer-2.01.10-r4.ebuild 2044
 SHA256 af23eb6246902ced256d3c05c2c397e9e1587e717e37a6432dc8e986d6d0a08e webalizer-2.01.10-r4.ebuild 2044
@@ -46,7 +52,7 @@ SHA256 6bacab1421a42f16f0441e26c6b65d45dba70c1543a3f166e0cc6f0a3987e796 webalize
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEDyrel5AvwDPiUowRAq3GAKCAiUTKreWs69otGIaHFHhZTmh7zwCgg4bS
-+/bDPpwBnYqRH2UnKFkea2c=
-=EE+p
+iD8DBQFEDy/0l5AvwDPiUowRAr8hAKDXk2jjcP6EwdkAmJG8zK/A0jwMfgCeMTjS
+y/zEP/oYMRrZ4M88A4ytf2o=
+=thD/
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.10-r13 b/app-admin/webalizer/files/digest-webalizer-2.01.10-r13
new file mode 100644
index 000000000000..dfe4e4eb9c16
--- /dev/null
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.10-r13
@@ -0,0 +1,15 @@
+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 eaeff1769532b29fa639baf4f174ff59 webalizer-2.01-10-RB07-patch.tar.gz 7778
+RMD160 d7a0e672f5817a6a719b13a3dd46999cd6f3b7df webalizer-2.01-10-RB07-patch.tar.gz 7778
+SHA256 b7318aa386a26964aade84b56346d3ffddec8192a03933556c75cbf3a5b1cdc0 webalizer-2.01-10-RB07-patch.tar.gz 7778
+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 194f592d3c6c8d492165ba73a1541e90 webalizer-search.patch.gz 6424
+RMD160 1db8210754f7b7f4fe49d99d51f01b5e7fbb3d13 webalizer-search.patch.gz 6424
+SHA256 0d9bd3adb4c3e571a9231f0f1a6d689851ff53ffdad9c0e6e3e4e495ff709360 webalizer-search.patch.gz 6424
+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-r13.ebuild b/app-admin/webalizer/webalizer-2.01.10-r13.ebuild
new file mode 100644
index 000000000000..8d4444cdd14a
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.10-r13.ebuild
@@ -0,0 +1,150 @@
+# 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-r13.ebuild,v 1.1 2006/03/08 19:41:40 smithj Exp $
+
+# uses webapp.eclass to create directories with right permissions
+# probably slight overkill but works well
+inherit eutils webapp
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+MY_PV=${PV/.10/-10}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+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/rb07/${PN}-${MY_PV}-RB07-patch.tar.gz )
+	mirror://gentoo/${PN}-search.patch.gz
+	mirror://gentoo/${PN}.conf.gz
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 geoip nls search 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
+
+	if use search && ! use geoip; then
+		einfo "Please enable the geoip USE flag if you wish to use search"
+	fi
+
+	# 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
+		if use search; then
+			epatch ${WORKDIR}/${PN}-search.patch || die
+		fi
+		use xtended && einfo "Xtended doesn't work with geolizer, skipping"
+	else
+		epatch ${FILESDIR}/${PN}-db4.2.patch || die
+		epatch ${FILESDIR}/${PN}-readability.patch || die
+		if use xtended; then
+			epatch ${WORKDIR}/${PN}-${MY_PV}-RB07-patch || die
+		fi
+	fi
+
+	# bugzy 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=/usr/include/db4.2/ \
+		--with-dblib=db-4.2"
+	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
+	autoconf
+
+	econf ${myconf} || die "econf failed"
+
+	emake || die "make 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}/${PV}/apache.webalizer
+	webapp_src_install
+}
+
+pkg_postinst(){
+	einfo
+	einfo "It is suggested that you restart apache before using webalizer"
+	einfo "You may want to review /etc/webalizer.conf and ensure that"
+	einfo "OutputDir is set correctly"
+	einfo
+	einfo "Then just type webalizer to generate your stats."
+	einfo "You can also use cron to generate them e.g. every day."
+	einfo "They can be accessed via http://localhost/webalizer"
+	einfo
+	einfo "A sample Apache config file has been installed into"
+	einfo "/usr/share/doc/${PF}/apache.webalizer"
+	einfo "Please edit and install it as necessary"
+	einfo
+
+	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
+		einfo "Read http://www.irc.unizh.ch/users/pfrei/webalizer/rb07/INSTALL"
+		einfo "if you are switching from stock webalizer to xtended"
+	fi
+
+	webapp_pkg_postinst
+}