Commit abecbd69 authored by Tobias Frost's avatar Tobias Frost

Merge branch 'cgzones_master' into master.

parents 7b3f6cfc bc688e54
This diff is collapsed.
Source: logrotate
Section: admin
Priority: important
Maintainer: Paul Martin <pm@debian.org>
Build-Depends: libpopt-dev, debhelper (>= 9),
libselinux1-dev [linux-any], libacl1-dev [linux-any], automake
Vcs-Svn: http://svn.fedorahosted.org/svn/logrotate/
Maintainer: Christian Göttsche <cgzones@googlemail.com>
Build-Depends: libpopt-dev, debhelper (>= 11),
libselinux1-dev [linux-any], libacl1-dev [linux-any]
Vcs-Browser: https://github.com/cgzones/logrotate_deb
Vcs-Git: https://github.com/cgzones/logrotate_deb
Homepage: https://github.com/logrotate/logrotate
Standards-Version: 3.9.6
Standards-Version: 4.1.3
Package: logrotate
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cron | anacron | cron-daemon, base-passwd (>= 2.0.3.4)
Depends: ${shlibs:Depends}, ${misc:Depends}, cron | anacron | cron-daemon | systemd-sysv
Breaks: postgresql-common (<= 126)
Recommends: bsd-mailx | mailx
Description: Log rotation utility
......
This package was originally debianized by Joseph Carter
<knghtbrd@debian.org> on Thu, 22 Apr 1999 15:33:04 -0700.
This version was downloaded from RedHat's server at:
https://fedorahosted.org/releases/l/o/logrotate/
Upstream's website for the source is:
https://fedorahosted.org/logrotate/
Upstream Authors are various RedHat people, including Erik Troan,
Preston Brown, Elliot Lee, Miloslav Trmac, Dan Walsh, Peter Vrabec,
Jesse Keating and Tomas Smetana.
Copyright: GNU GENERAL PUBLIC LICENSE (GPL) Version 2
All modifications to the packaging and patches by Paul Martin
<pm@debian.org> are also made available under the GPL:
Copyright (C) 2001-2011 Paul Martin
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On a Debian system, the GPLv2 can be found in /usr/share/common-licenses/GPL-2
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: logrotate
Upstream-Contact: https://github.com/logrotate/logrotate/issues
Source: https://github.com/logrotate/logrotate
Files: *
Copyright: 1999-2017 Erik Troan, Preston Brown, Elliot Lee, Miloslav Trmac,
Dan Walsh, Peter Vrabec, Jesse Keating, Tomas Smetana
and Kamil Dudka
License: GPL-2
Files: debian/*
Copyright: 1999 Joseph Carter
?-2017 Paul Martin <pm@debian.org>
License: GPL-2
License: GPL-2
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this package; if not, write to the Free
Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301 USA
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
#!/bin/sh
test -x /usr/sbin/logrotate || exit 0
/usr/sbin/logrotate /etc/logrotate.conf
../examples/logrotate.cron
\ No newline at end of file
......@@ -8,25 +8,13 @@ rotate 4
# create new (empty) log files after rotating old ones
create
# use date as a suffix of the rotated file
#dateext
# uncomment this if you want your log files compressed
#compress
# packages drop log rotation information into this directory
include /etc/logrotate.d
# no packages own wtmp, or btmp -- we'll rotate them here
/var/log/wtmp {
missingok
monthly
create 0664 root utmp
rotate 1
}
/var/log/btmp {
missingok
monthly
create 0660 root utmp
rotate 1
}
# system-specific logs may be configured here
# system-specific logs may be also be configured here.
logrotate usr/sbin/
debian/logrotate.conf etc/
logrotate usr/sbin/
debian/logrotate.conf etc/
examples/btmp etc/logrotate.d/
examples/wtmp etc/logrotate.d/
examples/logrotate.timer lib/systemd/system
examples/logrotate.service lib/systemd/system
#!/bin/sh
set -e
set -eu
if [ "$1" = "purge" ]; then
rm -rf /var/lib/logrotate
fi
......
#!/bin/sh
set -e
set -eu
if [ "$1" = "upgrade" ]; then
# Fix up the location of the state files that previous versions used.
......
From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Tue, 21 Nov 2017 12:19:17 +0100
Subject: fix spelling
found by lintian
---
logrotate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/logrotate.c b/logrotate.c
index 02d45e9..43b2ea0 100644
--- a/logrotate.c
+++ b/logrotate.c
@@ -2683,7 +2683,7 @@ int main(int argc, const char **argv)
" - Copyright (C) 1995-2001 Red Hat, Inc.\n");
fprintf(stderr,
"This may be freely redistributed under the terms of "
- "the GNU Public License\n\n");
+ "the GNU General Public License\n\n");
poptPrintUsage(optCon, stderr, 0);
poptFreeContext(optCon);
exit(1);
From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Fri, 9 Mar 2018 22:04:42 +0100
Subject: btmp config: allow rw group access
---
examples/btmp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/btmp b/examples/btmp
index 393ead5..0aa1ae1 100644
--- a/examples/btmp
+++ b/examples/btmp
@@ -2,6 +2,6 @@
/var/log/btmp {
missingok
monthly
- create 0600 root utmp
+ create 0660 root utmp
rotate 1
}
From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Fri, 1 Sep 2017 15:31:34 +0200
Subject: skip cronjob when running with systemd
---
examples/logrotate.cron | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/examples/logrotate.cron b/examples/logrotate.cron
index cec101e..1ac1570 100644
--- a/examples/logrotate.cron
+++ b/examples/logrotate.cron
@@ -1,5 +1,15 @@
#!/bin/sh
+# skip in favour of systemd timer
+if [ -d /run/systemd/system ]; then
+ exit 0
+fi
+
+# this cronjob persists removals (but not purges)
+if [ ! -x /usr/sbin/logrotate ]; then
+ exit 0
+fi
+
/usr/sbin/logrotate /etc/logrotate.conf
EXITVALUE=$?
if [ $EXITVALUE != 0 ]; then
From: Paul Martin <pm@debian.org>
Date: Wed, 30 Aug 2017 16:24:03 +0200
Subject: manpage
Closes: #101272, #335060
Patches from: J S Bygott <jsb_no_spm@jsbygott.fsnet.co.uk>
General fixes to manpages.
---
logrotate.8.in | 4 ++++
1 file changed, 4 insertions(+)
Index: logrotate.git/logrotate.8
===================================================================
--- logrotate.git.orig/logrotate.8 2016-12-29 02:36:21.419159138 +0100
+++ logrotate.git/logrotate.8 2016-12-29 02:36:21.416159140 +0100
@@ -58,21 +58,21 @@
Tells \fBlogrotate\fR which command to use when mailing logs. This
command should accept two arguments: 1) the subject of the message, and
2) the recipient. The command must then read a message on standard input
-and mail it to the recipient. The default mail command is \fB/bin/mail
+and mail it to the recipient. The default mail command is \fB/usr/bin/mail
-s\fR.
.TP
\fB\-s\fR, \fB\-\-state <statefile>\fR
Tells \fBlogrotate\fR to use an alternate state file. This is useful
if logrotate is being run as a different user for various sets of
-log files. The default state file is \fI/var/lib/logrotate.status\fR.
+log files. The default state file is \fI/var/lib/logrotate/status\fR.
.TP
\fB\-\-usage\fR
Prints a short usage message.
.TP
-+\fB\-v\fR, \fB\-\-verbose\fR
+\fB\-v\fR, \fB\-\-verbose\fR
Turns on verbose mode, ie. display messages during rotation.
.SH CONFIGURATION FILE
@@ -127,9 +127,6 @@
anywhere in the config file as long as the first non-whitespace
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 \fBstrtoul(3)\fR.
-
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
@@ -161,6 +158,10 @@
rotate all files, including previously rotated ones. A way around this
is to use the \fBolddir\fR directive or a more exact wildcard (such as *.log).
+If the directory \fI/var/log/news\fR does not exist, this will cause
+\fBlogrotate\fR to report an error. This error cannot be stopped with
+the \fBmissingok\fR directive.
+
Here is more information on the directives which may be included in
a \fBlogrotate\fR configuration file:
@@ -276,7 +277,7 @@
.TP
\fBextension \fIext\fR
Log files with \fIext\fR extension can keep it after the rotation.
-If compression is used, the compression extension (normally \fI.gz\fR)
+If compression is used, the compression extension (normally \fI.gz\fR)
appears after \fIext\fR. For example you have a logfile named mylog.foo
and want to rotate it to mylog.1.foo.gz instead of mylog.foo.1.gz.
@@ -591,7 +592,8 @@
.SH SEE ALSO
.BR gzip (1)
diff --git a/logrotate.8.in b/logrotate.8.in
index 7f5588c..2b728d1 100644
--- a/logrotate.8.in
+++ b/logrotate.8.in
@@ -634,10 +634,14 @@ left l l.
.BR strtoul (3),
<https://github.com/logrotate/logrotate>
-<https://github.com/logrotate/logrotate>
+.SH NOTES
+The \fBkillall\fR(1) program in Debian is found in the \fIpsmisc\fR package.
+
.SH AUTHORS
.nf
@@ -599,4 +601,5 @@
Erik Troan, Preston Brown, Jan Kaluza.
<https://github.com/logrotate/logrotate>
......
deb-config-h.patch
manpage.patch
cpp-crossbuild.patch
chown-484762.patch
taboo-716649.patch
fix-test-breakage.patch
fix-test-pagesize.patch
0007-skip-cronjob-when-running-with-systemd.patch
0003-fix-spelling.patch
0004-btmp-config-allow-rw-group-access.patch
#!/usr/bin/make -f
export DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS \
2>/dev/null || true)
export DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture \
-qDEB_HOST_GNU_SYSTEM 2>/dev/null || true)
ifeq ($(DEB_HOST_ARCH_OS),)
DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
ifeq ($(DEB_HOST_ARCH_OS),gnu)
DEB_HOST_ARCH_OS := hurd
endif
endif
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
CROSS :=
else
CROSS := CC=$(DEB_HOST_GNU_TYPE)-gcc
endif
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@
override_dh_auto_build:
ifeq ($(DEB_HOST_ARCH_OS),linux)
$(MAKE) RPM_OPT_FLAGS="$(CFLAGS)" WITH_SELINUX="yes" WITH_ACL="yes" $(CROSS)
else
$(MAKE) RPM_OPT_FLAGS="$(CFLAGS)" $(CROSS)
endif
override_dh_auto_install:
override_dh_auto_configure:
dh_auto_configure -- --with-state-file-path=/var/lib/logrotate/status --with-default-mail-command=/usr/bin/mail
override_dh_auto_clean:
-$(MAKE) clean
-cd test ; rm -f $$(ls | egrep '^test-config.[0-9]+$$')
-cd test ; rm -f test*.log* anothertest*.log* state test-config.
-cd test ; rm -f scriptout mail-out compress-args different*.log*
dh_auto_clean
cd test ; rm -f $$(ls | egrep '^test-config.[0-9]+$$')
cd test ; rm -f test*.log* anothertest*.log* state test-config.
cd test ; rm -f scriptout mail-out compress-args different*.log*
# ACL tests will fail if we're not building with ACL
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
ifeq ($(DEB_HOST_ARCH_OS),linux)
cd test ; ./test
dh_auto_test
endif
endif
override_dh_missing:
dh_missing --fail-missing
Tests: version
Depends: @
#!/bin/sh
set -eu
logrotate --version
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
lNGOILpBKr35
=QI6m
-----END PGP PUBLIC KEY BLOCK-----
version=4
https://github.com/logrotate/logrotate/releases \
opts="pgpsigurlmangle=s/$/.asc/" https://github.com/logrotate/logrotate/releases \
/logrotate/logrotate/releases/download/[^/]+/logrotate-([0-9.]+)\.tar\.xz
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment