From 3d4ae673eb9618042d08e19827d89245cbd55bd3 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Tue, 4 Apr 2017 14:50:18 +0200 Subject: [PATCH] component/logrotate: version up 3.11.0 to avoid strange 'bad compress path' errors. also install logrotate binary under ${logrotate:location}/sbin instead of ${logrotate:location}/usr/sbin, still keeping the backward compatibility. --- component/logrotate/buildout.cfg | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/component/logrotate/buildout.cfg b/component/logrotate/buildout.cfg index f4f1e603d..a52f184c6 100644 --- a/component/logrotate/buildout.cfg +++ b/component/logrotate/buildout.cfg @@ -2,17 +2,17 @@ extends = ../patch/buildout.cfg ../popt/buildout.cfg + ../xz-utils/buildout.cfg parts = logrotate [logrotate] recipe = slapos.recipe.cmmi -url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.9.tar.gz -md5sum = eeba9dbca62a9210236f4b83195e4ea5 -patch-options = -p1 -patches = - ${:_profile_base_location_}/logrotate-3.7.9-O_CLOEXEC.optional.patch#6beac248c978b767d4bccc1b7eebe6bd -configure-command = true -make-options = PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} +url = https://github.com/logrotate/logrotate/releases/download/3.11.0/logrotate-3.11.0.tar.xz +md5sum = 3a9280e4caeb837427a2d54518fbcdac +# BBB this is only for backward-compatibility. +post-install = + ln -s . ${buildout:parts-directory}/${:_buildout_section_name_}/usr environment = - PATH=${patch:location}/bin:%(PATH)s - POPT_DIR=${popt:location}/include -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib + PATH=${xz-utils:location}/bin:%(PATH)s + CPPFLAGS=-I${popt:location}/include + LDFLAGS=-L${popt:location}/lib -Wl,-rpath=${popt:location}/lib -- 2.30.9