1 |
commit: 6a8a2aa1c51c8f9d94607b1c65c896748bf7c881 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 24 07:43:24 2017 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 27 22:14:52 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8a2aa1 |
7 |
|
8 |
net-misc/ntp: drop vulnerable and obssolete patch wrt bug #600430 |
9 |
|
10 |
(cherry picked from commit 42c60b7f25fc89dfa79e447584ad6050ffce1393) |
11 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
12 |
Fixes: https://github.com/gentoo/gentoo/pull/3617/ |
13 |
Fixes: https://bugs.gentoo.org/600430 |
14 |
|
15 |
net-misc/ntp/Manifest | 2 - |
16 |
net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch | 21 ---- |
17 |
net-misc/ntp/ntp-4.2.8_p8.ebuild | 137 --------------------- |
18 |
3 files changed, 160 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest |
21 |
index 45d0062..4681b59 100644 |
22 |
--- a/net-misc/ntp/Manifest |
23 |
+++ b/net-misc/ntp/Manifest |
24 |
@@ -1,4 +1,2 @@ |
25 |
-DIST ntp-4.2.8p8-manpages.tar.xz 24992 SHA256 d1c349c970280b2bdb8ba197b1229c0c909a59782b76f3d650a9d2663e8a4d36 SHA512 1a2b71d66ee9e6f03bfbb8f2c4ab1ed30cb2a5a0673e9769749569aa55e8994bacbef399c4b67da265a9673195618df63d84eafbeb37bef30aea302ab99653ef WHIRLPOOL ec62bc2d01c2494727e385fab4dd40581e69806e5ee7b97dd8cb30c44331386c96650358ff09414536d4b74b8178b0e85a3c436673282f228200b9df863c1890 |
26 |
-DIST ntp-4.2.8p8.tar.gz 7205710 SHA256 2ab3d0b5f0456e6311dda1cc27ab75da108762773a19e46abd938bd9407b97ee SHA512 253675667f78ad8855e961d02f6a120b68b75233c18ddb92cb6c9510fb3847f1672d0d6f93ad1eb11b14e3bdf78fdbc1458e516d906b763e8599490da6a4f225 WHIRLPOOL cc054a550e59b44428989a183978ea59c7f1bc2ed9514e7d1cf82127f3188f73edb3521ee5b215438368a3c22b8cae09a78174e943195ddd752f0571335adb9e |
27 |
DIST ntp-4.2.8p9-manpages.tar.xz 24988 SHA256 a7814373e7ceb73a9e426b2e60a9966b6d053f145fd0253bbccf407af9f7ad3f SHA512 23ba80c540d12e78012a448348b94ccb68d0a8078e2e6fe05be58d89aa5e6e31ee8d686920c0f841ad12eade84a081e393885760fdf81bad5c30c76006df0094 WHIRLPOOL 49259ef4bade074bbcb5d87dd21bd93538a3a17405a42e483d10168fd609f908b59c86c73b01d2db2e683ff43fa0fdc0cdf297bfcc452d223dcb78bcef3f46c3 |
28 |
DIST ntp-4.2.8p9.tar.gz 7231884 SHA256 b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 SHA512 ffd9e34060210d1cfb8ca0d89f2577df1c5fbe3ba63c620cdadc3ccc3c9d07f518783c6b91e57bffc77b08f449fdbab12faf226672ebd2dde5a0b4a783322a04 WHIRLPOOL ea96b106fd06f2b536394ad2a3dcc2a973aa0cec96140a292bc13b6ceb4159208a59b9c51936240c8a44fa7b2caa4be60d07d3c53066ce8588b0561bef64c070 |
29 |
|
30 |
diff --git a/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch b/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch |
31 |
deleted file mode 100644 |
32 |
index 403b2d5..00000000 |
33 |
--- a/net-misc/ntp/files/ntp-4.2.8-ntpd-test-signd.patch |
34 |
+++ /dev/null |
35 |
@@ -1,21 +0,0 @@ |
36 |
-http://bugs.ntp.org/show_bug.cgi?id=2951 |
37 |
- |
38 |
---- a/tests/ntpd/Makefile.in |
39 |
-+++ b/tests/ntpd/Makefile.in |
40 |
-@@ -205,7 +205,7 @@ test_ntp_scanner_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
41 |
- -o $@ |
42 |
- am_test_ntp_signd_OBJECTS = t-ntp_signd.$(OBJEXT) \ |
43 |
- run-t-ntp_signd.$(OBJEXT) test-libntp.$(OBJEXT) \ |
44 |
-- ntp_signd.$(OBJEXT) $(am__objects_1) |
45 |
-+ $(am__objects_1) |
46 |
- test_ntp_signd_OBJECTS = $(am_test_ntp_signd_OBJECTS) |
47 |
- test_ntp_signd_DEPENDENCIES = $(am__DEPENDENCIES_3) \ |
48 |
- $(top_builddir)/ntpd/ntp_config.o \ |
49 |
-@@ -871,7 +871,6 @@ test_ntp_signd_SOURCES = \ |
50 |
- t-ntp_signd.c \ |
51 |
- run-t-ntp_signd.c \ |
52 |
- $(srcdir)/../libntp/test-libntp.c \ |
53 |
-- $(srcdir)/../../ntpd/ntp_signd.c \ |
54 |
- $(NULL) |
55 |
- |
56 |
- |
57 |
|
58 |
diff --git a/net-misc/ntp/ntp-4.2.8_p8.ebuild b/net-misc/ntp/ntp-4.2.8_p8.ebuild |
59 |
deleted file mode 100644 |
60 |
index ccb745f..00000000 |
61 |
--- a/net-misc/ntp/ntp-4.2.8_p8.ebuild |
62 |
+++ /dev/null |
63 |
@@ -1,137 +0,0 @@ |
64 |
-# Copyright 1999-2016 Gentoo Foundation |
65 |
-# Distributed under the terms of the GNU General Public License v2 |
66 |
-# $Id$ |
67 |
- |
68 |
-EAPI="5" |
69 |
- |
70 |
-inherit eutils toolchain-funcs flag-o-matic user systemd |
71 |
- |
72 |
-MY_P=${P/_p/p} |
73 |
-DESCRIPTION="Network Time Protocol suite/programs" |
74 |
-HOMEPAGE="http://www.ntp.org/" |
75 |
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz |
76 |
- https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" |
77 |
- |
78 |
-LICENSE="HPND BSD ISC" |
79 |
-SLOT="0" |
80 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint" |
81 |
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" |
82 |
- |
83 |
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) |
84 |
- >=dev-libs/libevent-2.0.9:=[threads?] |
85 |
- kernel_linux? ( caps? ( sys-libs/libcap ) ) |
86 |
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) |
87 |
- !openntpd? ( !net-misc/openntpd ) |
88 |
- snmp? ( net-analyzer/net-snmp ) |
89 |
- ssl? ( |
90 |
- !libressl? ( dev-libs/openssl:0= ) |
91 |
- libressl? ( dev-libs/libressl ) |
92 |
- ) |
93 |
- parse-clocks? ( net-misc/pps-tools )" |
94 |
-DEPEND="${CDEPEND} |
95 |
- virtual/pkgconfig" |
96 |
-RDEPEND="${CDEPEND} |
97 |
- selinux? ( sec-policy/selinux-ntp ) |
98 |
- vim-syntax? ( app-vim/ntp-syntax )" |
99 |
-PDEPEND="openntpd? ( net-misc/openntpd )" |
100 |
- |
101 |
-S=${WORKDIR}/${MY_P} |
102 |
- |
103 |
-PATCHES=( |
104 |
- "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 |
105 |
- "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 |
106 |
- "${FILESDIR}"/${PN}-4.2.8-ntpd-test-signd.patch |
107 |
-) |
108 |
- |
109 |
-pkg_setup() { |
110 |
- enewgroup ntp 123 |
111 |
- enewuser ntp 123 -1 /dev/null ntp |
112 |
-} |
113 |
- |
114 |
-src_prepare() { |
115 |
- epatch "${PATCHES[@]}" |
116 |
- append-cppflags -D_GNU_SOURCE #264109 |
117 |
- # Make sure every build uses the same install layout. #539092 |
118 |
- find sntp/loc/ -type f '!' -name legacy -delete || die |
119 |
- # Disable pointless checks. |
120 |
- touch .checkChangeLog .gcc-warning FRC.html html/.datecheck |
121 |
-} |
122 |
- |
123 |
-src_configure() { |
124 |
- # avoid libmd5/libelf |
125 |
- export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no |
126 |
- export ac_cv_lib_elf_nlist=no |
127 |
- # blah, no real configure options #176333 |
128 |
- export ac_cv_header_dns_sd_h=$(usex zeroconf) |
129 |
- export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} |
130 |
- # Increase the default memlimit from 32MiB to 128MiB. #533232 |
131 |
- econf \ |
132 |
- --with-lineeditlibs=readline,edit,editline \ |
133 |
- --with-yielding-select \ |
134 |
- --disable-local-libevent \ |
135 |
- --docdir='$(datarootdir)'/doc/${PF} \ |
136 |
- --htmldir='$(docdir)/html' \ |
137 |
- --with-memlock=256 \ |
138 |
- $(use_enable caps linuxcaps) \ |
139 |
- $(use_enable parse-clocks) \ |
140 |
- $(use_enable ipv6) \ |
141 |
- $(use_enable debug debugging) \ |
142 |
- $(use_with readline lineeditlibs readline) \ |
143 |
- $(use_enable samba ntp-signd) \ |
144 |
- $(use_with snmp ntpsnmpd) \ |
145 |
- $(use_with ssl crypto) \ |
146 |
- $(use_enable threads thread-support) |
147 |
-} |
148 |
- |
149 |
-src_install() { |
150 |
- default |
151 |
- # move ntpd/ntpdate to sbin #66671 |
152 |
- dodir /usr/sbin |
153 |
- mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" |
154 |
- |
155 |
- dodoc INSTALL WHERE-TO-START |
156 |
- doman "${WORKDIR}"/man/*.[58] |
157 |
- |
158 |
- insinto /etc |
159 |
- doins "${FILESDIR}"/ntp.conf |
160 |
- use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 |
161 |
- newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd |
162 |
- newconfd "${FILESDIR}"/ntpd.confd ntpd |
163 |
- newinitd "${FILESDIR}"/ntp-client.rc ntp-client |
164 |
- newconfd "${FILESDIR}"/ntp-client.confd ntp-client |
165 |
- newinitd "${FILESDIR}"/sntp.rc sntp |
166 |
- newconfd "${FILESDIR}"/sntp.confd sntp |
167 |
- if ! use caps ; then |
168 |
- sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die |
169 |
- fi |
170 |
- sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die |
171 |
- |
172 |
- keepdir /var/lib/ntp |
173 |
- use prefix || fowners ntp:ntp /var/lib/ntp |
174 |
- |
175 |
- if use openntpd ; then |
176 |
- cd "${ED}" |
177 |
- rm usr/sbin/ntpd || die |
178 |
- rm -r var/lib |
179 |
- rm etc/{conf,init}.d/ntpd |
180 |
- rm usr/share/man/*/ntpd.8 || die |
181 |
- else |
182 |
- systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service |
183 |
- use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service |
184 |
- systemd_enable_ntpunit 60-ntpd ntpd.service |
185 |
- fi |
186 |
- |
187 |
- systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service |
188 |
- systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf |
189 |
- systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service |
190 |
- systemd_install_serviced "${FILESDIR}"/sntp.service.conf |
191 |
-} |
192 |
- |
193 |
-pkg_postinst() { |
194 |
- if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then |
195 |
- eerror "The notrust option was found in your /etc/ntp.conf!" |
196 |
- ewarn "If your ntpd starts sending out weird responses," |
197 |
- ewarn "then make sure you have keys properly setup and see" |
198 |
- ewarn "https://bugs.gentoo.org/41827" |
199 |
- fi |
200 |
-} |