| 1 |
jer 15/01/30 11:26:16 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: chrony-1.31-r1.ebuild |
| 5 |
Log: |
| 6 |
Fix configure logic with regard to readline/libedit (bug #538190 by Brian Evans). |
| 7 |
|
| 8 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.149 net-misc/chrony/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/ChangeLog?rev=1.149&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/ChangeLog?rev=1.149&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/ChangeLog?r1=1.148&r2=1.149 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v |
| 20 |
retrieving revision 1.148 |
| 21 |
retrieving revision 1.149 |
| 22 |
diff -u -r1.148 -r1.149 |
| 23 |
--- ChangeLog 5 Nov 2014 11:24:29 -0000 1.148 |
| 24 |
+++ ChangeLog 30 Jan 2015 11:26:16 -0000 1.149 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for net-misc/chrony |
| 27 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.148 2014/11/05 11:24:29 jer Exp $ |
| 29 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.149 2015/01/30 11:26:16 jer Exp $ |
| 31 |
+ |
| 32 |
+*chrony-1.31-r1 (30 Jan 2015) |
| 33 |
+ |
| 34 |
+ 30 Jan 2015; Jeroen Roovers <jer@g.o> +chrony-1.31-r1.ebuild: |
| 35 |
+ Fix configure logic with regard to readline/libedit (bug #538190 by Brian |
| 36 |
+ Evans). |
| 37 |
|
| 38 |
05 Nov 2014; Jeroen Roovers <jer@g.o> -chrony-1.30-r1.ebuild, |
| 39 |
-files/chronyd.service, -files/chronyd.service-r1: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 net-misc/chrony/chrony-1.31-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/chrony-1.31-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/chrony/chrony-1.31-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: chrony-1.31-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2015 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.31-r1.ebuild,v 1.1 2015/01/30 11:26:16 jer Exp $ |
| 53 |
|
| 54 |
EAPI=5 |
| 55 |
inherit eutils systemd toolchain-funcs |
| 56 |
|
| 57 |
DESCRIPTION="NTP client and server programs" |
| 58 |
HOMEPAGE="http://chrony.tuxfamily.org/" |
| 59 |
SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" |
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
|
| 63 |
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86" |
| 64 |
IUSE="caps ipv6 libedit readline +rtc selinux" |
| 65 |
REQUIRED_USE="?? ( libedit readline )" |
| 66 |
|
| 67 |
CDEPEND=" |
| 68 |
caps? ( sys-libs/libcap ) |
| 69 |
libedit? ( dev-libs/libedit ) |
| 70 |
readline? ( >=sys-libs/readline-4.1-r4 ) |
| 71 |
" |
| 72 |
DEPEND=" |
| 73 |
${CDEPEND} |
| 74 |
sys-apps/texinfo |
| 75 |
" |
| 76 |
RDEPEND=" |
| 77 |
${CDEPEND} |
| 78 |
selinux? ( sec-policy/selinux-chronyd ) |
| 79 |
" |
| 80 |
|
| 81 |
RESTRICT=test |
| 82 |
|
| 83 |
S="${WORKDIR}/${P/_/-}" |
| 84 |
|
| 85 |
src_prepare() { |
| 86 |
sed -i \ |
| 87 |
-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \ |
| 88 |
-e 's:/var/run:/run:g' \ |
| 89 |
conf.c chrony.texi.in chrony.txt examples/* FAQ || die |
| 90 |
} |
| 91 |
|
| 92 |
src_configure() { |
| 93 |
tc-export CC |
| 94 |
|
| 95 |
local CHRONY_EDITLINE |
| 96 |
# ./configure legend: |
| 97 |
# --disable-readline : disable line editing entirely |
| 98 |
# --without-readline : do not use sys-libs/readline (enabled by default) |
| 99 |
# --without-editline : do not use dev-libs/libedit (enabled by default) |
| 100 |
if ! use readline && ! use libedit; then |
| 101 |
CHRONY_EDITLINE='--disable-readline' |
| 102 |
else |
| 103 |
CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" |
| 104 |
CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" |
| 105 |
fi |
| 106 |
|
| 107 |
# not an autotools generated script |
| 108 |
local CHRONY_CONFIGURE=" |
| 109 |
./configure \ |
| 110 |
$(usex caps '' --disable-linuxcaps) \ |
| 111 |
$(usex ipv6 '' --disable-ipv6) \ |
| 112 |
$(usex rtc '' --disable-rtc) \ |
| 113 |
${CHRONY_EDITLINE} \ |
| 114 |
${EXTRA_ECONF} \ |
| 115 |
--docdir=/usr/share/doc/${PF} \ |
| 116 |
--infodir=/usr/share/info \ |
| 117 |
--mandir=/usr/share/man \ |
| 118 |
--prefix=/usr \ |
| 119 |
--sysconfdir=/etc/chrony \ |
| 120 |
--without-nss \ |
| 121 |
--without-tomcrypt |
| 122 |
" |
| 123 |
|
| 124 |
# print the ./configure call to aid in future debugging |
| 125 |
einfo ${CHRONY_CONFIGURE} |
| 126 |
sh ${CHRONY_CONFIGURE} || die |
| 127 |
} |
| 128 |
|
| 129 |
src_compile() { |
| 130 |
emake all docs |
| 131 |
} |
| 132 |
|
| 133 |
src_install() { |
| 134 |
default |
| 135 |
rm "${D}"/usr/share/doc/${PF}/COPYING || die |
| 136 |
doinfo chrony.info* |
| 137 |
|
| 138 |
newinitd "${FILESDIR}"/chronyd.init chronyd |
| 139 |
newconfd "${FILESDIR}"/chronyd.conf chronyd |
| 140 |
|
| 141 |
insinto /etc/${PN} |
| 142 |
newins examples/chrony.conf.example chrony.conf |
| 143 |
newins examples/chrony.keys.example chrony.keys |
| 144 |
|
| 145 |
keepdir /var/{lib,log}/chrony |
| 146 |
|
| 147 |
insinto /etc/logrotate.d |
| 148 |
newins "${FILESDIR}"/chrony.logrotate chrony |
| 149 |
|
| 150 |
systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service |
| 151 |
systemd_enable_ntpunit 50-chrony chronyd.service |
| 152 |
} |
Archives