[packages/logrotate] - up to 3.8.8

arekm arekm at pld-linux.org
Sat Oct 25 15:44:34 CEST 2014


commit b5fb4aa14c0cf0ee160b1d03915919cbf5173d7e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Oct 25 15:44:30 2014 +0200

    - up to 3.8.8

 logrotate-print-prog-name.patch | 50 -----------------------------------------
 logrotate.spec                  |  8 +++----
 2 files changed, 3 insertions(+), 55 deletions(-)
---
diff --git a/logrotate.spec b/logrotate.spec
index f212f76..f79968c 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -19,19 +19,18 @@ Summary(ru.UTF-8):	Ротирует, компрессирует, удаляет
 Summary(tr.UTF-8):	Sistem günlüklerini yönlendirir, sıkıştırır ve mektup olarak yollar
 Summary(uk.UTF-8):	Ротує, компресує, видаляє та відправляє поштою лог-файли
 Name:		logrotate
-Version:	3.8.7
-Release:	2
+Version:	3.8.8
+Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/l/o/logrotate/%{name}-%{version}.tar.gz
-# Source0-md5:	99e08503ef24c3e2e3ff74cc5f3be213
+# Source0-md5:	49846e873dddea15964cd0355b9943ca
 Source1:	%{name}.conf
 Source2:	%{name}.sysconfig
 Source3:	%{name}.cron
 Source4:	%{name}.crontab
 Patch1:		%{name}-man.patch
 Patch2:		tabooext.patch
-Patch3:		logrotate-print-prog-name.patch
 URL:		https://fedorahosted.org/logrotate/
 %{?with_acl:BuildRequires:	acl-devel}
 %if %{with selinux}
@@ -118,7 +117,6 @@ Logrotate призначений для полегшення адміністр
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p2
 
 %build
 %{__make} \
diff --git a/logrotate-print-prog-name.patch b/logrotate-print-prog-name.patch
deleted file mode 100644
index 0a2d7ca..0000000
--- a/logrotate-print-prog-name.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: /trunk/logrotate.c
-===================================================================
---- /trunk/logrotate.c	(revision 454)
-+++ /trunk/logrotate.c	(revision 455)
-@@ -523,4 +523,7 @@
-     int i;
-     int status;
-+	int compressPipe[2];
-+	char buff[4092];
-+	int error_printed = 0;
- 
-     message(MESS_DEBUG, "compressing log with: %s\n", log->compress_prog);
-@@ -567,4 +570,12 @@
-     }
- 
-+	if (pipe(compressPipe) < 0) {
-+		message(MESS_ERROR, "error opening pipe for compress: %s",
-+				strerror(errno));
-+		close(inFile);
-+		close(outFile);
-+		return 1;
-+	}
-+
-     if (!FORK_OR_VFORK()) {
- 	dup2(inFile, 0);
-@@ -572,4 +583,7 @@
- 	dup2(outFile, 1);
- 	close(outFile);
-+	dup2(compressPipe[1], 2);
-+	close(compressPipe[0]);
-+	close(compressPipe[1]);
- 
- 	if (switch_user_permanently(log) != 0) {
-@@ -581,4 +595,15 @@
-     }
- 
-+    close(compressPipe[1]);
-+	while ((i = read(compressPipe[0], buff, sizeof(buff) - 1)) > 0) {
-+		if (!error_printed) {
-+			error_printed = 1;
-+			message(MESS_ERROR, "Compressing program wrote following message "
-+					"to stderr when compressing log %s:\n", name);
-+		}
-+		buff[i] = '\0';
-+		fprintf(stderr, "%s", buff);
-+	}
-+	close(compressPipe[0]);
-     wait(&status);
- 
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/logrotate.git/commitdiff/b5fb4aa14c0cf0ee160b1d03915919cbf5173d7e



More information about the pld-cvs-commit mailing list