diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2009-04-26 12:47:15 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2009-04-26 12:47:15 +0000 |
| commit | 8c2b44442be7f0374fda0872d303acbeb3fd2578 (patch) | |
| tree | ccc13685e392efd5b74c16cb82b2c681626e6c6c /net-proxy | |
| parent | ~ppc #266117 (diff) | |
| download | gentoo-2-8c2b44442be7f0374fda0872d303acbeb3fd2578.tar.gz gentoo-2-8c2b44442be7f0374fda0872d303acbeb3fd2578.tar.bz2 gentoo-2-8c2b44442be7f0374fda0872d303acbeb3fd2578.zip | |
Avoid entering emergency mode by using fprintf instead sgLogFatalError (#259272).
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squidguard/ChangeLog | 10 | ||||
| -rw-r--r-- | net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch | 12 | ||||
| -rw-r--r-- | net-proxy/squidguard/squidguard-1.4-r3.ebuild (renamed from net-proxy/squidguard/squidguard-1.4-r2.ebuild) | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/net-proxy/squidguard/ChangeLog b/net-proxy/squidguard/ChangeLog index 54266f36512d..2727c575de92 100644 --- a/net-proxy/squidguard/ChangeLog +++ b/net-proxy/squidguard/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-proxy/squidguard # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.34 2009/04/25 09:58:43 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/ChangeLog,v 1.35 2009/04/26 12:47:15 mrness Exp $ + +*squidguard-1.4-r3 (26 Apr 2009) + + 26 Apr 2009; Alin Năstac <mrness@gentoo.org> + files/squidguard-1.4-vsnprintf.patch, -squidguard-1.4-r2.ebuild, + +squidguard-1.4-r3.ebuild: + Avoid entering emergency mode by using fprintf instead sgLogFatalError + (#259272). *squidguard-1.4-r2 (25 Apr 2009) diff --git a/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch b/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch index 971d136fc988..bf4efec6042f 100644 --- a/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch +++ b/net-proxy/squidguard/files/squidguard-1.4-vsnprintf.patch @@ -1,6 +1,6 @@ diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in ---- squidGuard-1.4.orig/configure.in 2009-02-17 22:35:28.000000000 +0000 -+++ squidGuard-1.4/configure.in 2009-02-17 22:36:27.000000000 +0000 +--- squidGuard-1.4.orig/configure.in 2009-04-26 12:28:49.000000000 +0000 ++++ squidGuard-1.4/configure.in 2009-04-26 12:29:35.000000000 +0000 @@ -421,7 +421,7 @@ AC_CHECK_FUNCS(regexec, , AC_MSG_ERROR([No regexec library function.])) AC_CHECK_FUNCS(strdup, , AC_MSG_ERROR([No strdup library function.])) @@ -12,7 +12,7 @@ diff -Nru squidGuard-1.4.orig/configure.in squidGuard-1.4/configure.in diff -Nru squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c --- squidGuard-1.4.orig/src/sgLog.c 2007-11-16 16:58:32.000000000 +0000 -+++ squidGuard-1.4/src/sgLog.c 2009-02-17 22:37:04.000000000 +0000 ++++ squidGuard-1.4/src/sgLog.c 2009-04-26 12:31:40.000000000 +0000 @@ -55,7 +55,7 @@ char msg[MAX_BUF]; va_list ap; @@ -22,15 +22,17 @@ diff -Nru squidGuard-1.4.orig/src/sgLog.c squidGuard-1.4/src/sgLog.c fprintf(stderr,"overflow in vsprintf (sgLog): %s",strerror(errno)); va_end(ap); date = niso(0); -@@ -87,7 +87,7 @@ +@@ -87,8 +87,8 @@ char msg[MAX_BUF]; va_list ap; VA_START(ap, format); - if(vsprintf(msg, format, ap) > (MAX_BUF - 1)) +- sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno)); + if(vsnprintf(msg, MAX_BUF, format, ap) > (MAX_BUF - 1)) - sgLogFatalError("overflow in vsprintf (sgLogError): %s",strerror(errno)); ++ fprintf(stderr,"overflow in vsprintf (sgLogError): %s",strerror(errno)); va_end(ap); sgLog(globalErrorLog,"%s",msg); + } @@ -104,7 +104,7 @@ char msg[MAX_BUF]; va_list ap; diff --git a/net-proxy/squidguard/squidguard-1.4-r2.ebuild b/net-proxy/squidguard/squidguard-1.4-r3.ebuild index 915e126d67a9..b006984e77ab 100644 --- a/net-proxy/squidguard/squidguard-1.4-r2.ebuild +++ b/net-proxy/squidguard/squidguard-1.4-r3.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-proxy/squidguard/squidguard-1.4-r2.ebuild,v 1.1 2009/04/25 09:58:43 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.4-r3.ebuild,v 1.1 2009/04/26 12:47:15 mrness Exp $ WANT_AUTOMAKE=none EAPI="2" |