summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2016-09-23 22:53:25 +0200
committerNicolas Iooss2016-09-23 22:53:25 +0200
commit43a2a51157194a0d4fbb2c3e6b5478e25ff84d09 (patch)
treec837271570cf12da9978df6e8305912c03be1247
parent66be3c6196e1d760338071de1686cc9c0d4c4474 (diff)
downloadaur-43a2a51157194a0d4fbb2c3e6b5478e25ff84d09.tar.gz
logrotate-selinux 3.10.0-1 update
-rw-r--r--.SRCINFO12
-rw-r--r--0001-fixed-gcc6-warning.patch28
-rw-r--r--PKGBUILD11
3 files changed, 9 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4acf487fe8c7..c5a98b411899 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = logrotate-selinux
pkgdesc = Rotates system logs automatically with SELinux support
- pkgver = 3.9.2
+ pkgver = 3.10.0
pkgrel = 1
url = https://github.com/logrotate/logrotate
arch = i686
@@ -11,23 +11,21 @@ pkgbase = logrotate-selinux
depends = gzip
depends = acl
depends = libselinux
- provides = logrotate=3.9.2-1
- provides = selinux-logrotate=3.9.2-1
+ provides = logrotate=3.10.0-1
+ provides = selinux-logrotate=3.10.0-1
conflicts = logrotate
conflicts = selinux-logrotate
backup = etc/logrotate.conf
- source = https://github.com/logrotate/logrotate/archive/3.9.2.tar.gz
+ source = https://github.com/logrotate/logrotate/archive/3.10.0.tar.gz
source = paths.patch
source = logrotate.conf
source = logrotate.timer
source = logrotate.service
- source = 0001-fixed-gcc6-warning.patch
- md5sums = 584bca013dcceeb23b06b27d6d0342fb
+ md5sums = 3995acb2791a8dfd81b5ffc0046d0e71
md5sums = e76526bcd6fc33c9d921e1cb1eff1ffb
md5sums = 94dae4d3eded2fab9ae879533d3680db
md5sums = 287c2ad9b074cb5478db7692f385827c
md5sums = 85560be5272ed68a88bb77a0a2293369
- md5sums = 451d761df0b769be0289681a3db5f50d
pkgname = logrotate-selinux
diff --git a/0001-fixed-gcc6-warning.patch b/0001-fixed-gcc6-warning.patch
deleted file mode 100644
index 2b400bda79c9..000000000000
--- a/0001-fixed-gcc6-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6a36c105587b07ad14fc937f3ee6e2eb402621a2 Mon Sep 17 00:00:00 2001
-From: Chris Cromer <cromerc@users.noreply.github.com>
-Date: Tue, 2 Aug 2016 19:17:04 -0400
-Subject: [PATCH 1/1] fixed gcc6 warning
-
-Closes #50
----
- logrotate.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/logrotate.c b/logrotate.c
-index d42656a9724b..8a88607bf105 100644
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -1781,8 +1781,9 @@ int postrotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
- {
- int hasErrors = 0;
-
-- if (!state->doRotate)
-+ if (!state->doRotate) {
- return 0;
-+ }
-
- if (!hasErrors && log->flags & LOG_FLAG_TMPFILENAME) {
- char *tmpFilename = NULL;
---
-2.9.3
-
diff --git a/PKGBUILD b/PKGBUILD
index 5e7aace37cdd..ef824826ac8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# SELinux Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
pkgname=logrotate-selinux
-pkgver=3.9.2
+pkgver=3.10.0
pkgrel=1
pkgdesc="Rotates system logs automatically with SELinux support"
arch=('i686' 'x86_64')
@@ -18,20 +18,17 @@ backup=('etc/logrotate.conf')
source=("https://github.com/logrotate/logrotate/archive/${pkgver}.tar.gz"
'paths.patch'
'logrotate.conf'
- logrotate.{timer,service}
- '0001-fixed-gcc6-warning.patch')
-md5sums=('584bca013dcceeb23b06b27d6d0342fb'
+ logrotate.{timer,service})
+md5sums=('3995acb2791a8dfd81b5ffc0046d0e71'
'e76526bcd6fc33c9d921e1cb1eff1ffb'
'94dae4d3eded2fab9ae879533d3680db'
'287c2ad9b074cb5478db7692f385827c'
- '85560be5272ed68a88bb77a0a2293369'
- '451d761df0b769be0289681a3db5f50d')
+ '85560be5272ed68a88bb77a0a2293369')
build() {
cd "$srcdir/${pkgname/-selinux}-${pkgver}"
patch -p0 -i "$srcdir/paths.patch"
- patch -p1 -i "$srcdir/0001-fixed-gcc6-warning.patch"
./autogen.sh
./configure \