Accepting request 286929 from home:posophe:branches:Base:System
Update OBS-URL: https://build.opensuse.org/request/show/286929 OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=41
This commit is contained in:
Vítězslav Čížek
Git OBS Bridge
parent
06a1166f9a
commit
4b4b26c1fb
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64
|
||||
size 58898
|
||||
3
logrotate-3.8.9.tar.gz
Normal file
3
logrotate-3.8.9.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7
|
||||
size 77408
|
||||
@ -2,8 +2,8 @@ Index: test/test
|
||||
===================================================================
|
||||
--- test/test.orig 2013-10-10 10:43:36.000000000 +0200
|
||||
+++ test/test 2013-11-07 21:46:37.112487860 +0100
|
||||
@@ -1358,4 +1358,27 @@
|
||||
test.log.1 0 zero
|
||||
@@ -1511,4 +1511,27 @@
|
||||
test2.log.1 0 test2
|
||||
EOF
|
||||
|
||||
+# check rotation with extension appended to the filename
|
||||
@ -2,14 +2,14 @@ Index: config.c
|
||||
===================================================================
|
||||
--- config.c.orig 2013-06-10 14:02:36.000000000 +0200
|
||||
+++ config.c 2013-07-25 15:42:42.465060702 +0200
|
||||
@@ -594,6 +594,7 @@ static int readConfigFile(const char *co
|
||||
@@ -712,6 +712,7 @@
|
||||
char **scriptDest = NULL;
|
||||
struct logInfo *newlog = defConfig;
|
||||
char *start, *chptr;
|
||||
+ char *compresscmd_base;
|
||||
char *dirName;
|
||||
struct group *group;
|
||||
struct passwd *pw = NULL;
|
||||
int rc;
|
||||
@@ -1245,6 +1246,20 @@ static int readConfigFile(const char *co
|
||||
message(MESS_DEBUG, "compress_prog is now %s\n",
|
||||
newlog->compress_prog);
|
||||
@ -2,7 +2,7 @@ Index: examples/logrotate-default
|
||||
===================================================================
|
||||
--- examples/logrotate-default.orig
|
||||
+++ examples/logrotate-default
|
||||
@@ -14,22 +14,13 @@ dateext
|
||||
@@ -14,22 +14,13 @@
|
||||
# uncomment this if you want your log files compressed
|
||||
#compress
|
||||
|
||||
@ -13,7 +13,7 @@ Index: examples/logrotate-default
|
||||
-/var/log/wtmp {
|
||||
- monthly
|
||||
- create 0664 root utmp
|
||||
- minsize 1M
|
||||
- minsize 1M
|
||||
- rotate 1
|
||||
-}
|
||||
+# comment these to switch compression to use gzip or another
|
||||
@ -1,15 +0,0 @@
|
||||
Index: logrotate-3.8.7/logrotate.c
|
||||
===================================================================
|
||||
--- logrotate-3.8.7.orig/logrotate.c 2014-04-01 18:39:14.294635014 +0200
|
||||
+++ logrotate-3.8.7/logrotate.c 2014-04-01 18:40:29.613496763 +0200
|
||||
@@ -795,8 +795,9 @@ int findNeedRotating(struct logInfo *log
|
||||
char *ld = ourDirName(log->files[logNum]);
|
||||
if (stat(ld, &sb)) {
|
||||
/* If parent directory doesn't exist, it's not real error
|
||||
+ (unless nomissingok is specified)
|
||||
and rotation is not needed */
|
||||
- if (errno != ENOENT) {
|
||||
+ if (errno != ENOENT || (errno == ENOENT && (log->flags & LOG_FLAG_MISSINGOK) == 0)) {
|
||||
message(MESS_ERROR, "stat of %s failed: %s\n", ld,
|
||||
strerror(errno));
|
||||
free(ld);
|
||||
@ -2,14 +2,14 @@ Index: logrotate-3.8.5/logrotate.8
|
||||
===================================================================
|
||||
--- logrotate-3.8.5.orig/logrotate.8 2013-07-25 15:30:36.687434418 +0200
|
||||
+++ logrotate-3.8.5/logrotate.8 2013-07-31 16:08:57.460078472 +0200
|
||||
@@ -121,6 +121,10 @@ compressed after they are rotated. Note
|
||||
@@ -121,6 +121,10 @@
|
||||
anywhere in the config file as long as the first non-whitespace
|
||||
character on the line is a #.
|
||||
character on the line is a \fB#\fR.
|
||||
|
||||
+Values are separated from directives by whitespace and/or an optional =.
|
||||
+Numbers must be specified in a format understood by
|
||||
+.BR strtoul(3).
|
||||
+
|
||||
The next section of the config files defined how to handle the log file
|
||||
The next section of the config file defines how to handle the log file
|
||||
\fI/var/log/messages\fR. The log will go through five weekly rotations before
|
||||
being removed. After the log file has been rotated (but before the old
|
||||
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 20 11:04:12 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 3.8.9
|
||||
* Add new directive "createolddir" and "nocreateolddir". These directives
|
||||
can be used to create the directory specified by olddir with particular
|
||||
"mode", "owner" and "group".
|
||||
* Continue with rotation even when first log from logset is removed
|
||||
during the rotation.
|
||||
* Fix crash on BSD systems introduced in 3.8.8 caused by different qsort_r
|
||||
function. Function qsort is now used instead.
|
||||
* Fix potential buffer overflow in usage of strncat function.
|
||||
* Fix compilation with musl-libc.
|
||||
* Add experimental 'renamecopy' directive to allow 'olddir' on different
|
||||
physical device. See the "man logrotate" for more information.
|
||||
- Remove logrotate-fail_if_ENOENT_and_nomissingok.patch; merged on
|
||||
upstream release
|
||||
- Updated patches
|
||||
* logrotate-3.7.8-addextension.patch > logrotate-addextension.patch
|
||||
* logrotate-3.7.8-autoext.patch > logrotate-autoext.patch
|
||||
* logrotate-3.7.8-conf.patch > logrotate-conf.patch
|
||||
* logrotate-manpage_config_clarification.patch
|
||||
- Remove redunant %clean section
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 26 12:01:30 UTC 2014 - vcizek@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package logrotate
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,7 +19,7 @@
|
||||
Url: https://fedorahosted.org/releases/l/o/logrotate
|
||||
|
||||
Name: logrotate
|
||||
Version: 3.8.7
|
||||
Version: 3.8.9
|
||||
Release: 0
|
||||
Summary: Rotate, compress, remove, and mail system log files
|
||||
License: GPL-2.0+
|
||||
@ -29,12 +29,11 @@ Source100: %{name}-rpmlintrc
|
||||
Source101: %{name}.service
|
||||
Source102: %{name}.timer
|
||||
Patch0: logrotate-3.7.8-suse.patch
|
||||
Patch1: logrotate-3.7.8-conf.patch
|
||||
Patch2: logrotate-3.7.8-autoext.patch
|
||||
Patch3: logrotate-3.7.8-addextension.patch
|
||||
Patch1: logrotate-conf.patch
|
||||
Patch2: logrotate-autoext.patch
|
||||
Patch3: logrotate-addextension.patch
|
||||
Patch4: logrotate-3.7.8-mess_err.patch
|
||||
Patch5: logrotate-manpage_config_clarification.patch
|
||||
Patch6: logrotate-fail_if_ENOENT_and_nomissingok.patch
|
||||
BuildRequires: acl
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: libselinux-devel
|
||||
@ -63,7 +62,6 @@ daily cron job.
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CC="%__cc" RPM_OPT_FLAGS="%{optflags}" \
|
||||
@ -101,9 +99,6 @@ fi
|
||||
%postun
|
||||
%service_del_postun %{name}.service %{name}.timer
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc CHANGES COPYING
|
||||
|
||||
Loading…
Reference in New Issue
Block a user