diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-misc | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'net-misc')
291 files changed, 3195 insertions, 5988 deletions
diff --git a/net-misc/AQtion/AQtion-2.2.7.ebuild b/net-misc/AQtion/AQtion-2.2.7-r1.ebuild index 052ff5de6cb2..859d3b001daa 100644 --- a/net-misc/AQtion/AQtion-2.2.7.ebuild +++ b/net-misc/AQtion/AQtion-2.2.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/net-misc/AQtion/AQtion-2.3.1.ebuild b/net-misc/AQtion/AQtion-2.3.1-r1.ebuild index 6ea5a134c5c6..d913e44322c9 100644 --- a/net-misc/AQtion/AQtion-2.3.1.ebuild +++ b/net-misc/AQtion/AQtion-2.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/net-misc/AQtion/AQtion-2.3.4.ebuild b/net-misc/AQtion/AQtion-2.3.4-r1.ebuild index c9ff68cda4f9..c9ff68cda4f9 100644 --- a/net-misc/AQtion/AQtion-2.3.4.ebuild +++ b/net-misc/AQtion/AQtion-2.3.4-r1.ebuild diff --git a/net-misc/AQtion/Manifest b/net-misc/AQtion/Manifest index 12c1fdd91980..475fa4d724fb 100644 --- a/net-misc/AQtion/Manifest +++ b/net-misc/AQtion/Manifest @@ -1,7 +1,7 @@ DIST AQtion-2.2.7.tar.gz 122679 BLAKE2B 9d4e2d4d4b26a191551e2cfd30c2a8ce4e4bde01b7ab1e9beb9564abdfd1093b63f94713570fe2c949943037b649c55a9f448b0333fcdcc7227849330d466f92 SHA512 d3ba78acbe5d85d1017d5460fa7d916ffa59eeb137aa1817da215f08b994a10336a9f865c9b84a16b8cef7238d4fd87785bc17d6e3eac577210bf321538cbda3 DIST AQtion-2.3.1.tar.gz 122884 BLAKE2B 46037acfdb3914eb2aac26795d923f22e34bf51ed31c993169803ea572108fe0bf98ef61bbadfa86b7027161aa5105c8b2cb4f19e1b12388ce9296f87f2f7c6d SHA512 929a4f208c041340d684e7732256511d68dac71d5204c34c8f0d6aa5832b0de0667bda7e1fa44a5486c7c34692f73c5de397655b0ba0efb12de8d4d76316e835 DIST AQtion-2.3.4.tar.gz 123200 BLAKE2B 8427d7051625ad44a4478ad89c7bb7c079063f81a93c1704df25b6a033887eb93820b65d9ec46f5b3bd8a85544b94182f6e5d33e1dc60142c2292bad6fa054ce SHA512 b985214fc2ec31d0a71453a784b1467ac935265d8a6fd1f2f35a1602d288f4394deb178f29b4edbe4d962fadae942cb0c484a35ec3d02d3e6564e3cf5493314f -EBUILD AQtion-2.2.7.ebuild 1095 BLAKE2B 5fe62a9a9e1508adf34a4bb92e058c683daaec15e8663794157eb6ec5edb9358ed6ed909ce169d1538c45e149eaf36a7058ef20af259ac37fa0dc58efa95fe3c SHA512 44dcdc56acca18786bba37c66b718a225799249e1215e8c8803c2036bca3dfa23b9d79cd378bb82ae0879d9bdba915f9bcd126a8562a66ec067a32ed0d72b5b5 -EBUILD AQtion-2.3.1.ebuild 1095 BLAKE2B 31394903271e75f6b7fc834028f5d1a291022ec75ba545a86de60aeacbc7b2a87083103a34d1058b0a63dc1ac7e9d2c54c66ba55e8b032cad927ce115cf9cd66 SHA512 90ca880130f664e09a32aed1f90a2064c96b224cfbf33ca063985bdf36d62355c965b928f8f0250f05972ced30c906c69e02092a75e77eea4146f72bb0b04064 -EBUILD AQtion-2.3.4.ebuild 1100 BLAKE2B e9d9d9951ff37f16f6794ed4e1e231a7041440bb15e8ca574a6a3e9a00541544d38320841e9f214b7cd99d339092b4d55610aa910642358a03cf205f5ff059c3 SHA512 de1428a85b8945dfa500f781c8fe2528ed6fe59e467c85c6fb646ff259a550f1c590125d3847157222c185e9ed5b3f28bc25585d39047aa9ab54154b5649491c +EBUILD AQtion-2.2.7-r1.ebuild 1100 BLAKE2B 8a1d31b51e1588f7f59ef560573bef8e1f1e0814effddb70f2f46d1fc0a3598017ddcfd5e3a83c2a73f417c9e06b2347ba37d26e62e63bb40074aa62380eeffb SHA512 1adfb0a01f2d60ecd0d4a8711efdcd0693a2201b99eb5f88aac39ef9297ce75254aebed1a8094d0cb06042cb50bae4f3a482c24fb6680b9f7471e82df5a78295 +EBUILD AQtion-2.3.1-r1.ebuild 1100 BLAKE2B 72505cd4cf7b805f52cd984648ef91b4acef83f722a7cc95c43534c3e5b0f780a3cb4553c246ef436087a4013b77bbb9d81c9283a9d4b54e4e36600f90a64be7 SHA512 00b915a4c1fc878cf03424bfc368abba2fed2c4c38642b1752d17f8f5d67b9eebd9117505c131ebad5deedc75325cbf3964b48380e12b74e81b807e059470bee +EBUILD AQtion-2.3.4-r1.ebuild 1100 BLAKE2B e9d9d9951ff37f16f6794ed4e1e231a7041440bb15e8ca574a6a3e9a00541544d38320841e9f214b7cd99d339092b4d55610aa910642358a03cf205f5ff059c3 SHA512 de1428a85b8945dfa500f781c8fe2528ed6fe59e467c85c6fb646ff259a550f1c590125d3847157222c185e9ed5b3f28bc25585d39047aa9ab54154b5649491c MISC metadata.xml 697 BLAKE2B 2462c0dedde087805f1879750ad183a9c5d29dbd8561270f9e999bda47946517ce45ab70d29851aec06b5f2e79aa93fa5f7d9f09bcb3f089bf4cada541c4b87a SHA512 f2cbb250acd2690842dbdb5645f04e071f08a65e9dd80153fef3fe1c5d35ea1b5c40e8c58309b9323ca53941e902069c11b710037289923ff2b9a77570cb8313 diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex 5bde629ec718..86f3bf28c74e 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest index 0b7deeb89375..deb23d4ce7a6 100644 --- a/net-misc/anydesk/Manifest +++ b/net-misc/anydesk/Manifest @@ -9,8 +9,11 @@ DIST anydesk-5.5.4-amd64.tar.gz 4886562 BLAKE2B f8a754de375db95ae5af728e0433cd25 DIST anydesk-5.5.4-i386.tar.gz 4796401 BLAKE2B 35b89fcbc1565a548e3631fbd476bb5516405a62db537d1b5b76a18d3a4e912fe2be7fb92a451d1dcd11c3d16be5e012b53842a40811687320e4d806d0723509 SHA512 d6d14eed83c5b48fb02bbfe25b12c7875d984ab27ef713645aab4a4f63f5a54253da63133699a559ef4b827c9f56b3055efe0e08a4c31334247928f21c5539db DIST anydesk-5.5.6-amd64.tar.gz 5054062 BLAKE2B a131fe5e10def7017cf29e8cc175e2b448be7fe3e9fa7257dc0cb470f31f6fdc78e510b5e377bc10528f0eb7f264572bf4c334c9d412f8f7404aaf85d4babbb9 SHA512 32527532fb769dccc6df8208c18e391ac6537e38f7d6c5acfd3280dbbc7cf0c545ec55416eb798ad8a6d3b0e958778d87696c9d721dd1739c17b935f1046c29d DIST anydesk-5.5.6-i386.tar.gz 4970197 BLAKE2B b656071498784052ce1c81f32c0ae333039930b26487d204dc5f55e8352f263878437ab3a4e2ac8469745ece75a29056f553f12f33fe96c9c2bc54d3d4644941 SHA512 3b561e014cc4c149f4d77b43c4e5427266604679dfdf9253bb76689ee6c6ac5b274cc5ac58147bdc136c20f616c9f9d8dbc2c11b5b85d0f184a0251ece2ad265 +DIST anydesk-6.0.0-amd64.tar.gz 5195378 BLAKE2B b967e063cff609ff9a93f3946c6f555987526d2fd163130dc74d0e69d720972a483e0b7df04b1e39c9096156a7161ab46b160b243e249fca4ce7c6c565ae104e SHA512 f41e1fd7dc505166a21b0b7a16ad295e75b55ba73646564c8f1531f3ea659f58868294e694479a518f8692f1eb14918fa6a62c7b1e115f81da478bf8d268e07c +DIST anydesk-6.0.0-i386.tar.gz 5116771 BLAKE2B 074907ac1976a3b9df7df0acf29663039e0b56466c417cb40b6c2d5d643fa4f207af529ee89a278f26ede330e8bc6fc3b32e9e5a451811ff2d8e6e1b2ccd9065 SHA512 09bc0b0ae0f9d2ca764e9feee81c38a9890e710908265c35c181657a13eb5d326cde52d01b7ba68132aac1784b6422df33c904b130f025967e9375332a350414 EBUILD anydesk-5.5.0-r1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147f9b7a020ee426e2ae1aa605bf786575b6efc1c86c7747e5b8e3cf9cd774001c29b4d4142e4a358c8b85806dffb41 SHA512 bf68271d34c56804b63226d80784bd1b1fb9f4bd6f3a6c25722912e472be04c1272233f64a361d7f53194c16b8df4c3e16468e72ffe7e77623989f6144b0d116 EBUILD anydesk-5.5.1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147f9b7a020ee426e2ae1aa605bf786575b6efc1c86c7747e5b8e3cf9cd774001c29b4d4142e4a358c8b85806dffb41 SHA512 bf68271d34c56804b63226d80784bd1b1fb9f4bd6f3a6c25722912e472be04c1272233f64a361d7f53194c16b8df4c3e16468e72ffe7e77623989f6144b0d116 EBUILD anydesk-5.5.4.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862 EBUILD anydesk-5.5.6.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862 +EBUILD anydesk-6.0.0.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862 MISC metadata.xml 886 BLAKE2B 9cad890e470555034e22adec55e4aa5dd047289e054e708cbe9f6338f97440913fa63618a5a362a90749c17bb0f78b712af090c013da001b2e547733f6faac89 SHA512 897b088c714bf32fa0810c94c97131b5ebb00bffba3bf1b0e846064c83f0b65c3a0d52048a74ee27ae4ad1a12f1ea758a69f49185ddfba9a5b8c285be8f32ea3 diff --git a/net-misc/anydesk/anydesk-6.0.0.ebuild b/net-misc/anydesk/anydesk-6.0.0.ebuild new file mode 100644 index 000000000000..6b1d45ed0538 --- /dev/null +++ b/net-misc/anydesk/anydesk-6.0.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit desktop eutils systemd xdg-utils + +DESCRIPTION="Feature rich multi-platform remote desktop application" +HOMEPAGE="https://anydesk.com" +SRC_URI="amd64? ( + https://download.anydesk.com/linux/${P}-amd64.tar.gz + https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz + ) + x86? ( + https://download.anydesk.com/linux/${P}-i386.tar.gz + https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz + )" + +# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash +LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" + +RDEPEND=" + dev-libs/atk + dev-libs/glib:2 + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/glu + media-libs/mesa[X(+)] + sys-auth/polkit + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/gtkglext + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libxkbfile + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst + x11-libs/pango + x11-libs/pangox-compat +" + +RESTRICT="bindist mirror" + +QA_PREBUILT="opt/${PN}/*" + +src_install() { + local dst="/opt/${PN}" + + dodir ${dst} + exeinto ${dst} + doexe ${PN} + + dodir /opt/bin + dosym ${dst}/${PN} /opt/bin/${PN} + + newinitd "${FILESDIR}"/anydesk.init anydesk + systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service + + insinto /usr/share/polkit-1/actions + doins polkit-1/com.philandro.anydesk.policy + + insinto /usr/share + doins -r icons + + domenu "${FILESDIR}"/anydesk.desktop + + keepdir /etc/${PN} + + dodoc copyright README +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "To run AnyDesk as background service use:" + elog + elog "OpenRC:" + elog "# rc-service anydesk start" + elog "# rc-update add anydesk default" + elog + elog "Systemd:" + elog "# systemctl start anydesk.service" + elog "# systemctl enable anydesk.service" + elog + elog "Please see README at /usr/share/doc/${PF}/README.bz2 for" + elog "further information about the linux version of AnyDesk." + elog + fi + + elog "For querying information about the host PC AnyDesk calls" + elog "the following commands. Feel free to install them, but it" + elog "should run without as well." + elog + optfeature "lsb_release" sys-apps/lsb-release + optfeature "lspci" sys-apps/pciutils + optfeature "lsusb" sys-apps/usbutils +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index c760b0cfa79c..2b2219bd4010 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1,5 +1,5 @@ AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc -EBUILD aria2-1.34.0-r2.ebuild 5014 BLAKE2B 11ade715c629821946b28812b7990918f0134093f3bbc374701a0ae196ca46ea569caa2d435f91250c07489603e3a222556a3eee30dc8c052aaf267802942ffd SHA512 ca8aa1ff070bb11b5d542f93e07b573eddbde3286f82101c3b2a2b65eccdb30872e66388185092fa1113bd41542e1645b213960cab5b15eeeab62f1ac9da992e +EBUILD aria2-1.34.0-r2.ebuild 5021 BLAKE2B 0ecbf5266128c9a48b44f2ca436586a88a15dcb7b631815522b936134e031a00616d9c5d798250b20652bd1b28ff7302800fc62ddf792339851e55d75d0a9930 SHA512 eb66d6bd33872e0b65f5be17819ca9c6deed57c29e07c1ff403a14afd4e35d0830fb669469122ea61fccb960745e476820bc2ff16548c302b59cd78e9196e2d6 MISC metadata.xml 1331 BLAKE2B ab520da311f770e10183a680eaf5ef9ef5ede6abdd30a4eddfadaa338a9007af6bec9ea591dd38a11b56e8b8f4416f0d422e144bf67a0959b78473dd074d7ab3 SHA512 805cb1b92b2d5f79edafd68bb42b08a494ca13e3f9ec8c215fb5252a47c596f0d60377dc350eb01598fecddffdf3ebc33e742b44a2e481ef3ad82daa026eac7d diff --git a/net-misc/aria2/aria2-1.34.0-r2.ebuild b/net-misc/aria2/aria2-1.34.0-r2.ebuild index c7f2ec04cd93..ec3bc5903b47 100644 --- a/net-misc/aria2/aria2-1.34.0-r2.ebuild +++ b/net-misc/aria2/aria2-1.34.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/" SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" LICENSE="GPL-2+-with-openssl-exception" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest index 2b7121156d61..10d008828c8d 100644 --- a/net-misc/asterisk-core-sounds/Manifest +++ b/net-misc/asterisk-core-sounds/Manifest @@ -153,6 +153,6 @@ DIST asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz 7254975 BLAKE2B fbc603d336d7ab43a DIST asterisk-core-sounds-sv-wav-1.6.1.tar.gz 15042378 BLAKE2B 5f62bfc3fdd0715a15406f281af5c17b46e918b797ac8fa7430ff4e17249513509213c3a15c2ec9d12d2258545ef0be3fb35348617ffe65806ce4bdf74146d44 SHA512 7fe05dff8082b93e5b79a4fb93c873f9c618e1baee03d000a82a98b2d305fd837e32f3bd502896df50aac6e30421d0f48ae8122c1fabbee3bffc45d8717b3b60 EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200 EBUILD asterisk-core-sounds-1.4.22.ebuild 1853 BLAKE2B bbdd6efb432a829f6c3408d5b72fe51bc2758db0800a660d98c6cda8be15af82ce6ed4026ce1d73bdc8de442e225505bf2b598d378a4c7de7822b3c12ac9208a SHA512 b798ec930025c9c5ed86a0c911da5403c57c015f1fd92dbf53e2dcd6c79e951eac4d02692b874147537a518b4d3aade0aec634c635f506bbac75876390d95194 -EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1738 BLAKE2B e118f35620dab8809b0e1dfcde76319e0c058cb9f3bdce058faf3d10b5379258fc1ead1c50c971be7874648736f1512dc0c894977af54245a0efa1e79f4ba1ad SHA512 e7fc7b8684b25b3b15f580321deb0657254c0d2b11d80bb3187350e465c7950ae756275b608b858e3449590d20184c05f01cb355492f0c1218a2a67ca2f27a19 +EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1750 BLAKE2B 506f63453a482619e5366078b4f971ccf7b85a5914a711f69ef1bae95e0c1bb67a75ff982ffbae0f70f24f4d4111fb3fbce8a48a367a316bc90327286a540266 SHA512 ffc5ec8861ff0b308ee91169c5fdfd51c9e1c212be61478d2256d5abaad3c936cc537da1236d466b0f09b19b00b9686fd7688a8029cdad9bb9377f6befb402d1 EBUILD asterisk-core-sounds-1.6.1.ebuild 1918 BLAKE2B 3fc7d2338255e46b873a530b1faa0695f141dc973067e424a32ead733892c5cb5c52ffe3e8219e85343737c3302553f5ea8a0abc7e8b7d8bdcfebda257bfcbce SHA512 ceac6189c14a623eee56c1095f01c6f038eaa1820a741c2fb2843c92dc9991864b5d01faaa0060831af7e56a49b0acd2e1c5c345338d604c4f6d65cfd7d9d702 MISC metadata.xml 958 BLAKE2B a0bb142f5343679cc734d2154054fae0a93faf3cba74dd6a0939d37b1acfd7dc0c41b1aa22bc7a45e408b7c046d31d9c29ad9d5f2869d7e6c5388c10bafb99f6 SHA512 0665a156659c7b7199f06cca2a2d9498ae1230f65e850b92b2d8efd56550671c6f1932beae53b27ddd145133dae067e0fc0dfcfd264ab251de17f2bda7e8d3bf diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild index ed79a6611dcc..afa1249c00e6 100644 --- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild +++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" S="${WORKDIR}" diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest index 694b6eb5219a..c4d7d7c22a5a 100644 --- a/net-misc/asterisk-extra-sounds/Manifest +++ b/net-misc/asterisk-extra-sounds/Manifest @@ -44,5 +44,5 @@ DIST asterisk-extra-sounds-fr-ulaw-1.5.2.tar.gz 11539559 BLAKE2B 919cacb90afe5a0 DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba DIST asterisk-extra-sounds-fr-wav-1.5.2.tar.gz 22856532 BLAKE2B 921135610f7329893f0a90e88845507a26240948dde9fb4b83db4e9133d79fbd395336ceee2504e2438f868216901eb7bae79e2c63168255bc538e2892469102 SHA512 edbf1b36b2c2083f696f52021e7719d4ac6ced29c312de77465fb3ca7d9444e09cc91fe3c6fdb45140124c44418c571f2ce1145fcff5cf88765bd0d62770e3b8 EBUILD asterisk-extra-sounds-1.4.11-r1.ebuild 1420 BLAKE2B a0c707d7bde726eebb1adaeef4130d5d20dd439675aa6ca95a96eeaf4315dae6c2ce25d88d0e9cab76fdceacc076ef3a39a62f22cf7bdb2149a09e1f387ed268 SHA512 ec0db8212930f95416ec8b9997bc7651a67fe10bc7ce4a47681b89a4f06dc900c8c857351e1724b1ac7d3a578132786f1c5e518f6d80bc94f95625ae430014b3 -EBUILD asterisk-extra-sounds-1.5.2.ebuild 1786 BLAKE2B 079a7e1bef6455869698f2bb5b0ca50b5133d1b158d4e306373f1be4a616f7e613efaae1a081ec1beb587f450d6d826fc0c79bb82429b960b9662b18a383c0b5 SHA512 7914aaba31ffc04329ebd789a0e806f31032aa754aeaf6d5cba16c78fc82ad114723f8f634cd6f59e939bf67a7588799f51df08f85bfe1845fb49e64fcee07bf +EBUILD asterisk-extra-sounds-1.5.2.ebuild 1798 BLAKE2B 8a3a744bf8e08f1d2db9e709f21c7842f40683bbeddbd5464bfbd823eb28a9edaf88ee4c6c867e296554d5f1e167c90d02eb846c1a3a231c18f643fea4294a41 SHA512 7335626ccb5408a2e547028771b0c6f8d42974ab4ca80e4f8578c7c94827249b6b20383b5316338fe4016852a23ac565e1e9c6ac967675e6ed2aa4b1f06dc2b0 MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271 diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild index f90d3165f8f1..c4e002184790 100644 --- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild +++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild @@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" BLACKLIST=("astcc-followed-by-the-pound-key") diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest index cbbee1babd3b..8a855e3dc6b4 100644 --- a/net-misc/asterisk-moh-opsound/Manifest +++ b/net-misc/asterisk-moh-opsound/Manifest @@ -7,6 +7,6 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2 DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872 -EBUILD asterisk-moh-opsound-2.03-r1.ebuild 855 BLAKE2B 1230d319edd882c732824eb2d84fee282ce538bcf3a50e7d3f0c57de4cc0ec2781acb4b60371c9757049e7a1fe42e824fbd4525267aead62f6ced5f32f1d3fdb SHA512 ecfa2a5b1f942921c7e051d0df029317832db8c8e2c9278f9ae39669f64ca39c3782e55a6aff4c098619828ee91b75e1a57f58384e08b6abeb853e2590e32eaa +EBUILD asterisk-moh-opsound-2.03-r1.ebuild 867 BLAKE2B 5b6254344cd7f637e53e49659501a94e263194f62e5e0e79107c3436a2c87c936991f324e02ccd75b885a182198db613ef269cc9147a8be56b6316ce472efb5e SHA512 6290a0a123b060b053e72a31c4337535c355999d05ead92b260f4c6fac96e36156c55a9ec0023071019530f34f655ae1f8104874e9026df68adeaffaa7d5cdf4 EBUILD asterisk-moh-opsound-2.03.ebuild 1140 BLAKE2B 7bdcca804e6f84086415dc3bbe06025b2225267bd261aefea6590fdbc048879db6f2d887862eb4f0d1fe41c573a2389fe932113dd2ba5a8c9e278e66281ca846 SHA512 feff1f6cbdb0786c81e8917a3a5a958d0ebc3d518cc98f93f8d2a2142cf745ab3b05616a15269e92fea082743e4d5f0ddd1f7b18daeb4484f1aa5c242087a7e7 MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271 diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild index d9031a7659be..11d3fb081afc 100644 --- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild +++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild @@ -17,7 +17,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )" LICENSE="CC-BY-SA-3.0" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" S="${WORKDIR}" diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 2eebb3899e8d..cd1e10dc3a18 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -1,14 +1,4 @@ -AUX 1.6.2/asterisk.logrotate3 436 BLAKE2B aa8d40c209c2a0458d831964d3300a1afbb7c3b806547b0925df48a3d40d8a22ba759840ea2b7f12a76cd2a3d54611d573c32d89f91274f83205ef5fa2a2b251 SHA512 de9893ce0b460e711cc107779afd40150398ef53f901923a7378757df2936c1bde43c39ba50924f913db81ce66550a9d2e1bb66c5712021b5f8c652d3b3740c4 AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b74657531b9484664aae2869f6dfef3ff71cf64a3fa91e90c4fdbb275a8038751fff4087129e67f63b11b81a436e459b7 SHA512 8d661424838fd9500512290785a56af4364717df87d3423ab8dc3039affd1a26fa7aae6afe2ca4fe1ce668a0172b07a96f4cc9a73eced95f25d5848f3a3f2624 -AUX 1.6.2/call_data.txt 1120 BLAKE2B 3f7808d09ec6415b196153f7504795174d6749dce11bd2e70c58d7272807c6552430d23ef469a65fc715e9b3b08a9964a3ce93812978788dbac6eed77f88532c SHA512 0bc4ab49d3a7493d1871c63234fb4c4ec6725491d350e28836f1220d1c17097974d47afcf19265348215d3076e12266688df513614f595cbae8f996cbb6fc7cb -AUX 1.6.2/find_call_ids.sh 446 BLAKE2B 1ccbbe3fe1450986d74637c5c74124b12625e4f2be4473354b05f76388ff3b074aa9e9dae44c8d146baf1f6491f3bf830a1e84d6ed5fd43388cd39a7022d1ab0 SHA512 b3998652fa93b0cb9cf2b1a495e9d02ea4a1a0c82f6fd812df8e47d58c9da89fd8537632936b43ac72165ba38c9844ba721198a823f954feb0c7ea8a7221893b -AUX 1.6.2/find_call_sip_trace.sh 530 BLAKE2B 30e80a0aa21cdd34f33777f55da192ff8b7e422893f61628541c8e088d46293190e325f9e25c98acd73e1a498b58ac15be576adc0ee7470cf0bc24f3c6052c03 SHA512 bfff2511fd2cb9fae443c58dd627c96d831e6d5412f19fc172de1621ce031bbac2851250a2886565019f3aa5484ba41358ffdb003a6be05ed40022d30d7a3c55 -AUX 1.6.2/sip_calc_auth 493 BLAKE2B 54ea1524ea489d23b5c008057478fb6ff7608477d7631cf24c3ff19863d3eaee1cdf2e8d1e14ec662ba26b8ef5b2701b7e2e333e16995e6558956fd199af3f5d SHA512 07f11ac176206c81d491be8014436058196fcb21e5cefff1aa039c23df0c002d252d381c4bf1a55f6c7ceb5a58baa50282493c8c62e4ed8f77716da2ac7a0186 -AUX 1.8.0/asterisk.confd 2082 BLAKE2B dd21c075748453bc70fffd6c7590f883d832fad2c3134adcb0071dc6b84fb2d7e66850a09e4d3423db169dfa99f568eaf7c34cdac378043f817962fb2e8f1f3e SHA512 13e849af5a7be708f81ed9c021ba788175eff06fae49a3b2795fc6e03d9d1d1a51a7ee30835acf81738c79fe461636c6bb85c8661113673fd68b3b4da1e89ce3 -AUX 1.8.0/asterisk.initd7 9261 BLAKE2B a0b3740b9d4352bff9489b74aef60847eacb1f2b390fc8873ff0b80048be32947aa516399084901dd6298d1467f7161af07f66a10f7dba1ea248d40f887c66ae SHA512 6c89c4a5260116d5e137e0bb40aeadd755d9884acb508119d0f0c9598b5325a0e987b33cefe2d83115ed5fbfad82db2352ac0378b1be51be257b38932b47c735 -AUX 1.8.0/asterisk.initd8 9784 BLAKE2B 84558128572f9c3ca3331eda48728613e23ec7d5ebe5a1ef930a1ab125f1e1f2457a13231308506612e98b6c530c7a0d007bb8b673560ee77d078de5fc341d61 SHA512 eb0f316a2fbfbc228a605118b03e213653b94ab1400e50248bd2de5ce436eab9318d486d1c46d7ee8e83c71161d6106605b38bc01d5d4b461f91962749e41ee3 -AUX 1.8.0/find_call_ids.sh 1078 BLAKE2B b480ec9f61453081735e0a1e5176a6de3e6ecc58ec8035b439bd95d64f9e1a5d02fe9810db4ba2e8d20632f186dd91d17c6cdd17a307ddd7802e8aea4638abbc SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9 -AUX 1.8.0/find_call_sip_trace.sh 1115 BLAKE2B d9f5cc559f3dd3fbbb9c50a2b6e6ad30c94521774d3774023d0fd4f51d74b8109b4c9d3eea92c7872532012cabbe892d49aa5261aa4a64b324dff5b679820851 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a AUX asterisk-13.33.0-nossl.patch 3176 BLAKE2B 1c225d3a4256e6bb69bac025adf3f21aec806cc864e55fcd1381244b68ef8a8d82d462d548a32dc9e1cec3b94f508bad09fbc3bd8602230fa79a916e6dededa5 SHA512 895e6bd770701fe25c389447f5a4454e9d5ead183c44fcc76c623f0140af1fac72ba12ad8331f7ef43ff926dbf3470646c99af93cf5f83cc70f9432ab1604e29 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8 @@ -19,13 +9,15 @@ AUX initd-13.32.0-r1 9945 BLAKE2B 26fd8ff02e63a77fbe0712b745b9270fa58ae44d1dec44 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed DIST asterisk-13.33.0.tar.gz 33683712 BLAKE2B ecfc122628c08e93fc389f111e1ee8ddcf3d27895437df9da5b83a6440c2135f9223a5605e0ef436e8585f8b023abba5b74680cac97f1700e1bc153872c1ed87 SHA512 b866a63cce7c289d32333b4b3b0a605c413b48fc7518976aa0768dd5c68894348d0de1c9bc7c56b73eb86b69e0fd9847d7226fa0f9e449f8ebb8a7118329db56 DIST asterisk-13.34.0.tar.gz 33686020 BLAKE2B 48de77f2e29028ab3503ea30038e629b6ede43154bec8efe1384a7077fb971f91b85d9b4eb55f7a4ea6577a31ad5fe496453fe59cd607a0c613e46edef9a11d9 SHA512 2132db831bb063330c47cea8cea67af706839d25e64eee558475643cb79a4e548fc6ffe7ce61a053f41cf6f367320eedaa87973a5de4ef38ae858a6e5a183ee7 -DIST asterisk-16.10.0.tar.gz 27706766 BLAKE2B b8d7866fe3e8420ef5ce6ea5e016316f63e4f2e8904a79de69c4ddfb7aedcd00f09cfb414da43938af0771cdde387dcebfe716eb34e5ed1de3a30ff534459c7f SHA512 254c582593cf6ec691649d995a8d73260d2e340ad6ae65f0af62f6b8c3ef59c4da6ad9172bc04cc29a907d1e8d2ef105ae2ae20190b30115d5d402423c8c08cb +DIST asterisk-13.35.0.tar.gz 33685340 BLAKE2B 728281257541977ac150b1b7d6148fd326c584f7827af46882ff3e3af111d876c3e53f92f1034c55875d730e5b92c379b8906198393b7a4227a5bb74818ab27c SHA512 7596f387d45ef9f0327d78bc0446979e233aba517bbedfb539409cc507e2dac15e3b32d5c8a5e69783d106d4244661cb20b0580ed00904699bc5bf5db7b4713a DIST asterisk-16.11.1.tar.gz 27703143 BLAKE2B ad2c70f76e5d59e183713034c9bbe0988c5848512099230b58b8b2f32edd59c0e843e4d7bc72642e84e842e11639f02213057cc893532808e9fe075b061e35cc SHA512 ff4d971c32a568d4e49d0bc49f15a4a89278e4a1c70ed7d1107e3f4cca13455326465ecc97d23e83501ad45f579b572efbf9217758edfb4531c87d59879b31f9 +DIST asterisk-16.12.0.tar.gz 27727347 BLAKE2B 3e2e986136e5ff19a876f01fdc6db1b6c22f83bf38f8524a418e474e2400375d8091dd215fb54f5b01f998cecf46d6965a0c35a44dc6f3be7f7a811e2ce70b8c SHA512 1fc41b92d070efd4a7ea5db1a36c83bdb6dbbe7d9b5087b0a887ba3d6875e81ba1b71a79b216138b242f0349a176baf6745480ff6fb7ed47c62dda4b09b6a891 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1 -EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8 -EBUILD asterisk-13.33.0.ebuild 9211 BLAKE2B 0a41b74f03a243fd9dd6c53a5951ab0beecf77d81dd0fab6ff0aa4e9b3327b51c7f560b6f1eeba41773e4a82d5a239907f4ec4585bd9ff4044a87d39284eff0b SHA512 c8f6edef42e708dfe7b48a2f5d954a646f9c406909a14afaf31eaaec9deb9d4533dba625cbe5bfef63bf38c97a0a776bcfd21d2fe7a1d6fad07eff98efc1f401 -EBUILD asterisk-13.34.0.ebuild 9189 BLAKE2B f1372442376f1900d71f676b6182dee9fa68fa3256903b330871df58e108e7e20e2645ea9be95b2d4ded0eeb8b19f5d51b9a673067cb347b7b034bb262d4b810 SHA512 8d3de22d07decb6b2805af27314651334d9319761f6c88ee88ceebc129a81b9cc1b4f39d977b3b7c07e9c9703a7c6db7ce7babe3931d144f5d1549fd59eedbea -EBUILD asterisk-16.10.0.ebuild 9351 BLAKE2B 7d990e43401afd8449dad175238d13d4a70fc11e791ae233f3db8030cd3be4778d4f3b52aa6a1ced43c7f203bfeb249b3f0ac019a038af0a45f2713fcc150897 SHA512 782c463069a5764b101dc909117f8016f9d524871911f4b7efc1875185eb996dfe93aa39645b38d2f3baabf7213df67287dc34c7045fa97602f355ca0441cf5d -EBUILD asterisk-16.11.1.ebuild 9351 BLAKE2B 7d990e43401afd8449dad175238d13d4a70fc11e791ae233f3db8030cd3be4778d4f3b52aa6a1ced43c7f203bfeb249b3f0ac019a038af0a45f2713fcc150897 SHA512 782c463069a5764b101dc909117f8016f9d524871911f4b7efc1875185eb996dfe93aa39645b38d2f3baabf7213df67287dc34c7045fa97602f355ca0441cf5d -MISC metadata.xml 1391 BLAKE2B dfa59edbb0e1e073171b7b335bec7c8188af06e97a88674c4a4f516fc42e4754044c8430af549865ff6bb18eb1dc969dbfa3b3868cc7b8964150581d200d946c SHA512 1dce9bbe1879a7a93ec9ca99a618722753251625626f15fcf9efbf9aa781f93084ea0f68857eeeb41664d82bdb2922ce75649c8627dbd9b46e42a7e825e3b3b2 +EBUILD asterisk-11.25.3-r1.ebuild 9217 BLAKE2B eb0e7a050246a399a16460392602bc1e24b1c24ccdfa498eff96e4b385783d091422aa68260460ef11643084191b47f377841d8bb878558f7ac2fa31b4545dcf SHA512 5f53ad786fee2e7e14d144dce3f59ba11e39645469fe056b505b784f6f8eea1be274fd5eb9a63bbd66ae9c1c3e014b5cc2f7c38cc939884b9346e2aba5212432 +EBUILD asterisk-13.33.0.ebuild 9138 BLAKE2B 97ef7fed6dc2e1c302215b1e4e48c96816c244b80711c290080c741ff67851e2566fe3c26d106d2cb07d53f67d1d3f39a3f58711850445bfa19bf9a88cbe3fc3 SHA512 1f522c0116f43ff52867047c11df7d76f7b614781cc333bec1165d2e8fb077dfa13d7e72c366cbe95abc3f2e2d5b72671854ff3baa7efc58d4b102393fc9db55 +EBUILD asterisk-13.34.0.ebuild 9114 BLAKE2B dff3812c7fdfce38e14426d4fcb04ac1829303be1ef1caac40ac98c1ecbe6fe5f3cef33847047f16a5af163e26c9a669a2960f2d145f80f1bfa13800e93b600c SHA512 b144e6b3820628dd2ae44c69e18056967cd96e8a7ed9cf397cbe31cf8587233cb82c9b3f4ffbaa2086cdfa1a1e5cb987f36f940be759ae424e5ac0455147ec5e +EBUILD asterisk-13.35.0.ebuild 9099 BLAKE2B ab7c025a242ee6e260de71083df4460264697788879b9c600488d5e22946aaaf4c680073b6814a7320249a4f66930291010b8b0873a769a7ec97d54fde43c7bc SHA512 09f0c631a3703594664959660e78f8ffe74d72d495c3e78e605feba17889f9b1ca0b01e5c7ad40e0495a6ae5bb92090fe53f5852f0c016787c074a05422bcc78 +EBUILD asterisk-16.11.1.ebuild 9278 BLAKE2B d1e9340f0ca063e9046029c8cb983d7086f4c9e3a6985bab46fd2f6921005733829fbd3e17c22206557c0d33f29c9d358a30569e69d2e421265b2846765666c6 SHA512 1d871f6d84d65b324d9285973052aa81860e9a2492bae5f1bba2fa36f4c258c1455eaafef355f96934a39ce9bdc2d62717691e8f6a886c0940f649e9642fcf31 +EBUILD asterisk-16.12.0.ebuild 9276 BLAKE2B 4e255b30bf55f0104a3a92262b319459e0633f206558f5f195b78bb5dc1b8edbc78b7d292362cab7ac623d677eb33ae2e7cce8b5fe8c154a94603acad3f05285 SHA512 8aa84ddd97cee7aa9f164c1e158820754d008734660af68164130fc5a4d3309a80bfb0bb0d9b186e546b3d60480d0d4149276cbba80002b748ba8ec51cbd2a2f +MISC metadata.xml 1301 BLAKE2B 0989c94d86393562384681c19a2809dc6ebedfcdd592543b606206a8bd7829a4ca6768cb74082f74e75635c72804dda9154df3a4d61dcdbcc43eda93aa881322 SHA512 009e4dba6f55b8ff08940aab4722df6b76a055add43c7634a49dbc0fb68fe11e6c102a7a27ac84a253a2853b0d719f3a73bb40c86c2d2faa186b707e773987e3 diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild index dccee3d36f7d..fa44fb9d427c 100644 --- a/net-misc/asterisk/asterisk-11.25.3.ebuild +++ b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils linux-info multilib user systemd +inherit autotools linux-info systemd MY_P="${PN}-${PV/_/-}" DESCRIPTION="Asterisk: A Modular Open Source PBX System" HOMEPAGE="http://www.asterisk.org/" SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz - mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2" + mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" @@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=" voicemail_storage_odbc voicemail_storage_imap " -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) @@ -29,18 +29,22 @@ REQUIRED_USE="gtalk? ( xmpp ) EPATCH_SUFFIX="patch" PATCHES=( "${WORKDIR}/asterisk-patchset" ) -CDEPEND="dev-db/sqlite:3 +CDEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 - !libressl? ( dev-libs/openssl:0= ) + !libressl? ( =dev-libs/openssl-1.0*:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/ncurses:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) - calendar? ( net-libs/neon - dev-libs/libical - dev-libs/iksemel ) + calendar? ( + dev-libs/iksemel + dev-libs/libical + net-libs/neon + ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) @@ -58,7 +62,6 @@ CDEPEND="dev-db/sqlite:3 mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) @@ -91,10 +94,6 @@ pkg_setup() { have reported that this module dropped critical SIP packets in their deployments. You may want to disable it if you see such problems." check_extra_config - - enewgroup asterisk - enewgroup dialout 20 - enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout" } src_prepare() { @@ -181,7 +180,6 @@ src_configure() { use_select lua pbx_lua use_select mysql app_mysql cdr_mysql res_config_mysql use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - use_select osplookup app_osplookup use_select oss chan_oss use_select postgres {cdr,cel}_pgsql res_config_pgsql use_select radius {cdr,cel}_radius @@ -246,8 +244,8 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk - newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk + newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk + newconfd "${FILESDIR}"/confd-13.32.0 asterisk systemd_dounit "${FILESDIR}"/asterisk.service systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf @@ -265,13 +263,6 @@ src_install() { dodoc doc/*.pdf fi - # install SIP scripts; bug #300832 - # - dodoc "${FILESDIR}/1.6.2/sip_calc_auth" - dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh" - dodoc "${FILESDIR}/1.8.0/find_call_ids.sh" - dodoc "${FILESDIR}/1.6.2/call_data.txt" - # install logrotate snippet; bug #329281 # insinto /etc/logrotate.d diff --git a/net-misc/asterisk/asterisk-13.33.0.ebuild b/net-misc/asterisk/asterisk-13.33.0.ebuild index 1e709bfbd068..88b0e7f31aa0 100644 --- a/net-misc/asterisk/asterisk-13.33.0.ebuild +++ b/net-misc/asterisk/asterisk-13.33.0.ebuild @@ -11,14 +11,14 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE_VOICEMAIL_STORAGE=" +voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap " -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) @@ -64,7 +64,6 @@ DEPEND="acct-user/asterisk mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - osplookup? ( net-libs/osptoolkit ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) @@ -195,7 +194,6 @@ src_configure() { use_select lua pbx_lua use_select mysql app_mysql cdr_mysql res_config_mysql use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - use_select osplookup app_osplookup use_select oss chan_oss use_select postgres {cdr,cel}_pgsql res_config_pgsql use_select radius {cdr,cel}_radius diff --git a/net-misc/asterisk/asterisk-13.34.0.ebuild b/net-misc/asterisk/asterisk-13.34.0.ebuild index 0697a07c910d..35bff47da138 100644 --- a/net-misc/asterisk/asterisk-13.34.0.ebuild +++ b/net-misc/asterisk/asterisk-13.34.0.ebuild @@ -11,14 +11,14 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE_VOICEMAIL_STORAGE=" +voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap " -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) @@ -64,7 +64,6 @@ DEPEND="acct-user/asterisk mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - osplookup? ( net-libs/osptoolkit ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) @@ -195,7 +194,6 @@ src_configure() { use_select lua pbx_lua use_select mysql app_mysql cdr_mysql res_config_mysql use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - use_select osplookup app_osplookup use_select oss chan_oss use_select postgres {cdr,cel}_pgsql res_config_pgsql use_select radius {cdr,cel}_radius diff --git a/net-misc/asterisk/asterisk-13.35.0.ebuild b/net-misc/asterisk/asterisk-13.35.0.ebuild new file mode 100644 index 000000000000..1f33018e9fc4 --- /dev/null +++ b/net-misc/asterisk/asterisk-13.35.0.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info systemd + +DESCRIPTION="Asterisk: A Modular Open Source PBX System" +HOMEPAGE="https://www.asterisk.org/" +SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz + https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +IUSE_VOICEMAIL_STORAGE=" + +voicemail_storage_file + voicemail_storage_odbc + voicemail_storage_imap +" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp" +IUSE_EXPAND="VOICEMAIL_STORAGE" +REQUIRED_USE="gtalk? ( xmpp ) + ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) + voicemail_storage_odbc? ( odbc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-historic-no-var-run-install.patch" +) + +DEPEND="acct-user/asterisk + acct-group/asterisk + dev-db/sqlite:3 + dev-libs/popt + dev-libs/jansson + dev-libs/libedit + dev-libs/libxml2:2 + dev-libs/libxslt + sys-libs/ncurses:0= + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + bluetooth? ( net-wireless/bluez:= ) + calendar? ( + net-libs/neon:= + dev-libs/libical:= + dev-libs/iksemel + ) + caps? ( sys-libs/libcap ) + cluster? ( sys-cluster/corosync ) + curl? ( net-misc/curl ) + dahdi? ( + net-libs/libpri + net-misc/dahdi-tools + ) + freetds? ( dev-db/freetds ) + gtalk? ( dev-libs/iksemel ) + http? ( dev-libs/gmime:2.6 ) + iconv? ( virtual/libiconv ) + ilbc? ( media-libs/libilbc ) + ldap? ( net-nds/openldap ) + lua? ( dev-lang/lua:* ) + mysql? ( dev-db/mysql-connector-c:= ) + newt? ( dev-libs/newt ) + odbc? ( dev-db/unixODBC ) + pjproject? ( net-libs/pjproject ) + portaudio? ( media-libs/portaudio ) + postgres? ( dev-db/postgresql:* ) + radius? ( net-dialup/freeradius-client ) + snmp? ( net-analyzer/net-snmp:= ) + span? ( media-libs/spandsp ) + speex? ( + media-libs/speex + media-libs/speexdsp + ) + srtp? ( net-libs/libsrtp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + vorbis? ( media-libs/libvorbis ) + voicemail_storage_imap? ( virtual/imap-c-client ) + xmpp? ( dev-libs/iksemel ) +" + +RDEPEND="${DEPEND} + net-misc/asterisk-core-sounds + net-misc/asterisk-extra-sounds + net-misc/asterisk-moh-opsound + selinux? ( sec-policy/selinux-asterisk ) + syslog? ( virtual/logger )" + +BDEPEND="virtual/pkgconfig" + +QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" + +pkg_setup() { + CONFIG_CHECK="~!NF_CONNTRACK_SIP" + local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users + have reported that this module dropped critical SIP packets in their deployments. You + may want to disable it if you see such problems." + check_extra_config +} + +src_prepare() { + default + AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf +} + +src_configure() { + local vmst + + econf \ + --libdir="/usr/$(get_libdir)" \ + --localstatedir="/var" \ + --with-crypto \ + --with-gsm=internal \ + --with-popt \ + --with-z \ + --with-libedit \ + $(use_with caps cap) \ + $(use_with http gmime) \ + $(use_with newt) \ + $(use_with pjproject) \ + $(use_with portaudio) \ + $(use_with ssl) + + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(usex "$1" enable disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + + # Blank out sounds/sounds.xml file to prevent + # asterisk from installing sounds files (we pull them in via + # asterisk-{core,extra}-sounds and asterisk-moh-opsound. + >"${S}"/sounds/sounds.xml + + # That NATIVE_ARCH chatter really is quite bothersome + sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system" + + # Compile menuselect binary for optional components + emake NOISE_BUILD=yes menuselect.makeopts + + # Disable BUILD_NATIVE (bug #667498) + _menuselect --disable build_native menuselect.makeopts + + # Broken functionality is forcibly disabled (bug #360143) + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts + + # Utility set is forcibly enabled (bug #358001) + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts + + # this is connected, otherwise it would not find + # ast_pktccops_gate_alloc symbol + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts + + # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts + + # SQlite3 is now the main database backend, enable related features + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts + + # The others are based on USE-flag settings + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp + + # Voicemail storage ... + for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do + if use ${vmst}; then + _menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts + fi + done + + if use debug; then + for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do + _menuselect --enable $o menuselect.makeopts + done + fi +} + +src_compile() { + emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes +} + +src_install() { + local d + + mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die + emake DESTDIR="${ED}" NOISY_BUILD=yes install + + if use radius; then + insinto /etc/radiusclient/ + doins contrib/dictionary.digium + fi + diropts -m 0750 -o root -g asterisk + keepdir /etc/asterisk + emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs + for conffile in "${ED}/etc/asterisk/"* + do + fowners root:root "${conffile#${ED}}" + fperms 0644 "${conffile#${ED}}" + done + + # keep directories + diropts -m 0750 -o asterisk -g root + keepdir /var/lib/asterisk + keepdir /var/spool/asterisk + keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording} + diropts -m 0750 -o asterisk -g asterisk + keepdir /var/log/asterisk/{cdr-csv,cdr-custom} + + newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk + newconfd "${FILESDIR}"/confd-13.32.0 asterisk + + systemd_dounit "${FILESDIR}"/asterisk.service + systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf + systemd_install_serviced "${FILESDIR}"/asterisk.service.conf + + # Reset diropts else dodoc uses it for doc installations. + diropts -m0755 + + # install the upgrade documentation + dodoc UPGRADE* BUGS CREDITS + + # install extra documentation + if use doc; then + dodoc doc/*.txt + dodoc doc/*.pdf + fi + + # install logrotate snippet; bug #329281 + # + insinto /etc/logrotate.d + newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk + + # Asterisk installs a few folders that's empty by design, + # but still required. This finds them, and marks them for + # portage. + for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do + keepdir "${d#${ED}}" + done +} + +pkg_postinst() { + if [ -z "${REPLACING_VERSIONS}" ]; then + elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then + elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:" + elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)" + elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net" + fi +} diff --git a/net-misc/asterisk/asterisk-16.11.1.ebuild b/net-misc/asterisk/asterisk-16.11.1.ebuild index 7ee0fe2eb037..b971778f05c4 100644 --- a/net-misc/asterisk/asterisk-16.11.1.ebuild +++ b/net-misc/asterisk/asterisk-16.11.1.ebuild @@ -11,14 +11,14 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE_VOICEMAIL_STORAGE=" +voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap " -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) @@ -65,7 +65,6 @@ DEPEND="acct-user/asterisk mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - osplookup? ( net-libs/osptoolkit ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) @@ -200,7 +199,6 @@ src_configure() { use_select lua pbx_lua use_select mysql app_mysql cdr_mysql res_config_mysql use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - use_select osplookup app_osplookup use_select oss chan_oss use_select postgres {cdr,cel}_pgsql res_config_pgsql use_select radius {cdr,cel}_radius diff --git a/net-misc/asterisk/asterisk-16.10.0.ebuild b/net-misc/asterisk/asterisk-16.12.0.ebuild index 7ee0fe2eb037..e7b031043036 100644 --- a/net-misc/asterisk/asterisk-16.10.0.ebuild +++ b/net-misc/asterisk/asterisk-16.12.0.ebuild @@ -11,14 +11,14 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE_VOICEMAIL_STORAGE=" +voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap " -IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" +IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp" IUSE_EXPAND="VOICEMAIL_STORAGE" REQUIRED_USE="gtalk? ( xmpp ) ^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} ) @@ -27,7 +27,6 @@ REQUIRED_USE="gtalk? ( xmpp ) PATCHES=( "${FILESDIR}/${PN}-historic-no-var-run-install.patch" - "${FILESDIR}/${PN}-13.33.0-nossl.patch" ) DEPEND="acct-user/asterisk @@ -65,7 +64,6 @@ DEPEND="acct-user/asterisk mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) - osplookup? ( net-libs/osptoolkit ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) @@ -111,10 +109,6 @@ src_prepare() { AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf } -function menuselect() { - menuselect/menuselect "$@" || die "menuselect $* failed." -} - src_configure() { local vmst @@ -136,6 +130,20 @@ src_configure() { $(use_with ssl) \ $(use_with unbound) + _menuselect() { + menuselect/menuselect "$@" || die "menuselect $* failed." + } + + _use_select() { + local state=$(use "$1" && echo enable || echo disable) + shift # remove use from parameters + + while [[ -n $1 ]]; do + _menuselect --${state} "$1" menuselect.makeopts + shift + done + } + # Blank out sounds/sounds.xml file to prevent # asterisk from installing sounds files (we pull them in via # asterisk-{core,extra}-sounds and asterisk-moh-opsound. @@ -148,81 +156,70 @@ src_configure() { emake NOISY_BUILD=yes menuselect.makeopts # Disable BUILD_NATIVE (bug #667498) - menuselect --disable build_native menuselect.makeopts + _menuselect --disable build_native menuselect.makeopts # Broken functionality is forcibly disabled (bug #360143) - menuselect --disable chan_misdn menuselect.makeopts - menuselect --disable chan_ooh323 menuselect.makeopts + _menuselect --disable chan_misdn menuselect.makeopts + _menuselect --disable chan_ooh323 menuselect.makeopts # Utility set is forcibly enabled (bug #358001) - menuselect --enable smsq menuselect.makeopts - menuselect --enable streamplayer menuselect.makeopts - menuselect --enable aelparse menuselect.makeopts - menuselect --enable astman menuselect.makeopts + _menuselect --enable smsq menuselect.makeopts + _menuselect --enable streamplayer menuselect.makeopts + _menuselect --enable aelparse menuselect.makeopts + _menuselect --enable astman menuselect.makeopts # this is connected, otherwise it would not find # ast_pktccops_gate_alloc symbol - menuselect --enable chan_mgcp menuselect.makeopts - menuselect --enable res_pktccops menuselect.makeopts + _menuselect --enable chan_mgcp menuselect.makeopts + _menuselect --enable res_pktccops menuselect.makeopts # SSL is forcibly enabled, IAX2 & DUNDI are expected to be available - menuselect --enable pbx_dundi menuselect.makeopts - menuselect --enable func_aes menuselect.makeopts - menuselect --enable chan_iax2 menuselect.makeopts + _menuselect --enable pbx_dundi menuselect.makeopts + _menuselect --enable func_aes menuselect.makeopts + _menuselect --enable chan_iax2 menuselect.makeopts # SQlite3 is now the main database backend, enable related features - menuselect --enable cdr_sqlite3_custom menuselect.makeopts - menuselect --enable cel_sqlite3_custom menuselect.makeopts + _menuselect --enable cdr_sqlite3_custom menuselect.makeopts + _menuselect --enable cel_sqlite3_custom menuselect.makeopts # The others are based on USE-flag settings - use_select() { - local state=$(use "$1" && echo enable || echo disable) - shift # remove use from parameters - - while [[ -n $1 ]]; do - menuselect --${state} "$1" menuselect.makeopts - shift - done - } - - use_select alsa chan_alsa - use_select bluetooth chan_mobile - use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} - use_select cluster res_corosync - use_select curl func_curl res_config_curl res_curl - use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi - use_select freetds {cdr,cel}_tds - use_select gtalk chan_motif - use_select http res_http_post - use_select iconv func_iconv - use_select ilbc codec_ilbc format_ilbc - use_select ldap res_config_ldap - use_select lua pbx_lua - use_select mysql app_mysql cdr_mysql res_config_mysql - use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc - use_select osplookup app_osplookup - use_select oss chan_oss - use_select postgres {cdr,cel}_pgsql res_config_pgsql - use_select radius {cdr,cel}_radius - use_select snmp res_snmp - use_select span res_fax_spandsp - use_select speex {codec,func}_speex - use_select srtp res_srtp - use_select statsd res_statsd res_{endpoint,chan}_stats - use_select syslog cdr_syslog - use_select vorbis format_ogg_vorbis - use_select xmpp res_xmpp + _use_select alsa chan_alsa + _use_select bluetooth chan_mobile + _use_select calendar res_calendar res_calendar_{caldav,ews,exchange,icalendar} + _use_select cluster res_corosync + _use_select curl func_curl res_config_curl res_curl + _use_select dahdi app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi + _use_select freetds {cdr,cel}_tds + _use_select gtalk chan_motif + _use_select http res_http_post + _use_select iconv func_iconv + _use_select ilbc codec_ilbc format_ilbc + _use_select ldap res_config_ldap + _use_select lua pbx_lua + _use_select mysql app_mysql cdr_mysql res_config_mysql + _use_select odbc cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc + _use_select oss chan_oss + _use_select postgres {cdr,cel}_pgsql res_config_pgsql + _use_select radius {cdr,cel}_radius + _use_select snmp res_snmp + _use_select span res_fax_spandsp + _use_select speex {codec,func}_speex + _use_select srtp res_srtp + _use_select statsd res_statsd res_{endpoint,chan}_stats + _use_select syslog cdr_syslog + _use_select vorbis format_ogg_vorbis + _use_select xmpp res_xmpp # Voicemail storage ... for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do if use ${vmst}; then - menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts + _menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts fi done if use debug; then for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do - menuselect --enable "${o}" menuselect.makeopts + _menuselect --enable "${o}" menuselect.makeopts done fi } diff --git a/net-misc/asterisk/files/1.6.2/asterisk.logrotate3 b/net-misc/asterisk/files/1.6.2/asterisk.logrotate3 deleted file mode 100644 index 69296c99e66d..000000000000 --- a/net-misc/asterisk/files/1.6.2/asterisk.logrotate3 +++ /dev/null @@ -1,25 +0,0 @@ -/var/log/asterisk/messages /var/log/asterisk/queue_log { - missingok - notifempty - - postrotate - /usr/sbin/asterisk -rnx "logger reload" || /bin/true - endscript -} - -/var/log/asterisk/debug /var/log/asterisk/full { - missingok - notifempty - daily - - postrotate - /usr/sbin/asterisk -rnx "logger reload" || /bin/true - endscript -} - -/var/log/asterisk/cdr-csv/*.csv /var/log/asterisk/cdr-custom/*.csv { - missingok - notifempty - weekly - rotate 52 -} diff --git a/net-misc/asterisk/files/1.6.2/call_data.txt b/net-misc/asterisk/files/1.6.2/call_data.txt deleted file mode 100644 index ba9cbbba98b5..000000000000 --- a/net-misc/asterisk/files/1.6.2/call_data.txt +++ /dev/null @@ -1,32 +0,0 @@ -It's sometimes useful to look at SIP conversations in retrospect. If you have -a troublesome system, enable sip debug (in the CLI: sip set debug on), set up -logger.conf to log it to some file and then you can use the two scripts here to -extract the SIP converssations as seen by asterisk. - -find_call_ids.sh: - -This script will locate Call-ID values given an A and B number. Just invoke it with: - -find_call_ids.sh /path/to/log A-num B-num - -eg: - -find_call_ids.sh /var/log/asterisk/debug 102 105 - -To find the Call-IDs for calls going from ext 102 to ext 105 (depends on your -exact setup and the actual values being passed in the SIP INVITE packets) - -find_call_sip_trace.sh - -This script will extract a SIP conversation from the log for one or more -Call-ID values. Invoke with: - -find_call_sip_trace.sh /path/to/log Call-ID [...] - -Eg: - -find_call_sip_trace.sh /var/log/asterisk/debug 12341665haf434qgrq3@192.168.0.5 123123@192.168.0.3 - -This will find the SIP packets for those two conversations from the log -(interleaving the packets in the order asterisk output them - useful for -analysing the two SIP legs of the same call). diff --git a/net-misc/asterisk/files/1.6.2/find_call_ids.sh b/net-misc/asterisk/files/1.6.2/find_call_ids.sh deleted file mode 100644 index c4689bd1579d..000000000000 --- a/net-misc/asterisk/files/1.6.2/find_call_ids.sh +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/bash - -logfile=$1 -anum=$2 -bnum=$3 - -function usage() -{ - echo "USAGE: $1 logfile anum bnum" - exit -1 -} - -[ -r "${logfile}" ] || usage $0 -[ -n "${anum}" ] || usage $0 -[ -n "${bnum}" ] || usage $0 - -grep -B2 -P '^INVITE sip:'"${bnum}"'@.*\n(([^F].*|F[^r].*|Fr[^o].*|Fro[^m].*|From[^:]|From:.*<sip:'"${anum}"'@.*>.*)\r\n)+\r\n' "${logfile}" | awk '$4 ~ "^VERBOSE" { dt=$1" "$2" "$3 } $1=="Call-ID:" { if (cid != $2) { cid=$2; print dt" "cid; }}' diff --git a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh b/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh deleted file mode 100644 index 5b2e69e517b4..000000000000 --- a/net-misc/asterisk/files/1.6.2/find_call_sip_trace.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/bash - -logfile=$1 -callid=$2 - -function usage() -{ - echo "USAGE: $1 logfile Call-ID [Call-ID ...]" - exit -1 -} - -[ -r "${logfile}" ] || usage $0 -[ -n "${callid}" ] || usage $0 - -shift; shift; -while [ $# -gt 0 ]; do - callid="${callid}|$1" - shift -done - -dos2unix < "${logfile}" | grep -P '^.*\n<--- (SIP read|(Reliably )?(Ret|T)ransmitting) .*\n([^<\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^<\n].*)\n)*<-+>$|^.* chan_sip.c: (Reliably )?(Ret|T)ransmitting .*\n([^-\n].*\n)*Call-ID: ('"${callid//./\\.}"')\n((|[^-\n].*)\n)*---$' diff --git a/net-misc/asterisk/files/1.6.2/sip_calc_auth b/net-misc/asterisk/files/1.6.2/sip_calc_auth deleted file mode 100644 index 3f050ada5738..000000000000 --- a/net-misc/asterisk/files/1.6.2/sip_calc_auth +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/bash - -[ $# -lt 7 ] && echo "USAGE: $0 username realm password method uri algorithm nonce" && exit 1 - -un=$1 -realm=$2 -pw=$3 -method=$4 -uri=$5 -alg=$6 -nonce=$7 - -echo "Using $un@$realm (secret $pw) for method $method to $uri with nonce $nonce (alg=$alg)" - -a1=$un:$realm:$pw -a2=$method:$uri -ha1=$(echo -n "$a1" | openssl $alg) -ha2=$(echo -n "$a2" | openssl $alg) -resp=$(echo -n "$ha1:$nonce:$ha2" | openssl $alg) - -echo "a1=$a1" -echo "a2=$a2" -echo "ha1=$ha1" -echo "ha2=$ha2" -echo "resp=$resp" diff --git a/net-misc/asterisk/files/1.8.0/asterisk.confd b/net-misc/asterisk/files/1.8.0/asterisk.confd deleted file mode 100644 index f826d46f245c..000000000000 --- a/net-misc/asterisk/files/1.8.0/asterisk.confd +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# -# Additional options for asterisk -# -# see "asterisk -h" for a list of options -# -ASTERISK_OPTS="" - -# -# User and group to run asterisk as -# -# Value: double-colon separated list of user and group, or empty to run as root: -# -# -# "asterisk:asterisk" to run as user "asterisk" and group "asterisk" -# -# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of -# -# ":asterisk" to run as user "root" and group "asterisk" -# -# "" to run as user "root" and group "root" -# -ASTERISK_USER="asterisk" - -# -# Nicelevel -# -# Set the priority of the asterisk process -# -# Value: (highest) -20..19 (lowest) -# -#ASTERISK_NICE="19" - -# Send crash notifications emails to this address -# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp)) -# -# Value: Email address or empty to disable -# -#ASTERISK_NOTIFY_EMAIL="root" - -# -# Send asterisk's output to this terminal -# -# Value: Full path to device node or a number -# -#ASTERISK_TTY="/dev/tty9" - -# -# Start an asterisk console on the terminal specified by ASTERISK_TTY -# -# Warning! Use only for debugging, this is a potential security issue! -# -# Value: yes or no/empty -# -ASTERISK_CONSOLE="no" - -# -# Maximum size of core files. -# -# Value: Size in bytes, unlimited for no limit or empty to disable. -# -ASTERISK_CORE_SIZE="unlimited" - -# -# ASTERISK_CORE_DIR -# -# Value: Directory (will be created if non-existant), default is /tmp -# -ASTERISK_CORE_DIR="/var/lib/asterisk/coredump" - -# -# Max number of filedescriptors -# -# Value: Number of descriptors -# -ASTERISK_MAX_FD="4096" - -# -# Delay time before restarting asterisk after a crash. -# -# Value: Number of seconds to sleep after a crash before restarting. -# -ASTERISK_RESTART_DELAY=5 - -# -# Kill these tasks after asterisk crashed -# -# Warning! This will kill _ALL_ tasks with the specified names! -# -# Value: Space separated list of names in double quotes (e.g. "mpg123 mad") -# -#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad" diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd7 b/net-misc/asterisk/files/1.8.0/asterisk.initd7 deleted file mode 100644 index 0897919caac5..000000000000 --- a/net-misc/asterisk/files/1.8.0/asterisk.initd7 +++ /dev/null @@ -1,346 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="forcestop reload" - -depend() { - need net - use nscd dns dahdi mysql postgresql slapd capi -} - -is_running() { - [ -r "${ast_rundir}/asterisk.pid" ] || return 1 - PID="$(cat "${ast_rundir}/asterisk.pid")" - [ -d "/proc/${PID}" ] || return 1 - EXE="$(readlink -f /proc/${PID}/exe)" - EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one. - [ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process. - - # PID reported in pidfile is active, and is still an asterisk instance. - return 0 -} - -# Sets up a few variables for us for use -# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo. -# ast_rundir: directory to be used as run folder (pid and ctl files). -# ast_spooldir: -setup_svc_variables() -{ - local t - - ast_instancename=asterisk - ast_rundir=/var/run/${RC_SVCNAME} - ast_logdir=/var/log/${RC_SVCNAME} - ast_spooldir=/var/spool/${RC_SVCNAME} - ast_confdir=/etc/${RC_SVCNAME/.//} - - if [ "${RC_SVCNAME}" != "asterisk" ]; then - t="${RC_SVCNAME#asterisk.}" - if [ "${RC_SVCNAME}" = "${t}" ]; then - eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name." - return 1 - fi - ast_instancename+="(${t})" - fi - - [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" - [ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}" - [ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}" - [ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}" - - return 0 -} - -asterisk_run_loop() { - local result=0 signal=0 - - echo "Initializing ${ast_instancename} wrapper" - OPTS="$*" - - trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT - touch "${ast_rundir}/wrapper_loop.running" - - while [ -r "${ast_rundir}/wrapper_loop.running" ]; do - if [ -n "${TTY}" ]; then - /usr/bin/stty -F "${TTY}" sane - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}" - result=$? - else - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null - result=$? - fi - - if [ "$result" -eq 0 ]; then - echo "Asterisk terminated normally" - break - else - if [ "$result" -gt 128 ]; then - signal="$(expr "$result" - 128)" - MSG="Asterisk terminated with Signal: $signal" - - CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")" - - local CORE_DUMPED=0 - if [ -f "${ASTERISK_CORE_DIR}/core" ]; then - mv "${ASTERISK_CORE_DIR}/core" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then - mv "${ASTERISK_CORE_DIR}/core.${PID}" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - fi - - [ $CORE_DUMPED -eq 1 ] && \ - MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}" - else - MSG="Asterisk terminated with return code: $result" - fi - - # kill left-over tasks - for X in ${ASTERISK_CLEANUP_ON_CRASH}; do - kill -9 "$(pidof "${X}")"; - done - fi - - [ -n "${TTY}" ] \ - && echo "${MSG}" >"${TTY}" \ - || echo "${MSG}" - - - if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \ - [ -x /usr/sbin/sendmail ]; then - echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ - /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}" - fi - sleep "${ASTERISK_RESTART_DELAY}" - echo "Restarting Asterisk..." - done - - echo "Terminating wrapper loop." - return 0 -} - -start() { - local OPTS USER GROUP PID - local tmp x - - local OPTS ARGS - - setup_svc_variables || return $? - - ebegin "Starting ${ast_instancename} PBX" - - eindent - - # filter (redundant) arguments - OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")" - - # default options - OPTS="${OPTS} -f" # don't fork / detach breaks wrapper script... - - # mangle yes/no options - ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')" - ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')" - - ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')" - [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5 - - if [ -n "${ASTERISK_CORE_SIZE}" ] && - [ "${ASTERISK_CORE_SIZE}" != "0" ]; then - ulimit -c ${ASTERISK_CORE_SIZE} - - if [ -n "${ASTERISK_CORE_DIR}" ] && \ - [ ! -d "${ASTERISK_CORE_DIR}" ] - then - mkdir -m750 -p "${ASTERISK_CORE_DIR}" - - if [ -n "${ASTERISK_USER}" ]; then - chown -R "${ASTERISK_USER}" "${ASTERISK_CORE_DIR}" - fi - fi - ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}" - - cd "${ASTERISK_CORE_DIR}" - einfo "Core dump size : ${ASTERISK_CORE_SIZE}" - einfo "Core dump location : ${ASTERISK_CORE_DIR}" - - OPTS="${OPTS} -g" - fi - - if [ -n "${ASTERISK_MAX_FD}" ]; then - ulimit -n ${ASTERISK_MAX_FD} - einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}" - fi - - if [ -n "${ASTERISK_NICE}" ]; then - if [ ${ASTERISK_NICE} -ge -20 ] && \ - [ ${ASTERISK_NICE} -le 19 ]; then - einfo "Nice level : ${ASTERISK_NICE}" - NICE="nice -n ${ASTERISK_NICE} --" - else - eerror "Nice value must be between -20 and 19" - return 1 - fi - else - NICE="" - fi - - if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then - if [ -x /usr/sbin/sendmail ]; then - einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" - else - ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" - unset ASTERISK_NOTIFY_EMAIL - fi - fi - - if [ -n "${ASTERISK_TTY}" ]; then - for x in ${ASTERISK_TTY} \ - /dev/tty${ASTERISK_TTY} \ - /dev/vc/${ASTERISK_TTY} - do - if [ -c "${x}" ]; then - TTY="${x}" - fi - done - [ -n "${TTY}" ] && \ - einfo "Messages are sent to : ${TTY}" - fi - - if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then - einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}" - OPTS="${OPTS} -c" - fi - - if [ -n "${ASTERISK_USER}" ]; then - USER="$(echo $ASTERISK_USER | sed 's/:.*//')" - GROUP="$(echo $ASTERISK_USER | awk -F: '/.*:.*/ { print $2 }')" - if [ -n "${USER}" ]; then - if ! getent passwd "${USER}" &>/dev/null; then - eerror "Requested to run asterisk as ${USER}, which doesn't exist." - return 1 - fi - OPTS="${OPTS} -U ${USER}" - fi - if [ -n "${GROUP}" ]; then - if ! getent group "${GROUP}" &>/dev/null; then - eerror "Requested to run asterisk with group ${USER}, which doesn't exist." - return 1 - fi - OPTS="${OPTS} -G ${GROUP}" - GROUP=":${GROUP}" # make it look nice... - fi - checkpath -d -m 0755 -o ${USER}${GROUP} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" - find "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" ! -user "${USER}" | while read element; do - ewarn "${USER} is not the owner of $element, or permissions are insufficient, fixing." - chown ${USER} "${element}" - chmod u+rX "${element}" - done; - einfo "Starting asterisk as : ${USER}${GROUP}" - else - checkpath -d -m 0755 -o root:root "${ast_logdir}" "${ast_rundir}" - ewarn "Starting asterisk as root is not recommended." - fi - - asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" & - result=$? - - if [ $result -eq 0 ]; then - # 2 seconds should be enough for asterisk to start - sleep 2 - is_running - result=$? - - [ $result -eq 0 ] || wrapperstop - fi - - eoutdent - eend $result - - if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then - ebegin "Waiting for ${ast_instancename} to fully boot" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null - eend $? - fi - - return $result -} - -wrapperstop() { - # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running). - if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then - ebegin "Killing wrapper script" - kill "$(cat /var/run/asterisk/wrapper_loop.pid)" - eend $? - fi - - # The new one (due to "hardened" requirements) uses a simpler - # flag to indicate running or shutting down. - if [ -r "${ast_rundir}/wrapper_loop.running" ]; then - ebegin "Signalling wrapper script to terminate" - rm "${ast_rundir}/wrapper_loop.running" - eend $? - fi - - return 0 -} - -forcestop() { - setup_svc_variables || return $? - - # Just to be sure - when we want to forcestop we should make it all tear down. - wrapperstop - - ebegin "Stopping asterisk PBX" - start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid - eend $? -} - -stop() { - setup_svc_variables || return $? - - wrapperstop - - if ! is_running; then - eerror "Asterisk is not running!" - return 0 - fi - - ebegin "Stopping asterisk PBX gracefully" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null - # Now we have to wait until asterisk has _really_ stopped. - sleep 1 - if is_running; then - einfon "Waiting for asterisk to shutdown ." - local cnt=0 - while is_running; do - cnt="$(expr $cnt + 1)" - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - eend 1 "Failed." - return - fi - sleep 2 - echo -n "." - done - echo - fi - eend 0 -} - -reload() { - setup_svc_variables || return $? - - if is_running; then - ebegin "Forcing asterisk to reload configuration" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null - eend $? - else - eerror "Asterisk is not running!" - fi -} diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd8 b/net-misc/asterisk/files/1.8.0/asterisk.initd8 deleted file mode 100644 index 4419dda06883..000000000000 --- a/net-misc/asterisk/files/1.8.0/asterisk.initd8 +++ /dev/null @@ -1,361 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="forcestop reload" -extra_commands="checkperms" - -depend() { - need net - use nscd dns dahdi mysql postgresql slapd capi -} - -is_running() { - [ -r "${ast_rundir}/asterisk.pid" ] || return 1 - PID="$(cat "${ast_rundir}/asterisk.pid")" - [ -d "/proc/${PID}" ] || return 1 - EXE="$(readlink -f /proc/${PID}/exe)" - EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one. - [ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process. - - # PID reported in pidfile is active, and is still an asterisk instance. - return 0 -} - -# Sets up a few variables for us for use -# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo. -# ast_rundir: directory to be used as run folder (pid and ctl files). -# ast_spooldir: -setup_svc_variables() -{ - local t - - ast_instancename=asterisk - ast_rundir=/var/run/${RC_SVCNAME} - ast_logdir=/var/log/${RC_SVCNAME} - ast_spooldir=/var/spool/${RC_SVCNAME} - ast_confdir=/etc/${RC_SVCNAME/.//} - - if [ "${RC_SVCNAME}" != "asterisk" ]; then - t="${RC_SVCNAME#asterisk.}" - if [ "${RC_SVCNAME}" = "${t}" ]; then - eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name." - return 1 - fi - ast_instancename+="(${t})" - fi - - [ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}" - [ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}" - [ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}" - [ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}" - - if [ -n "${ASTERISK_USER}" ]; then - ast_user="${ASTERISK_USER%%:*}" - ast_group="${ASTERISK_USER#*:}" - ast_group="${ast_group%%:*}" - [ -z "${ast_user}" ] && ast_user=root - [ -z "${ast_group}" ] && ast_group="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')" - fi - - [ -z "${ast_user}" ] && ast_user=root - [ -z "${ast_group}" ] && ast_group=root - - return 0 -} - -checkperms() { - setup_svc_variables - - local path - checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}" - for path in "${ast_rundir}" "${ast_spooldir}" "${ast_logdir}"; do - ebegin "Checking ${path}" - find "${path}" ! -user "${ast_user}" | while read element; do - [[ "${element}" = *.gz ]] && continue # Skip logrotated files. - ewarn "${ast_user} is not the owner of ${element}, or permissions are insufficient, fixing." - chown ${ast_user} "${element}" - chmod u+rwX "${element}" - done; - eend 0 - done -} - -asterisk_run_loop() { - local result=0 signal=0 - - echo "Initializing ${ast_instancename} wrapper" - OPTS="$*" - - trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT - touch "${ast_rundir}/wrapper_loop.running" - - while [ -r "${ast_rundir}/wrapper_loop.running" ]; do - if [ -n "${TTY}" ]; then - /usr/bin/stty -F "${TTY}" sane - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}" - result=$? - else - ${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} 2>&1 >/dev/null - result=$? - fi - - if [ "$result" -eq 0 ]; then - echo "Asterisk terminated normally" - break - else - if [ "$result" -gt 128 ]; then - signal="$(expr "$result" - 128)" - MSG="Asterisk terminated with Signal: $signal" - - CORE_TARGET="core-$(date "+%Y%m%d-%H%M%S")" - - local CORE_DUMPED=0 - if [ -f "${ASTERISK_CORE_DIR}/core" ]; then - mv "${ASTERISK_CORE_DIR}/core" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then - mv "${ASTERISK_CORE_DIR}/core.${PID}" \ - "${ASTERISK_CORE_DIR}/${CORE_TARGET}" - CORE_DUMPED=1 - - fi - - [ $CORE_DUMPED -eq 1 ] && \ - MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}" - else - MSG="Asterisk terminated with return code: $result" - fi - - # kill left-over tasks - for X in ${ASTERISK_CLEANUP_ON_CRASH}; do - kill -9 "$(pidof "${X}")"; - done - fi - - [ -n "${TTY}" ] \ - && echo "${MSG}" >"${TTY}" \ - || echo "${MSG}" - - - if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \ - [ -x /usr/sbin/sendmail ]; then - echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\ - /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}" - fi - sleep "${ASTERISK_RESTART_DELAY}" - echo "Restarting Asterisk..." - done - - echo "Terminating wrapper loop." - return 0 -} - -start() { - local OPTS PID - local tmp x - - local OPTS ARGS - - setup_svc_variables || return $? - - ebegin "Starting ${ast_instancename} PBX" - - eindent - - # filter (redundant) arguments - OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")" - - # default options - OPTS="${OPTS} -f" # don't fork / detach breaks wrapper script... - - # mangle yes/no options - ASTERISK_CONSOLE="$(echo ${ASTERISK_CONSOLE} | tr '[:lower:]' '[:upper:]')" - ASTERISK_WAITBOOTED="$(echo "${ASTERISK_WAITBOOTED}" | tr '[:lower:]' '[:upper:]')" - - ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')" - [ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5 - - if [ -n "${ASTERISK_CORE_SIZE}" ] && - [ "${ASTERISK_CORE_SIZE}" != "0" ]; then - ulimit -c ${ASTERISK_CORE_SIZE} - - if [ -n "${ASTERISK_CORE_DIR}" ] && \ - [ ! -d "${ASTERISK_CORE_DIR}" ] - then - checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}" - fi - ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}" - - cd "${ASTERISK_CORE_DIR}" - einfo "Core dump size : ${ASTERISK_CORE_SIZE}" - einfo "Core dump location : ${ASTERISK_CORE_DIR}" - - OPTS="${OPTS} -g" - fi - - if [ -n "${ASTERISK_MAX_FD}" ]; then - ulimit -n ${ASTERISK_MAX_FD} - einfo "Max open filedescriptors : ${ASTERISK_MAX_FD}" - fi - - if [ -n "${ASTERISK_NICE}" ]; then - if [ ${ASTERISK_NICE} -ge -20 ] && \ - [ ${ASTERISK_NICE} -le 19 ]; then - einfo "Nice level : ${ASTERISK_NICE}" - NICE="nice -n ${ASTERISK_NICE} --" - else - eerror "Nice value must be between -20 and 19" - return 1 - fi - else - NICE="" - fi - - if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then - if [ -x /usr/sbin/sendmail ]; then - einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}" - else - ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!" - unset ASTERISK_NOTIFY_EMAIL - fi - fi - - if [ -n "${ASTERISK_TTY}" ]; then - for x in ${ASTERISK_TTY} \ - /dev/tty${ASTERISK_TTY} \ - /dev/vc/${ASTERISK_TTY} - do - if [ -c "${x}" ]; then - TTY="${x}" - fi - done - [ -n "${TTY}" ] && \ - einfo "Messages are sent to : ${TTY}" - fi - - if [ "${ASTERISK_CONSOLE}" = "YES" ] && [ -n "${TTY}" ]; then - einfo "Starting Asterisk console : ${ASTERISK_CONSOLE}" - OPTS="${OPTS} -c" - fi - - if ! getent passwd "${ast_user}" &>/dev/null; then - eerror "Requested to run asterisk as ${ast_user}, which doesn't exist." - return 1 - fi - OPTS="${OPTS} -U ${ast_user}" - - if ! getent group "${ast_group}" &>/dev/null; then - eerror "Requested to run asterisk with group ${ast_group}, which doesn't exist." - return 1 - fi - OPTS="${OPTS} -G ${ast_group}" - - if [ "${ast_user}" = root ]; then - ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)." - elif [ "${ast_group}" = root ]; then - ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)." - fi - - checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}" - einfo "Starting asterisk as : ${ast_user}:${ast_group}" - asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" & - result=$? - - if [ $result -eq 0 ]; then - # 2 seconds should be enough for asterisk to start - sleep 2 - is_running - result=$? - - [ $result -eq 0 ] || wrapperstop - fi - - eoutdent - eend $result - - if [ $result -eq 0 -a "${ASTERISK_WAITBOOTED}" = "YES" ]; then - ebegin "Waiting for ${ast_instancename} to fully boot" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null - eend $? - fi - - return $result -} - -wrapperstop() { - # Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running). - if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then - ebegin "Killing wrapper script" - kill "$(cat /var/run/asterisk/wrapper_loop.pid)" - eend $? - fi - - # The new one (due to "hardened" requirements) uses a simpler - # flag to indicate running or shutting down. - if [ -r "${ast_rundir}/wrapper_loop.running" ]; then - ebegin "Signalling wrapper script to terminate" - rm "${ast_rundir}/wrapper_loop.running" - eend $? - fi - - return 0 -} - -forcestop() { - setup_svc_variables || return $? - - # Just to be sure - when we want to forcestop we should make it all tear down. - wrapperstop - - ebegin "Stopping asterisk PBX" - start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid - eend $? -} - -stop() { - setup_svc_variables || return $? - - wrapperstop - - if ! is_running; then - eerror "Asterisk is not running!" - return 0 - fi - - ebegin "Stopping asterisk PBX gracefully" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop gracefully" &>/dev/null - # Now we have to wait until asterisk has _really_ stopped. - sleep 1 - if is_running; then - einfon "Waiting for asterisk to shutdown ." - local cnt=0 - while is_running; do - cnt="$(expr $cnt + 1)" - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - eend 1 "Failed." - return - fi - sleep 2 - echo -n "." - done - echo - fi - eend 0 -} - -reload() { - setup_svc_variables || return $? - - if is_running; then - ebegin "Forcing asterisk to reload configuration" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null - eend $? - else - eerror "Asterisk is not running!" - fi -} diff --git a/net-misc/asterisk/files/1.8.0/find_call_ids.sh b/net-misc/asterisk/files/1.8.0/find_call_ids.sh deleted file mode 100644 index 321f3dacd624..000000000000 --- a/net-misc/asterisk/files/1.8.0/find_call_ids.sh +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/bash - -logfile=$1 -anum=$2 -bnum=$3 - -function usage() -{ - echo "USAGE: $1 logfile anum bnum" - exit -1 -} - -[ -r "${logfile}" ] || usage $0 -[ -n "${anum}" ] || usage $0 -[ -n "${bnum}" ] || usage $0 - -#echo "Finding calls from '${anum}' to '${bnum}' in ${logfile}." - -# modes: -# 0 - not processing an INVITE. -# 1 - processing an INVITE. -# 2 - from matched (processing). -dos2unix < "${logfile}" | awk ' - BEGIN { mode = 0 } - mode==0 && $4~"^VERBOSE" { - dt=$1" "$2" "$3 - } - - mode==0 && $1=="INVITE" && $2 ~ "^sip:'"${bnum}"'@" { - #print - - mode=1 - - split($2, a, "[:@]") - bnum=a[2] - } - - mode==1 && $1=="From:" { - #print - if ($3 ~ "^<sip:'"${anum}"'@.*>") { - mode=2 - split($3, a, "[:@]") - anum=a[2] - } else { - #print "From does not match ... leaving block." - mode = 0 - } - } - - mode!=0 && $1=="Call-ID:" { - callid=$2 - - if (NF!=2) { - print "WTF @ Call-ID header having NF!=2" - } - } - - mode==1 && $0=="" { - #print "Leaving block (no match)" - mode = 0 - } - - mode==2 && $0=="" { - #print "Leaving block (match)" - print dt " " anum " " bnum " " callid - mode = 0 - } -' diff --git a/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh b/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh deleted file mode 100644 index 06ae824def5c..000000000000 --- a/net-misc/asterisk/files/1.8.0/find_call_sip_trace.sh +++ /dev/null @@ -1,76 +0,0 @@ -#! /bin/bash - -logfile=$1 -callid=$2 - -function usage() -{ - echo "USAGE: $1 logfile Call-ID [Call-ID ...]" - exit -1 -} - -[ -r "${logfile}" ] || usage $0 -[ -n "${callid}" ] || usage $0 - -shift; shift; -while [ $# -gt 0 ]; do - callid="${callid}|$1" - shift -done - -# modes: -# 0 - searching for SIP start block ... -# 1 - transmit of sorts -# 2 - receive - -dos2unix < "${logfile}" | awk ' - BEGIN { mode = 0 } - mode==0 && $4~"^VERBOSE" { - dt=$1" "$2" "$3 - } - - mode!=0 && $1 == "Call-ID:" { - #print - - if ($2 ~ /('"${callid}"')/) { - callidmatch=1 - } else { - #print $2" does not match ^('"${callid}"')$" - mode=0 - } - } - - (mode==1 && $0=="---") || (mode==2 && $0=="<------------->") { - if (callidmatch) { - print dt" "sipmode"\n"pckt"---" - } - - mode=0 - } - - mode!=0 { - pckt = pckt $0 "\n" - } - - mode==0 && $0 ~ "chan_sip[.]c: .*[tT]ransmitting" { - #print - - if ($6 == "Retransmitting") { - sipmode = $6" "$7" to "$NF - } else { - sipmode = "Transmitting to "$NF - } - - mode=1 - pckt="" - callidmatch=0 - } - - mode==0 && $0 ~ "SIP read from" { - #print - mode=2 - pckt="" - callidmatch=0 - sipmode="Received from "$5":" - } -' diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml index 25d257dff353..d19226fb19d0 100644 --- a/net-misc/asterisk/metadata.xml +++ b/net-misc/asterisk/metadata.xml @@ -16,7 +16,6 @@ <flag name="http">Enable embedded web server</flag> <flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag> <flag name="newt">Include additional tools that require redhats windowing toolkit</flag> - <flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag> <flag name="pjproject">Enable support for pjproject (pjsip)</flag> <flag name="samples">Install sample sound and configuration files (default: on)</flag> <flag name="span">Enable support for the spandsp codec</flag> diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest index 121422764a4a..3240b704e289 100644 --- a/net-misc/axel/Manifest +++ b/net-misc/axel/Manifest @@ -2,4 +2,4 @@ DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241 DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01 EBUILD axel-2.17.8.ebuild 1054 BLAKE2B 4b125d7d707116374d3c66342a70d174eee139e5f5ba07ef3d9b7bd8d2da2a2c906aceea4b751977c8bedf626d5bdef54b11263140d663f5559cc92b67702b44 SHA512 982df8b1fe6e40cda200318ecb32058c9d31889a8473f7124651353e0897b79729f4d3cd4697957a1047dd3a12890ad492481f3118a2539c3577e95bc7d0dcf9 EBUILD axel-2.17.9.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936 -MISC metadata.xml 410 BLAKE2B 89c374385d4e3a03953352d1d995029ca481386a0c522b1c4c2c18bc58c62f65e5eb287a656392093d72735174adc8e48dacd1771989d0bdd6ca2a0c77e3cd80 SHA512 f64c314f27882031b215373ded6b4a1e0a93b398ec96aff1a429ef6b01cc1d426c1692b8f2ecdea4f5503d853d753f292a7edac960a559bcb60ea491d5a1e7ce +MISC metadata.xml 334 BLAKE2B cdc0f78ca802b6c5268d4f3642637af74d419ba07fb07a2a0f0e21dfdc20de3301ee91d7b027b4fff5c1f2eca4dc5cd395dbf916ab7d2bb6cac9ed85b228f5eb SHA512 e23a07690d4d2f1b26e90fb151d1b7afb922649c4989b4f4b8e9dafe3024c9b7dafb6dbfa467731055d605e101cf44d3c17be3d6f6f99629063cc42f8b616449 diff --git a/net-misc/axel/metadata.xml b/net-misc/axel/metadata.xml index 0b08d51dbfed..10afdd5b6a81 100644 --- a/net-misc/axel/metadata.xml +++ b/net-misc/axel/metadata.xml @@ -1,13 +1,10 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>slashbeast@gentoo.org</email> <name>Piotr Karbowski</name> </maintainer> - <maintainer type="person"> - <email>jlec@gentoo.org</email> - </maintainer> <upstream> <remote-id type="github">eribertomota/axel</remote-id> </upstream> diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest index 498859c71b05..f1f613d7f49d 100644 --- a/net-misc/batctl/Manifest +++ b/net-misc/batctl/Manifest @@ -1,3 +1,5 @@ -DIST batctl-2017.4.tar.gz 85865 BLAKE2B 9d8786956b69407d46d1b024a40c3db2a80bbcce7c02e8e7d98234d06aaa3cd4fe86dd9331806699a7310ac41b7a758c324bcb6c3daf378da0db0a8858f814df SHA512 a3ce3f32ed1eaa65aee4a9ac56d8e235b861b3844a13fe050cfc0e707bbdf382fd2e6e4ecb35b7777f79020cb241e063f473d28f1b2e312f865e6dce304b4b9f -EBUILD batctl-2017.4.ebuild 871 BLAKE2B c603114dc6beebd8c2c7eba2763efc58849fc14c30e78038e4fb47c0c0404e91ab542c9736780c572219d0eb20d40b0393291bb1258cf62a1bb554d338bb46ac SHA512 956f530d28d143a49dcb4d546555b6dc1085e2ee6bf98dec5910c485ef896e659e1791b5713342cc14d951c3526a083978676c4f4969d04e3b94780c5e3b516b -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 +DIST batctl-2020.1.tar.gz 112004 BLAKE2B fdf99b97edfb1b65df3b6cfd3b99148e21a6fc201c5a6b2d2bfeedddfa18e22903b33811d8b9adf6d4a2b53ab9ca35602fdb90b48f97fb40e4edf9643264609e SHA512 b6f4b98a3a8450badf7d8dda2c23e0f91a1f3e0c6d9db96d220451ee4f2f5ea703206a888d504cc3b8594c4255a6ccea851e4da6d1c7869842a62ee0bac6ce8b +DIST batctl-2020.2.tar.gz 112155 BLAKE2B 9d36baf4f728163b12d63bf2b690b75633119ebc22a734668aaaae97d9c0a37ac1906dec40f62987d7c9db2ca6b0c7867164c989f3f3f5834bbc5c562b842852 SHA512 4990eece371320107cd522f5dc6ff4ecd2867d8b77ddb8a09b8c8fc81c6cf2a88df6635f026b16a2c59fc05532a82ecafae206fb1581ac7e1f863043eb3afa93 +EBUILD batctl-2020.1.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693 +EBUILD batctl-2020.2.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693 +MISC metadata.xml 375 BLAKE2B 63ed1708614d32491216fb627a3f16a07a9de5d8d4925e2676a61744c5ec3a6d398ee838c8bbea0b5d50101d27383c9484c508dc2f6a9f4d953b67d8d2d93235 SHA512 6a83a787d099e17f964e466cfbeed9ae40ba657d21c9881c289ddd318572e292fb3202e95f413e2e3807f9f35201f40458dd0da74adf5af790dd44a0242bb8b0 diff --git a/net-misc/batctl/batctl-2017.4.ebuild b/net-misc/batctl/batctl-2017.4.ebuild deleted file mode 100644 index 1a86c94be2ba..000000000000 --- a/net-misc/batctl/batctl-2017.4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info toolchain-funcs - -DESCRIPTION="BATMAN advanced control and management tool" -HOMEPAGE="https://www.open-mesh.org/" -SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-libs/libnl:3" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - if ( linux_config_exists && linux_chkconfig_present BATMAN_ADV ) \ - || ! has_version net-misc/batman-adv ; then - ewarn "You need the batman-adv kernel module," - ewarn "either from the kernel tree or via net-misc/batman-adv" - fi -} - -src_compile() { - emake CC="$(tc-getCC)" V=1 REVISION=gentoo-"${PVR}" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - dodoc README.rst -} diff --git a/net-misc/batctl/batctl-2020.1.ebuild b/net-misc/batctl/batctl-2020.1.ebuild new file mode 100644 index 000000000000..dc9f33ff9204 --- /dev/null +++ b/net-misc/batctl/batctl-2020.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info toolchain-funcs + +DESCRIPTION="BATMAN advanced control and management tool" +HOMEPAGE="https://www.open-mesh.org/" +SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.tar.gz" + +LICENSE="GPL-2 MIT ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BDEPEND="virtual/pkgconfig" +RDEPEND="dev-libs/libnl:3" +DEPEND="${RDEPEND}" + +pkg_setup() { + if ! linux_config_exists || ! linux_chkconfig_present BATMAN_ADV; then + ewarn "batctl requires batman-adv kernel support" + fi +} + +src_compile() { + emake CC="$(tc-getCC)" V=1 REVISION="gentoo-${PVR}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc README.rst +} diff --git a/net-misc/batctl/batctl-2020.2.ebuild b/net-misc/batctl/batctl-2020.2.ebuild new file mode 100644 index 000000000000..dc9f33ff9204 --- /dev/null +++ b/net-misc/batctl/batctl-2020.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info toolchain-funcs + +DESCRIPTION="BATMAN advanced control and management tool" +HOMEPAGE="https://www.open-mesh.org/" +SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.tar.gz" + +LICENSE="GPL-2 MIT ISC" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BDEPEND="virtual/pkgconfig" +RDEPEND="dev-libs/libnl:3" +DEPEND="${RDEPEND}" + +pkg_setup() { + if ! linux_config_exists || ! linux_chkconfig_present BATMAN_ADV; then + ewarn "batctl requires batman-adv kernel support" + fi +} + +src_compile() { + emake CC="$(tc-getCC)" V=1 REVISION="gentoo-${PVR}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc README.rst +} diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml index 6f49eba8f496..fb16ff9c1889 100644 --- a/net-misc/batctl/metadata.xml +++ b/net-misc/batctl/metadata.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>info@harrysmallbones.co.uk</email> + <name>Harry Smallbones</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest index 40139ba407d8..7029f2a7a8be 100644 --- a/net-misc/cadaver/Manifest +++ b/net-misc/cadaver/Manifest @@ -1,4 +1,4 @@ AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41 -EBUILD cadaver-0.23.3.ebuild 1073 BLAKE2B dc2af096996fafb295055cf9843465c323ce5f04b97a42e7d2fc201c8ef34c5ca93c28c97723a3671abc968fec9adec094a69d0c9c812c3afde8857edf3952b4 SHA512 217e5a20da9bea6e7eb099b61b33447ef074596d53e45d0318712771596c00adda66e0546e1f15e9067c25b51a842697451219e4b843ab06b428f98f619156ae +EBUILD cadaver-0.23.3.ebuild 1052 BLAKE2B 48aa748c19ec363da412c803570a0957e5e596540bc305a09b7009650fa97011aefae9e848675dcc69555a0c94e1278c6bf4060b1a1b8aea611574ce30369494 SHA512 334343e416c32d9d0fb9dc05d7b1aefa4f43f9e2bb76f8ce5b9f302567514790897f0e25571a25bd0059e323970e86d38260fc921280319035c40b7e84741d60 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877 diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild index c329d370cd88..e6b4ec10f0a5 100644 --- a/net-misc/cadaver/cadaver-0.23.3.ebuild +++ b/net-misc/cadaver/cadaver-0.23.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2019 Gentoo Authors +# Copyright 2003-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -38,6 +38,5 @@ src_prepare() { src_configure() { econf \ - $(use_enable nls) \ - --with-libs=/usr + $(use_enable nls) } diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 678b5184d5a3..3aeed31b4c50 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -6,10 +6,12 @@ AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686 AUX chronyd.conf-r1 389 BLAKE2B 12ce24ef0455876ca9b74c5fb03000d720526c4da7dabf1dffb3c959861d5b0f677e2efb96bb5c00f7cc26b79cc77c0b6dfa161551bda5506a5eaac8d16dc46e SHA512 81400fb47fdac472c7508bb301e0dd662429c6ac3243e13d2719b1d237057a8b996163fbc14fa85a498144728d9ddf78275251d630e6800b0144a43792d8c414 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da +DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984 DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3518c953591f43224dc3da79f627027a6cd4bf9c4227e9f8659a69adbdb634252ff3920d2ef677e32012456 SHA512 c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c DIST chrony-4.0-pre2.tar.gz 512765 BLAKE2B bfcac8564b05ed3cb6a67230746ec83d3f00192bd1d5e623ee12068bf3b7ca55e169a0228a13b62339be6a1c237199cd73186b1962ba51b445a56040560917fb SHA512 be3ca7c57c62c9ecf8d20d0b8d7b5a34ac455fb333be0587eabd5dfd7eebbcb3a3601ad161554a62098a9ca8d6530bee2900e9e7476bf477c3cb11907091dbd2 EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 3567ca621e71777dc34c90b77005e192f564bb8dba5f0705711eaa720262bebafde656da678b2d47130dee19caf8d2e52106ae27a0ee81e292b2defe1dadf5fa SHA512 2c8799bc3ac6e1759e048e37e6e4765d5a199fff043954e19a2640a060609c6281b397dc2834d10ecb34e5bb09b7b80c55b5bc96d0fa10a43b451799a1d53f3a EBUILD chrony-3.5-r4.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6 +EBUILD chrony-3.5.1.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6 EBUILD chrony-4.0_pre2-r1.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef EBUILD chrony-9999.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef MISC metadata.xml 1798 BLAKE2B c301fd829833515a78800677c498632a46ea968ad82f726b288ee3ec6bf79c733fcaea0b9a1777cf93e2a858da40beb105a301dca580e37e01b91111a38bdc17 SHA512 8609f9cb055d5de0a293cc78060101cbc30be4d3db6d7a8d751fa2bf416758e4c9d6509ce1890861c87d2e863e325051e68aadb4d621937f586e83ef585145e7 diff --git a/net-misc/chrony/chrony-3.5.1.ebuild b/net-misc/chrony/chrony-3.5.1.ebuild new file mode 100644 index 000000000000..fa28cf690097 --- /dev/null +++ b/net-misc/chrony/chrony-3.5.1.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit systemd tmpfiles toolchain-funcs + +DESCRIPTION="NTP client and server programs" +HOMEPAGE="https://chrony.tuxfamily.org/" +SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE=" + +adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc + +seccomp selinux +" +REQUIRED_USE=" + ?? ( libedit readline ) +" + +CDEPEND=" + caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) + libedit? ( dev-libs/libedit ) + readline? ( >=sys-libs/readline-4.1-r4:= ) + seccomp? ( sys-libs/libseccomp ) +" +DEPEND=" + ${CDEPEND} + html? ( dev-ruby/asciidoctor ) + pps? ( net-misc/pps-tools ) +" +RDEPEND=" + ${CDEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" + +RESTRICT=test + +S="${WORKDIR}/${P/_/-}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die + + # Copy for potential user fixup + cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf + cp examples/chronyd.service "${T}"/chronyd.service + + # Set config for privdrop + if ! use caps; then + sed -i \ + -e 's/-u ntp//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi + + if ! use seccomp; then + sed -i \ + -e 's/-F 1//' \ + "${T}"/chronyd.conf "${T}"/chronyd.service || die + fi +} + +src_configure() { + tc-export CC + + local CHRONY_EDITLINE + # ./configure legend: + # --disable-readline : disable line editing entirely + # --without-readline : do not use sys-libs/readline (enabled by default) + # --without-editline : do not use dev-libs/libedit (enabled by default) + if ! use readline && ! use libedit; then + CHRONY_EDITLINE='--disable-readline' + else + CHRONY_EDITLINE+=" $(usex readline '' --without-readline)" + CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" + fi + + # not an autotools generated script + local myconf=( + $(use_enable seccomp scfilter) + $(usex adns '' --disable-asyncdns) + $(usex caps '' --disable-linuxcaps) + $(usex cmdmon '' --disable-cmdmon) + $(usex ipv6 '' --disable-ipv6) + $(usex ntp '' --disable-ntp) + $(usex phc '' --disable-phc) + $(usex pps '' --disable-pps) + $(usex refclock '' --disable-refclock) + $(usex rtc '' --disable-rtc) + ${CHRONY_EDITLINE} + ${EXTRA_ECONF} + --chronysockdir="${EPREFIX}/run/chrony" + --disable-sechash + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + --without-nss + --without-tomcrypt + ) + + # print the ./configure call to aid in future debugging + echo bash ./configure "${myconf[@]}" >&2 + bash ./configure "${myconf[@]}" || die +} + +src_compile() { + emake all docs $(usex html '' 'ADOC=true') +} + +src_install() { + default + + newinitd "${FILESDIR}"/chronyd.init-r2 chronyd + newconfd "${T}"/chronyd.conf chronyd + + insinto /etc/${PN} + newins examples/chrony.conf.example1 chrony.conf + + docinto examples + dodoc examples/*.example* + + newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')" + + if use html; then + docinto html + dodoc doc/*.html + fi + + keepdir /var/{lib,log}/chrony + + if use caps; then + # Prepare a directory for the chrony.drift file (a la ntpsec) + # Ensures the environment is sane on new installs + fowners ntp:ntp /var/{lib,log}/chrony + fperms 770 /var/lib/chrony + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony + + systemd_dounit "${T}"/chronyd.service + systemd_dounit examples/chrony-wait.service + systemd_enable_ntpunit 50-chrony chronyd.service +} + +pkg_preinst() { + HAD_CAPS=false + + if has_version 'net-misc/chrony[caps]'; then + HAD_CAPS=true + fi +} + +pkg_postinst() { + tmpfiles_process chronyd.conf + + if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp" + ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony" + ewarn "This is necessary for chrony to drop privileges" + fi +} diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest index 0282b746e42b..6cdf7617c9a3 100644 --- a/net-misc/cni-plugins/Manifest +++ b/net-misc/cni-plugins/Manifest @@ -1,11 +1,3 @@ -DIST cni-plugins-0.8.2.tar.gz 1997790 BLAKE2B a3c0196c589a3a77de100a87ca8d3eb952478190c78dc50bc7b65d6229ec33593fe77be4a8c5b593d9ea8bb806f9b8d04768bc52b689b006640cfa34c176a0a1 SHA512 383540232593c7ef8c28f83e660a58ae6dd2592c6d97a43c8fc1f046a3fa448911d4066ec0a6a7d7e770a1a2dceee7c31d742100b0871e07d691fe6bdffd42f9 -DIST cni-plugins-0.8.3.tar.gz 2001599 BLAKE2B e087814146c53d372af5b1cc47098f0060cb1528618d9848287592c0b442856114c711ea747efca4e8a79e9ee0b4285678a6e48e07d0698f1382c1e822a49451 SHA512 054479a73ddbfbdb2986ac202ae2da7a69ae7bb693a250885f950a26973c60be3053d4e95ca24cf5eb67c104b9af8231f859e22c01a066ce3a206a186fc55a6d -DIST cni-plugins-0.8.4.tar.gz 2002863 BLAKE2B afc0229256f04b5079ff4f30fca422e7e72dc46b01a988b38647bbed767ad4c8362c99eca84ade86a52ffbd3aadda60ae1b14974436eab862d4c9ed356320b2b SHA512 1a66a9d2cc3bad17201426905ed8349fa0c260ffef423338bc93c4ff191c4d38e6b9228ca3b5c44b148c854379f741f2dbd88ac9937dc1599f95f4df8b6f4346 -DIST cni-plugins-0.8.5.tar.gz 2003900 BLAKE2B e14ee6ca6979b638ed041a28d382867006b05843bf5b2c9c79386f4db590684b047af226a11b49e75b750e63927f3ee672cec54f12a1c7447550b8755a96b0bb SHA512 e404ef69da189e2cc3e77ae1054fbea5232086066f2963d1ec824f63c02aede020ad8600d821ec47ae695043bd2c4a176d9e02b9a059024ff3a2fbeee9cb797a DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8 -EBUILD cni-plugins-0.8.2.ebuild 1180 BLAKE2B 65c6677411bba468a5c77361326aff928a83651e3b7326391724e83a3f7c5fb89b81819d2e12217e2fca64568ce53f1aa0714fe7cf05a8cbfb3a4378687d43c3 SHA512 2a390ea446112f068067d6e5d40e5a2d96242d772593856a1cb727c424ac0afa4e3e0dabf53fbecdea0613873f72d0d3018a72444ae58235a5e69905b800be4d -EBUILD cni-plugins-0.8.3.ebuild 1181 BLAKE2B 9cf5c0c0ede72dbf6454166a2a1fab9c9adcdc40277d2542b526f6584148f9a4416fb710a4f352bd4916d9c4aeb29386527cf86cce7a57deaa35a22e68b4e11f SHA512 0c14d1b3a0df0a397d3c0253592ab4e6d76cdad8335db44a960b74fcf1424a6c21e4c4fa54d8460db9db3d5c7e41404c1c6872536d05699f1012c466b15af5b5 -EBUILD cni-plugins-0.8.4.ebuild 1182 BLAKE2B 45476f645c86ca1518bf46315df141f515468c710f7fc78f792ec8ea10d0ddce300c8a645c07ba033833260e8e9f9ca77bdcd23c0a8c39b42161689c033d248a SHA512 a8099a79a4f6f2540a3e735eedf7688233d9f04cb77f682574d2492025998be573e864d02104d987e9e6c5ba72db9ff91c3fecf6af730bf191ab878b036d018c -EBUILD cni-plugins-0.8.5.ebuild 881 BLAKE2B 9bc3401bdaa377bf0357dd1ab014815e6defbc27db766f8bd8dec7fa035a77ccaf212949d298cd7a2f85f9314fd6737dad2b2ca5a8421ea0c44b10ae03c5a3e5 SHA512 c4b2e4e942ec676a366cb4aba16ce095f10c88f38a6df0a7f31cc1fbefbb0291b189a3ee6abb6dd56c6d02e9b18cb9403feda1778dcc0d78916137d95bfd8f85 -EBUILD cni-plugins-0.8.6.ebuild 881 BLAKE2B 9bc3401bdaa377bf0357dd1ab014815e6defbc27db766f8bd8dec7fa035a77ccaf212949d298cd7a2f85f9314fd6737dad2b2ca5a8421ea0c44b10ae03c5a3e5 SHA512 c4b2e4e942ec676a366cb4aba16ce095f10c88f38a6df0a7f31cc1fbefbb0291b189a3ee6abb6dd56c6d02e9b18cb9403feda1778dcc0d78916137d95bfd8f85 +EBUILD cni-plugins-0.8.6.ebuild 880 BLAKE2B 596189a6c130c67c2308bc5922d5604b52ae4c688372354d40c31d6d67c66a6b45a6f0f8158dbc9681f407bf16c1dd8683d6b6b87a2da9ec7aa65e3fb210c66e SHA512 a5c9f30b7dcfd0bf18b864d615dea6cf92721599ac50ec131a262b66b0524919e05369b51290e31ec925ff16aa49701f426a456f1e4d2463d2818ff4446b01bb MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b diff --git a/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild deleted file mode 100644 index 9d70c2e35d1b..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info golang-vcs-snapshot - -KEYWORDS="amd64" -DESCRIPTION="Standard networking plugins for container networking" -EGO_PN="github.com/containernetworking/plugins" -HOMEPAGE="https://github.com/containernetworking/plugins" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" - -src_compile() { - pushd src || die - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die - done - popd || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - pushd src/${EGO_PN} || die - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done - popd || die -} diff --git a/net-misc/cni-plugins/cni-plugins-0.8.3.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.3.ebuild deleted file mode 100644 index 4fd45539a5a6..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.8.3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info golang-vcs-snapshot - -KEYWORDS="~amd64" -DESCRIPTION="Standard networking plugins for container networking" -EGO_PN="github.com/containernetworking/plugins" -HOMEPAGE="https://github.com/containernetworking/plugins" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" - -src_compile() { - pushd src || die - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die - done - popd || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - pushd src/${EGO_PN} || die - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done - popd || die -} diff --git a/net-misc/cni-plugins/cni-plugins-0.8.4.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.4.ebuild deleted file mode 100644 index 855cb97aab8b..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.8.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info golang-vcs-snapshot - -DESCRIPTION="Standard networking plugins for container networking" -HOMEPAGE="https://github.com/containernetworking/plugins" -EGO_PN="github.com/containernetworking/plugins" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" - -src_compile() { - pushd src || die - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die - done - popd || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - pushd src/${EGO_PN} || die - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done - popd || die -} diff --git a/net-misc/cni-plugins/cni-plugins-0.8.5.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.5.ebuild deleted file mode 100644 index 999026880609..000000000000 --- a/net-misc/cni-plugins/cni-plugins-0.8.5.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module linux-info - -DESCRIPTION="Standard networking plugins for container networking" -HOMEPAGE="https://github.com/containernetworking/plugins" -SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="hardened" - -CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" -S="${WORKDIR}/plugins-${PV}" - -src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die -} - -src_install() { - exeinto /opt/cni/bin - doexe bin/* - dodoc README.md - local i - for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do - newdoc README.md ${i##*/}.README.md - done -} diff --git a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild index 999026880609..631097f1de60 100644 --- a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild +++ b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="hardened" CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index e15bf63decad..17b28419b724 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,15 +1,11 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f -AUX curl-fix-cpu-load.patch 3369 BLAKE2B 049a0d5b0dc6262d2d722e037d75cd966f7b87fd7e4bea23130118e91f1b54e1d374e2879b235cc90aeae8357588167b6bec7a375f9b23a4f96944ff12841519 SHA512 223a8b68157d58b050f89b46d2f3f5a486aa111fe5f5df46db3b49745e2a17e6be4a19fbf9b398f62311ee34fb0051f5302025632152188e840a0c60256b4da0 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 -DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c -DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa -DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6 DIST curl-7.71.0.tar.xz 2379056 BLAKE2B 50d7369e4335823c3032b8801b270f7d8e687b0552f25ed5f9752549483cf68870e0422132ecf86e756e1c7c27cdf60048a7765850608c3a1b734cffb1fe7b99 SHA512 f1ea045f23b6a7e2c84ea83954d3299c612f57c3b1e5fee0b39493dc92fc4e95e7af2a5424c2e5bc480659e80cf1adce1fc528fc816f8ff2d0e7bfcfe4c5830a DIST curl-7.71.1.tar.xz 2387660 BLAKE2B 47b3a4704ae8b09b37f7a9d8850fd7d692d91db3dd4ad776aad9a57d0162e0f4091e0387a850eb048f834e6dfee5bcb36da56493a106696c72072c612b47f623 SHA512 631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b -EBUILD curl-7.68.0.ebuild 7574 BLAKE2B a63f7bd7c6a27f2c67824d2cd2e742bf6d53f2fb004ab7ea6e4aaf0034bb97a5a59a605c133cd3c27ce84114bdc715c873706f757428a8f3ade59516dea1b882 SHA512 a59e3f0ad00bf9becf08fb624e0f634f6bac617b8ba88f751e2a2a78422eb54f294149db7a1cb9fbd25554637335c01c9467d1774a26b9571d413f90a620e491 -EBUILD curl-7.69.1.ebuild 7663 BLAKE2B c3d98ec0d1f9d40d1173cec9f4a8e6198e5da809fe52fe83db75ba3ec68f0f2ca0812fcc90d29004bdcdf874136ac139a130f913899553d5912392b541f612a9 SHA512 c6f542f18802aaf42ac0ca33477f239587bc20afd9462bf931444ee79a8773e0b1fc1cc8ce503157433d6d45f0600b104fd0a0b200de2ffcbd462dc6d2cd784b -EBUILD curl-7.70.0-r1.ebuild 7735 BLAKE2B 8bb2413f7fead1501f7146b06c0aa15e6c610c1e731c3ffc59d0a8b979b24cbc491d32087315aa0dfa178701a2a8eaee116d41fdbdd321bcee5c6c62e8ad5a0a SHA512 40c3dd6c2e168de6e596fa6e5177cef48be547fa5e76772a46fbbd076b68ddcaca0c9f8c2d1981ad528c900a3624d80dfa87dc077d84c773f21b35a57b568b9b -EBUILD curl-7.71.0.ebuild 7681 BLAKE2B 7d53f7e3282f0d3887864744e932a65a7e19c453645cfd6b20536433c2ef262dc5c1c490b2a50cf42e832001e9f54da0080821a4d24cf290cedbf48542d0dadc SHA512 40bad769e19118788e5c93643d7c05624af7ea03554b5292e2cdab18729d4148d9505a96f9c42182d13d71809d4e89309a528d79c4d0775cfb13984514de5cde -EBUILD curl-7.71.1.ebuild 7688 BLAKE2B bc7f9ea325b026c360a9e3dddde33c94a8b2a71dbbbd7d7cb5b28b09c3a8e662db36756ad00b40beb5ba452e71157f4253c7c02c65e9ab981a0c72000d1508df SHA512 9cfd78a000ba73e782b1ee16948d6266c7f9d90059dda2ea43f0450868660e97383802564ab15920b61903d0a2ef70f9101b2395ffd64c6d6b02a996a0a4122f -MISC metadata.xml 1643 BLAKE2B 269e3f95823a962466081b171d376e1f13cf4e8ac7d440577f704d585d40d0a4e7f496be1860f283f2e118338183210c1a93d3cff24fe517c9fed57dcd8b615c SHA512 ed329ba19ca89372141274e7fcb161e9f825e219d9bf71dc719b1a2bf5deefdecaaab02bb6e5e4c0bd1c87ce16731f7f5137dffb86e65c67381d98eaf72cc2d9 +DIST curl-7.72.0.tar.xz 2390040 BLAKE2B 8f20efe7255ffe6d68619645b634b9cb10557ba0ca458904e99105133fb54cfafe4cafa0e7a1c5e20bbf5b5d24c8c44670cb5ddc1a2035ca43eadd24899ea953 SHA512 e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107 +EBUILD curl-7.71.0.ebuild 7692 BLAKE2B a2114c226d010472ced5ed0a4d25feeba6d820defc786c49022c74dd0eb72a56015086fb549d3187dcd01f6cead02da6f9668a3442c833a6f52b8e76419d5bae SHA512 0d10f62aeb9a91c6199034060295064621ece66181019b7530b98d38bd36d31c0d404d1a92a4245cab7386363c84c6bf3c054b977ea07e3a8fb5aa541b877f28 +EBUILD curl-7.71.1-r1.ebuild 8734 BLAKE2B 748f1f1564ee84bd716679a8b336f324d325c51e74efe8db34797a9deecbc153a4158fb5c563076f5b8459798b9a3ebd4f2a6851ea71d9fa2f5da40de716d5cc SHA512 dbf4dc6fcb9ca884d36373661242558ba2240f6d9b88c1cf1a4285cebd06425d3fce7c38f52eb3b1cbf832e3cd3712d76d214824fefb6040168f9475081a00a6 +EBUILD curl-7.71.1.ebuild 7696 BLAKE2B 720b9d08868acb07d342791f87bb7c73a4d865aaabb771c2990aa7e4724dc974e2c73ad9b33fb718a3ea826856d89a2a91a5e329fbaabdf3f5f3bbcf6d8a8724 SHA512 b4df2c9e8d6541ae6b70a27f47ed44bbec27519123b1a2dc87761df657c30d0c3b49dd584501fca5d6fb7b870b1346747e36d08b664ecdac423500b1f6da61b1 +EBUILD curl-7.72.0.ebuild 8734 BLAKE2B 748f1f1564ee84bd716679a8b336f324d325c51e74efe8db34797a9deecbc153a4158fb5c563076f5b8459798b9a3ebd4f2a6851ea71d9fa2f5da40de716d5cc SHA512 dbf4dc6fcb9ca884d36373661242558ba2240f6d9b88c1cf1a4285cebd06425d3fce7c38f52eb3b1cbf832e3cd3712d76d214824fefb6040168f9475081a00a6 +MISC metadata.xml 1916 BLAKE2B 8907ea9d5ded3fadb233b056b41b3daeb00bba44caa631a77fbd07215a5a9fd1bf47b4751485a59c6b41684e4b14e0abb99b5d79566e2dc8f21a3d749f0d5d20 SHA512 8e52e382804b4d2f10de345240f7cb46203e454dd3cab31ff92be3d2d9ce2d1ae8f36d95546061208205c330c58ece1d19fb08c257da683342b484b2e53f3ed1 diff --git a/net-misc/curl/curl-7.68.0.ebuild b/net-misc/curl/curl-7.68.0.ebuild deleted file mode 100644 index 0141a4e0a48d..000000000000 --- a/net-misc/curl/curl-7.68.0.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="https://curl.haxx.se/" -SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" - -LICENSE="curl" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads" -IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" -IUSE+=" nghttp3 quiche" -IUSE+=" elibc_Winnt" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_gnutls? ( - net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_libressl? ( - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_mbedtls? ( - net-libs/mbedtls:0=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - dev-libs/nss:0[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] ) - nghttp3? ( - net-libs/nghttp3[${MULTILIB_USEDEP}] - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] - ) - quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] ) - idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) - sys-libs/zlib[${MULTILIB_USEDEP}]" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_gnutls - curl_ssl_libressl - curl_ssl_mbedtls - curl_ssl_nss - curl_ssl_openssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \ - docs/FAQ docs/BUGS docs/CONTRIBUTE.md ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch - eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch - eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 - - eapply_user - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) - local myconf=() - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - myconf+=( --with-gnutls --with-nettle ) - elif use curl_ssl_libressl; then - einfo "SSL provided by LibreSSL" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_mbedtls; then - einfo "SSL provided by mbedtls" - myconf+=( --with-mbedtls ) - elif use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - elif use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - else - eerror "We can't be here because of REQUIRED_USE." - fi - else - einfo "SSL disabled" - fi - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - - ECONF_SOURCE="${S}" \ - econf \ - $(use_enable alt-svc) \ - --enable-crypto-auth \ - --enable-dict \ - --disable-esni \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --disable-ntlm-wb \ - --enable-pop3 \ - --enable-rt \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - --enable-tls-srp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-dateparse \ - --enable-dnsshuffle \ - --enable-doh \ - --enable-hidden-symbols \ - --enable-http-auth \ - $(use_enable ipv6) \ - --enable-largefile \ - --without-libpsl \ - --enable-manual \ - --enable-mime \ - --enable-netrc \ - $(use_enable progress-meter) \ - --enable-proxy \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - $(use_enable threads pthreads) \ - --disable-versioned-symbols \ - --without-amissl \ - --without-bearssl \ - --without-cyassl \ - --without-darwinssl \ - --without-fish-functions-dir \ - $(use_with idn libidn2) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - $(use_with metalink libmetalink) \ - $(use_with http2 nghttp2) \ - $(use_with nghttp3) \ - $(use_with nghttp3 ngtcp2) \ - $(use_with quiche) \ - $(use_with rtmp librtmp) \ - $(use_with brotli) \ - --without-schannel \ - --without-secure-transport \ - --without-spnego \ - --without-winidn \ - --without-wolfssl \ - --with-zlib \ - "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die - fi - - # Fix up the pkg-config file to be more robust. - # https://github.com/curl/curl/issues/864 - local priv=() libs=() - # We always enable zlib. - libs+=( "-lz" ) - priv+=( "zlib" ) - if use http2; then - libs+=( "-lnghttp2" ) - priv+=( "libnghttp2" ) - fi - if use quiche; then - libs+=( "-lquiche" ) - priv+=( "quiche" ) - fi - if use nghttp3; then - libs+=( "-lnghttp3" "-lngtcp2" ) - priv+=( "libnghttp3" "-libtcp2" ) - fi - if use ssl && use curl_ssl_openssl; then - libs+=( "-lssl" "-lcrypto" ) - priv+=( "openssl" ) - fi - grep -q Requires.private libcurl.pc && die "need to update ebuild" - libs=$(printf '|%s' "${libs[@]}") - sed -i -r \ - -e "/^Libs.private/s:(${libs#|})( |$)::g" \ - libcurl.pc || die - echo "Requires.private: ${priv[*]}" >> libcurl.pc -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete - rm -rf "${ED}"/etc/ -} diff --git a/net-misc/curl/curl-7.71.0.ebuild b/net-misc/curl/curl-7.71.0.ebuild index 77fd51a89170..ed0e2adb8d45 100644 --- a/net-misc/curl/curl-7.71.0.ebuild +++ b/net-misc/curl/curl-7.71.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" @@ -20,7 +20,7 @@ IUSE+=" elibc_Winnt" #lead to lots of false negatives, bug #285669 RESTRICT="test" -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) +RDEPEND="ldap? ( net-nds/openldap[static-libs?,${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) ssl? ( curl_ssl_gnutls? ( @@ -48,7 +48,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) net-libs/nghttp3[${MULTILIB_USEDEP}] net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] ) - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + quiche? ( >=net-libs/quiche-0.5.0[${MULTILIB_USEDEP}] ) idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) diff --git a/net-misc/curl/curl-7.70.0-r1.ebuild b/net-misc/curl/curl-7.71.1-r1.ebuild index d10edbee2152..598b09eed1c4 100644 --- a/net-misc/curl/curl-7.70.0-r1.ebuild +++ b/net-misc/curl/curl-7.71.1-r1.ebuild @@ -11,34 +11,33 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" IUSE+=" elibc_Winnt" #lead to lots of false negatives, bug #285669 -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) ssl? ( - curl_ssl_gnutls? ( + gnutls? ( net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle:0=[${MULTILIB_USEDEP}] app-misc/ca-certificates ) - curl_ssl_libressl? ( - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_mbedtls? ( + mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] app-misc/ca-certificates ) - curl_ssl_openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] + openssl? ( + !libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] ) ) - curl_ssl_nss? ( + nss? ( dev-libs/nss:0[${MULTILIB_USEDEP}] app-misc/ca-certificates ) @@ -75,9 +74,9 @@ BDEPEND="virtual/pkgconfig )" # c-ares must be disabled for threads -# only one ssl provider can be enabled +# only one default ssl provider can be enabled REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) + winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( @@ -105,7 +104,6 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - eapply "${FILESDIR}"/${PN}-fix-cpu-load.patch sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252 @@ -120,30 +118,54 @@ multilib_src_configure() { # So start with all ssl providers off until proven otherwise # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) local myconf=() + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + #myconf+=( --without-default-ssl-backend ) if use ssl ; then - if use curl_ssl_gnutls; then + if use gnutls || use curl_ssl_gnutls; then einfo "SSL provided by gnutls" myconf+=( --with-gnutls --with-nettle ) - elif use curl_ssl_libressl; then - einfo "SSL provided by LibreSSL" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_mbedtls; then + fi + if use mbedtls || use curl_ssl_mbedtls; then einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) - elif use curl_ssl_nss; then + fi + if use nss || use curl_ssl_nss; then einfo "SSL provided by nss" myconf+=( --with-nss ) - elif use curl_ssl_openssl; then + fi + if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_winssl; then + fi + if use winssl || use curl_ssl_winssl; then einfo "SSL provided by Windows" myconf+=( --with-winssl ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_libressl; then + einfo "Default SSL provided by LibreSSL" + myconf+=( --with-default-ssl-backend=openssl ) # NOTE THE HACK HERE + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_winssl; then + einfo "Default SSL provided by Windows" + myconf+=( --with-default-ssl-backend=winssl ) else eerror "We can't be here because of REQUIRED_USE." fi + else einfo "SSL disabled" fi diff --git a/net-misc/curl/curl-7.71.1.ebuild b/net-misc/curl/curl-7.71.1.ebuild index cfcba68debda..0cec1ab0a84f 100644 --- a/net-misc/curl/curl-7.71.1.ebuild +++ b/net-misc/curl/curl-7.71.1.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gopher +http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" IUSE+=" elibc_Winnt" @@ -20,7 +20,7 @@ IUSE+=" elibc_Winnt" #lead to lots of false negatives, bug #285669 RESTRICT="test" -RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) +RDEPEND="ldap? ( net-nds/openldap[static-libs?,${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) ssl? ( curl_ssl_gnutls? ( @@ -48,7 +48,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) net-libs/nghttp3[${MULTILIB_USEDEP}] net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}] ) - quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] ) + quiche? ( >=net-libs/quiche-0.5.0[${MULTILIB_USEDEP}] ) idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] ) adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) diff --git a/net-misc/curl/curl-7.69.1.ebuild b/net-misc/curl/curl-7.72.0.ebuild index c787559e0302..598b09eed1c4 100644 --- a/net-misc/curl/curl-7.69.1.ebuild +++ b/net-misc/curl/curl-7.72.0.ebuild @@ -11,34 +11,33 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz" LICENSE="curl" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads" +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl" IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl" IUSE+=" nghttp3 quiche" IUSE+=" elibc_Winnt" #lead to lots of false negatives, bug #285669 -RESTRICT="test" +RESTRICT="!test? ( test )" RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) ssl? ( - curl_ssl_gnutls? ( + gnutls? ( net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] dev-libs/nettle:0=[${MULTILIB_USEDEP}] app-misc/ca-certificates ) - curl_ssl_libressl? ( - dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_mbedtls? ( + mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] app-misc/ca-certificates ) - curl_ssl_openssl? ( - dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] + openssl? ( + !libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] ) ) - curl_ssl_nss? ( + nss? ( dev-libs/nss:0[${MULTILIB_USEDEP}] app-misc/ca-certificates ) @@ -75,9 +74,9 @@ BDEPEND="virtual/pkgconfig )" # c-ares must be disabled for threads -# only one ssl provider can be enabled +# only one default ssl provider can be enabled REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) + winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( @@ -119,30 +118,54 @@ multilib_src_configure() { # So start with all ssl providers off until proven otherwise # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/) local myconf=() + myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl ) myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) + #myconf+=( --without-default-ssl-backend ) if use ssl ; then - if use curl_ssl_gnutls; then + if use gnutls || use curl_ssl_gnutls; then einfo "SSL provided by gnutls" myconf+=( --with-gnutls --with-nettle ) - elif use curl_ssl_libressl; then - einfo "SSL provided by LibreSSL" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_mbedtls; then + fi + if use mbedtls || use curl_ssl_mbedtls; then einfo "SSL provided by mbedtls" myconf+=( --with-mbedtls ) - elif use curl_ssl_nss; then + fi + if use nss || use curl_ssl_nss; then einfo "SSL provided by nss" myconf+=( --with-nss ) - elif use curl_ssl_openssl; then + fi + if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then einfo "SSL provided by openssl" myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - elif use curl_ssl_winssl; then + fi + if use winssl || use curl_ssl_winssl; then einfo "SSL provided by Windows" myconf+=( --with-winssl ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + elif use curl_ssl_libressl; then + einfo "Default SSL provided by LibreSSL" + myconf+=( --with-default-ssl-backend=openssl ) # NOTE THE HACK HERE + elif use curl_ssl_mbedtls; then + einfo "Default SSL provided by mbedtls" + myconf+=( --with-default-ssl-backend=mbedtls ) + elif use curl_ssl_nss; then + einfo "Default SSL provided by nss" + myconf+=( --with-default-ssl-backend=nss ) + elif use curl_ssl_openssl; then + einfo "Default SSL provided by openssl" + myconf+=( --with-default-ssl-backend=openssl ) + elif use curl_ssl_winssl; then + einfo "Default SSL provided by Windows" + myconf+=( --with-default-ssl-backend=winssl ) else eerror "We can't be here because of REQUIRED_USE." fi + else einfo "SSL disabled" fi @@ -170,6 +193,7 @@ multilib_src_configure() { $(use_enable imap) \ $(use_enable ldap) \ $(use_enable ldap ldaps) \ + --disable-mqtt \ --disable-ntlm-wb \ $(use_enable pop3) \ --enable-rt \ diff --git a/net-misc/curl/files/curl-fix-cpu-load.patch b/net-misc/curl/files/curl-fix-cpu-load.patch deleted file mode 100644 index fb20641b5b22..000000000000 --- a/net-misc/curl/files/curl-fix-cpu-load.patch +++ /dev/null @@ -1,94 +0,0 @@ -Fixes https://bugs.gentoo.org/727352 - -From 2a41e236716da4c41ebc1132bd36d9273bd0321f Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Mon, 8 Jun 2020 14:05:22 +0200 -Subject: [PATCH] socks: detect connection close during handshake - -The SOCKS4/5 state machines weren't properly terminated when the proxy -connection got closed, leading to a busy-loop. - -Reported-By: zloi-user on github -Fixes #5532 -Closes #5542 ---- - lib/socks.c | 32 ++++++++++++++++++++++++++++---- - 1 file changed, 28 insertions(+), 4 deletions(-) - -diff --git a/lib/socks.c b/lib/socks.c -index 4c1af7b9de7..b2215fef30c 100644 ---- a/lib/socks.c -+++ b/lib/socks.c -@@ -382,6 +382,11 @@ CURLcode Curl_SOCKS4(const char *proxy_user, - curl_easy_strerror(result)); - return CURLE_COULDNT_CONNECT; - } -+ else if(!result && !actualread) { -+ /* connection closed */ -+ failf(data, "connection to proxy closed"); -+ return CURLE_COULDNT_CONNECT; -+ } - else if(actualread != sx->outstanding) { - /* remain in reading state */ - sx->outstanding -= actualread; -@@ -592,6 +597,11 @@ CURLcode Curl_SOCKS5(const char *proxy_user, - failf(data, "Unable to receive initial SOCKS5 response."); - return CURLE_COULDNT_CONNECT; - } -+ else if(!result && !actualread) { -+ /* connection closed */ -+ failf(data, "Connection to proxy closed"); -+ return CURLE_COULDNT_CONNECT; -+ } - else if(actualread != sx->outstanding) { - /* remain in reading state */ - sx->outstanding -= actualread; -@@ -717,15 +727,19 @@ CURLcode Curl_SOCKS5(const char *proxy_user, - failf(data, "Unable to receive SOCKS5 sub-negotiation response."); - return CURLE_COULDNT_CONNECT; - } -- if(actualread != sx->outstanding) { -+ else if(!result && !actualread) { -+ /* connection closed */ -+ failf(data, "connection to proxy closed"); -+ return CURLE_COULDNT_CONNECT; -+ } -+ else if(actualread != sx->outstanding) { - /* remain in state */ - sx->outstanding -= actualread; - sx->outp += actualread; - return CURLE_OK; - } -- - /* ignore the first (VER) byte */ -- if(socksreq[1] != 0) { /* status */ -+ else if(socksreq[1] != 0) { /* status */ - failf(data, "User was rejected by the SOCKS5 server (%d %d).", - socksreq[0], socksreq[1]); - return CURLE_COULDNT_CONNECT; -@@ -890,6 +904,11 @@ CURLcode Curl_SOCKS5(const char *proxy_user, - failf(data, "Failed to receive SOCKS5 connect request ack."); - return CURLE_COULDNT_CONNECT; - } -+ else if(!result && !actualread) { -+ /* connection closed */ -+ failf(data, "connection to proxy closed"); -+ return CURLE_COULDNT_CONNECT; -+ } - else if(actualread != sx->outstanding) { - /* remain in state */ - sx->outstanding -= actualread; -@@ -967,7 +986,12 @@ CURLcode Curl_SOCKS5(const char *proxy_user, - failf(data, "Failed to receive SOCKS5 connect request ack."); - return CURLE_COULDNT_CONNECT; - } -- if(actualread != sx->outstanding) { -+ else if(!result && !actualread) { -+ /* connection closed */ -+ failf(data, "connection to proxy closed"); -+ return CURLE_COULDNT_CONNECT; -+ } -+ else if(actualread != sx->outstanding) { - /* remain in state */ - sx->outstanding -= actualread; - sx->outp += actualread; diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml index 8d7bc1a2c2d3..a11184c0ca04 100644 --- a/net-misc/curl/metadata.xml +++ b/net-misc/curl/metadata.xml @@ -9,20 +9,25 @@ <flag name="alt-svc">Enable alt-svc support</flag> <flag name="brotli">Enable brotli compression support</flag> <flag name="ftp">Enable FTP support</flag> + <flag name="gnutls">Enable gnutls ssl backend</flag> <flag name="gopher">Enable Gopher protocol support</flag> <flag name="http2">Enable HTTP/2.0 support</flag> <flag name="imap">Enable Internet Message Access Protocol support</flag> + <flag name="mbedtls">Enable mbedtls ssl backend</flag> <flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag> <flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag> - <flag name="ssh">Enable SSH urls in curl using libssh2</flag> <flag name="metalink">Enable metalink support</flag> + <flag name="nss">Enable nss ssl backend</flag> + <flag name="openssl">Enable openssl ssl backend</flag> <flag name="pop3">Enable Post Office Protocol 3 support</flag> <flag name="progress-meter">Enable the progress meter</flag> + <flag name="rtmp">Enable RTMP Streaming Media support</flag> <flag name="smtp">Enable Simple Mail Transfer Protocol support</flag> + <flag name="ssh">Enable SSH urls in curl using libssh2</flag> <flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag> <flag name="telnet">Enable Telnet protocol support</flag> <flag name="tftp">Enable TFTP support</flag> - <flag name="rtmp">Enable RTMP Streaming Media support</flag> + <flag name="winssl">Enable winssl ssl backend</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:curl:curl</remote-id> diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest index 3874134113d8..7ae96aecc312 100644 --- a/net-misc/dahdi-tools/Manifest +++ b/net-misc/dahdi-tools/Manifest @@ -7,5 +7,5 @@ AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7cce AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694 -EBUILD dahdi-tools-3.1.0.ebuild 1610 BLAKE2B 6ad00f51f5f7bd35456ff314214e51cca71c5ca37522494b42afb964c31bc1f216859449195b10b215c8937f91f76f52e5279574abe7957e16da0f3c5b9053e1 SHA512 a1dc3b4975b9e178d7667a5bf43c16cc24617f4876dcc05a885b963b68994ee8a6b4c94c53cea0ebe9e604ad904bccec1d5ebaa4df96916f414d30f7a4e41a47 +EBUILD dahdi-tools-3.1.0.ebuild 1692 BLAKE2B 7ed3148872c5975ad46517a4e687509610ebe57755be7e6ffbf5b1d8617f6a4ae12b7610d30eac5192199190e160d7ea6ee791e62f66deada89c40a39c15005e SHA512 e20f7a9fb034725b1b96a23630a5bfc37d2b90bf702343577328a1c1a078094ed93085e64f5be8a627570168916ab56efdbbe697f4fded5a5f774195b7f4d5f0 MISC metadata.xml 443 BLAKE2B 5a35a0f5e7aa8d8b19423f8aab317e7eef695b76f1b541a96af1c0f6194d3919a56260e3a461a0acbabd268f884265876b9601348179a976b620f39ca4bcab48 SHA512 d071770c4efce5c06137822cbf002d29c11b59f004afc537008417204851e05751df7b21140abc74e8439baa00d2e15bd596b4436f8e8aa5815ea8200018d007 diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild index 42a85a441515..4aa6660067cc 100644 --- a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild +++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="ppp" PATCHES=( "${FILESDIR}/dahdi-nondigium-blacklist.patch" @@ -26,7 +26,11 @@ DEPEND="dev-libs/newt sys-kernel/linux-headers virtual/libusb:0 ppp? ( net-dialup/ppp )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + dev-lang/perl:= + dev-perl/CGI" +BDEPEND="dev-lang/perl + sys-apps/file" src_prepare() { default diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest index 19dc34131258..4d07f273fe2e 100644 --- a/net-misc/dahdi/Manifest +++ b/net-misc/dahdi/Manifest @@ -18,5 +18,5 @@ DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66 -EBUILD dahdi-3.1.0-r1.ebuild 4781 BLAKE2B f317267d87d5d5c6617bd94928196d661ea9bd80dce5f55665baebcd898588e7c1859df4fa66fbcbef124801f44af6d5ee4f0dff4624ea904045286cf48887ff SHA512 6101d70501c8a57b18955824966a7c023d9e88871aa236bf4dc214d66a9b0ab64ae2599b79851812e93d3398ac02bd0bcc10347d554be7fec0a5ed3afd2ee303 +EBUILD dahdi-3.1.0-r2.ebuild 4797 BLAKE2B 0678c138c04c0d18e7b1220150615cc19bedc684ba8e22129439e938c80eed8af614314849e2d86811e18bacd78eb0baf4403784f658e5be4b473e66af0528ef SHA512 5846b09fe4cb0103c97f7eab2ae4e4a2ae4ad4872bb36979dac84378095611cfee432b1ff326d8fabb3d9d4d877fbbaa81a1fed93118c8acc7787d3159753101 MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r2.ebuild index f69efcbe4185..1bde322e9f43 100644 --- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild +++ b/net-misc/dahdi/dahdi-3.1.0-r2.ebuild @@ -38,12 +38,12 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_ LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="flash oslec" PATCHES=( "${WORKDIR}/dahdi-patchset" ) -CONFIG_CHECK="MODULES ~CRC_CCITT" +CONFIG_CHECK="MODULES PCI ~CRC_CCITT" pkg_pretend() { use oslec && CONFIG_CHECK+=" ECHO" diff --git a/net-misc/dhcdrop/Manifest b/net-misc/dhcdrop/Manifest index 5d9309c06963..53c94dd1ccf5 100644 --- a/net-misc/dhcdrop/Manifest +++ b/net-misc/dhcdrop/Manifest @@ -1,3 +1,3 @@ DIST dhcdrop-0.5.tar.bz2 279218 BLAKE2B e09921633e00b17ca703400bbb50b5551266b80521985c57501e4d94eafca3da6d35c55a78bd98ec832f733e5a11321b2ba56c301aa14e21b0b1fc3e582851b7 SHA512 11ac0ca6dcb65f696936e47e43cfbdd59083b607b26b5d12274cc04577be257dda94e9c27eb0c4aebb40f5f572693478cceb04cc4b5b06bf8882c3001fc46142 -EBUILD dhcdrop-0.5.ebuild 639 BLAKE2B 7a5f9c486159cf92d22fbbe21ee0648c069d79e14bb51a1d11b8f3af0720eff13d5ee259f1d8f15669ef1a87f6629af1f0d29b6ef79070c1462bf9a5c0f59e12 SHA512 2aa7f96f2c53b11a276726e2d1e6398c43493f8e39724ec4195378f788117b8fd2b528845949066a2c878b81f960bdbbbf9a36b6ae23601a88303f0f503791fd +EBUILD dhcdrop-0.5-r1.ebuild 715 BLAKE2B fb01a2f4f786208f2d9b46565b467eca502988abad809f228678d81ee6754ae414b7b35129d1b6690470b580d29968c3ba494695d8cb57a418347102599f3cf8 SHA512 3f0d28f9765cb1545ad5abad5f6bdd98fea24082c7770f2ea6a594aa9cc82b2e5b4122ba381ef5d0d2ff294ebb22fcdda70ff49b9a7c59804be24c7a1ffd592a MISC metadata.xml 996 BLAKE2B dc9777bace1e52c34401d45b387e3583d25e6c93208d884f4fd61a895fe23c9d7143a4438ce195fbe822a7488ee4aac1eb9b6ece7c2801af79bed100c9eac63b SHA512 3096fdaf9def441097b4464fb69719ec46b633d3d3623079a55fb14ed264431c116e36361803d54e907673e27b30428687d60c60aa7ff490938d61b90fa35fc1 diff --git a/net-misc/dhcdrop/dhcdrop-0.5.ebuild b/net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild index db32686b5063..5757f718f4d5 100644 --- a/net-misc/dhcdrop/dhcdrop-0.5.ebuild +++ b/net-misc/dhcdrop/dhcdrop-0.5-r1.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" - -inherit eutils +EAPI=7 DESCRIPTION="Effectively suppresses illegal DHCP servers on the LAN" HOMEPAGE="http://www.netpatch.ru/dhcdrop.html" @@ -22,7 +20,12 @@ DEPEND="static? ( net-libs/libpcap[static-libs] ) DOCS=( AUTHORS ChangeLog INSTALL NEWS README ) src_prepare() { - epatch_user + # Fix building with clang, bug #731694 + sed -i \ + -e '/^PACKAGE_/s/"//g' \ + configure || die + + eapply_user } src_configure() { diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest index ef316f7e12b4..1719673f9441 100644 --- a/net-misc/dhcpcd-ui/Manifest +++ b/net-misc/dhcpcd-ui/Manifest @@ -1,6 +1,4 @@ -AUX dhcpcd-ui-0.7.7-tinfo.patch 588 BLAKE2B 1f6ac41accd2643450721364e5fd907dfeb16981935643218804f94599b0d5c973202669a8eb5f8304f63037ff4be3f146f0f794564179c01574e02d0544d138 SHA512 be55e055ff66ca25bb24c2375a7cde3091a0bf90a4490e9f012a9563bdbfaff28f4e92ea0014c640d57fc296515dfd3d3757fac5fbe8b9f1985d97c23f3c9ce0 -DIST dhcpcd-ui-0.7.5.tar.bz2 209112 BLAKE2B 1eec904acefbc5059496419991b1d53c6715d56e611e09d7474879b4ae2741e61ce85bdd7ca32db42a8a890790d8784ee8904fa1228ab43488a88480f73dcd1c SHA512 78dba758f7cee825a1618c33b1fff9549c4e51e19fd5eebd1ae5d6a4686726ec8ad86dc1ec5384238b43589dd700979c694f48bc94e2844f1ef898292660a5d2 +AUX dhcpcd-ui-0.7.7-tinfo.patch 912 BLAKE2B 98d9797abc46573c3d83ca6d9d3c97746f9cabaad6a5c5f5e498a3ee3b90b440477552297c425dc75cc778b4071ab48eb730eeb99e235acedf59341170cd0dd8 SHA512 c803e61c2841834e6bcb01b5736dd04f432ee00f2aaeddf083c28df5864c5eea1ca7d1b5395671cca01e52243029d214d31ab4e5f330dc2992add4ac2cb30a72 DIST dhcpcd-ui-0.7.7.tar.xz 195648 BLAKE2B f382e331326e66d81674579ba018e6f9a6662df9d10fa0cca92808290e5d7621e7861afaa3d9a2c4d05fcc24b619922f8740faeaf4a531701f5d14505636fdf7 SHA512 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d -EBUILD dhcpcd-ui-0.7.5-r1.ebuild 1168 BLAKE2B 4d8ddcf2828a6b7523861e74b29be68d1cbef7fbaeea01de7920ddf6d64206179f292626238639b74bfb34b83307b1989810aa6f35c7c978cb0798e8b919c30d SHA512 9a89b625ccd2b930266a5767f38a6e3f42389ddd2a3b9312564a3782948598d251ed957c33a0be852e754445c6574dc566c1ccd47eb5ae734d0053b618124526 -EBUILD dhcpcd-ui-0.7.7.ebuild 1265 BLAKE2B c8cdb6e44699e696a972539c92a6fe1d3135e1e9ccbf9632ce8326a9a5761974774dd2ae00f1450df1827706d660de357b7bec5601826c8b3d04f83c482213b2 SHA512 7374ae5adcd9daf488d46c995535d2c3fccb37d8574b42c99e6b83f490587139933004805322a9150afd9da6aa918b7da621ae8ef945761564970f9b79941698 -MISC metadata.xml 379 BLAKE2B f9018bb0bad0ae5539e4d49b96cc61303ebeed6506464b15180a50e186315cb5c4989e2092237abbec4002932b4468c80c621f0f053a8a01b502db873e7a198b SHA512 8ce600176afa1fb8ef3d6f17f22b2757bd719f6a12cb377ff909333a3cc4f3d9b0e563c9cd3f11ddcf4151e5362c4fa66825eec9e8ca0ca3180f170b9334d2bd +EBUILD dhcpcd-ui-0.7.7-r1.ebuild 1350 BLAKE2B 2242025e46d67967cde0c7619f3bcddc47301d3e59f1c3ff129b4d650af2a94fa4828832e32a512bcd0e44df5f7284a361ce283b463d5aadf66eaf4c0fe0b03b SHA512 c6e730f0d2d7b847b62aebf2171ea849d3fdaf068ef7894bd8b8acf09ec7f5fa4cc77ff89307739f5de34ead6d069bd574dbea761aa81091675119a5a7cd4f5a +MISC metadata.xml 278 BLAKE2B f04208caf75cd1e148b392ed9177f706cab4a373ff62412f46496d7e18430c6cf510e29876b1ef581fc67f561b3e114bcf05ee94920b1e3a10e6554d6cbb2887 SHA512 c7530022ff0aeb201cceabe36c9386e65eeb8ac3fe1fba0c429545408d22203bd972943c7ba8e8058f1d4166d306dfe9a2f3508f07438853b8997ce6bcf43e05 diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild deleted file mode 100644 index a89c1a8d7012..000000000000 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.5-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="Desktop notification and configuration for dhcpcd" -HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/" -SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug gtk gtk3 libnotify" - -REQUIRED_USE=" - ?? ( gtk gtk3 ) - libnotify? ( || ( gtk gtk3 ) )" - -DEPEND=" - virtual/libintl - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - gtk3? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - ) - libnotify? ( x11-libs/libnotify )" - -RDEPEND="${DEPEND} - >=net-misc/dhcpcd-6.4.4" - -src_configure() { - local myeconfargs=( - --without-qt - $(use_enable debug) - $(usex gtk '--with-gtk=gtk+-2.0 --with-icons' '') - $(usex gtk3 '--with-gtk=gtk+-3.0 --with-icons' '') - $(use_enable libnotify notification) - $(use gtk || use gtk3 || echo '--without-icons --without-gtk') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - - systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service -} diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild index a92eeca9d77e..8cd78ad55b53 100644 --- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild +++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit systemd +inherit systemd xdg DESCRIPTION="Desktop notification and configuration for dhcpcd" HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/" @@ -11,7 +11,7 @@ SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug gtk gtk2 libnotify ncurses qt5" REQUIRED_USE="libnotify? ( gtk ) @@ -62,6 +62,13 @@ src_configure() { src_install() { emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service } + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch index ca7c284e428e..675b1edad4a9 100644 --- a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch +++ b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch @@ -1,25 +1,39 @@ -From 28eeb5e4a5d92ff913e3956550bff56f615c97df Mon Sep 17 00:00:00 2001 +From 988c171aa06bee85e393b28a482c894ccbbf8f58 Mon Sep 17 00:00:00 2001 From: Lars Wendler <polynomial-c@gentoo.org> -Date: Sat, 21 Dec 2019 15:17:56 +0100 -Subject: [PATCH] Fix build against ncurses with separate tinfo lib +Date: Mon, 10 Aug 2020 07:45:34 +0200 +Subject: [PATCH] configure: Fix build against ncurses with separate tinfo lib +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> --- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) diff --git a/configure b/configure -index ed83221..bae1180 100755 +index ed83221..f77bde5 100755 --- a/configure +++ b/configure -@@ -469,7 +469,7 @@ int main(void) { - } - EOF - if $XCC _curses.c -o _curses -lcurses 2>&3; then -- LIB_CURSES=-lcurses -+ LIB_CURSES="-lcurses -ltinfo" +@@ -472,6 +472,21 @@ EOF + LIB_CURSES=-lcurses fi rm -f _curses.c _curses ++ ++ #Check for -ltinfo requirement ++ cat <<EOF >_curses.c ++#include <curses.h> ++int main(void) { ++ curs_set(1); ++ return 0; ++} ++EOF ++ if ! $XCC _curses.c -o _curses -lcurses 2>&3; then ++ if $XCC _curses.c -o _curses -ltinfo 2>&3; then ++ LIB_CURSES="$LIB_CURSES -ltinfo" ++ fi ++ fi ++ rm -f _curses.c _curses fi + if [ -n "$LIB_CURSES" ]; then + echo "$LIB_CURSES" -- -2.24.1 +2.28.0 diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml index f3c463d88512..84adda2592e8 100644 --- a/net-misc/dhcpcd-ui/metadata.xml +++ b/net-misc/dhcpcd-ui/metadata.xml @@ -6,8 +6,5 @@ <flag name="gtk2"> Build with <pkg>x11-libs/gtk+</pkg> version 2 instead of version 3 </flag> - <flag name="gtk3"> - Add support for <pkg>x11-libs/gtk+</pkg> version 3 (The GIMP Toolkit) - </flag> </use> </pkgmetadata> diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 56b1dd1c66c4..280bce55b7fd 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -1,4 +1,3 @@ -AUX dhcpcd-9.1.2-embedded_config.patch 1607 BLAKE2B 04b6b55c60d5a57e3a06983f3324eca1ada0b732cbacc1f24eb237815d7e7906e8a856ddf8f1de949f9ad83164862ccdecee1a8d1e945688f1d658c124db5c84 SHA512 95a15299a58d8b9cf7f4162218815d7c418b8445958760ade60d7863d90a009c4a53aa64ea4651fc5dceff3a9719b7c94bdbbed955cf21bdae56897c3db0e4a2 AUX dhcpcd.initd 315 BLAKE2B c972ddd75c879d4e6a109cc4fd7b377ea27aef0b79ea5524cc456050117627c1baef8e884dbcd2cec987bac43efb42b77b426d6f2f864f09bf922142e08cd6af SHA512 f554a78c04ddae8fdc44a9427c5fc318d4eb31b6771bcc46e9b06feafc061ab9c1ceffb7d740cba57905f0820ca5e2313b152b217772abd5a9b9385e9aae7459 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557 diff --git a/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch b/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch deleted file mode 100644 index 5401317a2ece..000000000000 --- a/net-misc/dhcpcd/files/dhcpcd-9.1.2-embedded_config.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9dc6d4b7c8df8425c9b1e893e86b8463abb2053c Mon Sep 17 00:00:00 2001 -From: Roy Marples <roy@marples.name> -Date: Mon, 15 Jun 2020 22:04:37 +0100 -Subject: configure: Fix fallout with disabling embedded config - ---- - configure | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/configure b/configure -index 8398ad69..a3701726 100755 ---- a/configure -+++ b/configure -@@ -545,15 +545,6 @@ if [ -z "$AUTH" -o "$AUTH" = yes ]; then - echo "SRCS+= auth.c" >>$CONFIG_MK - fi - --if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then -- echo "$DHCPCD_DEFS will be embedded in dhcpcd itself" -- echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK --else -- echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR" -- echo "CPPFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK -- echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK --fi -- - if [ -z "$PRIVSEP" ]; then - # privilege separation works fine .... except on Solaris - case "$OS" in -@@ -665,6 +656,16 @@ EOF - rm -f _pledge.c _pledge - fi - -+# This block needs to be after the compiler test due to embedded quotes. -+if [ -z "$EMBEDDED" -o "$EMBEDDED" = yes ]; then -+ echo "$DHCPCD_DEFS will be embedded in dhcpcd itself" -+ echo "DHCPCD_SRCS+= dhcpcd-embedded.c" >>$CONFIG_MK -+else -+ echo "$DHCPCD_DEFS will be installed to $LIBEXECDIR" -+ echo "CPPFLAGS+= -DEMBEDDED_CONFIG=\\\"$LIBEXECDIR/dhcpcd-definitions.conf\\\"" >>$CONFIG_MK -+ echo "EMBEDDEDINSTALL= _embeddedinstall" >>$CONFIG_MK -+fi -+ - if [ "$OS" = linux ]; then - printf "Testing for nl80211 ... " - cat <<EOF >_nl80211.c --- -cgit v1.2.3 - diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest index d29cc9155649..73c3faaf207d 100644 --- a/net-misc/dibbler/Manifest +++ b/net-misc/dibbler/Manifest @@ -5,7 +5,7 @@ AUX dibbler-client.service 134 BLAKE2B f425f3460ae1188b2a391e240dd8f64e3ed9b8114 AUX dibbler-relay 348 BLAKE2B c9a8d1f2b130e00e9d0f4ad517fc5256ec1d09cde6b66c8641cdf6b171b170944866842d76a4619f2294dd30de9670dc45775d16253e96a1ee4a668ece576285 SHA512 5eb62c4c7e9a4c5b558d0fed79a41b5a2db996349ab5ebfdff2f50d2bf0ba0e4293aab1a9bb089014aacaa3a502a7a13c14b3f3fe9510d1c0d91fca2b0674745 AUX dibbler-server 354 BLAKE2B 08b1177bbe9f3f1f1be809dd9f3617368257072e22ad6fe1e1a671429a2e488ac47d2902defd34b60b0adf9b6aaf0db119c8edb4c4ce8d510df8e0f0a8b260dd SHA512 3d2f1df6263e3373988d5ba75479a7bed16c3a363809fdde582afeebab0cda746c91d02f8a9535e15ed1095c098f4ab3721322092bc692e0403f8c46f16adcd5 DIST dibbler-1.0.1.tar.gz 4375118 BLAKE2B 1418a20ecf96f0793b25165d2790bb12aec0dc9ffbdf248f996f736e375f466a5853f698bc3da753dae57db4493a662cc8962e5d1fb6d9dd7c0c9d893128773e SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0 -EBUILD dibbler-1.0.1-r2.ebuild 1377 BLAKE2B 564d335fb52c3c4dd702028a9d706caedce5e26d8a2762dcac524b65028ad94389d4ea0b1aa1ad4c647c214907a819a96a4c17584350fd2aa988a534712bba8b SHA512 717e52ec0d5c90e708f5437ffa294e34fe1c548e9d3fb923466090f14c9e66853901018877832369a7c6f38f53ee3b706ecd1f2ef8799f46cb199dfbf96e26f1 -EBUILD dibbler-1.0.1-r3.ebuild 1412 BLAKE2B 136b4d9aad708120816016d2663107b70a23a95fffb45badee12ad90a85ebc0c7d81a339ae2f499e322c208b938c531f38405a37ea11992d8881f6d6ce32a891 SHA512 209526ea3daa1b5fb48fca5f986f3ec0bc99ed15907b0c7fc2b1f11d7d15f140bbb5eebe067c9a68abcbe180f8b313b754b90b17eca5f7c9024ce1e7946d5558 -EBUILD dibbler-1.0.1.ebuild 1232 BLAKE2B 5d096c882545cb1c0dcb50e5dfc8cb6787cd100aa3ddf5e92df19695e04d3abb1cb3b9eccc115b9514273746bf232ee64eed5adf2723374ef63bac0bdcdda831 SHA512 a7a2693956d8c9cb85023dbe460899acd3f9fea9bc673558f9a15f2e6c2acad694ed918a2e9b8dc4b2c5c1ff0dae202ef405f3620e4cbcbf962cbf08c36c6d9b +EBUILD dibbler-1.0.1-r2.ebuild 1342 BLAKE2B aaa10aa5fb467c1b65ecc559250cc5fd633ed915d1e4b2cd8526ac9b5f1774b02370f25b25b2c9ff958c388134d1b0ea3656481ef3d21c92d242d63e27efbea8 SHA512 4e9d53563f94dc14fa9cdce3fa1fa93a0ac931568aa118e535edb073446d48ea83cc19bde4fe1c8aff09a65b58c8de4581f1c598cb64f7c80f954d55a91803a3 +EBUILD dibbler-1.0.1-r3.ebuild 1377 BLAKE2B 1ef90dcbeb577d64045077879e9987339685d5c58d3d85d698a255284ba69424085b855377ec9cfc78a62d0454c5979a2241a247b2e03e7474cf9b7cdcdd7bb3 SHA512 ceba9d31bd4b2a3edbb6e2ccf50751448c74246c5a612318686e3509d97a2582c530aeaceb797df5ac0f09cf114687cd8260bdfcbc39461ad169e29708924a2e +EBUILD dibbler-1.0.1.ebuild 1203 BLAKE2B 24fa20e21665dd00f6a667faa921470844fbe851e392e717f58b74fb105eb6ec18063092a0d5eedb64aa883a1fb7906703f8b9195d66a969f8370bcea07e2e3e SHA512 e3d27e086b2a07e4b9f7528b0b7ba50b160e35ff7a75be35a7c32bd169083ab507660fdd51b17f3bdfccaf0996f149fbb8bbab46b52ec2a409e226e7dbc25a5c MISC metadata.xml 350 BLAKE2B 88539009202645f314ed13bd5d4ebca86b45658a3d9de79596c337b262f6a37911efdb52defb0ea6e6a07ef8977cf1f3410a5d19359197df1d2c769f279856a7 SHA512 41de174499d1f04980b349af4c88d4fa396dee28edde06eeda3a144bed48f2a20d333f4b6ea7f0137e9ebbd3f47cc2019960084bec1bb8525daa6c06da90c0e9 diff --git a/net-misc/dibbler/dibbler-1.0.1-r2.ebuild b/net-misc/dibbler/dibbler-1.0.1-r2.ebuild index 9490ae32650f..64f7775868c1 100644 --- a/net-misc/dibbler/dibbler-1.0.1-r2.ebuild +++ b/net-misc/dibbler/dibbler-1.0.1-r2.ebuild @@ -15,12 +15,7 @@ IUSE="doc resolvconf" RDEPEND="resolvconf? ( virtual/resolvconf )" DEPEND="${RDEPEND} - doc? ( - || ( - dev-texlive/texlive-latexextra - dev-tex/floatflt - ) - )" + doc? ( dev-texlive/texlive-latexextra )" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) diff --git a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild index 8db74de7aae0..3bc3e0296bbb 100644 --- a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild +++ b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild @@ -15,12 +15,7 @@ IUSE="doc resolvconf" RDEPEND="resolvconf? ( virtual/resolvconf )" DEPEND="${RDEPEND} - doc? ( - || ( - dev-texlive/texlive-latexextra - dev-tex/floatflt - ) - )" + doc? ( dev-texlive/texlive-latexextra )" PATCHES=( "${FILESDIR}"/${P}-fno-common.patch "${FILESDIR}"/${P}-gnu-ism.patch diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild index e4bbf0482849..474895975efd 100644 --- a/net-misc/dibbler/dibbler-1.0.1.ebuild +++ b/net-misc/dibbler/dibbler-1.0.1.ebuild @@ -13,10 +13,7 @@ SLOT="0" KEYWORDS="amd64 ~arm64 hppa ~mips x86" IUSE="doc" -DEPEND="doc? ( || ( - dev-texlive/texlive-latexextra - dev-tex/floatflt ) - )" +DEPEND="doc? ( dev-texlive/texlive-latexextra )" RDEPEND="" DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest index bdc052f39612..5e372c445d22 100644 --- a/net-misc/dropbear/Manifest +++ b/net-misc/dropbear/Manifest @@ -1,6 +1,6 @@ AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8 -DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f -EBUILD dropbear-2019.78.ebuild 2691 BLAKE2B 76efc8649b50ec3628cfb9b37fed141871c4528b783d70177623aad32022629bfbc7c3da34298fc6f374fe1ba93bf35aae961a8118c96ebe9a31094f6555cf49 SHA512 43fcbbc60de31713fb4245d12c3fd362e26e25077c706257a889d27d3e8f4123d07013a489c204ca40769c093f723c1d9ef0ce826f4012e7dac7d90e222c1a83 +DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3 +EBUILD dropbear-2020.80-r1.ebuild 2703 BLAKE2B b3dbf9e23b9fe7fb3a0f286cdee5f40aaeea86f8c5cddb1ddf684a1807fa145bfa95d5843d0b401baa46102170db9e6c1754d8784f2fb53fb513bea24234628b SHA512 24dd5fb5529414dcaa66b65061571e391c90eefef0331c5f0870b592f466625d56fc06b530a80662e0ed87a646153dd6511b31ffe6dac0974a9289a5600e8afc MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314 diff --git a/net-misc/dropbear/dropbear-2019.78.ebuild b/net-misc/dropbear/dropbear-2020.80-r1.ebuild index d522d904fd9e..724fc017e16c 100644 --- a/net-misc/dropbear/dropbear-2019.78.ebuild +++ b/net-misc/dropbear/dropbear-2020.80-r1.ebuild @@ -3,24 +3,32 @@ EAPI=7 -inherit savedconfig pam user +inherit savedconfig pam DESCRIPTION="small SSH 2 client/server designed for small memory environments" HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html" SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2" -LICENSE="MIT" +LICENSE="MIT GPL-2" # (init script is GPL-2 #426056) SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib" -LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] ) - dev-libs/libtommath[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" +LIB_DEPEND=" + zlib? ( sys-libs/zlib[static-libs(+)] ) + >=dev-libs/libtommath-1.2.0[static-libs(+)] +" +RDEPEND=" + acct-group/sshd + acct-user/sshd + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + pam? ( sys-libs/pam ) +" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )" REQUIRED_USE="pam? ( !static )" @@ -100,8 +108,3 @@ src_install() { pamd_mimic system-remote-login dropbear auth account password session } - -pkg_preinst() { - enewgroup sshd 22 - enewuser sshd 22 -1 /var/empty sshd -} diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 59732f17e75c..f191026eeb04 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -1,13 +1,13 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85 -DIST dropbox-lnx.x86-100.4.409.tar.gz 96530220 BLAKE2B 392949b19d97bb8d8a63b83e48c03414eec7064f151060ae2ab9f8b852a9bb46710c7ba54440e9242f803de3245c96705255aea8ec1435061282a68e3d27bec2 SHA512 e54e6fdb5cc6eba4267cea60ae7c1dd4a4537de70c430436e7e0f6eaf99e6730bb2a69ffb3e62ff7a7b2fe23301b7c9093143554b5659385e23099d702b057a2 +DIST dropbox-lnx.x86-103.4.383.tar.gz 96880620 BLAKE2B 465ae55d90a4857f3311b4ac154297b1e422316a9b6eb0bec0b466eadafb06a0f8aa64fa8bfdcab44efdf185a344f0ea4bd2baef0df6a5712830687f08e03e96 SHA512 c4cb906729277a2b470e2ff5f4840bb2ff49e947ade1fd0b0eef1edc1bc995953b1a3ad6192592eb0c8c3a09bf67a92935be1114176651e54b227c1bf9c98ab3 +DIST dropbox-lnx.x86-104.4.175.tar.gz 96650490 BLAKE2B 4a74e3b8b31ba720ade57b685978c19827e53dc2eaf4519e10f736121c08e61de66caf1211568c52f624fb020ed8ba5c69c2dbf053bffa9e95d6c9308214d87d SHA512 30dbaa4061f673137f4659f201b62cabff94c827175d00fc348140926a9afe6f693e17237642988ccbe27988eb0aba516705cca65340d59d1d1889784660901c DIST dropbox-lnx.x86-98.4.158.tar.gz 96568004 BLAKE2B fc9ae4cf5d9ad1798dd5d55bf90cd5e77e7cd7405626fb55d4693e26d028d97a81d2843eb03d60de94f552cc446fffa4caa679ba3a750098a58549fc78ff4c67 SHA512 ce6432bbec1ec024e6753a93f2d0eed3af60de521f411f52efb63767eb500a85da80102a011e077fd9953d4827403d02143b186f30137ef7a338cb01664911a2 -DIST dropbox-lnx.x86-99.4.501.tar.gz 97126978 BLAKE2B 38476b8c0b36c385c69c44588c5b3ea227a8f7db2b1bc08c75558dfae6e962c5f9df4ce82ddb8afaa53b4b6522ec37f2cc5cfffce6d5b293a64b98333c33641b SHA512 01d91cb5be1439fd1d2e47b93da570650cbc21aa4ba0bff05f066ed5c5a60d162a7a5e3eb343e6a2ca48709964b29570b94cc8702a1064a8fce0779acb6ea14e -DIST dropbox-lnx.x86_64-100.4.409.tar.gz 100580993 BLAKE2B a9e6c4c02bfaac4f27bb0be0369c77af23bb0fe23a5105ed7c46fde699ecde012c31aff015591cad85a3fd4f3bfe58a0281f78efebb9db05fe732bfb0c92a8e2 SHA512 862c289827e3769725242b4973c384ca0ac933a5390641f8eca428a812f66858fc2f0a6ae056305fc17746d1a34ec927d68f9435c3bd47fa1308a0dbcab23e3c +DIST dropbox-lnx.x86_64-103.4.383.tar.gz 100927456 BLAKE2B f16876f45c345bf1590edb5f76d4bc0cfc3ed6dd1848badfbdbafff8409264c934de48abf9946deb2661d245077af690dfbd6d69c8e2c6b8acf9c13baced7660 SHA512 d0620fdaa6b80679390a906c0d1d4c22e0907ebacbbc06a9c52a5722b6aa793194c759af70888839d806d825d02d1504024efc7b46b7022afb5e71338e2f836e +DIST dropbox-lnx.x86_64-104.4.175.tar.gz 100702526 BLAKE2B 49d89293ce5874a01fba14204acfd1234de87b4c5e3f5dfa93cd4041f9412e0801a3e232869e376e583d46d56ea9c7635ec756f005903786dffce1caba608350 SHA512 74e4061ac00881fee06ab7f978c27a2fd0e782db7efa63d10ed7c5ce28a679fe23084521d46f819cfc2a691df6e5aad1bd6706d3c2d604d4addd50ddb99e1b3d DIST dropbox-lnx.x86_64-98.4.158.tar.gz 100751556 BLAKE2B 8ebbfa7101852e531edf9c6b3318c14418c95a0e618ce3725411e6fb1dbae70860de9b0daeba4c824fff0b3bd5f9a9347a4fe09c1433f76be3b3cc86184d769e SHA512 00db27742f8dff9d3fb96f06fcefdb30450b675b3c3cd35df717908455a8b1ca0419efff8932022d82c89dd3fccca183bc1bb16a1fb25c0505c49dfd03b06a19 -DIST dropbox-lnx.x86_64-99.4.501.tar.gz 101375862 BLAKE2B 46c03250bd2c2d480b67a645c03fc8fc0343aeb5906afd1807b49bfb44d07606b59a61fa79fcad48cb4029969f457ef347d5f1394dbf53b10586bc05b068295e SHA512 4d8b350aa8cbc9cc5491c8978cbe56eb8e08110f48dd4187d7287a46847d8a4316158ea39e09e707a135a10424e8c6bc2a66b3cf4f9b8529fc0cbf755744a118 -EBUILD dropbox-100.4.409.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8 +EBUILD dropbox-103.4.383.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8 +EBUILD dropbox-104.4.175.ebuild 2349 BLAKE2B a62df585380bb874f4127821d3e90164eb85c47c12ba5670c53d1dd91a330a82d6593e52ba5b45a6fa875a8128f772ff9aefbd6ece1429cb17590db70e072e00 SHA512 60162483835652d6a019af5bfaed3c31e4d08c6ecb3e9cf81971a9ea2b7169aaf139d3906f6ba13f45f79ecc1965afe52e25c4cce0eaa31f9fb6f01862819fff EBUILD dropbox-98.4.158.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e -EBUILD dropbox-99.4.501.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839 diff --git a/net-misc/dropbox/dropbox-100.4.409.ebuild b/net-misc/dropbox/dropbox-103.4.383.ebuild index 38f892d3ba40..38f892d3ba40 100644 --- a/net-misc/dropbox/dropbox-100.4.409.ebuild +++ b/net-misc/dropbox/dropbox-103.4.383.ebuild diff --git a/net-misc/dropbox/dropbox-99.4.501.ebuild b/net-misc/dropbox/dropbox-104.4.175.ebuild index 38f892d3ba40..e25a6938b0d2 100644 --- a/net-misc/dropbox/dropbox-99.4.501.ebuild +++ b/net-misc/dropbox/dropbox-104.4.175.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" SLOT="0" KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="+librsync-bundled selinux X" +IUSE="selinux X" RESTRICT="mirror strip" @@ -38,7 +38,6 @@ RDEPEND=" x11-misc/wmctrl x11-themes/hicolor-icon-theme ) - !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/libffi-compat:6 @@ -68,11 +67,6 @@ src_prepare() { else rm -vrf images || die fi - if use librsync-bundled ; then - patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die - else - rm -vf librsync.so.1 || die - fi patchelf --set-rpath '$ORIGIN' \ apex._apex.*.so \ nucleus_python.*.so \ diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 3afbe890e435..0067ff023ab5 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,5 +1,7 @@ AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6 +DIST electrum-4.0.2.gh.tar.gz 4395620 BLAKE2B 27d5e74ea85d792f73a01d41528dc9a84af374d672e7c7101a82e18634a32d7ebdb039571bde36625b460c6c7634ec75848711dc4cabfbd1be46f16d18e35df2 SHA512 8b03d60cb549315c9f8a2cb4f02e3a483b8e8f9ee0461bb9d54acca0d9cf96d38a158bb6bccdb1bb584fd5a3f4fd8ffbcb0d45244f41dc5636689adb514f1681 EBUILD electrum-3.3.8.ebuild 1982 BLAKE2B c1db2a13135b445b0ffd37779025868fc2446039a527988052d10dd48e0e5fff86e0e04f6373ff4d12a3e0946493c1496677404e8b35643a1847da149cf2db9d SHA512 9f9844b2ca4b8a76d3de83684860c9f840d4da10787478c579d3cebc1d026c8d4989ec0ce8de0a976d46771597723653485604d4eb85427987cba2c3364f3e61 +EBUILD electrum-4.0.2.ebuild 2400 BLAKE2B 793cf0cb19ac8e0b2a75dc3563580a144fd6364104687d74980daa1caf5478041223494f8318939130e0f1f19984977e9b78c5617400c1716f3655c3f4a71c43 SHA512 0b7e7fd953a9823299667c8931792e9ef4ff814bc6fd0bf5da48ae1f99ab7d62a4e9f79ac27942f988a05a8c3b9c0ef00dd32182cb0b2fe27803e03f359f5c74 MISC metadata.xml 629 BLAKE2B f1a4cf6cae2c3471b946b9a2966b0b3c8e7c2d39ce124fc100142b5d79d27377939094bb5b3ae9a7ff6c947b93ce12a38e3075e77110f1cad9a246e03159fed6 SHA512 c8e37976ca6a16a8d7f2326ff6d276814b5c4f5b7c1f39becb7a800f10b0c6aa7333d15f0d208a1ffd592b46db887dc77e95ffb5d1e01eea1ebfe6c478c8dfc6 diff --git a/net-misc/electrum/electrum-4.0.2.ebuild b/net-misc/electrum/electrum-4.0.2.ebuild new file mode 100644 index 000000000000..cad41a9dfc26 --- /dev/null +++ b/net-misc/electrum/electrum-4.0.2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="ncurses?" + +inherit desktop distutils-r1 xdg-utils + +DESCRIPTION="User friendly Bitcoin client" +HOMEPAGE="https://electrum.org/" +SRC_URI=" + https://github.com/spesmilo/electrum/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli ncurses qrcode +qt5" +REQUIRED_USE="|| ( cli ncurses qt5 )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libsecp256k1 + >=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}] + =dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}] + >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + dev-python/bitstring[${PYTHON_USEDEP}] + <dev-python/dnspython-2[${PYTHON_USEDEP}] + >=dev-python/ecdsa-0.14[${PYTHON_USEDEP}] + dev-python/pbkdf2[${PYTHON_USEDEP}] + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/qrcode[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}] + qrcode? ( media-gfx/zbar[v4l] ) + qt5? ( + dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + ) + ncurses? ( $(python_gen_impl_dep 'ncurses') ) + || ( + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ) +" +BDEPEND=" + test? ( + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + eapply "${FILESDIR}/3.1.2-no-user-root.patch" + eapply "${FILESDIR}/3.3.2-desktop.patch" + + # Prevent icon from being installed in the wrong location + sed -i '/icons_dirname/d' setup.py || die + + # use backwards-compatible cryptodome API + sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die + + local bestgui + if use qt5; then + bestgui=qt + elif use ncurses; then + bestgui=text + else + bestgui=stdio + fi + sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die + + eapply_user + + xdg_environment_reset + distutils-r1_src_prepare +} + +src_install() { + doicon -s 128 electrum/gui/icons/${PN}.png + dodoc RELEASE-NOTES + distutils-r1_src_install +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-misc/ena-driver/Manifest b/net-misc/ena-driver/Manifest index ac8177d37e51..dc127bb4efdb 100644 --- a/net-misc/ena-driver/Manifest +++ b/net-misc/ena-driver/Manifest @@ -1,5 +1,5 @@ DIST ena-driver-2.0.3-linux.zip 446695 BLAKE2B 43d4dc947f53c42c6ccda7a0fd3e32cda2c49aadee67ac7d719739f49c91b704aff04fa47f943667c7dd29f6ee0a573ceb43001a9dcdc6492cdbeb85091dd957 SHA512 08e8c1caecff3d7e19fd847e102506e501aafbefec1867fcc88d535fa728abfa7f0d292bdc9c4dff6c3d4d303002ab8b9a62bfc855cfda5130880fb237eb57c2 DIST ena-driver-2.2.3-linux.tar.gz 406557 BLAKE2B 3e77bcb8e5bd00e0a643c17ad780e3abb5ff71859cdcb1257f9c73c7d5a14b0922cf97132ed40195a69e233b2850cb62f1854b49c8ab5c92b6b83dadb32bd7bd SHA512 257c959a6727213df6600cfb09741f5036d4efb950c1460be85bab3026d7f0fa5af252550bf395665dcf0de5dbee75f751516ac80ecf3d470aee996d12796770 -EBUILD ena-driver-2.0.3.ebuild 893 BLAKE2B 8206c7e71f08c03fb2908a0de8da0cd42d12499b8e8d2b08f8ad6359db548d8b31e17eee7e735e2dd49a4d1edac4ac911f86b90f41044dc726d63d66ba55a801 SHA512 45f828a496371489102214d177aaea7ac5b85e40cf552f9da323b484462206d399751dbba9c20332105561a97ccdd503f72825b16b96acb5c3dd6a1dcce58eea -EBUILD ena-driver-2.2.3.ebuild 946 BLAKE2B b1952dc511209d94c71ac948c737d39931b2ecf7bdc7b868adbda31fc8e907a448b9a36172f9e15b368ff1c4c2d152a3d28792533a4e3a02833bf2c15f4bafea SHA512 1808fb697249bbbce14f426a5a41103632a56cf9d3e6dc90e1ea0e35631b1f31e421bd8a5791abffa936bace814bf9d91b9b907ee5c828db36be77d8ab95452d +EBUILD ena-driver-2.0.3-r1.ebuild 893 BLAKE2B d888bafc4744911c91759f85013008dacf2aca3fe5f6fe5d504412a451dd32d65b8fc4ffdb8b44435826fcfbdb021e52b668ef2ac05741beda8da22d0a5deec0 SHA512 39658ba6890efdfde3ddfc43aa81072e20f52ec1da992434544fef65173fecf0a69f6e087aff77fa2b5a90fa2372c88a0077c7b6f708e976fdb13eae9b30e2d7 +EBUILD ena-driver-2.2.3-r1.ebuild 946 BLAKE2B b1952dc511209d94c71ac948c737d39931b2ecf7bdc7b868adbda31fc8e907a448b9a36172f9e15b368ff1c4c2d152a3d28792533a4e3a02833bf2c15f4bafea SHA512 1808fb697249bbbce14f426a5a41103632a56cf9d3e6dc90e1ea0e35631b1f31e421bd8a5791abffa936bace814bf9d91b9b907ee5c828db36be77d8ab95452d MISC metadata.xml 346 BLAKE2B 52871ec0869c595fe75316469f0ad9174ebf75131f1d894ee9ce31c44ef34869c834c95ddd59efa150a80c086c9c1c5beac71089727359e9594c32687735c9ad SHA512 89d1251ed79b0ec69632b6f672cc4282ff6e10ba42bd6b8f2affe3e59bbd066cbee11d82fcdd136ca2eaba12965ab5f8ead246b69907a99c862a561171d83b1f diff --git a/net-misc/ena-driver/ena-driver-2.0.3.ebuild b/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild index 02e0ca271853..303afdb0d7e5 100644 --- a/net-misc/ena-driver/ena-driver-2.0.3.ebuild +++ b/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/net-misc/ena-driver/ena-driver-2.2.3.ebuild b/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild index 2a4bc1e592ab..2a4bc1e592ab 100644 --- a/net-misc/ena-driver/ena-driver-2.2.3.ebuild +++ b/net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest index 68bcebb5a29b..9570be679bdb 100644 --- a/net-misc/endlessh/Manifest +++ b/net-misc/endlessh/Manifest @@ -4,4 +4,4 @@ AUX endlessh.initd 767 BLAKE2B fdc7a57dbf9812880ee2b95f3d23350375ae960431929c582 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd EBUILD endlessh-1.1-r1.ebuild 1335 BLAKE2B 7020443bb021f25668b40d923b792a4de32c25f31da9ce1f3fad3d4455fe0c3ba2ef51d046a080b44ef1a3b2fa67e906ff6658eebf4f00548a4e6afc2b45b332 SHA512 9315012e6770a895ad9a8123e3bd5c04632558c6098df0cd8b468360e0915b4c0d9bfa4d817c2028d36be7e5e228429830807a7edecd896b1d23826ff68f41a8 EBUILD endlessh-9999.ebuild 1281 BLAKE2B 848c81ceca759839ef436cce8c906392a9265cb43dd04e5adff8c2efc8f9a7879e6fe3b0639375c1ccd79489314427d1ae230e4a4a4a41df94c6767dabb6d97b SHA512 01da5e8c76ca8eb794417162537048156ac2772da596ca1ab75641fc57a64a6c3304b56c6c116dd46ff50dd088265f05c9fa81c49a2e1379fcffc70a90750d43 -MISC metadata.xml 1031 BLAKE2B 8f3ec618c1142bbea8f7bc995b0630dedba8391b1b52045f24f3636418bdbdb3a9368e442b177915db8e77291af3c73bb2ee7ad7e3ad596916bcdfde14034ef2 SHA512 2cb9ee586abf06930aa03eb3a536c15d22114a5d3c42c15037cac9f6df6a289bdadcfd83b87f75869be49c22486c11c1e425f67bd982289be0f6130bfb828cbf +MISC metadata.xml 919 BLAKE2B ab8d02aa829751a4903ac5f0774ea59058604ff0bb3297a910eb8f705c5eb5a663a48bb96f4786aae0b477bf171d63478075f78b06eef5dedd4039100b2a62b4 SHA512 ac33dcf8f76eb84c1b78bebea62ea07e8dfd3c727e6ca37a1cd180841a6dbd4e969922e5fc3cb09883ece3255873e462d9e39980ad01291e06bf817af9644ac4 diff --git a/net-misc/endlessh/metadata.xml b/net-misc/endlessh/metadata.xml index 98e3367dc981..eff6a3d0357d 100644 --- a/net-misc/endlessh/metadata.xml +++ b/net-misc/endlessh/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>sam@cmpct.info</email> + <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> <longdescription lang="en"> Endlessh is an SSH tarpit that very slowly sends an endless, random SSH banner. It keeps SSH clients locked up for hours or even days at a time. diff --git a/net-misc/ethertypes/Manifest b/net-misc/ethertypes/Manifest index 83dbd61a6fda..5ba2a1d6b0f4 100644 --- a/net-misc/ethertypes/Manifest +++ b/net-misc/ethertypes/Manifest @@ -1,3 +1,3 @@ DIST ethertypes-0.gz 770 BLAKE2B d3d14fd99da30d5c4b366edc003653089468358323a58afd71770de1432588413d38ddf3c3f77b0b79a90d761e1e9c677efe594b64a995f6acdcda2b92da61f0 SHA512 62a88a76b3c3ce54b7c4b457cfdd7ea0d13e9deeebd485d37cfcbfa1cc1adba4bd82944e8d0a093c07594b88726376ff53bf70f61ca91a90af5550a455fe6643 -EBUILD ethertypes-0.ebuild 595 BLAKE2B f32f78543d2264f7a8503faabca6703226af10f40c758b74dae4e64931cf196894b311d0f45507f06b7e87c08e5d9c279f1507401467874cbc14cecea96abae6 SHA512 b2c461767099705bfb146fc0861dbec9f37604a73aeefdc5a4fd439f86cb76115e315b6036c80a5b4ce04c32ac27fa6470d4bbf43329c5660f9634e776d93edb +EBUILD ethertypes-0.ebuild 588 BLAKE2B 5cbcdf35bd4977c46de6a81311ad5038065bff63cc8c360a8311d2e113d06b84e855a57d8f254d62d1b97a965dee60e24e79008979b36930438020abe691ebf2 SHA512 c8cddb309ffa78c5a9aef178bf12bac012c8173d4d351edbf4551ca5d44be8d67c039b7a97783881db7be49422f0bfef53aa62ca5194c2c919520e175cb3d09d MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb diff --git a/net-misc/ethertypes/ethertypes-0.ebuild b/net-misc/ethertypes/ethertypes-0.ebuild index 55613d1c6a54..b5442f2a2785 100644 --- a/net-misc/ethertypes/ethertypes-0.ebuild +++ b/net-misc/ethertypes/ethertypes-0.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86" RDEPEND=" !<net-firewall/ebtables-2.0.10.4-r2 diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest index fba7197a7518..f3dab4042266 100644 --- a/net-misc/exabgp/Manifest +++ b/net-misc/exabgp/Manifest @@ -2,9 +2,9 @@ AUX exabgp-4.2.7-paths.patch 302 BLAKE2B 52110fefb75e0a36452ea3e53f099897b30df82 AUX exabgp.confd 183 BLAKE2B 59338bbd61001e4418b970abc45786004b833f80576117122fec99f148c1bab3bc7feed80c46b8bac2ac639b720daa320bd141f65b25a37a6ce1f229653f3741 SHA512 7b888ea5053ebb8da9acbd4a85b6a9900663cadb89258aea86d47cade505e8bbfc6e741fed599d410480467f76f759175d710c284bc6caafdabb4a61c53611ac AUX exabgp.initd 1472 BLAKE2B 488c1de5222be9f5f67e279fa9607c326922d80c2aafa6cb098f5f721ef1df30f1d56a2a0a0ef6ca376cdb00f65cb1fc644214248b7ea9dbc9dfd55442be7d2b SHA512 453ab87961b4647374af62a02280e750ba0b1bf535a5e92c4434c4ff6c0a55f7ec52a5e0e5a784a31695e02ece42543260186aa25c658368331c06c12794d4b4 AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786 -AUX exabgp.tmpfiles 136 BLAKE2B ce33ebfb296c6dcb30345b2a4c67f052fc5862ccb28d5cee3d63f45456e34bc72559dad53da4f8a919607522a8c49fc88acf30101b9250d712089c2b0e3a9b22 SHA512 1f191e043e29dc10ba6cf83adb9bbdcc4d9ac3b9e8c7b5d93424578f18d8142b21382218c9ff9fb86607172c52ece2e6aea5ce49a96b4f512663c840cb328540 +AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537 DIST exabgp-3.4.28.tar.gz 546611 BLAKE2B c4916fd903fe8853e99ba872d87dc97908546c53d34936019c809ffa18761c3044dd7a21aace9bf6e5bb6a2823d2178422b4cdc2e8f65d7be1fda6de2755ae4d SHA512 40edde5262e3033b5fcccf1e6020cce1fe856b6e31420e14166d5e0d636e5f616283827af2cd82946d94a196ef76ed7c5330ac4bebc564329852869f13018403 DIST exabgp-4.2.7.tar.gz 2931058 BLAKE2B 2c7bf175322a36c800a8a5874b699b01f4c3d4a8712b1f8decb73665cd214c25ccf657909cfef74610e6a5fd1903245bc4da638ac9245b04c6e63d8247d72d50 SHA512 9c53b78e3fc5ff9cef4d267e2cb3509dbcfdd4a3b21d2c7e40a8d873a9ac586b8d5bf860699b6f878cc221af341df140acdf88aaa26a79b0e7865ce7cc607e01 EBUILD exabgp-3.4.28-r2.ebuild 850 BLAKE2B ee79eef857a6364e4d1748da8ace0bd2e5d21d51f608b6fd0a027fcd7fb16f9f13062feb25826190d09e0f9285ae2c7d68b902bf3df44f1a45ce0041831f907f SHA512 ef8e5f7cdc233bfb4bdf476317fc3021c4796dd0e661a778df24fce72261224a987718ce0b96a6ca44695f8e8f46518bec48069a4d290c33896d18ce1604648a -EBUILD exabgp-4.2.7-r2.ebuild 1225 BLAKE2B 056734c689ddd191bf4227f71f8af8221b19bb176feb233ea1f8c6515886b9088c8b16c3cb2657a7e6ad4fac627282f349ac20b560fb9671eb6de7f770b44842 SHA512 5204bbdb48d313bae38e74fca9ddf48f1d2e57e7eaabd18943f13abedc4961c2b2ca1ef8335f5b38664aa8bf4910bf7c18c1c28d2827a323c06a403b6e500c1c +EBUILD exabgp-4.2.7-r3.ebuild 1225 BLAKE2B 056734c689ddd191bf4227f71f8af8221b19bb176feb233ea1f8c6515886b9088c8b16c3cb2657a7e6ad4fac627282f349ac20b560fb9671eb6de7f770b44842 SHA512 5204bbdb48d313bae38e74fca9ddf48f1d2e57e7eaabd18943f13abedc4961c2b2ca1ef8335f5b38664aa8bf4910bf7c18c1c28d2827a323c06a403b6e500c1c MISC metadata.xml 343 BLAKE2B 306f12e34e1edf8060cdd1515f77040a2b400a9d853b8b46a73b219464947cf3fc1f64efc32bde26074aa61cb483466ea752481876a02cb14c8388787105e61f SHA512 9c4c8e26eb586fa1153b1f02db408cebd9a460c6ceca049fe121977d1a14ec130d9289aca2f0cffee009a5e7f314818eb37b55790c75502817bb2941be7352f6 diff --git a/net-misc/exabgp/exabgp-4.2.7-r2.ebuild b/net-misc/exabgp/exabgp-4.2.7-r3.ebuild index bdcff317c204..bdcff317c204 100644 --- a/net-misc/exabgp/exabgp-4.2.7-r2.ebuild +++ b/net-misc/exabgp/exabgp-4.2.7-r3.ebuild diff --git a/net-misc/exabgp/files/exabgp.tmpfiles b/net-misc/exabgp/files/exabgp.tmpfiles index 80720cbfc1f7..513ccb06ba9c 100644 --- a/net-misc/exabgp/files/exabgp.tmpfiles +++ b/net-misc/exabgp/files/exabgp.tmpfiles @@ -1,3 +1,3 @@ -f /run/exabgp 0755 exabgp exabgp - - +d /run/exabgp 0755 exabgp exabgp - - p /run/exabgp/exabgp.in 0600 exabgp exabgp - - p /run/exabgp/exabgp.out 0600 exabgp exabgp - - diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 416773e30fab..86a0c73a5798 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,9 +1,8 @@ -AUX 2.1.1-write_pixel_16-endian.patch 752 BLAKE2B 6a7d28f90819a8f6d578d7c1f305141c5e189937e62bcd704d91041ea71a1121b5c60707b274dd762d524ecc9d198e74333a45f847d93d0139912082cc98196d SHA512 bf5ff1c57867106f19def3ef62da39d74239b8674ea07b8c8f404b9f47f1d9ba28460e04c13c68a19b27f933135688689b8ea4745aa7c82607c5e170da0d6489 AUX 2.1.2-mask-cached_brush.patch 691 BLAKE2B c7dd4dd9ec92958de6e2979446bc62e60ecd1fc729154deeff6c69614d9793bbc162d13cbb04e245faf2a237ffebcdaf3138ad5354573db903dc33a57fe7598e SHA512 33e75cf31f1922cc3e16c02e2a0f946c5c7c1268586952558a432119ffda4d18700967b223703c55ccb3bbfd01ee01e941d5ea70bd2e1d16be84cc93de91cb7d -DIST freerdp-2.1.1.tar.gz 6871637 BLAKE2B b0c01fb074f28aa569d934797d4fb8451edcb90d7f5eba9e47b7ec844cc95eda143c3d851b86ef72e233e8bde8ebc3e1c4a7d3d549d0de54f774ec1fee62e8cd SHA512 6f0cff79690ca550237c6e31f5ab361246a6d12ac765e85b752d474aceaf1390d8c5f2b21aba028927459892a045e5073e143705e6f2256a2a7c8744dcf3f95b DIST freerdp-2.1.2.tar.gz 6877052 BLAKE2B f58e7efa03fb1184aa3ebfe42214668f8372613237571ec2cc21c3d15c30df4ab3b11ac6050eb4ab87af988341f12b0a78e451da967615bc88b3257c253146dc SHA512 6d72b9138b4a4ae6a0a092371624b5a9b73ff914a4c42c73ace63e3f794f6bbca9a84e03d5e92c89bdb945ba2cc8200b4790b685f59d115d67b78a87a6ecab96 -EBUILD freerdp-2.1.1-r1.ebuild 2900 BLAKE2B a9e27e7d78bf14a3ccd6a8ddb74d775d7c7e235a8a7a84d3626b765dd8478a69ce65853b9cf41ed759fc0e88c21cb32c91748b18c30e11a33e5af5cbab3a88bb SHA512 821fb34853a3297a7e21aab476812e87ac9156b000ebf49a46ba484c788c94345cfc37bd784d4c540f530ef3d1805f2c5cbdeacb90101c4578844bae3440c04b -EBUILD freerdp-2.1.2-r1.ebuild 2921 BLAKE2B 93b979f98b6710b2d0a6fc5ac5d190af4f5f267112f0dc18df2204dec58c7bb890bf4e2e38870779e017f9d0ef40e5f1add3af2be57b8502719aaa7054de33bd SHA512 439a1ec3ca08d6eb57fc137a3750ff23e7fecad01d588243607ffd3597c62c15e70dbde9a0e34b4b62218f503ab9473e4765712d2c8b7914b9936b38fa3c610d -EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e -EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e +DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12 SHA512 8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae +EBUILD freerdp-2.1.2-r1.ebuild 2920 BLAKE2B 335e28b7a8877a6ca2acb59ba0794810bf2bd167e7b3ebad3f92755e0ed58fbf85ff1b690409b67139578e1b9e897eb6508db17ea3faaea61552e25cf7724942 SHA512 29a41334af123c568bd3e258dd7136351995ea73f929413304e8164680880b216a65da63ed31239797af2306cd9361b784257de43acfdeaca47c314c83e33d43 +EBUILD freerdp-2.2.0.ebuild 2865 BLAKE2B 6bb4ca8c1241827ae05fb47ab2b7d8f78075e6fff03773540d913397339532f5726c1c670e6b59cd7dbe427109cbfff7bc8b45af782cc59f832410e354216a0a SHA512 7b39663c760b4517ae82acce05d9934f2da0776e85b4fa9c7ce90a72bdd135a9cf004eda5d525b76b55d60f5eeda6af65ceb722661a51c8dc85efa4e463f62cd +EBUILD freerdp-2.9999.ebuild 2871 BLAKE2B b265024d8b9f410f79fb5a4789f69b8f4e42e489c018e40d21b2a6bcb4442f821897f0a7575d712fc03e7e8c9a84850e9fd519c6134d46337ed5fa39b44b05f6 SHA512 749dca9f0824f5c9ec0196254ced9f1dce0cfc7a5acd08302b1559c52661f5d1c76a364e10eefec2ae0eb42acf5ffd0d836114b1a1ddd058ee7c8cf8bc2784dc +EBUILD freerdp-9999.ebuild 2871 BLAKE2B b265024d8b9f410f79fb5a4789f69b8f4e42e489c018e40d21b2a6bcb4442f821897f0a7575d712fc03e7e8c9a84850e9fd519c6134d46337ed5fa39b44b05f6 SHA512 749dca9f0824f5c9ec0196254ced9f1dce0cfc7a5acd08302b1559c52661f5d1c76a364e10eefec2ae0eb42acf5ffd0d836114b1a1ddd058ee7c8cf8bc2784dc MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7 diff --git a/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch b/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch deleted file mode 100644 index f5d4d7638ad7..000000000000 --- a/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 733026dada313cf345c3e3664cfe5790519e9fae Mon Sep 17 00:00:00 2001 -From: akallabeth <akallabeth@posteo.net> -Date: Mon, 8 Jun 2020 07:09:07 +0200 -Subject: [PATCH] Fixed #6267: adjust write_pixel_16 endian handling - ---- - libfreerdp/codec/interleaved.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c -index e9f92c7009..b76fe1ca3c 100644 ---- a/libfreerdp/codec/interleaved.c -+++ b/libfreerdp/codec/interleaved.c -@@ -232,7 +232,8 @@ static INLINE void write_pixel_24(BYTE* _buf, UINT32 _pix) - - static INLINE void write_pixel_16(BYTE* _buf, UINT16 _pix) - { -- *(UINT16*)_buf = _pix; -+ _buf[0] = _pix & 0xFF; -+ _buf[1] = (_pix >> 8) & 0xFF; - } - - #undef DESTWRITEPIXEL diff --git a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild index 6bcdecf0961c..41f40c416651 100644 --- a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild +++ b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild @@ -15,7 +15,7 @@ else MY_P=${P/_/-} S="${WORKDIR}/${MY_P}" SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86" + KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" fi DESCRIPTION="Free implementation of the Remote Desktop Protocol" diff --git a/net-misc/freerdp/freerdp-2.1.1-r1.ebuild b/net-misc/freerdp/freerdp-2.2.0.ebuild index ffab34deaee1..980bcd892f59 100644 --- a/net-misc/freerdp/freerdp-2.1.1-r1.ebuild +++ b/net-misc/freerdp/freerdp-2.2.0.ebuild @@ -13,6 +13,7 @@ if [[ ${PV} == *9999 ]]; then esac else MY_P=${P/_/-} + S="${WORKDIR}/${MY_P}" SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz" KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86" fi @@ -55,7 +56,7 @@ RDEPEND=" x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264 ) + openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( @@ -88,10 +89,6 @@ BDEPEND=" ) ) " -PATCHES=( - "${FILESDIR}/2.1.1-write_pixel_16-endian.patch" -) - src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index fa7d73ce5c84..a7d671b0790b 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -56,7 +56,7 @@ RDEPEND=" x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264 ) + openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index fa7d73ce5c84..a7d671b0790b 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -56,7 +56,7 @@ RDEPEND=" x11-libs/libXrandr ) jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264 ) + openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index ce515ef59e98..5cfbf7bd6461 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -44,5 +44,5 @@ EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7 EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336 -EBUILD geoipupdate-4.3.0.ebuild 2782 BLAKE2B 5587e79a7f8fd9330f6cb62fa8fb5a9dc2193420e98b5eb156e16097f86cbbb908a526bd0a39b9457da0e8ffc593675da8b09fe51954f162ef775cbcce4967fc SHA512 6cc29328867e9938dc870c79896c7744349b535a4d74a8667d9a0ccd6415926113336fd461add9ce41f0979f6a20ebd847cfec1680092bbac8e1a8769e85fb92 +EBUILD geoipupdate-4.3.0.ebuild 2789 BLAKE2B 19bc3fb69c2d2c38f4cb75cc5c31c247e09630e65fdebe1f82f3d5aca0095d2cda4638d393215e6136e31cd37112c829ffb241093c6b58a0030a8c280d1915a9 SHA512 9c9fb224b87230de0c690065d0554e71eccbf8f972260add0f7f1226ec6bf13923b348c4cf34eafc65cb1e43bd45ec5a34b16f1bbb874ce66b869a5d730080ff MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild index f782d9fa17a5..ea39a1a811e3 100644 --- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild +++ b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild @@ -53,7 +53,7 @@ SRC_URI=" LICENSE="ISC BSD BSD-2 MIT Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~ppc64 x86" DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest index fcbbb4b796c3..2009e66e3a6f 100644 --- a/net-misc/geomyidae/Manifest +++ b/net-misc/geomyidae/Manifest @@ -1,5 +1,3 @@ -DIST geomyidae-v0.32.2.tgz 20897 BLAKE2B 117a4e89a379a8e84355661d910fcb227ef6105cdf6c5860a89c94caa7ed71d278b53c325a59bf200acdd589b515559995b27536c9fab3fe30fe87cb82f10130 SHA512 3b0927a16082df862b9efacc2f29fd1b1ca76f7d465426e179d5995a416bc27b518daba422512091304ed5479ff133e3d40f7bf66aedfbd8d99d13710809d519 DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41 -EBUILD geomyidae-0.32.2.ebuild 1029 BLAKE2B c242ef54e3a92f257149a373d276d3ef496c757c27cfdf8197b8285d56ddaf790a2feea8a2c7e032ea8e0a84beea69c03d7dcd1a70445b6ecabd105511f55a19 SHA512 875352e3b65ec186ec6fc3489c32173db9a214fdf235ad58dcf8bfba0f9c5283265c8aa413d2a65f1061add4f219feca76c35c11e57b0f77982228da314e5d29 -EBUILD geomyidae-0.34.ebuild 1029 BLAKE2B c242ef54e3a92f257149a373d276d3ef496c757c27cfdf8197b8285d56ddaf790a2feea8a2c7e032ea8e0a84beea69c03d7dcd1a70445b6ecabd105511f55a19 SHA512 875352e3b65ec186ec6fc3489c32173db9a214fdf235ad58dcf8bfba0f9c5283265c8aa413d2a65f1061add4f219feca76c35c11e57b0f77982228da314e5d29 +EBUILD geomyidae-0.34.ebuild 1106 BLAKE2B 9274bb87b8c0d99d33052b26acd4f0b21a5118105bd4ae0db0a825cf2c5bfb536413cdc8a75d563f2cd98e5086121f80d1743baeba9e4c377818ce9f6c2add5b SHA512 f2ba1cf38519d8850ae2b8b494afa204d1300c89eecde9c11252de844f8faf42f2d1f02b6629726e989a718fdb116323af7296e53a345ed417e5fb1c39dd3497 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/net-misc/geomyidae/geomyidae-0.32.2.ebuild b/net-misc/geomyidae/geomyidae-0.32.2.ebuild deleted file mode 100644 index 18d502998aa1..000000000000 --- a/net-misc/geomyidae/geomyidae-0.32.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs user - -DESCRIPTION="A daemon to serve the gopher protocol" -HOMEPAGE="http://r-36.net/scm/geomyidae/" -SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -S="${WORKDIR}/${PN}-v${PV}" - -pkg_setup() { - enewgroup gopherd - enewuser gopherd -1 -1 /var/gopher gopherd -} - -src_prepare() { - # enable verbose build - # drop -O. from CFLAGS - sed -i \ - -e 's/@${CC}/${CC}/g' \ - -e '/CFLAGS/s/-O. //' \ - Makefile || die 'sed on Makefile failed' - # fix path for pid file - sed -i \ - -e 's:/var/run:/run:g' \ - rc.d/Gentoo.init.d || die - - eapply_user -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dosbin ${PN} - - newinitd rc.d/Gentoo.init.d ${PN} - newconfd rc.d/Gentoo.conf.d ${PN} - - insinto /var/gopher - doins index.gph - fowners -R root.gopherd /var/gopher - fperms -R g=rX,o=rX /var/gopher - - doman ${PN}.8 - dodoc CGI README -} diff --git a/net-misc/geomyidae/geomyidae-0.34.ebuild b/net-misc/geomyidae/geomyidae-0.34.ebuild index 18d502998aa1..1125cd687e28 100644 --- a/net-misc/geomyidae/geomyidae-0.34.ebuild +++ b/net-misc/geomyidae/geomyidae-0.34.ebuild @@ -22,10 +22,12 @@ pkg_setup() { src_prepare() { # enable verbose build - # drop -O. from CFLAGS + # respect CFLAGS + # remove /usr/lib from LDFLAGS, bug #731672 sed -i \ -e 's/@${CC}/${CC}/g' \ - -e '/CFLAGS/s/-O. //' \ + -e '/CFLAGS/s/=/?=/' \ + -e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \ Makefile || die 'sed on Makefile failed' # fix path for pid file sed -i \ diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 3f65065bea41..c48cf22a03c1 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -6,5 +6,6 @@ DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96 EBUILD gerbera-1.4.0-r1.ebuild 2285 BLAKE2B 87c3342dddc9931f53654b2c948187472110628b0d49fc936908b44d7e4276b8a74dbba2b387b6f8ec9679f12fb69b1b20b55e55296a825e05c07566694271df SHA512 326481ecaadb0e04da9bbbb2e428bb19fbd45b15f4f040c89ca86f9ddb0756b0132a0b1cc670d4d0f6a42e8df55f0fab0ff6698dbcb38c23621910781ef497d2 EBUILD gerbera-1.5.0-r1.ebuild 2376 BLAKE2B 536362d7fddae6d2dc9b1846889e8757635512218edc73a909775b0b230d62429d721580e7cfbe7748faa93e0c1fa4710d778dc7e523e43e06eab027b5575070 SHA512 323b9a355a8691e7a76db7a28f4a151d840552de2f32b200e17e783aaa426b3d96bf0fc94c873db5860ac3f558fda03da2023806ab58a6cadb85a6eb1688bca7 -EBUILD gerbera-9999.ebuild 2311 BLAKE2B 4b344fd4a4d5951b490a97a23e5af37cd45a3a2bb2c7a73e6bf629cef25fbb76a95dad8cda6f1fa08f23761f7be0c7d455ddc8c45565615e2b3a94ac1fdcf79b SHA512 7b4330253af4df08e7aee9a66361f79762711511400cf211e5d4dc6655bf85614e395c853926ffd582e7b252cc83a96195ac4f32e27494f552ea84618b90c977 +EBUILD gerbera-1.5.0-r2.ebuild 2375 BLAKE2B f47ccf1d0d0dff9e7ebbb0720d56fe3215ad18f4f91fd057dfb116c250cdf489dfacd83a1c5408e471332dee44dc9e7029de169f88a9192026c3ee97aee901d7 SHA512 6c7e7a0cebef43e0a4b8eb700438696f2bdc3c41f72449e81cad0808a29c9f6a717e23c9e19a9a75d3c32e453b56b44b288a3487ca3e1268149d4ea4e0863ea6 +EBUILD gerbera-9999.ebuild 2310 BLAKE2B 03da9d17449ebd6f00cf0460cead7a3772ac86d473a11f4b249e53cf50502cf1b932417e64cd1e432cd863fa3e896138fc6a9dd802ecd90e482652030bccdbe4 SHA512 320e649c649417b44fd7f87a4a10d21aa6489e284482167b7ee49afc6789a13d7433dc0bf05f1c6941934479be21e5b4b03b97082d98ffc6a14c7992a795777c MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09 diff --git a/net-misc/gerbera/gerbera-1.5.0-r2.ebuild b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild new file mode 100644 index 000000000000..5357c3346ff8 --- /dev/null +++ b/net-misc/gerbera/gerbera-1.5.0-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake eutils linux-info systemd tmpfiles + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" + KEYWORDS="" + SRC_URI="" + inherit git-r3 +else + SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${P}" +fi + +DESCRIPTION="UPnP Media Server" +HOMEPAGE="https://gerbera.io" + +LICENSE="GPL-2" +SLOT="0" +IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" + +DEPEND=" + acct-user/gerbera + >=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr] + >=dev-db/sqlite-3 + dev-libs/spdlog:= + dev-libs/pugixml + dev-libs/libfmt:0= + mysql? ( dev-db/mysql-connector-c ) + javascript? ( dev-lang/duktape ) + taglib? ( >=media-libs/taglib-1.11 ) + lastfm? ( >=media-libs/lastfmlib-0.4 ) + exif? ( media-libs/libexif ) + exiv2? ( media-gfx/exiv2 ) + ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + curl? ( net-misc/curl ) + magic? ( sys-apps/file ) + matroska? ( media-libs/libmatroska ) + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv +" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~INOTIFY_USER" + +PATCHES=( + "${FILESDIR}/${P}-incomplete-type-iohandler.patch" +) + +src_configure() { + local mycmakeargs=( + -DWITH_CURL="$(usex curl)" \ + -DWITH_DEBUG="$(usex debug)" \ + -DWITH_EXIF="$(usex exif)" \ + -DWITH_EXIV2="$(usex exiv2)" \ + -DWITH_AVCODEC="$(usex ffmpeg)" \ + -DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \ + -DWITH_JS="$(usex javascript)" \ + -DWITH_LASTFM="$(usex lastfm)" \ + -DWITH_MAGIC="$(usex magic)" \ + -DWITH_MATROSKA="$(usex matroska)" \ + -DWITH_MYSQL="$(usex mysql)" + -DWITH_SYSTEMD="$(usex systemd)" \ + -DWITH_TAGLIB="$(usex taglib)" \ + -DWITH_INOTIFY=1 + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" + newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" + + insinto /etc/${PN} + newins "${FILESDIR}/${PN}-1.3.0.config" config.xml + fperms 0640 /etc/${PN}/config.xml + fowners root:gerbera /etc/${PN}/config.xml +} + +pkg_postinst() { + if use mysql ; then + elog "Gerbera has been built with MySQL support and needs" + elog "to be configured before being started. By default" + elog "SQLite will be used." + fi +} diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild index 7a452ed244cc..219386720083 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -29,7 +29,7 @@ DEPEND=" >=dev-db/sqlite-3 dev-libs/spdlog:= dev-libs/pugixml - dev-libs/libfmt:0/6 + dev-libs/libfmt:0= mysql? ( dev-db/mysql-connector-c ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest index 151ac11c2543..65a968a34250 100644 --- a/net-misc/gns3-gui/Manifest +++ b/net-misc/gns3-gui/Manifest @@ -1,4 +1,4 @@ AUX gns3-gui-rmraven.patch 7920 BLAKE2B d6264938eae55de6754c187f63bbb96707e8e0f68f1aa7153d8101aec5d81e46d3ad145a16f1694b358467c6a4586478c21112126b797e4b76e3ab549636dfdd SHA512 a47c9445caf185624aaec8834ed0884b588b07c34481e09b3f0be3ae5a9643f0a925eefb816d03617c072fe8d239307376715c6028345b6f498a98a41c3bcc51 -DIST gns3-gui-2.2.8.tar.gz 5237129 BLAKE2B ce72219a1d0201f596c20b0988ab81f280889d3eb4717898da5d1a3c52a248e8f1d020d83b900309e623fadb758e67a91baaac9d61d75e72b96f4144ac5101fb SHA512 28b9f6f16506f206f64831160d95687525b6709d9d0d84623763e46c3c9b2e138e3f12844619bbad00491677818a7e28da4f4ea9358d063c3427db16e62775ca -EBUILD gns3-gui-2.2.8.ebuild 1482 BLAKE2B 2c26d13df5bb66e112a4bab8d20a13db417029682c4cfebf2f736f65b1c61404834c19197c18789f87f2edc81a25d887c8ef07d26edc3df8c027dd5aec5b0e17 SHA512 c65c0214d019ed7c28bc64dfa71326d2edf4bf28f0b59a91bf6b6e3ab1fe1948ff8ea68332aaa6849f53cff4488e507532cb35b23d7aa374447b15c3c05923f8 -MISC metadata.xml 438 BLAKE2B ec1fc3f214034f6e467ed725c2972189fbc3598793d19584e2a84aa3f9fb12f566ee137b5bc1eaf2cd4442e21665a0b7cdfba9aaaf03557db0c1cd6bb3d126c7 SHA512 b58e19104628f98516f3cca55dff685ac66e3c96a51ee17a4ccf976a149bead74ac2eeb20b4f81e5da16a83b30af9bd5998a1e131c52709e576955e07fd85035 +DIST gns3-gui-2.2.11.tar.gz 5240137 BLAKE2B 6601e8477c9d5dadfb04a19d4bb75efad39d23cde1fb4e9bc0698cf59c403f154ea1b46b216e2271da476b42d7d58ecee9ef8acabeae039c4026c1f5ee7325eb SHA512 7cb3b4b8bcae5b6adc6d3637fad9a8e4cf885709f9440f484224c04044960b082d1b7b81ad23b5c128c9e58e6ac23d07101128b96caaa095394c0feedc2a8dc3 +EBUILD gns3-gui-2.2.11.ebuild 1339 BLAKE2B 6f583146310feff20f56f007025d35de424a22336c569922082136641a89043cd1604248343bb6605301fe30b922228bdda7fb1c766660e734e2f3a10ddba071 SHA512 b586e650f3ffee47d1f81ab336f0c5cf3a426a2bb5a1e0e7d1a42fb405ab8c97c8d7ff55633fb96b037004f8947a348515254b4127006bb9f7e90c8a139be92d +MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee diff --git a/net-misc/gns3-gui/gns3-gui-2.2.8.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.11.ebuild index 5494cff0bb34..57e7f1b46b89 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.8.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.11.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7,8} ) inherit distutils-r1 desktop xdg DESCRIPTION="Graphical Network Simulator" -HOMEPAGE="https://www.gns3.net/" +HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui" SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" @@ -18,9 +18,8 @@ KEYWORDS="~amd64 ~x86" #net-misc/gns3-server version should always match gns3-gui version RDEPEND=" >=dev-python/distro-1.3.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/jsonschema-3.2.0:=[${PYTHON_USEDEP}]' 'python3_8') - $(python_gen_cond_dep '<=dev-python/jsonschema-2.6.0:=[${PYTHON_USEDEP}]' 'python3_7') - >=dev-python/psutil-5.6.0[${PYTHON_USEDEP}] + ~dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}] >=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] @@ -28,12 +27,12 @@ RDEPEND=" DISTUTILS_USE_SETUPTOOLS=bdepend -PATCHES=( "${FILESDIR}/gns3-gui-rmraven.patch" ) - src_prepare() { default + # newer psutils is fine - sed -i -e '/psutil==5.6.6/d' requirements.txt || die "fixing requirements failed" + sed -i -e '/psutil==5.7.0/d' requirements.txt || die "fixing requirements failed" + eapply_user } diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml index 09439c8762b5..99647f7dae74 100644 --- a/net-misc/gns3-gui/metadata.xml +++ b/net-misc/gns3-gui/metadata.xml @@ -2,8 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>bman@gentoo.org</email> - <name>Aaron Bauman</name> + <email>mmk@levelnine.at</email> + <name>Michael Mair-Keimberger</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="sourceforge">gns-3</remote-id> diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest index 19237ad4d3b7..66749eb9764e 100644 --- a/net-misc/gns3-server/Manifest +++ b/net-misc/gns3-server/Manifest @@ -1,4 +1,4 @@ AUX gns3-server-rmraven.patch 7946 BLAKE2B 910366f4552ce3984cef20b88d5fb3a6233d02294d4921a068e5175e9b305dc6d60349c9362e6d09a959aa5eef615a1793363e8965e5711f33b15c981a3b192c SHA512 94af9d532ad6c90c23360240ab15f439cbdfbd95c870c76e0f71b5178d8a24058a18be088a98f9e3cc731f186cfb12c5fc501da32b0a514b7d66c98fdc0b58c3 -DIST gns3-server-2.2.8.tar.gz 11248484 BLAKE2B 14843a86c0348b92e9c54af5c966f46249f72ef9aa74fc8cda27f3209d00d2e129df98c75f301d8fe2046fb1c04f3e24e163adbead787fed2c1d364c50228902 SHA512 3394d368c986ce8378739bdbc15359c46bdf787a38e18bae9035653dd6dc6683973bf1b7952137189f57fd83074f3d5ea6040f5d7a1d0503f6cf21d2835cd693 -EBUILD gns3-server-2.2.8.ebuild 2387 BLAKE2B 2210e958dc4dca5fcb290e329c1e6f77bb6a426ede1ef6e204be31904e0833c8c56033eb750bc674e36e54b06041da62b0753d8f71534e0e1b1768a4a29a57f6 SHA512 001cbee2614da65679d8e7c45dd007fc864fe346e90d4c7fbeb6061596a759e8439b54b10353f1bc37e9a81d28e2353d6f16e7fa25fba0b7db243563030e744f -MISC metadata.xml 438 BLAKE2B ec1fc3f214034f6e467ed725c2972189fbc3598793d19584e2a84aa3f9fb12f566ee137b5bc1eaf2cd4442e21665a0b7cdfba9aaaf03557db0c1cd6bb3d126c7 SHA512 b58e19104628f98516f3cca55dff685ac66e3c96a51ee17a4ccf976a149bead74ac2eeb20b4f81e5da16a83b30af9bd5998a1e131c52709e576955e07fd85035 +DIST gns3-server-2.2.11.tar.gz 7588877 BLAKE2B 429eb23e44ca0f3f68abba6fa437b80c12fb1e70c02e1c81ce2051a9d9b78f31f6618397dee07e307589c3f9f0ad55a26f22084ffa01b7c42b730bd505979c2e SHA512 6e11c6ae10942bac9f82dc3b5e0bee04c8afbbae8ca6b5d20e42495c15010ba17cddbac83c7c188a565ce8b24ed58ac7c80b4eb5a8f29f2612dce9d0dfa65a07 +EBUILD gns3-server-2.2.11.ebuild 1990 BLAKE2B 985f6510da23c8924af22a73faf0c7764b40c05b37964c21eef33ddf0a4546115ebefff79923ae49ff404e0e37480aec4e9017411f0f573884f4a2f2f756da62 SHA512 a0060db7bd91bc00d0313e2041e038d0999e16e542dd016f78e1b271107ca74d360f09b32d8488b45dfd24ac04c04b08cf86ea6088989ffbcdac1a16efbb9cc6 +MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee diff --git a/net-misc/gns3-server/gns3-server-2.2.8.ebuild b/net-misc/gns3-server/gns3-server-2.2.11.ebuild index ed01d69a2653..13e0e6aec39b 100644 --- a/net-misc/gns3-server/gns3-server-2.2.8.ebuild +++ b/net-misc/gns3-server/gns3-server-2.2.11.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} ) inherit distutils-r1 DESCRIPTION="GNS3 server to asynchronously manage emulators" -HOMEPAGE="https://www.gns3.net/" +HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server" SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" @@ -16,35 +16,27 @@ KEYWORDS="~amd64 ~x86" RDEPEND=" >=app-emulation/dynamips-0.2.18 - >=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}] - >=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}] - >=dev-python/aiohttp-cors-0.7.0-r1[${PYTHON_USEDEP}] - >=dev-python/async_generator-1.10[${PYTHON_USEDEP}] - >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}] + ~dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}] + ~dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}] + ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] + ~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}] + >=dev-python/distro-1.3.0[${PYTHON_USEDEP}] >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/jsonschema-3.2.0:=[${PYTHON_USEDEP}]' 'python3_8') - $(python_gen_cond_dep '<=dev-python/jsonschema-2.6.0:=[${PYTHON_USEDEP}]' 'python3_7') + ~dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}] >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}] - dev-python/py-cpuinfo[${PYTHON_USEDEP}] + ~dev-python/py-cpuinfo-6.0.0[${PYTHON_USEDEP}] >=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}] - >=dev-python/yarl-1.4.2[${PYTHON_USEDEP}] >=net-misc/ubridge-0.9.14 " DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -PATCHES=( "${FILESDIR}/gns3-server-rmraven.patch" ) - src_prepare() { default # newer psutils is fine - sed -i -e '/psutil==5.6.6/d' requirements.txt || die "fixing requirements failed" - - # We don't support <py3.7 - sed -i -e '/aiocontextvars==0.2.2/d' requirements.txt || die "fixing requirements failed" - sed -i -e '/yarl==1.3.0/d' requirements.txt || die "fixing requirements failed 2" + sed -i -e '/psutil==5.7.0/d' requirements.txt || die "fixing requirements failed" - #Remove Pre-built busybox binary + # Remove Pre-built busybox binary rm gns3server/compute/docker/resources/bin/busybox || die # Package installs 'tests' package which is forbidden diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml index 09439c8762b5..99647f7dae74 100644 --- a/net-misc/gns3-server/metadata.xml +++ b/net-misc/gns3-server/metadata.xml @@ -2,8 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>bman@gentoo.org</email> - <name>Aaron Bauman</name> + <email>mmk@levelnine.at</email> + <name>Michael Mair-Keimberger</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="sourceforge">gns-3</remote-id> diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest index 7e6356645c69..8c97667fedee 100644 --- a/net-misc/grdesktop/Manifest +++ b/net-misc/grdesktop/Manifest @@ -1,5 +1,7 @@ AUX grdesktop-0.23-desktop.patch 538 BLAKE2B 70bc1fc74c7c9b298e844bd499a04a062ec8c511dca75acfc17914faaad6431573d0ae1897c72ee0e3018a174a5ecab8bed1ebef3d84c6279c7d87afdbb5280c SHA512 c228120c40f1c1afa18b120c6804e5bb824256fd5515bdcd05b7fb4a8c964cf8ef6d2a7902645640b5133b513bc9612b2484cce7413af5663d0e16c7e65122fd AUX grdesktop-0.23-format-security.patch 856 BLAKE2B e5f8c03ce0b7639d0662295d8260888d18af4062750aa5ce73ee13c0fb9b77ea61e3287a11f1b5d00bf1c3a654d84fa7e6bd820c81c09dc00c4fecce08d305fc SHA512 7754a958a45648cf1194e0840ab22de3025a3eaf0001670c3abe6b5ea0852caa9d27fd9f7db0b4c43a8c93a462a8f297b1c89007755486c9cef9eff26cca6590 +DIST grdesktop-0.23-patchset.tar.xz 17912 BLAKE2B 0252f3c7fa1779df05d1f7d4315e18e4cce5d4acf69e2a914805d072de25730206bf906b9fe767b777fdfde701ce033563f96087bdc2d85d11271b835947f029 SHA512 0327a17b48ff0f5eb8ab88c683f91deec612cf202cabcde3f150b4be5b19afb612a83ff9dcb965b29899a35c214a7334603263b42c0d2605b48209018845b04b DIST grdesktop-0.23.tar.gz 299914 BLAKE2B 0a00c721c8d962dd1ad885f4d85130486b3ad9973d21817068f4147ade03d59a2d13dd5e5b26376a0415120521e283a20d79627b62a8bcca15fb2f0213c05bc4 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f EBUILD grdesktop-0.23-r1.ebuild 950 BLAKE2B 7f142f234235a9c5063e26c882d64dac69a9914b2a0fa72f52162e7b8fc5f2ce6bf70a3bd838a395e5debc7e5be678e272f8fa4f066ebdde402d702bf939dcf9 SHA512 1377d544d03f32707e11a9c6a72cf40865151edd727b189b922770fce3ffe87b6e31fec03110c48f1f60fcc5b4292c5e2f240d910a29b11494d0e50b41c5a310 +EBUILD grdesktop-0.23-r2.ebuild 1084 BLAKE2B 0d755a7bd5fb9e44b65b6d56612eb6bd637cd96e3ab92a8419429867450ed9bfb50b461d54db9d87f00993b24954d658a98b67ee850d2cdc919cd34a81894fb1 SHA512 9a8f58b10af6b201de0bf0d7e454e9c16a806ad182694216bcaef6500a70533f261db6d20692ff9f684da3a0e47d60a9c973f167f6a2649af177f06bfa492bab MISC metadata.xml 429 BLAKE2B 117737367d74f70cbd717e361f2179150a8c9d3a156338464d5c6388ec226adf568fa3866e46937dc83465d0afa55caf2ac5b2c2806227892c60eb936728c284 SHA512 359d469647e065e6b771ce02442ce3789d8e67708679d07b5a3d0cb5fc76a5bd16af0483b37d3a5c593d1660d1e58d4ecc97cbe0c26659cfc6a3b6e7ce863a7d diff --git a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild new file mode 100644 index 000000000000..640c10447e95 --- /dev/null +++ b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" +inherit gnome2 + +DESCRIPTION="Gtk3 frontend for rdesktop" +HOMEPAGE="http://www.nongnu.org/grdesktop/" +SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +RDEPEND=" + >=x11-libs/gtk+-3.21.4:3 + net-misc/rdesktop +" +DEPEND="${RDEPEND} + app-text/rarian + virtual/pkgconfig +" + +PATCHES=( + # Patches from debian: + # Correct icon path. See bug #50295. + # Fix compilation with format-security, bug #517662 + # gsettings, gtk3 port, gcc10 compat, etc + "${WORKDIR}"/grdesktop-0.23+d040330-7 +) + +src_prepare() { + gnome2_src_prepare + # Fix desktop file validation after debian patchset (it removes Action line, but not the action itself - remove that here) + sed -e '/Desktop Action Full/,+1d' -i grdesktop.desktop +} + +src_configure() { + gnome2_src_configure \ + --with-keymap-path=/usr/share/rdesktop/keymaps/ +} diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest index a304e894513e..b1f41738f79b 100644 --- a/net-misc/gupnp-tools/Manifest +++ b/net-misc/gupnp-tools/Manifest @@ -1,3 +1,3 @@ DIST gupnp-tools-0.10.0.tar.xz 154792 BLAKE2B 47ef726fd931006ca8f63277269a729cda2d91fca7acb7f99c7c20020a3b75452b176dd7ad0c54aaf667da24db7f777d3fe6e8a2496127fe15e4d12912ddea6a SHA512 7fe9231a1ce9e1dea3d5d87df69dfb4014824ad286777cb7b5c93154df02c42e60e6aa239e34c4e0404d9a4a31c0172059110f7d004d7527b191bfa02ec552d7 -EBUILD gupnp-tools-0.10.0.ebuild 704 BLAKE2B 6fd58af69cc9ea82fbdf59fd83e88aa5354a2042e564accb62fe848f2a3a832ba33c844e6bcf416cc4081d986c72ddeb5c4577d22f5c8841b4b705315a2af698 SHA512 1c045eaac96be3eaf5c04c4ea6a57688fab67dd55ce3110fca9f58f06e2dd5e3417655b5f9c2ccc79cea2dd29a61889c503c26dcd0aa1a7f91138486c841ca0d +EBUILD gupnp-tools-0.10.0.ebuild 705 BLAKE2B a2a795c5829fb43f7194c8ae5b7989c4cf138c7b18124a5a7d7864dd2bb65a1c89b405ba5fd39467bb328533a5154070946b81fed8365e26851c57dea0651c6a SHA512 0fac93d994040dc7d7db094cdd478428e7fad8cbb7ac0fe4b39deacd1cebc0c3648164bea674cc526b56d19283f71fac5845f6691ed245d995e3b5c73ff26cd9 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild index adcd81082bc8..3f690b1392f1 100644 --- a/net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild +++ b/net-misc/gupnp-tools/gupnp-tools-0.10.0.ebuild @@ -23,7 +23,7 @@ RDEPEND=" x11-libs/gtksourceview:4 " DEPEND="${RDEPEND}" -BDEPED=" +BDEPEND=" >=sys-devel/gettext-0.19.8 virtual/pkgconfig " diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 8e1d8394b142..bcd3a4c4e381 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,10 +1,5 @@ -AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe0ed55703dcd08d1a64f6211ed49d974a8d95599ba30f26930cfda4e929acee9f46982debfa531a9d6c848250a9c0ff04 SHA512 7382a271c2ccf7c270102a40724abb2e505070e3062c9ab8910c45ad5e52cc6190c7b24604e5b738674beef5b032cfc59c90d33d7db0962dd63ca61722c5dfb1 -AUX httpie-1.0.3-test_binary.patch 782 BLAKE2B 1e7e63fe889e2b5ebcc814d681652b718d49c2bdf09d90e70c10cf2f7f6cb88ea70509a98a7e56d6b84ecfb84b6b8e5158e73c8d322aa161c8de79e6ac0332fe SHA512 ed917989c3f04aa213739563a6ccd34da413798787cff6a9af07ea058013c6a96c06dbf1e36daefef45faf571983286d3faab869b7918b29239278b54e5570b8 -AUX httpie-1.0.3-test_stream.patch 722 BLAKE2B 8ae3ff08311178f40d6e4156fc0fdab443e1f2b76a73f8f47bdffc2b3f62e506b9a60e856ddd358da36e9f45ccfe056ea18906f627c40e20313bd75949711f04 SHA512 1a5b9a010cba066b7fb33e7222c343271e7660f460e2cf23bfcfbb1ad3e6d1472e4dc9ee4679d9c893c40ab1e8dc7a652e2209167cd51f6f5489eac70be03d99 -DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7 -DIST httpie-2.0.0.tar.gz 1752529 BLAKE2B 212e7a142f3efdf1bf238d6eb7e472579a8a8248950caf19ec584eba4f903de09b08433805105a61714046857d32b662f54cde927d20db2a2a1ab81bc99bc753 SHA512 ddac5206107241c9fdc2d2697a31fc7a123c3a01c2ccbd0aad8d52e1472f093b201e422522972cce992bfb2fc7d32ffc6380d457112c83ab643008086f9a7f2d DIST httpie-2.1.0.tar.gz 1754801 BLAKE2B dabb6a1ce0cc4ecebbc7e933ed3084d7b75e0fac1fbf6968f41d37ee95cef684ee3603ddb5361e072328d13c9c98332b23bfdd0454da3399038307b124ea2e98 SHA512 39d56c9b9aad4871ce439a235377a930ad7c78b833f9bad568142efc9fd8af9123ac931e434c6ddb7fa6e0deb0acf8f5fd1ddf79f3b7a65467267cbf4629555b -EBUILD httpie-1.0.3.ebuild 1280 BLAKE2B 8dc29d0ac813e1a560329dcaa81a7d09a9943ab7da68cdfd8fe51d78e5770b488cfaba540d37ba846a28a4dea2637f6f120e139ca77781ddf8b797024ca74c86 SHA512 7fcd9f49ed92db12b57ad9bb684113260f941ac764f329616f7cb0c0d758c1c0ece6611ac0d7551243890b6a6991af3fa45b8e2a1ab594da97eb5dffa9ce9cf8 -EBUILD httpie-2.0.0.ebuild 1055 BLAKE2B 81e139ebc0bf0c666ea991a8e2afef1d2927304244012a955145c16b2f73a4e04716ad5d5580d9ecf92a1ec276a4e46e5d43c0af24d660a96bed88120c39e597 SHA512 e4ee9b4188bf81da301a3f306ac19f2fa3ab9fa751fc6ff36183e2d065ff91c4ea3ae998f6ffb8737277fc9aca373190536a1b5f50b077e7a338b00379661c31 +DIST httpie-2.2.0.tar.gz 1761927 BLAKE2B 3ce8acf4abf9cb189315e07e7f9c8dfc1b0a537696a2c9fd795e8e944c85c1df8e7e13fbaee68d3b93115296ba048e664d31245fe2c6b832123818292b4fac8d SHA512 00c1f34041854319816d7d643a79358723c27a3744f405d629b5361685745bfdd8ce0a0f127cb3d6746e46405d24562625ca37733a5955809d7bfc077ae5c533 EBUILD httpie-2.1.0.ebuild 1049 BLAKE2B 14c805d3d274998fcd8dc8c559730024d38f54cd20b0dc8dbb585003330702f5c7bb4d549c5bf594810d00686dffde61abcb526649f1d021506a77c84841b526 SHA512 126244d16e874663315fe0ece6e7be2107f11974d8c7f0fd072860cc518eeef9705b7626ed95e12a4d218f51e30e4623c823c9c91e8f8e07fac66c2f45eead2f +EBUILD httpie-2.2.0.ebuild 1051 BLAKE2B 0fff59edd7b2731da9e2d8c45448d60f66ce20db4dd842491fe898a9ea2df00236151319b7b65005d2644d4bb753ec23110141bb802e24bfdc8702dda8f98947 SHA512 12efd9b94a95798ef5802e8610d3af43e3553ebcef42f8a15b6ce60312ca5ae6b5c9d2f806b5173541a0ebf4650a0b78f6470c4c3e910e5e82e2175ac574bbe9 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb diff --git a/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch b/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch deleted file mode 100644 index 212f91f41e82..000000000000 --- a/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/test_ssl.py 2018-11-14 16:36:19.000000000 +0100 -+++ b/tests/test_ssl.py 2019-06-29 16:28:09.466528486 +0200 -@@ -45,7 +45,7 @@ - except ssl_errors as e: - if ssl_version == 'ssl3': - # pytest-httpbin doesn't support ssl3 -- assert 'SSLV3_ALERT_HANDSHAKE_FAILURE' in str(e) -+ assert 'SSLV3_ALERT_HANDSHAKE_FAILURE' in str(e) or 'handshake failure' in str(e) - else: - raise - diff --git a/net-misc/httpie/files/httpie-1.0.3-test_binary.patch b/net-misc/httpie/files/httpie-1.0.3-test_binary.patch deleted file mode 100644 index 0e4112629c73..000000000000 --- a/net-misc/httpie/files/httpie-1.0.3-test_binary.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/tests/test_binary.py 2019-10-13 17:33:33.346205203 +0200 -+++ b/tests/test_binary.py 2019-10-13 17:37:39.474820883 +0200 -@@ -35,12 +35,12 @@ - - def test_binary_suppresses_when_terminal(self, httpbin): - r = http('GET', httpbin + '/bytes/1024') -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - def test_binary_suppresses_when_not_terminal_but_pretty(self, httpbin): - env = MockEnvironment(stdin_isatty=True, stdout_isatty=False) - r = http('--pretty=all', 'GET', httpbin + '/bytes/1024', env=env) -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - def test_binary_included_and_correct_when_suitable(self, httpbin): - env = MockEnvironment(stdin_isatty=True, stdout_isatty=False) diff --git a/net-misc/httpie/files/httpie-1.0.3-test_stream.patch b/net-misc/httpie/files/httpie-1.0.3-test_stream.patch deleted file mode 100644 index 0df4a0a760eb..000000000000 --- a/net-misc/httpie/files/httpie-1.0.3-test_stream.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/tests/test_stream.py 2019-10-13 17:33:33.346205203 +0200 -+++ b/tests/test_stream.py 2019-10-13 17:37:57.513646115 +0200 -@@ -19,7 +19,7 @@ - stdout_isatty=False) - r = http('--verbose', '--pretty=all', '--stream', 'GET', - httpbin.url + '/get', env=env) -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - - def test_encoded_stream(httpbin): -@@ -29,7 +29,7 @@ - env = MockEnvironment(stdin=f, stdin_isatty=False) - r = http('--pretty=none', '--stream', '--verbose', 'GET', - httpbin.url + '/get', env=env) -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - - def test_redirected_stream(httpbin): diff --git a/net-misc/httpie/httpie-1.0.3.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild deleted file mode 100644 index 4c1b60f7651d..000000000000 --- a/net-misc/httpie/httpie-1.0.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/" -SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.19.1[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -# Extend list of expected strings in test -PATCHES=( - "${FILESDIR}/${PN}-1.0.2-fix-test_ssl.patch" - "${FILESDIR}/${PN}-1.0.3-test_binary.patch" - "${FILESDIR}/${PN}-1.0.3-test_stream.patch" -) - -python_test() { - pytest -vv || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-2.0.0.ebuild b/net-misc/httpie/httpie-2.2.0.ebuild index 12211f339e9b..e3773e796fbe 100644 --- a/net-misc/httpie/httpie-2.0.0.ebuild +++ b/net-misc/httpie/httpie-2.2.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_6 python3_7 ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="ssl(+)" inherit bash-completion-r1 distutils-r1 diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest index a47c8ed307f8..0b4b77524100 100644 --- a/net-misc/hylafaxplus/Manifest +++ b/net-misc/hylafaxplus/Manifest @@ -1,9 +1,7 @@ -AUX hylafax-cryptglibc.patch 3154 BLAKE2B 242ffe9babe0e68d891e2bb9fcc261368dca67c92dfac66c234abe42da4cdc2bb84ba939fdff6073c05ed0e8d10a343b723c43cea4bb43009a17302a61778966 SHA512 04e2253cbc8b1f71e984a3d80e98d8aa5a7c7ab7ae286ecbecf8fb6c8d5528085b719a9dbc9f5dae6c788cfa83a57393d9ae0c36525eac658d244f4fc500f0cb +AUX hylafaxplus-CVE-2020-1539x.patch 3799 BLAKE2B 017793755bc17224e41541010b9bc46db72aac0c4801f94e86a5bd88ec834db4738aa22747fb3bfaa867a2967acca35ef77f9cfb88d39a0990aef93e12381010 SHA512 7f04ac1af6bb6d2440aeb0b74aab023d47357f8e27a2bffd237e6be3b66277c54947968c7dafac1dd6a6623c833970fe22f5e9ee817582279116ca88ba655e50 AUX hylafaxplus-conf 572 BLAKE2B cd2b237704e0607565c16cf81593654d266c212810d0dcb399f35d980d04ed54a5bb961f2fd29dbc8386ef6684fe684a8bcbd21c9cd782490546554ec90e4b2e SHA512 ee97c45e49ed03bf2d393b7861fb8d0a92ce927243b7f1843c52de452540e78633e1a6d7b6892e6f5e30b5518b4b3d998354a3cfebe7adfd84da3f9586585621 AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0dc0ef55384ac0d448803a8984c35eb22185c0aa315019eea1588829717b170f0b6168b549a270f2570 SHA512 6bc4db4597ef55aaf01bff66dfe7e9b3ce23d51e8d165f635ad49d9971260f8f131d386869787b2cd0de612d8ee784fb8f4e44fa8b8deb4eabf1aeab441e68f5 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c -DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf -DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd32f669fb2ea513b86e112a5743ae6b4ddc8d43f3bd4af6006517e8787392c84bf60e715c104ddb0d819b22985a SHA512 c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1 -EBUILD hylafaxplus-5.5.5.ebuild 4713 BLAKE2B b2411e3d73bfad32c801af743373aa1580f488df9cb1dd270d45af049814fa3a498a6e1990c9f7f816b49b750a9a6484968090a0a33e3a52e1587ad6ba700868 SHA512 eb924ce2ebd1892e7d55d735ab44ce7adfc21fd90d8a5508333a878586ed9a39a6b38eaa3696c77d7a0cbcccdf127f54bbc976d5ae2429b6f4a3c0c1307e61fe -EBUILD hylafaxplus-5.6.1.ebuild 4291 BLAKE2B 59910c07d2b56694d7bc1b6ffdf3475ae88b0c8c8b49e575fdf6ed110939464125b4751fa72a114936f3375de233e6e3ef2d54f917162277fb074de0cdaec27e SHA512 34f741613a2b527a6e42275c503b7fe9743459160ca7a3a27f5739748f29530f30d0efc95d570865fb7bc3d8b74d0634c12c4c753018cf4e97e5c36b5cfe4cac -MISC metadata.xml 604 BLAKE2B 012e03ab403ae6f27142ac9394736f1ad10bd049e5403e673259371d39119162ad5c61bd84248f1a1ec4f659f20c879e5682b0855d54f096b51c75688975e835 SHA512 bcaa18269a7ece318c970552134c79f89eb41c76a7e471e430d72ad9a8dc4ea10fa57d6b89434759f6cd1aa22db6ad8b5fb8933b7e65ffcdab11275cfce14593 +DIST hylafax-7.0.2.tar.gz 1393586 BLAKE2B cbf99f91a0aa07783dd30e76ce8416b2933240d4bf829220909000519f9c9e14a324163707c14504848ba71e7c1ee7d98455f06bb040c2c50c1493d0138122aa SHA512 ea68404ad79e798b29450683eaa927e73033e0fa8160b803a3e2c9000df487c81193cc8fc0c1187477f5e1b2e26eec1c065ebc17e0be82e9a3e3758b1b5b5e4e +EBUILD hylafaxplus-7.0.2.ebuild 4236 BLAKE2B 1327ad118d3333313300cab3ce41d1725d4c42e89eb6a6f41e28c6dd53622d04f67c76a44b86fe7f334aade6687827a2afe590e0012ccaf756f4d28fc134c010 SHA512 44dba8d9d8c7096b379b4749f5ef3a7eeb8bb7a08b5b6d866b67388f8281b1375cd0aff73ed5474d35ceb67d1faa3a8a33c9d6f65a7727669a0f9d915596d4cf +MISC metadata.xml 496 BLAKE2B 778816874c73db0b7958055c119ef88326993ba3dbac35086b6ebcc3f27c95b71abdec098989460e800c25407f0a7781869649639cddd8671f998d3cf9d0d615 SHA512 092154bcc54daa4db847fabc773d588ee09e6c65c540391d4bd78c4856662b348304a0116628b5142381fe9cf76c5caaf25984c1e7449f032f7c20b83b0a0bd5 diff --git a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch b/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch deleted file mode 100644 index dbfc8bac5393..000000000000 --- a/net-misc/hylafaxplus/files/hylafax-cryptglibc.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -urN hylafax-5.5.4/hfaxd/Login.c++ hylafax-5.5.4-libc217/hfaxd/Login.c++ ---- hylafax-5.5.4/hfaxd/Login.c++ 2013-08-07 01:23:35.000000000 +0200 -+++ hylafax-5.5.4-libc217/hfaxd/Login.c++ 2013-11-13 12:56:02.000000000 +0100 -@@ -30,9 +30,6 @@ - #include <ctype.h> - #include <fcntl.h> - #include <pwd.h> --#if HAS_CRYPT_H --#include <crypt.h> --#endif - - void - HylaFAXServer::loginRefused(const char* why) -@@ -434,7 +431,7 @@ - /* - * Check hosts.hfaxd first, then PAM, and last, LDAP - */ -- if (pass[0] == '\0' || !(strcmp(crypt(pass, passWd), passWd) == 0 || -+ if (pass[0] == '\0' || !(strcmp(Sys::crypt(pass, passWd), passWd) == 0 || - pamCheck(the_user, pass) || - ldapCheck(the_user,pass))) - { -@@ -513,7 +510,7 @@ - { - fxAssert(IS(LOGGEDIN), "ADMIN command permitted when not logged in"); - // NB: null adminWd is permitted -- if ((strcmp(crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) { -+ if ((strcmp(Sys::crypt(pass, adminWd), adminWd) != 0) && !pamIsAdmin()) { - if (++adminAttempts >= maxAdminAttempts) { - reply(530, "Password incorrect (closing connection)."); - logNotice("Repeated admin failures from %s [%s]" -diff -urN hylafax-5.5.4/hfaxd/SNPPServer.c++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++ ---- hylafax-5.5.4/hfaxd/SNPPServer.c++ 2013-08-07 01:23:35.000000000 +0200 -+++ hylafax-5.5.4-libc217/hfaxd/SNPPServer.c++ 2013-11-13 12:55:42.000000000 +0100 -@@ -36,9 +36,6 @@ - #include "RE.h" - - #include <ctype.h> --#if HAS_CRYPT_H --#include <crypt.h> --#endif - - extern "C" { - #include <netdb.h> -@@ -1003,7 +1000,7 @@ - - if (checkUser(loginID)) { - if (passWd != "") { -- if (pass[0] == '\0' || !(streq(crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) { -+ if (pass[0] == '\0' || !(streq(Sys::crypt(pass, passWd), passWd) || pamCheck(the_user, pass))) { - if (++loginAttempts >= maxLoginAttempts) { - reply(421, "Login incorrect (closing connection)."); - logNotice("Repeated SNPP login failures for user %s from %s [%s]" -diff -urN hylafax-5.5.4/hfaxd/User.c++ hylafax-5.5.4-libc217/hfaxd/User.c++ ---- hylafax-5.5.4/hfaxd/User.c++ 2013-08-07 01:23:35.000000000 +0200 -+++ hylafax-5.5.4-libc217/hfaxd/User.c++ 2013-11-13 12:55:19.000000000 +0100 -@@ -30,9 +30,6 @@ - - #include <ctype.h> - #include <pwd.h> --#if HAS_CRYPT_H --#include <crypt.h> --#endif - #include <math.h> - - #ifndef CHAR_BIT -@@ -374,7 +371,7 @@ - #else - to64(&salt[0], random(), 2); - #endif -- result = crypt(pass, salt); -+ result = Sys::crypt(pass, salt); - return (true); - } - -diff -urN hylafax-5.5.4/util/Sys.h hylafax-5.5.4-libc217/util/Sys.h ---- hylafax-5.5.4/util/Sys.h 2013-08-07 01:23:35.000000000 +0200 -+++ hylafax-5.5.4-libc217/util/Sys.h 2013-11-13 12:56:26.000000000 +0100 -@@ -44,6 +44,10 @@ - #include <osfcn.h> - #endif - -+#if HAS_CRYPT_H -+#include <crypt.h> -+#endif -+ - /* - * Wrapper functions for C library calls. - * -@@ -140,5 +144,8 @@ - { return ::fopen(filename, mode); } - - static int getOpenMax(); -+ -+ static const char* crypt(const char* key, const char* salt) -+ { const char* enc = ::crypt(key, salt); return enc ? enc : ""; } - }; - #endif /* _Sys_ */ diff --git a/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch b/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch new file mode 100644 index 000000000000..6c484590c468 --- /dev/null +++ b/net-misc/hylafaxplus/files/hylafaxplus-CVE-2020-1539x.patch @@ -0,0 +1,110 @@ +commit e8f8196230ae15f6f7d7104ded3e2633002506e4 +Author: faxguy <faxguy@5505949e-d877-4686-9e03-c53b7a51b376> +Date: Sat Jun 13 23:46:33 2020 +0000 + + Johannes Segitz reported two issues: + + 1) faxaddmodem, faxsetup, and probemodem create temporary directories in a way that is not secure due to a race condition. + + 2) The HylaFAX spool directory bin and etc subdirectories are not secure against uucp deleting and recreating scripts that root runs. + + These changes address these two issues. + + + + git-svn-id: https://svn.code.sf.net/p/hylafax/HylaFAX+@2534 5505949e-d877-4686-9e03-c53b7a51b376 + +diff --git a/CONTRIBUTORS b/CONTRIBUTORS +index 057739f..a9d4f21 100644 +--- a/CONTRIBUTORS ++++ b/CONTRIBUTORS +@@ -203,6 +203,7 @@ following for their contributions: + Travis Schafer LogSend and LogRecv modem config options, documentation fixes + Sven Schmidt + Steven Schoch faxrcvd faxinfo text parsing ++ Johannes Segitz code security audit + John Sellens + Chris Severance documentation fixes, scripting improvements + Simon <iahnl@iah.nl> +diff --git a/Makefile.in b/Makefile.in +index 1ee4d76..ec0cda7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -208,7 +208,10 @@ makeServerDirs:: + -idb hylafax.sw.server -root ${INSTALLROOT} -dir ${SPOOL} + -${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \ + -idb hylafax.sw.server -dir \ +- -root ${INSTALLROOT} -F ${SPOOL} bin client config dev etc info log recvq status ++ -root ${INSTALLROOT} -F ${SPOOL} client config dev info log recvq status ++ -${INSTALL} -u root -g root -m ${DIRMODE} \ ++ -idb hylafax.sw.server -dir \ ++ -root ${INSTALLROOT} -F ${SPOOL} bin etc + -${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m 700 \ + -idb hylafax.sw.server -dir \ + -root ${INSTALLROOT} -F ${SPOOL} sendq doneq docq tmp pollq archive +diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in +index dc39917..c4d3ff1 100644 +--- a/etc/faxaddmodem.sh.in ++++ b/etc/faxaddmodem.sh.in +@@ -113,12 +113,14 @@ if [ "$euid" != "root" ]; then + fi + + # security ++o="`umask`" ++umask 077 + TMPDIR=`(mktemp -d /tmp/.faxaddmodem.XXXXXX) 2>/dev/null` ++umask "$o" + if test X$TMPDIR = X; then +- TMPDIR=/tmp/.faxaddmodem$$ ++ echo "Failed to create temporary directory. Cannot continue." ++ exit 1 + fi +-@RM@ -rf $TMPDIR +-(umask 077 ; mkdir $TMPDIR) || exit 1 + + SH=$SCRIPT_SH # shell for use below + CPATH=$SPOOL/etc/config # prefix of configuration file +diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in +index 556eef5..b4aae40 100644 +--- a/etc/faxsetup.sh.in ++++ b/etc/faxsetup.sh.in +@@ -922,12 +922,14 @@ if onServer; then + # + + # Setup TMPDIR before anything can trap and rm it ++ o="`umask`" ++ umask 077 + TMPDIR=`(mktemp -d /tmp/.faxsetup.XXXXXX) 2>/dev/null` ++ umask "$o" + if test x$TMPDIR = x; then +- TMPDIR=/tmp/.faxsetup$$ ++ echo "Failed to create temporary directory. Cannot continue." ++ exit 1 + fi +- $RM -rf $TMPDIR +- (umask 077 ; mkdir $TMPDIR) || exit 1 + + JUNK="etc/setup.tmp" + trap "$RM \$JUNK; $RM -r \$TMPDIR; exit 1" 1 2 15 +diff --git a/etc/probemodem.sh.in b/etc/probemodem.sh.in +index 55b5d9b..c0abf15 100644 +--- a/etc/probemodem.sh.in ++++ b/etc/probemodem.sh.in +@@ -85,12 +85,14 @@ test -f $SPOOL/etc/setup.cache || { + . $SPOOL/etc/setup.cache # common configuration stuff + . $SPOOL/etc/setup.modem # modem-specific stuff + ++o="`umask`" ++umask 077 + TMPDIR=`(mktemp -d /tmp/.probemodem.XXXXXX) 2>/dev/null` ++umask "$o" + if test X$TMPDIR = X; then +- TMPDIR=/tmp/.probemodem$$ ++ echo "Failed to create temporary directory. Cannot continue." ++ exit 1 + fi +-@RM@ -fr $TMPDIR +-(umask 077 ; mkdir $TMPDIR) || exit 1 + + SH=$SCRIPT_SH # shell for use below + OUT=$TMPDIR/probemodem$$ # temp file in which modem output is recorded diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild deleted file mode 100644 index e1d8b5510a8f..000000000000 --- a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit eutils multilib pam toolchain-funcs - -MY_PN="${PN/plus/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems" -HOMEPAGE="http://hylafax.sourceforge.net" -SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="hylafaxplus" -KEYWORDS="amd64 x86" - -IUSE="jbig html ldap mgetty pam" - -DEPEND=" - >=sys-libs/zlib-1.1.4 - app-text/ghostscript-gpl - virtual/mta - media-libs/tiff:0[jbig?] - virtual/jpeg:0 - jbig? ( media-libs/jbigkit ) - virtual/awk - ldap? ( net-nds/openldap ) - pam? ( sys-libs/pam ) - mgetty? ( net-dialup/mgetty[-fax] ) - !net-dialup/mgetty[fax] -" -RDEPEND="${DEPEND} - net-mail/metamail - !net-dialup/sendpage -" - -S="${WORKDIR}/${MY_P}" - -export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" - -src_prepare() { - epatch "${FILESDIR}/ldconfig-patch" - epatch "${FILESDIR}/hylafax-cryptglibc.patch" - - # force it not to strip binaries - for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \ - hfaxd sendfax sendpage ; do - sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \ - "${dir}"/Makefile.in || die "sed failed" - done - - sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed" - - # Respect LDFLAGS(at least partially) - sed -i -e "/^LDFLAGS/s/LDOPTS}/LDOPTS} ${LDFLAGS}/" defs.in || die "sed on defs.in failed" - - sed -i -e "s|-fpic|-fPIC|g" \ - configure || die - - epatch_user -} - -src_configure() { - do_configure() { - echo ./configure --nointeractive ${1} - # eval required for quoting in ${my_conf} to work properly, better way? - eval ./configure --nointeractive ${1} || die "./configure failed" - } - local my_conf=" - --with-DIR_BIN=/usr/bin - --with-DIR_SBIN=/usr/sbin - --with-DIR_LIB=/usr/$(get_libdir) - --with-DIR_LIBEXEC=/usr/sbin - --with-DIR_LIBDATA=/usr/$(get_libdir)/fax - --with-DIR_LOCALE=/usr/share/locale - --with-DIR_LOCKS=/var/lock - --with-DIR_MAN=/usr/share/man - --with-DIR_SPOOL=/var/spool/fax - --with-DIR_HTML=/usr/share/doc/${P}/html - --with-DIR_CGI="${WORKDIR}" - --with-PATH_DPSRIP=/var/spool/fax/bin/ps2fax - --with-PATH_IMPRIP=\"\" - --with-SYSVINIT=no - --with-REGEX=yes - --with-LIBTIFF=\"-ltiff -ljpeg -lz\" - --with-OPTIMIZER=\"${CFLAGS}\" - --with-DSO=auto - --with-HTML=$(usex html)" - - if use mgetty; then - my_conf="${my_conf} \ - --with-PATH_GETTY=/sbin/mgetty \ - --with-PATH_EGETTY=/sbin/mgetty \ - --with-PATH_VGETTY=/usr/sbin/vgetty" - else - # GETTY defaults to /sbin/agetty - my_conf="${my_conf} \ - --with-PATH_EGETTY=/bin/false \ - --with-PATH_VGETTY=/bin/false" - fi - - #--enable-pam isn't valid - use pam || my_conf="${my_conf} $(use_enable pam)" - use ldap || my_conf="${my_conf} $(use_enable ldap)" - use jbig || my_conf="${my_conf} $(use_enable jbig)" - - tc-export CC CXX AR RANLIB - - do_configure "${my_conf}" -} - -src_compile() { - # Parallel building is borked - emake -j1 -} - -src_install() { - dodir /usr/{bin,sbin} /usr/$(get_libdir)/fax /usr/share/man - dodir /var/spool /var/spool/recvq /var/spool/fax - fowners uucp:uucp /var/spool/fax - fperms 0600 /var/spool/fax - dodir "/usr/share/doc/${P}/samples" - - emake DESTDIR="${D}" \ - BIN="${D}/usr/bin" \ - SBIN="${D}/usr/sbin" \ - LIBDIR="${D}/usr/$(get_libdir)" \ - LIB="${D}/usr/$(get_libdir)" \ - LIBEXEC="${D}/usr/sbin" \ - LIBDATA="${D}/usr/$(get_libdir)/fax" \ - DIR_LOCALE="${D}/usr/share/locale" \ - MAN="${D}/usr/share/man" \ - SPOOL="${D}/var/spool/fax" \ - HTMLDIR="${D}/usr/share/doc/${PF}/html" \ - install - - keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp} - keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev} - - generate_files # in this case, it only generates the env.d entry - - einfo "Adding env.d entry for ${PN}" - doenvd "${T}/99${PN}" - - newconfd "${FILESDIR}/${PN}-conf" ${PN} - newinitd "${FILESDIR}/${PN}-init" ${PN} - - use pam && pamd_mimic_system ${MY_PN} auth account session - - dodoc CONTRIBUTORS README TODO - docinto samples -} - -pkg_postinst() { - elog - elog "The faxonly USE flag has been removed; since ${PN} does not" - elog "require mgetty, and certain fax files conflict, you must build" - elog "mgetty without fax support if you wish to use them both. You" - elog "may want to add both to package.use so any future updates are" - elog "correctly built:" - elog - elog " net-dialup/mgetty -fax" - elog " net-misc/hylafax [-mgetty|mgetty]" - elog - elog "See the docs and man pages for detailed configuration info." - elog - elog "Now run faxsetup and (if necessary) faxaddmodem." - elog -} - -generate_files() { - cat <<-EOF > "${T}/99${PN}" - PATH="/var/spool/fax/bin" - CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax" - EOF -} diff --git a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild index 6a3be949d081..78a77fe1f505 100644 --- a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild +++ b/net-misc/hylafaxplus/hylafaxplus-7.0.2.ebuild @@ -1,46 +1,50 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit pam toolchain-funcs MY_PN="${PN/plus/}" MY_P="${MY_PN}-${PV}" DESCRIPTION="Enterprise client-server fax package for class 1 and 2 fax modems" -HOMEPAGE="http://hylafax.sourceforge.net" +HOMEPAGE="https://hylafax.sourceforge.net" SRC_URI="mirror://sourceforge/hylafax/${MY_P}.tar.gz" SLOT="0" LICENSE="hylafaxplus" -KEYWORDS="~amd64 ~x86" -IUSE="jbig html lcms ldap mgetty pam" +KEYWORDS="amd64 x86" +IUSE="html jbig lcms ldap mgetty pam" DEPEND=" - >=sys-libs/zlib-1.1.4 app-text/ghostscript-gpl - virtual/mta media-libs/tiff:0[jbig?] + !net-dialup/mgetty[fax] + >=sys-libs/zlib-1.1.4 + virtual/awk virtual/jpeg:0 + virtual/mta jbig? ( media-libs/jbigkit ) - virtual/awk lcms? ( media-libs/lcms ) ldap? ( net-nds/openldap ) - pam? ( sys-libs/pam ) mgetty? ( net-dialup/mgetty[-fax] ) - !net-dialup/mgetty[fax] + pam? ( sys-libs/pam ) " RDEPEND="${DEPEND} - net-mail/metamail !net-dialup/sendpage + net-mail/metamail " S="${WORKDIR}/${MY_P}" -export CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" -export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog" +CONFIG_PROTECT="${CONFIG_PROTECT} /var/spool/fax/etc /usr/lib/fax" +CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK} /var/spool/fax/etc/xferfaxlog" -PATCHES=( "${FILESDIR}/ldconfig-patch" ) +PATCHES=( + "${FILESDIR}/ldconfig-patch" + "${FILESDIR}/${PN}-CVE-2020-1539x.patch" +) src_prepare() { default @@ -49,7 +53,7 @@ src_prepare() { for dir in etc util faxalter faxcover faxd faxmail faxrm faxstat \ hfaxd sendfax sendpage ; do sed -i -e "s:-idb:-idb \"nostrip\" -idb:g" \ - "${dir}"/Makefile.in || die "sed failed" + "${dir}"/Makefile.in || die "sed on ${dir}/Makefile.in failed" done sed -i -e "s:hostname:hostname -f:g" util/{faxrcvd,pollrcvd}.sh.in || die "sed on hostname failed" @@ -139,10 +143,12 @@ src_install() { keepdir /var/spool/fax/{archive,client,etc,pollq,recvq,tmp} keepdir /var/spool/fax/{status,sendq,log,info,doneq,docq,dev} - generate_files # in this case, it only generates the env.d entry - einfo "Adding env.d entry for ${PN}" - doenvd "${T}/99${PN}" + newenvd - 99hylafaxplus <<-EOF + PATH="/var/spool/fax/bin" + CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax" + CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog" + EOF newconfd "${FILESDIR}/${PN}-conf" ${PN} newinitd "${FILESDIR}/${PN}-init" ${PN} @@ -152,11 +158,3 @@ src_install() { einstalldocs docinto samples } - -generate_files() { - cat <<-EOF > "${T}/99${PN}" - PATH="/var/spool/fax/bin" - CONFIG_PROTECT="/var/spool/fax/etc /usr/$(get_libdir)/fax" - CONFIG_PROTECT_MASK="/var/spool/fax/etc/xferfaxlog" - EOF -} diff --git a/net-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml index 80224275b19e..3d61d69194dc 100644 --- a/net-misc/hylafaxplus/metadata.xml +++ b/net-misc/hylafaxplus/metadata.xml @@ -2,9 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> - <longdescription> - Enterprise client-server fax package for class 1 and 2 fax modems. - </longdescription> <use> <flag name="jbig">JBIG Fax Compression Support</flag> <flag name="pam">hfaxd authentication via PAM</flag> diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest index 33a425022be4..9ed07f2121a7 100644 --- a/net-misc/igmpproxy/Manifest +++ b/net-misc/igmpproxy/Manifest @@ -1,8 +1,6 @@ AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85b383bcb8e77570f33c2a9f2a52ba3690b9a4a69bf0df82926571326b9720e274f7cbfd8bb39215c9 SHA512 3c95e98d19b88bed32562e64e4e491ac34da3533acb5cfd39032443688bdfe889e4835544bc358ccd5f7a95356c1eb8013462f3bc4a13e8e083717bfaaba4b5f AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62c7d62bbae33b59edd23c3b873db29f38eac37c42a9385c223e050fb3ed1e8776472f9fb73533d73200e SHA512 1e4e5d73fe9a734ab7898c2defdef8f9b27c3811109ef8819875a65733c72e48feb683d0001ced759c3195ce30bf31c6af9be7cebf30dd1dcd9141ffbbfe3f53 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be -DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2 DIST igmpproxy-0.2.1_p20200508.tar.gz 43672 BLAKE2B 886e293a30ec8b0a6bdfee9a7858d6de67b42e71628a604b108909f7eac31cfb129648f6eb8c47cf6aeec4d0a078f5a7a0f4487737b4f9338f727445a4f94dac SHA512 f0929537cac30664ed94231b2b31098dccea53a3e0d5ddfc14ae5ab08fa116438a983d06c17f41d8fec69b94d0c8725eb23525c94813d78310f2f2e3c03bcbf7 -EBUILD igmpproxy-0.2.1-r2.ebuild 602 BLAKE2B a5bef105ee2271b1801692825cb60274a498f91122d684e893ff0f487e3a07ecb6e9d6edf6c1326ae85c4ad178f9a4407e37944470b314561800177f2c5e3afb SHA512 964d744d22b1fcd627c0db393a11e4d5fc088ad442f783735078bac8cc06747dce7480c717e0e429ea4224fb5ff6dc58f0f3faa7cd840a79c581ab6a13e492fc -EBUILD igmpproxy-0.2.1_p20200508.ebuild 754 BLAKE2B 661ba0bcbf2a1e075a4c2f5bdea5dd1fc28e041b63955ccb81b506e4484ca4702a83d7bb3dfaefb2545af5a6bb74afafc210fb0b18b58b03bf113ffd48788da2 SHA512 1654dbe8aa96b9068ee8b5df201919ba5c4ae50bfd8aaa8725eafbf4f83bb1627df63d79ffbcc17a628affdaedf00dc2d604524c6f9b817ae1703d24f9fd9ad1 +EBUILD igmpproxy-0.2.1_p20200508.ebuild 752 BLAKE2B f2239d6a5230d652b07ff5e7f0321ff7d9a073da365c61a542453d0d8295c1e677ff5bea68319dea2c58f4d94635aa8fbe9ed0572eee47782fdb5538a6afde67 SHA512 30de163b64bc4f5cf4d3a43df562c74eb991c1084c65db0f6d42de893a7f5251f30441f5b48e8b15377330950fa8d0c133f735d53e95291bb878f670f72469f0 MISC metadata.xml 593 BLAKE2B 29de61191b267e0b01464e3cd66e5d1b68deb0feba50b2ae1facb2909a04dbe56e8fb1b9188028bb11ba8fade7f750927e9cc24e2f47bf071fb775a4366deec9 SHA512 326ef6823232e5e8a11e173024a759d969ab190fa3c406063c8f59cdd1a6c33cbe3e1e4c070605e298d7bd3ec4d92c446edcc17dcc3c76660f9391235c1a4721 diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild deleted file mode 100644 index 59e0df486118..000000000000 --- a/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info systemd - -DESCRIPTION="A multicast routing daemon which uses IGMP forwarding" -HOMEPAGE="https://github.com/pali/igmpproxy" -SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz" - -KEYWORDS="amd64 x86" -LICENSE="GPL-2+" -SLOT="0" - -CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE" - -src_install() { - default - - newinitd "${FILESDIR}"/igmpproxy.initd-r1 igmpproxy - systemd_dounit "${FILESDIR}"/"${PN}".service - - newconfd "${FILESDIR}"/igmpproxy.confd igmpproxy -} diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild index e9a6c7141374..a25a15192766 100644 --- a/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild +++ b/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="A multicast routing daemon which uses IGMP forwarding" HOMEPAGE="https://github.com/pali/igmpproxy" SRC_URI="https://github.com/pali/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" LICENSE="GPL-2+" SLOT="0" diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 8f18d5b5c39a..584a189853ca 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -8,11 +8,13 @@ DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd2760 DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d DIST iperf-3.7.tar.gz 609874 BLAKE2B a2abd640004713a0d805be4779e5fd17a7a5ce58ef67cbb0ce8050e30000465686466b30b699b2d8cb374be6b5a063ce220cb79e48fa8fd2257cce69cd8a90e8 SHA512 4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7 DIST iperf-3.8.1.tar.gz 622721 BLAKE2B 8afcf0ba0ca9d82caf62eca1da4f656921f5b7b1e1b284533da57410db714744f5b3e80562d273a98bde7981e6204d309d36e8e6ebe399f4b4a8a94b02dbfd27 SHA512 3b551e2d603724374228682b316a0b1572f8630d51dcfed673b9d3df8589ce27679c27f3e9ce9539fabc111faa96fe5981778599076abe4f24b7a1d48ab63b09 +DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035 EBUILD iperf-2.0.13.ebuild 743 BLAKE2B f4b9a4c6829ee8633c462cbfe5e1461ee3ec2d7b86ed3a6cdb5c54751d566c1ebc35898a5781db563b0dbb499205b6b968007dce69ccbfa0ad5f4618898dc0a6 SHA512 7f7bfc1135d70d799ce97276967111e132a1f7b80ecc786b060dc5fad12fe0b1cc838d4919b1ced3fab3ac96ac0eb6d5a417b8381554217005eb6da49f3f8b3b -EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 5a675f50e83bff8d761c2925401ec1d134ac42da79b7d13eb0ca6b8e48786b9d579592400a08e8df22e35360d2067f3fbdb3f805c2f38490462d0ac7f3da5db8 SHA512 d78c211a9de6db728b9456d34825076004ea71cc0fbbed53c63f0de62383c3385230ecef15f2670bf7802d6e01ad50ea6e1a087bc61dd60812ff409a5e8aec87 -EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 6d99e56fcace17bebff7791c0f642d76b5723126091fb7e2583510a5e685c47b168252ed3cc2f0589da0093064425ff6317dc35e4c1ed5a3edbba1bcd87e7d94 SHA512 7f50ca3896efa0d65e69711cd8dd1ce532e3481cb3da77a7522cf66171f46c29195d0c12b396c1c69a1af3c8133ce454ad3e7b8562759f8fa282d886b905ac28 +EBUILD iperf-2.0.14a.ebuild 876 BLAKE2B 5fc8d0ed70626ba9e5b162bc86d4a09bc7b630fa92c4d8c9a886caf7e6a6d61ae4b8bfcb739d03f4da7308faa8d3e89849f6484f2a89d0dace8c88de1ff4f560 SHA512 5f68152df2d0be242c8c6e4304819cb70af66171a26f73cef19c5045cb5d4d7db47205ef3e5301f324f18914ec0d129ce43da4c15cfcefae1b299353077a1ed9 +EBUILD iperf-2.99999.99999.ebuild 729 BLAKE2B 7fbe549c0035bdc6accaccfc53a2f02a84b41ec12693a2a36a9eba172c6007dd6651a4f3cdd0121979e80d2b09dce90a3211390bf91f4dd3a18e37d831a81bbc SHA512 b444c695aa9b2ca0e498dc392dab7e56fbe95b075ca6c935508e8c654808fbead3caa73952d55438be38d7ca4a3ebddaf82841bdabd753e8610b84deadeba4b1 EBUILD iperf-3.6.ebuild 1014 BLAKE2B 803a8ddecb82cb8cd33b5e16c53db46d8fc6d8b4ba8bf6ed0412a2be9ee0ba4f97cea7b576a3ea989f04fe1eddd3cceb0066e8d0882c85f19861cc13eead41f3 SHA512 09d1d479b898ffc662fc6108908bcf84a596365f13017597246a3476ec02195ca69c49a6d3d053b771040d6289d3a36add2c328ed6ec007bb0f973b1b58dc2a5 EBUILD iperf-3.7.ebuild 947 BLAKE2B f292caa6b05da89f13a0465ce03a04158cd94cb626607bb62dd119af16f9ba08bf714acd1f91a948c857aa66e5f21023bcac1fef8d635171f5393ec407d6f068 SHA512 1bece2a1ce119fa2b2bf9c34f1093f61b233726539bc885c6d078a0ed2641cb009b7a521bbad0eeb958e11bc569249efb0adfce8db2af7cb6cbfa833ec4f64ea EBUILD iperf-3.8.1.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851 +EBUILD iperf-3.9.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851 EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 6c697e6a3693d5be60eb35ce1a271d1cf4842037e17f3a7279e76dccdf9db2547c3a222ad5d3074126d1bf522d2f06d6fa1b9f4251c1d9fa4635e727ed6ac476 SHA512 0709b7db179b7ae4ceca704ecc3c162ffabb89d6df9bd3d4f44f2d95b7b24e8b26cf89e1f06278d9dbaa55379d607307f334d441a4eae9ca3ecc474855d93357 MISC metadata.xml 455 BLAKE2B 63c2a5eb313e525820e470ca060751f9f7486147d30b59fc135cfbc1235814df004b1d0cb741842ce2380ff69e938d0105ef5a37a794c1b523b246a0c75e2613 SHA512 36ebc27e7e4b2a3577a4c532b19d0b1e61a3261a59510453689772d568972796b32acafc161f9dc8483602105ea804fbb43e9a445fd44e7869278c19cba42b93 diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild index 25750ac91672..15f7dc5179ff 100644 --- a/net-misc/iperf/iperf-2.0.14a.ebuild +++ b/net-misc/iperf/iperf-2.0.14a.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" HOMEPAGE="https://sourceforge.net/projects/iperf2/" @@ -26,6 +27,10 @@ src_configure() { $(use_enable threads) } +src_compile() { + emake AR="$(tc-getAR)" +} + src_install() { default dodoc doc/* diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild index 0e887f4a4e2d..5d1c5b42d4a4 100644 --- a/net-misc/iperf/iperf-2.99999.99999.ebuild +++ b/net-misc/iperf/iperf-2.99999.99999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 +inherit git-r3 toolchain-funcs DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" HOMEPAGE="https://sourceforge.net/projects/iperf2/" @@ -25,6 +25,10 @@ src_configure() { $(use_enable threads) } +src_compile() { + emake AR="$(tc-getAR)" +} + src_install() { default dodoc doc/* diff --git a/net-misc/iperf/iperf-3.9.ebuild b/net-misc/iperf/iperf-3.9.ebuild new file mode 100644 index 000000000000..eaf20a65cee9 --- /dev/null +++ b/net-misc/iperf/iperf-3.9.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" +HOMEPAGE="https://github.com/esnet/iperf/" +SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint" +IUSE="libressl sctp static-libs" + +DEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sctp? ( net-misc/lksctp-tools ) +" +RDEPEND=" + ${DEPEND} +" +S=${WORKDIR}/${P/_/} +DOCS="README.md RELNOTES.md" + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with sctp) +} + +src_install() { + default + newconfd "${FILESDIR}"/iperf.confd iperf3 + newinitd "${FILESDIR}"/iperf3.initd iperf3 + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest index acb6ee569861..dabc5e48c36c 100644 --- a/net-misc/ipmiview/Manifest +++ b/net-misc/ipmiview/Manifest @@ -2,7 +2,7 @@ AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161 DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux.tar.gz 138691420 BLAKE2B 7f2d8e9519d6a9651d09c8b55e6a530266b809e437132ac4a814473ec25622663a0fb455a3b078fd5e79194e82d24d1b324369799f15bd1d4dbb6b607cdada76 SHA512 17078c8480579e63391a8cfb7af5033510ca3a9c5616b2af0af7679bbd6592f4f7fbe68dc01194aa11c1b481bc1c4089339adb42c22a687effa05dd728984579 DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux_x64.tar.gz 135584164 BLAKE2B d74ade013d00e7c7dd5d79b808d158519a520603931dfe9bd44f4dc64911b066f0e9f61bdff7386ee30d2d5b1f4fb86477ee339e76f00746f0b119c3a4b49e82 SHA512 2409f79850cafb2af5f34ec3fd755a6438ef7abef3c1a014df95d4ccc49d9b151ddfba7c1824de9c0f00234ea36b2fa6bb519f5035321dccae9ac06fa2f9458a -DIST IPMIView_2.16.0_build.190815_bundleJRE_Linux_x64.tar.gz 93629983 BLAKE2B 7be066184a6722b7fae87a3427bd161092393662dbb9597188de913bccfe6df0050441d5180b434c8394438d98d37f77452a6eb9ad3cf6f654eb67f4cc7facaa SHA512 9a6af293a08dcdb662a226c061590e7149e5cee0a69eca12906e4581e254d3293d27e71dd36c301a449a43a10be700f3023f8408bdda5a3b9b65d76c96eaa3d7 +DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B 915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766 SHA512 17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091 EBUILD ipmiview-2.15.0.190109.ebuild 2389 BLAKE2B 251caeefbe35ea4f88c6fb9f6c4dc3e3ac8beb992aab4fe91bd1037cd1ffdae21e4daee57af69a026e48715d7f9e3bb822482d408442eb72dfa81438233e2d4d SHA512 ec5dfc4088d33cfd70b704e263518424f26aba1c3c6ffe0ee4e43533cd60edf9f29e96a8480aab147e73439833a6180cdc817639b4a080278887acd0862c26fa -EBUILD ipmiview-2.16.0.190815.ebuild 2202 BLAKE2B 7863a161c8d901fa4832c9b0510352371828cb573ef046eca2cc41c9bae63966d400651d026b6fb972ee0660382a91e1db70c9f7c2c411183077a00b08f9dc43 SHA512 9e4cff9887ee905d606167b17e3df9e1631057078f5c2e5b6baae0d243c0c157cf1ec5a615c21ef3760706240ff7fe76cb67d9e6baeba4060067b93dcb649893 +EBUILD ipmiview-2.17.0.200505.ebuild 2197 BLAKE2B fe4c5b9f9358e32fe42696f2a6cfcabead5ff37c84ada6b36ca33ff1ad357d30f7fed6c5bf0b14e3228c68f5a0d905e592f2dbf6ec3e07a100610f6c094b4712 SHA512 06fcadc842fb8abfbdd876e677f31bf6a77de45f59b30a2403ac0b5bcc154c7e30890cbabaeec4ead1f35acc9d219e6dd2376c580e5b0bf10f0cf5f44ef12390 MISC metadata.xml 702 BLAKE2B 094fd116b6c0d306d68106f78b867450fdb4a48b321a69f2169dac1737b6f8b93df2740e4f04b0671b61e01d872542411a22773f043ffefa8adbeb64cfc43ce3 SHA512 ee1eb3a7497345d7f7d8c55d25dd6d8f2b0353e1d785ee496cde69c2a1b386ebc96aaf70d5a70eee8d6294b5b072dfe97882254d3f42d4f69d238dde78aec6ce diff --git a/net-misc/ipmiview/ipmiview-2.16.0.190815.ebuild b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild index adb03bbec4d5..664d3944d27e 100644 --- a/net-misc/ipmiview/ipmiview-2.16.0.190815.ebuild +++ b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,9 +22,9 @@ RDEPEND=" virtual/jre:1.8 " -DEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip" -RESTRICT="bindist fetch mirror strip" +RESTRICT="bindist fetch mirror" DIR="/usr/share/${PN}" QA_PREBUILT="usr/lib*" diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 010a85e4fa37..5afa15a74491 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -7,15 +7,11 @@ AUX iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch 285 AUX iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch 7935 BLAKE2B 550fc998feb6accae244baf8334d522ffcd6c464756f465c17298bef5338c8e746345026b72c95ff86aa14ef85223ca8cad4e00040f66b4e7aab3526296fc411 SHA512 1da0f189d47cb0b31cea5d1ea8081fbb2be0e55fb5b206cb366dce467bf0e557a2b77b2c8007993bdc91006a5f290269ae70e5d7e50f7fa5bdde93b0079d4e07 AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada -DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 -DIST iputils-20190515.tar.gz 403228 BLAKE2B cebe2460ac4da5471a9b8e655bed1c1640f69d4dc41a724ab197533e3d532e34c28e9ccbc852e057d18c9867d9d668e2f73848b005439463dc4e7735c68ae87c SHA512 adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250 DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5 -DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a -DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2 +DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066 -EBUILD iputils-20180629.ebuild 3968 BLAKE2B 8e2fbe0e178ad92516ed47775b95db4fc4ec33a76fea341d9868edf76a942a63198df0871ab2cc036dcfdc321270c8f0498a5dbd83d54f14e81c8bb05cef5198 SHA512 c7c9132e64d0f62b5c64a433207afc49d30cc9c2a7cc761646a5921f37c7969c87ae50634128a90bf0e8d9617d563fdc2340b8faa62ef1249a7275a72b249667 -EBUILD iputils-20190515.ebuild 4919 BLAKE2B 4971db4c7e34487f58cd8475e5d5f1a8c4019ff74c14d9cb0dbbebe34c75d98033073c8faae6a6bbfc0b9ec70cead5bcbf3d69c532e418bb72b6c07a98f5323c SHA512 fcd0be342b6f865ca0b12e30d98f347b44d11dcf2871914a0e657c27d0cb9dfdae9c289cde19825fbd2c7aa7a3d5d10ce5cd31d0f585df58196977e1606f6cbe +DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33 EBUILD iputils-20190709-r1.ebuild 5054 BLAKE2B 917fae9c9867ef740c55121a47d1d4e34365f7c224e148e812a17c2d1556e41c60a2b13f97fd8e2cd69ea6e9f9eb6135eadbce5d338651c92ba37812b35a4257 SHA512 87e8b0cc765316ac1507a5e0f96c852effa7ddcd971baba445dc5e62fef8e96d0cffac545770d740444ac4131582002e0a22aaabe9b104ea9783e7bd7b24e337 -EBUILD iputils-20190709.ebuild 4832 BLAKE2B 568c48b41ebc6130dd0bc57a300bebd1e3f1994c5cea2f844dd43573e3e9fc24488784307649048ea83a30bcdc0696c56974f83a3a9a07a87d94c539d1fee6af SHA512 861e080265a15292a6c45adff6aec359b2f4cee26ce91d3d3a1ae01a9b06325f421d9016b27d68ff878e0432bd48a7adfade6b1828747ddbf1b90b9a924f02b0 -EBUILD iputils-99999999.ebuild 4839 BLAKE2B 36de576375669cde223c1a8e37225d9527969434238e1a12475679968ef2a76b1d696214c2b2e029d4480246e8d047a797484499da1324ad783296afd4c334ac SHA512 c600edbeb543af780408ac536c5fd89384c3b487aab5ea02cc0c17184b1f351f1d9ecde4f018085d16daf58ddaf2907378683b2f3ae450b91705461d3e54f404 +EBUILD iputils-20200821.ebuild 4435 BLAKE2B 3bdc031997db6288820fd9c7dce345415540d39a88bb4d63c2a2cd551c32abf7528d48681e6f54dd172577d3a2dd922798abb31070e4d4ab62d273b400a58a4f SHA512 0877a4e23496151e6f2a00609868cfe4fa5a4af8eb5c853f67a173920702d4c3c736168b6fae885e6c52eac247a4fed90c30f7290bf178949092458c94f6a534 +EBUILD iputils-99999999.ebuild 4435 BLAKE2B 3bdc031997db6288820fd9c7dce345415540d39a88bb4d63c2a2cd551c32abf7528d48681e6f54dd172577d3a2dd922798abb31070e4d4ab62d273b400a58a4f SHA512 0877a4e23496151e6f2a00609868cfe4fa5a4af8eb5c853f67a173920702d4c3c736168b6fae885e6c52eac247a4fed90c30f7290bf178949092458c94f6a534 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild deleted file mode 100644 index c71a8d09411b..000000000000 --- a/net-misc/iputils/iputils-20180629.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces depedencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag and tar ${S}/doc folder. - -EAPI="6" - -inherit flag-o-matic toolchain-funcs fcaps - -MY_PV="${PV/_pre/}" - -PATCHES=( - "${FILESDIR}"/${PN}-20180629-musl.patch - "${FILESDIR}"/${P}-fix-ping-on-musl.patch -) - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/s${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${MY_PV}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6" - -LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - ipv6? ( - ssl? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - !gcrypt? ( - nettle? ( dev-libs/nettle[static-libs(+)] ) - !nettle? ( - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - ) - ) - ) - ) -" -RDEPEND="arping? ( !net-misc/arping ) - rarpd? ( !net-misc/rarpd ) - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/os-headers -" -if [[ ${PV} == "99999999" ]] ; then - DEPEND+="app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" - -src_prepare() { - use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) - - default -} - -src_configure() { - use static && append-ldflags -static - - TARGETS=( - ping - $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done) - ) - if use ipv6 ; then - TARGETS+=( - $(usex traceroute6 'traceroute6' '') - ) - fi - - myconf=( - USE_CRYPTO=no - USE_GCRYPT=no - USE_NETTLE=no - ) - - if use ipv6 && use ssl ; then - myconf=( - USE_CRYPTO=yes - USE_GCRYPT=$(usex gcrypt) - USE_NETTLE=$(usex nettle) - ) - fi -} - -src_compile() { - tc-export CC - emake \ - USE_CAP=$(usex caps) \ - USE_IDN=$(usex idn) \ - IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \ - TARGETS="${TARGETS[*]}" \ - ${myconf[@]} - - if [[ ${PV} == "99999999" ]] ; then - emake man - - use doc && emake html - fi -} - -src_install() { - into / - dobin ping - dosym ping /bin/ping4 - if use ipv6 ; then - dosym ping /bin/ping6 - dosym ping.8 /usr/share/man/man8/ping6.8 - fi - doman doc/ping.8 - - if use arping ; then - dobin arping - doman doc/arping.8 - fi - - into /usr - - if use tracepath ; then - dosbin tracepath - doman doc/tracepath.8 - dosym tracepath /usr/sbin/tracepath4 - fi - - local u - for u in clockdiff rarpd rdisc tftpd ; do - if use ${u} ; then - case ${u} in - clockdiff) dobin ${u};; - *) dosbin ${u};; - esac - doman doc/${u}.8 - fi - done - - if use tracepath && use ipv6 ; then - dosym tracepath /usr/sbin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - - if use traceroute6 && use ipv6 ; then - dosbin traceroute6 - doman doc/traceroute6.8 - fi - - if use rarpd ; then - newinitd "${FILESDIR}"/rarpd.init.d rarpd - newconfd "${FILESDIR}"/rarpd.conf.d rarpd - fi - - dodoc INSTALL.md - - use doc && dodoc doc/*.html -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20190515.ebuild b/net-misc/iputils/iputils-20190515.ebuild deleted file mode 100644 index dbeb6834c857..000000000000 --- a/net-misc/iputils/iputils-20190515.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# For released versions, we precompile the man/html pages and store -# them in a tarball on our mirrors. This avoids ugly issues while -# building stages, and reduces depedencies. -# To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag and tar ${S}/doc folder. - -EAPI="6" - -PLOCALES="ja" - -inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/iputils/iputils.git" - inherit git-r3 -else - SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="Network monitoring tools including ping and ping6" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" - -LICENSE="BSD GPL-2+ rdisc" -SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6" - -LIB_DEPEND=" - caps? ( sys-libs/libcap[static-libs(+)] ) - idn? ( net-dns/libidn2:=[static-libs(+)] ) - ipv6? ( - ssl? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - !gcrypt? ( - nettle? ( dev-libs/nettle[static-libs(+)] ) - !nettle? ( - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - ) - ) - ) - ) - nls? ( sys-devel/gettext[static-libs(+)] ) -" - -RDEPEND=" - arping? ( !net-misc/arping ) - rarpd? ( !net-misc/rarpd ) - traceroute6? ( !net-analyzer/traceroute ) - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) -" -DEPEND=" - ${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/os-headers - virtual/pkgconfig -" -if [[ ${PV} == "99999999" ]] ; then - DEPEND+=" - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-ns-stylesheets - app-text/docbook-xsl-stylesheets - dev-libs/libxslt:0 - " -fi - -[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-20190515-fix-setcap.patch -) - -src_prepare() { - use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) - - default - - l10n_get_locales > po/LINGUAS || die -} - -src_configure() { - use static && append-ldflags -static - - local emesonargs=( - -DUSE_CAP="$(usex caps true false)" - -DUSE_IDN="$(usex idn true false)" - -DBUILD_ARPING="$(usex arping true false)" - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)" - -DBUILD_PING="true" - -DBUILD_RARPD="$(usex rarpd true false)" - -DBUILD_RDISC="$(usex rdisc true false)" - -DENABLE_RDISC_SERVER="$(usex rdisc true false)" - -DBUILD_TFTPD="$(usex tftpd true false)" - -DBUILD_TRACEPATH="$(usex tracepath true false)" - -DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)" - -DBUILD_NINFOD="false" - -DNINFOD_MESSAGES="false" - -DNO_SETCAP_OR_SUID="true" - -Dsystemdunitdir="$(systemd_get_systemunitdir)" - -DUSE_GETTEXT="$(usex nls true false)" - ) - - if use ipv6 && use ssl ; then - emesonargs+=( - -DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))" - ) - else - emesonargs+=( - -DUSE_CRYPTO="none" - ) - fi - - if [[ "${PV}" == 99999999 ]] ; then - emesonargs+=( - -DBUILD_HTML_MANS="$(usex doc true false)" - -DBUILD_MANS="true" - ) - else - emesonargs+=( - -DBUILD_HTML_MANS="false" - -DBUILD_MANS="false" - ) - fi - - meson_src_configure -} - -src_compile() { - tc-export CC - meson_src_compile -} - -src_install() { - meson_src_install - - dodir /bin - local my_bin - for my_bin in $(usex arping arping '') ping ; do - mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die - done - dosym ping /bin/ping4 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath4 - fi - - if use ipv6 ; then - dosym ping /bin/ping6 - - if use tracepath ; then - dosym tracepath /usr/bin/tracepath6 - dosym tracepath.8 /usr/share/man/man8/tracepath6.8 - fi - fi - - if [[ "${PV}" != 99999999 ]] ; then - local -a man_pages - local -a html_man_pages - - local oifs=${IFS} - while IFS= read -r -u 3 -d $'\0' my_bin - do - my_bin=$(basename "${my_bin}") - [[ -z "${my_bin}" ]] && continue - - if [[ -f "${S}/doc/${my_bin}.8" ]] ; then - man_pages+=( ${my_bin}.8 ) - fi - - if [[ -f "${S}/doc/${my_bin}.html" ]] ; then - html_man_pages+=( ${my_bin}.html ) - fi - done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) - IFS=${oifs} - - pushd doc &>/dev/null || die - doman "${man_pages[@]}" - if use doc ; then - docinto html - dodoc "${html_man_pages[@]}" - fi - popd &>/dev/null || die - else - if use doc ; then - mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die - fi - fi -} - -pkg_postinst() { - fcaps cap_net_raw \ - bin/ping \ - $(usex arping 'bin/arping' '') \ - $(usex clockdiff 'usr/bin/clockdiff' '') -} diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20200821.ebuild index bdf494ae2e6f..3365b1ca6cc5 100644 --- a/net-misc/iputils/iputils-20190709.ebuild +++ b/net-misc/iputils/iputils-20200821.ebuild @@ -5,11 +5,12 @@ # them in a tarball on our mirrors. This avoids ugly issues while # building stages, and reduces depedencies. # To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag and tar ${S}/doc folder. +# EGIT_COMMIT set to release tag, all USE flags enabled and +# tar ${S}/doc folder. EAPI="7" -PLOCALES="ja" +PLOCALES="de fr ja pt_BR tr uk zh_CN" inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs @@ -19,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then else SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux" fi DESCRIPTION="Network monitoring tools including ping and ping6" @@ -34,18 +35,6 @@ BDEPEND="virtual/pkgconfig" LIB_DEPEND=" caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) - ipv6? ( - ssl? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - !gcrypt? ( - nettle? ( dev-libs/nettle[static-libs(+)] ) - !nettle? ( - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - ) - ) - ) - ) nls? ( sys-devel/gettext[static-libs(+)] ) " @@ -106,16 +95,6 @@ src_configure() { -DUSE_GETTEXT="$(usex nls true false)" ) - if use ipv6 && use ssl ; then - emesonargs+=( - -DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))" - ) - else - emesonargs+=( - -DUSE_CRYPTO="none" - ) - fi - if [[ "${PV}" == 99999999 ]] ; then emesonargs+=( -DBUILD_HTML_MANS="$(usex doc true false)" diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index cc025fe8be3e..3365b1ca6cc5 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -5,11 +5,12 @@ # them in a tarball on our mirrors. This avoids ugly issues while # building stages, and reduces depedencies. # To regenerate man/html pages emerge iputils-99999999[doc] with -# EGIT_COMMIT set to release tag and tar ${S}/doc folder. +# EGIT_COMMIT set to release tag, all USE flags enabled and +# tar ${S}/doc folder. EAPI="7" -PLOCALES="ja" +PLOCALES="de fr ja pt_BR tr uk zh_CN" inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs @@ -34,18 +35,6 @@ BDEPEND="virtual/pkgconfig" LIB_DEPEND=" caps? ( sys-libs/libcap[static-libs(+)] ) idn? ( net-dns/libidn2:=[static-libs(+)] ) - ipv6? ( - ssl? ( - gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) - !gcrypt? ( - nettle? ( dev-libs/nettle[static-libs(+)] ) - !nettle? ( - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - ) - ) - ) - ) nls? ( sys-devel/gettext[static-libs(+)] ) " @@ -106,16 +95,6 @@ src_configure() { -DUSE_GETTEXT="$(usex nls true false)" ) - if use ipv6 && use ssl ; then - emesonargs+=( - -DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))" - ) - else - emesonargs+=( - -DUSE_CRYPTO="none" - ) - fi - if [[ "${PV}" == 99999999 ]] ; then emesonargs+=( -DBUILD_HTML_MANS="$(usex doc true false)" diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index 30ac06b85181..19469a3e8e4d 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -7,6 +7,7 @@ DIST kafka_2.12-2.3.0.tgz 57215197 BLAKE2B 91400bed0860633523d60f4b00e47eb18b27f DIST kafka_2.12-2.4.0.tgz 62283588 BLAKE2B 3492f7a5be9941a75aa5896be0e25974b46887a66e391395a813844bae2f5f57062b636852cdb7aa3650fb4017f9d462a3b95b2166b8a0be62f403c44826b675 SHA512 53b52f86ea56c9fac62046524f03f75665a089ea2dae554aefe3a3d2694f2da88b5ba8725d8be55f198ba80695443559ed9de7c0b2a2817f7a6141008ff79f49 DIST kafka_2.12-2.4.1.tgz 62358954 BLAKE2B 333b4a1d34c6249efb9984e90c314f4b39bbd1e907bbd53e1ce67d49eaa7f972c291fafcbf5be129cde055cd696ba545ac8c95c54dfbd3a89f639f7461f8dc45 SHA512 8582dc25cb14a2e9c6966efd98e41cd0ebf6369b42436954800b847298e763b22caecf130fdccc58bf79fe9e95facce6e0b5aacad072d69f6dc1eed7678a49b8 DIST kafka_2.12-2.5.0.tgz 61604633 BLAKE2B f73f3a03f245aa82b9ce5a895e7875d5ad9c4006b84c3152cac72322eb18283a1a87d81f255160ff062883737ae9862e160fec0d85160ed3a64f45e47b26db53 SHA512 447a7057bcd9faca98b6f4807bd6019ef73eee90efdc1e7b10005f669e2537a8a190cb8b9c9f4c20db1d95b13d0f0487e9cc560d0759532058439ce7f722c7cd +DIST kafka_2.13-2.6.0.tgz 65537909 BLAKE2B 883bc22f53ae7882ff2e27a3b9b62967f4718718f8e2ee222debd5f5b36636e00b35ceb60c3fd6924905b88ef96442439198255bb8329cee1cc722364ff0810f SHA512 d884e4df7d85b4fff54ca9cd987811c58506ad7871b9ed7114bbafa6fee2e79f43d04c550eea471f508b08ea34b4316ea1e529996066fd9b93fcf912f41f6165 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.2.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 @@ -14,4 +15,5 @@ EBUILD kafka-bin-2.3.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354 EBUILD kafka-bin-2.4.0.ebuild 1445 BLAKE2B 7a3195fa859a082c87c53c9a635e60f7c2a17e3f1b3b86e5098c1fb4d6693de1a56502a5885c012b9a19a8ec8bb45e9fe2d5ad3bf3b3d6abed0e021f9d33b42d SHA512 0ae2805608cfda3fdcc9f1c54733e7c2e7cab2c4e385fd3bd3c78339f08be5162d7a397b0cd747b6bad5d1e6f556524dc02cbfb0cb4b7d5aa6d77a279701604c EBUILD kafka-bin-2.4.1.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b EBUILD kafka-bin-2.5.0.ebuild 1445 BLAKE2B 0dbb9df50a4f0d74f4343392e817618f1b6d32101264b8193ee337599425d8e68bd198c696af6cb044df57953eafa7af564f51848d55b9bd013038aeb597b4a6 SHA512 6d48acf951772fd99abfa5a7faebcc277e3dcbcb7f03fb45a20787d2f102f781b2b99489ef839fa3bf4f636f64c34ef41dfcb48b9b3cf95d63b4c22affbaa36b +EBUILD kafka-bin-2.6.0.ebuild 1445 BLAKE2B f462939b918172f7dd31dbeaab8ecd9e4480da93ba6f2220597f158019789007ddf686029e12747669e7eae836b79a4f81dd47594d570b55ef054d5479010248 SHA512 1ae04cb30a976b1fb242856c8089e59071dd17f3278176b61d51e180c4cf0d768e9fb3331c18baa3ae32c321e156bb8bc77c5b225aedd909ad3a40521f42da6e MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6 diff --git a/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild new file mode 100644 index 000000000000..7c0567d9f402 --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-2.6.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils + +DESCRIPTION="A high-throughput distributed messaging system" +HOMEPAGE="https://kafka.apache.org/" + +# pick recommended scala version +SCALA_VERSION=2.13 +MY_PN="kafka" +MY_P="${MY_PN}_${SCALA_VERSION}-${PV}" +SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz" + +RESTRICT="mirror" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="internal-zookeeper" + +COMMON_DEPEND="acct-group/kafka + acct-user/kafka + virtual/jre:1.8" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR="/opt/${MY_PN}" + +src_prepare() { + sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die + sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die + eapply_user +} + +src_install() { + insinto /etc/kafka + doins config/zookeeper.properties config/server.properties + if use "internal-zookeeper"; then + keepdir /var/lib/kafka/zookeeper + newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper" + fi + + keepdir /var/lib/kafka + fowners -R kafka:kafka /var/lib/kafka + + keepdir /var/log/kafka + fowners -R kafka:kafka /var/log/kafka + + newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}" + + dodir "${INSTALL_DIR}" + cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die + keepdir "${INSTALL_DIR}/logs" + fowners -R kafka:kafka "${INSTALL_DIR}" +} diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index 2e639ad2168b..f842b0acf571 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,8 +1,8 @@ AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31 -DIST kea-1.7.8.tar.gz 7443616 BLAKE2B 88de7f0ffb0cf9b594eabf6520c6d1b16d1e94524ae12087e9cd119aa1d6396f250c2f6d77fdc8d87cf46f892f26054625be083d4e4e5bfecc498092e9146c2f SHA512 1bed7a20f0ee2198eb6c196cf6895217fecea1a8274d155d669bf30ac1aab795917e7537d279bad55c951c3c99a7cd7cf9a86594bf6f7a689d1f694823353a28 +DIST kea-1.7.10.tar.gz 7513433 BLAKE2B 7b7accccf1200c8673669d4db7ae5efa628a409661b3f82d6dc85c191578cb73fc85866307a1626a0c4a48f81df4f4ad3f5a2b9d8d5f682de2e8fc5750b56ff5 SHA512 b5f6c7c6538f767b604ff59e4cb8acb0a85bfa7611f9dbdc1b17cc70d483d6fcdc4978ccda8dd010623b2126d0b8ddf4275012f492b1c57f7b210bfd946e4a68 DIST kea-1.7.9.tar.gz 7481156 BLAKE2B eef2561b79ad83c18d42a0d23e97fc27205190475c24bb871112050b5ec0a134c4c448c03c4f1b678aadf7d54c7f96481c43485187408f8bfebe6f2c6edbc832 SHA512 180e80dbf21789e9c18c69b9e03a2ad4519eb3386cf8c4221a283883eb8151443e888b6a95d1affb0790ef25d6174582448bf590eb2ddadb12b965cba7dc8717 -EBUILD kea-1.7.8.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb +EBUILD kea-1.7.10.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb EBUILD kea-1.7.9.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb EBUILD kea-9999.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975 diff --git a/net-misc/kea/kea-1.7.8.ebuild b/net-misc/kea/kea-1.7.10.ebuild index 2f6a4dc21e8a..2f6a4dc21e8a 100644 --- a/net-misc/kea/kea-1.7.8.ebuild +++ b/net-misc/kea/kea-1.7.10.ebuild diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest index 949a191fa015..9a7e167649fa 100644 --- a/net-misc/libteam/Manifest +++ b/net-misc/libteam/Manifest @@ -1,8 +1,6 @@ DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b -DIST libteam-1.29.tar.gz 175970 BLAKE2B 8fa4192fc90b3a7ebe7ba9330191ad81e9c27dbec8e6cb657cf287cc66e4d3cc072ff032ea48311368401d7ba89b31015a9ca0c285a262336d6babfcb6457833 SHA512 adcf3706abd7fd2641388606dc2f39584607ec1f455bc52409c3905961cea446baecc5af80b6605ebb7167aef6f539b99f641cb39d97d396f32cea2aeb676561 -DIST libteam-1.30.tar.gz 175985 BLAKE2B 10ad03167c627ab7a51c5a8bcaa7fa95233c10a8df72c602e6a053bf48560653e053a5c161d61cba5e2c8860c80e17e04e953ae0fb483d00fc70d8b56630e93c SHA512 c037fb20b31fe018f508ccd733037267bb628b569f5689f5748e3daa467239d4d5ffe00ca389022d4dddaefed11828204b2887fdccf1a76327b56ec7fa0a0be5 +DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e EBUILD libteam-1.22.ebuild 1278 BLAKE2B 760afca7072e722f981b8a492accd81ca33907389f601a6baa8b74c025c8011c69d5f2ad67d7db1682a6cc9f52edc6158d79743df2090bdd972c2563198e3420 SHA512 b041b9a44a39c69947febd1747d238cc38ebddd4ca55e2032523875d388edbf0d41744d9dab2b6c3a78d76e6c3d286e28ed98fcc325889f770f147224e0f676a -EBUILD libteam-1.29.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653 -EBUILD libteam-1.30.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653 -EBUILD libteam-9999.ebuild 1359 BLAKE2B 245cb586cedf580935c7a55198f8c907fdefaad07b452a63066484f3ebbc01552d67310b55022407d9ad272b456bd27e9152e835416ed467df5a26c5b6a6dce6 SHA512 0c08712c4a2e6ec840308df9975a7a618cca15843b8d3602260af06acf075a9074d171d179bc037cb0c41801a3b58f3b810f95b2ca0b7841aec388b766f3b167 +EBUILD libteam-1.31.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653 +EBUILD libteam-9999.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4 diff --git a/net-misc/libteam/libteam-1.30.ebuild b/net-misc/libteam/libteam-1.30.ebuild deleted file mode 100644 index d4c4a38f6d61..000000000000 --- a/net-misc/libteam/libteam-1.30.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/pirko/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Library and tools set for controlling team network device" -HOMEPAGE="http://libteam.org" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="dbus debug examples static-libs +syslog zmq" - -DEPEND=">=dev-libs/jansson-2.4 - dev-libs/libdaemon - >=dev-libs/libnl-3.2.19[utils] - dbus? ( sys-apps/dbus ) - zmq? ( >=net-libs/zeromq-3.2.0 ) - " - -RDEPEND="${DEPEND} - syslog? ( virtual/logger )" - -CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE" -ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel! -Only >=3.3.0 kernel version support in team mode" - -DOCS=( README ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable syslog logging) \ - $(use_enable dbus) \ - $(use_enable zmq) -} - -src_install() { - default - - insinto /etc/dbus-1/system.d - doins teamd/dbus/teamd.conf - - if use examples; then - docinto examples - dodoc teamd/example_configs/* - fi -} diff --git a/net-misc/libteam/libteam-1.29.ebuild b/net-misc/libteam/libteam-1.31.ebuild index d4c4a38f6d61..d4c4a38f6d61 100644 --- a/net-misc/libteam/libteam-1.29.ebuild +++ b/net-misc/libteam/libteam-1.31.ebuild diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild index f28587593458..d4c4a38f6d61 100644 --- a/net-misc/libteam/libteam-9999.ebuild +++ b/net-misc/libteam/libteam-9999.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/pirko/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz" + SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest index 0daac4063586..9145acd1e614 100644 --- a/net-misc/mcproxy/Manifest +++ b/net-misc/mcproxy/Manifest @@ -3,5 +3,5 @@ AUX mcproxy.confd 160 BLAKE2B 5c2e387bbcb5de69412b1b08b63bedab8346363c4d303336c5 AUX mcproxy.initd 580 BLAKE2B aff88e8962c7861140f4a11568cab5aaa17df153bcd88b6057f3f17cbad2ee46693db681f1307daa569d4c67e258ab7ab8123c18bffd39fc924b34dd483ab2af SHA512 9f5eaeb39ef5a5cbd8af70f23f17e609f783204ee2dc458128f41a4327eb9f5b8f7f77ae1d642121e7a4af4f6778e65bc97bf0c0b800606c0ce2d6ec79c18f95 AUX mcproxy.service 161 BLAKE2B c218284289627ae733746263662c16579a617b740825e8b6e0032e9531e17c4c4f0d6bc88d6db2fd6ebbc4a9dcb6bb3dc181fea859e152eef8c53978944a6c0c SHA512 a8298d9278ee934289832d360e502268739e415681c8ecf1c69b93d80ec75094ef32e7f9618ed243a6c05a8facd7aee0b5be591aa6dfce0fcf4658bed845b830 DIST mcproxy-1.1.1.tar.gz 3373209 BLAKE2B 0b54f7c20b9d6d66c5b88daeaa00901918057b449b932656355303a83c4e4f1feb370de0c55e55484b9bafc63bfd82b8ef8179144529f3074e3d94e147cc8ff5 SHA512 408bc27169c9c90080c7842aaeaf260d5349b735e017d1750118f190124f48743fbf15fc05eee16290e38cc2f752e27b28548714a3d0cd2366dfc53dafcda0bb -EBUILD mcproxy-1.1.1-r1.ebuild 1066 BLAKE2B 52fd2c2d28eacc387f5bd63f91285896ad9faba1b0025a74888727703168649c2b9ee433b7102a0d74f651a4248380da7b51a936a6dfae561068862a03ed3f55 SHA512 ed386d1062d65be24b66c637129ef5ddb4801a918ffcba71600ec44155c13cbe653539eec553238d66a020fb0f0d175d2f468eb3e6a2e0935cac962a969b122c +EBUILD mcproxy-1.1.1-r1.ebuild 1064 BLAKE2B 2ea2e0fda806e7b9473a52eac381488d37a2bed631da4f20f43d8258c66f79738a438e93dfc6433cef6999c702a09410ef3b34693394d9c569ee5bbc9a58f0b2 SHA512 e33e7a701893fa3d5738b859d27bf4ecd8c4476ca22d08c3d9b98fffd9df3f99dc1778318b91d486c7b53ad9bc67d930601014949b5799af0e90c2e88bdfb35c MISC metadata.xml 1263 BLAKE2B e3df52a90f366a1c7f6f754908f31455322c8b0da826ee1f121925a231c4f8cb74961ba9ca49607336310e5f7176ad8ff0610220a4888f2dcd004f2bce44ecfe SHA512 48e7b7051b9172bae3816e1e2737371a9253cff443a03953b373becc9bcaf152e63a341f7a97a00adae283aeab003cd0765514ba30988994a59570314ab00df0 diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild index 41a61a3847d5..77232c3d9926 100644 --- a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild +++ b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 inherit linux-info qmake-utils systemd diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index c6b72319c248..c04a09e6964f 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -8,6 +8,6 @@ AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba55 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa DIST memcached-1.6.6.tar.gz 543661 BLAKE2B 04de48d6450961585ac3b1c8ae6f803c59e5bbf34e45aa27c9e53309350608dc3c899cf169095361c4ccdc44e0bcc2860662d7066477abd7fdc8e80e34d22d36 SHA512 dfd19bf42d35fff391bb479338706a83082e3cdd3ff6e225d3d4da9df01b0a1f659a012dc30766651ffd57f0c19128fc4c3df29b721e588c909656d02cfdaa0a -EBUILD memcached-1.5.22.ebuild 2956 BLAKE2B 149c5f1c78050f0b36086811f632ead56840a56edec63b1da22a3642c223b6fbe9eb01b55dd5f032cfad3ce540d6eeb68e34787dfca382c921fa85cc324033f2 SHA512 e05ce60c58028f51ef572dde0319d669aa9aa21c227cf7490bee0a9678144b3f11fe0a525421a2ae1c016cf0027d74bd3ec861c7aa1d83119a2d16301f29b490 -EBUILD memcached-1.6.6.ebuild 2890 BLAKE2B c91614a11022713c534524fc053b9d669aaf716ac47b7197c0732077ed31cb7a8e27a0240fd785542cec44fe5fc7afa1b36e5f50cc96e17bb194e3fc80835ea4 SHA512 e22a7b8a8e7ff6733ba5380e2765f935b313f09eef93f5df292924078a8781f710f5e6085a5efef6a35358f50a7c174c0d2c425709d5372536de035a2f626b9b +EBUILD memcached-1.5.22.ebuild 2945 BLAKE2B 0c4c35283d3974009dbd401699b8bb10e695b9d608daceb87402316b083772c2f1ef932d9ccf72ca17bc895602e7ac032fcd215bf7a40a9d29d8843ef774b01c SHA512 a22de0a032ffd098a4283ebf97aefc0e315744d59893c61110a46eba734f78ec4f98d1c8968756471811244fd02c38b7d17f83a385aeb1117aec0dee9a977618 +EBUILD memcached-1.6.6.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 diff --git a/net-misc/memcached/memcached-1.5.22.ebuild b/net-misc/memcached/memcached-1.5.22.ebuild index 3fb1c6eddbcc..29623384ac99 100644 --- a/net-misc/memcached/memcached-1.5.22.ebuild +++ b/net-misc/memcached/memcached-1.5.22.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/memcached/memcached-1.6.6.ebuild b/net-misc/memcached/memcached-1.6.6.ebuild index 3ff5cfe1d936..563ec54b1aea 100644 --- a/net-misc/memcached/memcached-1.6.6.ebuild +++ b/net-misc/memcached/memcached-1.6.6.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest index 3e065806868e..688821d8e327 100644 --- a/net-misc/mikutter/Manifest +++ b/net-misc/mikutter/Manifest @@ -1,6 +1,6 @@ -AUX mikutter 136 BLAKE2B ba1a252d63dc3a190f61ad3f0489ac7222a90d48dc01cdaadb24f02d870ef64d0fd20b5c913f8469b590ab4b961accfcb14b7b7d7fa1542fbf0b938dac35024d SHA512 bae3b58b6983c7ad6e0c10f006f4338eb0923b1056b6f74f518a1b3caeeef7c414f8de8dd927420611ae8542dde8507f1c25ca0529e7cd3a17f6ac8fc25e16b0 -DIST mikutter.3.8.6.tar.gz 3174454 BLAKE2B 3fc3802ae840fc310f1b9abd51c560fb804b57aad6bf78bd1e3b8046a42dc785c8a454de722a5e57d499bda15884a255da50d3919a1c5bbcd9e5753948d45f46 SHA512 102c25263df804fd005928ac8605ca4d115040c0e3bd13a09e73bac5b1a4ddedff92b45ac38c54692bf388b5ac8ea422a0b5c42851bb3616c74991943f1cd98f +AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6bd36ad895376c7812840afe579959a122c7619ef02c209cb7dc06da1011bc95b9b8d9fe74 SHA512 bbf70ab03b994f9593ea3854d1911f23d1a78d155e6aa755b2456f138ef6f7f2ca5ad7aea477beca487dac43a2e5472ca7f2e7d1503a57aaa93f41f06cafccba +DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4 -EBUILD mikutter-3.8.6.ebuild 2840 BLAKE2B d01f0074662996140f804692080df7f3e880c0aa57101abdee30a0677063a727f8ecde32e4762933aab0d327ac6cfe469ea6acbaf52df4eb9e9d343f540aa695 SHA512 21215df11bad9e6ed1e112ad5138a8ec0c8fadd9fce5fa8ac28675a924c9d4ba0be597b603d605efeee1ee8c4825067b84dc802098db9b1992917f9d4f35ba08 -EBUILD mikutter-9999.ebuild 2840 BLAKE2B d01f0074662996140f804692080df7f3e880c0aa57101abdee30a0677063a727f8ecde32e4762933aab0d327ac6cfe469ea6acbaf52df4eb9e9d343f540aa695 SHA512 21215df11bad9e6ed1e112ad5138a8ec0c8fadd9fce5fa8ac28675a924c9d4ba0be597b603d605efeee1ee8c4825067b84dc802098db9b1992917f9d4f35ba08 +EBUILD mikutter-4.0.6.ebuild 2862 BLAKE2B 720272f3cfc41e607f91d2c56248375334bc8fc14d019c26f842fa4d0e4f6f27be19167f769cf049031f34ecd8ad2ad02606ef66b08193e161e0de55320998b0 SHA512 4f652a5a216fbdf263de46222bcedb8dca03bbae32d1574af42d5f90bbff663e26d4e8aa2a086c52c69f7edbbbf39b845e95e4a15fb0df6531a7038cc0a5dd3f +EBUILD mikutter-9999.ebuild 2862 BLAKE2B 720272f3cfc41e607f91d2c56248375334bc8fc14d019c26f842fa4d0e4f6f27be19167f769cf049031f34ecd8ad2ad02606ef66b08193e161e0de55320998b0 SHA512 4f652a5a216fbdf263de46222bcedb8dca03bbae32d1574af42d5f90bbff663e26d4e8aa2a086c52c69f7edbbbf39b845e95e4a15fb0df6531a7038cc0a5dd3f MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3 diff --git a/net-misc/mikutter/files/mikutter b/net-misc/mikutter/files/mikutter index 129b8cd6f106..169fbc76db89 100644 --- a/net-misc/mikutter/files/mikutter +++ b/net-misc/mikutter/files/mikutter @@ -2,5 +2,5 @@ EPREFIX=${0%/usr/bin/mikutter} -DISABLE_BUNDLER_SETUP= $EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $* +DISABLE_BUNDLER_SETUP=1 $EPREFIX/usr/bin/ruby19 $EPREFIX/usr/share/mikutter/mikutter.rb $* diff --git a/net-misc/mikutter/mikutter-3.8.6.ebuild b/net-misc/mikutter/mikutter-4.0.6.ebuild index 54fc8e5670f4..2eefb272d4e6 100644 --- a/net-misc/mikutter/mikutter-3.8.6.ebuild +++ b/net-misc/mikutter/mikutter-4.0.6.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -USE_RUBY="ruby24 ruby25" +USE_RUBY="ruby25 ruby26" -inherit eutils ruby-ng +inherit eutils desktop ruby-ng PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" @@ -17,17 +17,15 @@ if [ "${PV}" = "9999" ]; then KEYWORDS="" EGIT_CHECKOUT_DIR="${WORKDIR}/all" else - MY_P="${PN}.${PV}" - SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz + SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" KEYWORDS="~amd64" - RUBY_S="${PN}" fi DESCRIPTION="Simple, powerful and moeful twitter client" HOMEPAGE="https://mikutter.hachune.net/" -LICENSE="GPL-3" +LICENSE="MIT" SLOT="0" IUSE="+libnotify" @@ -36,25 +34,26 @@ RDEPEND=" libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils" -ruby_add_rdepend "<dev-ruby/addressable-2.6 - dev-ruby/delayer - >=dev-ruby/delayer-deferred-2.0 - >=dev-ruby/diva-0.3.2 +ruby_add_rdepend "=dev-ruby/addressable-2.7* + =dev-ruby/delayer-1.1*:1 + =dev-ruby/delayer-deferred-2.1* + !<dev-ruby/delayer-deferred-2.1.3 + =dev-ruby/diva-1.0* + !<dev-ruby/diva-1.0.2 dev-ruby/httpclient - dev-ruby/json:0 - dev-ruby/instance_storage - dev-ruby/memoist + dev-ruby/json:2 + =dev-ruby/memoist-0.16* + !<dev-ruby/memoist-0.16.2 dev-ruby/moneta dev-ruby/nokogiri - >=dev-ruby/oauth-0.5.1 - >=dev-ruby/pluggaloid-1.1.1 + >=dev-ruby/oauth-0.5.4 + =dev-ruby/pluggaloid-1.2* dev-ruby/rcairo - >=dev-ruby/ruby-gettext-3.2.9 - >=dev-ruby/ruby-gtk2-3.3.0 - >dev-ruby/ruby-hmac-0.4 - dev-ruby/totoridipjp - dev-ruby/twitter-text:= - >dev-ruby/typed-array-0.1 + =dev-ruby/ruby-gettext-3.3* + !<dev-ruby/ruby-gettext-3.3.5 + =dev-ruby/ruby-gtk2-3.4* + =dev-ruby/typed-array-0.1* + !<dev-ruby/typed-array-0.1.2 virtual/ruby-ssl" all_ruby_unpack() { @@ -68,10 +67,10 @@ all_ruby_unpack() { all_ruby_install() { local rubyversion - if use ruby_targets_ruby25; then + if use ruby_targets_ruby26; then + rubyversion=ruby26 + elif use ruby_targets_ruby25; then rubyversion=ruby25 - elif use ruby_targets_ruby24; then - rubyversion=ruby24 fi exeinto /usr/share/mikutter diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild index 54fc8e5670f4..2eefb272d4e6 100644 --- a/net-misc/mikutter/mikutter-9999.ebuild +++ b/net-misc/mikutter/mikutter-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -USE_RUBY="ruby24 ruby25" +USE_RUBY="ruby25 ruby26" -inherit eutils ruby-ng +inherit eutils desktop ruby-ng PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09" @@ -17,17 +17,15 @@ if [ "${PV}" = "9999" ]; then KEYWORDS="" EGIT_CHECKOUT_DIR="${WORKDIR}/all" else - MY_P="${PN}.${PV}" - SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz + SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb" KEYWORDS="~amd64" - RUBY_S="${PN}" fi DESCRIPTION="Simple, powerful and moeful twitter client" HOMEPAGE="https://mikutter.hachune.net/" -LICENSE="GPL-3" +LICENSE="MIT" SLOT="0" IUSE="+libnotify" @@ -36,25 +34,26 @@ RDEPEND=" libnotify? ( x11-libs/libnotify ) media-sound/alsa-utils" -ruby_add_rdepend "<dev-ruby/addressable-2.6 - dev-ruby/delayer - >=dev-ruby/delayer-deferred-2.0 - >=dev-ruby/diva-0.3.2 +ruby_add_rdepend "=dev-ruby/addressable-2.7* + =dev-ruby/delayer-1.1*:1 + =dev-ruby/delayer-deferred-2.1* + !<dev-ruby/delayer-deferred-2.1.3 + =dev-ruby/diva-1.0* + !<dev-ruby/diva-1.0.2 dev-ruby/httpclient - dev-ruby/json:0 - dev-ruby/instance_storage - dev-ruby/memoist + dev-ruby/json:2 + =dev-ruby/memoist-0.16* + !<dev-ruby/memoist-0.16.2 dev-ruby/moneta dev-ruby/nokogiri - >=dev-ruby/oauth-0.5.1 - >=dev-ruby/pluggaloid-1.1.1 + >=dev-ruby/oauth-0.5.4 + =dev-ruby/pluggaloid-1.2* dev-ruby/rcairo - >=dev-ruby/ruby-gettext-3.2.9 - >=dev-ruby/ruby-gtk2-3.3.0 - >dev-ruby/ruby-hmac-0.4 - dev-ruby/totoridipjp - dev-ruby/twitter-text:= - >dev-ruby/typed-array-0.1 + =dev-ruby/ruby-gettext-3.3* + !<dev-ruby/ruby-gettext-3.3.5 + =dev-ruby/ruby-gtk2-3.4* + =dev-ruby/typed-array-0.1* + !<dev-ruby/typed-array-0.1.2 virtual/ruby-ssl" all_ruby_unpack() { @@ -68,10 +67,10 @@ all_ruby_unpack() { all_ruby_install() { local rubyversion - if use ruby_targets_ruby25; then + if use ruby_targets_ruby26; then + rubyversion=ruby26 + elif use ruby_targets_ruby25; then rubyversion=ruby25 - elif use ruby_targets_ruby24; then - rubyversion=ruby24 fi exeinto /usr/share/mikutter diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index 02b36945a996..9651ddce1109 100644 --- a/net-misc/mosh/Manifest +++ b/net-misc/mosh/Manifest @@ -1,5 +1,5 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 EBUILD mosh-1.3.2.ebuild 1509 BLAKE2B c4d9e6d0b10d7f97b1f43afbe5ed8069a1fca302877ac6b0abe91761d0486ed5e39fb70bf9e0acde444e91bd3ac4f9c0899da3b6b1e2c0c087f66edb3ad12913 SHA512 1de597aed7f93ad5081031c8e582620e2ae31e6b3b5410211c896f09ed37ec98c5e18112c60433d068fff62743d8473b3912f6f557db2f900d1324b8bd43002d -EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e +EBUILD mosh-9999.ebuild 1453 BLAKE2B b0f0c891713b3ebc5679198c7952743f5e87dc9aa093b1c61e311695f71cb928cdd7ef7b8cdc6e9befaf9b9eb2dec5a626faf011216014ce3de967d68e72f0a4 SHA512 9ed66cdcbb7e600a2c35369077942566d0b28da2dc289b58cf79d299617234b1f328e79c60fb61a8ece77c99982b73968f20903fe651c0e13ea27e7759c92eb2 MISC metadata.xml 1046 BLAKE2B b82f683b0b6a236f78d9e46378e5bf14bfd1ff232045c9a56490e1d19a58767ba1f78647e57b60217aa3851059c4a96c4c8218fbd5387203ad34ee5f577e0f32 SHA512 a4d754df5abc7fec2838525e5fec6386086a4afbbd1132cb4360fcea8211f6bf1629a00b5ddc64faad8e89ccc9a8bc82a9467b6bbdedc6a7503447d84407589a diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild index e01550c41834..97e8d3172038 100644 --- a/net-misc/mosh/mosh-9999.ebuild +++ b/net-misc/mosh/mosh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,6 @@ REQUIRED_USE=" examples? ( client )" RDEPEND=" - dev-libs/openssl:0= dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest index 3a2bafce5cf5..bbf54633c2f3 100644 --- a/net-misc/ncp/Manifest +++ b/net-misc/ncp/Manifest @@ -1,3 +1,3 @@ DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8 EBUILD ncp-1.2.4-r1.ebuild 843 BLAKE2B d42afa30ebcb9b390ff02b964f66353cd00ece303168645ccb4dd2ab85339e66b968b496fa8fd230b38da87c877a2e0f39085a333f7371686cc9ae6a861cbaad SHA512 3cb657dd0c5eba849d352eccb6b880df6660c854e98883b7ba1f9c054d677fcbd1ff812001cbc138893369dc5f5b57a352ad17d0fcd6ae1a9295291665af4186 -MISC metadata.xml 706 BLAKE2B 89f943a8462b4e25cdf30ec304a96cc2b9d33385c9f89a0050c901f57676dc05fd84a6003dd858f553cdb52be40868d048eba826aa32c2aadedbebd7b6aee341 SHA512 9601721bdaeb89191afd88187fbc2a1bf0295225c17b89aa6da0599ff5fffdf895d3b74f83f971857d6b208ce180dc36051e100b236d46257f84e8a2c50b6631 +MISC metadata.xml 696 BLAKE2B 5a7039139c48529dc58d23f5ccb5bf0cfb0f512934bde8f1db62569fd1ce2a3ba15e72dcd35ad40b53786fc701d19a9036e893d05696f7a86d90e203d5f42942 SHA512 bf9abea0e052be4f733327d6ad5b87264222da86a095995c2697039811bd11ca2d87943fe6d920f662d5f4059f1a36c884e8dabe76821fd1d3e739a5471c1401 diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml index cbd3e6302489..874363d1925d 100644 --- a/net-misc/ncp/metadata.xml +++ b/net-misc/ncp/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>m.mairkeimberger@gmail.com</email> + <email>mmk@levelnine.at</email> <name>Michael Mair-Keimberger</name> </maintainer> <maintainer type="project"> diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest index 6bc07c07405b..aa5d4feb7f88 100644 --- a/net-misc/ndisc6/Manifest +++ b/net-misc/ndisc6/Manifest @@ -4,5 +4,5 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83 DIST ndisc6-1.0.3.tar.bz2 260294 BLAKE2B cb9f302bd4d4f15effc8165dfdc686b2eda7543dd745cae43a24fea49086e3b5c58cc5b4eb14bc1a46657a15f6bd11322d5629570461f68743619deb9cd10004 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54 -EBUILD ndisc6-1.0.3.ebuild 715 BLAKE2B d55a8d38fbaa67f4d90684394d91cdf50fa183ffa2920b3693fee0a63e4c324c3070d10d96a85b076a7ec35b643d747f1bb5d77c2afc1483608c43fde0d9ade3 SHA512 affa755999661260e8fb20d67bdfb552e51d8e88746c2fe01447784025f4c878fccb7a24232fb95194f5a167c846fd5619fba40895f9aab989c4f64028b15b24 +EBUILD ndisc6-1.0.3.ebuild 722 BLAKE2B dc5acf5c08f35afb55a66457ba260218c7fa14bf4fb273e428f0507fb0225c852bfaee36380fbc621bf2de3bc37e618d2d42e593502c4bf342b7ad8417e41686 SHA512 302a959eff77adc69337bc74b9b178dd0d6f4421f112f3b3e23b14763682898cbafdc6bc9eef721196cda13d85d98b7082c12a08a7a4bdaa3ff55512e2a214e2 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild index 8c33ffaefa15..c75e79254c84 100644 --- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild +++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm x86 ~x64-macos" +KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos" IUSE="debug" DEPEND="dev-lang/perl diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest index b93bffdd4ebf..0708343f9931 100644 --- a/net-misc/netsed/Manifest +++ b/net-misc/netsed/Manifest @@ -1,7 +1,6 @@ -AUX netsed-0.01c-man.patch 2507 BLAKE2B 72c39f82972dc41124d2f91727db00ab08453ef93a5f7121e11e95bccc16c3ae329856e94225be4eed4a8d96b58c8c317fa368d40722047b1521bc9c5632448e SHA512 c418ffe795019054fe114189a4af7f3c05355645140c61b91739b3801025a273d9b20c8ccbeaeecf1285d3e1591a8f1af8b32982bcd772ee4ba09a5989e332ac DIST netsed-0.01b.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7 -DIST netsed-0.01c.tgz 12987 BLAKE2B 9d31a2cde79adc944f69cc2bf522a615201fd48dd1b46152b39368f36657ebebbfa5dbdecd91c965fb63d6e06a2a37317e005483a0c60be30a3ad178157418c2 SHA512 de1a1f38698cdcfa3b39975eb7b701abb97fd5035e306b63a6d5a459e4180cf8bb49dc2430acf4767e6d9f9c673f3e1e83040edfb8f331b9b1e10b0036058c57 +DIST netsed-1.3.tar.gz 28850 BLAKE2B 3349f9266f96bc397a85f52cf8515f0c0cb047496704ab1c1605cd479016a411662b0e7b08f3b14aa53bac250ea801b88ffcbd3ecd2609eecb1596cd41fec24a SHA512 5ffed86b462c6f89dac9d19184917b5b0759b49862ba0b34701ff2d3aa8cfe55502abb0b09594eb993c50a18962f0ca30c8e9cb96d2445f8c2877189b9a9ac79 DIST netsed_0.01c-2.diff.gz 3140 BLAKE2B 211c7f71a76b74fc47cc32dbd5e9ad05a2c7c67bd95de73b0bdb09249f245ab8b0190ee79b51cf1d2f2bc99cc0b7fdf8d358851fddafb2815adc640260122c77 SHA512 5a729e9800051449f7f52989cb65232e262ac6023f21b8ec688f3ce33ed4be79f9d00993aed7773d83dbe109927a5fc6c64e4775d4958136e5c891b6b82e6b83 EBUILD netsed-0.01b-r1.ebuild 529 BLAKE2B f69588f4e5a4a476be30f7ec5d24e632ab3c94d46c078f4cfab3a3fe22d459d92e0f99c17d1b0c988c87c8c51098cd9991b7e7bf2590c1eabece3adbab920cc6 SHA512 c0f2c24b074ab4117a605ba5e033fc0b5c3abef37b2a4666dab17e8bc78e7cef45579baf8e33141e4ee9e916317eeb27fc67647dfd42844c690e3692451c5151 -EBUILD netsed-0.01c.ebuild 549 BLAKE2B fd573f0fd565d719248187556c8ef66e889cd149e538e06382ce9e00cef14e4ddc39d663bafb6cc357c5a00ca2286bc5a3ba7790179fd88c9ac45e8335448437 SHA512 4c3e88592e6efda6ecf904961b86994478d3d0e87617d36be22fe4d87204d1320dc752babfd113aa307f32f8180d3002a4582488052bee746192b197fd633802 -MISC metadata.xml 246 BLAKE2B 51e0781372b853df95595d4124ba0f81cb5fab4dfb78745aeeebcc0728617634384d5f9a90f02b50c13330b29651450eb18dd782e1c485bea5bdcb5017fd1d63 SHA512 68010e77c1c73aa0f8b81bd63ec9734de511e7b3fef0edd156df2584f25b6d485656a4d11f200af89e53a1b3ece9d6d15e93a2d1ba63f83adf944841183cdf00 +EBUILD netsed-1.3.ebuild 459 BLAKE2B 3cee6f7685a4d57429a265d9a45cfa5d945df1e0a6d4648bbc4e8602d3d2fd5fe4f04db5120ca15736e2009161da0157767d290b21e2367dc9777cec32a95f7a SHA512 602306f98ae3822d49ef1178e226bc6c1923ee8cb3b52e9bc0aca55093f46d19b02ee57bf6d3bcefd813e8dbe71a1d7cdcd601c1a01470e90762175318b9e888 +MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/net-misc/netsed/files/netsed-0.01c-man.patch b/net-misc/netsed/files/netsed-0.01c-man.patch deleted file mode 100644 index a35a88b87b02..000000000000 --- a/net-misc/netsed/files/netsed-0.01c-man.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- netsed-0.01c.orig/debian/netsed.1 -+++ netsed-0.01c/debian/netsed.1 -@@ -0,0 +1,76 @@ -+.TH NETSED 1 "June 23, 2001" NETSED -+.SH NAME -+netsed \- network packet stream editor -+.SH SYNOPSIS -+.B netsed -+.I proto lport rhost rport rule1 -+.RI [ rule2 ] " " ... -+.SH DESCRIPTION -+NetSED is small and handful utility designed to alter the contents of -+packets forwarded thru your network in real time. It is really useful -+for network hackers in following applications: -+.TP -+.B black\-box protocol auditing -+whenever there are two or more propertiary boxes communicating over -+undocumented protocol (by enforcing changes in ongoing transmissions, -+you will be able to test if tested application is secure) -+.TP -+.B fuzz\-alike experiments, integrity tests -+whenever you want to test stability of the application and see how it -+ensures data integrity, -+.TP -+.B other common applications -+fooling other people, content filtering, etc etc \- choose whatever -+you want to. -+.LP -+It perfectly fits netgrep, netcat and tcpdump tools suite :P -+.SH OPTIONS -+.TP -+.B proto -+protocol specification (tcp or udp) -+.TP -+.B lport -+local port to listen on (see README for transparent traffic intercepting -+on some systems) -+.TP -+.B rhost -+where connection should be forwarded (0 = use destination address of -+incoming connection, see README) -+.TP -+.B rport -+destination port (0 = dst port of incoming connection) -+.TP -+.B rule\fIN\fR -+replacement rules (see below) -+.LP -+General replacement rules syntax: s/\fBpat1\fR/\fBpat2\fR\fI[/expire]\fR -+ -+This will replace all occurences of \fBpat1\fR with \fBpat2\fR in matching -+packets. Additional parameter (count) can be used to expire rule after 'count' -+succesful substitutions. Eight\-bit characters, including NULL and '/', can -+be passed using HTTP\-alike hex escape sequences (eg. %0a%0d). Single '%' -+can be reached by using '%%'. Examples: -+.TP -+.B 's/andrew/mike/1' -+replace 'andrew' with 'mike' (once) -+.TP -+.B 's/andrew/mike' -+replace all occurences of 'andrew' with 'mike' -+.TP -+.B 's/andrew/mike%00' -+replace 'andrew' with 'mike\\x00\\x00' (to keep orig. size) -+.TP -+.B 's/%%/%2f/20' -+replace '%' with '/' in first 20 packets -+.LP -+Rules are not working on cross\-packet boundaries and are evaluated from -+first to last not expired rule. -+.SH SEE ALSO -+.BR ngrep (8), -+.BR nc (1), -+ -+.BR /usr/share/doc/netsed/README.gz -+.SH AUTHOR -+\fBnetsed\fR was written by Michal Zalewski <lcamtuf@ids.pl>. -+ -+This manual page was written by Gergely Nagy <algernon@debian.org>. diff --git a/net-misc/netsed/metadata.xml b/net-misc/netsed/metadata.xml index 40f04073415b..1b2becffa26c 100644 --- a/net-misc/netsed/metadata.xml +++ b/net-misc/netsed/metadata.xml @@ -2,7 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> - <upstream> - <remote-id type="freshmeat">netsed</remote-id> - </upstream> </pkgmetadata> diff --git a/net-misc/netsed/netsed-0.01c.ebuild b/net-misc/netsed/netsed-1.3.ebuild index 979b23a2ae47..ff0fe3ff7439 100644 --- a/net-misc/netsed/netsed-0.01c.ebuild +++ b/net-misc/netsed/netsed-1.3.ebuild @@ -1,22 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Small tool for altering forwarded network data in real time" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="http://lcamtuf.coredump.cx/soft/obsolete/netsed.tgz -> ${P}.tgz" +HOMEPAGE="http://silicone.homelinux.org/projects/netsed/" +SRC_URI="http://silicone.homelinux.org/release/netsed/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" - -S=${WORKDIR}/${PN} - -PATCHES=( - "${FILESDIR}/${P}-man.patch" -) src_compile() { emake CFLAGS="${CFLAGS}" @@ -24,6 +17,5 @@ src_compile() { src_install() { dobin netsed - doman debian/netsed.1 - dodoc README + dodoc NEWS README } diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 2c7546e4c4d0..a466f6ed797c 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -12,10 +12,14 @@ DIST NetworkManager-1.20.12.tar.xz 4663320 BLAKE2B c0faab91a50ee38d6c884dd4f753d DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1 DIST NetworkManager-1.22.14.tar.xz 4771180 BLAKE2B d0133c2de2fd8a7932be7699bcef7e8e32083e6f908de0eaa3875a862329a1a302245d66dbba8a90a691245897b7a943a35785da21f394a7cf2659eb9cceb866 SHA512 81ccb634c3583406d52c159d1b0903f98c2732f9cd6962f3d6d71940d05cba32e262219de4f09c0cc687beff57bd7ba425f06d9a9c1bfa60aef11d427e91f453 DIST NetworkManager-1.24.2.tar.xz 4848624 BLAKE2B f8030159d6f645c3015cfb9cf41ffbf30f052592e04c27a2a378e6d7c0ac86f521a5147229b84e68adb7835ebac8b8ad094977f0783b3fa794149190d809a098 SHA512 34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e0280631ecc38d335871a3ee3483b338106b3a513d46a6cafdf61849027fe923 +DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d +DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517 EBUILD networkmanager-1.18.4-r3.ebuild 11431 BLAKE2B 76cb824cea61c07fb21a59dc8bee989eddcaf2ad289a899d8aa5c3a865331dc5298f5e3ca92caf1e32cb081f3ab83138df56066b8ef0ac0708cf63998e002295 SHA512 a791b582b8f90aeb845f2f04052ac24ef11a5dfc6427205a76255a625e6a26cb00ac87e0b5bd5b5fb20e44259417ccd6a039a0f97cd1989b922f1f369eb609e0 EBUILD networkmanager-1.18.6.ebuild 11432 BLAKE2B 2ef7ce19c9cd88dc3164ac651d766bbbb7fbbe2175e58fcf4eabd613cfe8cf1457678cddf0d2383fa021824e83a55d0d44734294933d95f86487b8883a8fd3f2 SHA512 852ccdbdd1c6c46ec6301f97b3108d202c1eeed3827a4cec9098a3c6d91eabb26b43f591d6bc7d2c3bbc746433efb5ba7416fe9623a5606e62fd19e317f6e323 EBUILD networkmanager-1.20.12.ebuild 11088 BLAKE2B 0dbdfd04968daad96115958bc1340fb16dec34ec8f43f0d51acee7ecd46c310b0e041130318420d5436c78134d88f13594b5201adf710c66fc5a3a4e6318e680 SHA512 c07598b70aad185a490a179f5e92b80c62af536a77dbcde44a9506d034ae0c48d4b2a4dc115a66778dfe92650605aac353ff764389f3709d642b3053744c139d EBUILD networkmanager-1.22.10-r11.ebuild 8778 BLAKE2B cfcb2044f5f9d7bfef67cfda7d58d032ca9e2cce7e9a0ee0fd64caa9875c6f6873a01823f4b56a1ecd25680dba145bf5688c580f5c465601eaef0313ebf65381 SHA512 a271e30d97f2effe6b12a168c10e4a898bb0c4105c73525db4c864cb9ab0b2a2bc3241a74f22f74fa7f1a5d6d99fdbbc528be5c28c77a2cd1adcfc159ed1e7d4 EBUILD networkmanager-1.22.14.ebuild 11203 BLAKE2B d1a13257f060d03c6ff000777b0b04e422511e2c5c9f4ebf31ad49932b9b3fd47e3ece8850541c21cb70c2091381e130914a6660ebd815535122e6d864e54beb SHA512 7302dcc4bebee3787879cbb1bd6580e883d79d93e3e54a929106dd0ec4e607f9e957730db21e6851d2ef28726d636f47c12d2f52f44e1823cc20923e4c04a4fe EBUILD networkmanager-1.24.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a +EBUILD networkmanager-1.26.0.ebuild 11144 BLAKE2B 1e6654df5c8fc594d3ec5d8c468e0bd2a47e78697b225b399b59b3ef81165432139a7d79d634c6683495e7a9d742d2fdf4c0a5bbd49017648345a068e6e0b904 SHA512 5f296495eab641feb6de9ad5e534242e70c98abe2f3395e884adafb06d6875e0aa2d9018a585ffc13e5b7ed36ec0cdb88e7e2fef68f8d2b5549a54e0661caf69 +EBUILD networkmanager-1.26.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89 diff --git a/net-misc/networkmanager/networkmanager-1.26.0.ebuild b/net-misc/networkmanager/networkmanager-1.26.0.ebuild new file mode 100644 index 000000000000..f18ab98a66db --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.26.0.ebuild @@ -0,0 +1,340 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME_ORG_MODULE="NetworkManager" +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+" +SLOT="0" + +IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + bluetooth? ( modemmanager ) + iwd? ( wifi ) + vala? ( introspection ) + wext? ( wifi ) + || ( nss gnutls ) + ?? ( consolekit elogind systemd ) +" + +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" + +# gobject-introspection-0.10.3 is needed due to gnome bug 642300 +# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +COMMON_DEPEND=" + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + policykit? ( >=sys-auth/polkit-0.106 ) + net-libs/libndp[${MULTILIB_USEDEP}] + >=net-misc/curl-7.24 + net-misc/iputils + sys-apps/util-linux[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + audit? ( sys-process/audit ) + bluetooth? ( >=net-wireless/bluez-5 ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + net-firewall/iptables ) + consolekit? ( >=sys-auth/consolekit-1.0.0 ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( net-misc/dhcpcd ) + elogind? ( >=sys-auth/elogind-219 ) + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) + modemmanager? ( >=net-misc/modemmanager-0.7.991:0= + net-misc/mobile-broadband-provider-info ) + ncurses? ( >=dev-libs/newt-0.52.15 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + !nss? ( gnutls? ( + dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) + ofono? ( net-misc/ofono ) + ovs? ( dev-libs/jansson ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + resolvconf? ( net-dns/openresolv ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-209:0= ) + teamd? ( + dev-libs/jansson + >=net-misc/libteam-1.9 + ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/plugdev + || ( + net-misc/iputils[arping(+)] + net-analyzer/arping + ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + >=sys-kernel/linux-headers-3.18 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-lang/perl + dev-libs/libxslt + ) + vala? ( $(vala_depend) ) + test? ( + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + ) +" + +python_check_deps() { + if use introspection; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + if use test; then + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + fi +} + +sysfs_deprecated_check() { + ebegin "Checking for SYSFS_DEPRECATED support" + + if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then + eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" + eerror "or NetworkManager will not work correctly." + eerror "See https://bugs.gentoo.org/333639 for more info." + die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" + fi + eend $? +} + +pkg_pretend() { + if use kernel_linux; then + get_version + if linux_config_exists; then + sysfs_deprecated_check + else + ewarn "Was unable to determine your kernel .config" + ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." + ewarn "See https://bugs.gentoo.org/333639 for more info." + fi + + fi +} + +pkg_setup() { + if use connection-sharing; then + if kernel_is lt 5 1; then + CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" + else + CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + fi + linux-info_pkg_setup + fi + if use introspection || use test; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + DOC_CONTENTS="To modify system network connections without needing to enter the + root password, add your user account to the 'plugdev' group." + + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + --disable-more-warnings + --disable-static + --localstatedir=/var + --with-runstatedir=/run + --disable-lto + --disable-qt + --without-netconfig + --with-dbus-sys-dir=/etc/dbus-1/system.d + $(multilib_native_with nmcli) + --with-udev-dir="$(get_udevdir)" + --with-config-plugins-default=keyfile + --with-iptables=/sbin/iptables + --with-ebpf=yes + $(multilib_native_enable concheck) + --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) + --with-crypto=$(usex nss nss gnutls) + --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) + # ConsoleKit has no build-time dependency, so use it as the default case. + # There is no off switch, and we do not support upower. + --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + $(multilib_native_use_with audit libaudit) + $(multilib_native_use_enable bluetooth bluez5-dun) + --without-dhcpcanon + $(use_with dhclient) + $(use_with dhcpcd) + --with-config-dhcp-default=internal + $(multilib_native_use_enable introspection) + $(use_enable json json-validation) + $(multilib_native_use_enable ppp) + --without-libpsl + $(multilib_native_use_with modemmanager modem-manager-1) + $(multilib_native_use_with ncurses nmtui) + $(multilib_native_use_with ofono) + $(multilib_native_use_enable ovs) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_with resolvconf) + $(multilib_native_use_with selinux) + $(multilib_native_use_with systemd systemd-journal) + $(multilib_native_use_enable teamd teamdctl) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable vala) + --without-valgrind + $(multilib_native_use_with wifi iwd) + $(multilib_native_use_with wext) + $(multilib_native_use_enable wifi) + ) + + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + if use ppp; then + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + # unit files directory needs to be passed only when systemd is enabled, + # otherwise systemd support is not disabled completely, bug #524534 + use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) + + if multilib_is_native_abi; then + # work-around man out-of-source brokenness, must be done before configure + ln -s "${S}/docs" docs || die + ln -s "${S}/man" man || die + fi + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + local targets=( + libnm/libnm.la + ) + emake "${targets[@]}" + fi +} + +multilib_src_test() { + if use test && multilib_is_native_abi; then + python_setup + virtx emake check + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + # Install completions at proper place, bug #465100 + gnome2_src_install completiondir="$(get_bashcompdir)" + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + else + local targets=( + install-libLTLIBRARIES + install-libnmincludeHEADERS + install-nodist_libnmincludeHEADERS + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${targets[@]}" + fi +} + +multilib_src_install_all() { + einstalldocs + ! use systemd && readme.gentoo_create_doc + + newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager + newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager + + # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts + keepdir /etc/NetworkManager/dispatcher.d + + # Provide openrc net dependency only when nm is connected + exeinto /etc/NetworkManager/dispatcher.d + newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status + sed -e "s:@EPREFIX@:${EPREFIX}:g" \ + -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die + + keepdir /etc/NetworkManager/system-connections + chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 + + # Allow users in plugdev group to modify system connections + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + + if use iwd; then + # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir + cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf + [device] + wifi.backend=iwd + EOF + fi + + # Empty + rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable NetworkManager.service + ! use systemd && readme.gentoo_print_elog + + if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then + ewarn "The ${PN} system configuration file has moved to a new location." + ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn + ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" + fi + + # NM fallbacks to plugin specified at compile time (upstream bug #738611) + # but still show a warning to remember people to have cleaner config file + if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then + if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then + ewarn + ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." + ewarn + fi + fi + + # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 + if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then + ewarn "You have psk-flags=1 setting in above files, you will need to" + ewarn "either reconfigure affected networks or, at least, set the flag" + ewarn "value to '0'." + fi + + if use dhclient || use dhcpcd; then + ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" + ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" + ewarn "works for you, and you're happy with, the alternative USE flags can be" + ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" + ewarn "the main.dhcp configuration option to use one of them instead of internal." + fi +} diff --git a/net-misc/networkmanager/networkmanager-1.26.2.ebuild b/net-misc/networkmanager/networkmanager-1.26.2.ebuild new file mode 100644 index 000000000000..91ce0e3aeda7 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.26.2.ebuild @@ -0,0 +1,340 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME_ORG_MODULE="NetworkManager" +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+" +SLOT="0" + +IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + bluetooth? ( modemmanager ) + iwd? ( wifi ) + vala? ( introspection ) + wext? ( wifi ) + || ( nss gnutls ) + ?? ( consolekit elogind systemd ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# gobject-introspection-0.10.3 is needed due to gnome bug 642300 +# wpa_supplicant-0.7.3-r3 is needed due to bug 359271 +COMMON_DEPEND=" + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + policykit? ( >=sys-auth/polkit-0.106 ) + net-libs/libndp[${MULTILIB_USEDEP}] + >=net-misc/curl-7.24 + net-misc/iputils + sys-apps/util-linux[${MULTILIB_USEDEP}] + sys-libs/readline:0= + >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + audit? ( sys-process/audit ) + bluetooth? ( >=net-wireless/bluez-5 ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + net-firewall/iptables ) + consolekit? ( >=sys-auth/consolekit-1.0.0 ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( net-misc/dhcpcd ) + elogind? ( >=sys-auth/elogind-219 ) + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] ) + modemmanager? ( >=net-misc/modemmanager-0.7.991:0= + net-misc/mobile-broadband-provider-info ) + ncurses? ( >=dev-libs/newt-0.52.15 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + !nss? ( gnutls? ( + dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) ) + ofono? ( net-misc/ofono ) + ovs? ( dev-libs/jansson ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + resolvconf? ( net-dns/openresolv ) + selinux? ( sys-libs/libselinux ) + systemd? ( >=sys-apps/systemd-209:0= ) + teamd? ( + dev-libs/jansson + >=net-misc/libteam-1.9 + ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/plugdev + || ( + net-misc/iputils[arping(+)] + net-analyzer/arping + ) + wifi? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc-am + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + >=sys-kernel/linux-headers-3.18 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-lang/perl + dev-libs/libxslt + ) + vala? ( $(vala_depend) ) + test? ( + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + ) +" + +python_check_deps() { + if use introspection; then + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + if use test; then + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" + fi +} + +sysfs_deprecated_check() { + ebegin "Checking for SYSFS_DEPRECATED support" + + if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then + eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" + eerror "or NetworkManager will not work correctly." + eerror "See https://bugs.gentoo.org/333639 for more info." + die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" + fi + eend $? +} + +pkg_pretend() { + if use kernel_linux; then + get_version + if linux_config_exists; then + sysfs_deprecated_check + else + ewarn "Was unable to determine your kernel .config" + ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." + ewarn "See https://bugs.gentoo.org/333639 for more info." + fi + + fi +} + +pkg_setup() { + if use connection-sharing; then + if kernel_is lt 5 1; then + CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4" + else + CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE" + fi + linux-info_pkg_setup + fi + if use introspection || use test; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + DOC_CONTENTS="To modify system network connections without needing to enter the + root password, add your user account to the 'plugdev' group." + + use vala && vala_src_prepare + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + --disable-more-warnings + --disable-static + --localstatedir=/var + --with-runstatedir=/run + --disable-lto + --disable-qt + --without-netconfig + --with-dbus-sys-dir=/etc/dbus-1/system.d + $(multilib_native_with nmcli) + --with-udev-dir="$(get_udevdir)" + --with-config-plugins-default=keyfile + --with-iptables=/sbin/iptables + --with-ebpf=yes + $(multilib_native_enable concheck) + --with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no) + --with-crypto=$(usex nss nss gnutls) + --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no))) + # ConsoleKit has no build-time dependency, so use it as the default case. + # There is no off switch, and we do not support upower. + --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit)) + $(multilib_native_use_with audit libaudit) + $(multilib_native_use_enable bluetooth bluez5-dun) + --without-dhcpcanon + $(use_with dhclient) + $(use_with dhcpcd) + --with-config-dhcp-default=internal + $(multilib_native_use_enable introspection) + $(use_enable json json-validation) + $(multilib_native_use_enable ppp) + --without-libpsl + $(multilib_native_use_with modemmanager modem-manager-1) + $(multilib_native_use_with ncurses nmtui) + $(multilib_native_use_with ofono) + $(multilib_native_use_enable ovs) + $(multilib_native_use_enable policykit polkit) + $(multilib_native_use_with resolvconf) + $(multilib_native_use_with selinux) + $(multilib_native_use_with systemd systemd-journal) + $(multilib_native_use_enable teamd teamdctl) + $(multilib_native_use_enable test tests) + $(multilib_native_use_enable vala) + --without-valgrind + $(multilib_native_use_with wifi iwd) + $(multilib_native_use_with wext) + $(multilib_native_use_enable wifi) + ) + + # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 + if use ppp; then + local PPPD_VER=`best_version net-dialup/ppp` + PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision + myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + # unit files directory needs to be passed only when systemd is enabled, + # otherwise systemd support is not disabled completely, bug #524534 + use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) + + if multilib_is_native_abi; then + # work-around man out-of-source brokenness, must be done before configure + ln -s "${S}/docs" docs || die + ln -s "${S}/man" man || die + fi + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + emake + else + local targets=( + libnm/libnm.la + ) + emake "${targets[@]}" + fi +} + +multilib_src_test() { + if use test && multilib_is_native_abi; then + python_setup + virtx emake check + fi +} + +multilib_src_install() { + if multilib_is_native_abi; then + # Install completions at proper place, bug #465100 + gnome2_src_install completiondir="$(get_bashcompdir)" + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + else + local targets=( + install-libLTLIBRARIES + install-libnmincludeHEADERS + install-nodist_libnmincludeHEADERS + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${targets[@]}" + fi +} + +multilib_src_install_all() { + einstalldocs + ! use systemd && readme.gentoo_create_doc + + newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager + newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager + + # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts + keepdir /etc/NetworkManager/dispatcher.d + + # Provide openrc net dependency only when nm is connected + exeinto /etc/NetworkManager/dispatcher.d + newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status + sed -e "s:@EPREFIX@:${EPREFIX}:g" \ + -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die + + keepdir /etc/NetworkManager/system-connections + chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594 + + # Allow users in plugdev group to modify system connections + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules" + + if use iwd; then + # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir + cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf + [device] + wifi.backend=iwd + EOF + fi + + # Empty + rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable NetworkManager.service + ! use systemd && readme.gentoo_print_elog + + if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then + ewarn "The ${PN} system configuration file has moved to a new location." + ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf" + ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn + ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf" + fi + + # NM fallbacks to plugin specified at compile time (upstream bug #738611) + # but still show a warning to remember people to have cleaner config file + if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then + if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then + ewarn + ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" + ewarn "Since it won't be used, you will need to stop setting ifnet plugin there." + ewarn + fi + fi + + # NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457 + if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then + ewarn "You have psk-flags=1 setting in above files, you will need to" + ewarn "either reconfigure affected networks or, at least, set the flag" + ewarn "value to '0'." + fi + + if use dhclient || use dhcpcd; then + ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since" + ewarn "version 1.20 defaults to the internal DHCP client. If the internal client" + ewarn "works for you, and you're happy with, the alternative USE flags can be" + ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak" + ewarn "the main.dhcp configuration option to use one of them instead of internal." + fi +} diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 753b13fce62c..a7b8b16fe2fa 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -2,6 +2,10 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c3 AUX nextcloud-client-2.6.4-qt515.patch 678 BLAKE2B 767ff6f3bb4ecd9ff6e87484d8e2b74b7c8f1753b71d5037f98838fa8ea5c78f63a75b66b8ee8cbd20f48a47296603136f525e090f0f625ee15e1fe6a6e688ac SHA512 19caea8c5b8b14db7af6520e72b4e4e2f20b45e6c6c8dcd2e1b0de5d8abd8d274127bb50fc16ba448d9fea189fc5cfb8c5f1e0d7c6d00661a2738ac959156049 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1 +DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462 +DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17 EBUILD nextcloud-client-2.6.4.ebuild 2063 BLAKE2B 8cba515c853082f9295afe9511f59c63a52d71410247df752aa89725c4091bbbd0aeac0e99c553f8e6246076266e398af9bc14329b5d033ed735fdc3d7b6f965 SHA512 b3b809f73652286f2df1c2720b36448e0ab4bcb66485211f1f8c4ca0a404fe31e6d38e70e19a956268050f0919f7cebe671bc1c21109fb55d3f813f4c5df5b68 +EBUILD nextcloud-client-2.6.5.ebuild 2014 BLAKE2B 3e3a102ee3043cf2d1335b31814e4dd31e2a52c85f5b8753b86deecf78e2bafe1734d0267b9752dc6e922b777450d5ccafaef91cb9b4635816462f19a031e911 SHA512 b4c283cb3afa9e33909b3656bc0192eb8e6abe3ec9aca58ecabc4a645a7900da114443cc08f84e385aebee19abf19eab224a6c573818131a2473aa38292f6bd4 +EBUILD nextcloud-client-3.0.0.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4 diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild new file mode 100644 index 000000000000..164f2273dd1f --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="Desktop Syncing Client for Nextcloud" +HOMEPAGE="https://github.com/nextcloud/desktop" +SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="doc dolphin nautilus shibboleth test" + +COMMON_DEPEND=">=dev-db/sqlite-3.4:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain[qt5(+)] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-fs/inotify-tools + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + shibboleth? ( dev-qt/qtwebkit:5 )" + +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + dolphin? ( kde-frameworks/extra-cmake-modules ) + test? ( + dev-util/cmocka + dev-qt/qttest:5 + )" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch + ) + +S=${WORKDIR}/desktop-${PV/_/-} + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + if ! use nautilus; then + pushd shell_integration > /dev/null || die + cmake_comment_add_subdirectory nautilus + popd > /dev/null || die + fi + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) + -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) + -DNO_SHIBBOLETH=$(usex !shibboleth) + -DUNIT_TESTING=$(usex test) + ) + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use doc ; then + elog "Documentation and man pages not installed" + elog "Enable doc USE-flag to generate them" + fi +} diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild new file mode 100644 index 000000000000..b6dc27e09eaa --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg + +DESCRIPTION="Desktop Syncing Client for Nextcloud" +HOMEPAGE="https://github.com/nextcloud/desktop" +SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc dolphin nautilus shibboleth test" + +COMMON_DEPEND=">=dev-db/sqlite-3.4:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain[qt5(+)] + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtquickcontrols2:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + sys-fs/inotify-tools + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + shibboleth? ( dev-qt/qtwebkit:5 )" + +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + dolphin? ( kde-frameworks/extra-cmake-modules ) + test? ( + dev-util/cmocka + dev-qt/qttest:5 + )" + +RESTRICT="!test? ( test )" + +S=${WORKDIR}/desktop-${PV/_/-} + +src_prepare() { + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + if ! use nautilus; then + pushd shell_integration > /dev/null || die + cmake_comment_add_subdirectory nautilus + popd > /dev/null || die + fi + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc) + -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) + -DNO_SHIBBOLETH=$(usex !shibboleth) + -DUNIT_TESTING=$(usex test) + ) + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + if ! use doc ; then + elog "Documentation and man pages not installed" + elog "Enable doc USE-flag to generate them" + fi +} diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 223ef88652ed..8a2c3d93a759 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,7 +1,6 @@ AUX man-pages/genmans.sh 1882 BLAKE2B f2da7801ad33b15486bba29832587281bab0abd472b3645d4c4291701cce041e862eac6b625e3707c872aba3bf59c9223fafc33b7ecd7bc3a50fa517c3ac2fbe SHA512 7f5161c8c25066f1a08e0c228956716aa55e2b5c54e4a67e1d9b18ffcd9bdc56e95c345ffbee9c35d974146652909b80c87a2796053b26dd0b2a0ac40afefd6d AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd0058fbdcb5e22404ac5a51deb9736de9cd840b7eacd4f5bd865de80a83113a898428289aa1c2fb8fda72f038666 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd -AUX ntp-4.2.8-gcc10-fno-common.patch 729 BLAKE2B 42692a4ae85bbf59d8f9ea22109b189b597234cee236d18229efb4e53181b6288c04a25f77300ca98af10fca9d15cb3df6bd962244eb40047ae6fa345b906b72 SHA512 794a2879a686423609f424fb73b7a1416cb0253b262b4c6b3bd42d9bb46441987daa87873bd343cc2987a9d65da887bb132c95c2bb1515ffb39637f9e64b1569 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9 @@ -19,10 +18,7 @@ AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b4933 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b920aa400cbf7db4ecbc874e5cddb778dbdca07da9cb79be327c1c0f8f296d30bb20d6b886b41084e5f SHA512 607322b6b47fc3e64e16a91e8c4114fcc1c565769e08dc872be9d9eb7c747a42c52a3ac855544cd05a3ae232463d612c1e58fcfed2d5b8f6fbdeff076f490380 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 -DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1 -DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794 -EBUILD ntp-4.2.8_p14-r2.ebuild 4595 BLAKE2B f1e6d0463c435249205a44d6215099e79278172acc560770723b293409432c265a9cb2d0a1733a2331ec453bc03fc8ae6e714aa33d403df3810d72437d12378b SHA512 7badaee6ba22252b003d3345b3cf08d2e9365f0721350279bebda13ec10e1bd8139c413947c45cb0ef63d0acc006f31d597c3cee634b1602f154a71a2daa8175 -EBUILD ntp-4.2.8_p15.ebuild 4553 BLAKE2B 9e5e9f42b36e041e504ea8ea6dc433c0f3c12e6e7bfca4ef62564da58eb0dd7d2107a7a56049128a8daad1c12d274e25a826d5335f3b209987873646ae85fc0e SHA512 70512d21242d8da475c7bd739b7d3c03f211258b0a4f5bf68adb15928b9798616ba64b20c7192dff897c2d9fadc4b2fe78070801f4adf20b0150b5dc1b6b60b5 +EBUILD ntp-4.2.8_p15.ebuild 4545 BLAKE2B 5010fdac23ee0d6398987ce0d1455dd233fbd65c56a5bea7c01a2bac8310117810d1f831e362d69c1117f826e12ae373a2c702f7cd6503a44be073d8d0844c33 SHA512 2ce600932e6a1d83257c250caa763f4e9357ce2b2b183c70645b2e58ce90a9015836bf2a61b6be6ca79c03549d7a0d07a59047456f85dff98802282588139261 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650 diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch deleted file mode 100644 index d2ed719d8ff7..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ntp-4.2.8p14/include/ntp_config.h.psl -+++ ntp-4.2.8p14/include/ntp_config.h -@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag { - * Poll Skew List - */ - --psl_item psl[17-3+1]; /* values for polls 3-17 */ -+extern psl_item psl[17-3+1]; /* values for polls 3-17 */ - /* To simplify the runtime code we */ - /* don't want to have to special-case */ - /* dealing with a default */ ---- ntp-4.2.8p14/ntpd/ntp_config.c.psl -+++ ntp-4.2.8p14/ntpd/ntp_config.c -@@ -202,6 +202,8 @@ int cryptosw; /* crypto command called - - extern char *stats_drift_file; /* name of the driftfile */ - -+psl_item psl[17-3+1]; /* values for polls 3-17 */ -+ - #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED - /* - * backwards compatibility flags diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild deleted file mode 100644 index 2b72249e9970..000000000000 --- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs flag-o-matic 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint" -IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" - -COMMON_DEPEND="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] ) - snmp? ( net-analyzer/net-snmp ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - parse-clocks? ( net-misc/pps-tools )" -BDEPEND="virtual/pkgconfig - acct-group/ntp - acct-user/ntp" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - acct-group/ntp - acct-user/ntp - selinux? ( sec-policy/selinux-ntp ) - vim-syntax? ( app-vim/ntp-syntax ) - !net-misc/ntpsec - !openntpd? ( !net-misc/openntpd ) -" -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}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch - "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch - "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 - "${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch -) - -src_prepare() { - default - 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 - eautoreconf #622754 - # 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 - local myeconfargs=( - --with-lineeditlibs=readline,edit,editline - --with-yielding-select - --disable-local-libevent - --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) - ) - econf "${myeconfargs[@]}" -} - -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}" || die - rm usr/sbin/ntpd || die - rm -r var/lib || die - rm etc/{conf,init}.d/ntpd || die - rm usr/share/man/*/ntpd.8 || die - else - systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service - if use caps ; then - sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ - "${D}$(systemd_get_systemunitdir)"/ntpd.service \ - || die - fi - systemd_enable_ntpunit 60-ntpd ntpd.service - fi - - systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service - systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf - systemd_newunit "${FILESDIR}"/sntp.service-r3 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/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild index 026c16b562c7..57803acb8487 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar LICENSE="HPND BSD ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint" IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest deleted file mode 100644 index 2c0b780b2487..000000000000 --- a/net-misc/ntpclient/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596 -DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc -EBUILD ntpclient-2018.244-r1.ebuild 823 BLAKE2B 21f89606ba96d99e57389686cd89deb74bcf879353476158488c006264658b71e17f2763d46f076844d9b822619faecb715f8dd610d0f41cfc56ae3948aa9e95 SHA512 4976c96d64d2a6e6b4a658b7c20d321c509916a6bca96eddfd754c489b640fcbdab0cb0937939ee9b725ee0f39e7ff3f9630b2093ac4b212fdbc71d2fa49be55 -MISC metadata.xml 1131 BLAKE2B ec8fd204149e107cdd9f29528be26e12f7e9f7a9bbcf6c9fc0be38ff6664f28a34285353955ef4cea63e169b025db793af437b774d2697d6b7ab1b77bfb1dbee SHA512 ba48bf738e4fd1288385d04a24d89bacae3c14dd292b29305320ebda63a94effa0e3ec5c01cf98623a76a0d98944e2056d300d2ad45770ed787eb66ab16a4345 diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest index 87bf8db835ed..c2c262e5084f 100644 --- a/net-misc/ntpsec/Manifest +++ b/net-misc/ntpsec/Manifest @@ -13,6 +13,6 @@ DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b EBUILD ntpsec-1.1.7-r1.ebuild 4157 BLAKE2B 9c992edfdb1ce011c07190c1f91da6eae3f8dada516587a94ea9a5aa2feedfc904583b63bca288df2301d8b2ae58d7353a822ee9ece4c34c99243076f776b0a2 SHA512 8afda370b45d2048f10c7f3122d67af4c45204b021a5ad62e686c35c79c59fed627cedb6d39653560354b692614222bbafd46938a2620a423defa6816f170f13 EBUILD ntpsec-1.1.8.ebuild 4345 BLAKE2B 5912cebcb1f7315538293b3c0c332abaa43525b2d78c89d8d1bdda102bdfbcfb2c01a48ce599911952708ffac64a25607844d198d0f2bd43175f749fcf96a3bb SHA512 239de4704281175438c76099ecb03726ce467c811077e2d11b11671ebde6d102ecdf50838eaeae94484daa4af48bee5b2e336df440888f64fc4e599d8da69702 -EBUILD ntpsec-1.1.9.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5 +EBUILD ntpsec-1.1.9.ebuild 4053 BLAKE2B f5b5015d72999c7f30053bd20a3bea86ccc7190d55a435b77d6b3dc6832843ee2e502251987c3a6aab527fb79b0fe56f6ee41ea9c3f3d789c98e27a2703ff62e SHA512 a655d1b47f0225bef39bd15d1b1501caf7e26e5232a606fbf18bfb81625a0877ac618f1bb2dd2a5be2cb52e9122bddcbae8a868ee9c829ed30f23d03b6371764 EBUILD ntpsec-9999.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild index 0692e84af87d..1af747e2e914 100644 --- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild +++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz" RESTRICT="mirror" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 arm arm64 ~x86" fi DESCRIPTION="The NTP reference implementation, refactored" diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest index 455eebef4bcd..741d29d8cfe4 100644 --- a/net-misc/oidentd/Manifest +++ b/net-misc/oidentd/Manifest @@ -1,8 +1,6 @@ AUX oidentd-2.0.7-init 837 BLAKE2B ab01ed3d6675f6196edcf7712c9f2e77369edc2481433788e63a3a82e591831869623723002f49a4498ed10ba7657f51dbc795895384213e473eba950e7ba7be SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a AUX oidentd-2.5.0-respect-ar.patch 250 BLAKE2B e756da25bca3a2e98be1a625c99f33b20ebb237cd7a3fe8f6e01664db328636451bd7af70cc16e08e45344511660787836358f92c2fa1806998dcf35f73fdc10 SHA512 6ddb24e88e864359faf8f6aa6a28de01067b0cc20c349e8c9f6ec4dafde26636e7cce3e11e137c12cd868f0de85546462be599333966ad8bf850cea5afc9b62c -DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0 DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320 -EBUILD oidentd-2.4.0.ebuild 1181 BLAKE2B e7dfd55712c91fa3073ac2e49a7e2f6360fc4804bb3aa64971dae63addfa814de422657358ede9510087787b869b9f5c95aaad7b4e26f7cd9eed1549128ae06b SHA512 dcaba59488562d2758972307cb5ea0bd99d11ae2cec142d64fe54f2adfe9df085959f91733a117dd35ce3684899a3d7d087791230506339ca7bd3937346aede0 -EBUILD oidentd-2.5.0.ebuild 1259 BLAKE2B 45b92137129317d9ec7f1089bb6b44a0627c1436c937a20ddefd75ea410bea53b63766345927263ccae06424968020d1cad14888a03bc161274eaac8dab32191 SHA512 00d0dda12a7428eb39750084f02a834b56da6980a7bcbec38afef52d1fbc61c44854b47935ef8f17401f6d1228ef3e248e261749cdecec48b530bf79a4582917 +EBUILD oidentd-2.5.0.ebuild 1254 BLAKE2B 928c432bef758266ecd842a3aaea3a4fe55468598a4867d1502eec42a73e540b62591f277f96f4874f38c1e9069f3ccdc6a32a8390c0fc619aa8d9a643511bb6 SHA512 0ea39fead9d40f11229831e53551430788baf885b25efa476b7695057a182279b187b142b50113530a3b2177f577ec5a1f0b60dd88346e23fa807b90055b36f8 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84 diff --git a/net-misc/oidentd/oidentd-2.4.0.ebuild b/net-misc/oidentd/oidentd-2.4.0.ebuild deleted file mode 100644 index 00f4dd339b44..000000000000 --- a/net-misc/oidentd/oidentd-2.4.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -DESCRIPTION="Another (RFC1413 compliant) ident daemon" -HOMEPAGE="https://oidentd.janikrabe.com/" -SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz" - -LICENSE="BSD-2 GPL-2 LGPL-2+ MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" -IUSE="debug ipv6 masquerade selinux" - -DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )" - -RDEPEND=" - acct-user/oidentd - acct-group/oidentd - selinux? ( sec-policy/selinux-oident ) - ${DEPEND}" - -src_prepare() { - sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die - - default -} - -src_configure() { - local myconf=( - $(use_enable debug) - $(use_enable ipv6) - $(use_enable masquerade libnfct) - $(use_enable masquerade nat) - --enable-xdgbdir - ) - econf "${myconf[@]}" -} - -src_install() { - default - - newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN} - newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN} - - systemd_dounit contrib/systemd/${PN}@.service - systemd_dounit contrib/systemd/${PN}.socket - systemd_dounit contrib/systemd/${PN}.service -} diff --git a/net-misc/oidentd/oidentd-2.5.0.ebuild b/net-misc/oidentd/oidentd-2.5.0.ebuild index ceb7d227fd8e..fd799d2a1495 100644 --- a/net-misc/oidentd/oidentd-2.5.0.ebuild +++ b/net-misc/oidentd/oidentd-2.5.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz" LICENSE="BSD-2 GPL-2 LGPL-2+ MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86" IUSE="debug ipv6 masquerade selinux" DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )" diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest index 7235d98b3034..3dc489f21481 100644 --- a/net-misc/omniORB/Manifest +++ b/net-misc/omniORB/Manifest @@ -5,5 +5,5 @@ AUX omniORB-4.1.4-openssl-1.patch 770 BLAKE2B ffdb15d5e48ae4cad6ee0c75334c48634f DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af -EBUILD omniORB-4.2.2.ebuild 2703 BLAKE2B da513f172984381c01f512ca8c18fd20e6cc97d63d5824137d96b3601c686f265ef152dcf2f30f4bb33069a34f98f8c546a99d18ad5b404fdf90f8359d53cfd7 SHA512 f30921b474d37d5db13be0789736fffe5e4188cb12006b1c132ba71576f02b88bf635c096414792daadeca45a7f0b3b841bad2f8cea9654095f8c54851c2705c +EBUILD omniORB-4.2.2.ebuild 2699 BLAKE2B 7d90ee3818c33c9789e895fda80aa51311f37ea719272f2908e530a24568fb9befae217d695ef2287eb83bbc3abfea03f37692c8f7b4d1be97bd7f289414ac50 SHA512 11149736ef2da11c63a961767e1193bced15b818905c5c8d290d3e38eb8e18014523219a1f4f6ba662d8ac7a66c47362d9ad455c84ef4a8c7c07a0725e17dcb7 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f diff --git a/net-misc/omniORB/omniORB-4.2.2.ebuild b/net-misc/omniORB/omniORB-4.2.2.ebuild index 62f67c23cdc9..63e319f12a9d 100644 --- a/net-misc/omniORB/omniORB-4.2.2.ebuild +++ b/net-misc/omniORB/omniORB-4.2.2.ebuild @@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2" LICENSE="LGPL-2 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ppc ppc64 ~sparc x86" IUSE="doc ipv6 ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index c7a189f85f05..a141888c3b03 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -12,9 +12,7 @@ AUX openssh-8.1_p1-hpn-14.20-glue.patch 3534 BLAKE2B 13206d78b0e344d4d90aad3f9aa AUX openssh-8.1_p1-hpn-14.20-sctp-glue.patch 737 BLAKE2B b8f93cb197206eb4315c66350ce3e943cd5f1280b5294099320cbc4a611de2a23f5a5c04ed71a394e1bd23a0928df50d754f549d652e53389ceadda2ac9f1636 SHA512 96fa9a317d9cc0a77bf5a8d82d8fa0498fff04309bc4ae546b34939580c4ed945d075f26d8ea16e787d7bf631ea5067543f380ab08167993d713ec1591a346b9 AUX openssh-8.1_p1-tests-2020.patch 1332 BLAKE2B a400f6859a5d096729c9cb6047dce8612da7fe5f8d06cc891cfb6a4c88b568be3dfc7872d5be78ef349798f501828e1505bbd5ebd49d548dbbdc6bbf987dc843 SHA512 8f4c535d3ab15e4c761f6f5d4efe762ec2bc9b5de49ee369ce9186fe40095d2065418249c89161a8ef53e893079264fd9c95b73cd74937b08fa9f563a4f00290 AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4 -AUX openssh-8.2_p1-X509-12.4.2-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a AUX openssh-8.2_p1-X509-12.4.3-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a -AUX openssh-8.2_p1-X509-glue-12.4.2.patch 5118 BLAKE2B 6adb167f27a926ac591c023e0bec87d3d5df9fd331338eea16240133bb1f637c5b2b8c44358ace9d390c2e8ed5f627360b8928ab47415fc89dcc44c1c8f1de5a SHA512 e4121c9b454445613a38d68a6dcb7be27ede1878fba811678d8a8b4cd185db609b4ffe7efb6cab0121e00af84aa86c798ebcedfe43a1b1ba4c200fe8600ba7b5 AUX openssh-8.2_p1-X509-glue-12.4.3.patch 5024 BLAKE2B 96568de2316e50d8390654aecbec7751eb9eb333b30fb30700161c626f93e97c5fb244d96baf32fa12d31760efdb10c80012f872412e90837f8b294082d7b087 SHA512 85c635ed067ec3c829fe4caee6bfe84e0f986f0513d744476e637c1af16af910604b879e6894300be1ce8a6a6e397149329e8fe09246e3654dcdef1ff44da4ed AUX openssh-8.2_p1-hpn-14.20-X509-glue.patch 4881 BLAKE2B 899065ef3b781e7e67ea630ff26ac8c3975073e9ef5b0cc345c6cee9fb2e45d2ff549b716a76211c88efb1e540ed7d79c4467e0342cfbea64fef8e6cafddac85 SHA512 d37d4fd8614bed8b1592697b911a04e2ca7d14d24e9c315a6695b4c88cdb5b4ae980e8cb68040fe54b4587675ebb3ac5694ea0d09093f8451aa65e427b6a5d95 AUX openssh-8.2_p1-hpn-14.20-glue.patch 5294 BLAKE2B 6a778eab95e05d371fd92a02f96b926cec5c6ff90dea36065b4857ddf243b5f95bb25aa339fddb1c662b628f26d0c11858d1ca0badece0a7268d6a51e99a09be SHA512 50289c60df01a59f134a0b283ec21d6a06beccdb68de67a46b4e0e9a9bc47855b0e4dbed47300c2f042f2eb9f63e4d6d0683f3092ee358a82e9d6337a3b173fe @@ -22,6 +20,7 @@ AUX openssh-8.2_p1-hpn-14.20-libressl.patch 794 BLAKE2B 36e42916a90aeb857eb7b9bc AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde AUX openssh-8.3_p1-X509-glue-12.5.1.patch 1721 BLAKE2B c67e6ce756d8febea9066ca52d47baff962075610ca87ee8ef9581940db020ab8889f1bb7e2809bac7c521058e835a25823f30bd6ee8b4948cbb19b7459e512c SHA512 bf356de43307cb48fd79427b22fff5bf40ad4fc72c6e906b517209f5f51bddf6a5f81d7617ad01e8434db5703df4fa45f68d4a70fd5869691536b9f82fb18b18 AUX openssh-8.3_p1-hpn-14.20-glue.patch 6059 BLAKE2B 454178571fbf051fad6edff93c87d96f4fa62c687b03666a27e912e29c9f11d375935d0f830edff779ff73f0de16831bc54d2a7e747ff5e3951933b25f39b452 SHA512 0791c0936b4e316715e691b3ac0fa6dd03495fc30ddb68ba15a73c2f8aafb3892df5fa3c29d91e16d956f9aa3c9fd66ded8ad744834788f2fad08b807efe0a5b +AUX openssh-8.3_p1-sha2-include.patch 370 BLAKE2B 3d9ee891d9d647f4ff3b42d47cae4c7a32533bce917b35101fd3c5549717a6b285423894b3372ecb6983d4425c712f4b0590fc95799fd521523d9d74860863c6 SHA512 a1edda5dc43af79e9e4e7d3bcd78cc1c2dbf40e94f22189022dcaf1107c8f2cb2a37c949af5955144f6ada210417a695fe0c4d05d52ba2dbafb1dddf6a1bac3f AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c @@ -32,7 +31,6 @@ DIST openssh-8.1_p1-glibc-2.31-patches.tar.xz 1752 BLAKE2B ccab53069c0058be7ba78 DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566 DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925 -DIST openssh-8.2p1+x509-12.4.2.diff.gz 805574 BLAKE2B 4df31b634308ce074d820df24984d44fdde48e115f8c2ac62afb09f28602acf9e4b080a13e5ba2e6033fe92bc4289ef00ed7adbb4af334462fbc9c82c4e7b64f SHA512 770b269929df0b7c9709fa2d07693a3ae9ebaca12fe463f7eabdaab66ee115fc02afa46dc847493d5050bff105740f2c1453fc456271d723c6e5b98d5bf7fd43 DIST openssh-8.2p1+x509-12.4.3.diff.gz 806905 BLAKE2B 8e0f0f3eeb2aafd9fc9e6eca80c0b51ffedbed9dfc46ff73bb1becd28f6ac013407d03107b59da05d9d56edbf283eef20891086867b79efd8aab81c3e9a4a32f SHA512 51117d7e4df2ff78c4fdfd08c2bb8f1739b1db064df65bab3872e1a956c277a4736c511794aa399061058fea666a76ee07bb50d83a0d077b7fa572d02c030b91 DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305 DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a @@ -42,8 +40,7 @@ DIST openssh-8.3p1.tar.gz 1706358 BLAKE2B 0b53d92caa4a0f4cb40eee671ac889753d320b DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221 DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1877acdedeaee80172da469b5a62d0aaa43d6ed46c578e7893577b9d563835d89ca2044867fc561ad3f562bf504c025cf4c78421cf3d24397e9 SHA512 768db7cca8839df4441afcb08457d13d32625b31859da527c3d7f1a92d17a4ec81d6987db00879c394bbe59589e57b10bfd98899a167ffed65ab367b1fd08739 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d -EBUILD openssh-8.1_p1-r3.ebuild 16430 BLAKE2B 5f87ff43f472c467a8e4dc359556b970a2d9889d45d5eb09c5eac5c0d245027764ec4d6b99853baaf7324883e5be426e20515b53f48fcc7a445a05e84fb0edde SHA512 e07cf259d7a6476c5efa4db22710bd533f86188bd1f5139e2c306858dd67e3b2a83cf5c9236c9441171e25af20a14e9f1d04aa058020ac9a20e0b0d6e7d8d89d -EBUILD openssh-8.2_p1-r5.ebuild 16798 BLAKE2B 03dd8a663c89cb2185188a0fa9f72af49def3f44a9eaaa989c95f8b2812aab7a335547ff9d22edf64522576a04705e1f957d0edfe2ecf397df760f077eb846c5 SHA512 2a1714d7c8fa18a7b3bf5333625773e2125ca21dd3096766aad341663510503276db61fa42b9cc99d0531b4fcc55ae81e31c47de7502f7c2d83bdb49b91f1448 -EBUILD openssh-8.2_p1-r6.ebuild 16856 BLAKE2B f2e13e4cf7dd8f5fa5413bf66fb78116c27dc578b3a1f3368e288b26aea5a90d3e19f8a347e79d460935123169c95583c379c9db1ed352af54ed34991d02ad43 SHA512 e9bf2cda73df7d5b5a38e0ef9ce907a9be9fdeeb871e47d80809773e4119664dd42277f0d8016f4e77ae486750540c52fbdf0712fdecbac919b282a25d1e493c -EBUILD openssh-8.3_p1-r2.ebuild 17104 BLAKE2B c1203cc284fc9fbc6bdf58e14fce7e88bc6407f8ca5dfd7fc5fd6ae6fd7e702f9fdb9dd83cfae9184921488d0c38ad359b862ce7f3eaf8b41eddc4d944d4ddec SHA512 ac48088bc33f837860f8d3fa34875d72270ad58eed0f650288983307f9752aa0b0a47b5c244624f395e541867fba3b0552327f5d81a554fa92d240d888e903ec -MISC metadata.xml 2009 BLAKE2B de9bc08ceda797610a3910f79fc382a40c3129fec66b65675e008c649f8dd7341ef12b4391136e0e0d036699ed98fe23d7b3def941cb26cd299a17408e469830 SHA512 b72696b307f01cfe3b4ccf746450fbd15d0e64436fe7668c936c1f902522df68218314d494254d8e5403dcb1ffc79a52e64212b6c49b0e464754875112048544 +EBUILD openssh-8.1_p1-r4.ebuild 16480 BLAKE2B a5e5d62c92081c5295cbbe035a83da2def0cdf22bd13da5621108d642f5537fd8c0c88849639267b0ee345c67926b6de44dd195e51bd56fdab15200eb5be7081 SHA512 a62ac99608dd98656ccf03834026af28f279eb635d7852fe2b0aea42f0d83ee0c776b63e48b14f09aa5c746ef7647ab2069edd151384ab8a2c260580ebc70873 +EBUILD openssh-8.2_p1-r7.ebuild 16906 BLAKE2B 8cd3c1a0712ebc989497e7f45b39551d07ee29928f5c64719c96cd4d1ea460259fdf437d828827954961596c4255041a65a0965db48e62b63bdf4d48c313e882 SHA512 ce10e972fa022f40ed1800eedf9f946322a993d1183a22ddd636f819da6a000594d1602a89bb4bbc7788dffce2d4a366013ac29a2ac09f1c09588ccd62965f90 +EBUILD openssh-8.3_p1-r5.ebuild 17417 BLAKE2B 85b03f36185181d15570cab52910a13bcc679bbd16b78ccff41f6c28375d04c5ab03f95d6eb0dd8b9643fff3f4d8425a8e1bf2dd668c91e663bc67a16ad758ab SHA512 e40ec9459844b1838ba887e4c79180e8df87537397eddcf5ae6a74a352321168c9c69f5e3a220c5019f31627cc88f0732763fb9f0ca511ccc5568bd3a82f40eb +MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch deleted file mode 100644 index 1c58d0d5d823..000000000000 --- a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4.2-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:01.210601434 -0700 -+++ b/openbsd-compat/regress/Makefile.in 2020-02-15 10:59:18.753485852 -0700 -@@ -7,7 +7,7 @@ - CC=@CC@ - LD=@LD@ - CFLAGS=@CFLAGS@ --CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ -+CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ - EXEEXT=@EXEEXT@ - LIBCOMPAT=../libopenbsd-compat.a - LIBS=@LIBS@ diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch deleted file mode 100644 index 90a5d5a660f2..000000000000 --- a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.2.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --exclude '*.un~' -ubr a/openssh-8.2p1+x509-12.4.2.diff b/openssh-8.2p1+x509-12.4.2.diff ---- a/openssh-8.2p1+x509-12.4.2.diff 2020-02-23 12:25:17.296737805 -0800 -+++ b/openssh-8.2p1+x509-12.4.2.diff 2020-02-23 12:26:25.347779673 -0800 -@@ -39236,16 +39236,15 @@ - - install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config - install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf --@@ -378,6 +379,8 @@ -+@@ -378,6 +379,7 @@ - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5 - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8 - $(MKDIR_P) $(DESTDIR)$(libexecdir) - + $(MKDIR_P) $(DESTDIR)$(sshcadir) --+ $(MKDIR_P) $(DESTDIR)$(piddir) - $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT) --@@ -386,11 +389,14 @@ -+@@ -386,11 +388,14 @@ - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) - $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) -@@ -39264,7 +39263,7 @@ - $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 - $(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 - $(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 --@@ -400,12 +406,12 @@ -+@@ -400,12 +405,12 @@ - $(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5 - $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 - $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 -@@ -39278,7 +39277,7 @@ - - install-sysconf: - $(MKDIR_P) $(DESTDIR)$(sysconfdir) --@@ -463,10 +469,9 @@ -+@@ -463,10 +468,9 @@ - -rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT) - -rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT) - -rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT) -@@ -39292,7 +39291,7 @@ - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 --@@ -478,7 +483,6 @@ -+@@ -478,7 +482,6 @@ - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 - -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 -@@ -39300,7 +39299,7 @@ - - regress-prep: - $(MKDIR_P) `pwd`/regress/unittests/test_helper --@@ -491,11 +495,11 @@ -+@@ -491,11 +494,11 @@ - $(MKDIR_P) `pwd`/regress/unittests/match - $(MKDIR_P) `pwd`/regress/unittests/utf8 - $(MKDIR_P) `pwd`/regress/misc/kexfuzz -@@ -39314,7 +39313,7 @@ - - regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS) - $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \ --@@ -546,8 +550,7 @@ -+@@ -546,8 +549,7 @@ - regress/unittests/sshkey/tests.o \ - regress/unittests/sshkey/common.o \ - regress/unittests/sshkey/test_file.o \ -@@ -39344,7 +39343,7 @@ - - regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ - ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ --@@ -618,35 +619,18 @@ -+@@ -618,35 +618,18 @@ - -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) - - MISC_KEX_FUZZ_OBJS=\ -@@ -39382,7 +39381,7 @@ - regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ - regress/unittests/sshkey/test_sshkey$(EXEEXT) \ - regress/unittests/bitmap/test_bitmap$(EXEEXT) \ --@@ -657,36 +641,29 @@ -+@@ -657,36 +640,29 @@ - regress/unittests/utf8/test_utf8$(EXEEXT) \ - regress/misc/kexfuzz/kexfuzz$(EXEEXT) - -@@ -39439,7 +39438,7 @@ - TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \ - TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \ - TEST_SSH_ECC="@TEST_SSH_ECC@" ; \ --@@ -708,8 +685,6 @@ -+@@ -708,8 +684,6 @@ - TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ - TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ - TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ -@@ -39448,7 +39447,7 @@ - TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ - TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ - TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ --@@ -717,17 +692,35 @@ -+@@ -717,17 +691,35 @@ - TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ - TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ - TEST_SSH_ECC="$${TEST_SSH_ECC}" \ -@@ -39487,7 +39486,7 @@ - - survey: survey.sh ssh - @$(SHELL) ./survey.sh > survey --@@ -743,4 +736,8 @@ -+@@ -743,4 +735,8 @@ - sh buildpkg.sh; \ - fi - -@@ -98042,16 +98041,6 @@ - + return mbtowc(NULL, s, n); - +} - +#endif --diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4.2/version.h ----- openssh-8.2p1/version.h 2020-02-14 02:40:54.000000000 +0200 --+++ openssh-8.2p1+x509-12.4.2/version.h 2020-02-23 11:07:00.000000000 +0200 --@@ -2,5 +2,4 @@ -- -- #define SSH_VERSION "OpenSSH_8.2" -- ---#define SSH_PORTABLE "p1" ---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE --+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" - diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4.2/version.m4 - --- openssh-8.2p1/version.m4 1970-01-01 02:00:00.000000000 +0200 - +++ openssh-8.2p1+x509-12.4.2/version.m4 2020-02-23 11:07:00.000000000 +0200 diff --git a/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch new file mode 100644 index 000000000000..6bd716619701 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.3_p1-sha2-include.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index c9e4294d..2dbfac24 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -44,7 +44,7 @@ CC=@CC@ + LD=@LD@ + CFLAGS=@CFLAGS@ + CFLAGS_NOPIE=@CFLAGS_NOPIE@ +-CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ ++CPPFLAGS=-I. -I$(srcdir) -I$(srcdir)/openbsd-compat @CPPFLAGS@ $(PATHS) @DEFS@ + PICFLAG=@PICFLAG@ + LIBS=@LIBS@ + K5LIBS=@K5LIBS@ diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml index 2a8ac0609ece..9ce34e610701 100644 --- a/net-misc/openssh/metadata.xml +++ b/net-misc/openssh/metadata.xml @@ -21,6 +21,7 @@ ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and </longdescription> <use> <flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag> + <flag name="scp">Enable scp command with known security problems. See bug 733802</flag> <flag name="hpn">Enable high performance ssh</flag> <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag> <flag name="livecd">Enable root password logins for live-cd environment.</flag> diff --git a/net-misc/openssh/openssh-8.1_p1-r3.ebuild b/net-misc/openssh/openssh-8.1_p1-r4.ebuild index 75b805da4ddb..53ccdd567a28 100644 --- a/net-misc/openssh/openssh-8.1_p1-r3.ebuild +++ b/net-misc/openssh/openssh-8.1_p1-r4.ebuild @@ -82,8 +82,9 @@ RDEPEND=" kerberos? ( virtual/krb5 ) " DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) virtual/os-headers + kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) + static? ( ${LIB_DEPEND} ) " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) diff --git a/net-misc/openssh/openssh-8.2_p1-r5.ebuild b/net-misc/openssh/openssh-8.2_p1-r5.ebuild deleted file mode 100644 index 83bb3bd37ed4..000000000000 --- a/net-misc/openssh/openssh-8.2_p1-r5.ebuild +++ /dev/null @@ -1,482 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs - -# Make it more portable between straight releases -# and _p? releases. -PARCH=${P/_} -HPN_PV="8.1_P1" - -HPN_VER="14.20" -HPN_PATCHES=( - ${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff - ${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff -) - -SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz" -X509_VER="12.4.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz" - -DESCRIPTION="Port of OpenBSD's free SSH release" -HOMEPAGE="https://www.openssh.com/" -SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz - ${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )} - ${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )} - ${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )} -" -S="${WORKDIR}/${PARCH}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -# Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" - -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ldns? ( ssl ) - pie? ( !static ) - static? ( !kerberos !pam ) - X509? ( !sctp !security-key ssl !xmss ) - xmss? ( || ( ssl libressl ) ) - test? ( ssl ) -" - -LIB_DEPEND=" - audit? ( sys-process/audit[static-libs(+)] ) - ldns? ( - net-libs/ldns[static-libs(+)] - !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) - bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) - ) - libedit? ( dev-libs/libedit:=[static-libs(+)] ) - sctp? ( net-misc/lksctp-tools[static-libs(+)] ) - security-key? ( dev-libs/libfido2:=[static-libs(+)] ) - selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) - ssl? ( - !libressl? ( - || ( - ( - >=dev-libs/openssl-1.0.1:0[bindist=] - <dev-libs/openssl-1.1.0:0[bindist=] - ) - >=dev-libs/openssl-1.1.0g:0[bindist=] - ) - dev-libs/openssl:0=[static-libs(+)] - ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - virtual/libcrypt:=[static-libs(+)] - >=sys-libs/zlib-1.2.3:=[static-libs(+)] -" -RDEPEND=" - acct-group/sshd - acct-user/sshd - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - pam? ( sys-libs/pam ) - kerberos? ( virtual/krb5 ) -" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) - virtual/os-headers -" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20081028 ) - userland_GNU? ( !prefix? ( sys-apps/shadow ) ) - X? ( x11-apps/xauth ) -" -BDEPEND=" - virtual/pkgconfig - sys-devel/autoconf -" - -pkg_pretend() { - # this sucks, but i'd rather have people unable to `emerge -u openssh` - # than not be able to log in to their server any more - maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; } - local fail=" - $(use hpn && maybe_fail hpn HPN_VER) - $(use sctp && maybe_fail sctp SCTP_PATCH) - $(use X509 && maybe_fail X509 X509_PATCH) - " - fail=$(echo ${fail}) - if [[ -n ${fail} ]] ; then - eerror "Sorry, but this version does not yet support features" - eerror "that you requested: ${fail}" - eerror "Please mask ${PF} for now and check back later:" - eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" - die "booooo" - fi - - # Make sure people who are using tcp wrappers are notified of its removal. #531156 - if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then - ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like" - ewarn "you're trying to use it. Update your ${EROOT}/etc/hosts.{allow,deny} please." - fi -} - -src_prepare() { - sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ - pathnames.h || die - - # don't break .ssh/authorized_keys2 for fun - sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die - - eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch - eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex - eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch - eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch - eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch - - [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches - - local PATCHSET_VERSION_MACROS=() - - if use X509 ; then - pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch" - popd &>/dev/null || die - - eapply "${WORKDIR}"/${X509_PATCH%.*} - eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch - - # We need to patch package version or any X.509 sshd will reject our ssh client - # with "userauth_pubkey: could not parse key: string is too large [preauth]" - # error - einfo "Patching package version for X.509 patch set ..." - sed -i \ - -e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \ - "${S}"/configure.ac || die "Failed to patch package version for X.509 patch" - - einfo "Patching version.h to expose X.509 patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE.*/a #define SSH_X509 \"-PKIXSSH-${X509_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in X.509 patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_X509' ) - fi - - if use sctp ; then - eapply "${WORKDIR}"/${SCTP_PATCH%.*} - - einfo "Patching version.h to expose SCTP patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_SCTP \"-sctp-${SCTP_VER}\"" \ - "${S}"/version.h || die "Failed to sed-in SCTP patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' ) - - einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..." - sed -i \ - -e "/\t\tcfgparse \\\/d" \ - "${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch" - fi - - if use hpn ; then - local hpn_patchdir="${T}/${P}-hpn${HPN_VER}" - mkdir "${hpn_patchdir}" || die - cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die - pushd "${hpn_patchdir}" &>/dev/null || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch - if use X509; then - # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" - # # X509 and AES-CTR-MT don't get along, let's just drop it - # rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die - eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch - fi - use sctp && eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-sctp-glue.patch - popd &>/dev/null || die - - eapply "${hpn_patchdir}" - - use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch" - - einfo "Patching Makefile.in for HPN patch set ..." - sed -i \ - -e "/^LIBS=/ s/\$/ -lpthread/" \ - "${S}"/Makefile.in || die "Failed to patch Makefile.in" - - einfo "Patching version.h to expose HPN patch set ..." - sed -i \ - -e "/^#define SSH_PORTABLE/a #define SSH_HPN \"-hpn${HPN_VER//./v}\"" \ - "${S}"/version.h || die "Failed to sed-in HPN patch version" - PATCHSET_VERSION_MACROS+=( 'SSH_HPN' ) - - if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - einfo "Disabling known non-working MT AES cipher per default ..." - - cat > "${T}"/disable_mtaes.conf <<- EOF - - # HPN's Multi-Threaded AES CTR cipher is currently known to be broken - # and therefore disabled per default. - DisableMTAES yes - EOF - sed -i \ - -e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \ - "${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config" - - sed -i \ - -e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \ - "${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config" - fi - fi - - if use X509 || use sctp || use hpn ; then - einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)" - - einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..." - sed -i \ - -e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \ - "${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)" - - einfo "Patching version.h to add our patch sets to SSH_RELEASE ..." - sed -i \ - -e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \ - "${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)" - fi - - sed -i \ - -e "/#UseLogin no/d" \ - "${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)" - - eapply_user #473004 - - tc-export PKG_CONFIG - local sed_args=( - -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" - # Disable PATH reset, trust what portage gives us #254615 - -e 's:^PATH=/:#PATH=/:' - # Disable fortify flags ... our gcc does this for us - -e 's:-D_FORTIFY_SOURCE=2::' - ) - - # The -ftrapv flag ICEs on hppa #505182 - use hppa && sed_args+=( - -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:' - -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d' - ) - # _XOPEN_SOURCE causes header conflicts on Solaris - [[ ${CHOST} == *-solaris* ]] && sed_args+=( - -e 's/-D_XOPEN_SOURCE//' - ) - sed -i "${sed_args[@]}" configure{.ac,} || die - - eautoreconf -} - -src_configure() { - addwrite /dev/ptmx - - use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG - use static && append-ldflags -static - use xmss && append-cflags -DWITH_XMSS - - local myconf=( - --with-ldflags="${LDFLAGS}" - --disable-strip - --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX}"/etc/ssh - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX}"/usr/share/openssh - --with-privsep-path="${EPREFIX}"/var/empty - --with-privsep-user=sshd - $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX}"/usr) - # We apply the sctp patch conditionally, so can't pass --without-sctp - # unconditionally else we get unknown flag warnings. - $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX}"/usr) - $(use_with libedit) - $(use_with pam) - $(use_with pie) - $(use_with selinux) - $(use_with security-key security-key-builtin) - $(use_with ssl openssl) - $(use_with ssl md5-passwords) - $(use_with ssl ssl-engine) - $(use_with !elibc_Cygwin hardening) #659210 - ) - - # stackprotect is broken on musl x86 and ppc - use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect ) - - # The seccomp sandbox is broken on x32, so use the older method for now. #553748 - use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit ) - - econf "${myconf[@]}" -} - -src_test() { - local t skipped=() failed=() passed=() - local tests=( interop-tests compat-tests ) - - local shell=$(egetshell "${UID}") - if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then - elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" - elog "user, so we will run a subset only." - skipped+=( tests ) - else - tests+=( tests ) - fi - - # It will also attempt to write to the homedir .ssh. - local sshhome=${T}/homedir - mkdir -p "${sshhome}"/.ssh - for t in "${tests[@]}" ; do - # Some tests read from stdin ... - HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \ - emake -k -j1 ${t} </dev/null \ - && passed+=( "${t}" ) \ - || failed+=( "${t}" ) - done - - einfo "Passed tests: ${passed[*]}" - [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" - [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" -} - -# Gentoo tweaks to default config files. -tweak_ssh_configs() { - local locale_vars=( - # These are language variables that POSIX defines. - # http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02 - LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - - # These are the GNU extensions. - # https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html - LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE - ) - - # First the server config. - cat <<-EOF >> "${ED}"/etc/ssh/sshd_config - - # Allow client to pass locale environment variables. #367017 - AcceptEnv ${locale_vars[*]} - - # Allow client to pass COLORTERM to match TERM. #658540 - AcceptEnv COLORTERM - EOF - - # Then the client config. - cat <<-EOF >> "${ED}"/etc/ssh/ssh_config - - # Send locale environment variables. #367017 - SendEnv ${locale_vars[*]} - - # Send COLORTERM to match TERM. #658540 - SendEnv COLORTERM - EOF - - if use pam ; then - sed -i \ - -e "/^#UsePAM /s:.*:UsePAM yes:" \ - -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ - -e "/^#PrintMotd /s:.*:PrintMotd no:" \ - -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED}"/etc/ssh/sshd_config || die - fi - - if use livecd ; then - sed -i \ - -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED}"/etc/ssh/sshd_config || die - fi -} - -src_install() { - emake install-nokeys DESTDIR="${D}" - fperms 600 /etc/ssh/sshd_config - dobin contrib/ssh-copy-id - newinitd "${FILESDIR}"/sshd-r1.initd sshd - newconfd "${FILESDIR}"/sshd-r1.confd sshd - - newpamd "${FILESDIR}"/sshd.pam_include.2 sshd - - tweak_ssh_configs - - doman contrib/ssh-copy-id.1 - dodoc CREDITS OVERVIEW README* TODO sshd_config - use hpn && dodoc HPN-README - use X509 || dodoc ChangeLog - - diropts -m 0700 - dodir /etc/skel/.ssh - - keepdir /var/empty - - systemd_dounit "${FILESDIR}"/sshd.{service,socket} - systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service' -} - -pkg_preinst() { - if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then - show_ssl_warning=1 - fi -} - -pkg_postinst() { - local old_ver - for old_ver in ${REPLACING_VERSIONS}; do - if ver_test "${old_ver}" -lt "5.8_p1"; then - elog "Starting with openssh-5.8p1, the server will default to a newer key" - elog "algorithm (ECDSA). You are encouraged to manually update your stored" - elog "keys list as servers update theirs. See ssh-keyscan(1) for more info." - fi - if ver_test "${old_ver}" -lt "7.0_p1"; then - elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream." - elog "Make sure to update any configs that you might have. Note that xinetd might" - elog "be an alternative for you as it supports USE=tcpd." - fi - if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518 - elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their" - elog "weak sizes. If you rely on these key types, you can re-enable the key types by" - elog "adding to your sshd_config or ~/.ssh/config files:" - elog " PubkeyAcceptedKeyTypes=+ssh-dss" - elog "You should however generate new keys using rsa or ed25519." - - elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'" - elog "to 'prohibit-password'. That means password auth for root users no longer works" - elog "out of the box. If you need this, please update your sshd_config explicitly." - fi - if ver_test "${old_ver}" -lt "7.6_p1"; then - elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely." - elog "Furthermore, rsa keys with less than 1024 bits will be refused." - fi - if ver_test "${old_ver}" -lt "7.7_p1"; then - elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality." - elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option" - elog "if you need to authenticate against LDAP." - elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details." - fi - if ver_test "${old_ver}" -lt "8.2_p1"; then - ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you" - ewarn "will not be able to establish new sessions. Restarting sshd over a ssh" - ewarn "connection is generally safe." - fi - done - - if [[ -n ${show_ssl_warning} ]]; then - elog "Be aware that by disabling openssl support in openssh, the server and clients" - elog "no longer support dss/rsa/ecdsa keys. You will need to generate ed25519 keys" - elog "and update all clients/servers that utilize them." - fi - - if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then - elog "" - elog "HPN's multi-threaded AES CTR cipher is currently known to be broken" - elog "and therefore disabled at runtime per default." - elog "Make sure your sshd_config is up to date and contains" - elog "" - elog " DisableMTAES yes" - elog "" - elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher." - elog "" - fi -} diff --git a/net-misc/openssh/openssh-8.2_p1-r6.ebuild b/net-misc/openssh/openssh-8.2_p1-r7.ebuild index c0ed8f5dec46..c8fff3ba9509 100644 --- a/net-misc/openssh/openssh-8.2_p1-r6.ebuild +++ b/net-misc/openssh/openssh-8.2_p1-r7.ebuild @@ -81,8 +81,9 @@ RDEPEND=" kerberos? ( virtual/krb5 ) " DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) virtual/os-headers + kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) + static? ( ${LIB_DEPEND} ) " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) diff --git a/net-misc/openssh/openssh-8.3_p1-r2.ebuild b/net-misc/openssh/openssh-8.3_p1-r5.ebuild index 80dc7c3cd59f..86300b9d8105 100644 --- a/net-misc/openssh/openssh-8.3_p1-r2.ebuild +++ b/net-misc/openssh/openssh-8.3_p1-r5.ebuild @@ -36,7 +36,7 @@ LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # Probably want to drop ssl defaulting to on in a future version. -IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss" +IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" RESTRICT="!test? ( test )" @@ -84,8 +84,9 @@ RDEPEND=" kerberos? ( virtual/krb5 ) " DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} ) virtual/os-headers + kernel_linux? ( >=sys-kernel/linux-headers-5.1 ) + static? ( ${LIB_DEPEND} ) " RDEPEND="${RDEPEND} pam? ( >=sys-auth/pambase-20081028 ) @@ -137,6 +138,9 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch + # workaround for https://bugs.gentoo.org/734984 + use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch + [[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches local PATCHSET_VERSION_MACROS=() @@ -419,6 +423,12 @@ src_install() { diropts -m 0700 dodir /etc/skel/.ssh + # https://bugs.gentoo.org/733802 + if ! use scp; then + rm "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ + || die "failed to remove scp" + fi + keepdir /var/empty systemd_dounit "${FILESDIR}"/sshd.{service,socket} diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 3a4d3e0560ac..86205c4b748b 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -11,5 +11,5 @@ AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7 DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c -EBUILD openvswitch-2.13.0.ebuild 4405 BLAKE2B c526b9667212e53c6ca463403eb69f24750f42c29f91ce0dff2759d22c22b5dcb4a9a25410fbad3690c85dbad4e185297a419b3d0c5c56ee76ad063fc77b7552 SHA512 52c8c6963788f27bf444e342ad370568516a0717466d5e787a3064b07a987a1620dfa4e601ecf927d75b11cdcc6d53d0f2ba1229f49a1e1d796c6a29cb0df5a7 +EBUILD openvswitch-2.13.0-r1.ebuild 4405 BLAKE2B c526b9667212e53c6ca463403eb69f24750f42c29f91ce0dff2759d22c22b5dcb4a9a25410fbad3690c85dbad4e185297a419b3d0c5c56ee76ad063fc77b7552 SHA512 52c8c6963788f27bf444e342ad370568516a0717466d5e787a3064b07a987a1620dfa4e601ecf927d75b11cdcc6d53d0f2ba1229f49a1e1d796c6a29cb0df5a7 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36 diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild index 41b9b1b021a5..41b9b1b021a5 100644 --- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest index 108323d2f224..dd03446b49b2 100644 --- a/net-misc/pps-tools/Manifest +++ b/net-misc/pps-tools/Manifest @@ -9,5 +9,5 @@ DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30 DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de EBUILD pps-tools-0.0.20120407.ebuild 683 BLAKE2B 86c7a81d4a0d372967245aa0695f39d9c0e873d1532f305b8debaca5f55377b21f202e32fb8829409452882adde35cb1169184a0508ec504d5e9943e92058be7 SHA512 6ded78dfbb7ea4ff2221b0cf4d8833aa3b71d2bcce158d7467fc130402f0445c974da85f71bd3ba9f8311477a39c7e896fb2a0ed8514d9819070fb691471e473 EBUILD pps-tools-1.0.1.ebuild 592 BLAKE2B 54d5837caacda5372d5d8cc325d07f0902f54a146d866bae1b465402888124598fd344b5f93c312063d68db78deef34e3f310e7e7ef694770a70f374be6c9a23 SHA512 e31a33d7b608d05bfa547237db7dc8dceec909ebbd8d3daa0cb85da5c43306ca530ce67650d3e167828d2ea5228c48073643be8a2239ad83ad160f7d4db98e4a -EBUILD pps-tools-1.0.2.ebuild 550 BLAKE2B d6f457833bdf6edf1eb45a77c0ef0632c21240304a9d9104e960c59d477a3ef3745939930f8bd1ccd3c063f3f6c2dfea7656d6128dd940378a195d4a2eb9e953 SHA512 ec2cb49ede84c55b07f77cd60c31cad2952ca5ada15d90e056fac91e8364d809a8a8d75ea1db7520169696bb9b49a5bb0455cb7ebd1ed054451fa950e3f0f70c +EBUILD pps-tools-1.0.2.ebuild 544 BLAKE2B 98ca845a43a744c287750f2e81d4040eafc52a769c4c4983d69b7db866a034155a72da3719052a5c2b7404b6c5a2b7c429f1b0f21eceb7205bd3d6029b023fb3 SHA512 3a37793a5493210a619e575dda0765eea43c1e932361249cf0d3f9c32364b6f6938a310ffa410a5c26d0d0af0bdd0490445fa8d5c98cb5adfde064e117e1b6da MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06 diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild index 6c8b12af41eb..c9c3561e2f2f 100644 --- a/net-misc/pps-tools/pps-tools-1.0.2.ebuild +++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86" IUSE="" PATCHES=( diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest index 6617103b255b..81d4f7906754 100644 --- a/net-misc/proxychains/Manifest +++ b/net-misc/proxychains/Manifest @@ -3,5 +3,5 @@ AUX proxychains-4.14-makefile.patch 1299 BLAKE2B 9c53f252910da0f0247c95e74856703 DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95 EBUILD proxychains-4.12-r1.ebuild 1053 BLAKE2B 3a7efc6ab9b696cc44abef396a81c23311c674260dee94e6957c844f6dc7692b53466ca6606766ca53658b00eac1b130410e934ebaa6fb9acb4f91435c1d9526 SHA512 5ec56256c1a1ba7ef38cc47143d6a10adddde05974c14cccc0e85ca2844b103115e02a5740395a1e8b0baab2e5f1e88d48a265c34af64845c66db3887d4bb558 -EBUILD proxychains-4.14.ebuild 1029 BLAKE2B b8bbe250a091c7334346edd2e2b44e33218aa4d474565ae632fbd85c49107deda8da65b0fbb41b14412531f557bc807c6550ab747f1d793d750fa6532ae88862 SHA512 c0f99cbeed4536aa58b40ebd31f5e9dfa48c0e097e822642529276d5006c7a8e7e8474a37c8b215b5e9ba4acee1ea93c4820d6627154afff83dbd5338c45ffae +EBUILD proxychains-4.14.ebuild 1026 BLAKE2B 5261e86fcc27ee36446426fbf70da311b20fac51930fe56614caddad3d8976a1070f989d5f9d2fe2b770737c79217c62ef4b192a92cea813552c8f33c00b7091 SHA512 f928f796cfdfcf25b06836b8b4df83bdf706ec52a6d233c4227412dfd441a8cb8ee67ecc040d114625ce0f919610055d29337a7b076146f049096fa914b98ba3 MISC metadata.xml 622 BLAKE2B 0437eff84f33578c5d27f011dddb6bacd7b645f2efcdcb612155eb30e2d49ac58b2fe5b38831eb973254c5e213b3eefed46fd9a9e3d89e8396483b9ee348b04b SHA512 8aae7373f8835661775fee0cb07a5a5fb16228e29d3f87434dc95b05f051f18c19e327595a79d447028c91edf8ae410e5a7c3c5f54a43d6283d5e32a16ee2b04 diff --git a/net-misc/proxychains/proxychains-4.14.ebuild b/net-misc/proxychains/proxychains-4.14.ebuild index 440fc2477149..286e4ae4ae23 100644 --- a/net-misc/proxychains/proxychains-4.14.ebuild +++ b/net-misc/proxychains/proxychains-4.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="http://ftp.barfooze.de/pub/sabotage/tarballs/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ppc ~sparc x86" S=${WORKDIR}/${MY_P} diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest index 41ba145e4a98..1a5f49e1ccec 100644 --- a/net-misc/putty/Manifest +++ b/net-misc/putty/Manifest @@ -1,7 +1,5 @@ -DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5 DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 -EBUILD putty-0.73.ebuild 1582 BLAKE2B 922b7caec11440dc2a07706c8bfd26de95cb91295311736a12df3135aec50873ed1d8d76a0d6dcb447747062b936bff790591a000e24c88dfff1fb895ccc727e SHA512 4275e021f15f898346445fd97563486b6489c478b39a67e106fd2d8d166b6a6036386158c5b42656390dc4743b4b58ec1396c4f76650ae9f83c4182b1d827aa3 -EBUILD putty-0.74.ebuild 1588 BLAKE2B 8945b86e6aeaad3e5c8d0ed2228a4acb873192e0c08727f11037f8ec6f81fdbd0d75c08a19a2bb722f9a90281b926e710a358400f737610b397614c12392daa9 SHA512 b245a8a467f4ede02ed71c185f2c6923bd12cc67db71ea234f982e907441491436c6bdc4d112f7224bb4728359c08071ccd91fc0197e35f91a1d0e24e847385b -EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505 +EBUILD putty-0.74.ebuild 1683 BLAKE2B f2e694377eaa8ae5dad4c136ce82ea3a1f8707bef3b9a7527228a2b49c382e2ade8e2215ea1d93a0bafd74fff4360369578a8eb85af94157cb90bc3352b67bb0 SHA512 2fde3aaa7af3b725e5d61deb410f26e32dc7230b11ec524e8ed768543bb69691d623a7e10ba97f2df59cabf4c26bd823c7800ee9c705a5fd5312454d311c7243 +EBUILD putty-9999.ebuild 1737 BLAKE2B 7e09d4cbf3e219f2452f535ef15a1733c77b72fedf8336968b88cb4adbc6e7ab13fb4dd3bfea9150a23198d1e5d649a1a099d65da0263e8942f39ea02001e1ad SHA512 30577a60f28a9ef6fcb6e763a93d4ce624d4ba23708181eef42d8c20afc303f1c42af598808957caa80759a40d02c294eb19b16eea369ff801ef57b74d00fbe4 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6 diff --git a/net-misc/putty/putty-0.73.ebuild b/net-misc/putty/putty-0.73.ebuild deleted file mode 100644 index 5cf6ea3e9126..000000000000 --- a/net-misc/putty/putty-0.73.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools desktop toolchain-funcs xdg-utils - -DESCRIPTION="A Free Telnet/SSH Client" -HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" -LICENSE="MIT" - -SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="doc +gtk gtk2 ipv6 gssapi" -SRC_URI=" - https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 - https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz -" - -RDEPEND=" - !net-misc/pssh - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/pango - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3[X] ) - ) - gssapi? ( virtual/krb5 ) -" -DEPEND=" - ${RDEPEND} - dev-lang/perl - virtual/pkgconfig -" - -src_prepare() { - default - - sed -i \ - -e 's|-Werror||g' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - cd "${S}"/unix || die - econf \ - $(use_with gssapi) \ - $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) ) -} - -src_compile() { - emake -C "${S}"/doc - emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) -} - -src_install() { - dodoc doc/puttydoc.txt - - if use doc; then - docinto html - dodoc doc/*.html - fi - - cd "${S}"/unix || die - default - - if use gtk ; then - for i in 16 22 24 32 48 64 128 256; do - newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png - done - - # install desktop file provided by Gustav Schaffter in #49577 - make_desktop_entry ${PN} PuTTY ${PN} Network - fi -} - -pkg_postinst() { - use gtk && xdg_icon_cache_update -} - -pkg_postrm() { - use gtk && xdg_icon_cache_update -} diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild index 07d0f147a344..518c228a1d8c 100644 --- a/net-misc/putty/putty-0.74.ebuild +++ b/net-misc/putty/putty-0.74.ebuild @@ -9,13 +9,12 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc +gtk gtk2 ipv6 gssapi" +KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" SRC_URI=" https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2 https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz " - +IUSE="doc +gtk gtk2 ipv6 gssapi" RDEPEND=" !net-misc/pssh gtk? ( @@ -30,9 +29,14 @@ RDEPEND=" " DEPEND=" ${RDEPEND} +" +BDEPEND=" dev-lang/perl virtual/pkgconfig " +REQUIRED_USE=" + gtk2? ( gtk ) +" src_prepare() { default @@ -56,6 +60,11 @@ src_compile() { emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6) } +src_test() { + emake -C unix cgtest + unix/cgtest || die +} + src_install() { dodoc doc/puttydoc.txt diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild index 88def03e4bf1..5fd210bd12d5 100644 --- a/net-misc/putty/putty-9999.ebuild +++ b/net-misc/putty/putty-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,10 +28,15 @@ RDEPEND=" " DEPEND=" ${RDEPEND} +" +BDEPEND=" app-doc/halibut dev-lang/perl virtual/pkgconfig " +REQUIRED_USE=" + gtk2? ( gtk ) +" src_unpack() { git-r3_src_unpack diff --git a/net-misc/pytvshows/Manifest b/net-misc/pytvshows/Manifest deleted file mode 100644 index a4a9f165409f..000000000000 --- a/net-misc/pytvshows/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX pytvshows-0.2-ezrss.it.patch 1339 BLAKE2B 5a267430001de4a5f9f2784dea318d4d131783156d43b8363def26e4971cf47c3eeb15ab23546857d5f0bef78e13c6a46d93852d56b581c6ee83514a85d11a05 SHA512 45ee987549fe8648ec4ff5ac7a54cf5f5cea15ff7c467d1bd04a36f2587a4f76afd3bf61331ffb01b150d4d425f71bbb397a03ff8b00a04825901458169a87bc -AUX pytvshows-0.2-feedurl.patch 13082 BLAKE2B dccfd2c5d6637411faf91020a93dc9d84f52915d27fe4149d90b0bb54c34ca14dd3758582d4ccb67effbc9b757e3907558b099137f67857d321e216916828403 SHA512 0ba4e1ec330be7bfaccbc6087ba093c5c54ef63ab9d62592bfd41acdfd48e30ac0a23cbd04b43972a6d7da6bb07f0813e05f16f625c0e375f17b94ff23f4e978 -AUX pytvshows-0.2-improved-re.patch 680 BLAKE2B c2d7f08c256d78ae0d793df5e889bc5b99b7018053dfb701b52e0b2fdd364c6e23748db9defeb63be39ddb5cb0414e02175f9c1f0eff42e30866aad93f3fcaff SHA512 15cf4beb2b7da4efed4cf4ae744c0dcefffb4ef61b6a920c41e7926a2666bc07b9cb4ec9b058cfe84566415e7659e00adad423ae90aab0e91ba43646ecc0f6a9 -AUX pytvshows-0.2-rename-var.patch 484 BLAKE2B 9d03cff276bc1960a4813f0605be411c1044ed4647a372683bf46fca45f1df24866784be25ef1f2426fd0355c44aecf89062d2ff5e47ceeb16a4febb509106b0 SHA512 15de0a4fdef7f70df5b5e7612bc3c40741bd2efe4ef0e714b067635b400a4b5676e1f1bbbaa53818380c915714cdfc141cea3aafed75871edfb4f0bec89a9c0f -DIST pytvshows-0.2.tar.gz 14156 BLAKE2B 61449e01096ef81b131c03b0cadd89433a7dcafd3a8828f251ca9ecceb49dd4d92e382ce50b06f4b5498523fd8b4625fb5442e7f5ef71949a4605ab10910be45 SHA512 c4acd9b968dba7af1c787f9a3f5db4986ffbc52bfc43a4b7101070f8e91e80e78be0e59c4a4fbd873e64a6c4862e64abed2396c7140e9165d72e7d3cea267d5f -EBUILD pytvshows-0.2-r4.ebuild 735 BLAKE2B e3e58b21109797c6421bb8196fcf8b9a6d6a5e187da210286746ff5f1f90867e386af053448b7ca61dce6dede2f4991855438e01290a72a847ba0aec0d3045ca SHA512 274226cb80932ac76e7ca518dea07ceeb67ecc6df57f603ca80911f16f75d51cfbe2c991cd2123299e3efed01f35797415b215be0d9bcca940b6c2c4381a340e -MISC metadata.xml 246 BLAKE2B 9716f6dddff0f0604acad323b9c91c077bcf46a52f165f566193eb6cd5cb338180ff87f67f0d4df33eda5dc0136e5dd263f4f327d274803be59ff9d9acb17ccd SHA512 6f6e043d6a63993611316553ea1c70736c02151d19f1ee63ad855226dd79862c7ae7bdeccc572f23ed4dc9dfe3b0e77dd80d48bcbc33c02091c40111ac5e1aa1 diff --git a/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch b/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch deleted file mode 100644 index ba0a1b91e8e1..000000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch simply alters the feed site since txrss.net was closed/shut down. -Luckily, ezrss.it expects the same arguments and should generally work. You can -find similar details at: -https://sourceforge.net/projects/pytvshows/forums/forum/726961/topic/3309243?message=7544190 - -Yes, this could have been accomplished via the --feed paramater, but this is -more user friendly. - ---- a/pytvshows.orig 2009-09-15 22:36:34.575002779 -0500 -+++ b/pytvshows 2009-09-15 22:43:18.283754081 -0500 -@@ -59,7 +59,7 @@ - -cFILE, --config FILE - Path to config file. Default: ~/.pytvshows.cfg - -fFEED, --feed=FEED -- Override the tvrss.net feed. %%s is replaced with the -+ Override the ezrss.it feed. %%s is replaced with the - exact show name. - -h, --help This help message - -oDIR, --output_dir=DIR -@@ -77,8 +77,8 @@ - commands = ['update', 'subscribe', 'unsubscribe', 'run'] - config = { - 'config_file': os.path.expanduser("~/.pytvshows.cfg"), -- 'feed': "http://tvrss.net/search/index.php?show_name=%s&show_name_exact" \ -- "=true&mode=rss", -+ 'feed': "http://www.ezrss.it/search/index.php?show_name=%s" \ -+ "&show_name_exact=true&mode=rss", - 'output_dir': os.path.expanduser("~/"), - 'output_dir2': None, - 'quality_matches': { diff --git a/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch b/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch deleted file mode 100644 index fb78581b04f9..000000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch +++ /dev/null @@ -1,279 +0,0 @@ -David Reitz writes: - -I created this so that I could specify a feedurl parameter in the config file, -which allows me to use the public RSS feeds at showRSS (http://showrss.karmorra.info/). -This patch will ONLY work for seasonepisode. I made no modifications for other types. - -Simply apply this patch and then modify your config like so: - -[Weeds] -feedurl = http://showrss.karmorra.info/feeds/68.rss -episode = 4 -season = 5 -show_type = seasonepisode -human_name = Weeds - -https://sourceforge.net/tracker/index.php?func=detail&aid=2818315&group_id=203642&atid=986413 - ---- a/pytvshows.orig 2009-06-20 15:46:23.000000000 -0400 -+++ b/pytvshows 2009-07-07 20:41:39.000000000 -0400 -@@ -83,11 +83,14 @@ config = { - 'output_dir2': None, - 'quality_matches': { - "[HD": 1, -+ "HDTV": 1, - "[DSRIP": 1, - "[TVRIP": 1, - "[PDTV": 1, - "[DVD": 1, - "[HR": 2, -+ "720p": 3, -+ "720P": 3, - "[720p": 3, - "[720P": 3, - }, -@@ -189,6 +192,7 @@ class Show(object): - self.show_type = args['show_type'] - self.season = args['season'] - self.episode = args['episode'] -+ self.feedurl = args['feedurl'] - #YYYY-MM-DD HH:MM:SS - if args['date']: - self.date = datetime.datetime(*(time.strptime( -@@ -290,7 +294,10 @@ class Show(object): - - def _get_rss_feed(self): - """Gets the feedparser object.""" -- url = config['feed'] % self.exact_name -+ if self.feedurl: -+ url = self.feedurl -+ else: -+ url = config['feed'] % self.exact_name - if config['verbose']: - print "Downloading and processing %s..." % url - r = feedparser.parse(url) -@@ -335,50 +342,21 @@ class Show(object): - if not self.rss: - return False - episodes = {} -- for episode in self.rss['entries']: -- if self.show_type == 'seasonepisode': -- r = re.compile('Season\s*: ([0-9]*?);') -- season_match = r.search(episode.description) -- r = re.compile('Episode\s*:\ ([0-9]*?)$') -- episode_match = r.search(episode.description) -- if not season_match or not episode_match: -- # This might be a special with a title -- r = re.compile('Show\s*Title\s*:\s*(.*?);') -- title_match = r.search(episode.description) -- if title_match and title_match.group(1) != 'n/a' \ -- and title_match.group(1) != '': -- title = title_match.group(1) -- if config["verbose"]: -- print "Found episode with title %s and no " \ -- "season or episode in seasonepisode show." % title -- quality = 0 -- for key, value in config["quality_matches"].items(): -- if key in episode.title: -- quality = value -- break -- date = datetime.datetime(* episode.updated_parsed[:6]) -- obj = EpisodeWithTitle( -- self, -- episode.link, -- date, -- title, -- quality) -- last_key = 0 -- for key in episodes.keys(): -- if key[0] == 0 and key[1] > last_key: -- last_key = key[1] -- episodes[0, last_key] = [obj] -- elif not self.ignoremissingdetails: -- print >> warn, 'W: Could not match season and/or ' \ -- 'episode in %s' % episode.description -- else: -+ # we've defined a feedurl in the config file... -+ if self.feedurl: -+ for episode in self.rss['entries']: -+ if self.show_type == 'seasonepisode': -+ r = re.compile('S([0-9]+)E([0-9]+)') -+ match = r.search( episode.title ) -+ season_num = int(match.group(1)) -+ episode_num = int(match.group(2)) -+ if config["verbose"]: -+ print "Found Show: Season %i, Episode %i" % (season_num, episode_num) - quality = 0 - for key, value in config["quality_matches"].items(): - if key in episode.title: - quality = value - break -- season_num = int(season_match.group(1)) -- episode_num = int(episode_match.group(1)) - if season_num != 0 and episode_num != 0: - obj = EpisodeWithSeasonAndEpisode( - self, -@@ -394,57 +372,117 @@ class Show(object): - elif config['verbose']: - print 'Season or episode number is 0 in %s' \ - % episode.description -- elif self.show_type == 'date': -- r = re.compile('Episode\s*Date:\s*([0-9\-]+)$') -- date_match = r.search(episode.description) -- if not date_match: -- if not self.ignoremissingdetails: -- print >>warn, 'W: Could not match date in %s' % \ -- episode.description -- else: -+ else: -+ for episode in self.rss['entries']: -+ if self.show_type == 'seasonepisode': -+ r = re.compile('Season\s*: ([0-9]*?);') -+ season_match = r.search(episode.description) -+ r = re.compile('Episode\s*:\ ([0-9]*?)$') -+ episode_match = r.search(episode.description) -+ if not season_match or not episode_match: -+ # This might be a special with a title -+ r = re.compile('Show\s*Title\s*:\s*(.*?);') -+ title_match = r.search(episode.description) -+ if title_match and title_match.group(1) != 'n/a' \ -+ and title_match.group(1) != '': -+ title = title_match.group(1) -+ if config["verbose"]: -+ print "Found episode with title %s and no " \ -+ "season or episode in seasonepisode show." % title -+ quality = 0 -+ for key, value in config["quality_matches"].items(): -+ if key in episode.title: -+ quality = value -+ break -+ date = datetime.datetime(* episode.updated_parsed[:6]) -+ obj = EpisodeWithTitle( -+ self, -+ episode.link, -+ date, -+ title, -+ quality) -+ last_key = 0 -+ for key in episodes.keys(): -+ if key[0] == 0 and key[1] > last_key: -+ last_key = key[1] -+ episodes[0, last_key] = [obj] -+ elif not self.ignoremissingdetails: -+ print >> warn, 'W: Could not match season and/or ' \ -+ 'episode in %s' % episode.description -+ else: -+ quality = 0 -+ for key, value in config["quality_matches"].items(): -+ if key in episode.title: -+ quality = value -+ break -+ season_num = int(season_match.group(1)) -+ episode_num = int(episode_match.group(1)) -+ if season_num != 0 and episode_num != 0: -+ obj = EpisodeWithSeasonAndEpisode( -+ self, -+ episode.link, -+ datetime.datetime(* episode.updated_parsed[:6]), -+ season_num, -+ episode_num, -+ quality) -+ try: -+ episodes[season_num, episode_num].append(obj) -+ except KeyError: -+ episodes[season_num, episode_num] = [obj] -+ elif config['verbose']: -+ print 'Season or episode number is 0 in %s' \ -+ % episode.description -+ elif self.show_type == 'date': -+ r = re.compile('Episode\s*Date:\s*([0-9\-]+)$') -+ date_match = r.search(episode.description) -+ if not date_match: -+ if not self.ignoremissingdetails: -+ print >>warn, 'W: Could not match date in %s' % \ -+ episode.description -+ else: -+ quality = 0 -+ for key, value in config["quality_matches"].items(): -+ if key in episode.title: -+ quality = value -+ break -+ date = datetime.datetime(*(time.strptime( -+ date_match.group(1), "%Y-%m-%d")[0:6])).date() -+ obj = EpisodeWithDate( -+ self, -+ episode.link, -+ datetime.datetime(* episode.updated_parsed[:6]), -+ date, -+ quality) -+ try: -+ episodes[date].append(obj) -+ except KeyError: -+ episodes[date] = [obj] -+ elif self.show_type == 'time': -+ r = re.compile('Show\s*Title\s*:\s*(.*?);') -+ title_match = r.search(episode.description) -+ if not title_match: -+ if not self.ignoremissingdetails: -+ print >>warn, 'W: Could not match title in %s' % \ -+ episode.description -+ title = "" -+ else: -+ title = title_match.group(1) - quality = 0 - for key, value in config["quality_matches"].items(): - if key in episode.title: - quality = value - break -- date = datetime.datetime(*(time.strptime( -- date_match.group(1), "%Y-%m-%d")[0:6])).date() -- obj = EpisodeWithDate( -+ date = datetime.datetime(* episode.updated_parsed[:6]) -+ obj = EpisodeWithTitle( - self, - episode.link, -- datetime.datetime(* episode.updated_parsed[:6]), - date, -+ title, - quality) - try: - episodes[date].append(obj) - except KeyError: - episodes[date] = [obj] -- elif self.show_type == 'time': -- r = re.compile('Show\s*Title\s*:\s*(.*?);') -- title_match = r.search(episode.description) -- if not title_match: -- if not self.ignoremissingdetails: -- print >>warn, 'W: Could not match title in %s' % \ -- episode.description -- title = "" -- else: -- title = title_match.group(1) -- quality = 0 -- for key, value in config["quality_matches"].items(): -- if key in episode.title: -- quality = value -- break -- date = datetime.datetime(* episode.updated_parsed[:6]) -- obj = EpisodeWithTitle( -- self, -- episode.link, -- date, -- title, -- quality) -- try: -- episodes[date].append(obj) -- except KeyError: -- episodes[date] = [obj] - self.episodes = episodes - return episodes - -@@ -597,6 +635,7 @@ def main(argv=None): - 'date': None, - 'time': None, - 'ignoremissingdetails': False, -+ 'feedurl': None, - } - for key in args.keys(): - if f.has_option(exact_name, key): diff --git a/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch b/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch deleted file mode 100644 index a0f114588b3e..000000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch +++ /dev/null @@ -1,15 +0,0 @@ -Improved regular expression for matching season and episode; see -https://sourceforge.net/tracker/index.php?func=detail&aid=2818315&group_id=203642&atid=986413 - ---- a/pytvshows.orig 2011-08-17 23:20:16.000000000 +0200 -+++ b/pytvshows 2011-08-17 23:22:30.000000000 +0200 -@@ -346,7 +346,8 @@ - if self.feedurl: - for episode in self.rss['entries']: - if self.show_type == 'seasonepisode': -- r = re.compile('S([0-9]+)E([0-9]+)') -+ #r = re.compile('S([0-9]+)E([0-9]+)') -+ r = re.compile(r'\bS?([0-9]{1,2})\s*(?:E|x)?\s*([0-9]{1,2})\b') - match = r.search( episode.title ) - season_num = int(match.group(1)) - episode_num = int(match.group(2)) diff --git a/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch b/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch deleted file mode 100644 index 0713a029c37f..000000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pytvshows.bug 2014-06-19 18:49:42.414928250 +0100 -+++ b/pytvshows 2014-06-19 18:49:50.534957323 +0100 -@@ -255,7 +255,7 @@ - self.show_type = 'seasonepisode' - elif date_match: - self.show_type = 'date' -- elif titlematch and titlematch.group(1) != 'n/a': -+ elif title_match and title_match.group(1) != 'n/a': - self.show_type = 'time' - else: - print >> warn, "Could not determine show type for %s." % self diff --git a/net-misc/pytvshows/metadata.xml b/net-misc/pytvshows/metadata.xml deleted file mode 100644 index b3afcab16c89..000000000000 --- a/net-misc/pytvshows/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">pytvshows</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/pytvshows/pytvshows-0.2-r4.ebuild b/net-misc/pytvshows/pytvshows-0.2-r4.ebuild deleted file mode 100644 index dd398bde85ea..000000000000 --- a/net-misc/pytvshows/pytvshows-0.2-r4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 - -DESCRIPTION="downloads torrents for TV shows from RSS feeds provided by ezrss.it" -HOMEPAGE="https://sourceforge.net/projects/pytvshows/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -DEPEND="" -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/feedparser[${PYTHON_MULTI_USEDEP}] - ')" - -PATCHES=( - "${FILESDIR}/${P}-ezrss.it.patch" - "${FILESDIR}/${P}-feedurl.patch" - "${FILESDIR}/${P}-improved-re.patch" - "${FILESDIR}/${P}-rename-var.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index bdebd2500a17..e7ea3e46b179 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -2,7 +2,7 @@ AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe1561866 DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a DIST r8168-8.048.02.tar.bz2 109232 BLAKE2B 24c04cd0e47fce427ef7de1a2e41e384fd7c0d8dd028715411cc6f47901b703c824dd9c15bc0ed90f649520bd5fd25dbd48cdc37f94ca8f838a07faa99c8aa84 SHA512 d9d828e4717d2857bd38e8c9b9005de19387419db9bc8d174f5c8a8ea120c81c3094770b164a1f92cec7833696d7a1302332ef473c5852146fff5dbf9a69196e DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f -EBUILD r8168-8.048.00.ebuild 923 BLAKE2B b91f9d551f38d5fb82e480e0ebd299de9dcbb9671897c1c17d3a682ea6c70b79c7e26b41b7daa092c76a2d53c2d819e029afb0ab7de32e0128110a24525c4c25 SHA512 d0972fb69d9c97d5e5cb845d7dd124d8c48ba789e157575298a750656976c06655b3ace2d858d45f457adbca6d20e085f89092d4491aa49996f7d18a7cf30a76 -EBUILD r8168-8.048.02.ebuild 966 BLAKE2B 5de1e783e73c113f06735475035d7cb61918ef6a0522a970d9c3f01d48ce9e6519d136cf9f1ce7a13543a3f73eb82905008f5497323c82bd6b80317754a9688c SHA512 d092a193b6ee1faed1ed99d21e8a268717078c47700a8033e29241259b303a6f3441aecf03b56727569779c4a3f71528545aa01dc99746164090cb757bc7362d -EBUILD r8168-8.048.03.ebuild 924 BLAKE2B 2f18641ad6a6ed40af5ba470ae9fc57ad3b355d6d8b161a3f596977bef5810727a6c61d396e718537e8c6ce7cddb260740c3dbb5393ce6a242db3f4e6b34b873 SHA512 6a76911bdd8b6c95135da603b8af42914819a3a6e3c9034ed6e2d052d2bb202e4ed832bd2822a153a45ae1258ff5927ec80aa937742ddbe372fe8029416f22a4 +EBUILD r8168-8.048.00-r1.ebuild 923 BLAKE2B b91f9d551f38d5fb82e480e0ebd299de9dcbb9671897c1c17d3a682ea6c70b79c7e26b41b7daa092c76a2d53c2d819e029afb0ab7de32e0128110a24525c4c25 SHA512 d0972fb69d9c97d5e5cb845d7dd124d8c48ba789e157575298a750656976c06655b3ace2d858d45f457adbca6d20e085f89092d4491aa49996f7d18a7cf30a76 +EBUILD r8168-8.048.02-r1.ebuild 966 BLAKE2B 5de1e783e73c113f06735475035d7cb61918ef6a0522a970d9c3f01d48ce9e6519d136cf9f1ce7a13543a3f73eb82905008f5497323c82bd6b80317754a9688c SHA512 d092a193b6ee1faed1ed99d21e8a268717078c47700a8033e29241259b303a6f3441aecf03b56727569779c4a3f71528545aa01dc99746164090cb757bc7362d +EBUILD r8168-8.048.03-r1.ebuild 922 BLAKE2B bdee0c271494634f06402eb065f65e4e2f3497bb89666666d5eded6536b8c5c82421c55e70bcd3a4b3e1bdcf402733c3cd4e07846522f1023ad59c84bd94754c SHA512 18164bb5f346774ae3407b1eeff38958a3641bce84d8f12f9639ff308425aaf0dc65d8b515e916631c8f04a3ceb28135d6669626b91ebda01fa6987d942a9750 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f diff --git a/net-misc/r8168/r8168-8.048.00.ebuild b/net-misc/r8168/r8168-8.048.00-r1.ebuild index 3d0aad6e797e..3d0aad6e797e 100644 --- a/net-misc/r8168/r8168-8.048.00.ebuild +++ b/net-misc/r8168/r8168-8.048.00-r1.ebuild diff --git a/net-misc/r8168/r8168-8.048.02.ebuild b/net-misc/r8168/r8168-8.048.02-r1.ebuild index 2496884f96e0..2496884f96e0 100644 --- a/net-misc/r8168/r8168-8.048.02.ebuild +++ b/net-misc/r8168/r8168-8.048.02-r1.ebuild diff --git a/net-misc/r8168/r8168-8.048.03.ebuild b/net-misc/r8168/r8168-8.048.03-r1.ebuild index 54bd8991ee45..49c108910168 100644 --- a/net-misc/r8168/r8168-8.048.03.ebuild +++ b/net-misc/r8168/r8168-8.048.03-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" MODULE_NAMES="r8168(net:${S}/src)" BUILD_TARGETS="modules" diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest index 8fb358574e5e..5b5940aafa92 100644 --- a/net-misc/rabbitmq-server/Manifest +++ b/net-misc/rabbitmq-server/Manifest @@ -1,19 +1,6 @@ AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab -AUX rabbitmq-server.init-r3 638 BLAKE2B 56c9116898f480b08fcd8fbfa37af5d1e9d4f9d482aa91e63f2bb5eaeb2e0700566dfddd27e0463fb2162292a09ceb1c96fa16b9fda5389e39491214d2952d25 SHA512 fa6c7293c11190b1f59eef23c4a3de00666e32451f695f1a7f686f01bb92055a0c2afae565d9106e852e6b77a71661c364eacb36e2d39dfb8d175d8f0eab98b9 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457 -DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f -DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662 -DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9 -DIST rabbitmq-server-3.7.24.tar.xz 2867964 BLAKE2B 30d49a72f92a9adc4fe7de071e9369cb4d574249b1d414b2e5d492585ae0bc0e5f85ca0c287d73dbf661df4cb249f29d1bfccc7516e6ec5d6ff70a437a01ce00 SHA512 5bf2b69b555ddc89415ce7918d0ab23221d383742fc20036f608b4cf99852fb58b61a5d7616b6357f151e1f16ed660b35d7b54a1c2ea46cf5b4ef67c2d38bd28 -DIST rabbitmq-server-3.8.2.tar.xz 15178744 BLAKE2B 11da75e48415d53f291fffc8fafd89b506e727714e6f9dfce6a0b7c605a0d56bb3b879c779bebbc21f2bc5ada21378f9ed30e6f729c2c71b61ebe00db16eb225 SHA512 ac8cfc002ccbff8cf95c3e5508956cf5622c1c145b730589308ec4ca9173e5efca338829e13aa7dc37db035868dc964ab0e3e0edba15de49c64e18c50247b918 -DIST rabbitmq-server-3.8.3.tar.xz 3304456 BLAKE2B 2ad04a1a8688cbbba71a82d44003f7ad632b26616dae977e8d326316baaaf7b475c4db37777b13aa8cb153373be0f9f85972aac7ad53c299e39615dd032e8ced SHA512 1547e7935ff34be278970c03b176d76e52a6968cc2955dc75fa00d184ed1ba567e095c5a56e0f2f7c868d41281897c53ec6f4baff019e144aa57afe99cd6adaa DIST rabbitmq-server-3.8.4.tar.xz 3086216 BLAKE2B c1c22ebca1b66aa210b45b3fccfffd89f3bb9312d37c78362db6d728456c8b7f3a0d787bcd411909509130307faf8457e4a7becb40cbf76ebb1cd1f1b615cce6 SHA512 2dee202b0a39f3d3d4314c4a5ee812d1c2b85225c6cdfc9ddb887285176df8d7009ca4ac8c3ab61cc3a943d32fa7665124dbf51ed18a322a280a3590601f118d -EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a -EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50 -EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf -EBUILD rabbitmq-server-3.7.24.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2 -EBUILD rabbitmq-server-3.8.2.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2 -EBUILD rabbitmq-server-3.8.3.ebuild 2160 BLAKE2B 1ea1fb4a67301f670fc1c256dc2c32ea3f833e0b02adace4a1e34e03a4d5509d9e3e931385697b9dc749e0f24a70974ef0161798743fcef9106f0395c1953717 SHA512 ab51c206eb5d2d9c395aabc016b691784364b2220fea1feacdbf559ba809402491ba5282c513d312f82b897d36ccad9b8e15837bb6ed69d5f2484315b8959786 -EBUILD rabbitmq-server-3.8.4.ebuild 2376 BLAKE2B af252dc508def8a6902923deccf85a3308de5c10b973d572b5f6d34916c84e5e8f7543acd42237fc586b35ee0ceda3b678880e49fdeae27f2005ec1a43ef3344 SHA512 028fe0378e8ae3aa6ad729d6886359ea69269d5c1d78098f30047c964df88c55badde3e410469acda81c0b2d41d76abaffed41a2079fe6d9a362525f0b98a596 +EBUILD rabbitmq-server-3.8.4.ebuild 2374 BLAKE2B 3befa2b1082a817401324e00a571f3e59bb66cd97e1249adb791edfe3b78e005d3169af7068e3cad23595196873b6bbc127c8b668091bb859c06aaffd0cfe8c5 SHA512 4386018e0dd428346285d082681b43b0e3fd2c25be676301ef176e18e7c475e2e9cfb85eede2a7d4e18b2964f1b7e9db696986eb52a71f8e5b63c141a98ec92a MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701 diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 deleted file mode 100644 index fb7c194aa94f..000000000000 --- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use dns epmd -} - -start() { - ebegin "Starting RabbitMQ" - /usr/sbin/rabbitmq-server -detached >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err - /usr/sbin/rabbitmqctl status | sed -n 's/[^p]*pid,\([0-9]*\)[^0-9]*/\1/p' > /var/run/rabbitmq.pid - /usr/sbin/rabbitmqctl -q wait /var/run/rabbitmq.pid - eend $? -} - -stop() { - ebegin "Stopping RabbitMQ" - /usr/sbin/rabbitmqctl stop /var/run/rabbitmq.pid >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err - eend $? -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild deleted file mode 100644 index d6fd89e8e0e4..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 systemd user - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz" - -LICENSE="GPL-2 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/erlang-18[ssl]" -DEPEND="${RDEPEND} - app-arch/zip - app-arch/unzip - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - dev-libs/libxslt - $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq - python-any-r1_pkg_setup -} - -src_compile() { - emake all docs dist -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i deps/rabbit/scripts/rabbitmq-env || die - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r deps/rabbit/ebin deps/rabbit/include plugins - - einfo "Installing server scripts to /usr/sbin" - for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do - exeinto /usr/libexec/rabbitmq - doexe deps/rabbit/scripts/${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script} - done - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq - systemd_dounit "${FILESDIR}/rabbitmq.service" - - # install documentation - dodoc deps/rabbit/docs/*.xml - dodoc deps/rabbit/README.md - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq /etc/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - dodir /var/lib/rabbitmq{,/mnesia} -} - -pkg_preinst() { - if has_version "<=net-misc/rabbitmq-server-1.8.0"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "RabbitMQ is now running as an unprivileged user instead of root." - elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." - elog "Please run the following commands as root:" - elog - elog " usermod -d /var/lib/rabbitmq rabbitmq" - elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" - elog - elif has_version "<net-misc/rabbitmq-server-2.1.1"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "Please read release notes before upgrading:" - elog - elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt" - fi - if has_version "<net-misc/rabbitmq-server-3.3.0"; then - elog - elog "This release changes the behaviour of the default guest user:" - elog - elog "https://www.rabbitmq.com/access-control.html" - fi -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild deleted file mode 100644 index 60b7628d197a..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 systemd user - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz" - -LICENSE="GPL-2 MPL-1.1" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" - -RDEPEND=">=dev-lang/erlang-18[ssl]" -DEPEND="${RDEPEND} - app-arch/zip - app-arch/unzip - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - dev-libs/libxslt - $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq - python-any-r1_pkg_setup -} - -src_compile() { - emake all docs dist -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i deps/rabbit/scripts/rabbitmq-env || die - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r deps/rabbit/ebin deps/rabbit/include plugins - - einfo "Installing server scripts to /usr/sbin" - for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do - exeinto /usr/libexec/rabbitmq - doexe deps/rabbit/scripts/${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script} - done - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq - systemd_dounit "${FILESDIR}/rabbitmq.service" - - # install documentation - dodoc deps/rabbit/docs/*.xml - dodoc deps/rabbit/README - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq /etc/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - dodir /var/lib/rabbitmq{,/mnesia} -} - -pkg_preinst() { - if has_version "<=net-misc/rabbitmq-server-1.8.0"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "RabbitMQ is now running as an unprivileged user instead of root." - elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." - elog "Please run the following commands as root:" - elog - elog " usermod -d /var/lib/rabbitmq rabbitmq" - elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" - elog - elif has_version "<net-misc/rabbitmq-server-2.1.1"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "Please read release notes before upgrading:" - elog - elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt" - fi - if has_version "<net-misc/rabbitmq-server-3.3.0"; then - elog - elog "This release changes the behaviour of the default guest user:" - elog - elog "https://www.rabbitmq.com/access-control.html" - fi -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild deleted file mode 100644 index dfbcc2c75b34..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 systemd user - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz" - -LICENSE="GPL-2 MPL-1.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RESTRICT="test" - -# dev-lang/erlang-20.3 cloud be used but 21 is easier to specify as it always includes the smp stuff now -RDEPEND=">=dev-lang/erlang-21.0[ssl] - <dev-lang/erlang-22.0[ssl]" -DEPEND="${RDEPEND} - app-arch/zip - app-arch/unzip - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - >=dev-lang/elixir-1.6.6 - dev-libs/libxslt - $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq - python-any-r1_pkg_setup -} - -src_compile() { - emake all docs dist -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i deps/rabbit/scripts/rabbitmq-env || die - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins - - einfo "Installing server scripts to /usr/sbin" - rm -v deps/rabbit/scripts/*.bat - exeinto /usr/libexec/rabbitmq - for script in deps/rabbit/scripts/*; do - doexe ${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script) - done - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq - systemd_dounit "${FILESDIR}/rabbitmq.service" - - # install documentation - dodoc deps/rabbit/docs/*.example - dodoc deps/rabbit/README.md - doman deps/rabbit/docs/*.5 - doman deps/rabbit/docs/*.8 - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq /etc/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/lib/rabbitmq{,/mnesia} -} - -pkg_preinst() { - if has_version "<=net-misc/rabbitmq-server-1.8.0"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "RabbitMQ is now running as an unprivileged user instead of root." - elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." - elog "Please run the following commands as root:" - elog - elog " usermod -d /var/lib/rabbitmq rabbitmq" - elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" - elog - elif has_version "<net-misc/rabbitmq-server-2.1.1"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "Please read release notes before upgrading:" - elog - elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt" - fi - if has_version "<net-misc/rabbitmq-server-3.3.0"; then - elog - elog "This release changes the behaviour of the default guest user:" - elog - elog "https://www.rabbitmq.com/access-control.html" - fi -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.24.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.24.ebuild deleted file mode 100644 index b3cb02eb6945..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.24.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit python-any-r1 systemd user - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz" - -LICENSE="GPL-2 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -RDEPEND=">=dev-lang/erlang-21.3[ssl] - <dev-lang/erlang-23.0[ssl]" -DEPEND="${RDEPEND} - app-arch/zip - app-arch/unzip - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - >=dev-lang/elixir-1.6.6 - <dev-lang/elixir-1.10.0 - dev-libs/libxslt - $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq - python-any-r1_pkg_setup -} - -src_compile() { - emake all docs dist -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i deps/rabbit/scripts/rabbitmq-env || die - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins - - einfo "Installing server scripts to /usr/sbin" - rm -v deps/rabbit/scripts/*.bat - exeinto /usr/libexec/rabbitmq - for script in deps/rabbit/scripts/*; do - doexe ${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script) - done - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq - systemd_dounit "${FILESDIR}/rabbitmq.service" - - # install documentation - dodoc deps/rabbit/docs/*.example - dodoc deps/rabbit/README.md - doman deps/rabbit/docs/*.5 - doman deps/rabbit/docs/*.8 - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq /etc/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/lib/rabbitmq{,/mnesia} -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.2.ebuild deleted file mode 100644 index b3cb02eb6945..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit python-any-r1 systemd user - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz" - -LICENSE="GPL-2 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -RDEPEND=">=dev-lang/erlang-21.3[ssl] - <dev-lang/erlang-23.0[ssl]" -DEPEND="${RDEPEND} - app-arch/zip - app-arch/unzip - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - >=dev-lang/elixir-1.6.6 - <dev-lang/elixir-1.10.0 - dev-libs/libxslt - $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq - python-any-r1_pkg_setup -} - -src_compile() { - emake all docs dist -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i deps/rabbit/scripts/rabbitmq-env || die - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins - - einfo "Installing server scripts to /usr/sbin" - rm -v deps/rabbit/scripts/*.bat - exeinto /usr/libexec/rabbitmq - for script in deps/rabbit/scripts/*; do - doexe ${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script) - done - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq - systemd_dounit "${FILESDIR}/rabbitmq.service" - - # install documentation - dodoc deps/rabbit/docs/*.example - dodoc deps/rabbit/README.md - doman deps/rabbit/docs/*.5 - doman deps/rabbit/docs/*.8 - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq /etc/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/lib/rabbitmq{,/mnesia} -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild deleted file mode 100644 index 2f702fd994a5..000000000000 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit python-any-r1 systemd user - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang" -HOMEPAGE="https://www.rabbitmq.com/" -SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz" - -LICENSE="GPL-2 MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -RDEPEND=">=dev-lang/erlang-21.3[ssl] - <dev-lang/erlang-23.0[ssl]" -DEPEND="${RDEPEND} - app-arch/zip - app-arch/unzip - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - >=dev-lang/elixir-1.7.0 - <dev-lang/elixir-1.11.0 - dev-libs/libxslt - $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]') -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq - python-any-r1_pkg_setup -} - -src_compile() { - emake all docs dist -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i deps/rabbit/scripts/rabbitmq-env || die - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins - - einfo "Installing server scripts to /usr/sbin" - rm -v deps/rabbit/scripts/*.bat - exeinto /usr/libexec/rabbitmq - for script in deps/rabbit/scripts/*; do - doexe ${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script) - done - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq - systemd_dounit "${FILESDIR}/rabbitmq.service" - - # install documentation - dodoc deps/rabbit/docs/*.example - dodoc deps/rabbit/README.md - doman deps/rabbit/docs/*.5 - doman deps/rabbit/docs/*.8 - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq /etc/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/lib/rabbitmq{,/mnesia} -} diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild index 34216e4b9ac2..99334121ba05 100644 --- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild +++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra LICENSE="GPL-2 MPL-1.1" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" RESTRICT="test" diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest index 23f500dbf081..6de3e84113df 100644 --- a/net-misc/rdate/Manifest +++ b/net-misc/rdate/Manifest @@ -2,6 +2,6 @@ AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add0597 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157 DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996 -EBUILD rdate-1.10.ebuild 751 BLAKE2B 24e52d7a4799cf5740415a87a3244fb188d282e868d3c58dfb05ec64ed607acd2c9a102f6f39a033b356165e419c55ae023981a54f91f8bbbe19f97fb01aafa7 SHA512 ffb7cdf7b406f49b55f97a3bed78da59b2d323797bf63d0717c6241c09ecd72172c7a55d8ebd32cb6a616fb115cd8994c89a5a17efb98d67e42cabae1d9d5cca +EBUILD rdate-1.10.ebuild 744 BLAKE2B 7f9f9bdf3c3e1d42397208c5299be4a20f43d2c6100bb8b43e0a259c3d16194a19aa6c16a0d6e00591d465d66dd042f6bde2f4e8f1adc36d5e3b77fd78617535 SHA512 51be95637b563fbe7e413495e792f9f7fe2a26a7c6cce40355341c0d3df68f59759559d7aadb637c117c6b926b499fb75e315cc19224a2a4480a7524762c423f EBUILD rdate-1.4-r4.ebuild 829 BLAKE2B db9a2d14fd6445329e4cf57ad8ae817488f41e790207eb7d5af6d3401db4dfe17cca33e00f600fa5dddcfe04f365856e55e472628e23cfa7aa1b832e16ec5784 SHA512 b3c05b7f419c13d5aba9bb7a567f8c9fa3e075b43dcaf707900d1a5dccfb2cd883cb1fb5d43bce1add6fad45a3a817a971aa649ce6f4a40ac55cbacdf925fc6c MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild index 56ca14a4561b..95c32b708797 100644 --- a/net-misc/rdate/rdate-1.10.ebuild +++ b/net-misc/rdate/rdate-1.10.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${ LICENSE="BSD-4" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86" IUSE="" DEPEND="dev-libs/libbsd" diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index ca36d27bc4c8..56991656ad71 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,8 +1,8 @@ AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d030c4b26c05b0758d9669d6f29311ee4c3273374addd92c2e191cb86c91dbce7ebb7681ebec46462986696c746e0dcd03ec SHA512 7a4c09378238a675e76eadeaa29215d32ea5f6afa618bdb60569b30ed9fba0dcbf7ae7cf3a1de47a05d25c5b61a3bd14313930dc02967477c20e212483af1e59 -DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41 DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d DIST Remmina-v1.4.7.tar.gz 1908687 BLAKE2B a6656821d727914f70bafe50d5c3764e3c36a4753c618048b91eadc1fa27b8f03bcd313b99cfd46cadc446b85b583994528895f9fb755d6c8ee28e0b0bab66d1 SHA512 ebe1e62e090062107ed6674d494255bac9e3d175553bc5ae949aa1bfc9e1de4b59f35f523ee36b08bb02580513d3b585344b9864001dd991cac656f1c13116e9 -EBUILD remmina-1.4.3.ebuild 2614 BLAKE2B e87cb2e5c2e626fbc8309bfeaddf385b9dd47fae9d0244ac3a79a631ebda8df235d3dfd59009b5882520fef7e697b6d75fb6fc16204cb6c747608a58b9092684 SHA512 855a700ce278a7385e5240c7767fa37b2478d227aa5fa9f899c08c1012e7669a94efb27a2bbce3d3f25d7fcc3047778141e56739524d4d72960175a5bdb545a3 +DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf EBUILD remmina-1.4.5.ebuild 2522 BLAKE2B a860efa261252c4c559df6c4977c22bf56fef998b498dceea2e493d650a5ff2085259031c9f23df9d20fc81fc90e8ae85dd950f799213cc30884b4689c9ca5b3 SHA512 74d25d7c19ec7c9d68ce8ba06579d62608d47086874c1a4161ce52a393c7f24414c33033c088d4e41df6ba30e5d9356662c0a56702bc9115ced79af7381b720e EBUILD remmina-1.4.7.ebuild 2525 BLAKE2B 6c7d02fa36bb644ac179976d4d624a41deb3dd2c8e0c2d3cb13fa18892bf0cd06c40a64b5bb388146988872ee535a6d446365b7bb45616582169d12b0708b244 SHA512 a8adacebd610b10af5239d1e17ceddcf4763f642a91cb7240f887e76d0d206b80b37296ff85bbef8cf9eeb3651c6fe8c021707ddd8efb735459a893f8db4ec19 +EBUILD remmina-1.4.8.ebuild 2525 BLAKE2B 6c7d02fa36bb644ac179976d4d624a41deb3dd2c8e0c2d3cb13fa18892bf0cd06c40a64b5bb388146988872ee535a6d446365b7bb45616582169d12b0708b244 SHA512 a8adacebd610b10af5239d1e17ceddcf4763f642a91cb7240f887e76d0d206b80b37296ff85bbef8cf9eeb3651c6fe8c021707ddd8efb735459a893f8db4ec19 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346 diff --git a/net-misc/remmina/remmina-1.4.3.ebuild b/net-misc/remmina/remmina-1.4.8.ebuild index 2daffd642361..f73e076ebcd8 100644 --- a/net-misc/remmina/remmina-1.4.3.ebuild +++ b/net-misc/remmina/remmina-1.4.8.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils eutils gnome2-utils xdg-utils +inherit cmake eutils xdg MY_P="${PN^}-v${PV}" @@ -13,10 +13,10 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" LICENSE="GPL-2+-with-openssl-exception" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ayatana crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf" +KEYWORDS="~amd64 ~x86" +IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf" -CDEPEND=" +DEPEND=" dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= @@ -25,7 +25,7 @@ CDEPEND=" x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxkbfile - ayatana? ( dev-libs/libappindicator:3 ) + appindicator? ( dev-libs/libappindicator:3 ) crypt? ( dev-libs/libgcrypt:0= ) rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129 <net-misc/freerdp-3 @@ -42,12 +42,14 @@ CDEPEND=" webkit? ( net-libs/webkit-gtk:4 ) zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) ) " -DEPEND="${CDEPEND} +BDEPEND=" dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) " -RDEPEND="${CDEPEND} + +RDEPEND=" + ${DEPEND} virtual/freedesktop-icon-theme " @@ -55,9 +57,14 @@ DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) S="${WORKDIR}/${MY_P}" +src_prepare() { + xdg_environment_reset + cmake_src_prepare +} + src_configure() { local mycmakeargs=( - -DWITH_APPINDICATOR=$(usex ayatana) + -DWITH_APPINDICATOR=$(usex appindicator) -DWITH_GCRYPT=$(usex crypt) -DWITH_EXAMPLES=$(usex examples) -DWITH_LIBSECRET=$(usex gnome-keyring) @@ -73,16 +80,15 @@ src_configure() { -DWITH_LIBVNCSERVER=$(usex vnc) -DWITH_WWW=$(usex webkit) -DWITH_AVAHI=$(usex zeroconf) + -DWITH_NEWS=$(usex telemetry) -DWITH_ICON_CACHE=OFF -DWITH_UPDATE_DESKTOP_DB=OFF ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update + xdg_pkg_postinst elog "To get additional features, some optional runtime dependencies" elog "may be installed:" @@ -90,9 +96,3 @@ pkg_postinst() { optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] optfeature "XDMCP support" x11-base/xorg-server[xephyr] } - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest index 98eb38eca139..f5e4f99f5224 100644 --- a/net-misc/rsync/Manifest +++ b/net-misc/rsync/Manifest @@ -1,16 +1,14 @@ -AUX rsync-3.2.0-noexecstack.patch 931 BLAKE2B 92afb3233c42ae5fb08cf51c257e362fe531ece228b0fe490017714449c8f77043cbba7168224bd7f710087da1ca88468f2218fcaeefe868224071567c9ea672 SHA512 a007b365cab90bf9b6d499686fa8c3fd304075d22539e9fd04cd23ccee0e66172ec5ca0f2c8312f9b941a90e30089418546c9f43d2b2507068dd7f24a64f16b0 -AUX rsync-3.2.0-simd_check.patch 446 BLAKE2B d36350122964bc4838841d4d7b814c4e5602f225f41e5d922e18aeb97d51e77c60f952beff25908a4d478d3b245157e6c8eafe5528c7d178c72a3e82e48375e0 SHA512 b262fbb6ae9fba7d01ee0d28928e45df0ede143d81ea4d23e3401e164cfa4f06454b305a54c35a280157d910b42902b627696fccdcec63053fedd0d446d0f152 +AUX rsync-3.2.2-allow_bwlimit_0.patch 3163 BLAKE2B 69255e7e2926dccdbfa63962db7b11bf8d2ce110251a9edbd437e743f3af9208b2d009b1d7aec6c57b3c241bb01e810b210cd055848532efa724543c440cdc7a SHA512 4c91e63aac56d4e177baa5e0840680515e172cc7a431408bc41ee5f4afa9f1d2f5f4de21999bc77709175cfc042997f4aa455f9ff2ccfa9c6abdf1401f81ac44 +AUX rsync-3.2.2-zstd_see_token.patch 738 BLAKE2B 3bfb8c27e6b6f1893e25d0ff763fb59966d93ac62b0c43245f9544a48d42b65d78161c9add23d26592ac3405636d2387d7d1938b6efc2264c22f25499e17e8af SHA512 03ab78e4f7cffa56727cf528d2d3b09310cb959887f72bcc7bce41b0315c7bcabe72dda9ebacf71a600a7bc9b1c417568adb740ace988beed2e016facf8faf1a AUX rsyncd.conf-3.0.9-r1 462 BLAKE2B 45a7dde876368e7392ee7a05edf593f55cf6b3b4dc913745f4322ebd75f97bcdf1a24240a54e11469bd659fd565fc74cd8eeaa9490434d88444b5a076803cea7 SHA512 5c57f633aa3daa6513b5d35a1157a50308559ad993257374ce4eea0269f6bf384938f95bed749acb19538e8c4672355351fcee5cef9607153463b19227d343d7 AUX rsyncd.conf.d 149 BLAKE2B fd2556d0c270c2baa83d4d474d44ab1d16e35f112279a339f179f9af693d977cc0863bf4cd7139363c58e4e6a1a18a24c06474ecc248167224261dbaf04ae0a8 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a03127ba242ec535b7c8a3af3ad4489661ba7b5f6b074e2af38b12da394c0f8992bd28328d807a89757bb0 SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 -DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2 -DIST rsync-3.2.1.tar.gz 1051665 BLAKE2B de1ee047b9a378cd16fceb188d0a2e14e78751c8295263e183888b464ced9263be600bbb04b7793d48e7aa1fd2ab0709d717234f346cc6a5a028c3daddcb019e SHA512 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c -DIST rsync-3.2.2pre3.tar.gz 1043941 BLAKE2B 7f3730d39509af9eba921f2cc23716176ba7287d61f949ad2bfa26ed3252dc43738943937295da6005f1a81bb83281118e517d16c8575de764e37369db31f337 SHA512 375c3936f5876a01a35f509df82eb9cfde01fcdc1b401735b6a6298b10fedfc82eb87a51995b2122923d49f941364547b47b03c6bad88995d50c0ee922a0f0ea -EBUILD rsync-3.2.0-r1.ebuild 4509 BLAKE2B ab0897f40b2f7ea13a8a841892ba5eca647befe4f8be98d6440ed9f1cdb7addc13d548a45660c4295472b116517b8c41b30f35e01b37227a1ede1b507a45fa20 SHA512 89ad2d62e3b764e8283dc41899b54ecb93d69f16e9ab4e7e859d0c45bd108bff744776fee114cbca2c4ea85e944ae53e6b5d068b809253aea482cca002ebe5a7 -EBUILD rsync-3.2.1.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9 -EBUILD rsync-3.2.2_pre3.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9 -EBUILD rsync-9999.ebuild 4444 BLAKE2B 9ebb509b7fd4ca4e77eec489a5b8f628bee745d12a8828c54f8887d81b2a79d77e65333b65491041b26efd40cec3dc6dc44d99b590b99eaa1b5f1d80fe8815bc SHA512 0437f7264cd62f2a77a4d0c81cb6135451fc705901ab658f1fd1e4b8ad4d199c096c02fab605781fd6b203caf3c0fd9a1edbaf3588a4d76548709b96a5bc3f1d +DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169 +DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e +EBUILD rsync-3.2.2-r1.ebuild 4595 BLAKE2B f98b70a7d8e1c8bc677c7cc0750c21fc8b4f837a25094fc06cbc7af4eeca2e2deed18fd1e01b3ae8eafc450b3fe0e2dc68449d7131abc1cac316322e27572553 SHA512 72752c1941c034cf09fe91b7396024d6d18c4d3837c8edb437753f9f00848fedc8dc3c562186813496538291262389184a3132aceac3a9011939be55598033ba +EBUILD rsync-3.2.3.ebuild 4486 BLAKE2B 28067a0b28bebe7f55e0ea922030625dccb3ee6b1575b39dc8bc4ab58d5356c0c8c37d782f38713ab81f5b5d7f355f9c14fc77bce4672f3dac62bfd3dae9ed2a SHA512 14f921148a2bacc9fafb188754e7c7a6ddaba413598fde32f09ab6c8db53ece64e882c393de92ef378aca4a22ebf28e2a5ad4f5d7af7c2e549dc219c635f9c61 +EBUILD rsync-9999.ebuild 4492 BLAKE2B e8c61555b6fb9ae26b8b6cb1aef37321eef943aac9f942fe968867530a9bba551a09b8aedf5f6a08d17959936e87731c56f12620461e9099567d9c2bafb338be SHA512 1aa7da8316877a9a9e8b6fadc7ce2ef04c5566cab24ccb8ae3504803f077d271eadc3a0df048235ab18f9b6a47d770ed755f6d03da66fe1dccf69fd9bd2cfe2e MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d diff --git a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch b/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch deleted file mode 100644 index 918346062e6a..000000000000 --- a/net-misc/rsync/files/rsync-3.2.0-noexecstack.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 75901616c5f38a9ff6ba736c8281933e8ce64b8b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com> -Date: Sat, 20 Jun 2020 16:54:11 +0200 -Subject: [PATCH] Pass --noexecstack to assembler. - -This prevents Linux from rightfully complaining about an executable -stack segment, which is widely considered a security hazard. ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 31ddc43b..60aff920 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -135,7 +135,7 @@ simd-checksum-x86_64.o: simd-checksum-x86_64.cpp - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp - - lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s -- $(CC) -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s -+ $(CC) -Wa,--noexecstack -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s - - tls$(EXEEXT): $(TLS_OBJ) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) diff --git a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch b/net-misc/rsync/files/rsync-3.2.0-simd_check.patch deleted file mode 100644 index 255f2792dc07..000000000000 --- a/net-misc/rsync/files/rsync-3.2.0-simd_check.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/WayneD/rsync/pull/24 - ---- rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 -+++ rsync-3.2.0/configure.ac 2020-06-19 23:11:01.000000000 +0200 -@@ -207,7 +207,7 @@ - if test x"$CXX" != x""; then - CXX_VERSION=`$CXX --version 2>/dev/null | head -n 1` - case "$CXX_VERSION" in -- g++*) -+ *g++*) - CXX_VERSION=`$CXX -dumpversion | sed 's/\..*//g'` - if test "$CXX_VERSION" -ge "5"; then - CXX_OK=yes diff --git a/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch b/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch new file mode 100644 index 000000000000..4a795bb17b96 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.2-allow_bwlimit_0.patch @@ -0,0 +1,77 @@ +From 5dcb49c7ddec765d4a24b4f801ffc7212c085db1 Mon Sep 17 00:00:00 2001 +From: Wayne Davison <wayne@opencoder.net> +Date: Tue, 7 Jul 2020 11:40:27 -0700 +Subject: [PATCH] Allow --bwlimit=0 again. + +--- + options.c | 12 ++++++------ + testsuite/hands.test | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/options.c b/options.c +index 5a372ae7..0b7b9f33 100644 +--- a/options.c ++++ b/options.c +@@ -1253,7 +1253,7 @@ static int count_args(const char **argv) + /* If the size_arg is an invalid string or the value is < min_value, an error + * is put into err_buf & the return is -1. Note that this parser does NOT + * support negative numbers, so a min_value < 0 doesn't make any sense. */ +-static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value) ++static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value, BOOL allow_0) + { + int reps, mult; + const char *arg, *err = "invalid"; +@@ -1299,7 +1299,7 @@ static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name + size += atoi(arg), arg += 2; + if (*arg) + goto failure; +- if (size < min_value) { ++ if (size < min_value && (!allow_0 || size != 0)) { + err = size < 0 ? "too big" : "too small"; + goto failure; + } +@@ -1683,19 +1683,19 @@ int parse_arguments(int *argc_p, const char ***argv_p) + break; + + case OPT_MAX_SIZE: +- if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0)) < 0) ++ if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, True)) < 0) + return 0; + max_size_arg = num_to_byte_string(max_size); + break; + + case OPT_MIN_SIZE: +- if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0)) < 0) ++ if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, True)) < 0) + return 0; + min_size_arg = num_to_byte_string(min_size); + break; + + case OPT_BWLIMIT: { +- ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512); ++ ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, True); + if (size < 0) + return 0; + bwlimit_arg = num_to_byte_string(size); +@@ -1889,7 +1889,7 @@ int parse_arguments(int *argc_p, const char ***argv_p) + max_alloc_arg = NULL; + } + if (max_alloc_arg) { +- ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024); ++ ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, False); + if (size < 0) + return 0; + max_alloc = size; +diff --git a/testsuite/hands.test b/testsuite/hands.test +index 46928d4e..8e265b7c 100644 +--- a/testsuite/hands.test ++++ b/testsuite/hands.test +@@ -16,7 +16,7 @@ DEBUG_OPTS="--debug=all0,deltasum0" + runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' + + ln "$fromdir/filelist" "$fromdir/dir" +-runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' ++runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' + + rm "$todir/text" + runtest "one file" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' diff --git a/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch b/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch new file mode 100644 index 000000000000..02f22409d4c2 --- /dev/null +++ b/net-misc/rsync/files/rsync-3.2.2-zstd_see_token.patch @@ -0,0 +1,31 @@ +From bb1365dd7736b264738f50b683a0f81a2ed11aba Mon Sep 17 00:00:00 2001 +From: Wayne Davison <wayne@opencoder.net> +Date: Fri, 10 Jul 2020 09:47:16 -0700 +Subject: [PATCH] Fix see_token zstd case. + +--- + token.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/token.c b/token.c +index cad6b641..61be8dd9 100644 +--- a/token.c ++++ b/token.c +@@ -1093,13 +1093,13 @@ void see_token(char *data, int32 toklen) + break; + case CPRES_ZLIBX: + break; +-#ifdef SUPPORT_LZ4 +- case CPRES_LZ4: +- /*see_uncompressed_token(data, toklen);*/ ++#ifdef SUPPORT_ZSTD ++ case CPRES_ZSTD: + break; + #endif + #ifdef SUPPORT_LZ4 +- case CPRES_ZSTD: ++ case CPRES_LZ4: ++ /*see_uncompressed_token(data, toklen);*/ + break; + #endif + default: diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.2-r1.ebuild index d74e0fca5bbc..a7cd968e74bf 100644 --- a/net-misc/rsync/rsync-3.2.0-r1.ebuild +++ b/net-misc/rsync/rsync-3.2.2-r1.ebuild @@ -3,13 +3,13 @@ EAPI=7 -inherit autotools flag-o-matic prefix systemd +inherit flag-o-matic prefix systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" if [[ "${PV}" == *9999 ]] ; then PYTHON_COMPAT=( python3_{6,7,8} ) - inherit git-r3 python-any-r1 + inherit autotools git-r3 python-any-r1 EGIT_REPO_URI="https://github.com/WayneD/rsync.git" else if [[ "${PV}" == *_pre* ]] ; then @@ -51,22 +51,23 @@ if [[ "${PV}" == *9999 ]] ; then ')" fi +PATCHES=( + "${FILESDIR}/${P}-allow_bwlimit_0.patch" #731306 + "${FILESDIR}/${P}-zstd_see_token.patch" #733084 +) + # Only required for live ebuild python_check_deps() { has_version "dev-python/commonmark[${PYTHON_USEDEP}]" } -PATCHES=( - "${FILESDIR}/${P}-simd_check.patch" - "${FILESDIR}/${P}-noexecstack.patch" #728882 -) - src_prepare() { default - - eaclocal -I m4 - eautoconf -o configure.sh - eautoheader && touch config.h.in + if [[ "${PV}" == *9999 ]] ; then + eaclocal -I m4 + eautoconf -o configure.sh + eautoheader && touch config.h.in + fi } src_configure() { @@ -85,8 +86,9 @@ src_configure() { $(use_enable zstd) ) - if [[ "${ARCH}" == "amd64" ]] ; then - # SIMD is only available for x86_64 right now (#728868) + if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then + # SIMD is only available for x86_64 right now + # and only on glibc (#728868) myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) ) else myeconfargs+=( --disable-simd ) @@ -102,7 +104,7 @@ src_install() { newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd - dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex + dodoc NEWS.md README.md TODO tech_report.tex insinto /etc newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf diff --git a/net-misc/rsync/rsync-3.2.2_pre3.ebuild b/net-misc/rsync/rsync-3.2.2_pre3.ebuild deleted file mode 100644 index c02794fd0b9b..000000000000 --- a/net-misc/rsync/rsync-3.2.2_pre3.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic prefix systemd - -DESCRIPTION="File transfer program to keep remote files into sync" -HOMEPAGE="https://rsync.samba.org/" -if [[ "${PV}" == *9999 ]] ; then - PYTHON_COMPAT=( python3_{6,7,8} ) - inherit autotools git-r3 python-any-r1 - EGIT_REPO_URI="https://github.com/WayneD/rsync.git" -else - if [[ "${PV}" == *_pre* ]] ; then - SRC_DIR="src-previews" - else - SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - fi - SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" - S="${WORKDIR}/${P/_/}" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE_CPU_FLAGS_X86=" sse2" -IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd" -IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}" - -LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] ) - lz4? ( app-arch/lz4[static-libs(+)] ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - system-zlib? ( sys-libs/zlib[static-libs(+)] ) - xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) - xxhash? ( dev-libs/xxhash[static-libs(+)] ) - zstd? ( app-arch/zstd[static-libs(+)] ) - >=dev-libs/popt-1.5[static-libs(+)]" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - iconv? ( virtual/libiconv )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -if [[ "${PV}" == *9999 ]] ; then - BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/commonmark[${PYTHON_USEDEP}] - ')" -fi - -# Only required for live ebuild -python_check_deps() { - has_version "dev-python/commonmark[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - if [[ "${PV}" == *9999 ]] ; then - eaclocal -I m4 - eautoconf -o configure.sh - eautoheader && touch config.h.in - fi -} - -src_configure() { - use static && append-ldflags -static - local myeconfargs=( - --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf - --without-included-popt - $(use_enable acl acl-support) - $(use_enable iconv) - $(use_enable ipv6) - $(use_enable lz4) - $(use_enable ssl openssl) - $(use_with !system-zlib included-zlib) - $(use_enable xattr xattr-support) - $(use_enable xxhash) - $(use_enable zstd) - ) - - if [[ "${ARCH}" == "amd64" ]] ; then - # SIMD is only available for x86_64 right now (#728868) - myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) ) - else - myeconfargs+=( --disable-simd ) - fi - - econf "${myeconfargs[@]}" - [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625 -} - -src_install() { - emake DESTDIR="${D}" install - - newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd - newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd - - dodoc NEWS.md README.md TODO tech_report.tex - - insinto /etc - newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}"/rsyncd.logrotate rsyncd - - insinto /etc/xinetd.d - newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd - - # Install stunnel helpers - if use stunnel ; then - emake DESTDIR="${D}" install-ssl-daemon - fi - - # Install the useful contrib scripts - if use examples ; then - exeinto /usr/share/rsync - doexe support/* - rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} - fi - - eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd* - - systemd_dounit "${FILESDIR}/rsyncd.service" -} - -pkg_postinst() { - if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \ - "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then - ewarn "You have disabled chroot support in your rsyncd.conf. This" - ewarn "is a security risk which you should fix. Please check your" - ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'." - fi - if use stunnel ; then - einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature." - einfo - einfo "You maybe have to update the certificates configured in" - einfo "${EROOT}/etc/stunnel/rsync.conf" - fi - if use system-zlib ; then - ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when" - ewarn "using the --compress option." - ewarn - ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib," - ewarn "and the --compress option, add --new-compress (-zz)." - ewarn - ewarn "For syncing the portage tree, add:" - ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf" - fi -} diff --git a/net-misc/rsync/rsync-3.2.1.ebuild b/net-misc/rsync/rsync-3.2.3.ebuild index c02794fd0b9b..9770c2897831 100644 --- a/net-misc/rsync/rsync-3.2.1.ebuild +++ b/net-misc/rsync/rsync-3.2.3.ebuild @@ -16,7 +16,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" S="${WORKDIR}/${P/_/}" @@ -81,8 +81,9 @@ src_configure() { $(use_enable zstd) ) - if [[ "${ARCH}" == "amd64" ]] ; then - # SIMD is only available for x86_64 right now (#728868) + if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then + # SIMD is only available for x86_64 right now + # and only on glibc (#728868) myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) ) else myeconfargs+=( --disable-simd ) diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index 7bd6a4121f2d..fb78f513976f 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -16,7 +16,7 @@ else SRC_DIR="src-previews" else SRC_DIR="src" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz" S="${WORKDIR}/${P/_/}" @@ -81,8 +81,9 @@ src_configure() { $(use_enable zstd) ) - if [[ "${ARCH}" == "amd64" ]] ; then - # SIMD is only available for x86_64 right now (#728868) + if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then + # SIMD is only available for x86_64 right now + # and only on glibc (#728868) myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) ) else myeconfargs+=( --disable-simd ) diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest index 79f33df20d64..e132477d9f45 100644 --- a/net-misc/rygel/Manifest +++ b/net-misc/rygel/Manifest @@ -1,3 +1,5 @@ DIST rygel-0.38.3.tar.xz 4106460 BLAKE2B 38547cd28b0039440cf5e4a7381914c606479c1f26f91eb8af14276a6aa7d6267f0fba5b2af374ca3f0b933c683d569e26cbcec8cbdd15d620d57bd1ecf32c48 SHA512 787508f809e473dccc8461128c1b3b9d71b118008fa13660144f32ccb4b1ad02f41866ddf00343e102ed6f13552d34278917e14cf50c57ea3ffb6cf474f0ce58 +DIST rygel-0.38.4.tar.xz 4123464 BLAKE2B b807dd7fd20c0fd77da6af49cb32399d3e83cd45f1eed121d9b16f201aff260eb4a381ec47774c638a274e83a9b4a1c10d6d317374891ffdb792217e2693fdb5 SHA512 791dcc624f90cdc77bd00e9513c15998d42979e0b3255dcfda771e1d9d718fe4a0127ba0d18e69b6f4e9259c9e691e187b69c6c55c5c35ccefaf5daf65a1f447 EBUILD rygel-0.38.3.ebuild 2209 BLAKE2B 7e40c88afe41dadb3ecdd5469688436b015bdd5f43651f904bac5f682cc77a9e4579505861533f346d73f747251d81e5545cafcae7fb4f8cb73870c48d560006 SHA512 7d50000a2b16ecd28cb5a4f69b7e6280f741e74f5e935296008de23df9865479a0e6bead86b096514c3dac4150fbbbd20d96c407d2720acb5cf5b2038a81abc3 +EBUILD rygel-0.38.4.ebuild 2211 BLAKE2B 7bd7f9e0685fd3a30276b6f8aa7bef83ec4e35d8217391bffedadffc4b1060c009e9125e56dc1355d57a6019660b70a6092a11793b74df167fd7ee0e5390718d SHA512 7272d3d8e46bac598a771c4aa75d2044601969f1ca8c2e82d72de6b8897cb486119390abfc5b025ac68e5aaabb014086fb2df3b59527d2aba484c4c031af685d MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce diff --git a/net-misc/rygel/rygel-0.38.4.ebuild b/net-misc/rygel/rygel-0.38.4.ebuild new file mode 100644 index 000000000000..fdf2b4325976 --- /dev/null +++ b/net-misc/rygel/rygel-0.38.4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 systemd + +DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer" +HOMEPAGE="https://wiki.gnome.org/Projects/Rygel" + +LICENSE="LGPL-2.1+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X +introspection +sqlite tracker test transcode" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.44.0:2 + >=dev-libs/libgee-0.8:0.8 + >=dev-libs/libxml2-2.7:2 + >=media-libs/gupnp-dlna-0.9.4:2.0 + >=media-libs/gstreamer-1.12:1.0 + >=media-libs/gst-plugins-base-1.12:1.0 + >=media-libs/libmediaart-0.7:2.0 + media-plugins/gst-plugins-soup:1.0 + >=net-libs/gssdp-1.1.0:0= + >=net-libs/gupnp-1.1.0:0= + >=net-libs/gupnp-av-0.12.8 + >=net-libs/libsoup-2.44:2.4 + >=sys-apps/util-linux-2.20 + x11-misc/shared-mime-info + introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) + sqlite? ( + >=dev-db/sqlite-3.5:3 + dev-libs/libunistring:= + x11-libs/gdk-pixbuf:2 + ) + tracker? ( app-misc/tracker:= ) + transcode? ( + media-libs/gst-plugins-bad:1.0 + media-plugins/gst-plugins-twolame:1.0 + media-plugins/gst-plugins-libav:1.0 + ) + X? ( >=x11-libs/gtk+-3.22:3 ) +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + >=sys-devel/gettext-0.19.7 + virtual/pkgconfig +" +# Maintainer only +# app-text/docbook-xsl-stylesheets +# >=dev-lang/vala-0.36 +# dev-libs/libxslt + +src_prepare() { + # Disable test triggering call to gst-plugins-scanner which causes + # sandbox issues when plugins such as clutter are installed + sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \ + -i tests/rygel-playbin-renderer-test.c || die + + gnome2_src_prepare +} + +src_configure() { + # We set xsltproc because man pages are provided by upstream + # and we do not want to regenerate them automagically. + gnome2_src_configure \ + XSLTPROC=$(type -P false) \ + --enable-gst-launch-plugin \ + --with-media-engine=gstreamer \ + --enable-nls \ + --with-systemduserunitdir=$(systemd_get_userunitdir) \ + $(use_enable introspection) \ + $(use_enable sqlite media-export-plugin) \ + $(use_enable sqlite lms-plugin) \ + $(use_enable test tests) \ + $(use_enable tracker tracker-plugin) \ + $(use_with X ui) +} diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest index 77a16a9fb993..0c7df0627bf6 100644 --- a/net-misc/s3cmd/Manifest +++ b/net-misc/s3cmd/Manifest @@ -1,7 +1,5 @@ -DIST s3cmd-1.6.1.tar.gz 102431 BLAKE2B a470417c790f60acd60cb23ad45d8d274b3f849f610cd582524c20fa88cbd592762f5e41a6abb36c6fc49ff6719b87322b12cc37c973d52847f9a400d8bf3024 SHA512 0b1e3cf839144b24e42974f973a8ae97e9b4c79df3a40e38f61cc4b5284ea41a1fcbdc9dd45ff2b402915acb1ffc908a1e1c45c12f93243211ef2349c9acf70b -DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e519d8ffdfddecb1c157fc39fe8b26f39cf698cedd83ddf2649abd8e509c97b6e3073f7baa29a229a9958a1c SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d -EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050 -EBUILD s3cmd-2.0.0.ebuild 569 BLAKE2B 531a6555be566cbbe57325c6bd98cfb1bdffe32028addd89d67d72fe12d6dc66debf02acc58b061d53eff3a66af5488ca19a7b3eabeb6c71372629cbb32926b5 SHA512 4ecf2fa88755bc3d74a1a53960ad59dc31bde4dce32fc67babd92d6e6f5740d40e7b586d97e2a0bb4434b7a57103020f8b74e6ff4dac3a54fc5542b0bb966a03 +DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6 EBUILD s3cmd-2.0.2.ebuild 579 BLAKE2B 37142c3dbcb5ee3d9ddd574738fdd0df153e566949a0f1f7350b1ba2c02acd36e0a4398ba4683f12ab9392d86375a5e10adbf9b39d76a020e20e4b565af1b5ef SHA512 bfad562510e73393e0cb8ca22ca7b7853ed5a66b35105282eb6eeec1ccef38a0e051d45a62eb442b923148fd75a88259fda742cd28399fad9bfdaf31fe731775 -MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca +EBUILD s3cmd-2.1.0.ebuild 558 BLAKE2B 7742429c519ec2f0ecc6f973c58fae365e6792c27fa73285710e59b806cf966a30c9117a5dbf1710a7c0f7f637d50afbbf821864ab2fa67135c186713144937c SHA512 e08a88cb49ce97a41bd7e22a0f634e3673e369dfc171ebf88b71ae06bbca7264a84ac5fb1076d81e25e49d499af6ac34e99e71e9e63d3ba0d36119f60c9e8bbb +MISC metadata.xml 684 BLAKE2B a51a67e94176e0c83d810b847abce27229e0769007d984fe4947a474f7d5dbc7a27169efa6caad265405e7e489351f5cc506fc852be88381f282bc7068bd70f4 SHA512 aa2ed58e516488adeb24cca0aac779dcb49c4ed6977a6b411df34f45a0e1b58a42aa34b0ff5faf1206bfb88f85bddf034dad43577512cff67e1aed2292f373e8 diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml index 1e93066ae8dc..8d26ba9964fb 100644 --- a/net-misc/s3cmd/metadata.xml +++ b/net-misc/s3cmd/metadata.xml @@ -9,13 +9,14 @@ <email>titanofold@gentoo.org</email> <name>Aaron W. Swenson</name> </maintainer> + <maintainer type="person"> + <email>rich0@gentoo.org</email> + <name>Rich Freeman</name> + </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <longdescription> - Command line client for Amazon S3. - </longdescription> <upstream> <remote-id type="sourceforge">s3tools</remote-id> </upstream> diff --git a/net-misc/s3cmd/s3cmd-1.6.1.ebuild b/net-misc/s3cmd/s3cmd-1.6.1.ebuild deleted file mode 100644 index d94467370c51..000000000000 --- a/net-misc/s3cmd/s3cmd-1.6.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit distutils-r1 - -DESCRIPTION="Command line client for Amazon S3" -HOMEPAGE="https://s3tools.org/s3cmd" -SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="amd64 x86 ~x64-macos" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/python-magic[${PYTHON_USEDEP}]" - -S="$WORKDIR/${P/_/-}" diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.1.0.ebuild index 49035b03c3ef..52463ca60029 100644 --- a/net-misc/s3cmd/s3cmd-2.0.0.ebuild +++ b/net-misc/s3cmd/s3cmd-2.1.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_6 python3_7 python3_8 python3_9 ) PYTHON_REQ_USE="xml" inherit distutils-r1 @@ -11,14 +11,13 @@ inherit distutils-r1 DESCRIPTION="Command line client for Amazon S3" HOMEPAGE="https://s3tools.org/s3cmd" SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz" + LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos" -KEYWORDS="amd64 ~ia64 x86 ~x64-macos" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] +RDEPEND=" + dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/python-magic[${PYTHON_USEDEP}]" S="$WORKDIR/${P/_/-}" diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest index 10c979f1f867..7c8b41a341de 100644 --- a/net-misc/scponly/Manifest +++ b/net-misc/scponly/Manifest @@ -3,5 +3,5 @@ AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a3 AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538142c15dd0be82956c2c8a48c7d46cc9ec59605a4f1c10fc5235acb584945b00ee4c187391d198571d841b45225c328765b49 SHA512 86171549d894426d12eb2f8d65959d1be2e137327c135be31c762820a55256f5c4ac90a01f989c8bffd2b46b275de408912306209b5aba9a94b81dbc06ff5a24 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b EBUILD scponly-4.8-r6.ebuild 6872 BLAKE2B 157742b3ba96711c41389bf038c112438de483145cfc30357499b3e2ddfb3cd9a1d7e5cdfa1c839cd7faaf9a0f82f938adb8f2f135ef7a6ca7ea1ba70728adb3 SHA512 a51fe4efa6d1aaf45aea4ad8c221e02f07533d5dbfff50b0bf34da73252ef5f6be80def1236611375bdbe18862dc60e5dbde24b7af3d56e664981247d34b2aa1 -EBUILD scponly-4.8-r7.ebuild 6942 BLAKE2B 0a34a9674018a0ed6c4bc023fc2024c7cecc76dc9021a4512f30830ff13a9862db7d79eb38dc6e2042e8d462f4dfcc0f4e2303ce00cd15bfda953621e4bc986d SHA512 8f7564031f1f45c19aba9359225a6203d79f3a22a59c0cd7c5bbc547aa880447e9f1d18638cc73e8d3167751224b016e8370b7bbd5adbeefe5cd80d881801411 +EBUILD scponly-4.8-r7.ebuild 6938 BLAKE2B 44e7e4de6259a6692b9d5dc22453eea34917eecffdfc2e78da9474b5102c75bba59939496b6c80121c009966f51b99668a70853a1cf0a25c55aa425885994b88 SHA512 9ba63e00d60988b9250dbc1521d8a08323f9ccdead86025b6a85082472f2e6ec9fcf860591734c3ef47fdc58d2b5b171c35a60a0866636be8a59785560c7061f MISC metadata.xml 1730 BLAKE2B b6663a37fe260a5e1552d5bf173d96021cf5588a917a54e3e892eddf7be9618e8b2244328ca6bf87fe8dda4777349fb703f09075975b754026403742a590238a SHA512 86aedd96e8b14fa8b86a2f69a253191777e9292e4547dd8e4e07e11b22068bf1a7b6404a7a0ee4108b7ecc4d99a952c81999482aa9488d45b92ae9c4ba451938 diff --git a/net-misc/scponly/scponly-4.8-r7.ebuild b/net-misc/scponly/scponly-4.8-r7.ebuild index 8128ad5d15a5..33e64c389ddb 100644 --- a/net-misc/scponly/scponly-4.8-r7.ebuild +++ b/net-misc/scponly/scponly-4.8-r7.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scponly/${P}.tgz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="chroot +sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging" REQUIRED_USE=" || ( sftp scp winscp rsync unison subversion ) diff --git a/net-misc/sgopherd/Manifest b/net-misc/sgopherd/Manifest index 35cff283c76e..9d3d9ca8330c 100644 --- a/net-misc/sgopherd/Manifest +++ b/net-misc/sgopherd/Manifest @@ -1,5 +1,3 @@ -DIST sgopherd-17.09.tar.gz 8855 BLAKE2B d79b6f2d6c19e0ec2878ff44c56d739863a74bfc967098d4e51d4b9a723fed587d5d52f78aeb5e915e466f43a28ac443b39e8b79e6a8e8fc82c4c049be7b8cb4 SHA512 7f3ef37d5ec08d21e7945f0327ea50697237461f717a2ce3c5a0fe9c077effe26710013725a59a184564e028f249f7b53087752410600da0f8feaf9cd1b9c7dc DIST sgopherd-18.08.tar.bz2 12777 BLAKE2B dde415822f9e4a41463fa6d2622b59adc5676b88cb5b5831ec3396869f6b2bfa4d605b92bd56c24d9aa1b8d4a0198c4f2f46a6141f5f2c913cde1cfb9e99d3db SHA512 830558f2be0763550f0229bfa22524de81c9ea119b2d0f00e465f76ba343d4f488e5595851bbf13697b270d7dc611eafb36a320b6dc2c7d27ad854bd14f4c10d -EBUILD sgopherd-17.09.ebuild 881 BLAKE2B 385053740a10062f894ce1e44834785d4f1fc93679a18198ad08411b165c17387f09212ac0b75a5dfc10e49eb8a4a7e7d802733ba4a587728cbba71a9274c32b SHA512 5097bae8034d6cb3eb680dc42956880dcf38dad2afc460ce5281dcc54999e6fa70b3e4a1cb9f83bac377be19f4e11933d6f3e986bee98f0edb7e11d38a35aa1c EBUILD sgopherd-18.08.ebuild 872 BLAKE2B b1d6b50cd57b0df8d29c80ccdf49bd35ab8f74e3842ff59a7194e43044c4661eee31fe3d40426b57abd8c68e98e9796aed7ceaf950e576dd06c3aab01883472e SHA512 c2d08328ed56c5dd1887614f7805a593576708a1b1695db0b30058db653895b3ddac40f7e6a7e31e375ca0285f95c47884f0de0e62e72a99589181d73e873306 MISC metadata.xml 325 BLAKE2B 466851c33b7e7823dfc601e38bc23ff344e623acda48d749a33ad70fd12623ebf2120fff9e7a67ccf48edd32b08088df3ed85de7f2a1ec8aab6b759932d9e123 SHA512 b0da1cc0212383ff00849f6c9b3cf1e96713d1db19e21711cb8147b43ac8dc696fbfb5ff4703f8b25f73f051c25d3f05dd3e59bf229528cc0a6652b57c2b19ef diff --git a/net-misc/sgopherd/sgopherd-17.09.ebuild b/net-misc/sgopherd/sgopherd-17.09.ebuild deleted file mode 100644 index 742b26b78b00..000000000000 --- a/net-misc/sgopherd/sgopherd-17.09.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Small Gopher Server written in GNU Bash" -HOMEPAGE="https://github.com/vain/sgopherd" -SRC_URI="https://github.com/vain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="" -RDEPEND="app-shells/bash - sys-apps/sed - sys-apps/xinetd" - -src_prepare() { - # Set default user to run sgopherd - sed -i -e '/user/s/http/nobody/' xinetd/xinetd-example.conf || die 'sed failed' - - eapply_user -} - -src_install() { - dodoc README - doman man8/"${PN}".8 - dobin "${PN}" - insinto /etc/xinetd.d - newins xinetd/xinetd-example.conf "${PN}" - # TODO: add installation of systemd-related files -} - -pkg_postinst() { - elog "${PN} can be launched through xinetd" - elog "Configuration options are in /etc/xinetd.d/${PN}" -} diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest new file mode 100644 index 000000000000..f798293cbaae --- /dev/null +++ b/net-misc/sntpd/Manifest @@ -0,0 +1,8 @@ +AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596 +AUX sntpd.confd 243 BLAKE2B fc2d82b48e8b57e346ebe5fc65750368b09dce96dadbc159033d7181e9bf0a71794969b24310975b72d10faa22753ca3cc751c03b3f0775aa085f39d87f695f0 SHA512 b2ecb3e96418d36504c8ceab5ec88f7415e7fc32c00bd9fee0eb6fb643f207b5c0e481427e1fdb7a3e52a5bc2619b67363e7c27dd48e67eab61910906b86df3f +AUX sntpd.initd 252 BLAKE2B b574c0e208548dc960a8dcef5998fc44246c77972a7d09938c775b54beffdcb39cfd300b7d72c502f16c9382b30c8aab65881386bb027ab4d5969e3bf7a5abd3 SHA512 7bc79fe425d078309c1b064e365ec6ff02880f97a05c83607bd4ebcd747be1d11e9f26d64408edfff53044555fa6fb828887f1902d09c69e7d03c148bac588d1 +DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc +DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea +EBUILD sntpd-2.2018.244-r1.ebuild 861 BLAKE2B 453645dce4a010fa7b58164ee9229204e5b697754320e5b31c0d8fa27229fbe2e21022343585e2503e8074e40fd4d278ec6e7288285e8de428e857631066c05f SHA512 4062ce0572a597f336009fd11104f7f6aaac43aef17b41ab77978089aacdb780245bf96d5aa2125a68cab41b13753593257462eb4fbd6ba078eb3f1f0cdc9d70 +EBUILD sntpd-3.0.ebuild 803 BLAKE2B 78a4ebd3e706f02548695580e29582c18162cf2e2ee037d54d3f10b9de0689ca816eac72ac2bf25004f235c52f077e289951588778a42f3866996d407fe41956 SHA512 5df2212d0c740738b5ff1fe74932ea64cf62b71862f16bdb89c3d665ac30d1c017534979c8424fea809a668da26b94cbfa355166dc237fb370e6f6c719a49b05 +MISC metadata.xml 1215 BLAKE2B ea6284bde03ea2157cd105851ad90a1a2cf379bc6b5f0742866d25fdb2997e0875dcb350984daa79b63625b525d1b53cde28b3fa47220591540a165955273fc4 SHA512 eba1d1787f52e8101cb64df313df7eb3ddc2e6b593d9acbc8b5a8accacdd6d7b0fd02c4b73e65ffd73fce1bbbd10f3d206989e5b2d5280ad84aac97506568659 diff --git a/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch b/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch index df87cb6ceb22..df87cb6ceb22 100644 --- a/net-misc/ntpclient/files/ntpclient-2018.244-linux-headers-5.2.patch +++ b/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch diff --git a/net-misc/sntpd/files/sntpd.confd b/net-misc/sntpd/files/sntpd.confd new file mode 100644 index 000000000000..ef7a12ef8a43 --- /dev/null +++ b/net-misc/sntpd/files/sntpd.confd @@ -0,0 +1,5 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Additional command line options +SNTPD_OPTS="-s 0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" diff --git a/net-misc/sntpd/files/sntpd.initd b/net-misc/sntpd/files/sntpd.initd new file mode 100644 index 000000000000..2e4c0652c940 --- /dev/null +++ b/net-misc/sntpd/files/sntpd.initd @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +name="sntpd" +pidfile="/run/sntpd.pid" + +command="/usr/sbin/sntpd" +command_args="${SNTPD_OPTS}" + +depend() { + use net dns logger +} diff --git a/net-misc/ntpclient/metadata.xml b/net-misc/sntpd/metadata.xml index 3582e10f27d3..0d0a5d1ae349 100644 --- a/net-misc/ntpclient/metadata.xml +++ b/net-misc/sntpd/metadata.xml @@ -18,6 +18,7 @@ <remote-id type="github">troglobit/sntpd</remote-id> </upstream> <use> + <flag name="adjtimex">Install adjtimex for the clock adjustment algorithm.</flag> <flag name="debug">Enable analysis code path and debugging of NTP protocol.</flag> <flag name="embedded">Build a very small ntpclient, from OpenWRT project.</flag> <flag name="obsolete">Enable obsolete features, to use with kernel versions older than 3.0</flag> diff --git a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild b/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild index 8efb23121982..f6b938200cc1 100644 --- a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild +++ b/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -MY_PV="${PV/./_}" -MY_P="${PN}-${MY_PV}" +MY_PN="ntpclient" +MY_PV="${PV/2./}" +MY_P="${MY_PN}-${MY_PV/./_}" DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems" HOMEPAGE="https://github.com/troglobit/sntpd" @@ -18,7 +19,7 @@ IUSE="debug embedded obsolete +syslog" S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}/${P}-linux-headers-5.2.patch" + "${FILESDIR}/${MY_PN}-${MY_PV}-linux-headers-5.2.patch" ) src_configure() { diff --git a/net-misc/sntpd/sntpd-3.0.ebuild b/net-misc/sntpd/sntpd-3.0.ebuild new file mode 100644 index 000000000000..4b7079d372b3 --- /dev/null +++ b/net-misc/sntpd/sntpd-3.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client and server for unix-alike systems" +HOMEPAGE="https://github.com/troglobit/sntpd" +SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="adjtimex systemd" + +RDEPEND="systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND}" + +src_configure() { + local myeconfargs=( + $(use_with adjtimex) + $(use_with systemd systemd $(systemd_get_systemunitdir)) + --with-ntpclient + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/sntpd.initd sntpd + newconfd "${FILESDIR}"/sntpd.confd sntpd +} diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 213e7ce8b369..877ae7b1e692 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -3,13 +3,9 @@ AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24 AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed AUX socat-9999-stddef_h.patch 1272 BLAKE2B c6ab67b4aba676387b3d1584b03741ff829d5455991e67a5a0262cb529b965545e2935fa733a7c9a01a8c36cb2378d6d3e443a978a8993cab55bdf06d724d260 SHA512 b951fbc1d8fe26babe69fde1acc779907e00866c1a6bba85e37a4e173948ad2ade9aa7835a0e9ea1ec8902d0b181ebb11ace57ff0f8ab570301d8d35849e939d -DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293 -DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce SHA512 6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 -EBUILD socat-1.7.3.2.ebuild 1520 BLAKE2B 32d8aa672a3a43f6024feb331edf40eabca12642057a12d9d98fd01dd206bf11290c7226ef2792d237c3857c59dc141b8ea6b36feaf9d18b57e9b6e16bb059e1 SHA512 81114768886ba305e956195076f26b9563b2dc437bb46b95f8ea0ef98f1b424a5e66680915d489b03a42efdade16a7bdc246d097f605d59a19a849554a9aa065 -EBUILD socat-1.7.3.3.ebuild 1471 BLAKE2B 687c3406bbdf64c937d3c9ac3c390d0ecbd03b88c7fd09f32ec7e7225e24f6758aa5379c538c465e400e55e178c361661568c70c273ce7bc230b1ef35a992401 SHA512 1e41fd0d07fd686f5a7aeda87a998dd7fa83d254ced0bea3b27267fbe2e70fc9d88efe0864c8ef9398ace0f301842f7bc13199535a13be4b608cff8b7a7c84e4 -EBUILD socat-1.7.3.4.ebuild 1477 BLAKE2B ed640d382b632be7e1410061a8b38266500761009b17143a28acdee817b83d68bee5288e2f969cad4e0946f93e4af545ac70f604362b14f7f37977b872580ef8 SHA512 1fef52abadf4ba97fc77764616e5ab1111f8621665dd8f9a137075de2d9f8e8db48aa0d633c3bb925d58f6cc5a1374bc755236eb1a35f64bddc0dee55eba2da4 +EBUILD socat-1.7.3.4.ebuild 1469 BLAKE2B b684ac8a85ad1f08fcb39a417c8d8775590d9eb6ee0ee532a78c28b0f6afd26989111468be9100aa6a44741e95cc0c3e82de02dbbb8105b45c1939ddc5760350 SHA512 19ef1680249be8dc416126a83c1651dd7da6182dae171eec5a819c1a026f9f8f84bf8d1eada092086da26cff103a1481d16cd649aaf7ba39e79d91e124f6a9f1 EBUILD socat-2.0.0_beta9.ebuild 1554 BLAKE2B 4fd6cd332d44b5a0499e246a04bd99081bad7242c4f4fc1ac12596a475545cf4b7e26d3cb51f4871c11ffa791b7b2c29a17005434b8370fc391877365a73351a SHA512 537fd04485508f2363f97715d03604dc2a3e5caf6907a17ae478eb3c0053d0edf6dc1a9798746c4557085aee7a8413961817b1205c577c0fe433740c06783c18 EBUILD socat-9999.ebuild 1395 BLAKE2B 0884f6b4f865dc2ff255e5a48a45c0de198b3b926db598d18472758767c6a7e10978a59a88b7ec543bd1f5b8b4a18aa67b42bf59cbd3ecaf2696e83932940b53 SHA512 8836b32f18f8680bf27c26c10ac996d14befcea2f1f2ba6aab2f5e433e757ec51e81a0bebfced410c7e07f3cbd9704af7f349441530e223d132ccb5c78a3cc20 MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601 diff --git a/net-misc/socat/socat-1.7.3.2.ebuild b/net-misc/socat/socat-1.7.3.2.ebuild deleted file mode 100644 index 5b4862cd2597..000000000000 --- a/net-misc/socat/socat-1.7.3.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/" -MY_P=${P/_beta/-b} -S="${WORKDIR}/${MY_P}" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="bindist libressl ssl readline ipv6 tcpd" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND}" - -RESTRICT="test - ssl? ( readline? ( bindist ) )" - -DOCS=( - BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY -) - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch -) - -pkg_setup() { - # bug #587740 - if use readline && use ssl; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - filter-flags '-Wno-error*' #293324 - tc-export AR - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/socat/socat-1.7.3.3.ebuild b/net-misc/socat/socat-1.7.3.3.ebuild deleted file mode 100644 index b12695499bbe..000000000000 --- a/net-misc/socat/socat-1.7.3.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Multipurpose relay (SOcket CAT)" -HOMEPAGE="http://www.dest-unreach.org/socat/" -MY_P=${P/_beta/-b} -S="${WORKDIR}/${MY_P}" -SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="bindist libressl ssl readline ipv6 tcpd" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - readline? ( sys-libs/readline:= ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND=" - ${DEPEND} -" -RESTRICT=" - test - ssl? ( readline? ( bindist ) ) -" -DOCS=( - BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY -) - -pkg_setup() { - # bug #587740 - if use readline && use ssl; then - elog "You are enabling both readline and openssl USE flags, the licenses" - elog "for these packages conflict. You may not be able to legally" - elog "redistribute the resulting binary." - fi -} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - filter-flags '-Wno-error*' #293324 - tc-export AR - econf \ - $(use_enable ssl openssl) \ - $(use_enable readline) \ - $(use_enable ipv6 ip6) \ - $(use_enable tcpd libwrap) -} - -src_install() { - default - - docinto html - dodoc doc/*.html doc/*.css -} diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild index bb9b7b39d9a2..a7e73743412b 100644 --- a/net-misc/socat/socat-1.7.3.4.ebuild +++ b/net-misc/socat/socat-1.7.3.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="bindist libressl ssl readline ipv6 tcpd" DEPEND=" diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index 76388cf6b268..11cbae2db7e5 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,6 +1,12 @@ AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0830bbfaa1c2e4018ff480b625349372cc35ec47a1b10069cb5fd6a3c22d7e957e782c888c70b55 SHA512 31d482af0b3626f4b2f669f74a08fa6b6dfc310a40ab332cc3907306bd2fa5321f92e0e76af72c2ea185142f0d485578817e738737917b9c1764079070297e67 AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53c3d1c870ff6b03ac780c04c29e4dce7d6aa3e4cdce365fb54228600e7ce70d9d32691202a5ffb5 SHA512 b919ae318c789ba3e5dd0f5df665a7421be791e89074b07ee00c47b3fe12475562eb5675bbb168c86388902bf50069e0d6f3e804a14666563de07a0a71075ee0 +DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5da1562cb893a6f20df4ccaa1e6618fa2cdcc28f311518001396d861a5b50e36707327087192b0454f04287 SHA512 e758efc548b68ea4c50a56b6a6169f5c5bcfeb40163ff9968489ef6a3cdf2a69fa46869d1f53e24c6e31de4d44233005608dcf240968de6245653ccb068f692c +DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f +DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a EBUILD sslh-1.20.ebuild 1927 BLAKE2B 826342d1c48ce7137d43f17954fb4bbe116137d57f6f10ebab8dc94721121d16caaa228a86be56d6b3ef1a2ea09437a8efb3eee20c3445684b38814157022319 SHA512 42d8c60970a21165bda0bd8a782d1858a71017716b01d31607435cf9219854c6f388fa8f7a74c9fe6755f197a403dda17d094dab910cf0b7b2ae4f2e3cfc7d0b -EBUILD sslh-9999.ebuild 1951 BLAKE2B 74ea9c85d215789895a6cf4ca56cd1e442d0ecaf5cc56916ece33c5f1d3a32752318a53b50f95b588cdb5dced06a137cee32075df604d7c55f9f3fd51c8b74e2 SHA512 ebdc00830bcf7fa50eb542bfd9e1f566758d35bafd9d480154c7634c51db3828ef757f9b60b514d593fb91baa892ef28dfb00b150c4c6e5a3b192c4328ce96b4 +EBUILD sslh-1.21.ebuild 1925 BLAKE2B 79690ddd6a4e9ce7ddb451f6e7696b1355df9f8c014dd67a6b477ce6ca63911ebf6d2a334b40d5e1ec849dcc857ff65c3a646f8b7a4d1ab54cb588f959f994bd SHA512 5b02e1f81a0f1f7b6845d38de0107bab70d7b19e49f494b3bbb0939a557b52d1a337fa5646cac66cd3eab801bbfafaeddd0986857b3e519cae91f88667c25ce5 +EBUILD sslh-1.21b.ebuild 1925 BLAKE2B 79690ddd6a4e9ce7ddb451f6e7696b1355df9f8c014dd67a6b477ce6ca63911ebf6d2a334b40d5e1ec849dcc857ff65c3a646f8b7a4d1ab54cb588f959f994bd SHA512 5b02e1f81a0f1f7b6845d38de0107bab70d7b19e49f494b3bbb0939a557b52d1a337fa5646cac66cd3eab801bbfafaeddd0986857b3e519cae91f88667c25ce5 +EBUILD sslh-1.21c.ebuild 1925 BLAKE2B 79690ddd6a4e9ce7ddb451f6e7696b1355df9f8c014dd67a6b477ce6ca63911ebf6d2a334b40d5e1ec849dcc857ff65c3a646f8b7a4d1ab54cb588f959f994bd SHA512 5b02e1f81a0f1f7b6845d38de0107bab70d7b19e49f494b3bbb0939a557b52d1a337fa5646cac66cd3eab801bbfafaeddd0986857b3e519cae91f88667c25ce5 +EBUILD sslh-9999.ebuild 1947 BLAKE2B dd2d92d360b3b078d5dc20c4e4b1ca4c2a4dad1ebf8d40bf788784221334eb64929cf33c22e598e4f8d7a0e391ddac5cc5d05704bc00e65f8580fb17403d8786 SHA512 872e36bea8a682048e23dc8c5a3b0f1de89151e4138b4af98e192d0903fb55b8342dbb285a3b71f9087b263b46e93d741c8b56d8cfde0583c049d414b784c88f MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da diff --git a/net-misc/sslh/sslh-1.21.ebuild b/net-misc/sslh/sslh-1.21.ebuild new file mode 100644 index 000000000000..f112f155149a --- /dev/null +++ b/net-misc/sslh/sslh-1.21.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" +HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P} +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps pcre systemd tcpd" + +RDEPEND="caps? ( sys-libs/libcap ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + >=dev-libs/libconfig-1.5" +DEPEND="${RDEPEND} + dev-lang/perl + pcre? ( dev-libs/libpcre:= )" + +RESTRICT="test" + +src_prepare() { + default + sed -i \ + -e '/MAN/s:| gzip -9 - >:>:' \ + -e '/MAN=sslh.8.gz/s:.gz::' \ + Makefile || die +} + +src_compile() { + # On older versions of GCC, the default gnu89 variant + # will reject within-for-loop initializers, bug #595426 + # Furthermore, we need to use the gnu variant (gnu99) instead + # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro + # to be defined. + append-cflags -std=gnu99 + + emake \ + CC="$(tc-getCC)" \ + USELIBPCRE=$(usev pcre) \ + USELIBCAP=$(usev caps) \ + USELIBWRAP=$(usev tcpd) \ + USESYSTEMD=$(usev systemd) +} + +src_install() { + dosbin sslh-{fork,select} + dosym sslh-fork /usr/sbin/sslh + + doman ${PN}.8 + + dodoc ChangeLog README.md + + newinitd "${FILESDIR}"/sslh.init.d-3 sslh + newconfd "${FILESDIR}"/sslh.conf.d-2 sslh + + if use systemd; then + # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin + sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die + systemd_newunit scripts/systemd.sslh.service sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} diff --git a/net-misc/sslh/sslh-1.21b.ebuild b/net-misc/sslh/sslh-1.21b.ebuild new file mode 100644 index 000000000000..f112f155149a --- /dev/null +++ b/net-misc/sslh/sslh-1.21b.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" +HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P} +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps pcre systemd tcpd" + +RDEPEND="caps? ( sys-libs/libcap ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + >=dev-libs/libconfig-1.5" +DEPEND="${RDEPEND} + dev-lang/perl + pcre? ( dev-libs/libpcre:= )" + +RESTRICT="test" + +src_prepare() { + default + sed -i \ + -e '/MAN/s:| gzip -9 - >:>:' \ + -e '/MAN=sslh.8.gz/s:.gz::' \ + Makefile || die +} + +src_compile() { + # On older versions of GCC, the default gnu89 variant + # will reject within-for-loop initializers, bug #595426 + # Furthermore, we need to use the gnu variant (gnu99) instead + # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro + # to be defined. + append-cflags -std=gnu99 + + emake \ + CC="$(tc-getCC)" \ + USELIBPCRE=$(usev pcre) \ + USELIBCAP=$(usev caps) \ + USELIBWRAP=$(usev tcpd) \ + USESYSTEMD=$(usev systemd) +} + +src_install() { + dosbin sslh-{fork,select} + dosym sslh-fork /usr/sbin/sslh + + doman ${PN}.8 + + dodoc ChangeLog README.md + + newinitd "${FILESDIR}"/sslh.init.d-3 sslh + newconfd "${FILESDIR}"/sslh.conf.d-2 sslh + + if use systemd; then + # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin + sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die + systemd_newunit scripts/systemd.sslh.service sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} diff --git a/net-misc/sslh/sslh-1.21c.ebuild b/net-misc/sslh/sslh-1.21c.ebuild new file mode 100644 index 000000000000..f112f155149a --- /dev/null +++ b/net-misc/sslh/sslh-1.21c.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" +HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P} +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps pcre systemd tcpd" + +RDEPEND="caps? ( sys-libs/libcap ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + >=dev-libs/libconfig-1.5" +DEPEND="${RDEPEND} + dev-lang/perl + pcre? ( dev-libs/libpcre:= )" + +RESTRICT="test" + +src_prepare() { + default + sed -i \ + -e '/MAN/s:| gzip -9 - >:>:' \ + -e '/MAN=sslh.8.gz/s:.gz::' \ + Makefile || die +} + +src_compile() { + # On older versions of GCC, the default gnu89 variant + # will reject within-for-loop initializers, bug #595426 + # Furthermore, we need to use the gnu variant (gnu99) instead + # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro + # to be defined. + append-cflags -std=gnu99 + + emake \ + CC="$(tc-getCC)" \ + USELIBPCRE=$(usev pcre) \ + USELIBCAP=$(usev caps) \ + USELIBWRAP=$(usev tcpd) \ + USESYSTEMD=$(usev systemd) +} + +src_install() { + dosbin sslh-{fork,select} + dosym sslh-fork /usr/sbin/sslh + + doman ${PN}.8 + + dodoc ChangeLog README.md + + newinitd "${FILESDIR}"/sslh.init.d-3 sslh + newconfd "${FILESDIR}"/sslh.conf.d-2 sslh + + if use systemd; then + # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin + sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die + systemd_newunit scripts/systemd.sslh.service sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild index 802f410ba5d7..77b77de39d48 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-9999.ebuild @@ -12,9 +12,8 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" - MY_P="${PN}-v${PV}" - SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz" - S=${WORKDIR}/${MY_P} + SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" + S=${WORKDIR}/${P} fi LICENSE="GPL-2" diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 7ea10916adbb..8cd787ee5d4a 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,6 +1,6 @@ AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f3565063887d8ef01b8379539fb7bb6a70d00e80809a203dd3a263de6c96012f5357b7e059044f0ca34 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6 AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4 -AUX stunnel-r1 1437 BLAKE2B 92689cd4ee63920e1064cb96c88795132ee917e7886f9970f125f52d4eabf0fdb2515783c321771ae4e06598dca7e54f9b8131523c14dea7efa2769e0de0ed4b SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c +AUX stunnel-r1 1462 BLAKE2B 3acccb347c008ce5e8eb1cbd72d9125edd452ce5f607a819cffe72618a77c4a1d9b3702851e6e13cc236532b536144acf564cec3f1811563452dc02be0b8f992 SHA512 b5d33a9beb056bf6c9571296cb2a30e2aaa48b9841adb7ac3e40881f261f7ba999acf95ded81f2185d6a51ff8a21f79bdcbb0f3ab2e635c93279f33fc74f249f AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac @@ -8,5 +8,5 @@ DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc DIST stunnel-5.56.tar.gz 981163 BLAKE2B eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b SHA512 db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877 EBUILD stunnel-5.50-r1.ebuild 2793 BLAKE2B 171534b2db1295d9a0f23664a43d5f01a45b113397c24c8e3e53484cd1fef30b609f3d696eb76ec57a3b2408c1f52e5755ab7e75b9669b247170dcb3b8790b81 SHA512 27a6c83a40b46a568091bffc0586fabbea86df217bca9f674156e08eeb15ff7443caecc78c678c33e0f10e69bcfaa8b4c36c08a72a147d66068013c3b43dd934 EBUILD stunnel-5.55.ebuild 2775 BLAKE2B dfc2654573b38a777a90c8951de517016a933eed0493d3b529dd0b16e9f06e001e71f28ae18a78fe847c049072770614914c4b72ca4823648cabeb45e74d458b SHA512 ad9deb507a177d3d9a62db77d3ed35766a7b6d2a4f8ed3e193ae96fe6a80aae35a1a8a5c81082a9f439c1ac445279fa8f4b521bc202ce16c75816f8c06a52423 -EBUILD stunnel-5.56-r1.ebuild 2755 BLAKE2B 519d47e87b6b80df3b32c057629c3ac8cc25d6c9e761665d272a708d0770c0b90aaba02caed060096ae3fcade304638022103a277886a1ac0219e615e45cdecb SHA512 98701fce9d7a7a35f2dc6fa843b5a7caad9e1a008f62319e8085c6bd0c0ec90b5314d260486d9eed70636e2a96e2529d4b5dee72d642c9326dbda0626fcc42b2 +EBUILD stunnel-5.56-r1.ebuild 2904 BLAKE2B 89c1e6b0dd5923cae0575c002343abc295b7d2a745df998307f0bf71e12cfcacc951ce452d6809f30086cf52b4954c291ac64efbe48079edd68b5893029cd017 SHA512 235b6410724e2114f571a19b8c9a5b7924de0cb2142681dc4007b5a38e6ea2ed8282b2e7681a3d3514cdee50b7cd6a718116a25640fcd8c56ba3e1452ed23402 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362 diff --git a/net-misc/stunnel/files/stunnel-r1 b/net-misc/stunnel/files/stunnel-r1 index a73527ed57e7..11530eabe720 100644 --- a/net-misc/stunnel/files/stunnel-r1 +++ b/net-misc/stunnel/files/stunnel-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" @@ -38,7 +38,8 @@ start() { stop() { get_config || return 1 ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} + start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \ + --pidfile ${PIDFILE} eend $? "Failed to stop ${SVCNAME}" } diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild b/net-misc/stunnel/stunnel-5.56-r1.ebuild index 10f5581fa01a..a6540f0fb4ad 100644 --- a/net-misc/stunnel/stunnel-5.56-r1.ebuild +++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="ipv6 selinux stunnel3 tcpd" DEPEND="dev-libs/openssl:0= @@ -85,5 +85,7 @@ pkg_postinst() { einfo "If you want to run multiple instances of stunnel, create a new config" einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " - einfo "\'pid= \' with a unique filename." + einfo "\'pid= \' with a unique filename. For openrc make a symlink from the" + einfo "stunnel init script to \'stunnel.name\' and use that to start|stop" + einfo "your custom instance" } diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest index 7799bc105ad5..73e5c27f890c 100644 --- a/net-misc/ubridge/Manifest +++ b/net-misc/ubridge/Manifest @@ -1,7 +1,5 @@ AUX ubridge-0.9.14-respect-flags.patch 395 BLAKE2B 746f481789bca31b87759eb879521288e27b4cf16d3e2d83ea593d76bf03f614ecad6a0f2c0b001d47c08ca57ab898b2c4c9d475d34bd0b54ce7da4bdf507746 SHA512 4a86af19f8462ff3d81d509e6d264240cb3769f3175e0b1c0142cee30d7b61354c86ffec57d31f0bfbca46c0dad078efa6d3c61d19e29ca9ab6dec43f401eccc AUX ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch 1008 BLAKE2B d518f3d2b5fc5fd9c6c15c39f755d05b04738dc8cd443b55019ba14d858a9796d2e73190a4956f1f13896d30e2cf49f203755c37d3ccfeb73b484da3421a37f1 SHA512 d9afe86a35ff50d9455bac90c0a0fbe830816c043c4580bff10e1a556ef3b0de92a697188b3efcf5f87ce8672015320b5795f393a6916e2d96619c465344c80b -DIST ubridge-0.9.14.tar.gz 63492 BLAKE2B 4c19bb79c264c9bec2ca39fea8b386817f6eb41d23b35f9fbd0a1407b45398ad5362bd76cbb81597438367a2af8d80308f13d3e8faa4e75c6173bbeb23da177d SHA512 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f -DIST ubridge-0.9.16.tar.gz 64106 BLAKE2B ea5292bb7895034f18fde2c78e6ec22a043d3f712af0f699240073778bf72ade4ba9fc9be56d5ff13ce4119c6d90265daf86e84405597483c07c900e80b4e579 SHA512 409b5705e178d0edda17f5a321bc28a4a03d417c59893228e022a88025a51e4d4f9a18e548ec71f1b36df24b204cfdf73bc2efb8fe9e39893d29c16b3695380c -EBUILD ubridge-0.9.14.ebuild 1003 BLAKE2B ef1bf86ff6eb34a06748f14a98bc086a9ed39247d4a649feff896c06a210c3cc78d7e644be9e9c5f9412cd1b731abc2b7acb8445acf23b8f28182f3ed48f634c SHA512 9fea9b1c5270159bc592d5ba42e14ebd037bce7660fb38b59c02a72184833d48956f4ea53b1c4ded2b1c7dce19beb177fe5a79f1632d87fa532e7da131401109 -EBUILD ubridge-0.9.16.ebuild 1101 BLAKE2B f4c0635d72e6fc2eb2dca231ef68a26d57daedfc060a7dd9425df636912efee26f0990efd8b48338043ddba687b394cfa5eff04b45e9aa1488ba08650c395b3c SHA512 8052e0e2d5028c4b16e0aca688aa234d5048f06447f9c1c9d0a5a4527037249fa8b77a52cb042ddc19b0c26371b4f7ff731aeac5b56793485ec18251b2ea1e23 -MISC metadata.xml 620 BLAKE2B 0b56364ec1f6e18cc56a58c0ed36480114d4ff8b3ef90963d1b964f5dbdeb1fa905336e8fdf0014476927b9b530e9f0be9bf70810d02b8437253813d886e7005 SHA512 ab05ab88363c0d3fbb703af5e98180ac925331b81a50061a53526dbcbfe28ca0aae1dfc2b74e0689a494068251f834e54917e9557eb4e00cf52e69a48b998f19 +DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60 +EBUILD ubridge-0.9.18.ebuild 1089 BLAKE2B 26e9f3dde16372a76c98da998844c51dc1adb387c8fad068ac412e1ae37285f438f6b6b1e336bf46857bcb5fcd3c8e97bf0d3dfe4aa7fdb93f461c80f9af1e2f SHA512 d86fba30cb6d18dbc74b2da231c2c89df2b72d5614c3b11554d0d2f47db336a4e8d3cbf5223949df55f123b0392d3388935646149a76ff6beaa286e2c3a82dc3 +MISC metadata.xml 736 BLAKE2B d85c09cd99c67395cbfe18605835f109a5b2db0b29982eed9ed78895f6a754d17737aa947c1d07edf804395dd8e6776963424c07797ee77633782a8d78891f60 SHA512 c744f3033a7af7a876bf4b7d2800638d383c4b42ad07477fa52359f4230b7c99d097c8351ce6816010634fdb57a79314305b2133f25662662fdb7cdcc41ff553 diff --git a/net-misc/ubridge/metadata.xml b/net-misc/ubridge/metadata.xml index fe85611a44da..8a7b8ca468d1 100644 --- a/net-misc/ubridge/metadata.xml +++ b/net-misc/ubridge/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>mmk@levelnine.at</email> + <name>Michael Mair-Keimberger</name> + </maintainer> + <maintainer type="person"> <email>g.djavadyan@gmail.com</email> <name>Garri Djavadyan</name> </maintainer> diff --git a/net-misc/ubridge/ubridge-0.9.14.ebuild b/net-misc/ubridge/ubridge-0.9.14.ebuild deleted file mode 100644 index 4ae6e8746b18..000000000000 --- a/net-misc/ubridge/ubridge-0.9.14.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit fcaps toolchain-funcs user - -DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces" -HOMEPAGE="https://github.com/GNS3/ubridge" -SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - net-libs/libpcap - dev-libs/iniparser:= -" -DEPEND=" - ${RDEPEND} -" - -PATCHES=( "${FILESDIR}"/${P}-respect-flags.patch ) - -pkg_setup() { - enewgroup ubridge -} - -src_configure() { - export SYSTEM_INIPARSER=1 -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - exeinto /usr/bin - exeopts -m 710 -g ubridge - doexe ubridge - dodoc README.rst -} - -pkg_postinst() { - fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/ubridge - - ewarn "NOTE: To read packets from the network interfaces with ubridge as" - ewarn "normal user you have to add trusted users to the ubridge group." -} diff --git a/net-misc/ubridge/ubridge-0.9.16.ebuild b/net-misc/ubridge/ubridge-0.9.18.ebuild index b09d2fdadaab..adfeeba6492c 100644 --- a/net-misc/ubridge/ubridge-0.9.16.ebuild +++ b/net-misc/ubridge/ubridge-0.9.18.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit fcaps toolchain-funcs user +inherit fcaps toolchain-funcs DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces" HOMEPAGE="https://github.com/GNS3/ubridge" @@ -11,21 +11,18 @@ SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" KEYWORDS="~amd64 ~x86" -LICENSE="GPL-3" +LICENSE="GPL-3+" RDEPEND=" - net-libs/libpcap - dev-libs/iniparser:4=" + acct-group/ubridge + dev-libs/iniparser:4= + net-libs/libpcap" DEPEND="${RDEPEND}" # Bugs: https://bugs.gentoo.org/647588 # https://github.com/GNS3/ubridge/issues/60 -PATCHES=( "${FILESDIR}/${P}_add_slotted_iniparser-4.1+_support.patch" ) - -pkg_setup() { - enewgroup ubridge -} +PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" ) src_compile() { emake \ diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest index 329a78482418..2503b7ad0d2a 100644 --- a/net-misc/vde/Manifest +++ b/net-misc/vde/Manifest @@ -6,7 +6,7 @@ AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 EBUILD vde-2.3.2-r4.ebuild 1664 BLAKE2B f8da664dc0bffde29dcd6086a6140fa7d890ac3fe505ee2a1cb7e7508d7f635451e867d60bf5a4c1cbdd7082556e15a198ffaaf434028b1c6a8b2a699590a352 SHA512 516232acd5db7ef34b7a1064870a0ad2797525bda33379abbc11a18a29b99e5f86a0fcf7b22d081a99602f15a0d6e94d3688f61c9578ee50a6796e93decf2a36 -EBUILD vde-2.3.2-r6.ebuild 1493 BLAKE2B 92427dfc6e4944951c9af14da684704e8bfea94ef7aa3c60b129b3436633bf5c3cd8f840b7b739c45945a027ca480ffcbeffab8850a79e2f4c9f09aa2f8ac1cf SHA512 c6a2198e062bd497f51bde152bbdddba8afa888dfea45acfd25dc099884be2bf4ff89851773530fd77e41188df28b51afa70cb272adfb959980c4d6234e6a77b +EBUILD vde-2.3.2-r6.ebuild 1492 BLAKE2B f5f82e24bdbffd3eac3066c2a26657a3f29041e634f9b0132c7d2ee9323536be5e75912716b137f1bdb3dd30bd9a86a32e86089188aacb30e41eea746887c22b SHA512 6b5abf52deb147499c294e58c2f363df0313eaa9a7cb1af97369a5ea557c706a8ed3199bcb3405770918c97765417485f140d3e28292b7f8e6b62c8bef502400 EBUILD vde-2.3.2_p20191011.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee EBUILD vde-9999.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6 diff --git a/net-misc/vde/vde-2.3.2-r6.ebuild b/net-misc/vde/vde-2.3.2-r6.ebuild index 3d99e238fb29..dd3ab5980fea 100644 --- a/net-misc/vde/vde-2.3.2-r6.ebuild +++ b/net-misc/vde/vde-2.3.2-r6.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://virtualsquare.org" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86" IUSE="pcap selinux ssl libressl static-libs" COMMON_DEPS="pcap? ( net-libs/libpcap ) @@ -40,7 +40,7 @@ src_prepare() { src_configure() { econf \ - --disable-python + --disable-python \ $(use_enable pcap) \ $(use_enable ssl cryptcab) \ $(use_enable static-libs static) diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 44c9ad96e437..9561acb63ddb 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,5 +1,5 @@ AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b739143b8a9706d153ba598a1849898151df3482df416075c67efdfbf5adbac4efe3e72d7ff412334dec9647b89cfe1d9a6e SHA512 b7008692ca3a35a49ec206e3314c232b24e26821d280d4346e7a63b8e2d2592614d2b290880379f861bb4f0d97977d0205660d2653b9cce6ac0297c2d224002d DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c -EBUILD wget-1.20.3-r1.ebuild 3215 BLAKE2B 046366c62070b9bfb055fc9b31f1e68817fd34d72f6e1ef60b5810b9d3a0154159a984100b85a7cda4f2dbf6c0d7f7d2e4c423a4742df9c88ca8d3bd396674bd SHA512 20f4632b350d918a04552e92ae61b742d8a99d4c2f5889a8eeb7cd6feb522707b997d5d433e8fcffb40f0851a7e259f704c5ae1aab4a7971c3b3adaa16bf7146 -EBUILD wget-1.20.3-r3.ebuild 3411 BLAKE2B 4aeaafbb078031c212673afd0ab734d0415873ed5fed8d773afcdf468d23b8533e6abcf16bc014eaf6641ae361dd5c0852eedab3759e30e961432983b6796325 SHA512 c777144fce1f8d35b56181830f266222deb372e06109df5ff91052012e9db9cbdcaeeff8637fca2f08cf763911bf8680c46402a3e0cf1c8b7249670d23803582 +EBUILD wget-1.20.3-r1.ebuild 3098 BLAKE2B 00c8bf175191e940c69cdfe2171915ffcb617317b2d6ea87d00b564fc6d350a5d1385ee6ffc2e6f1b8c6d29d38a023c3e5d1712874daf7404b0c20172ec38ee6 SHA512 d06353ccee5862395f1fece9fae3e2b51e3c9907872e58600a872708d9d5cfd7e9d92f233d59c13c6ac183a2a61ed6e7a43ae609ac9a9a3c85af849f10565a37 +EBUILD wget-1.20.3-r3.ebuild 3394 BLAKE2B b43aaf9c21666722c63cd1a9cab0a538cb6b401f43ae9c4e66a18a8f7532f8fd2883edc84f0262e01da256322b8285b6a33756bd95f00903dd1ad80d9a7d21f8 SHA512 66140ed90f1887629e162d37a0871aa1068b9647632c43ae0337d8b6cd107eaa439c2cb59176798046304367ea071212f8c16246dd12acdacce7575806d6824a MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4 diff --git a/net-misc/wget/wget-1.20.3-r1.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild index 21bffdc666e6..d195a6a5b080 100644 --- a/net-misc/wget/wget-1.20.3-r1.ebuild +++ b/net-misc/wget/wget-1.20.3-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux" IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild index b66e2ea1140a..f08c091ddc6c 100644 --- a/net-misc/wget/wget-1.20.3-r3.ebuild +++ b/net-misc/wget/wget-1.20.3-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib" REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" RESTRICT="!test? ( test )" diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index 3e69d2c240a8..7db5db2e41bd 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -6,6 +6,6 @@ DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084 EBUILD whois-5.4.3.ebuild 1573 BLAKE2B fc50ea531b65cef7b4987129c8c5669a417455d50b277a5da11f1c1d418a278e549c2c1a7d958d1c52d4bf6cc33a538f64d53898dca779dc90a6940b44a6cd07 SHA512 e6547e93190db050a60658e057da8a204ab7f441d5a5f9d45145547c60bf21804e63b36b0ec29932873fade1cc048f10c6f0dcb2084574c8bce9c04dbd488a8f EBUILD whois-5.5.5.ebuild 1799 BLAKE2B 88352b97b5f99ec654251f4e44fccc301c922ff3bff5ead97a793187728630d8c5d17a25fb008201407c6c2b35cc545772ed60ee73c7cb0676ca195bc8d9e57a SHA512 b5668faf787c2bf8f6786dab4a075e10a186c72e219f43cac4839bed67a88d192137091516495725fc30242e1a240d13f5dc93712e7c40c21846cd9b790dddda -EBUILD whois-5.5.6-r1.ebuild 1936 BLAKE2B 79351dca4c817dd71aa4e86d76b24d24fe860f8bc216c3b4a6ec4efdba21332459b116c920fc336e7c4d22ab4cbc1f145bf94c2f22949db0bf2f75436ff6c461 SHA512 b77b6459cf80a1c854bd145eb6669b462e12ad078d7cde781944ec3f120be79cb383c743094e4fe813a092611e37ca68f76813f994eb5d566079efc2f22cfaa4 +EBUILD whois-5.5.6-r1.ebuild 1933 BLAKE2B f484171828eaafa8c7d380c800ffaeae33a4bba5c832f7dedbbdaa80bb60ed93cc68c34fa00afaaf1a94c9aabca64251bdfb474d0150d22a04dbb01a46dcbf7a SHA512 5fb403c5c6a379f6014d15c6aa8e6b3dbe0acbabfde65a8d9311f8dbe0c10d6c16908cb20034ed859015b68ecd8b1b31a2fa933a78acba7bf25ef0d5a3f48165 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e diff --git a/net-misc/whois/whois-5.5.6-r1.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild index 33c2eb43e69e..d562bf425991 100644 --- a/net-misc/whois/whois-5.5.6-r1.ebuild +++ b/net-misc/whois/whois-5.5.6-r1.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then else #SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz" SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi LICENSE="GPL-2" SLOT="0" diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest index 9a806137064b..2be0f36ed207 100644 --- a/net-misc/wol/Manifest +++ b/net-misc/wol/Manifest @@ -1,3 +1,3 @@ DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3 -EBUILD wol-0.7.1-r2.ebuild 469 BLAKE2B 3dbde4bf661bd025c221c88bbe1a6708472a616c257625ff108516322c00a33521e4bada1041fb9e1c27038956a89ed66e41495116b7737d344627dc1ede0e66 SHA512 660229ad565faed71bc2142bfa5b78bf2053b399fd7883ce3e26c274b7ea66bf206b9dea2719ac7af05f73c96990972db21443e72cb63394f641a1d4e27d4d41 +EBUILD wol-0.7.1-r2.ebuild 537 BLAKE2B 2779a8f0998d6484990426b3d134994d048bbe3bd6b95974f447bc1de40c5b8de697c90e0b3b0c64422dbce34b8188dd2069eb5f6064378e19f631bc0d68634d SHA512 a604ab3610cd7796a6b93a680d977af465c57a749a45372a06ea6a5e7bf68bc0ad2a37fdec57c742b13dd2bcd762e6894bad263a0375342a88cd0a2dc35b287f MISC metadata.xml 616 BLAKE2B 5beea9884b74086c02e1cf37e08157dee574c98c56f06371e96132a31747be644761601429ff79211eec98004dd468b5e51e7a71c480b0d6e3e43d3e5941dfa3 SHA512 ba5865dcd92e68b01a21d126aadb530d936639bb391b959c683e83daefcc671201b772a713fc0a6397eb892558c8e9691700ee97955b3992fd64ecf1cdc9c240 diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild index 27e01462efda..8ee1f1db4070 100644 --- a/net-misc/wol/wol-0.7.1-r2.ebuild +++ b/net-misc/wol/wol-0.7.1-r2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs + DESCRIPTION="Implements Wake On LAN (Magic Paket) functionality in a small program" HOMEPAGE="http://ahh.sourceforge.net/wol/" SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz" @@ -20,3 +22,7 @@ src_configure() { econf ${myeconfargs[@]} } + +src_compile() { + emake AR="$(tc-getAR)" +} diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest index 9177aeb52bed..b600625bf020 100644 --- a/net-misc/x2goclient/Manifest +++ b/net-misc/x2goclient/Manifest @@ -1,8 +1,3 @@ -AUX x2goclient-4.1.2.1-gentoo-17.1.patch 996 BLAKE2B afc5538457142b93deb80832bbfe37352844289304ff07d2bbdb1251b082e471ddba787db5267109a594dd101e936a1552a20d75d8a7e27fc125f4c835ecc54f SHA512 a76e819aae1b8150bf219f58a29c24979bc11c6d49346c3a486d16573819d3663e93e5ef3070c9389a9d0c8c76bcdc4d904cfdf669bdd25176d0c365b2b5b502 -AUX x2goclient-4.1.2.1-qt511.patch 678 BLAKE2B d4c6de81d060d415030c7b160eaca2d72fc4c0fbcb4dc4428471069fbf6c6c1b8b918b382efd5b852cbd0accd4a2cd7c76b7b3a957a271bb46fd7b770fca74c6 SHA512 4c2571dfe286dc5e632a278c683df8ed3d5bb7107f9342ba843ac42b36d73df24a140927b0d147484c4e69668a85ccc309dd6a32627a9e0ba82493e0a9529a55 -DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b179cb69bf28c082ef1d8122d4c32b79dd7bcb685e846a62481a4a3334eb902a3fe84aa8422099a5088559a3b548fbe20 SHA512 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369 DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d -EBUILD x2goclient-4.1.2.1-r1.ebuild 1457 BLAKE2B 7d246b2e56ff6d84ddca5d1376d9c95399ebd96ac182b0f4b5969d5006a817f872d3984baf30b595bcf59a11509e330e7d4eb850ff9cc27de75352813d625ee9 SHA512 d31d2a343c5cdd006bf76102f8a9bdd9ed080f13c86ec90807024fe4216155966875d787e0df06b22b3e70db4e0c342fecebbde5c81704ae557c7dc6d0d501d0 -EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94 EBUILD x2goclient-4.1.2.2.ebuild 1275 BLAKE2B 9cf9d6d7ccc697c6a52ab63ab2f519ed7ec2c2b2f3fcd8e54f9855fab786535b821dc17958a42a74a3a7d897e47e53c316336da136dc571916da64f05644b568 SHA512 1e537a1e4205b5ecf1af941758cf1b93bf45a7b9f7187e875515b7bf51d039c6b274bd4dc1b81f786aef462596dc8283d46c2350b7884b771fd529465e7fe6a1 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721 diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch deleted file mode 100644 index b9a63264be99..000000000000 --- a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=blobdiff_plain;f=src%2Fonmainwindow.cpp;h=cd97e6c7f28a6ab4e9495f7a9ba4b447f2b47a2f;hp=cb6bb72918cdc1d54f57cbf0b426adb03a6f4dc8;hb=567223f;hpb=fc5c93518b9023e2499a945740cd6559233ed301 - -diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp -index cb6bb72..cd97e6c 100644 ---- a/src/onmainwindow.cpp -+++ b/src/onmainwindow.cpp -@@ -10754,6 +10754,7 @@ void ONMainWindow::generateEtcFiles() - << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */ - << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */ - << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */ -+ << "/usr/lib64/misc" /* Gentoo *64 with 17.1 profile - has no lib compat-symlink. */ - << "/usr/lib/misc" /* Gentoo */ - << "/run/current-system/sw/bin" /* NixOS */ - << "/usr/libexec"; /* Slackware, OS X */ diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch deleted file mode 100644 index 2329813defd8..000000000000 --- a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Mihai Moldovan <ionic@ionic.de> -Date: Thu, 5 Jul 2018 06:52:18 +0000 (+0200) -Subject: src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+. -X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=ce14cfda34175b6456a8cc7d1e336dce2b0b0682 - -src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+. ---- - -diff --git a/src/printwidget.cpp b/src/printwidget.cpp -index 58a8af7..131d340 100644 ---- a/src/printwidget.cpp -+++ b/src/printwidget.cpp -@@ -23,6 +23,7 @@ - #include "x2gosettings.h" - #include "x2gologdebug.h" - #include <QDir> -+#include <QButtonGroup> - #ifdef Q_OS_WIN - #include "wapi.h" - #endif diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild deleted file mode 100644 index 911efdf18aca..000000000000 --- a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop gnome2-utils qmake-utils - -DESCRIPTION="The X2Go Qt client" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ldap" - -COMMON_DEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - >=net-libs/libssh-0.7.5-r2 - net-print/cups - x11-libs/libXpm - ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${COMMON_DEPEND} - net-misc/nx" - -CLIENT_BUILD="${WORKDIR}"/${P}.client_build -PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build - -PATCHES=( - "${FILESDIR}/${P}-qt511.patch" - "${FILESDIR}/${P}-gentoo-17.1.patch" -) - -src_prepare() { - default - - if ! use ldap; then - sed -e "s/-lldap//" -i x2goclient.pro || die - sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die - fi -} - -src_configure() { - eqmake5 "${S}"/x2goclient.pro -} - -src_install() { - dobin ${PN} - - local size - for size in 16 32 48 64 128 ; do - doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png - done - newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg - - insinto /usr/share/pixmaps - doins res/img/icons/${PN}.xpm - - domenu desktop/${PN}.desktop - doman man/man?/* -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild deleted file mode 100644 index 9912ac58712b..000000000000 --- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop gnome2-utils qmake-utils - -DESCRIPTION="The X2Go Qt client" -HOMEPAGE="http://www.x2go.org" -SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ldap" - -COMMON_DEPEND="dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - >=net-libs/libssh-0.7.5-r2 - net-print/cups - x11-libs/libXpm - ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5" -RDEPEND="${COMMON_DEPEND} - net-misc/nx" - -CLIENT_BUILD="${WORKDIR}"/${P}.client_build -PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build - -PATCHES=( - "${FILESDIR}/${P}-qt511.patch" -) - -src_prepare() { - default - - if ! use ldap; then - sed -e "s/-lldap//" -i x2goclient.pro || die - sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die - fi -} - -src_configure() { - eqmake5 "${S}"/x2goclient.pro -} - -src_install() { - dobin ${PN} - - local size - for size in 16 32 48 64 128 ; do - doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png - done - newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg - - insinto /usr/share/pixmaps - doins res/img/icons/${PN}.xpm - - domenu desktop/${PN}.desktop - doman man/man?/* -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest index c23a809834ec..f5df245bc5c8 100644 --- a/net-misc/yandex-disk/Manifest +++ b/net-misc/yandex-disk/Manifest @@ -1,4 +1,4 @@ -DIST yandex-disk-0.1.5.978-1.fedora.i386.rpm 4353188 BLAKE2B 5d82bf72cf670754c6889e1b7f4c99c47426fe938f7131381bf06d1bb6d5e98d403d746b336624f958a75839fb0c73982b14ba86d4d3db581286ace31fac48f7 SHA512 59008f42463185fab2aed221b44283e57c279ef7fd0966732dc3b6a3f474104f2ca676d77e7d958f53bff38aac9c0f7ea82b25202fd9da5f0de62bb56a983319 -DIST yandex-disk-0.1.5.978-1.fedora.x86_64.rpm 4534132 BLAKE2B 1e39bf6a9dab9c6d7bf1960214c23a9196347d7d757e014b22cd37a598f479e2576346ad1d38bc8986f7a1b30529db0e0e58b0fc20f51d4abcbdac028759678c SHA512 d4f22bf008767289abf95237aa86ae27b33b99c62ba89381c4ed73a510d8096c169c1c215274133cc7fdf885fb7d629e758cea5925f4afc5acf7b6d688bf0078 -EBUILD yandex-disk-0.1.5.978_p1.ebuild 1026 BLAKE2B 0b1ce41863ca7b8604cb9078210124b13075288bd97016d3edd85704418fcbad29f417cf9e82764cd43faa3d5be8059d3b12e6024bccdfdee22a608de979ef48 SHA512 1b1557fc9c954ee30060fe8136a3bbcc8e7e6c0b9e1994e4d386baea6abc55bd3c2080edea315baba2df3078d625c17c6e562067d255a53bc6cd791ba754bd3f -MISC metadata.xml 359 BLAKE2B f42092316fc9b64d257cbcf253d696471614f6a108d50cde587dd22753cc69209bc9033802856d32b4c9dffac4bc4338acbdaee27602555e218c95b718e7196e SHA512 bfdfbc956a34caec3772c6b094fca9512b87c17e475e3b4d0329368aa2a060efd72d152e3920abb7763ffbb9b5508f6396e9769a8f208ffaab928e984ea99369 +DIST yandex-disk-0.1.5.1039-1.fedora.i386.rpm 4556176 BLAKE2B 5ade043c21a13e678ca11b3074fb1392b99f461ef5a7bd7205b3d6ea984b20dec0ba086adb8b881eaf52888f04cf371dd63ce73432c3f82f31c895e03f31f073 SHA512 3c323e6aaa5fa669ef7efa80e4b899cd732a6b29235d81f635dce67d0ff59dafd01da8d9ea7b040242882f0e5e153f7cd623f4b993dfc390bc0a18d2811c1719 +DIST yandex-disk-0.1.5.1039-1.fedora.x86_64.rpm 4743384 BLAKE2B 626a7e921567640b88d33fd426cc230bb92846a252b0960c51da9367f300b8622104db14c8788749e0f5cb484dffd9c9407994568449be769c24d2730cd0936a SHA512 9128d59f426de44b8c953d61ad07ffe886b5e864c5f20ba7ab1a69a47ab3269e5d4e39f4b92675f0ccaea43db1711184892a5e3178694bc453bc96e932045fa9 +EBUILD yandex-disk-0.1.5.1039_p1.ebuild 1153 BLAKE2B da725706243e2c36ec30aa864bf2526a0c49d6834ee9b497631c3ae0135e5fd8f8123b9672e0fa9cb6ca7d88ba243d8e099141c45e4a148fb51c465ac1007ecc SHA512 e416818e1425d5c406dde505bab8aafe5e416cc4f7f0154064c122245b70d79e24671d7afdc6a36d6d8460fe4444b1e66d78addb632114e6237966194e0aa000 +MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/net-misc/yandex-disk/metadata.xml b/net-misc/yandex-disk/metadata.xml index da0b2362a32c..5b159fbcadd1 100644 --- a/net-misc/yandex-disk/metadata.xml +++ b/net-misc/yandex-disk/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>blueboar@gentoo.org</email> - <name>Vladimir Romanov</name> - </maintainer> - <maintainer type="person"> <email>pinkbyte@gentoo.org</email> <name>Sergey Popov</name> </maintainer> diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild index c2f03cb326ab..8f1d7906f160 100644 --- a/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild +++ b/net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit bash-completion-r1 eutils rpm @@ -10,15 +10,15 @@ MY_P="${PN}-${PV/_p/-}" DESCRIPTION="CLI to access Yandex Disk file storage service" HOMEPAGE="https://disk.yandex.ru" SRC_URI=" - amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm ) - x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm ) + amd64? ( https://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm ) + x86? ( https://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm ) " LICENSE="YDSLA" SLOT="0" KEYWORDS="-* amd64 x86" -DEPEND="" +DEPEND="app-arch/gzip" RDEPEND="sys-libs/zlib" S="${WORKDIR}" @@ -33,6 +33,9 @@ src_prepare() { -e '/^complete/s/-X //' \ etc/bash_completion.d/yandex-disk-completion.bash || die + # Uncompress man pages to prevent QA warnings, bug #731684 + find usr/share/man -type f -name *.gz | xargs gunzip + eapply_user } diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 96bb3992bfa0..b49bd3216b23 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,4 +1,4 @@ -DIST youtube-dl-2020.06.16.1.tar.gz 3177873 BLAKE2B 8bf2df25b416c4a48b2b4a14466f15f99b1bbe0b4900c18e30bc3edab66a54b036f95025218cb584f820f3c45b2ab2e805f21e2d6548078d49c6a122fb52716d SHA512 2f0c01cd1a52293afd8c4fddc20b6f7baca94903fbe852769ad1d25740bd87e38d42ee4a275c2e3d611c639c432f6245d27f361471c6b566da03677384a04e54 -EBUILD youtube-dl-2020.06.16.1.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c +DIST youtube-dl-2020.07.28.tar.gz 3179686 BLAKE2B 0f4a611a8d455a79193711746fee592995d1965128a866fc7f7f8833bc76a09b2197c15625399ea5f44f5de5695ad5e40e4c50bb11ddc2ed88ad5df44a9db93b SHA512 be18cd53577a1e750a9610d481225b5683414ee4a095aa90b1a9ef150e9009bec4c2188f19f13505c88ac0179872751a07f5fb4b591beca3cefd11ccf071132d +EBUILD youtube-dl-2020.07.28.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c EBUILD youtube-dl-99999999.ebuild 2068 BLAKE2B 93977d0be35ac43d7ba1cea51a20364effe0c87a11684e02a13b70fd682d8199fff2652bd86767b3ea4a148603ee93ecd7837e7fcc54139de5ae59cdc510c1e6 SHA512 429c926a0fce1cc0ab8cabdae8904ab0fcd99399c7b6e924d7034ad07f6d038489f44ebb9ac0d69cc270a023c37d0a2845fa22deb8bd94a4d6d9237dd1114043 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild b/net-misc/youtube-dl/youtube-dl-2020.07.28.ebuild index 9dc88dfb1591..9dc88dfb1591 100644 --- a/net-misc/youtube-dl/youtube-dl-2020.06.16.1.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2020.07.28.ebuild |