Fix insecure log file creation (#266947).

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 27 insertions, 7 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 3d7423a61b02..e0f5df3052fd 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.74 2009/04/22 21:13:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.75 2009/04/25 09:30:09 mrness Exp $
+
+*ntop-3.3.9-r2 (25 Apr 2009)
+
+  25 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  +files/ntop-3.3.9-accesslog-umask.patch, -ntop-3.3.9-r1.ebuild,
+  +ntop-3.3.9-r2.ebuild:
+  Fix insecure log file creation (#266947).
 
   22 Apr 2009; Markus Meier <maekke@gentoo.org> ntop-3.3.9-r1:
   x86 stable, bug #265704
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index c49eaeb81603..c909d08d0a99 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -6,6 +6,7 @@ AUX ntop-3.2-build.patch 9369 RMD160 396ab052d11c21f5f33ea246c57aae8f1e4b2e35 SH
 AUX ntop-3.2-snmp.patch 776 RMD160 22b4e288b88beaff7a855f18b9b9a1bec09d92da SHA1 a197e0887ea05bc223951d65c349382592bc3b4a SHA256 c2cb51b8adb0909f29580846ee58d07c105998b5675cebf97f1cfda36e20abef
 AUX ntop-3.3.6-gentoo.patch 1602 RMD160 c2c328b3d00bfe59f82477c4f5c52875629731b8 SHA1 0878bba98e6e9d31dc2f56e66435e29a2f96f3d9 SHA256 8fdd082b6162221977c2fa5fd478109a7d222ea2174d60dbf06eb3596fe25f4e
 AUX ntop-3.3.8-gentoo.patch 1671 RMD160 a07f271b511227f633e972199b9667889f68fa18 SHA1 c9ec1e99ffef9288f73e0e3ad2021972b078388b SHA256 3f9561fb8e7ee657d68d44840897fda1cc05b0dff884a3ae8358e1b7bfc89bc7
+AUX ntop-3.3.9-accesslog-umask.patch 496 RMD160 2b943d82b978f750b1c6f2cea7554c03fa60f439 SHA1 58ffbe0ab35e65adc363902e13cfa004492c5a8f SHA256 c27abc8d0564acf41daae0b0a7e94958597512f6dc0f566cb722efa08c769687
 AUX ntop-3.3.9-external-geoip.patch 3427 RMD160 58487133eafa4c8990eb5960c1f363cdafc34e38 SHA1 f4b77eb17fed29df005a4fcd9b9111ea71c00bba SHA256 462a1f4c4d4260b47f23e63ab008bc7e9ba1c030847fe5f021d27cd51490809a
 AUX ntop-3.3.9-gentoo.patch 1742 RMD160 560fca4b581215cb288178bf7b6e6d3b5822c754 SHA1 734f7392b38fe243800bfb6887b673543f14387d SHA256 2013f7124c5bd9c3f13202ef46eb7b49f3f01257ad62e91239796ae2b6f37a75
 AUX ntop-confd 341 RMD160 40eb09215a1f50f86ae82ecd527198c2e7be17a3 SHA1 474aeb45826d71c28c5404add651f31be89b14d7 SHA256 b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d
@@ -18,13 +19,13 @@ DIST ntop-3.3.9.tar.gz 4955257 RMD160 3d7b14bff99a6652ae83fb86a2cda3206cc3392c S
 EBUILD ntop-3.2-r3.ebuild 2605 RMD160 06890151b3a2ad1084823f3e6ec42ba80801e229 SHA1 8b606f4e2e561d748316393171ad9da539524866 SHA256 6ae43b7a7e3d6783c4d4dcac5f48f894d0f86728af66838466f03ed6543a58a5
 EBUILD ntop-3.3.6.ebuild 3228 RMD160 91bf24321e591c99c1654c58e39b5db3b69cb6f1 SHA1 e757d1b4b07b5359daca77fc17f04d206097f88c SHA256 0a72f39b32658374f315e8ef5ccd642aed43aee801ee1a36760cfcd7a0263b03
 EBUILD ntop-3.3.8.ebuild 3141 RMD160 03c722452d5af5ac49693430725ea03f00eb2226 SHA1 80b7347d8c1af69699ddd22c91d9055a607b6672 SHA256 31e79951ae18125012ff49f371f8f2e02bbc8dac00269b738fbfbec260fc729a
-EBUILD ntop-3.3.9-r1.ebuild 3427 RMD160 1d2fd0298ef24e7e3c8c5bf17a0e782c41914445 SHA1 a9a1e576ae27bd3ff19c79f9af707e334ae116f0 SHA256 940cfa3da7c256a5bf9a6041f0e23b579a7e55382eec950e877179740e10b1da
-MISC ChangeLog 10178 RMD160 c3307999159cc5db3bd5485a5b5f61eedd467869 SHA1 531e14c00772ba610534952d0dbb312c3e44b41b SHA256 2bc6388ed9564ea8288b1ba081d001984f141f08823daa787eff2c94e607cef1
+EBUILD ntop-3.3.9-r2.ebuild 3476 RMD160 9eebfb013619c154e63f3159450e446aa20de680 SHA1 7c9c8f7b35c76dda17bfd798061c0b449913180d SHA256 e326eb884a5ef4e53ddfdd67da2f96614f79e136bb8d7bcb51f00b3e7e748a95
+MISC ChangeLog 10392 RMD160 fdc686023ce663aeec5b93bfe366a5e302e053cb SHA1 e568033f0525646c811f0844a8a98fc2482891b6 SHA256 6a5446e3b96f4a8d896af93c7b917eef99535055cdac6c5b961f46b5172921b6
 MISC metadata.xml 322 RMD160 b7f7af3a210902c2b2496ec63b09a3ba372b695b SHA1 b1066ca022ba3396c1964d517c366686339e3c82 SHA256 7ed574b22255d4bbc246459407865f6b9405e7ec7de95c08e16bbf3d2ba2134b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknviKYACgkQkKaRLQcq0GIYhwCgl8tiqF0oXozepg/VxKCFrRy2
-G30AoIGlx5XV8YNTGQpcV3QsTt6EXIKJ
-=kFM2
+iEYEARECAAYFAkny2CsACgkQts85UDFmaOW8lACeK2923KUbS6lGDjSRgiX9uZu2
+IHcAnivIoswkf4IE/mwXguTcTvlYjaMg
+=qj/1
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ntop/files/ntop-3.3.9-accesslog-umask.patch b/net-analyzer/ntop/files/ntop-3.3.9-accesslog-umask.patch
new file mode 100644
index 000000000000..75eda9e3f7b9
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-3.3.9-accesslog-umask.patch
@@ -0,0 +1,11 @@
+diff -Nru ntop-3.3.9.orig/http.c ntop-3.3.9/http.c
+--- ntop-3.3.9.orig/http.c	2008-11-07 00:56:35.000000000 +0000
++++ ntop-3.3.9/http.c	2009-04-25 09:23:50.000000000 +0000
+@@ -1341,6 +1341,7 @@
+ void initAccessLog(void) {
+ 
+   if(myGlobals.runningPref.accessLogFile) {
++    umask(0137);
+     myGlobals.accessLogFd = fopen(myGlobals.runningPref.accessLogFile, "a");
+     if(myGlobals.accessLogFd == NULL) {
+       traceEvent(CONST_TRACE_ERROR, "Unable to create file %s. Access log is disabled.",
diff --git a/net-analyzer/ntop/ntop-3.3.9-r1.ebuild b/net-analyzer/ntop/ntop-3.3.9-r2.ebuild
index b6adb76884b1..34308abecfe8 100644
--- a/net-analyzer/ntop/ntop-3.3.9-r1.ebuild
+++ b/net-analyzer/ntop/ntop-3.3.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.9-r1.ebuild,v 1.6 2009/04/22 21:13:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.9-r2.ebuild,v 1.1 2009/04/25 09:30:09 mrness Exp $
 
 EAPI="2"
 
@@ -69,6 +69,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 	epatch "${FILESDIR}"/${P}-external-geoip.patch
+	epatch "${FILESDIR}"/${P}-accesslog-umask.patch
 	cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
 	eautoreconf
 }