From f2ee561968e036b8042841a3c60d31c1189b4b71 Mon Sep 17 00:00:00 2001
From: ensc <ensc@fedoraproject.org>
Date: Oct 29 2009 09:13:04 +0000
Subject: updated to 0.95.3


---

diff --git a/.cvsignore b/.cvsignore
index e2c64e0..5b7c836 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-clamav-0.95.2-norar.tar.bz2
+clamav-0.95.3-norar.tar.bz2
diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch
new file mode 100644
index 0000000..220f7ab
--- /dev/null
+++ b/clamav-0.95.3-umask.patch
@@ -0,0 +1,39 @@
+Index: clamav-0.95.3/clamav-milter/clamav-milter.c
+===================================================================
+--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c
++++ clamav-0.95.3/clamav-milter/clamav-milter.c
+@@ -306,7 +306,7 @@ int main(int argc, char **argv) {
+ 
+     if((opt = optget(opts, "PidFile"))->enabled) {
+ 	FILE *fd;
+-	mode_t old_umask = umask(0002);
++	mode_t old_umask = umask(0022);
+ 
+ 	if((fd = fopen(opt->strarg, "w")) == NULL) {
+ 	    logg("!Can't save PID in file %s\n", opt->strarg);
+Index: clamav-0.95.3/shared/output.c
+===================================================================
+--- clamav-0.95.3.orig/shared/output.c
++++ clamav-0.95.3/shared/output.c
+@@ -270,7 +270,7 @@ int logg(const char *str, ...)
+ #endif
+     if(logg_file) {
+ 	if(!logg_fp) {
+-	    old_umask = umask(0037);
++	    old_umask = umask(0077);
+ 	    if((logg_fp = fopen(logg_file, "at")) == NULL) {
+ 		umask(old_umask);
+ #ifdef CL_THREAD_SAFE
+Index: clamav-0.95.3/freshclam/freshclam.c
+===================================================================
+--- clamav-0.95.3.orig/freshclam/freshclam.c
++++ clamav-0.95.3/freshclam/freshclam.c
+@@ -102,7 +102,7 @@ static void writepid(const char *pidfile
+ {
+ 	FILE *fd;
+ 	int old_umask;
+-    old_umask = umask(0006);
++    old_umask = umask(0022);
+     if((fd = fopen(pidfile, "w")) == NULL) {
+ 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
+     } else {
diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch
deleted file mode 100644
index 8a46216..0000000
--- a/clamav-0.95rc1-umask.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: clamav-0.95rc1/clamav-milter/clamav-milter.c
-===================================================================
---- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c
-+++ clamav-0.95rc1/clamav-milter/clamav-milter.c
-@@ -287,7 +287,7 @@ int main(int argc, char **argv) {
- 
-     if((opt = optget(opts, "PidFile"))->enabled) {
- 	FILE *fd;
--	mode_t old_umask = umask(0006);
-+	mode_t old_umask = umask(0022);
- 
- 	if((fd = fopen(opt->strarg, "w")) == NULL) {
- 	    logg("!Can't save PID in file %s\n", opt->strarg);
-Index: clamav-0.95rc1/shared/output.c
-===================================================================
---- clamav-0.95rc1.orig/shared/output.c
-+++ clamav-0.95rc1/shared/output.c
-@@ -250,7 +250,7 @@ int logg(const char *str, ...)
- #endif
-     if(logg_file) {
- 	if(!logg_fp) {
--	    old_umask = umask(0037);
-+	    old_umask = umask(0077);
- 	    if((logg_fp = fopen(logg_file, "at")) == NULL) {
- 		umask(old_umask);
- #ifdef CL_THREAD_SAFE
-Index: clamav-0.95rc1/freshclam/freshclam.c
-===================================================================
---- clamav-0.95rc1.orig/freshclam/freshclam.c
-+++ clamav-0.95rc1/freshclam/freshclam.c
-@@ -102,7 +102,7 @@ static void writepid(const char *pidfile
- {
- 	FILE *fd;
- 	int old_umask;
--    old_umask = umask(0006);
-+    old_umask = umask(0022);
-     if((fd = fopen(pidfile, "w")) == NULL) {
- 	logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
-     } else {
diff --git a/clamav.spec b/clamav.spec
index 31926a4..a6308a1 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -20,8 +20,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.95.2
-Release:	%release_func 3%{?snapshot:.%snapshot}
+Version:	0.95.3
+Release:	%release_func 1100%{?snapshot:.%snapshot}
 
 License:	%{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 Group:		Applications/File
@@ -46,7 +46,7 @@ Source8:	clamav-notify-servers
 Patch24:	clamav-0.92-private.patch
 Patch25:	clamav-0.92-open.patch
 Patch26:	clamav-0.95-cliopts.patch
-Patch27:	clamav-0.95rc1-umask.patch
+Patch27:	clamav-0.95.3-umask.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	clamav-lib = %version-%release
 Requires:	data(clamav)
@@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || :
 
 
 %changelog
+* Thu Oct 29 2009 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.95.3-1100
+- updated to 0.95.3
+
 * Sun Sep 13 2009 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.95.2-3
 - add the '%milteruser' user to the '%scanuser' group when the -scanner
   subpackage is installed (#505739)
diff --git a/lastver b/lastver
index e7f6f8b..4d8fc8c 100644
--- a/lastver
+++ b/lastver
@@ -1 +1 @@
-0.95.2
+0.95.3
diff --git a/sources b/sources
index 5744218..898c137 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-377aed737db63d902e641be8d923cda9  clamav-0.95.2-norar.tar.bz2
+7a76425f5cffb9973d6ee45580dc2094  clamav-0.95.3-norar.tar.bz2