[gentoo-commits] gentoo-x86 commit in net-analyzer/sarg: ChangeLog sarg-2.2.2.ebuild sarg-2.2.4.ebuild sarg-2.2.1.ebuild sarg-2.1-r1.ebuild

[gentoo-commits] gentoo-x86 commit in net-analyzer/sarg: ChangeLog sarg-2.2.2.ebuild sarg-2.2.4.ebuild sarg-2.2.1.ebuild sarg-2.1-r1.ebuild

[Peter Volkov (pva)]

pva         08/03/03 16:25:05

  Modified:             ChangeLog sarg-2.2.2.ebuild
  Added:                sarg-2.2.4.ebuild
  Removed:              sarg-2.2.1.ebuild sarg-2.1-r1.ebuild
  Log:
  Version bump, fixes security issue, bug #212208.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.35                 net-analyzer/sarg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	20 Feb 2007 00:28:25 -0000	1.34
+++ ChangeLog	3 Mar 2008 16:25:05 -0000	1.35
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/sarg
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.34 2007/02/20 00:28:25 jokey Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.35 2008/03/03 16:25:05 pva Exp $
+
+*sarg-2.2.4 (03 Mar 2008)
+
+  03 Mar 2008; <pva@gentoo.org> -files/sarg-2.1-datafile.patch,
+  -files/sarg-2.1-laslog.patch, -files/sarg-2.1-sort-options.patch,
+  +files/sarg-2.2.3.1-rewind.patch, -sarg-2.1-r1.ebuild, -sarg-2.2.1.ebuild,
+  sarg-2.2.2.ebuild, +sarg-2.2.4.ebuild:
+  Version bump, fixes security issue, bug #212208.
 
   20 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2



1.5                  net-analyzer/sarg/sarg-2.2.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild?r1=1.4&r2=1.5

Index: sarg-2.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sarg-2.2.2.ebuild	3 Nov 2006 17:25:05 -0000	1.4
+++ sarg-2.2.2.ebuild	3 Mar 2008 16:25:05 -0000	1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild,v 1.4 2006/11/03 17:25:05 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild,v 1.5 2008/03/03 16:25:05 pva Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Fixes bug #43132
 	sed -i \



1.1                  net-analyzer/sarg/sarg-2.2.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/sarg/sarg-2.2.4.ebuild?rev=1.1&content-type=text/plain

Index: sarg-2.2.4.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.4.ebuild,v 1.1 2008/03/03 16:25:05 pva Exp $

inherit eutils

DESCRIPTION="Squid Analysis Report Generator"
HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
		mirror://gentoo/sarg-2.2.3.1-lots-of-compiler-warnings.patch.gz"

LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~x86"
SLOT="0"
IUSE=""

DEPEND="media-libs/gd"

pkg_setup() {
	built_with_use -a media-libs/gd png || die \
	"Please recompile media-libs/gd with USE=\"png\""
}

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${WORKDIR}"/${PN}-2.2.3.1-lots-of-compiler-warnings.patch
	epatch "${FILESDIR}"/${PN}-2.2.3.1-rewind.patch

	# Fixes bug #43132
	sed -i \
	-e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
	-e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
	log.c || die "setting default for gentoo directories... failed"

	sed -i \
	-e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
	-e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
	sarg.conf || die "setting default for gentoo directories... failed"

	# Fixes bug #64743
	sed -i -e 's:sarg_tmp:sarg:' email.c || die "fixing dir in email.c failed"

	sed -i \
	-e 's:/usr/local/sarg/sarg.conf:/etc/sarg/sarg.conf:' \
	-e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
	sarg.1 || die "Failed to fix man page."
}

src_compile() {
	econf \
		--enable-bindir=/usr/bin \
		--enable-mandir=/usr/share/man/man1 \
		--enable-sysconfdir=/etc/sarg/ || die "econf failed"

	emake || die "emake failed"
}

src_install() {
	# This is workaround for sarg installation script, which does not create dirs
	dodir /etc/sarg /usr/sbin

	make \
		BINDIR="${D}"/usr/sbin \
		MANDIR="${D}"/usr/share/man/man1 \
		SYSCONFDIR="${D}"/etc/sarg \
		HTMLDIR="${D}"/var/www/html \
		install || die "sarg installation failed"

	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
}



-- 
gentoo-commits@lists.gentoo.org mailing list