EAPI bump. Add format to fprintf.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xA792A613

6 files changed, 46 insertions, 57 deletions

diff --git a/net-analyzer/squidsites/ChangeLog b/net-analyzer/squidsites/ChangeLog
index 2cee519b7e9d..c7e5a3298d17 100644
--- a/net-analyzer/squidsites/ChangeLog
+++ b/net-analyzer/squidsites/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/squidsites
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/ChangeLog,v 1.16 2013/11/06 03:58:26 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/ChangeLog,v 1.17 2014/07/17 15:22:23 jer Exp $
+
+*squidsites-1.01-r2 (17 Jul 2014)
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> -squidsites-1.01.ebuild,
+  -squidsites-1.01-r1.ebuild, +squidsites-1.01-r2.ebuild,
+  +files/squidsites-1.01-format-security.patch, metadata.xml:
+  EAPI bump. Add format to fprintf.
 
   06 Nov 2013; Patrick Lauer <patrick@gentoo.org> squidsites-1.01-r1.ebuild,
   squidsites-1.01.ebuild:
diff --git a/net-analyzer/squidsites/Manifest b/net-analyzer/squidsites/Manifest
index ad7b8b3960af..844bffcbebf5 100644
--- a/net-analyzer/squidsites/Manifest
+++ b/net-analyzer/squidsites/Manifest
@@ -1,5 +1,15 @@
-DIST squidsites-1.01.tar.gz 23646 SHA256 5bf946a4ff3d4a695b695c28b7455071f08f1210f1bfee1bd340ee6211de75e0
-EBUILD squidsites-1.01-r1.ebuild 893 SHA256 cd6a92255ed281487228a09ee44e437a96a3acba45046cf94b765bb8fbe8418d SHA512 c219a419f910e2515535dc18edb8a4459b2d286cfb60cfc7886b2fd625b280f58b59e2292fe4bf53c893b16a4bb48a8f4f801fdf9e97bda2acf20d6ea65b7074 WHIRLPOOL 5750aa97149abc96bf0c2595a6956d963db4bf869c57bd451a82707d1a87ee2535d3e02d6e0ddf638963b49c6a98cd2f1176f2437ac8e25aba45ed5c883066df
-EBUILD squidsites-1.01.ebuild 902 SHA256 47e28bddd7ae4238033e4e3fcf287d700e7fb44c1a2adc290eb45e986844f22b SHA512 896102280d16f0806a9ea17b7526fd537e0d1e88c1015ebce31d1c187c7395e67d8c51120e1e67d7b1efd2712b789c1a1c947515e7c37480752ceb23b151b804 WHIRLPOOL 4009b2a10b00d3834cb0a73c7aff4ffdad86c60c1b8a714a9615606388b5dd933820e8228572ff8720db1997a6c167a8a6ef65e3c73386888b589f545d075499
-MISC ChangeLog 1871 SHA256 503d7130fc4ab2b981e0a8fd09962a4db1362c3d2b225ef0c4ad4226e2aba5a7 SHA512 75d56451cbbe78a745e6fad6c689dc382eaa4e353ba7533126b7b8508bf68c002198b27c144f1beb356109f45f35754bea03d9d1909746b87de1327771a1ef73 WHIRLPOOL 58c6fafb65a64c176d36b5a066e5955033a08ac83414e4a69880f29c4c86e69daeebe8ae3f1e7e877583317e142399684456bc3311af76a9f658388721db7fd8
-MISC metadata.xml 299 SHA256 66454982806a596ddaec1b1f1d559b888354f01422e95c4189e03204d546a0ec SHA512 ed278266c58676e4fcb2898c21ae67bb12e9672964985bcc843bcb59a19b2521172cf1b8601d61f993a8eed0e8231445700b38ad669271d02e2b1b298d2cccfc WHIRLPOOL 241d9dc44f31f5f7bb519f027ba5267623d1eecb30e6a529e84dce529df5384917a26ad5d2afed9e20d89de0d323c4e64981d23b7c53a727360a3031420228ff
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX squidsites-1.01-format-security.patch 210 SHA256 37764d47b14db4bf95b74c0bcfee1312b6a7678b20c4787510acc468226ebe2d SHA512 0e5d42ccf3a0ff75b630ae82b4db34d4e04df1e3336a701168df2ceb7194ce64d22f442dd523f7a3e37a74255a71cad162026e43121d0f4d06861cd0f5e8ac5f WHIRLPOOL 122974f8e4ecf3e30bff8fc01c42b85aea415660d666eed919c62586d6f32f4676c7064ab2e15607e4b5e11f9d360e227d637b1c896cbb965e86e68288829219
+DIST squidsites-1.01.tar.gz 23646 SHA256 5bf946a4ff3d4a695b695c28b7455071f08f1210f1bfee1bd340ee6211de75e0 SHA512 ecd6caf4ffbb531de1de85b2d8548e4256603909b1d1bc8c368516b644298803bc0cf3036a370ad679a763b94494bd755043df8a806dcca16990024c515cfed9 WHIRLPOOL b8bb650df49bed0d5037b006537bce14c2a6ee580a712af0745646ea9f32759a26a5351b9aef7404ec4ff7201d09e39d155d2e8c03582f826f39f6e48e427b8e
+EBUILD squidsites-1.01-r2.ebuild 886 SHA256 fc7b0cfd78fc7b709761a45b9f262d8aac9399d1ee04cbcf8490ac2e6d1a2916 SHA512 70ef435d96e8c4e8da7cb200b30ce35c34735d7f30db5dd1ab736895332a44e761ac8481898cd77112a571597545f050b7c4ff7f19a3e78f24ff1b4032c53c68 WHIRLPOOL db772ebd39f5be62196df91b1d364baa33efb9a050b4289cb11fecd1cce3976aa3b75b4227340508cc8b3e9485d42256f9bf327ad6610b4c817adcb94b58fc6f
+MISC ChangeLog 2131 SHA256 0e0f4c72beeb3abbbefa3b1c20fbf52618358dafca0e74b1f9c29d9992b16b2f SHA512 4d84891d3af2af1b3cbd0ed92fac7d1ade9385da60bb3c867ad8e70573a060e9686a11f414007dde52969c7b1e983f4197243f727ff79048b680ec83eaf38737 WHIRLPOOL 444ef7645c88237b7d257d9b039d7a9b7883dde6c94d2d2a2572039b4b09760008453ee94e356de12e86d6cfc147b82d934556c8d0ae3ef71d46aad9dd7ceedb
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlPH6jEACgkQVWmRsqeSphOerACfexgh5UcNSTvQVPwmQcR0fJp5
+ukQAnjlA/251cjOkzDmnbtmbHKwaLra1
+=axtM
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch
new file mode 100644
index 000000000000..3dd72203c309
--- /dev/null
+++ b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch
@@ -0,0 +1,11 @@
+--- a/src/squidsites.c
++++ b/src/squidsites.c
+@@ -286,7 +286,7 @@
+ static

+ void print_help()

+ {

+-   fprintf( stderr, help_message );

++   fprintf( stderr, "%s\n", help_message );

+ } /* print_help */

+ 

+ 

diff --git a/net-analyzer/squidsites/metadata.xml b/net-analyzer/squidsites/metadata.xml
index 971c11307563..03aa50bab7e3 100644
--- a/net-analyzer/squidsites/metadata.xml
+++ b/net-analyzer/squidsites/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Squidsites is a tool that parses Squid access log file and generates a report of the most visited sites.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/squidsites/squidsites-1.01-r1.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
index 03b6b16ae9f7..e01a170a1992 100644
--- a/net-analyzer/squidsites/squidsites-1.01-r1.ebuild
+++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
@@ -1,36 +1,34 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/squidsites-1.01-r1.ebuild,v 1.5 2013/11/06 03:58:26 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/squidsites-1.01-r2.ebuild,v 1.1 2014/07/17 15:22:23 jer Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
-IUSE=""
-DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites."
+DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites"
+LICENSE="GPL-2"
 HOMEPAGE="http://www.stefanopassiglia.com/misc.htm"
 SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz"
-LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND=""
-RDEPEND=""
 S="${WORKDIR}/src"
 
 src_prepare() {
 	# Respect CFLAGS
 	sed -i Makefile \
-		-e '/^CCFLAGS=/s|-g|$(CFLAGS) $(LDFLAGS)|' \
-		|| die "sed failed"
+		-e '/^CCFLAGS=/s|-g| $(CFLAGS) $(LDFLAGS)|' \
+		|| die
+	epatch "${FILESDIR}"/${P}-format-security.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install () {
-	cd "${WORKDIR}"
+	cd "${WORKDIR}" || die
 	dobin src/squidsites
 	dodoc Authors Bugs ChangeLog GNU-Manifesto.html README
 }
diff --git a/net-analyzer/squidsites/squidsites-1.01.ebuild b/net-analyzer/squidsites/squidsites-1.01.ebuild
deleted file mode 100644
index c124bfd65e45..000000000000
--- a/net-analyzer/squidsites/squidsites-1.01.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/squidsites-1.01.ebuild,v 1.8 2013/11/06 03:58:26 patrick Exp $
-
-inherit toolchain-funcs
-
-IUSE=""
-DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites."
-HOMEPAGE="http://www.stefanopassiglia.com/misc.htm"
-SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ppc x86"
-
-DEPEND=""
-RDEPEND=""
-S="${WORKDIR}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Respect CFLAGS
-	sed -i -e "s/CCFLAGS=-g -Wall/CCFLAGS=${CFLAGS}/g" Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	cd "${WORKDIR}"
-	dobin src/squidsites
-	dodoc Authors Bugs ChangeLog GNU-Manifesto.html README
-}