1 |
commit: 6109df8405c78516589580b6d0867c000072752e |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 25 13:33:03 2021 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 25 13:33:12 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6109df84 |
7 |
|
8 |
net-dns/dnsmasq: security cleanup |
9 |
|
10 |
Bug: https://bugs.gentoo.org/782130 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
net-dns/dnsmasq/Manifest | 2 - |
15 |
net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild | 217 -------------------- |
16 |
net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild | 221 --------------------- |
17 |
.../files/dnsmasq-2.84-version-string.patch | 13 -- |
18 |
4 files changed, 453 deletions(-) |
19 |
|
20 |
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest |
21 |
index f65dc2f4d6e..8a4d81c60fb 100644 |
22 |
--- a/net-dns/dnsmasq/Manifest |
23 |
+++ b/net-dns/dnsmasq/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST dnsmasq-2.83.tar.xz 513880 BLAKE2B 16220fd7eac03f3ba70b014ace3c9775a85b31cdbabd7680d88a87697453a54bfec4c553207477f416032e679dbdaf3ca6c8bb56b72ee423540e0bedf0621865 SHA512 1eaade775dc19658afe825407c10456ab954b82034644bb19af2594d737ceae17ff2cee7f1f917e8e8b2dadbfbcb83dd8b842c0693fcac71487a5fade1eb4b05 |
26 |
-DIST dnsmasq-2.84.tar.xz 514216 BLAKE2B 2bca97c16bcf32e0126eb50dc14b82a1f37e1635ebd1dc205e9a92455640fcbb98c093be725768ba9ced84443e451775f8556a164c82967e09e1df4bf7fc901b SHA512 e84bdcdf3cf35f08e8492eb5aa89ee6543233bdb821d01f164783bd6d0913ec01c513e85e2109352c77e77142a1a94bedcd3361f37d7b2a9a5d35a02448e85c6 |
27 |
DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09 |
28 |
|
29 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild b/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild |
30 |
deleted file mode 100644 |
31 |
index d1c269b7660..00000000000 |
32 |
--- a/net-dns/dnsmasq/dnsmasq-2.83-r101.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,217 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-LUA_COMPAT=( lua5-{1..4} luajit ) |
41 |
- |
42 |
-inherit toolchain-funcs flag-o-matic lua-single systemd |
43 |
- |
44 |
-DESCRIPTION="Small forwarding DNS server" |
45 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
46 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
47 |
- |
48 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" |
51 |
- |
52 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" |
53 |
-IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp" |
54 |
- |
55 |
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) |
56 |
- |
57 |
-BDEPEND=" |
58 |
- app-arch/xz-utils |
59 |
- virtual/pkgconfig |
60 |
- nls? ( sys-devel/gettext ) |
61 |
-" |
62 |
- |
63 |
-COMMON_DEPEND=" |
64 |
- acct-group/dnsmasq |
65 |
- acct-user/dnsmasq |
66 |
- dbus? ( sys-apps/dbus:= ) |
67 |
- idn? ( |
68 |
- !libidn2? ( net-dns/libidn:0= ) |
69 |
- libidn2? ( >=net-dns/libidn2-2.0:= ) |
70 |
- ) |
71 |
- lua? ( ${LUA_DEPS} ) |
72 |
- conntrack? ( net-libs/libnetfilter_conntrack:= ) |
73 |
- nls? ( sys-devel/gettext ) |
74 |
-" |
75 |
- |
76 |
-DEPEND="${COMMON_DEPEND} |
77 |
- dnssec? ( |
78 |
- dev-libs/nettle:=[gmp] |
79 |
- static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) |
80 |
- ) |
81 |
-" |
82 |
- |
83 |
-RDEPEND="${COMMON_DEPEND} |
84 |
- dnssec? ( |
85 |
- !static? ( >=dev-libs/nettle-3.4:=[gmp] ) |
86 |
- ) |
87 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
88 |
-" |
89 |
- |
90 |
-REQUIRED_USE=" |
91 |
- dhcp-tools? ( dhcp ) |
92 |
- dnssec? ( !nettlehash ) |
93 |
- lua? ( |
94 |
- script |
95 |
- ${LUA_REQUIRED_USE} |
96 |
- ) |
97 |
- libidn2? ( idn ) |
98 |
-" |
99 |
- |
100 |
-use_have() { |
101 |
- local no_only |
102 |
- if [[ ${1} == '-n' ]]; then |
103 |
- no_only=1 |
104 |
- shift |
105 |
- fi |
106 |
- local useflag="${1}" |
107 |
- shift |
108 |
- |
109 |
- local uword="${1:-${useflag}}" |
110 |
- shift |
111 |
- |
112 |
- while [[ ${uword} ]]; do |
113 |
- uword="${uword^^}" |
114 |
- |
115 |
- if ! use "${useflag}"; then |
116 |
- printf -- " -DNO_%s" "${uword}" |
117 |
- elif [[ -z "${no_only}" ]]; then |
118 |
- printf -- " -DHAVE_%s" "${uword}" |
119 |
- fi |
120 |
- uword="${1}" |
121 |
- shift |
122 |
- done |
123 |
-} |
124 |
- |
125 |
-pkg_setup() { |
126 |
- use lua && lua-single_pkg_setup |
127 |
-} |
128 |
- |
129 |
-pkg_pretend() { |
130 |
- if use static; then |
131 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
132 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \ |
133 |
- "in this case the static USE flag does nothing." |
134 |
- fi |
135 |
-} |
136 |
- |
137 |
-src_prepare() { |
138 |
- default |
139 |
- |
140 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die |
141 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \ |
142 |
- dnsmasq.conf.example || die |
143 |
-} |
144 |
- |
145 |
-src_configure() { |
146 |
- COPTS=( |
147 |
- $(use_have -n auth-dns auth) |
148 |
- $(use_have conntrack) |
149 |
- $(use_have dbus) |
150 |
- $(use libidn2 || use_have idn) |
151 |
- $(use_have libidn2) |
152 |
- $(use_have -n inotify) |
153 |
- $(use_have -n dhcp dhcp dhcp6) |
154 |
- $(use_have -n ipv6 ipv6 dhcp6) |
155 |
- $(use_have -n id id) |
156 |
- $(use_have lua luascript) |
157 |
- $(use_have -n script) |
158 |
- $(use_have -n tftp) |
159 |
- $(use_have dnssec) |
160 |
- $(use_have nettlehash) |
161 |
- $(use_have static dnssec_static) |
162 |
- $(use_have -n dumpfile) |
163 |
- ) |
164 |
-} |
165 |
- |
166 |
-src_compile() { |
167 |
- emake \ |
168 |
- PREFIX=/usr \ |
169 |
- MANDIR=/usr/share/man \ |
170 |
- CC="$(tc-getCC)" \ |
171 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
172 |
- CFLAGS="${CFLAGS}" \ |
173 |
- LDFLAGS="${LDFLAGS}" \ |
174 |
- COPTS="${COPTS[*]}" \ |
175 |
- CONFFILE="/etc/${PN}.conf" \ |
176 |
- all$(use nls && printf -- "-i18n\n") |
177 |
- |
178 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
179 |
- PREFIX=/usr \ |
180 |
- MANDIR=/usr/share/man \ |
181 |
- CC="$(tc-getCC)" \ |
182 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
183 |
- CFLAGS="${CFLAGS}" \ |
184 |
- LDFLAGS="${LDFLAGS}" \ |
185 |
- all |
186 |
-} |
187 |
- |
188 |
-src_install() { |
189 |
- local lingua puid |
190 |
- emake \ |
191 |
- PREFIX=/usr \ |
192 |
- MANDIR=/usr/share/man \ |
193 |
- COPTS="${COPTS[*]}" \ |
194 |
- DESTDIR="${ED}" \ |
195 |
- install$(use nls && printf -- "-i18n\n") |
196 |
- |
197 |
- for lingua in "${DM_LINGUAS[@]}"; do |
198 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
199 |
- || rm -rf "${ED}"/usr/share/locale/${lingua} |
200 |
- done |
201 |
- [[ -d "${D}"/usr/share/locale/ ]] && \ |
202 |
- rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/ |
203 |
- |
204 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
205 |
- dodoc -r logo |
206 |
- |
207 |
- docinto html/ |
208 |
- dodoc *.html |
209 |
- |
210 |
- newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN} |
211 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
212 |
- |
213 |
- insinto /etc/logrotate.d |
214 |
- newins "${FILESDIR}"/dnsmasq.logrotate ${PN} |
215 |
- |
216 |
- insinto /etc |
217 |
- newins dnsmasq.conf.example dnsmasq.conf |
218 |
- |
219 |
- insinto /usr/share/dnsmasq |
220 |
- doins trust-anchors.conf |
221 |
- |
222 |
- if use dhcp; then |
223 |
- keepdir /var/lib/misc |
224 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN} |
225 |
- fi |
226 |
- if use dbus; then |
227 |
- insinto /etc/dbus-1/system.d |
228 |
- doins dbus/dnsmasq.conf |
229 |
- fi |
230 |
- |
231 |
- if use dhcp-tools; then |
232 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
233 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
234 |
- if use ipv6; then |
235 |
- dosbin contrib/lease-tools/dhcp_release6 |
236 |
- doman contrib/lease-tools/dhcp_release6.1 |
237 |
- fi |
238 |
- fi |
239 |
- |
240 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
241 |
-} |
242 |
- |
243 |
-pkg_preinst() { |
244 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && \ |
245 |
- cp /var/lib/misc/dnsmasq.leases "${T}" |
246 |
-} |
247 |
- |
248 |
-pkg_postinst() { |
249 |
- [[ -f "${T}"/dnsmasq.leases ]] && \ |
250 |
- cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
251 |
-} |
252 |
|
253 |
diff --git a/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild b/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild |
254 |
deleted file mode 100644 |
255 |
index 3ca7420ed50..00000000000 |
256 |
--- a/net-dns/dnsmasq/dnsmasq-2.84-r101.ebuild |
257 |
+++ /dev/null |
258 |
@@ -1,221 +0,0 @@ |
259 |
-# Copyright 1999-2021 Gentoo Authors |
260 |
-# Distributed under the terms of the GNU General Public License v2 |
261 |
- |
262 |
-EAPI=7 |
263 |
- |
264 |
-LUA_COMPAT=( lua5-{1..4} luajit ) |
265 |
- |
266 |
-inherit toolchain-funcs flag-o-matic lua-single systemd |
267 |
- |
268 |
-DESCRIPTION="Small forwarding DNS server" |
269 |
-HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" |
270 |
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
271 |
- |
272 |
-LICENSE="|| ( GPL-2 GPL-3 )" |
273 |
-SLOT="0" |
274 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
275 |
- |
276 |
-IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" |
277 |
-IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp" |
278 |
- |
279 |
-DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) |
280 |
- |
281 |
-BDEPEND=" |
282 |
- app-arch/xz-utils |
283 |
- virtual/pkgconfig |
284 |
- nls? ( sys-devel/gettext ) |
285 |
-" |
286 |
- |
287 |
-COMMON_DEPEND=" |
288 |
- acct-group/dnsmasq |
289 |
- acct-user/dnsmasq |
290 |
- dbus? ( sys-apps/dbus:= ) |
291 |
- idn? ( |
292 |
- !libidn2? ( net-dns/libidn:0= ) |
293 |
- libidn2? ( >=net-dns/libidn2-2.0:= ) |
294 |
- ) |
295 |
- lua? ( ${LUA_DEPS} ) |
296 |
- conntrack? ( net-libs/libnetfilter_conntrack:= ) |
297 |
- nls? ( sys-devel/gettext ) |
298 |
-" |
299 |
- |
300 |
-DEPEND="${COMMON_DEPEND} |
301 |
- dnssec? ( |
302 |
- dev-libs/nettle:=[gmp] |
303 |
- static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) |
304 |
- ) |
305 |
-" |
306 |
- |
307 |
-RDEPEND="${COMMON_DEPEND} |
308 |
- dnssec? ( |
309 |
- !static? ( >=dev-libs/nettle-3.4:=[gmp] ) |
310 |
- ) |
311 |
- selinux? ( sec-policy/selinux-dnsmasq ) |
312 |
-" |
313 |
- |
314 |
-REQUIRED_USE=" |
315 |
- dhcp-tools? ( dhcp ) |
316 |
- dnssec? ( !nettlehash ) |
317 |
- lua? ( |
318 |
- script |
319 |
- ${LUA_REQUIRED_USE} |
320 |
- ) |
321 |
- libidn2? ( idn ) |
322 |
-" |
323 |
- |
324 |
-PATCHES=( |
325 |
- "${FILESDIR}/dnsmasq-2.84-version-string.patch" |
326 |
-) |
327 |
- |
328 |
-use_have() { |
329 |
- local no_only |
330 |
- if [[ ${1} == '-n' ]]; then |
331 |
- no_only=1 |
332 |
- shift |
333 |
- fi |
334 |
- local useflag="${1}" |
335 |
- shift |
336 |
- |
337 |
- local uword="${1:-${useflag}}" |
338 |
- shift |
339 |
- |
340 |
- while [[ ${uword} ]]; do |
341 |
- uword="${uword^^}" |
342 |
- |
343 |
- if ! use "${useflag}"; then |
344 |
- printf -- " -DNO_%s" "${uword}" |
345 |
- elif [[ -z "${no_only}" ]]; then |
346 |
- printf -- " -DHAVE_%s" "${uword}" |
347 |
- fi |
348 |
- uword="${1}" |
349 |
- shift |
350 |
- done |
351 |
-} |
352 |
- |
353 |
-pkg_setup() { |
354 |
- use lua && lua-single_pkg_setup |
355 |
-} |
356 |
- |
357 |
-pkg_pretend() { |
358 |
- if use static; then |
359 |
- einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
360 |
- use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense;" \ |
361 |
- "in this case the static USE flag does nothing." |
362 |
- fi |
363 |
-} |
364 |
- |
365 |
-src_prepare() { |
366 |
- default |
367 |
- |
368 |
- sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die |
369 |
- sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \ |
370 |
- dnsmasq.conf.example || die |
371 |
-} |
372 |
- |
373 |
-src_configure() { |
374 |
- COPTS=( |
375 |
- $(use_have -n auth-dns auth) |
376 |
- $(use_have conntrack) |
377 |
- $(use_have dbus) |
378 |
- $(use libidn2 || use_have idn) |
379 |
- $(use_have libidn2) |
380 |
- $(use_have -n inotify) |
381 |
- $(use_have -n dhcp dhcp dhcp6) |
382 |
- $(use_have -n ipv6 ipv6 dhcp6) |
383 |
- $(use_have -n id id) |
384 |
- $(use_have lua luascript) |
385 |
- $(use_have -n script) |
386 |
- $(use_have -n tftp) |
387 |
- $(use_have dnssec) |
388 |
- $(use_have nettlehash) |
389 |
- $(use_have static dnssec_static) |
390 |
- $(use_have -n dumpfile) |
391 |
- ) |
392 |
-} |
393 |
- |
394 |
-src_compile() { |
395 |
- emake \ |
396 |
- PREFIX=/usr \ |
397 |
- MANDIR=/usr/share/man \ |
398 |
- CC="$(tc-getCC)" \ |
399 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
400 |
- CFLAGS="${CFLAGS}" \ |
401 |
- LDFLAGS="${LDFLAGS}" \ |
402 |
- COPTS="${COPTS[*]}" \ |
403 |
- CONFFILE="/etc/${PN}.conf" \ |
404 |
- all$(use nls && printf -- "-i18n\n") |
405 |
- |
406 |
- use dhcp-tools && emake -C contrib/lease-tools \ |
407 |
- PREFIX=/usr \ |
408 |
- MANDIR=/usr/share/man \ |
409 |
- CC="$(tc-getCC)" \ |
410 |
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \ |
411 |
- CFLAGS="${CFLAGS}" \ |
412 |
- LDFLAGS="${LDFLAGS}" \ |
413 |
- all |
414 |
-} |
415 |
- |
416 |
-src_install() { |
417 |
- local lingua puid |
418 |
- emake \ |
419 |
- PREFIX=/usr \ |
420 |
- MANDIR=/usr/share/man \ |
421 |
- COPTS="${COPTS[*]}" \ |
422 |
- DESTDIR="${ED}" \ |
423 |
- install$(use nls && printf -- "-i18n\n") |
424 |
- |
425 |
- for lingua in "${DM_LINGUAS[@]}"; do |
426 |
- has ${lingua} ${LINGUAS-${lingua}} \ |
427 |
- || rm -rf "${ED}"/usr/share/locale/${lingua} |
428 |
- done |
429 |
- [[ -d "${D}"/usr/share/locale/ ]] && \ |
430 |
- rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/ |
431 |
- |
432 |
- dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
433 |
- dodoc -r logo |
434 |
- |
435 |
- docinto html/ |
436 |
- dodoc *.html |
437 |
- |
438 |
- newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN} |
439 |
- newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
440 |
- |
441 |
- insinto /etc/logrotate.d |
442 |
- newins "${FILESDIR}"/dnsmasq.logrotate ${PN} |
443 |
- |
444 |
- insinto /etc |
445 |
- newins dnsmasq.conf.example dnsmasq.conf |
446 |
- |
447 |
- insinto /usr/share/dnsmasq |
448 |
- doins trust-anchors.conf |
449 |
- |
450 |
- if use dhcp; then |
451 |
- keepdir /var/lib/misc |
452 |
- newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${PN} |
453 |
- fi |
454 |
- if use dbus; then |
455 |
- insinto /etc/dbus-1/system.d |
456 |
- doins dbus/dnsmasq.conf |
457 |
- fi |
458 |
- |
459 |
- if use dhcp-tools; then |
460 |
- dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time} |
461 |
- doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1 |
462 |
- if use ipv6; then |
463 |
- dosbin contrib/lease-tools/dhcp_release6 |
464 |
- doman contrib/lease-tools/dhcp_release6.1 |
465 |
- fi |
466 |
- fi |
467 |
- |
468 |
- systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
469 |
-} |
470 |
- |
471 |
-pkg_preinst() { |
472 |
- [[ -f /var/lib/misc/dnsmasq.leases ]] && \ |
473 |
- cp /var/lib/misc/dnsmasq.leases "${T}" |
474 |
-} |
475 |
- |
476 |
-pkg_postinst() { |
477 |
- [[ -f "${T}"/dnsmasq.leases ]] && \ |
478 |
- cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
479 |
-} |
480 |
|
481 |
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch b/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch |
482 |
deleted file mode 100644 |
483 |
index bd37dbbfe75..00000000000 |
484 |
--- a/net-dns/dnsmasq/files/dnsmasq-2.84-version-string.patch |
485 |
+++ /dev/null |
486 |
@@ -1,13 +0,0 @@ |
487 |
-diff --git a/bld/get-version b/bld/get-version |
488 |
-index e472aab..3bf0b87 100755 |
489 |
---- a/bld/get-version |
490 |
-+++ b/bld/get-version |
491 |
-@@ -28,7 +28,7 @@ else |
492 |
- vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]` |
493 |
- |
494 |
- if [ $? -eq 0 ]; then |
495 |
-- echo "${vers}" | sort -r | head -n 1 | sed 's/^v//' |
496 |
-+ echo "${vers}" | sort | head -n 1 | sed 's/^v//' |
497 |
- else |
498 |
- cat $1/VERSION |
499 |
- fi |