version bump (bug #537292, thx to Paul)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

7 files changed, 317 insertions, 49 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index eef4c8a5730c..b16c5514a24b 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.129 2015/01/12 18:09:55 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.130 2015/01/25 00:54:30 ottxor Exp $
+
+*openntpd-5.7_p2 (25 Jan 2015)
+
+  25 Jan 2015; Christoph Junghans <ottxor@gentoo.org>
+  +files/openntpd-5.7_p2-adjtimex.patch, +files/openntpd-5.7_p2-proctitle.patch,
+  +openntpd-5.7_p2.ebuild, -files/openntpd-5.7_p1-signal.patch,
+  -files/openntpd-5.7_p1-warn-s-failure.patch, -openntpd-5.7_p1.ebuild:
+  version bump (bug #537292, thx to Paul)
 
 *openntpd-5.7_p1 (12 Jan 2015)
 
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 87b9764004dd..67d453728baf 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -7,26 +7,26 @@ AUX openntpd-20080406-signal.patch 1587 SHA256 06febce7828dcd351c62544685ff08415
 AUX openntpd-5.7_p1-driftpath.patch 1245 SHA256 7a6f9f58d0b4d51b580e6b665bdead03e1383f205d0f8ac3bd571575b2d43edf SHA512 14330b1865bd6ac7a8c36f6c71e9649714631c49443aa3b08fbc22d2baed50fcdd578ce53bc681ecaf3c000ac57170ab735eeaaae4a192c4dbe17ea9fa20b778 WHIRLPOOL 045ddca163182d05f54e4727c295363dabc8cb6c2995e0e235ed27b6b01335901480b22980a594a8d52bcf0d5b6201f3db7b1304646478b173aada1b79002d80
 AUX openntpd-5.7_p1-gentoopool.patch 553 SHA256 1a04dc8610569babb013aaa188111482221d7c73310fb5660899e507aa9617a9 SHA512 e6a2efe366dc1cd0b8867ef658d8da6720c08999ceea84a027819f281fc932d76db81bffe56183b1c646992ddef86a210b789d1449bf211c49634f1448373cea WHIRLPOOL 578d0de20a0188503b95c8b286c6a9ddea459e76260e369bba8225ec4d0da9858c3d6e608bc98efc10c5ad4dcbada26bd25fcf0fb465097152047837d91535c0
 AUX openntpd-5.7_p1-runpath.patch 1281 SHA256 5aad437c8c5895525a06b0d316ac4ff48b4fbfecc66fee17c1eb17131df4d6da SHA512 f3bba088d7251c6ce0ecae0d23bb30910add4a6fcd4005d4c8eaa72fdf9fe6e775e5c0e9d949186bf141274631a7c9a4975b284fcc3370a642a02011177a42fb WHIRLPOOL 05eb38b88b03d62444212242526e42b3a555d051e9ea61fe2447680640c6a63440a9773275edd54836aac40de1ca9e4f2680a776f3c3ad00414770135daefd51
-AUX openntpd-5.7_p1-signal.patch 519 SHA256 999ff799adf14e0ec9c66666a801dd493f114a17b3397e723f8b7181e5827246 SHA512 574bb49be6d23e691898524b2feb04a12a9378b68a5e50581f651c8ba57b71cbabce211251dcdabe8e2bcb5863175ee6c9018347760e7293811e388d30dc1a58 WHIRLPOOL a1860bc52262fac4d30a1aa94e30138c8429243bb29d38d35abc36fb731fcffcba7a323c823e3d7f5104ae7cc83846aa0ade3d723ead60bb273def028fd49538
-AUX openntpd-5.7_p1-warn-s-failure.patch 475 SHA256 3bba63e1766f7d583bfa24d641f423f7ecc2aaa33e75819198741e7b01c94daf SHA512 c6050a68918c85e79dac07416d705c6d22014ee8ac37a3eb8cd38f9430179476fdcdfa81006502c121b113d102ccb883c7c5a13ec6d5ca6a31cbd4bb9dd193ee WHIRLPOOL 39a0f5bfc0650eef163aef9f30a31faca8f72839d746efad335af1a95ceb605c389e8bebbdb67d7330b1680279987f2eac131a0925e32eb7491de08745f323c1
+AUX openntpd-5.7_p2-adjtimex.patch 1507 SHA256 f2eb984daf187a79f766954f24aee3d6be5e7b04342fcee6143b80811f252b33 SHA512 ebc0552b601f38c916a07d983d3c3ad7ca0ba68b791ac8064458b3e4de743f090dd43a3c89d0ad8b0b63df4151515f3e4236596c00039716edc3da6d7b2b3900 WHIRLPOOL ca02fe1c937a498003168d933a4c4638cb6f4e130e10fc914839399aa88617c0ce6c835208b72dc1df82b9cbb89b2f4719adac2715de91b59eb94ec9018b599d
+AUX openntpd-5.7_p2-proctitle.patch 10951 SHA256 3ee5f2c2f4e69fb52cbc6af06acec92f1780148030027b5bb387ca93c6865b3e SHA512 acdd88000db8144362cfea629e186ceadf58e6fc773a47d3ffbb1b127d6085805538814305f01155782b6401cb516d4c0d5dea588f930d58c76ac51b3c76b505 WHIRLPOOL 5fda1ab5043557bde4ab1787703e4e97c1632151b0b1c5e7d1b8577959dec759c07e852fa5dc2d9d8d63ccf2d1082ee6372d0aa17175988e4bd18fcd6d7ba6c6
 AUX openntpd.conf.d-20080406-r6 255 SHA256 91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059 WHIRLPOOL 9fa127624f50b01ba1b5872262d26b18362d3784a73021e608bd8a6cead2499cabf0fe5eafeaa315548e97285228a6e70689a3cadbdb7031ac00e23bf064e3b9
 AUX openntpd.init.d-20080406-r6 417 SHA256 fca7183a7676f0f471878925c8fbec20b7a0bff01551c0ad2b34d4d8a826c876 SHA512 e5ea7b26871e92a04713c93b0d60d435839f9321aeea7105330b9d9d4259d98581d6da6224274fae89cf7107329a28a9348c8c40a9372c5fc7bc7f5d47801a3b WHIRLPOOL 72626acd887bb997dae48fb717a94f046e2a3f4b01bad72cffc8da03bf388528149f37c6672362ed0661c9582851ebd77124749dcc9238bb013d6f2ccc2bf78f
 AUX openntpd.service-20080406-r4 196 SHA256 1171f2aff396842fee94cd3f85a7929601fffb788840aaf9f9abb6f2b0d17016 SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e WHIRLPOOL 5f33f400d045352f5e7f5fad718920d71c6f70526988ef87e02cf73ee98c4fb70afd928a770657b1f8d41aff46664a43dc21f3fd7bbcc6c6b95f4ad1788a52cf
-DIST openntpd-5.7p1.tar.gz 400113 SHA256 071cfdcfc179c481568a2b8262945243a3123abfc7fa8831da1bbff3729b8307 SHA512 2fe6f7daae147eca616bbc76bbcc9d0d2d03cb705f1437a3fa21c98114ce9b78eabbbcbf9ed38d4d7752936a9bf2ee2cabe0a75dfa8f00980088dc2d9f8ac4df WHIRLPOOL 79120a4634badc3b0f38d621bb369f07672ec7d3e27e953012fbb84ffac15d09c9a7ba2f1cb0cc17c1b2bb580308e6beddc5968e8e771b10ee39afbeca24c502
+DIST openntpd-5.7p2.tar.gz 408421 SHA256 1640ad4a6e6475f6065d5f999b17b5dc6ab40dc17309b782b9ae390fe54bd6a5 SHA512 f320c6262eccf428428e7a3578cb0e6cf6305c93faa0dd98e5fb9d55474accd5c5e73d636b8c1339a34c2f46071fb6fc31e6fc296453eaa1501b0e2c01cf6e13 WHIRLPOOL f544e920892e4b44864febbb790affa496aca1c998257b298072903722c41cce47fd9c8a2a0707b14b24d02779d5296fb1326e0ea7fb341fc2c1d7394a463a53
 DIST openntpd_20080406p-6.debian.tar.gz 11849 SHA256 6718ffb52b7f34c7c3e9532d245f31ee5c749bac2cc2c2d4594d8161925a3122 SHA512 f857fbc85e29035470af0855c8fc416c188f55586ba2e1d719159ecfa4a0274ba4dd526409dfd915056a1c15f5e44cb8c40196a7e03c3026c5d73851ebb5abc8 WHIRLPOOL 35bc0ab16d161c7878d438641eede8425238fbce4d32f6b56e347252e6ad561dc1a5795e3bc3cf133fa09dccb69520cb9837c7134bc0fe6cec9ea14be314ee51
 DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
 EBUILD openntpd-4.0_pre20080406.ebuild 3242 SHA256 c63281f7874ed6cfd767d5bf8f2feacd63f0d2e6e501dd7f8af4b63f91ee78d3 SHA512 04c3843c4cbaf27dd12e5880d6a1a6921db7f2481575f6d5f3fe6e821cc151d568dacd64adb0d239e38c2a7217e28a91f690d88a4d6be26970952dcb424f3464 WHIRLPOOL c0f7447735b237d5777aad88858f738f0395154ebcd3a10a679f8e6280e48ae14b986765071db124b130df735049ec70d61710c766dde05bd4019f7b7532b870
-EBUILD openntpd-5.7_p1.ebuild 2923 SHA256 5b616b89dc6222de47ab5498b8b1aef7ad21e8d0f5c1812a9828c224b34e7737 SHA512 b88d5efbc9c595938c99f424959e5a531594055a66e77a807fdcb36c542bc25a902d3480d3255bbd71a3b2af71a53af11f81680ecda7f608c1a3128e86b9dc6a WHIRLPOOL 26099de5d12c87de39c85f8c99b4fa12a016d4a32f09b78f8463a71fe5034cd2c62fa4ad98a90fbdc43e523a3916bc3ac1ecf154c46bec4ad9d9c2eb7e37b35a
-MISC ChangeLog 18465 SHA256 8ad54430375a7a91d4840892bb038c5ba34a0e1e6a6ede96918ba1082c6dcd92 SHA512 30ba10f487076fd5f1d993c3b183279cd54bedd68c8e0a28b95dc3cdd0108a7251b0383c30ac5876368a2233d975e1c2c4c891c034c82520f5e5591144890c22 WHIRLPOOL 6b0c53fef2c07b2f9e76ede63f915cae4e96bcea791b2058af7b8e4af42c3d5ece9c2d7deb98f47eb2c482fb473ea9346f9eb57eeff9a645d2868a98112d1e1e
+EBUILD openntpd-5.7_p2.ebuild 2987 SHA256 57a10dde48b7f2992fca5690ba39fe0b518353924a877e73f3d4f133caf37071 SHA512 9139976066d70e2a66a8bf26d07a516fcc16263f741eec27ee7fe390c2f2980153962875b529b85be873dfbb2fe6b81f2909be5d77496de00041f57aff137e42 WHIRLPOOL 435ff52ae51df95850f69f90af8c10af6e3244fecf9645e12c13de226d7eade04c7aafb4f021749e6ad7cd8e4651b7eeba2d85224920071005008acd5c1326d2
+MISC ChangeLog 18811 SHA256 9282061221e0b9a2d0beee610072981cb1f1236ec4e70d510f9c050783cce847 SHA512 1ad640f5d8312c35354cd6469aef99b3087e4a6f50cc79e57e062791c8a834772b5e1be338a61e390397a3ada15e23c288b818010e782a03f1345ee6ee2bedde WHIRLPOOL b8e85ffec94c1b25b22a560020d9cf1cdeb708a2994b32e41aa487e3078fe12b8b18723af92ddd3a215eeb647cf1b3efb7c51e1ebc98620dfb63204b695b327e
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUtA30AAoJEOeBhlrCAAWG6lUH/0joQs0LXINmiYrkIthV5sSc
-IHCYwquFUpI92ZOz+Ohzv2lNf6qkUMfhulNktY4flMtCKZX/wp0ZWYeGhmGl1N8Z
-kaiwZbKMEeKXeUm2oCr1oADgVlDOX/6xYDzSLeLTHua+/TiO9qZcfu+98PNgXZDh
-tZCgE8mGFUTG0OqC9svcaRQGkYVPr5kFu+8DCmymumt6XR7mavQXyHRJIyZYUPR8
-Iy/CgF1GiaYGQcoB+AolGR3WtM6ZuHbVWeP0y3izYF7EZu1Cr1V8MenJVQq2aEha
-pKU6HUf4OVTYlXZ235EK4wYdspMEPfWq4YG8mMDqju3RL1/FeBdLGLAZ2kOhFGs=
-=BkqB
+iQEcBAEBCAAGBQJUxD7UAAoJEOeBhlrCAAWGO1gIAK7Oxsn/RkzCIV5/J7F3EKSW
+eeNbdwPxEAZrQw0Pxkp8a4G6PhDCgUuJtdPe96x3p9JK5SA8iMNI5soU5EkxOg4D
+9nTDkORbIKzK6LXrkpiJ727BBccyEjO4AtTcZPPalH/UayPw5raI4cwzrzVKfFIs
+lt2AD+/D1W3V5HndWKnwu/av4sREZ+D/Y7w0H/3ScDaFkDiWq1JBpnRAtGiTFcp6
+ZuwwCvHJaiBBjBVKd/Vf2Oso46TQFt+gLbKyhw7fCV2eZDFxNsYBgq/0mf9XvyW8
+xYdSJpb662q0T88GCEpvFWlEk8Vh6vr6CcgY7cEnPztnGVtLZDaqX5yZZbIi8os=
+=Rap9
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch b/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch
deleted file mode 100644
index 68bd5992eeac..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p1-signal.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Only in openntpd-5.7p1: .ntpd.8.swp
-diff -u -r openntpd-5.7p1-orig/ntpd.8 openntpd-5.7p1/ntpd.8
---- openntpd-5.7p1-orig/ntpd.8	2015-01-09 18:51:48.724711211 -0800
-+++ openntpd-5.7p1/ntpd.8	2015-01-09 18:56:32.461471870 -0800
-@@ -126,7 +126,11 @@
- .Pq engine
- receives a
- .Dv SIGINFO
--signal, it writes its peer and sensor status to
-+signal (or a
-+.Dv SIGUSR1
-+signal on systems without
-+.Dv SIGINFO),
-+it writes its peer and sensor status to
- .Xr syslog 3 .
- .Sh FILES
- .Bl -tag -width "/var/db/ntpd.driftXXX" -compact
diff --git a/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch b/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch
deleted file mode 100644
index 884c0865d4c2..000000000000
--- a/net-misc/openntpd/files/openntpd-5.7_p1-warn-s-failure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r openntpd-5.7p1-orig/ntpd.c openntpd-5.7p1/ntpd.c
---- openntpd-5.7p1-orig/ntpd.c	2015-01-09 18:58:14.498903138 -0800
-+++ openntpd-5.7p1/ntpd.c	2015-01-09 19:00:59.917844614 -0800
-@@ -242,7 +242,7 @@
- 			lconf.settime = 0;
- 			timeout = INFTIM;
- 			log_init(lconf.debug);
--			log_debug("no reply received in time, skipping initial "
-+			log_warnx("no reply received in time, skipping initial "
- 			    "time setting");
- 			if (!lconf.debug) {
- 				if (daemon(1, 0))
diff --git a/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch b/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch
new file mode 100644
index 000000000000..b856276a3109
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p2-adjtimex.patch
@@ -0,0 +1,50 @@
+From eeb97529cd5a332a69a312687e41939eb17f7a81 Mon Sep 17 00:00:00 2001
+From: Brent Cook <busterb@gmail.com>
+Date: Wed, 21 Jan 2015 10:30:37 -0600
+Subject: [PATCH] prefer adjtimex over the deprecated ntp_adjtime on Linux
+
+Thanks to @chneukirchen for the suggestion.
+---
+ compat/adjfreq_linux.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/compat/adjfreq_linux.c b/compat/adjfreq_linux.c
+index 21ee40f..e4a8ae9 100644
+--- a/compat/adjfreq_linux.c
++++ b/compat/adjfreq_linux.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <sys/types.h>
+-# include <sys/timex.h>
++#include <sys/timex.h>
+ 
+ #include <unistd.h>
+ 
+@@ -37,20 +37,20 @@ adjfreq(const int64_t *freq, int64_t *oldfreq)
+ 		txc.modes = ADJ_FREQUENCY;
+ 		txc.freq = *freq / 1e3 / (1LL << 16);
+ 
+-		if ((ntp_adjtime(&txc)) == -1)
+-			log_warn("ntp_adjtime (2) failed");
++		if ((adjtimex(&txc)) == -1)
++			log_warn("adjtimex failed");
+ 
+-		log_debug("ntp_adjtime adjusted frequency by %fppm",
++		log_debug("adjtimex adjusted frequency by %fppm",
+ 			  ((txc.freq * 1e3) *  (1LL<<16) / 1e3 / (1LL << 32)));
+ 	}
+ 	if (oldfreq != NULL) {
+ 		txc.modes = 0;
+-		if ((ntp_adjtime(&txc)) == -1) {
+-			log_warn("ntp_adjtime (1) failed");
++		if ((adjtimex(&txc)) == -1) {
++			log_warn("adjtimex failed");
+ 			return -1;
+ 		}
+ 		newfreq = (txc.freq * 1e3) *  (1LL<<16);
+-		log_debug("ntp_adjtime returns frequency of %fppm",
++		log_debug("adjtimex returns frequency of %fppm",
+ 			  newfreq / 1e3 / (1LL << 32));
+ 		*oldfreq = newfreq;
+ 	}
diff --git a/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch b/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch
new file mode 100644
index 000000000000..63531c8b630c
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-5.7_p2-proctitle.patch
@@ -0,0 +1,237 @@
+diff -Nur openntpd-5.7p2-orig/Makefile.am openntpd-5.7p2/Makefile.am
+--- openntpd-5.7p2-orig/Makefile.am	2015-01-19 17:18:56.000000000 -0800
++++ openntpd-5.7p2/Makefile.am	2015-01-21 12:09:17.221031344 -0800
+@@ -162,6 +162,8 @@
+ libcompat_la_SOURCES += compat/md5.c
+ endif
+ 
++libcompat_la_SOURCES += compat/progname.c
++
+ if !HAVE_REALLOCARRAY
+ libcompat_la_SOURCES += compat/reallocarray.c
+ endif
+diff -Nur openntpd-5.7p2-orig/configure.ac openntpd-5.7p2/configure.ac
+--- openntpd-5.7p2-orig/configure.ac	2015-01-19 17:18:56.000000000 -0800
++++ openntpd-5.7p2/configure.ac	2015-01-21 12:10:32.118825079 -0800
+@@ -153,6 +153,18 @@
+ 	   -a "x$HOST_OS" != xnetbsd \
+ 	   -a "x$ac_cv_func_arc4random_uniform" = xyes])
+ 
++AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
++       AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
++                [[ extern char *__progname; printf("%s", __progname); ]])],
++        [ ac_cv_libc_defines___progname="yes" ],
++        [ ac_cv_libc_defines___progname="no"
++        ])
++])
++if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
++        AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
++fi
++
++
+ AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
+ 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <stdarg.h>
+diff -Nur openntpd-5.7p2-orig/configure openntpd-5.7p2/configure
+--- openntpd-5.7p2-orig/configure	2015-01-19 18:30:48.000000000 -0800
++++ openntpd-5.7p2/configure	2015-01-21 12:11:19.827967669 -0800
+@@ -13519,6 +13519,42 @@
+ fi
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libc defines __progname" >&5
++$as_echo_n "checking if libc defines __progname... " >&6; }
++if ${ac_cv_libc_defines___progname+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++
++       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++ extern char *__progname; printf("%s", __progname);
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++   ac_cv_libc_defines___progname="yes"
++else
++   ac_cv_libc_defines___progname="no"
++
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libc_defines___progname" >&5
++$as_echo "$ac_cv_libc_defines___progname" >&6; }
++if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
++
++$as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
++
++fi
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_copy exists" >&5
+ $as_echo_n "checking whether va_copy exists... " >&6; }
+ if ${ac_cv_have_va_copy+:} false; then :
+diff -Nur openntpd-5.7p2-orig/Makefile.in openntpd-5.7p2/Makefile.in
+--- openntpd-5.7p2-orig/Makefile.in	2015-01-19 18:30:49.000000000 -0800
++++ openntpd-5.7p2/Makefile.in	2015-01-21 12:11:17.319907603 -0800
+@@ -161,13 +161,14 @@
+ 	compat/adjfreq_osx.c compat/adjfreq_solaris.c \
+ 	compat/bsd-asprintf.c compat/clock_getres.c \
+ 	compat/clock_gettime_osx.c compat/imsg.c compat/imsg-buffer.c \
+-	compat/md5.c compat/reallocarray.c compat/setproctitle.c \
+-	compat/strlcat.c compat/strlcpy.c compat/strtonum.c \
+-	compat/bsd-setresgid.c compat/bsd-setresuid.c \
+-	compat/arc4random.c compat/getentropy_freebsd.c \
+-	compat/getentropy_linux.c compat/sha2.c \
+-	compat/getentropy_netbsd.c compat/getentropy_osx.c \
+-	compat/getentropy_solaris.c compat/arc4random_uniform.c
++	compat/md5.c compat/progname.c compat/reallocarray.c \
++	compat/setproctitle.c compat/strlcat.c compat/strlcpy.c \
++	compat/strtonum.c compat/bsd-setresgid.c \
++	compat/bsd-setresuid.c compat/arc4random.c \
++	compat/getentropy_freebsd.c compat/getentropy_linux.c \
++	compat/sha2.c compat/getentropy_netbsd.c \
++	compat/getentropy_osx.c compat/getentropy_solaris.c \
++	compat/arc4random_uniform.c
+ am__dirstamp = $(am__leading_dot)dirstamp
+ @HAVE_ADJFREQ_FALSE@@HOST_FREEBSD_TRUE@am__objects_1 = compat/libcompat_la-adjfreq_freebsd.lo
+ @HAVE_ADJFREQ_FALSE@@HOST_LINUX_TRUE@am__objects_2 = compat/libcompat_la-adjfreq_linux.lo
+@@ -207,7 +208,8 @@
+ am_libcompat_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+ 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+ 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
+-	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
++	$(am__objects_9) $(am__objects_10) \
++	compat/libcompat_la-progname.lo $(am__objects_11) \
+ 	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
+ 	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
+ 	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
+@@ -562,12 +564,13 @@
+ libcompat_la_SOURCES = $(am__append_4) $(am__append_5) $(am__append_6) \
+ 	$(am__append_7) $(am__append_8) $(am__append_9) \
+ 	$(am__append_10) $(am__append_11) $(am__append_12) \
+-	$(am__append_13) $(am__append_14) $(am__append_15) \
+-	$(am__append_16) $(am__append_17) $(am__append_18) \
+-	$(am__append_19) $(am__append_20) $(am__append_21) \
+-	$(am__append_22) $(am__append_23) $(am__append_24) \
+-	$(am__append_25) $(am__append_26) $(am__append_27) \
+-	$(am__append_28) $(am__append_29) $(am__append_30)
++	$(am__append_13) compat/progname.c $(am__append_14) \
++	$(am__append_15) $(am__append_16) $(am__append_17) \
++	$(am__append_18) $(am__append_19) $(am__append_20) \
++	$(am__append_21) $(am__append_22) $(am__append_23) \
++	$(am__append_24) $(am__append_25) $(am__append_26) \
++	$(am__append_27) $(am__append_28) $(am__append_29) \
++	$(am__append_30)
+ libcompat_la_LIBADD = $(PLATFORM_LDADD)
+ noinst_HEADERS = compat/arc4random.h compat/arc4random_freebsd.h \
+ 	compat/arc4random_linux.h compat/arc4random_netbsd.h \
+@@ -649,6 +652,8 @@
+ 	compat/$(DEPDIR)/$(am__dirstamp)
+ compat/libcompat_la-md5.lo: compat/$(am__dirstamp) \
+ 	compat/$(DEPDIR)/$(am__dirstamp)
++compat/libcompat_la-progname.lo: compat/$(am__dirstamp) \
++	compat/$(DEPDIR)/$(am__dirstamp)
+ compat/libcompat_la-reallocarray.lo: compat/$(am__dirstamp) \
+ 	compat/$(DEPDIR)/$(am__dirstamp)
+ compat/libcompat_la-setproctitle.lo: compat/$(am__dirstamp) \
+@@ -783,6 +788,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg-buffer.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-imsg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-md5.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-progname.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-reallocarray.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-setproctitle.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/libcompat_la-sha2.Plo@am__quote@
+@@ -893,6 +899,13 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-md5.lo `test -f 'compat/md5.c' || echo '$(srcdir)/'`compat/md5.c
+ 
++compat/libcompat_la-progname.lo: compat/progname.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-progname.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-progname.Tpo -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c
++@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-progname.Tpo compat/$(DEPDIR)/libcompat_la-progname.Plo
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='compat/progname.c' object='compat/libcompat_la-progname.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -c -o compat/libcompat_la-progname.lo `test -f 'compat/progname.c' || echo '$(srcdir)/'`compat/progname.c
++
+ compat/libcompat_la-reallocarray.lo: compat/reallocarray.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompat_la_CFLAGS) $(CFLAGS) -MT compat/libcompat_la-reallocarray.lo -MD -MP -MF compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo -c -o compat/libcompat_la-reallocarray.lo `test -f 'compat/reallocarray.c' || echo '$(srcdir)/'`compat/reallocarray.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) compat/$(DEPDIR)/libcompat_la-reallocarray.Tpo compat/$(DEPDIR)/libcompat_la-reallocarray.Plo
+diff -Nur openntpd-5.7p2-orig/compat/progname.c openntpd-5.7p2/compat/progname.c
+--- openntpd-5.7p2-orig/compat/progname.c	1969-12-31 16:00:00.000000000 -0800
++++ openntpd-5.7p2/compat/progname.c	2015-01-21 12:09:55.528948784 -0800
+@@ -0,0 +1,46 @@
++/*
++ * Copyright (c) 1999-2004 Damien Miller <djm@mindrot.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++#include <string.h>
++
++#ifndef HAVE___PROGNAME
++char *__progname;
++#endif
++
++/*
++ * NB. duplicate __progname in case it is an alias for argv[0]
++ * Otherwise it may get clobbered by setproctitle()
++ */
++char *get_progname(char *argv0)
++{
++#ifdef HAVE___PROGNAME
++	extern char *__progname;
++
++	return strdup(__progname);
++#else
++	char *p;
++
++	if (argv0 == NULL)
++		return ("unknown");	/* XXX */
++	p = strrchr(argv0, '/');
++	if (p == NULL)
++		p = argv0;
++	else
++		p++;
++
++	return (strdup(p));
++#endif
++}
+diff -Nur openntpd-5.7p2-orig/ntpd.c openntpd-5.7p2/ntpd.c
+--- openntpd-5.7p2-orig/ntpd.c	2015-01-19 18:30:41.000000000 -0800
++++ openntpd-5.7p2/ntpd.c	2015-01-21 12:11:05.744630385 -0800
+@@ -116,6 +116,8 @@
+ static char **saved_argv;
+ #endif
+ 
++char *get_progname(char *argv0);
++
+ int
+ main(int argc, char *argv[])
+ {
+@@ -139,6 +141,8 @@
+ 
+ 	log_init(1);		/* log to stderr until daemonized */
+ 
++	__progname = get_progname(argv[0]);
++
+ #ifndef HAVE_SETPROCTITLE
+ 	int i;
+ 	/* Prepare for later setproctitle emulation */
diff --git a/net-misc/openntpd/openntpd-5.7_p1.ebuild b/net-misc/openntpd/openntpd-5.7_p2.ebuild
index aea04df87a78..4b20c77d1d9e 100644
--- a/net-misc/openntpd/openntpd-5.7_p1.ebuild
+++ b/net-misc/openntpd/openntpd-5.7_p2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-5.7_p1.ebuild,v 1.1 2015/01/12 18:09:55 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-5.7_p2.ebuild,v 1.1 2015/01/25 00:54:30 ottxor Exp $
 
 EAPI=5
 
-inherit eutils systemd user
+inherit autotools eutils systemd user
 
 DESCRIPTION="Lightweight NTP server ported from OpenBSD"
 HOMEPAGE="http://www.openntpd.org/"
@@ -43,11 +43,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-runpath.patch"
-	epatch "${FILESDIR}/${P}-driftpath.patch"
-	epatch "${FILESDIR}/${P}-signal.patch"
-	epatch "${FILESDIR}/${P}-gentoopool.patch"
-	epatch "${FILESDIR}/${P}-warn-s-failure.patch"
+	epatch "${FILESDIR}/${PN}-5.7_p1-runpath.patch"
+	epatch "${FILESDIR}/${PN}-5.7_p1-driftpath.patch"
+	epatch "${FILESDIR}/${PN}-5.7_p1-gentoopool.patch"
+	epatch "${FILESDIR}/${P}-adjtimex.patch"
+	epatch "${FILESDIR}/${P}-proctitle.patch"
+	#Due to last patch
+	eautoreconf
 }
 
 src_configure() {