From: Markos Chandras Date: Mon, 22 Dec 2014 15:04:47 +0000 (+0000) Subject: Backport upstream patch to allow ntp-keygen building with USE=-ssl. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=122e97992a62e45db1c783de8da1cd439b29fd7c;p=gentoo.git Backport upstream patch to allow ntp-keygen building with USE=-ssl. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x09BF4F54C2BA7F3C! --- diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index 87084722b251..08d88280e5f6 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/ntp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.225 2014/12/22 08:42:22 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.226 2014/12/22 15:04:43 hwoarang Exp $ + + 22 Dec 2014; Markos Chandras + +files/ntp-4.2.8-ntp-keygen-no-openssl.patch, ntp-4.2.8-r1.ebuild: + Backport upstream patch to allow ntp-keygen building with USE=-ssl. 22 Dec 2014; Lars Wendler -ntp-4.2.4_p7-r1.ebuild, -ntp-4.2.6_p2-r1.ebuild, -ntp-4.2.6_p3.ebuild, -ntp-4.2.6_p3-r1.ebuild, diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index ed6d60ab2fc2..56043faf7a09 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -6,6 +6,7 @@ AUX man-pages/ntp.conf.5.patch 503 SHA256 d26c1006d72d76591588fbd058000596b17b0b AUX man-pages/ntp.xsl 5831 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd WHIRLPOOL 0376d57f0e657c9a09fa83c69485fe202f4ef6d46957d7a2680410cb08ac0d5083e4bcb4221175acc942d211fdbb7ffbbf4d9ed00a43b8087c90fbe2a4e3f808 AUX ntp-4.2.4_p5-adjtimex.patch 670 SHA256 ec465c5d5b3e9d72563ec88dba19ad7a05d9d65d2e72899532730333a8d38b38 SHA512 d2f50cd8894361b70125b43edba22661cca8b4ce3329c461c78d93b20ffc262f89ba20b6a923783ad85f785c870911712e9cb9ecdf0797832f65a89258e31168 WHIRLPOOL daa33249c492d942bbba2c632e1bc5b14109b4195614dcfc3bf219b5a26672630419b51253add5043bd9f70ca991d68e2c9c837ce5e6a9aad71352f7cb082402 AUX ntp-4.2.4_p7-nano.patch 393 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3842f2e8acc88dc5f2deb1b4 SHA512 b8531f8b33a4d062ae5910e5775edc5e52a5df971b6fbcc7efdc55fa34681a38bc8881ab6164acfa692e4105bc1ae6d3e20fa06592cb04b7bd935dfd0abd9746 WHIRLPOOL 66dcf8cf79468c8f58e87cceeefea35ccbc930329eee18ed2b0b1c749aa645486207ebb413fe962c9b6824ffc00ed64636622194f8a3e4cf611d3b7ff822325f +AUX ntp-4.2.8-ntp-keygen-no-openssl.patch 4335 SHA256 8c13773cc10a0b51b94801bd779c57d412048d3d9e1684dcf5d38e512ccfb639 SHA512 d8bbcc99a25eb8f0ddf940b3765bd37655958a6b39060891046c87ef109e173884e81b4b5c25a1bb4cecc1457d88c404332d224b525f255c19a6a63f60df1194 WHIRLPOOL 3cdf5f556073b4bab3350ad2e81113cf842a0caa3b8460d656b7b5550209d458e5602a5c2b09358f125556e1770f26a6e626bc42b48978f0d42e329ded84ee31 AUX ntp-client.confd 776 SHA256 c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5 SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 WHIRLPOOL 7282c74d564f776cb6e8e15d79cb77e60088c516a71f87c28d96bda7e67bddc3d35e01cf86eac58655c2536d0a4a023b6142527bc8ec62318524114502d5cc99 AUX ntp-client.rc 827 SHA256 2e4a42dd64b7c6dacfcfefdab8dc1e7c45d7a0966ef8b928583d18393362c719 SHA512 04cabf1c501922f5c90a3201ee3418acf3934cb4e61640c3915b7d515f246d8fe3ac38f10b9947d574878b92871c9dba59d351a8c15eea1dbde52f518ecac7a5 WHIRLPOOL 08611b1dcacb85fff955c3c6af7118704b7b9a269d8070a538854aea980e5975c0d72ea9bc6f42115e871937a9f90b64d12bda01040a45c5dc70d144f4343d00 AUX ntp.conf 1614 SHA256 1e644397a0360a997064d0704b489c66b17ae2c50b49278ba46ec04942f13fb6 SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c WHIRLPOOL c84ab4e53d8c778f64a656a920aa062b4c03cd871684814f3f2bf6a3d8b76870a921d91676cfe71d84db0865b887f64ebe3d403a81a91af656987d74469cc6cf @@ -28,23 +29,25 @@ DIST ntp-4.2.8-manpages.tar.bz2 46542 SHA256 9c68840456c7002796baea70231e6cf7f6b DIST ntp-4.2.8.tar.gz 6750364 SHA256 2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee SHA512 d69ed02e57c66d5c57616bb5e4be0d58e7410dd27ea96acaed6e8b63726a37cd22ae73e8bdff089abbe8e19bcd8bee05733ab362249018fc495fcedc71aa3a44 WHIRLPOOL 4bfe1222c250425e3fc229649d1d4ae11fa6a32eb03f9d15b95575ee31171761321730c83d6e283551fc89647370a86791ec1c262c49826b31106d4317fb64e1 EBUILD ntp-4.2.6_p5-r10.ebuild 4385 SHA256 8c30f3b8f7fcdf7ede4f534fe2c9e67f3f62cefea076fd8080d1c57a9ae305fc SHA512 18137975fa6703d877a8357da1c24279f1ab001b767257c827b10692994a8636b4fe849b5951f9a1dfbaef47c89c7356299936f82a9474aa8901d7cb3a9b1587 WHIRLPOOL ecb4b932b3ce6c86ce57c86818f803568642d654ca9925f4283a790096ae42f9ace6d6862907b171111daf8a5f0cdc68bc6fbef34a063ccc72be5fb613476bcf EBUILD ntp-4.2.6_p5-r11.ebuild 4416 SHA256 d6808650a0477ccae3e0a30577c24a40d789209be87098291fd949e0954f49af SHA512 cf6b5afc4c78c318af4c9f9cd4c90a0942c02f88eb61f985e6fa31352f7a11e3fc971d9913ab6d6e6101e3b02fea529573b3a91f9cfdbdc9b8dbea4b67b29115 WHIRLPOOL 56b4ad2d444dd2d95b380eef283a1f92a4bbedf103875e0eb5bbce183f862c403d8d705b1e83130c4a4dc39bdcdbf3d84a40cccac39c135cdf59a11238485209 -EBUILD ntp-4.2.8-r1.ebuild 4144 SHA256 a9681d44affdaff8caf657047880dd9d4873331cd620dfe94ef40427759f4186 SHA512 28aba43b9060b46d1090c201f0054975d8c9cce41b02a678669aed009f8cf88e795a4ab7929e7b311f9c5ca95a960f4a2f057035c830ac617b5523574623f4a2 WHIRLPOOL 78c6e2f5abdc88be3bbf6a34dfaa68a05043c84d3172ffd7812c29ddfb4d08080bd2251b88f9342158d3b6aec5dd773d4ee5df59bcdb3014b92edf27dfcc94fc -MISC ChangeLog 32245 SHA256 4ae58566ee39dc31524f24cf6db691edb093e9520fe0ca916d8e22125c340b59 SHA512 fd56f0ad4c3b8a9d44c1a414236bcf9fc9378fa4cc7a86a9f4c921e07e952de2ae830bc030f60f30257a1c20cd9a9364233f7313b570a2f080976f530e7c0f9d WHIRLPOOL fbd0a4d6d27bca07585b6d8a557f0cffe0a7373c911741f33a1e014f4dec65432556f5e358feff99f2dc2c7fbe6c77a9d13e8ef6bcaf535d1612fcdce9b36df1 +EBUILD ntp-4.2.8-r1.ebuild 4226 SHA256 806fde891f8a1013d14cfc43f079e5fad45289dcf926e861a59834432d830ce3 SHA512 36c73761b593effcedea15f977261c5dd6b5c7a58024ae68f202bcd35ddbbc05b6e49aebf68189c2e1927eaaa4c1e67ef2041a3cfba7bcbe0a6eeec83bce9265 WHIRLPOOL 303068107075f006250ad3f0707d0564e864c467868a691ee7755de3055ae2fe884cf9ee80904215506ad2786bde36456132b1f928d85f34a3a115137d4a05c6 +MISC ChangeLog 32434 SHA256 6210ed81501c356bd686d57d85cab5a58bc5e18de8966c047a35c74b2badcee8 SHA512 0a2828aaf695cdbd46e90c92a4277279b72d20f5ceaa62462929a78dcaee1a7a70e675b0fba548ee4e36e9362de5da76bbdfd91aeeaacc4ee9777329947485ca WHIRLPOOL 21b137630b8e4421252bc2da32b939868a7d5ab2d81fc027756da84118b1f385b55e911ba2d9af04138d027bc107ccf8946c009e6657a1df28e78c0dd402e5b8 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUl9lwAAoJEPiazRVxLXTFt6oP/0GrOgLovbPk78JZAqyJcF9G -RYRk7TUDKJKvAMS5xG+pyKIt9JbM7T54QNJ1qguJyHf0yz6maM+YfHVBYyyc2KLg -Yx2iA13T2Z8BlhQccEtI6y9ZWd/TRHTGjbtMqZedjUrLIz18xaPb1aqBW8Dr4/1t -u604SMBRi33+/t5amYpOqG3YOPKwMZq+7jcRcI31NjpGxoVPhVafRYWz3h7EyGUD -2c+dN/yx0GZDlkP8xOtr3KNEGtyi/6P5SRZExSSpfVcEzUnGWZPXJPRvFbVbgXqb -iDy4eFUAWKNliOUfZgYoppvV8Mcv2aoVHpwV6Zb8HsR6j99m5Yiw25mw0fNSrDQC -SXhpTWUBBPhrxwP18v8ydGtRe+kAO4WoZY5UnhcUckIV0s46gfQreoBTTPn5LE26 -gfpi7JKstyuXeAX7froh53KCxxxehJxJAccwY2Ae/eM88/g7TeImQ5bIvvkjwSuD -+8Hl1ebLP6Kmk/fvWXqmLMcz06827Krz4JanFXX4ikQEQhNe4HPWmHiIDLN90lxH -rk8F7zr2uQQfx52EOWE7al+rs8ffSzhlIzGLUbB/zE2qkmeAIRim2mZJU3mlT3pi -WvI+9UpW9LQIKSzzrYRXvtxggCiv+XT9svm0ZI44IPFYiUW6UEyL5ho2tZqXysB8 -rqnzLnL+pusMbSzJt7V5 -=lEDz +iQJ8BAEBCABmBQJUmDMMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw +OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun882vAP/3yEAYXhkLJF+tMxFwdDjXtx +ZoRVBE6qytR07vzIrZMCPfcs5PK835IGZ7BkYgMrcRaaH9kCNV7oJOqIOoSbp8Qz +nx24+2rLKk/6sriC49znc1QBEC1a+i2qC/nnm8/RLDW5JG1onrqBDNoG6WsUDKmm +lCDsXiy6eVMbA5Y1iU3neRNWp5HqeVrQR7PWD1ISHOGvdw+Z9gNR1yPoS+aR1CQk +mfTZdFvhPVwG9GmV5/efWFtnpoRci5mINUqrVa6jTVR2e91D7OykrUE1wn09ZRyp +CGcfC+vtMGtZbDkO0fae3pOt7/Xa1ADhoV4UDR+RC1s1a18V4bRiV5odgGIFDXeV +OnqFustu1VYLcYcI/Dw/148U3xnJBj0L62hmnCTGDJcd/tygvbfxA/QhtcGfhT+y +ST/TuoTY7w//6I3ZwVlTqkvvxl9AmbdYmHradZeDaRg2J+XCIvn0QMNcqQI8BtQt +KCB1fYf54tkDpS3l3PfZDz1l5389mToFRfwrZ5wihTZyE+5OfO0CAK3iWIagIuNC +2zD0sx9Lrx9QeZwU3qeDcToxisfrC1eIvqze/NLajeqLE58z/3QkNG/FDS93j2Y5 +l7ZVmRyo8nuRMlmkh0ntX7r64UBtG4GOJMS255suymYHACkeRdOrV5OOs+k3IM88 +/igPdFu3LuRIzHRxXVoq +=ASWt -----END PGP SIGNATURE----- diff --git a/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch b/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch new file mode 100644 index 000000000000..bfed86c3cb4d --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8-ntp-keygen-no-openssl.patch @@ -0,0 +1,164 @@ +Fix ntp-keygen build without OpenSSL + +Upstream commit: +http://bk1.ntp.org/ntp-stable/?PAGE=patch&REV=5497b345z5MNTuNvJWuqPSje25NQTg +Gentoo bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=533238 + +Signed-off-by: Markos Chandras +Index: ntp-4.2.8/Makefile.am +=================================================================== +--- ntp-4.2.8.orig/Makefile.am ++++ ntp-4.2.8/Makefile.am +@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/lib + + NULL = + ++# moved sntp first to get libtool and libevent built. ++ + SUBDIRS = \ ++ sntp \ + scripts \ + include \ + libntp \ +@@ -17,7 +20,6 @@ SUBDIRS = \ + clockstuff \ + kernel \ + util \ +- sntp \ + tests \ + $(NULL) + +@@ -64,7 +66,6 @@ BUILT_SOURCES = \ + .gcc-warning \ + libtool \ + html/.datecheck \ +- sntp/built-sources-only \ + $(srcdir)/COPYRIGHT \ + $(srcdir)/.checkChangeLog \ + $(NULL) +Index: ntp-4.2.8/configure.ac +=================================================================== +--- ntp-4.2.8.orig/configure.ac ++++ ntp-4.2.8/configure.ac +@@ -102,7 +102,7 @@ esac + enable_nls=no + LIBOPTS_CHECK_NOBUILD([sntp/libopts]) + +-NTP_ENABLE_LOCAL_LIBEVENT ++NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent]) + + NTP_LIBNTP + +@@ -771,6 +771,10 @@ esac + + #### + ++AC_CHECK_FUNCS([arc4random_buf]) ++ ++#### ++ + saved_LIBS="$LIBS" + LIBS="$LIBS $LDADD_LIBNTP" + AC_CHECK_FUNCS([daemon]) +Index: ntp-4.2.8/libntp/ntp_crypto_rnd.c +=================================================================== +--- ntp-4.2.8.orig/libntp/ntp_crypto_rnd.c ++++ ntp-4.2.8/libntp/ntp_crypto_rnd.c +@@ -24,6 +24,21 @@ + int crypto_rand_init = 0; + #endif + ++#ifndef HAVE_ARC4RANDOM_BUF ++static void ++arc4random_buf(void *buf, size_t nbytes); ++ ++void ++evutil_secure_rng_get_bytes(void *buf, size_t nbytes); ++ ++static void ++arc4random_buf(void *buf, size_t nbytes) ++{ ++ evutil_secure_rng_get_bytes(buf, nbytes); ++ return; ++} ++#endif ++ + /* + * As of late 2014, here's how we plan to provide cryptographic-quality + * random numbers: +Index: ntp-4.2.8/sntp/configure.ac +=================================================================== +--- ntp-4.2.8.orig/sntp/configure.ac ++++ ntp-4.2.8/sntp/configure.ac +@@ -97,11 +97,14 @@ esac + enable_nls=no + LIBOPTS_CHECK + +-AM_COND_IF( +- [BUILD_SNTP], +- [NTP_LIBEVENT_CHECK], +- [NTP_LIBEVENT_CHECK_NOBUILD] +-) ++# From when we only used libevent for sntp: ++#AM_COND_IF( ++# [BUILD_SNTP], ++# [NTP_LIBEVENT_CHECK], ++# [NTP_LIBEVENT_CHECK_NOBUILD] ++#) ++ ++NTP_LIBEVENT_CHECK([2]) + + # Checks for libraries. + +Index: ntp-4.2.8/sntp/m4/ntp_libevent.m4 +=================================================================== +--- ntp-4.2.8.orig/sntp/m4/ntp_libevent.m4 ++++ ntp-4.2.8/sntp/m4/ntp_libevent.m4 +@@ -1,4 +1,25 @@ +-dnl NTP_ENABLE_LOCAL_LIBEVENT -*- Autoconf -*- ++# SYNOPSIS -*- Autoconf -*- ++# ++# NTP_ENABLE_LOCAL_LIBEVENT ++# NTP_LIBEVENT_CHECK([MINVERSION [, DIR]]) ++# NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]]) ++# ++# DESCRIPTION ++# ++# AUTHOR ++# ++# Harlan Stenn ++# ++# LICENSE ++# ++# This file is Copyright (c) 2014 Network Time Foundation ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice, ++# author attribution and this notice are preserved. This file is offered ++# as-is, without any warranty. ++ ++dnl NTP_ENABLE_LOCAL_LIBEVENT + dnl + dnl Provide only the --enable-local-libevent command-line option. + dnl +@@ -29,7 +50,7 @@ dnl If NOBUILD is provided as the 3rd ar + dnl but DO NOT invoke DIR/configure if we are going to use our bundled + dnl version. This may be the case for nested packages. + dnl +-dnl provide --enable-local-libevent . ++dnl provides --enable-local-libevent . + dnl + dnl Examples: + dnl +Index: ntp-4.2.8/util/Makefile.am +=================================================================== +--- ntp-4.2.8.orig/util/Makefile.am ++++ ntp-4.2.8/util/Makefile.am +@@ -19,6 +19,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP) + LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS) + tg2_LDADD= ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) + ntp_keygen_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a ++ntp_keygen_LDADD += $(LDADD_LIBEVENT) + ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM) + ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h + diff --git a/net-misc/ntp/ntp-4.2.8-r1.ebuild b/net-misc/ntp/ntp-4.2.8-r1.ebuild index b8c51ece629c..aaf7b08f49cd 100644 --- a/net-misc/ntp/ntp-4.2.8-r1.ebuild +++ b/net-misc/ntp/ntp-4.2.8-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r1.ebuild,v 1.3 2014/12/22 08:42:22 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.8-r1.ebuild,v 1.4 2014/12/22 15:04:43 hwoarang Exp $ EAPI="4" -inherit eutils toolchain-funcs flag-o-matic user systemd +inherit autotools eutils toolchain-funcs flag-o-matic user systemd MY_P=${P/_p/p} DESCRIPTION="Network Time Protocol suite/programs" @@ -42,7 +42,9 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483 + epatch "${FILESDIR}"/${P}-ntp-keygen-no-openssl.patch #533238 append-cppflags -D_GNU_SOURCE #264109 + eautoreconf } src_configure() {