diff options
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/networkmanager-openvpn/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild | 55 | ||||
| -rw-r--r-- | net-misc/ntp/Manifest | 5 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch | 35 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch | 236 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.8_p9.ebuild | 136 | ||||
| -rw-r--r-- | net-misc/rabbitmq-server/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild | 2 |
8 files changed, 59 insertions, 414 deletions
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest index 943e65f3c73d..bb92773626a2 100644 --- a/net-misc/networkmanager-openvpn/Manifest +++ b/net-misc/networkmanager-openvpn/Manifest @@ -1,9 +1,11 @@ DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 SHA256 ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61 SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 WHIRLPOOL 75669197a378d775eef26e6a69e764578d5628b2d8a6f11bf08b93e60a2e823b8138827e2456b37d8296def2c074362d0d4bc28b8e56389f5a826bcbdf19b502 DIST NetworkManager-openvpn-1.2.6.tar.xz 494132 SHA256 2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0 SHA512 973b13937bd14891181cfac4b3c8df891bbbd8aad31769130d7acd6f3c41e23fb3359a49a750c885e2c72c94aaf357ff1e326ece7a304b2154c6b33c35118a05 WHIRLPOOL b99542e3529b73d21770dc1ca492e29131f04de0336b6a53f58ed9a4e1f886e04bbebd32b33dc3a1b11483dd6a73779964af3a64d06edd8fb6f4c759c021cc2a DIST NetworkManager-openvpn-1.2.8.tar.xz 498732 SHA256 3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654 SHA512 e6d64106cd93f91d292a6b2346dc31317e1056d2bbaf09a376c84ffaaa8fd584f92999865bdf52531b44de7ae144e1ae9271b9efc564d99f8569b0d059ab8019 WHIRLPOOL ead14f8ca4e194c0ff2b9b2151b44e3a2d97c81a4c89187c701090ce891861ba0f5a947e4b132bb2c70a28647ddb976d3989b1a3f54be87a22e983afad49f161 +DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 SHA256 166e1123ade1b322162b83876c605393a8e74240aa908cba934319f312b2e3a4 SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c WHIRLPOOL 170b6d02a4e2d2d9ebd5246fd390cc9a40f3b56fad019348b66e83d88458c309c61324bf528695c0295ae95e93a08918c4c4222582788789ccb97701b75f3230 EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832 EBUILD networkmanager-openvpn-1.2.6.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832 EBUILD networkmanager-openvpn-1.2.8.ebuild 1245 SHA256 234a539a6cc0ebf77faa1ec4f97124f0bf6a6b43128a9ce25cdc3d8d9c1d0bbe SHA512 caa8db384290d9bf0700e3b3c827a70283c8ddae7fe83b37736bae29010a542f075f8ce06337f3cbd7eb5bcb9cb56990f797fffd812e61be8bff3b51d3d44d27 WHIRLPOOL 7796beba48b6b4b74807184642ff41179367e5f1f91da5588be844f7ba2ff9821178bf3095fef99a21aad07d442c3217d8703cf6e2d48495ce6b058451041fd8 +EBUILD networkmanager-openvpn-1.8.0.ebuild 1241 SHA256 ac4d463b1ab578419ff133c15368992a8d01792d1b6878a659857ab31e3fbaf8 SHA512 c39724749b53fe42f23bb132f36af2154dd88b73d18e93e4b0373ed5b839c45642f48a67a81d0abed98b9ea20f5f3b54edab528608fe67a6da59763bc4be1288 WHIRLPOOL 460263132ff46174d7a453ae775e22940e3f13f22abd30365d107650315acb3f1b3fd8710f9ecf2f48d47a8eee2bb70d8f952307c963d3d9c705ce9790393d3a MISC ChangeLog 6211 SHA256 f2380c9cff2bf554d42c7e59f6f110bba3e5538d10c59519e7dedfb550038a13 SHA512 d67c67ef8813695dc23432e047d51be81322f8143377a7261ead6811f33b03c2b24fea5e5895613ce9d9ff3ba6396b07c244adaa4560f37c15c0e1f9c6f5a98c WHIRLPOOL f807fecc1858b4ad433fb7c002c518dff5db7772f01b282edf3447490ae6c2ae4cbdf21c9465d071237105511f7b67aed6cc5b797bc7b874561122d0eea6d12d MISC ChangeLog-2015 10215 SHA256 8a2dc9e16a52b5984d2662f79bd4d0e29019afdee312eac6071214c9104ddde5 SHA512 4141295a2b577c691a404e81350fff792628fc3a9a4dd9f968a1514ef178b1fcd3d941fabbc5acfb3f9c77e3cea3d5f4485c0c1be591aec63e1d6563b2456353 WHIRLPOOL ed7aa3cd25fd7dab23bcad9edc8bf065527d3feb0f63ff48a87227a4652e1f0aa83f632c5746c2e40c7f16086b57cc2619c48886e0f3baf2fc118303c255346b MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9 diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild new file mode 100644 index 000000000000..cdb1898ecebd --- /dev/null +++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME_ORG_MODULE="NetworkManager-${PN##*-}" + +inherit gnome2 user + +DESCRIPTION="NetworkManager OpenVPN plugin" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gtk test" + +RDEPEND=" + >=dev-libs/glib-2.32:2 + >=net-misc/networkmanager-1.7.0:= + >=net-vpn/openvpn-2.1 + gtk? ( + >=app-crypt/libsecret-0.18 + >=gnome-extra/nm-applet-1.7.0 + >=x11-libs/gtk+-3.4:3 + ) +" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.35 + virtual/pkgconfig +" + +pkg_setup() { + enewgroup nm-openvpn + enewuser nm-openvpn -1 -1 -1 nm-openvpn +} + +src_prepare() { + # Test will fail if the machine doesn't have a particular locale installed + # FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708 + sed '/test_non_utf8_import (plugin, test_dir)/ d' \ + -i properties/tests/test-import-export.c || die "sed failed" + + gnome2_src_prepare +} + +src_configure() { + # --localstatedir=/var needed per bug #536248 + gnome2_src_configure \ + --localstatedir=/var \ + --disable-more-warnings \ + --disable-static \ + --with-dist-version=Gentoo \ + $(use_with gtk gnome) +} diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 4836ada87315..329bff69d144 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -4,9 +4,7 @@ AUX man-pages/ntp.xsl 5831 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a AUX ntp-4.2.8-ipc-caps.patch 471 SHA256 2b63684fdf2d77d4b85081b1d2809a52b34b1406c0d469000ae12795c4b91394 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f WHIRLPOOL c3dd13f7ef04d4f42e37da3ad6c205d91a312600eb45ff1497c8a6ecb58cc83f400763e23ce2f19aff0b025ce9890082d2b7f84cfa69acb13ca6d895a3e84cce AUX ntp-4.2.8-sntp-test-pthreads.patch 325 SHA256 3af800a07382a217cfa854166664dbe6c91c54d23cca9c7a2bab01d433d50cd2 SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 WHIRLPOOL d8151be7a9a0966bd390246d4d31f229e0071969c94293a0c01944bfd610ba50a0c6d639832fe026dc0708e827a3aa0674320251f82badf0e321958ea6b50b32 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 SHA256 312c45416216f0061777f6cf02b5dde6ec6d3c75fbf3a70fff11d947d93e043b SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9 WHIRLPOOL 7db8ad867eb39b6b913d536229171134b04a99772594a6b0a6dfa0a87f59a1f8ba505945a6d5dd4d4f9ca9396c383b72b8b9d9e1068c86366a5c4c29b8dc5493 -AUX ntp-4.2.8_p10-libressl.patch 1669 SHA256 1f77e7b0d125e8f3502139e6052d46849b5861d9915adfda9b11616fab42e9a8 SHA512 2a44b250fa33725d0cee075dbf3fdbe616335432f7b31a0753c037765cfb91445aea35dee0f245f6dfbbb27d9eb1d107a412ab6325707711b65650a4785695df WHIRLPOOL e59916ac22db745f2742e775cabe85c30612154ce42d239de579bf957ea0ecc40eb968b44f2b28367a407ac3ac7c7e86c555a1faf6e15370aafb0aa5ce572f98 AUX ntp-4.2.8_p10-ntpq-fpic.patch 464 SHA256 189d24170b6d8df22feac6881394f0a64aa06c04e6e1e8cd2d39104fbb5e753a SHA512 706f199b612f7a30f385668a2624cc442bcf0b2674f779488a03f94d659c5efa5355fcfb4e221e14d7eed608edd5a678dce4d1e110c97640d8e489d50e223b09 WHIRLPOOL 629d44eb3193bc222f6ec09c0f42c79ba24d9735c10137ac1478836c5263b3bf962a4e02d4d6fc5949cad6a5f12722020b32bbf279266a35527ea254aae22f15 -AUX ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch 7611 SHA256 ede0c5ef472de78cf7c083f6e1e7372430fd51d8de39d2b841f8354212b45dd0 SHA512 630a29233b86bddaa2439a130533ebfb5bdff5cda5be6c578600a0022f8c1439538dbb72b6a9de65023920782ff7912e0ec63291f92d5e4bb7d4908fd39db692 WHIRLPOOL 4d1c6f5b74171c2ab0f7440687d13a5fc1dee5e65cbb44998e015acd87a76944fc435c0bcaaf571dff8f1b7541dd52b8dd8e03ecbddfb8b6d8b260c3b7e358b0 AUX ntp-client.confd 776 SHA256 c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5 SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 WHIRLPOOL 7282c74d564f776cb6e8e15d79cb77e60088c516a71f87c28d96bda7e67bddc3d35e01cf86eac58655c2536d0a4a023b6142527bc8ec62318524114502d5cc99 AUX ntp-client.rc 720 SHA256 49f6634a258d4a91dc12c3b6bf9014b05a39cfe121ad52f826721ab791a28aa3 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81 WHIRLPOOL a5dd1c93b007255ed2148e1e48e3a1447b730031a7be5f7f7744559304028f11d622e668b5f6a2564f9d1a18734bfa0964c30862e66b40503e59da0e37033fce AUX ntp.conf 1614 SHA256 1e644397a0360a997064d0704b489c66b17ae2c50b49278ba46ec04942f13fb6 SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c WHIRLPOOL c84ab4e53d8c778f64a656a920aa062b4c03cd871684814f3f2bf6a3d8b76870a921d91676cfe71d84db0865b887f64ebe3d403a81a91af656987d74469cc6cf @@ -21,10 +19,7 @@ AUX sntp.service-r2 324 SHA256 4e36dca24d29c0debf5882193b870685f32e65f37f02068bb AUX sntp.service.conf 119 SHA256 a7f886d6f5e671005da8ef9b53567884a8467239528bf860db61230b73097eb3 SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 WHIRLPOOL 6d99157e99026fdd4734674647bbb9a721f8766d5708f6c6f725fa88687bbb2995233fd02ccb34ebed7b80570e1a309a857ddb58fc08e0255268880eb8d18d9e DIST ntp-4.2.8p10-manpages.tar.xz 25004 SHA256 7d968a7e68e0ce26c56635e452468b3583e2cb8bfcf558127c753c62e31d7007 SHA512 5b31a1429484ad30a35c8fa38157190a66b0983b5bf1a802c0817613901b5e0644941a3f4d5b660fcfe4ca04968766a5981331a6f9353316e7de953e55c33a09 WHIRLPOOL 6f5d593be7003fa9212364c0409f7e1ae7adcd6d1134c6db5bfb92fbbeb181495c3d484ff73bdfe55f231bb323e286ef4e1eb2ba588fcf3acd360ac8bf53b259 DIST ntp-4.2.8p10.tar.gz 6998648 SHA256 ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f SHA512 67e01ab533c3dfabb0bdd3ced848bdd239980bde28fdb2791d167b7e9690ab3b3759e1bd99e9fddcce03ddef4cd63a47eb85941bb127ceb79b7ecff22cce9c05 WHIRLPOOL 7a72762d349591808c0f3d4686bbb2fbf60a0915769e77140414795892d6929feb0aae30cf2f2ea1febd3c4fecb9d3d62401e1f66033bb2dc57e3245f41708c8 -DIST ntp-4.2.8p9-manpages.tar.xz 24988 SHA256 a7814373e7ceb73a9e426b2e60a9966b6d053f145fd0253bbccf407af9f7ad3f SHA512 23ba80c540d12e78012a448348b94ccb68d0a8078e2e6fe05be58d89aa5e6e31ee8d686920c0f841ad12eade84a081e393885760fdf81bad5c30c76006df0094 WHIRLPOOL 49259ef4bade074bbcb5d87dd21bd93538a3a17405a42e483d10168fd609f908b59c86c73b01d2db2e683ff43fa0fdc0cdf297bfcc452d223dcb78bcef3f46c3 -DIST ntp-4.2.8p9.tar.gz 7231884 SHA256 b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 SHA512 ffd9e34060210d1cfb8ca0d89f2577df1c5fbe3ba63c620cdadc3ccc3c9d07f518783c6b91e57bffc77b08f449fdbab12faf226672ebd2dde5a0b4a783322a04 WHIRLPOOL ea96b106fd06f2b536394ad2a3dcc2a973aa0cec96140a292bc13b6ceb4159208a59b9c51936240c8a44fa7b2caa4be60d07d3c53066ce8588b0561bef64c070 EBUILD ntp-4.2.8_p10-r1.ebuild 4509 SHA256 26b89ffff258d7e1fbf788d6f3e06a39370f4dcc4c5c2629f214bcbd4b815260 SHA512 8fc3394ea6cfca15557422ffd6c87dbe074cb955af8537ff8f912dd061015fae3597680de9b7d14dfe99ff871643567e519aa75f10f85e74be427c555b861230 WHIRLPOOL 2a30aee1615dd94b84705129572ae57275a6f9a28f692561a20bd87de14621c7d68734a11c3819269ebc4cc1abc3e919a17938432500c9c19e8a4c98c83c1928 -EBUILD ntp-4.2.8_p9.ebuild 4406 SHA256 e7a849cb4c96c7a8c96a07cc932c4a32d1da0a3f8a6a32c74f44fa8e15371566 SHA512 9fa23bbb7e9ad2283064b22f4661ce2a5855cbc93be296c80aa909303577cff999538cb53ab79dee77999d37a88f27ee9443f418f6505de93e2da9530f54807d WHIRLPOOL 85712eb9b856f2f40e65533771db6bbd870b34ec503763e2eb9dd39618b659a53c8f3fdff0baa3adfbf448f709b339d0423b39ba1da79925fbaab28bceabaa98 MISC ChangeLog 13329 SHA256 4af69e0b1f274b3ab6e6c2a5762160ef6d3a586968ccf1e07001611240081294 SHA512 fbd7c3013a20ff722226fda2a417715c344669b99e2e2b746c581251334a2fd1fa7180702d33d61a90b9f381bbd31fb52d89bc9923f2fc2c274231b930ddf22f WHIRLPOOL 891184bca6aab64014578c812dd13bd28b0255f98fed3168d5a88b0ce3084ffda8a4acde412c43ca02855b4c5733b9c1ea8133056e438d1cc9e56f8c55d6c0e0 MISC ChangeLog-2015 35438 SHA256 b1ee0c5247f54077d519bdc0f28d204058b1bc0f27ce0e633b11855c619bd28e SHA512 23317f991b73a9da7eac36d54739e7904ddb33ff652a40ed998c27a3a974eb4f05a359d131dc60960cf52cee5491476b45850a7a13611f339d54fccbdd8a2f82 WHIRLPOOL fcc2d0fd512bc87440c6ee5d4ba79d9c462a0a4946cbf6c481f8141a9f5b868086cd8478f322daa794fdaa53499faffdd76c02c3d56bef1bebcc69ecd117b302 MISC metadata.xml 1014 SHA256 76b51a00c0cc2ba0dc0d3438da3b1ddf576197fb1e867e2956daa1908bbc8ac6 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 WHIRLPOOL c5aabcb26063c306bd27b069b2f2ce099c330110089ec07e26559d383678812117fa94cbc3ea039f73d1c833dc9a2a1b5c38368dbf004b203e69f2c3286e6781 diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch deleted file mode 100644 index 98ca61af4595..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur a/include/libssl_compat.h ntp-4.2.8p10/include/libssl_compat.h ---- ntp-4.2.8p10.orig/include/libssl_compat.h 2017-03-21 06:04:20.000000000 -0700 -+++ ntp-4.2.8p10/include/libssl_compat.h 2017-03-30 16:34:03.892173084 -0700 -@@ -37,7 +37,7 @@ - #endif - - /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - # include <openssl/objects.h> -diff -ur ntp-4.2.8p10.orig/libntp/a_md5encrypt.c ntp-4.2.8p10/libntp/a_md5encrypt.c ---- ntp-4.2.8p10.orig/libntp/a_md5encrypt.c 2017-02-01 01:47:13.000000000 -0800 -+++ ntp-4.2.8p10/libntp/a_md5encrypt.c 2017-03-30 16:55:49.830229507 -0700 -@@ -11,6 +11,7 @@ - #include "ntp.h" - #include "ntp_md5.h" /* provides OpenSSL digest API */ - #include "isc/string.h" -+#include "libssl_compat.h" - /* - * MD5authencrypt - generate message digest - * -diff -ur ntp-4.2.8p10.orig/libntp/libssl_compat.c ntp-4.2.8p10/libntp/libssl_compat.c ---- ntp-4.2.8p10.orig/libntp/libssl_compat.c 2017-02-01 01:47:13.000000000 -0800 -+++ ntp-4.2.8p10/libntp/libssl_compat.c 2017-03-30 16:52:17.287543795 -0700 -@@ -26,7 +26,7 @@ - /* ----------------------------------------------------------------- */ - - /* ----------------------------------------------------------------- */ --#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - #include "libssl_compat.h" diff --git a/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch deleted file mode 100644 index 5166e5f9a1d0..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p9-fix-build-wo-ssl-or-libressl.patch +++ /dev/null @@ -1,236 +0,0 @@ -Fix building with libressl or without SSL. - -Origin: http://bugs.ntp.org/attachment.cgi?id=1481 - -LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2) - -diff -Nru a/include/ntp_md5.h b/include/ntp_md5.h ---- a/include/ntp_md5.h 2016-11-23 08:35:18.248130387 +0100 -+++ b/include/ntp_md5.h 2016-11-23 08:35:18.248130387 +0100 -@@ -8,6 +8,7 @@ - - #ifdef OPENSSL - # include "openssl/evp.h" -+# include "libssl_compat.h" - #else /* !OPENSSL follows */ - /* - * Provide OpenSSL-alike MD5 API if we're not using OpenSSL -@@ -23,6 +24,9 @@ - # endif - - typedef MD5_CTX EVP_MD_CTX; -+ -+# define EVP_MD_CTX_free(c) free(c) -+# define EVP_MD_CTX_new() calloc(1, sizeof(MD5_CTX)) - # define EVP_get_digestbynid(t) NULL - # define EVP_md5() NULL - # define EVP_MD_CTX_init(c) -diff -Nru a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c ---- a/libntp/a_md5encrypt.c 2016-11-23 08:35:18.248130387 +0100 -+++ b/libntp/a_md5encrypt.c 2016-11-23 08:35:18.248130387 +0100 -@@ -11,7 +11,6 @@ - #include "ntp.h" - #include "ntp_md5.h" /* provides OpenSSL digest API */ - #include "isc/string.h" --#include "libssl_compat.h" - /* - * MD5authencrypt - generate message digest - * -diff -Nru a/libntp/libssl_compat.c b/libntp/libssl_compat.c ---- a/libntp/libssl_compat.c 2016-11-23 08:35:18.248130387 +0100 -+++ b/libntp/libssl_compat.c 2016-11-23 08:35:18.248130387 +0100 -@@ -15,15 +15,18 @@ - * --------------------------------------------------------------------- - */ - #include "config.h" -- --#include <string.h> --#include <openssl/bn.h> --#include <openssl/evp.h> -- - #include "ntp_types.h" - - /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#ifdef OPENSSL -+# include <string.h> -+# include <openssl/bn.h> -+# include <openssl/evp.h> -+#endif -+/* ----------------------------------------------------------------- */ -+ -+/* ----------------------------------------------------------------- */ -+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - #include "libssl_compat.h" -@@ -325,7 +328,7 @@ - } - - /* ----------------------------------------------------------------- */ --#else /* OPENSSL_VERSION_NUMBER >= v1.1.0 */ -+#else /* OPENSSL && OPENSSL_VERSION_NUMBER >= v1.1.0 */ - /* ----------------------------------------------------------------- */ - - NONEMPTY_TRANSLATION_UNIT -diff -Nru a/ntpd/ntp_control.c b/ntpd/ntp_control.c ---- a/ntpd/ntp_control.c 2016-11-23 08:35:18.256130015 +0100 -+++ b/ntpd/ntp_control.c 2016-11-23 08:35:18.260129828 +0100 -@@ -33,8 +33,6 @@ - # include "ntp_syscall.h" - #endif - --#include "libssl_compat.h" -- - /* - * Structure to hold request procedure information - */ -@@ -1653,8 +1651,10 @@ - } - - /* -- * ctl_putcal - write a decoded calendar data into the response -+ * ctl_putcal - write a decoded calendar data into the response. -+ * only used with AUTOKEY currently, so compiled conditional - */ -+#ifdef AUTOKEY - static void - ctl_putcal( - const char *tag, -@@ -1678,6 +1678,7 @@ - - return; - } -+#endif - - /* - * ctl_putfs - write a decoded filestamp into the response -@@ -1838,7 +1839,7 @@ - char * oplim; - char * iptr; - char * iplim; -- char * past_eq; -+ char * past_eq = NULL; - - optr = output; - oplim = output + sizeof(output); -diff -Nru a/ntpd/ntp_io.c b/ntpd/ntp_io.c ---- a/ntpd/ntp_io.c 2016-11-23 08:35:18.268129456 +0100 -+++ b/ntpd/ntp_io.c 2016-11-23 08:35:18.272129269 +0100 -@@ -516,13 +516,17 @@ - /* - * function to dump the contents of the interface structure - * for debugging use only. -+ * We face a dilemma here -- sockets are FDs under POSIX and -+ * actually HANDLES under Windows. So we use '%lld' as format -+ * and cast the value to 'long long'; this should not hurt -+ * with UNIX-like systems and does not truncate values on Win64. - */ - void - interface_dump(const endpt *itf) - { - printf("Dumping interface: %p\n", itf); -- printf("fd = %d\n", itf->fd); -- printf("bfd = %d\n", itf->bfd); -+ printf("fd = %lld\n", (long long)itf->fd); -+ printf("bfd = %lld\n", (long long)itf->bfd); - printf("sin = %s,\n", stoa(&itf->sin)); - sockaddr_dump(&itf->sin); - printf("bcast = %s,\n", stoa(&itf->bcast)); -@@ -570,11 +574,11 @@ - static void - print_interface(const endpt *iface, const char *pfx, const char *sfx) - { -- printf("%sinterface #%d: fd=%d, bfd=%d, name=%s, flags=0x%x, ifindex=%u, sin=%s", -+ printf("%sinterface #%d: fd=%lld, bfd=%lld, name=%s, flags=0x%x, ifindex=%u, sin=%s", - pfx, - iface->ifnum, -- iface->fd, -- iface->bfd, -+ (long long)iface->fd, -+ (long long)iface->bfd, - iface->name, - iface->flags, - iface->ifindex, -diff -Nru a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c ---- a/ntpd/ntp_proto.c 2016-11-23 08:35:18.280128897 +0100 -+++ b/ntpd/ntp_proto.c 2016-11-23 08:35:18.284128711 +0100 -@@ -4054,7 +4054,7 @@ - ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen, - peer->keynumber)); - #else /* !AUTOKEY follows */ -- DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %d\n", -+ DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %zu\n", - current_time, peer->dstadr ? - ntoa(&peer->dstadr->sin) : "-", - ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen)); -diff -Nru a/ports/winnt/ntpd/ntp_iocompletionport.c b/ports/winnt/ntpd/ntp_iocompletionport.c ---- a/ports/winnt/ntpd/ntp_iocompletionport.c 2016-11-23 08:35:18.288128524 +0100 -+++ b/ports/winnt/ntpd/ntp_iocompletionport.c 2016-11-23 08:35:18.288128524 +0100 -@@ -1391,8 +1391,7 @@ - goto fail; - } - -- ; -- if ( ! (rio->ioreg_ctx = iopad = iohpCreate(rio))) { -+ if (NULL == (rio->ioreg_ctx = iopad = iohpCreate(rio))) { - msyslog(LOG_ERR, "%s: Failed to create shared lock", - msgh); - goto fail; -@@ -1401,13 +1400,13 @@ - iopad->riofd = rio->fd; - iopad->rsrc.rio = rio; - -- if (!(rio->device_ctx = DevCtxAttach(serial_devctx(h)))) { -+ if (NULL == (rio->device_ctx = DevCtxAttach(serial_devctx(h)))) { - msyslog(LOG_ERR, "%s: Failed to allocate device context", - msgh); - goto fail; - } - -- if ( ! (lpo = IoCtxAlloc(iopad, rio->device_ctx))) { -+ if (NULL == (lpo = IoCtxAlloc(iopad, rio->device_ctx))) { - msyslog(LOG_ERR, "%: Failed to allocate IO context", - msgh); - goto fail; -@@ -1594,7 +1593,6 @@ - static const char * const msg = - "OnSocketSend: send to socket failed"; - -- IoHndPad_T * iopad = NULL; - endpt * ep = NULL; - int rc; - -@@ -1662,7 +1660,7 @@ - - INSIST(hndIOCPLPort && hMainRpcDone); - if (iopad) -- iocpl_notify(iopad, OnInterfaceDetach, -1); -+ iocpl_notify(iopad, OnInterfaceDetach, (UINT_PTR)-1); - } - - /* -------------------------------------------------------------------- -diff -Nru a/sntp/crypto.c b/sntp/crypto.c ---- a/sntp/crypto.c 2016-11-23 08:35:18.288128524 +0100 -+++ b/sntp/crypto.c 2016-11-23 08:35:18.288128524 +0100 -@@ -2,7 +2,7 @@ - #include "crypto.h" - #include <ctype.h> - #include "isc/string.h" --#include "libssl_compat.h" -+#include "ntp_md5.h" - - struct key *key_ptr; - size_t key_cnt = 0; -diff -urN ntp-4.2.8p9/include/libssl_compat.h ntp-4.2.8p9_fixed/include/libssl_compat.h ---- a/include/libssl_compat.h 2016-11-21 07:28:40.000000000 -0500 -+++ b/include/libssl_compat.h 2016-11-23 12:10:33.014148604 -0500 -@@ -25,7 +25,7 @@ - #include "openssl/rsa.h" - - /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - # include <openssl/objects.h> diff --git a/net-misc/ntp/ntp-4.2.8_p9.ebuild b/net-misc/ntp/ntp-4.2.8_p9.ebuild deleted file mode 100644 index 4ff1b7a2eb34..000000000000 --- a/net-misc/ntp/ntp-4.2.8_p9.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic user systemd - -MY_P=${P/_p/p} -DESCRIPTION="Network Time Protocol suite/programs" -HOMEPAGE="http://www.ntp.org/" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz - https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" - -LICENSE="HPND BSD ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -CDEPEND="readline? ( >=sys-libs/readline-4.1:0= ) - >=dev-libs/libevent-2.0.9:=[threads?] - kernel_linux? ( caps? ( sys-libs/libcap ) ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - !openntpd? ( !net-misc/openntpd ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - ) - parse-clocks? ( net-misc/pps-tools )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax )" -PDEPEND="openntpd? ( net-misc/openntpd )" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 - "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 - "${FILESDIR}"/${P}-fix-build-wo-ssl-or-libressl.patch -) - -pkg_setup() { - enewgroup ntp 123 - enewuser ntp 123 -1 /dev/null ntp -} - -src_prepare() { - epatch "${PATCHES[@]}" - append-cppflags -D_GNU_SOURCE #264109 - # Make sure every build uses the same install layout. #539092 - find sntp/loc/ -type f '!' -name legacy -delete || die - # Disable pointless checks. - touch .checkChangeLog .gcc-warning FRC.html html/.datecheck -} - -src_configure() { - # avoid libmd5/libelf - export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no - export ac_cv_lib_elf_nlist=no - # blah, no real configure options #176333 - export ac_cv_header_dns_sd_h=$(usex zeroconf) - export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} - # Increase the default memlimit from 32MiB to 128MiB. #533232 - econf \ - --with-lineeditlibs=readline,edit,editline \ - --with-yielding-select \ - --disable-local-libevent \ - --docdir='$(datarootdir)'/doc/${PF} \ - --htmldir='$(docdir)/html' \ - --with-memlock=256 \ - $(use_enable caps linuxcaps) \ - $(use_enable parse-clocks) \ - $(use_enable ipv6) \ - $(use_enable debug debugging) \ - $(use_with readline lineeditlibs readline) \ - $(use_enable samba ntp-signd) \ - $(use_with snmp ntpsnmpd) \ - $(use_with ssl crypto) \ - $(use_enable threads thread-support) -} - -src_install() { - default - # move ntpd/ntpdate to sbin #66671 - dodir /usr/sbin - mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" - - dodoc INSTALL WHERE-TO-START - doman "${WORKDIR}"/man/*.[58] - - insinto /etc - doins "${FILESDIR}"/ntp.conf - use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 - newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd - newconfd "${FILESDIR}"/ntpd.confd ntpd - newinitd "${FILESDIR}"/ntp-client.rc ntp-client - newconfd "${FILESDIR}"/ntp-client.confd ntp-client - newinitd "${FILESDIR}"/sntp.rc sntp - newconfd "${FILESDIR}"/sntp.confd sntp - if ! use caps ; then - sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die - fi - sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die - - keepdir /var/lib/ntp - use prefix || fowners ntp:ntp /var/lib/ntp - - if use openntpd ; then - cd "${ED}" - rm usr/sbin/ntpd || die - rm -r var/lib - rm etc/{conf,init}.d/ntpd - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service - systemd_install_serviced "${FILESDIR}"/sntp.service.conf -} - -pkg_postinst() { - if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then - eerror "The notrust option was found in your /etc/ntp.conf!" - ewarn "If your ntpd starts sending out weird responses," - ewarn "then make sure you have keys properly setup and see" - ewarn "https://bugs.gentoo.org/41827" - fi -} diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest index e481a56502c0..26fd487917d3 100644 --- a/net-misc/rabbitmq-server/Manifest +++ b/net-misc/rabbitmq-server/Manifest @@ -6,7 +6,7 @@ DIST rabbitmq-server-3.6.5.tar.xz 2923164 SHA256 9550433ca8aaf5130bf5235bb978c44 DIST rabbitmq-server-3.6.9.tar.xz 1422316 SHA256 2df4f09860167de803f592a45792f3f83533bd97acdd7e18569c5bafcf2e470f SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662 WHIRLPOOL af674e8e555b6ee94f72f5d09d795f3a53f41ec9cf7a00ecefa3a418935742cc568319b82735da2ef9374e64b41ecf89bf234d02be0e66dce4d4aff0b82f3d77 EBUILD rabbitmq-server-3.6.10.ebuild 2862 SHA256 8f209c80cd5bf3ca1a8bd7c869470f9d1320f4a4f0d4e7c7c6667ff071e84939 SHA512 30b2b5abea99f3f7d277c73135ebcfa15e592650dfd5b7815c81824efc495e3d3fcdeb350e3fba5d6e465a73d844230ff46da2083c580819146b8548361ca0a5 WHIRLPOOL 3d5c5c6804d55b4156fdaddfc1c8fe3e5f301437235343f9b7d41eb089c4cc6b8164028720a24bf87c049c0e0fe2f38c60588eb572b282f746da31d2418bf44c EBUILD rabbitmq-server-3.6.5.ebuild 2784 SHA256 f5244a685d4a98b0b43f0769d42b361c174666c1e43da5ecde0f812c92f17c6c SHA512 e56a01c1d4c0cc7537fdd680387a845c0077c744fa29faf73777d258b8d7399233ccf58bc5368a10c5949ed9685a4fc14c9778a43bd03a98564451b0028b584e WHIRLPOOL da5f7793fc3f4d937384c50612c00151e440b1d3c717986a547ec537ccee11b5aa5811f0091dd29acbf888eaa1524bcde7ebce08a4ec5c1917b92c1d7457fb4e -EBUILD rabbitmq-server-3.6.9.ebuild 2861 SHA256 4a0e3b55ae099d77c5c0017820f9e212b272937a2e3c18797d75e4c0c6b5737e SHA512 d3bbb35338e57667d2dbf6a2524e9bafdbfbb7195f1af53c6a4cca0c15c320092607e43ba7c1a18cbd3568fbcfc261a85e35e0efcb05814c864a6deddeaa0501 WHIRLPOOL 50299ded32d29f4336f40a4a6001dc5a2f619c81b2a009554ea4fac7f3ce8126fc39bdaa812052d13c361c9648f227a851797304ce6a808a6faeb6f75de48979 +EBUILD rabbitmq-server-3.6.9.ebuild 2860 SHA256 9f3a0f9ec8a2d456fd5f8b218791362c5ba4d0d2c70d320dea220bd049478772 SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303 WHIRLPOOL d6d4395b0564c34beed29a0d9db66e5348f22a7250316b939acc9e4b604305662c0e21534002561d7480cc80ee8dc498e2dafc880ae599fb56dd75bdc89cb68a MISC ChangeLog 4923 SHA256 f9d6c91ff43982646a66e386ecf8096ec13a05d118335143959297889d29d86d SHA512 bb0db708d4948042fb50adc991ae49868c11db7788e8e21bb8ae85fe1d237a0552b9afe184cfa57198ed00bf6f9793d2fc575744bd0d7b0f6222e89465e68ca5 WHIRLPOOL a0f679867374f75a84ee82bd025211cbb5b2a8b44e990bf33f084917fa0e9f8822c11d59a365b5ca3ce955e938e0f80bf2dd1d3edf00240334b3edf9f39abbf1 MISC ChangeLog-2015 9325 SHA256 909f07a4b271e41482d034bd4da6b8939dd3023bb4eeb2fb9912e3248d35d3be SHA512 68317f1c63f79a38c282dd4f45964198e5f4977f58b856fb4aef2feabadefd5cc0a756f29edd64b2a1b00c0ca94fc28ab466e54d97a7d291cc289132050c086f WHIRLPOOL 5882a7ce7855b9b436ed63bed531009095eef28af3e466678fba8899d725b355004e67da3524bd4f657346174651c3d2298e20c6698aee5ff2de2998dfade1a7 MISC metadata.xml 243 SHA256 1446624bfa571e6b512e5cf6df92ad4773a91dd5066b852d48b6629df20dd42d SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701 WHIRLPOOL e55b1ed28253d63931acbabcf8c0e2a7e88c8bb61d1fe9cbf4795ca3aae755749b7a4a01d3fcf4d7461dfe60c9a2e5a06a68549f016d021440d22653ddf7d6b8 diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild index d57de986cabb..669fedafa631 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server LICENSE="GPL-2 MPL-1.1" SLOT="0" -KEYWORDS="~amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" RDEPEND=">=dev-lang/erlang-18[ssl]" |