Version bump with a lot of improvements. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/159 by j123b567.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

7 files changed, 29 insertions, 140 deletions

diff --git a/net-misc/ptpd/ChangeLog b/net-misc/ptpd/ChangeLog
index 0a6d7da56e61..f0f0f9df872b 100644
--- a/net-misc/ptpd/ChangeLog
+++ b/net-misc/ptpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/ptpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ptpd/ChangeLog,v 1.1 2015/06/12 10:55:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ptpd/ChangeLog,v 1.2 2015/07/09 06:39:06 mgorny Exp $
+
+*ptpd-2.3.1 (09 Jul 2015)
+
+  09 Jul 2015; Michał Górny <mgorny@gentoo.org> +ptpd-2.3.1.ebuild,
+  -files/ptpd-2.3.0-ntpdc.patch, -files/ptpd-2.3.0-statistics-clear.patch,
+  -files/ptpd-2.3.1_rc4-debug-display.patch, -ptpd-2.3.0.ebuild,
+  -ptpd-2.3.1_rc4.ebuild:
+  Version bump with a lot of improvements. https://github.com/gentoo/gentoo-
+  portage-rsync-mirror/pull/159 by j123b567.
 
 *ptpd-2.3.1_rc4 (12 Jun 2015)
 *ptpd-2.3.0 (12 Jun 2015)
diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest
index 99f65e503f27..ada897416b8b 100644
--- a/net-misc/ptpd/Manifest
+++ b/net-misc/ptpd/Manifest
@@ -1,34 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ptpd-2.3.0-ntpdc.patch 745 SHA256 218fd14394f95643bf43616415c62d287eb16d1297be56cbbf2fd673a95ab2ca SHA512 5ae331705ea97fd6ff0e3056d7f0dfc9e983f31695d642a4daae46943ff3cc11a785a85e4087cfe126218c75d698f93dba2574fa4c5c7f2f839186c323123236 WHIRLPOOL 87d0eecdf7f188ef8ec619ea2db23a7e2b43b4ecc682d8000c56123ffdf7555117c47754b7db2ec50da5939a375363e5fedf84fb6fa66e57632edfd9b6455bea
-AUX ptpd-2.3.0-statistics-clear.patch 391 SHA256 772225ebd6b49bf6871a4dc0ec82a0360b54ee3250fbce5ad2b5e4eab8e58fc5 SHA512 4a1ea58829ddfcd56ae93255d6bb8fc65fb335ca99473b21998d626237292ae65b54291a3ad991680a682109b056ccd54ed529b0b4e00655bda150aedb90c57d WHIRLPOOL 346ce6899eba7c339674c06f4213b63bfeb7cc035cf748ad926c673e1424da06e8a1dbccb43dbe7079af2db7e82cd4143a7ee97665e92baa1e1c63d0bae24862
-AUX ptpd-2.3.1_rc4-debug-display.patch 817 SHA256 60cc4af0932359e3553243015bc82705dfe35896434988e8f6dbb74dad3b54de SHA512 dcd6301a503288a91962bfbb5635f01aa3489fa12a5b6c3b9a2436bb2bc56d0f1c1ca167b428fb420259de3ad6a0ffd6019300ad3d92fcf32872c0523344b75e WHIRLPOOL 151031a8106b1f2e2484e0fd0fc4b791b10d66f50da3dc8c6a1facd22778272935208b5280b65faca62e129d13b61cfaa85d0018be81b8f811a667e9149f1956
 AUX ptpd2.confd 61 SHA256 0c0c1a6e6260b90c8420066ab64acd1c0f70ac7cf6af5dddd64a627d4dcf628f SHA512 40ea56a92222eb10dc429343a23bdcc0e75f626e34fea139a09ca545a50aee0550253965de036218889554a2c0c7928c0051e3e71d9b9cd0a9d44d334e0bac47 WHIRLPOOL 61155a827f264ae2e2a1763722fb561f2446b6d50f344d79f3423989d5de30a837cf92b0edd0561c40a910380e04a7ed5d2a6d7bbbbf8f62df10adc86f5f8f3b
 AUX ptpd2.rc 1474 SHA256 79f7081502fee32ad8ce11f191f4e0147d2f5f94003226a2ab41a22815f57323 SHA512 a5a1681d4e9047617871fac549336ddfff548c9653b263a509524964b852586eadd513efd4ef726ba8ffdc731e1a01d605b14f689f51a94cd4352d9cfa81bfa9 WHIRLPOOL 41acfb89381ba74b922a6ee5e05774f4bf0340acbbeddd2e25a367e6bf62d0bb70de5c78f3a3a982e14d3becea3f8c3e7d652787d8c9f9f77c1927053e8a772b
 AUX ptpd2.service 228 SHA256 3cda793010dbcc4be0f032f249fa8235d444846fa97a610a7a00fbf30c1ce29b SHA512 72d609c9b803921b55cc0528aafa5cbbff0b7ed2f1267fa5f06e410ec640295642717928bbf38c849f632d157132f01f60a8bad826428b846d8248bac27e932a WHIRLPOOL e5fd83c5ef4e060b7c72e339ba2ec378ad198deb6fbb7da3bda2d3f5b2355f6a52d58d9d80d1dad4234dc06b88e9ef6db1a79e075c1fc23175a66c5664d98d7e
-DIST ptpd-2.3.0.tar.gz 785362 SHA256 1a4e90496f004bfd91657ccc49209101dc25b787e540648c07c0973469f1d8f7 SHA512 eb6614ce8bfe313dd2a3bb14adcccc0b2580d7a375ead220f44f63fa9ea91e6e1e3eacd757f517e3051ff852000813cda94f21acc5ada75e604e2b20545ddf3a WHIRLPOOL cb87ed5d7ec78a3ea57d4eac14b4d72b062c339b4063d7d9c99ffba894c3ced3746b04f10ae3b4d1dc52d908dca780427ff1273924910065a1799f3e7a33bd63
-DIST ptpd-2.3.1-rc4.tar.gz 1744782 SHA256 3766bea6a743932e381fe9c7d6821a2e9fa56df0d829902d6917093904fadc56 SHA512 53699ea55a8900ff47ac1ccefe2b8f2dd637422d60069cdcaa4dc7bbc4375a404e58b7a21bcd390c3758326e89a2420da9dd05c1c266749f86597cf712f31ce7 WHIRLPOOL fe2f3cecfd3e31a94d7e075d48a7f7b70f527889d5848c5d3626d8bfabfb7ec46b0b69b538c63096bedfab6705238db6a887d3ef4e5ac38d2be86f26d2fc456e
-EBUILD ptpd-2.3.0.ebuild 1438 SHA256 ce22080f36a2d165454a1e0ea03600fb96748c1624ee3b6197d3d6c87b4db91f SHA512 a4818b5fa0f24f9c50b4b4d5cac957335ddb475acbf7f66158c716870f7018f1c2dbf01c4493004cda1543a9f2508591b121e46e7d0ac65df91c2e923af3ddad WHIRLPOOL 32c6f7176980937bae0e4d05392ea3a4ce2ffccf7df435823d34d97d6004488d4992b9d90736ba9e6442c87fe3dcae73889e7bd81c66d2f67cf79be277be5f76
-EBUILD ptpd-2.3.1_rc4.ebuild 1465 SHA256 962ec9816e7a4266bea5d3afc52f059be72146064a8a1a1b57156252ecc8a6da SHA512 d74a4a87ff5c84861b09de4805b56f2dddbb094b5c0295497a356d7cf00f7dd2a048fb1bbff66da2ff7c64eec46e60e1c984c5bbafca39b8b63fc14c871b9813 WHIRLPOOL b237724d7e1bc3433e7d713d129c9456850fcd201d75b4b28f53e5c83a97d7791ac72c4bbdb9806a62c21847604c909f79b1a3f59a646931975418d3fde71d70
-MISC ChangeLog 705 SHA256 4a11ea42716272d67128d87602b10ff898c6efbf1233cf5a7751cb619dd02981 SHA512 426c14b9742081c138eb7a0bde40906fc05713b7fe5f72ad31eee458841d83227bd989ca7abc399d054264692d1b57531ba36884281eb46c7b5e4b2a9b84e9a3 WHIRLPOOL fcccf66db477ad9455e1beefde9a211eec221473bcdfbc6d11eb06494eddd48d2a1863429e0f7bf7d70945d0a1f98ed566f3cf87c5be65ac4b9d9a36ad8b16cd
+DIST ptpd-2.3.1.tar.gz 1196180 SHA256 0dbf54dd2c178bd9fe62481d2c37513ee36636d8bf137cfdad96891490cdbf93 SHA512 c0e9eecfd87769b8cdbac624bf40f28634911e92d2169f4b91d59b76466eb4bf2143037dab3c601190ceaa13c8ab857c7875789448a46ab560bf0d0b8d321963 WHIRLPOOL e81b43eded2891a8eec2e880a837e6da5d94b64f363979af64eabdc341b75aae79605c00a7790a842e77b9d00ec69cf9bf97d7ff92498549db31825835cd6128
+EBUILD ptpd-2.3.1.ebuild 1340 SHA256 940c432f4a4e8672fd0114946c3a171acc1a18e9de4f6b649f6c347f6ecf783e SHA512 91146d746d3d554c9ee36dcf11408695734bd189fe4aa5087023ecc4e183987cffbbbf7ae9a32141def1a497c13e3f05357c07ad12b439cdc4acf60e2ac387dd WHIRLPOOL 0f27ef5339f2938f89ebfa65ca4f59ee1529160092360a6f68f8ab0b86a089315fced18ab4c743e689666a4a1f2b6288c258d0f5167149cf6c94e734a1f818c0
+MISC ChangeLog 1091 SHA256 b08d875b305af3c91274a6c6b73c9553f551f8dac9d6cf94d8da20ccc6504cf3 SHA512 ec50a766a69dfb2f5f0d47dff5caa8fdc0083520bd007367e0130b6751efa97e3381154a7c147e2eff796eab7fa497b5134a144ec08d2dd746250d9c32e62b7f WHIRLPOOL b3d74ff6c7c0e278a47f667ad766c1e419feb76b06b19a2e29f80603257e99eca7deb4ee498faa634e89754d685f57a0dad219853f18f055d26a2104ed9c0c9c
 MISC metadata.xml 887 SHA256 ef73d38686d5a25b3db12abebb3958e6a7c5691663d8f3d0ec61123c089f20ef SHA512 ea7be7ea6b5a841f5f628e3bed955715bd28bb756be49b291eba1cfe66cca6b4abe8ff410b298f53db547c07ef94fd2e4e2ea967f265c7718f17c9f350f76fac WHIRLPOOL 79e056f971cf3c63b4a734fe3e13c589c59d46a82669a0a71d6d51cb1fd9756057785651d5062d186ff900067df30e64ac2ee691c88c2c7aebd0141fd0145a91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVerq7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVnhcNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLNgP/jtPYIVP8c0RFy4+5hI0GZu/
-XxUsSYqyyFuRUVqlBHtEJQ7WDjr6pk5whLmWqjpbzWWmkHvlm3kBCKkbtfdtEjVb
-fp0zVqdTjWsDnPC1sgUL8kAIuUymuX4XQ+r7mdccigxDL6Y2xlb8XgbH5rI0Yh9S
-mmvwjPOluL6xBztryDn5n/rB04zuUv11LrKxNKZtpM+DiB6Pblx0LVsSmF3G7Xcu
-rQ6NMfM0MLqJdgfN34Rx+mGzeb39CmT+/xpt9zuWCy76oOqHtMAtNZOpW2PQ356r
-8Azq44GMDc+DST9a0n8oIJjScO6cIsdQVn3X7ur5mwSfbJ+cpL0xzTMOkYWgTFxE
-V5DhwIjK0BmXEVBlaLsb5AWNYCBmc7mnOEnjtV8DQASetDNEvv8eGfdblmZC+lu6
-xT3c/dx4rFgiCxjtIPKEzaq4HbxwnoKNXS/PhlYgNfV3DqsYrQcy2IgJ1MEjCvBz
-9XHflI4OlWXBIpiqsBu+I+pP+8Co6aluQgT2VqNuOqqDe4lD3HASFRTy1/QXWvD3
-SbepFz8s8M5tK+ZqaFsDYa8U6s2G6iM0b+WCOhhAUqxU5PpXHHpNZT4FpcfHUHSX
-+XxkhMqtlpSD3z0/roDvuY70wMF6cSVPKE37G2XpdxUpKxibUikpdZ+dOqgEtMjM
-cQcUWzI/ftolZk5fpcaI
-=8aBu
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObCkQAI5XhzKBtMLGFND3nPt2CmM+
+CAHRNbqIfIx8RO3hdqNc/lEFxQ6cL6hFqKS+PBWCK1n5/8ZsyDEl0lAywBBOCy4L
+fhhMf5T/40eRamsEeKRVkyq2/QdyfbiOAnvNbse8eeOnD/ie4ZnQTpH78X8OBJjo
+Qcd/gln8xvF5ixT4J+LYHJP5y5u+xhkgtEwE4+SU/LayuCa3UL8mZRAh8Wn17E0E
+zsN4lsflzHQ7/RmR95rBnzRuP+djzMgbWCWUYyoBYrCaCsTuuaoDDGsE/+JmHwx7
+hzaIlQRMZ/9hBq8Jf+lEDUlGXSsdcQxSjW5MYJS6OUou0qbYrKRmhQNm4xibzDGh
+xrqVmpN4CZKFVYwaSz9ohHtdf7tDXlTRmvwtW0QibQrfbqh30fyQ2+OoCVXKxZ1x
+gw6UcWiutouFod9hss5EQp8y/AnYAuGX5hPHv0dDZQK1EPLPRtGRRFF/4LzcYSuw
+L5vxfg5hg724p0AvCc77p9thpxHUx4Aqh44+DbXq322jj/gs+M/BogO7tvGbLypV
+s+sYO7+uHhtDYmlUjcon0N3PaxDHI8UTn0QAH0KE5tUeUgvCsh/s+xnBCIBei4xU
+myRRczVU0MTndYMT7Ddmj+TrrgQPO3XbOl1FSfvHyXv9bMQ/aimKOrdsBH67TbYS
+/KQoeTTJhZutyfbWU1iW
+=y788
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ptpd/files/ptpd-2.3.0-ntpdc.patch b/net-misc/ptpd/files/ptpd-2.3.0-ntpdc.patch
deleted file mode 100644
index 08b4cd3b8640..000000000000
--- a/net-misc/ptpd/files/ptpd-2.3.0-ntpdc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN ptpd-2.3.0.old/src/dep/ntpengine/ntpdcontrol.c ptpd-2.3.0.new/src/dep/ntpengine/ntpdcontrol.c
---- ptpd-2.3.0.old/src/dep/ntpengine/ntpdcontrol.c	2013-11-22 17:17:57.000000000 +0100
-+++ ptpd-2.3.0.new/src/dep/ntpengine/ntpdcontrol.c	2014-10-08 01:37:09.000000000 +0200
-@@ -74,7 +74,7 @@
- 	if(!options->enableEngine)
- 	    return FALSE;
- 
--	memset(control, 0, sizeof(control));
-+	memset(control, 0, sizeof(*control));
- 
- 	if(!hostLookup(options->hostAddress, &control->serverAddress)) {
-                 control->serverAddress = 0;
-@@ -236,8 +236,7 @@
- 	int	maclen;
- 	static char *key;
- 
--	key=malloc(21);
--	memset (key, 0, sizeof(key));
-+	key=calloc(21,sizeof(char));
- 	strncpy(key,options->key,20);
- 
- 	memset(&qpkt, 0, sizeof(qpkt));
diff --git a/net-misc/ptpd/files/ptpd-2.3.0-statistics-clear.patch b/net-misc/ptpd/files/ptpd-2.3.0-statistics-clear.patch
deleted file mode 100644
index dd20e2142eb4..000000000000
--- a/net-misc/ptpd/files/ptpd-2.3.0-statistics-clear.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ptpd-2.3.0.old/src/dep/statistics.c ptpd-2.3.0/src/dep/statistics.c
---- ptpd-2.3.0.old/src/dep/statistics.c	2013-11-22 17:17:58.000000000 +0100
-+++ ptpd-2.3.0/src/dep/statistics.c	2015-06-07 10:29:45.697110725 +0200
-@@ -528,7 +528,7 @@
- void
- clearPtpEngineSlaveStats(PtpEngineSlaveStats* stats)
- {
--	memset(stats, 0, sizeof(stats));
-+	memset(stats, 0, sizeof(*stats));
- }
- 
- void
diff --git a/net-misc/ptpd/files/ptpd-2.3.1_rc4-debug-display.patch b/net-misc/ptpd/files/ptpd-2.3.1_rc4-debug-display.patch
deleted file mode 100644
index da76904274df..000000000000
--- a/net-misc/ptpd/files/ptpd-2.3.1_rc4-debug-display.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur ptpd-2.3.1-rc4.old/src/ptpd.h ptpd-2.3.1-rc4.new/src/ptpd.h
---- ptpd-2.3.1-rc4.old/src/ptpd.h	2015-06-08 23:28:46.000000000 +0200
-+++ ptpd-2.3.1-rc4.new/src/ptpd.h	2015-06-12 11:35:37.200223151 +0200
-@@ -438,7 +438,7 @@
- void mMUtcProperties_display(const MMUtcProperties*, const PtpClock*);
- void mMTraceabilityProperties_display(const MMTraceabilityProperties*, const PtpClock*);
- void mMDelayMechanism_display(const MMDelayMechanism*, const PtpClock*);
--void mMlogMinPdelayReqInterval_display(const MMLogMinPdelayReqInterval*, const PtpClock*);
-+void mMLogMinPdelayReqInterval_display(const MMLogMinPdelayReqInterval*, const PtpClock*);
- void mMErrorStatus_display(const MMErrorStatus*, const PtpClock*);
- 
- void sMRequestUnicastTransmission_display(const SMRequestUnicastTransmission*, const PtpClock*);
diff --git a/net-misc/ptpd/ptpd-2.3.0.ebuild b/net-misc/ptpd/ptpd-2.3.0.ebuild
deleted file mode 100644
index d621c08f846c..000000000000
--- a/net-misc/ptpd/ptpd-2.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ptpd/ptpd-2.3.0.ebuild,v 1.1 2015/06/12 10:55:53 mgorny Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic systemd
-
-DESCRIPTION="Precision Time Protocol daemon"
-HOMEPAGE="http://ptpd.sf.net"
-
-SRC_URI="mirror://sourceforge/ptpd/${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug experimental ntp snmp +statistics"
-RDEPEND="
-	ntp? ( net-misc/ntp )
-	snmp? ( net-analyzer/net-snmp:= )
-	net-libs/libpcap:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# QA
-	epatch "${FILESDIR}/${P}-statistics-clear.patch"
-	epatch "${FILESDIR}/${P}-ntpdc.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	econf \
-		--enable-daemon \
-		$(use_enable snmp) \
-		$(use_enable experimental experimental-options) \
-		$(use_enable statistics) \
-		$(use_enable ntp ntpdc) \
-		$(use_enable debug runtime-debug)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	insinto /etc
-	newins "src/ptpd2.conf.minimal" ptpd2.conf
-
-	dodoc "src/ptpd2.conf.default-full"
-	dodoc "src/ptpd2.conf.minimal"
-
-	newinitd "${FILESDIR}/ptpd2.rc" ptpd2
-	newconfd "${FILESDIR}/ptpd2.confd" ptpd2
-
-	systemd_dounit "${FILESDIR}/ptpd2.service"
-}
-
-pkg_postinst() {
-	elog "Do not forget to setup correct network interface."
-	elog "Change the config file /etc/ptpd2.conf to suit your needs."
-}
diff --git a/net-misc/ptpd/ptpd-2.3.1_rc4.ebuild b/net-misc/ptpd/ptpd-2.3.1.ebuild
index 4abaa9ac3432..f795ddbe8f49 100644
--- a/net-misc/ptpd/ptpd-2.3.1_rc4.ebuild
+++ b/net-misc/ptpd/ptpd-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ptpd/ptpd-2.3.1_rc4.ebuild,v 1.1 2015/06/12 10:55:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ptpd/ptpd-2.3.1.ebuild,v 1.1 2015/07/09 06:39:06 mgorny Exp $
 
 EAPI=5
 
@@ -9,10 +9,7 @@ inherit autotools eutils flag-o-matic systemd
 DESCRIPTION="Precision Time Protocol daemon"
 HOMEPAGE="http://ptpd.sf.net"
 
-MY_PV=${PV/_rc*/}
-MY_P=${P/_rc/-rc}
-
-SRC_URI="mirror://sourceforge/ptpd/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/ptpd/${PV}/${P}.tar.gz"
 KEYWORDS="~amd64 ~arm ~x86"
 
 LICENSE="BSD"
@@ -25,12 +22,7 @@ DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
 	ntp? ( net-misc/ntp )"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
-	# QA
-	epatch "${FILESDIR}/${P}-debug-display.patch"
-
 	eautoreconf
 }