| 1 |
flameeyes 10/07/27 13:06:37 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: ntp-4.2.6_p2-r1.ebuild |
| 5 |
Removed: ntp-4.2.6_p2.ebuild ntp-4.2.4_p6.ebuild |
| 6 |
ntp-4.2.6_p1.ebuild ntp-4.2.6_p1-r1.ebuild |
| 7 |
ntp-4.2.4_p7.ebuild ntp-4.2.6.ebuild |
| 8 |
Log: |
| 9 |
Fix net-snmp automagic dependency (bug #330043, thanks to Timo Gurr). Cleanup old versions. |
| 10 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.162 net-misc/ntp/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/ChangeLog?rev=1.162&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/ChangeLog?rev=1.162&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/ChangeLog?r1=1.161&r2=1.162 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v |
| 22 |
retrieving revision 1.161 |
| 23 |
retrieving revision 1.162 |
| 24 |
diff -u -r1.161 -r1.162 |
| 25 |
--- ChangeLog 18 Jul 2010 21:54:28 -0000 1.161 |
| 26 |
+++ ChangeLog 27 Jul 2010 13:06:37 -0000 1.162 |
| 27 |
@@ -1,6 +1,16 @@ |
| 28 |
# ChangeLog for net-misc/ntp |
| 29 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.161 2010/07/18 21:54:28 vapier Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.162 2010/07/27 13:06:37 flameeyes Exp $ |
| 32 |
+ |
| 33 |
+*ntp-4.2.6_p2-r1 (27 Jul 2010) |
| 34 |
+ |
| 35 |
+ 27 Jul 2010; Diego E. Pettenò <flameeyes@g.o> |
| 36 |
+ -ntp-4.2.4_p6.ebuild, -ntp-4.2.4_p7.ebuild, -ntp-4.2.6.ebuild, |
| 37 |
+ -ntp-4.2.6_p1.ebuild, -ntp-4.2.6_p1-r1.ebuild, -ntp-4.2.6_p2.ebuild, |
| 38 |
+ +ntp-4.2.6_p2-r1.ebuild, -files/ntp-4.2.6-linking.patch, |
| 39 |
+ -files/ntp-4.2.6_p1-linking.patch: |
| 40 |
+ Fix net-snmp automagic dependency (bug #330043, thanks to Timo Gurr). |
| 41 |
+ Cleanup old versions. |
| 42 |
|
| 43 |
*ntp-4.2.6_p2 (18 Jul 2010) |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.1 net-misc/ntp/ntp-4.2.6_p2-r1.ebuild |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild?rev=1.1&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild?rev=1.1&content-type=text/plain |
| 52 |
|
| 53 |
Index: ntp-4.2.6_p2-r1.ebuild |
| 54 |
=================================================================== |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p2-r1.ebuild,v 1.1 2010/07/27 13:06:37 flameeyes Exp $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
|
| 61 |
inherit eutils toolchain-funcs flag-o-matic |
| 62 |
|
| 63 |
MY_P=${P/_p/p} |
| 64 |
DESCRIPTION="Network Time Protocol suite/programs" |
| 65 |
HOMEPAGE="http://www.ntp.org/" |
| 66 |
SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz |
| 67 |
mirror://gentoo/${MY_P}-manpages.tar.bz2" |
| 68 |
|
| 69 |
LICENSE="as-is" |
| 70 |
SLOT="0" |
| 71 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
| 72 |
IUSE="caps debug ipv6 openntpd parse-clocks selinux snmp ssl vim-syntax zeroconf" |
| 73 |
|
| 74 |
DEPEND=">=sys-libs/ncurses-5.2 |
| 75 |
>=sys-libs/readline-4.1 |
| 76 |
kernel_linux? ( caps? ( sys-libs/libcap ) ) |
| 77 |
zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) |
| 78 |
!openntpd? ( !net-misc/openntpd ) |
| 79 |
snmp? ( net-analyzer/net-snmp ) |
| 80 |
ssl? ( dev-libs/openssl ) |
| 81 |
selinux? ( sec-policy/selinux-ntp )" |
| 82 |
RDEPEND="${DEPEND} |
| 83 |
vim-syntax? ( app-vim/ntp-syntax )" |
| 84 |
PDEPEND="openntpd? ( net-misc/openntpd )" |
| 85 |
|
| 86 |
S=${WORKDIR}/${MY_P} |
| 87 |
|
| 88 |
pkg_setup() { |
| 89 |
enewgroup ntp 123 |
| 90 |
enewuser ntp 123 -1 /dev/null ntp |
| 91 |
} |
| 92 |
|
| 93 |
src_prepare() { |
| 94 |
epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030 |
| 95 |
epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 |
| 96 |
append-cppflags -D_GNU_SOURCE #264109 |
| 97 |
} |
| 98 |
|
| 99 |
src_configure() { |
| 100 |
# avoid libmd5/libelf |
| 101 |
export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no |
| 102 |
export ac_cv_lib_elf_nlist=no |
| 103 |
# blah, no real configure options #176333 |
| 104 |
export ac_cv_header_dns_sd_h=$(use zeroconf && echo yes || echo no) |
| 105 |
export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} |
| 106 |
econf \ |
| 107 |
--with-lineeditlibs=readline,edit,editline \ |
| 108 |
$(use_enable caps linuxcaps) \ |
| 109 |
$(use_enable parse-clocks) \ |
| 110 |
$(use_enable ipv6) \ |
| 111 |
$(use_enable debug debugging) \ |
| 112 |
$(use_with snmp ntpsnmpd) \ |
| 113 |
$(use_with ssl crypto) |
| 114 |
} |
| 115 |
|
| 116 |
src_install() { |
| 117 |
emake install DESTDIR="${D}" || die "install failed" |
| 118 |
# move ntpd/ntpdate to sbin #66671 |
| 119 |
dodir /usr/sbin |
| 120 |
mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin" |
| 121 |
|
| 122 |
dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START |
| 123 |
doman "${WORKDIR}"/man/*.[58] |
| 124 |
dohtml -r html/* |
| 125 |
|
| 126 |
insinto /usr/share/ntp |
| 127 |
doins "${FILESDIR}"/ntp.conf |
| 128 |
cp -r scripts/* "${D}"/usr/share/ntp/ || die |
| 129 |
fperms -R go-w /usr/share/ntp |
| 130 |
find "${D}"/usr/share/ntp \ |
| 131 |
'(' \ |
| 132 |
-name '*.in' -o \ |
| 133 |
-name 'Makefile*' -o \ |
| 134 |
-name support \ |
| 135 |
')' \ |
| 136 |
-exec rm -r {} \; |
| 137 |
|
| 138 |
insinto /etc |
| 139 |
doins "${FILESDIR}"/ntp.conf |
| 140 |
newinitd "${FILESDIR}"/ntpd.rc ntpd |
| 141 |
newconfd "${FILESDIR}"/ntpd.confd ntpd |
| 142 |
newinitd "${FILESDIR}"/ntp-client.rc ntp-client |
| 143 |
newconfd "${FILESDIR}"/ntp-client.confd ntp-client |
| 144 |
use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd |
| 145 |
dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd |
| 146 |
|
| 147 |
keepdir /var/lib/ntp |
| 148 |
fowners ntp:ntp /var/lib/ntp |
| 149 |
|
| 150 |
if use openntpd ; then |
| 151 |
cd "${D}" |
| 152 |
rm usr/sbin/ntpd || die |
| 153 |
rm -r var/lib |
| 154 |
rm etc/{conf,init}.d/ntpd |
| 155 |
rm usr/share/man/*/ntpd.8 || die |
| 156 |
fi |
| 157 |
} |
| 158 |
|
| 159 |
pkg_postinst() { |
| 160 |
ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/" |
| 161 |
ewarn "Review /etc/ntp.conf to setup server info." |
| 162 |
ewarn "Review /etc/conf.d/ntpd to setup init.d info." |
| 163 |
echo |
| 164 |
elog "The way ntp sets and maintains your system time has changed." |
| 165 |
elog "Now you can use /etc/init.d/ntp-client to set your time at" |
| 166 |
elog "boot while you can use /etc/init.d/ntpd to maintain your time" |
| 167 |
elog "while your machine runs" |
| 168 |
if grep -qs '^[^#].*notrust' "${ROOT}"/etc/ntp.conf ; then |
| 169 |
echo |
| 170 |
eerror "The notrust option was found in your /etc/ntp.conf!" |
| 171 |
ewarn "If your ntpd starts sending out weird responses," |
| 172 |
ewarn "then make sure you have keys properly setup and see" |
| 173 |
ewarn "http://bugs.gentoo.org/41827" |
| 174 |
fi |
| 175 |
} |
Archives