diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-09-02 16:20:33 +0200 |
| commit | 7353967690b425fd6519756979f3ef839b1a9cd1 (patch) | |
| tree | a910fd6b794556251fe607295c631aed98534235 /package/logrotate | |
| parent | cff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab (diff) | |
| parent | 1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a (diff) | |
Merge branch 'next'
Quite some conflicts, so here goes ..
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/logrotate')
| -rw-r--r-- | package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch | 14 | ||||
| -rw-r--r-- | package/logrotate/logrotate.hash | 2 | ||||
| -rw-r--r-- | package/logrotate/logrotate.mk | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch b/package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch index ed3209821..14efc1d35 100644 --- a/package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch +++ b/package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch @@ -1,4 +1,4 @@ -From 24fd7f81f9966071717f6a0effe8190310f1b393 Mon Sep 17 00:00:00 2001 +From e626f4ca5169036a0042e55e58aca2bb5cc19ad7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Fri, 19 Aug 2016 22:39:17 +0200 Subject: [PATCH] Use autoconf checks for strndup and asprintf @@ -22,7 +22,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c -index dbbf563..2209afd 100644 +index 8731348..8741e48 100644 --- a/config.c +++ b/config.c @@ -45,7 +45,7 @@ @@ -44,18 +44,18 @@ index dbbf563..2209afd 100644 { size_t nAvail; diff --git a/configure.ac b/configure.ac -index e655b85..73b98da 100644 +index 5c83d20..51da52a 100644 --- a/configure.ac +++ b/configure.ac -@@ -13,6 +13,8 @@ AC_STRUCT_ST_BLOCKS +@@ -18,6 +18,8 @@ AC_SYS_LARGEFILE AC_CHECK_LIB([popt],[poptParseArgvString],, AC_MSG_ERROR([libpopt required but not found])) +AC_CHECK_FUNCS([strndup asprintf]) + - AC_ARG_WITH([selinux], - [AS_HELP_STRING([--with-selinux], - [support handling SELinux contexts (yes,no,check) @<:@default=check@:>@])], + dnl Needed for out-of-source builds + mkdir -p test + -- 2.7.4 diff --git a/package/logrotate/logrotate.hash b/package/logrotate/logrotate.hash index 8dee71565..3003d4254 100644 --- a/package/logrotate/logrotate.hash +++ b/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 logrotate-3.9.2.tar.gz +sha256 db63b5932190cba941357c029b595a7fddf43539943aa1e0ca53a96136e4c5d9 logrotate-3.10.0.tar.gz sha256 e0d360908ac506e02f08fa1ad70e17d6985045d8640f383fef8f322886d6e1e1 6a36c105587b07ad14fc937f3ee6e2eb402621a2.patch diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index 38f183c37..14d06937b 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.9.2 +LOGROTATE_VERSION = 3.10.0 LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) LOGROTATE_LICENSE = GPLv2+ LOGROTATE_LICENSE_FILES = COPYING |