diff options
Diffstat (limited to 'net-misc')
235 files changed, 5540 insertions, 2611 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex 41833f4a0c47..f193670782f9 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest index b61ab9d1faad..cfa7db143f3f 100644 --- a/net-misc/asterisk-moh-opsound/Manifest +++ b/net-misc/asterisk-moh-opsound/Manifest @@ -7,5 +7,5 @@ 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 875 BLAKE2B 7d1be4d71c2e2de0c2ccc89eff3a78b37ce176c4e92b8b60ae2a255c92336c5dc15dcabf541532dfda513fdcccb8b082fa3babfdbb552927edd540f1e5555ce5 SHA512 079ec4e60154094cccbf37736fd7fefec87269315bdd81a81bf7bb6d0e2ae8fb0fb6d41905a133f0f47414981e60dd934be7e9c8341de1cf356a55fb34e9f9c1 +EBUILD asterisk-moh-opsound-2.03-r1.ebuild 846 BLAKE2B dded50e0f9a9a78d76fc0ac2ba3236ba6fddb1400759e684fe1b069d36244060b0f9d1ccc74c73ca98489de0747e6efbec479b38cbbf708c738a3f485339fa05 SHA512 383399155188ec6e8c3f229bef5ff253258b35b312b76b437b97556314f8711ab5bde07c22ad05bc364a08b0308cccc7ed2bb01d891ac6a370a5fdd82b71dc38 MISC metadata.xml 1083 BLAKE2B aab36ea1ec791048e112e2a755f9e9eb84ec2f0e67dbc0b22ccca7b560115a3d997b1dc9cb9d356df1017b7fc2b3784e60e3323f4bab29248fc358796ecedc77 SHA512 0792755550da354a46d34026615a3f777798f2fd86c944ee0d6b5cebd4125713618fdfec527cedab469795cf22f3357234b172a63245e1af03bc40c3dd83fff3 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 1e55dbf25b31..9c5c1bcc2ef4 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -36,7 +36,6 @@ src_install() { diropts -m 0755 -o root -g root insopts -m 0644 -o root -g root - dodir /var/lib/asterisk/moh insinto /var/lib/asterisk/moh doins -r . } diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest index 24a52a7cef6f..120e936952c3 100644 --- a/net-misc/asterisk/Manifest +++ b/net-misc/asterisk/Manifest @@ -10,24 +10,22 @@ AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3 AUX asterisk.tmpfiles-13.38.3-r2.conf 39 BLAKE2B 5b38f28ce1a22fc388ba5a68a71a3bff2ff02d37c24cc5f13e37bae603eeec82def2f5f62c2d1dbe012ef24c4e1c9724e684f860d32393d777b5f38aab9a08d7 SHA512 a8f467f19f57268aa860b4a1c1e9655e883c277dc4d6c1d109a02f4702b07c16c5fca1e6802fcc5d3fed31177cdac42407f4771bf83b95653fbd185fcb843ffd AUX asterisk.tmpfiles-16.22.0-18.8.0.conf 84 BLAKE2B 133761739570a08bebb88059df1a870ddaef194bd1c5a1a4d4626d3791e3cb664b03ff51260892167a22c3cfca2caa02d162e7476070ec1374a92ef24ec799dc SHA512 680a4478d3a501c26fa19e29fad18389e7e02f04c8b9a676ae0f192fa6afbed95a826b74696c6c5459aba5aba6a16c57df8a9c5ff486e9dc8f1cbd01185e9320 -AUX asterisk.tmpfiles3.conf 88 BLAKE2B 826beba7712e4d096c5506fed353a1a21c89b4acbc6b6ae99f60fbc7e338a331056ec145bd885dd23b7058f4bdf3109d68fddff715ae32e9ec0fc88ce68bef56 SHA512 992902fd01dfd03a2d77bf8a6c7b3adbdcd769478cf0bfa019632515107222aa59b12be10f5dfd26b4e18651e51b81939f1321ae29531dda0f3a623306e6a983 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5 AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa353dcff2d8c239cb203da289a7af91c083f4b89350d64bc2e87b1d7422266207605997badfab00ea24fc SHA512 4b4402ce62527084d0f82c5ad975d6b85276bb9c1e97d6f405737c6eee3c15f45e1b48f149d508c4f5cd70dd23a5e9be3ebd673047f80f4dfcda4913c9b6b287 AUX initd-13.38.3-r2 9933 BLAKE2B fffa5c97efc3691570500960cb01e86e0003950b93c67042a78342d2931a36198218f67de2d38a9f5ee5f2145c2712aa448b38710d9548cc3869ba9540c52565 SHA512 2bddbf10fcc39bbaaaadbbccdce9219cfef63807db553fa4923e558589985edbf83495fc94564b4a10d20c405140c6e8d6310e12a88eb350056ce52caf7dff88 -AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7 AUX initd-16.22.0-18.8.0 9974 BLAKE2B 29c3d51fb9935267061f33d5a5763dc07fdade2301f9f6c0b2b40cf866dd3673714e52e59b442c688e5c02f883718ed86ca227f6ba2fbe23e3919d23558905ed SHA512 9182c1385f404c3a4b7d3b72d3f03d4e34d3bed38378639a18f624f6a5cb95c451e7712588ee163ce8852b5eae1df01ff258bdb77cfecbe8130752f267079d96 DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895 -DIST asterisk-16.20.0.tar.gz 27888074 BLAKE2B 74f7812db787e5dcb041850fc7e80229e05ef0849cf373be29f9a3ac2eb0f2244fc6f2bd2a3f411c4d37d968184dfbc140e55ad62de53e6beb0b2340179b831c SHA512 0e270c2d00eda1aea3135eba427a77ac2abe66a31c868cf700d5cc26bde65fded6f2191d5e4af361b2e055ae04f2943611ca1fa19815a4a690076a83fb899148 DIST asterisk-16.22.0.tar.gz 27925083 BLAKE2B ce700f8924fb2c7c8fc521879c0768595eb7462bb3aa78dd8b64c8a268b357e522ece17c6c4a02a4e17c16bad5141d5c2c15b602d335567be5a3df49f67300ca SHA512 7032da647f4063320fb2ea9c3cd7b0079fbb907e5c8f9d5cdc4197c82d07c99c75bfdcace5c74a593573cd0d9a1b9eb73b2030dc0b13604abb481a311a742173 DIST asterisk-16.23.0.tar.gz 27960909 BLAKE2B 60aa12e41c199da7c052555f5716fd7325de66d0821c8f285635c8ad01435a182c670b12c9d3959ce8206b1bad255e61eeea199bf23b9dd49915da84487e2ce2 SHA512 d9f6cc083afb858ce48b090bea6a8479679ff840eb35dbc6af7d88ded17539c6e906547a7d936de31b3a50d692df1ccce2fe40b81bba1dc6a82a78c94e1198c4 -DIST asterisk-18.6.0.tar.gz 27970531 BLAKE2B a2eaecc962b236e6e455b8d305c05f33fab8e4d6c63eae1506b8354710d6e3e0e3c6da59600555d880520bb58a13950f830057ac03bc82628ab27b2627de52c9 SHA512 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590 +DIST asterisk-16.24.0.tar.gz 27987904 BLAKE2B 2a179366d3853afd6528b7b61c33b6683e924ae62bb4cbfd04b3e6717b4d73345b893632164396a5587d633d60338615f69a02d1f8b7f7ac3903131e209825ea SHA512 0c770264fad5a5f4c8cc6572b524349337635f0a8def26391897776d7ba4ec8f0cf595f588abc75f9f37ba941a56b7d3704b3ef3ddb4b67d3e4e341992e8f815 +DIST asterisk-18.10.0.tar.gz 28071071 BLAKE2B 750cebfdb8ae0485e29b9b92c652e7e1aaea6701e2dd14679b271e22360aac5a6aa5f7570c7a8255999c60cebcf9fae118a6e949ee2413adc250fd47ad214ef1 SHA512 d0746431d87d7c5ce0b76b935cf144ea6a8f759f0dbc012f9a4d7a838ac8f811c3ffde539de5f44d4298c752e3a3242e00c9cf02824207c09c72f90f58898d2e DIST asterisk-18.8.0.tar.gz 28007752 BLAKE2B d5feb2a03003869ee304cd38bc3abcd77a13614c4f1f0a871d517c972f661c17de3da7f452345aaa11e23526a612c1805325ac5a3e902fea1070f63c993ef3fa SHA512 aa06077c6e33e35c35bbaf7dcee13782197f2d9f61e159741ade20050a7bd0dd9a7f6a69d539ee3789af950e8c03518d6186abc99d93ace38dd7e9a1e5dcd337 DIST asterisk-18.9.0.tar.gz 28045278 BLAKE2B 776be9ee6481dbaf38ff617dc5cc2525b226d57fd93a7ec180c20795af3a7905c5239b1e452628cca463f9d8e077ead794afde6425d39043eb4c3dda3ceba7a6 SHA512 514f806ac93c2975101133e897c20e4483ad97141b125de5b6fcb96b8acd3248bd0d4fc638381fe9e9be7b504a35ddae24d8437c33ed10c88a37565577af52b6 EBUILD asterisk-13.38.3-r2.ebuild 10884 BLAKE2B a5d6ad2195ad4375d43cc95ef76fdfd5e1ebb075c1907cb320ad98de9221f32e2ef6754cef38fa0f9633995ce58b506a4293e84ef085d87803f6eeb93f7ecdef SHA512 2abb7f02954fb6039c4cb4b71db6ed09ac6008273c084db47162db880a13a504cc4f1d293c97770b7f363852c159db9e4f62f54a91c23cb40f7f4244399b056c -EBUILD asterisk-16.20.0-r1.ebuild 11250 BLAKE2B c187f9a9ace7b0b27cf7f435a821be029a958a3b223c9e57dc37dc2aafdfd10cac7c401726bd3afdc25dc97692b061ec96429d390321a812d7f1c9a9510bbf90 SHA512 3397e1de8591eb3ce5c83f8d123369c0bffe96e7b33c318508ae1b1b5cbdbc552bc5887c1a6f24aa161750f81d682e0e832d5ad09b78f570c850d35278bd879e EBUILD asterisk-16.22.0.ebuild 11298 BLAKE2B 897154c0fb088236ceafe0b431a71ba9cef7ba47cc0accf90e54308ae50478e56419ed7126d1805c30605e9eded6790d98d6d03fc06e8a4b6f942ef7d5e873a5 SHA512 515a0750df9e35361516ca076632a39b33749aeb2d88e629229f6a44980a8f58e5d46fd861f8491e5f4b0a1561480afa14bdb3e2ed0527350e27532add0620af EBUILD asterisk-16.23.0.ebuild 11300 BLAKE2B a29cd3eac10268e130d109abf65330057b3bab2a145eaa0f90e43c099374cc6f4e8f3e91af996bc358d020d04aeb75ee28eeb5c580a9e3e29b5e8c1062e0f6ba SHA512 07e6914a1a086e2f12e3cc315657781752d59308ecab43d50947a6fe010953da51fa12dc3a932c131a34b804577ccd61f0c881b4baf40a9fd99af5164283506a -EBUILD asterisk-18.6.0-r1.ebuild 11223 BLAKE2B 99eca23e3eaa2caf971038282d32de5a944f5b62f229b23891a19cdada87a905ae88a9b2440625e7380779cc5a6224407c5e1a28ba1650f051c3151a8c00729b SHA512 a78276a1977eedcaf244f70cf4fc3499d0ba8b3fe07fc0ae1c1e3530ad9de2d24ea752a02829bae81e69fef139263b48767bc029f7db0eec818e334b4287b9e4 +EBUILD asterisk-16.24.0.ebuild 11300 BLAKE2B aa4fc88ff430c1825c87f862dcffac2860d11cb0b9b10453767cbdca89fb25300906873bf10d68d9e08e29f2d82686a3289c30e779aab6a367462f139b0030f4 SHA512 5cd3c85e0c67432dc9d6c0876c97b50bc1196b58ed32e6d60693b639087d4cd1467d5de6b9d8ac8bc8d4ff3aae676eb52760c66955e2a57a177a3a41f84f8d4f +EBUILD asterisk-18.10.0.ebuild 11273 BLAKE2B 2c077b366a55d89e52e166fdb6a4ecedd97db8c1c47717c2d5d5148149caebd44b00039cea45b156d682a2c380d3c800add4be18285b4959eb56f7b4fe1fbea9 SHA512 eaa21aec9ece1ba7e4d60994ef3193c2594a5721a08c0224329b1a1b5b046e87d386d4b08295ae727236292bac02f44d6effdf7fb2bae71888de9d0072b1e38f EBUILD asterisk-18.8.0.ebuild 11271 BLAKE2B 96fd6cf1dfaf6162e905d8cc38646722e8a9944cf1d475f4d6a3a8e7156b62112dcd28356915a551180759660c45075b43488266f5f10709ed8287d73c32a497 SHA512 64cf9d20655eea8b7a3c508f49f1aaf845a923b5a4fe6578777c5e9d76d578d70b170c6215defcfe47b4ceeac9ed002b2e772d5e73ab89b40ae05c2b27211ab3 EBUILD asterisk-18.9.0.ebuild 11273 BLAKE2B 7846bc1f453f77ca7bcee275508008a8d9b93f542998bdccbff97ad67b961b62fc122a0613afc3d0f0799170750bd681f78634652b122d1211138a069c431a23 SHA512 1e5d88bbb7555cb75518631f8190fb133d6c638a55338f7b06faad3f786de127502b5e8952a1c2951059b45e9821c8bad651900faba0769c0b08e2534782ab4e MISC metadata.xml 1483 BLAKE2B 00aa83418aa9cf46f9ac04f2281157abd02f6e0d77b18e10ec0e516a116d92c87b6bb70a4c595dd5e2553f522f8ebd4ef6b102f30cd02fe8ce261f3fa049ddd0 SHA512 65f32411b7a6ed223a9e12d9f43fc975de7fa00c42e93b6302dbcf50a44c4805d1a116ddea0749d17e28dfc0fe6897ecccd0873a76e6dbf4f9580e2ff6df2149 diff --git a/net-misc/asterisk/asterisk-16.20.0-r1.ebuild b/net-misc/asterisk/asterisk-16.24.0.ebuild index a1a9536e12ed..c50425f63e31 100644 --- a/net-misc/asterisk/asterisk-16.20.0-r1.ebuild +++ b/net-misc/asterisk/asterisk-16.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/" SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE_VOICEMAIL_STORAGE=( +voicemail_storage_file @@ -109,6 +109,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "ASTCACHEDIR=/var/cache/asterisk" "OPTIMIZE=" "DEBUG=" @@ -301,11 +302,11 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk + newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf systemd_install_serviced "${FILESDIR}"/asterisk.service.conf # Reset diropts else dodoc uses it for doc installations. diff --git a/net-misc/asterisk/asterisk-18.6.0-r1.ebuild b/net-misc/asterisk/asterisk-18.10.0.ebuild index 22c24bf0800f..9b806b3fb026 100644 --- a/net-misc/asterisk/asterisk-18.6.0-r1.ebuild +++ b/net-misc/asterisk/asterisk-18.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/" SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE_VOICEMAIL_STORAGE=( voicemail_storage_odbc @@ -107,6 +107,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+" _make_args=( "NOISY_BUILD=yes" "ASTDBDIR=\$(ASTDATADIR)/astdb" + "ASTVARRUNDIR=/run/asterisk" "ASTCACHEDIR=/var/cache/asterisk" "OPTIMIZE=" "DEBUG=" @@ -300,11 +301,11 @@ src_install() { diropts -m 0750 -o asterisk -g asterisk keepdir /var/log/asterisk/{cdr-csv,cdr-custom} - newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk + newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk systemd_dounit "${FILESDIR}"/asterisk.service - newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf + newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf systemd_install_serviced "${FILESDIR}"/asterisk.service.conf # Reset diropts else dodoc uses it for doc installations. diff --git a/net-misc/asterisk/files/asterisk.tmpfiles3.conf b/net-misc/asterisk/files/asterisk.tmpfiles3.conf deleted file mode 100644 index 7af4ed720d43..000000000000 --- a/net-misc/asterisk/files/asterisk.tmpfiles3.conf +++ /dev/null @@ -1,2 +0,0 @@ -d /var/run/asterisk 0750 asterisk asterisk -d /var/cache/asterisk 0750 asterisk asterisk diff --git a/net-misc/asterisk/files/initd-16.16.2-r1 b/net-misc/asterisk/files/initd-16.16.2-r1 deleted file mode 100644 index bdd979a56978..000000000000 --- a/net-misc/asterisk/files/initd-16.16.2-r1 +++ /dev/null @@ -1,363 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# 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). -setup_svc_variables() -{ - local t - - ast_instancename=asterisk - ast_rundir=/var/run/${RC_SVCNAME} - ast_logdir=/var/log/${RC_SVCNAME} - ast_confdir=/etc/${RC_SVCNAME/.//} - ast_cachedir=/var/cache/asterisk - ast_stop_timeout=120 - ast_stop_method="gracefully" - - 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_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}" - [ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}" - [ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}" - case "${ASTERISK_STOP_METHOD}" in - gracefully|when\ convenient|now) - ast_stop_method="${ASTERISK_STOP_METHOD}" - ;; - esac - ast_group= - if [ -n "${ASTERISK_USER}" ]; then - ast_user="${ASTERISK_USER%%:*}" - if [ "${ast_user}" != "${ASTERISK_USER}" ]; then - ast_group="${ASTERISK_USER#*:}" - ast_group="${ast_group%%:*}" - fi - fi - - [ -z "${ast_user}" ] && ast_user=asterisk - - ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')" - - 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} >/dev/null 2>&1 - 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-" - yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-" - CORE_TARGET+="$(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... - - # ensure that ASTERISK_RESTART_DELAY is integer. - 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 yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then - einfo "Starting Asterisk console : Yes" - 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 [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then - eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist." - return 1 - fi - [ -n "${ast_group}" ] && 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}" - checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}" - - einfo "Starting asterisk as : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}" - asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null & - 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 ] && yesno "${ASTERISK_WAITBOOTED}"; then - if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then - # asterisk can crash during startup ... - ebegin "Waiting for ctl file to appear" - while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do - sleep 1 - done - is_running - result=$? - eend $result - fi - if [ $result -eq 0 ]; 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 - 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 ${ast_instancename} 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 ${ast_instancename} 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 ${ast_instancename} PBX" - start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid - eend $? -} - -stop() { - setup_svc_variables || return $? - - wrapperstop - - if ! is_running; then - eerror "${ast_instancename} is not running!" - return 0 - fi - - ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null - # Now we have to wait until asterisk has _really_ stopped. - sleep 1 - if is_running; then - einfon "Waiting for ${ast_instancename} to shutdown ." - local cnt=0 - while is_running; do - cnt="$(expr $cnt + 2)" - if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then - echo - eend 1 "Failed waiting for ${ast_instancename} to stop." - return 1 - fi - sleep 2 - echo -n "." - done - echo - fi - eend 0 -} - -reload() { - setup_svc_variables || return $? - - if is_running; then - ebegin "Forcing ${ast_instancename} to reload configuration" - /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null - eend $? - else - eerror "${ast_instancename} is not running!" - fi -} diff --git a/net-misc/balance/Manifest b/net-misc/balance/Manifest index 63c5fd09b09a..6260bdd2612a 100644 --- a/net-misc/balance/Manifest +++ b/net-misc/balance/Manifest @@ -1,4 +1,5 @@ AUX balance-3.57-Makefile.patch 1349 BLAKE2B 9bf514589580af60165e4edf0558bd2924bdb13342e9e85c45fb07fe1ab988ae9660f10a3e46a999b16950b4587db68c94e020f22af20029faaa251f2b9b757c SHA512 95d98992206d21784ed53874a55c0e1bc8b0b8ad918d7daefe89f118e200d62d1bb445b6371cbca2418b2f362c57a67fc929aaba2256f502211cda96a89f443a DIST balance-3.57.tar.gz 35547 BLAKE2B 293861bdfbeb7d768c9ccc2e6373cee6000c1b048eed6d741b3e340382db15c5b012e228af47632cf6aed439caf200b62258dab9d0f4a6e64de0c299bd0588d4 SHA512 191195e2aa62c867d85085f273db911e8957c3eea7bed8e58abc29e125a0b0a4487048c7db5857e32f54545de1f81f8148b174225aaf8cf1e3a66e4b040748b4 +EBUILD balance-3.57-r1.ebuild 773 BLAKE2B 00c698f6536ab12f327a21a34e3c9e5b517288884e99208716a33d6d6cfbb66765995c17e28756e318aafa71e2b69b0fff1a70817df14717d72a91ab370e115d SHA512 559194a7753723bfa3e42ce6de4566254025dded3112aa5416643f4962985bc66e1a5cef0b1a18829dd6c103f294e80ca0f29b8c1f2bfc1b61a305c0e4aa1c43 EBUILD balance-3.57.ebuild 549 BLAKE2B 486395c7e1cc58ff632093640d4b9c6084c3a0611f7f5c67fab260adf5d23d178b06a5630c802548dbf548f23fa78a6e0da8b16c7f0020da0867b516b29e2688 SHA512 e0cc0aa6e999f917697eefb46d58268cf3f66372c1eb2ee1cc8c3ec15e9b4ff9e7b4fabdf41302dba635976e6fa811025c9386b59f0ae63ba5e8c019a9fe4cee MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-misc/balance/balance-3.57-r1.ebuild b/net-misc/balance/balance-3.57-r1.ebuild new file mode 100644 index 000000000000..bfbf74ec2a13 --- /dev/null +++ b/net-misc/balance/balance-3.57-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps toolchain-funcs + +DESCRIPTION="TCP Load Balancing Port Forwarder" +HOMEPAGE="http://www.inlab.de/balance.html" +SRC_URI="http://www.inlab.de/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) + +FILECAPS=( + CAP_NET_BIND_SERVICE usr/sbin/balance +) + +src_prepare() { + default + + tc-export CC +} + +src_install() { + default + + # Autocreated on program start, if missing + rm -rv "${ED}/var/run" || die +} + +pkg_postinst() { + fcaps_pkg_postinst + elog "To run as non-root, be sure to have rendezvous directory created" + elog "with either 'mkdir -m 01777 ${EROOT}/var/run/balance' or using tmpfiles." +} diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest index 525b36def8f5..9d78e11e05b4 100644 --- a/net-misc/bird/Manifest +++ b/net-misc/bird/Manifest @@ -3,6 +3,8 @@ AUX confd-bird-2 231 BLAKE2B 9be6c9b94ede8233e6b249d6543b236f3bba2f065bd3bd811c4 AUX initd-bird-2 1433 BLAKE2B d89a6d48e36736f8dc8d21df7213f5edc0702f2a4e64f5321a8a4b0b3e1501755553f35e4f6270be707a50538defb806658dee00453835bcac86a633c60fb8c7 SHA512 bd3eec06701c86eaa7c89e75a963656be6081415f93f7844bba272e3f1feccbd90081ea0b711ac51c6d7c1e337e8325a27879b336f20204ad225d0c7dafa3b68 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35 DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2 +DIST bird-2.0.9.tar.gz 1282045 BLAKE2B a9f60ac7a768793e985ff8edc4c42af4b5e0eb9028af575d12e2fbe9ea67092cdc908289be848ef71403e6fafdcf46a8b78e90a5880951f9cb09854a3a3f0c73 SHA512 14c1f5c792de58e1b89ce16ea942244ad998833cf159a3cde78fd0c7d81238b1ad18fd76f6a0e7e11210447c73a6c74cfef4c6a70989891fa78ba5df0ae71d90 EBUILD bird-2.0.7.ebuild 808 BLAKE2B 7ce2db0fee210a80a196f111b8690e0b347cf9224255b41479b2a831058cc0fb931b7c1ef13f7e347f654b5222d73faafec8d0126c4b02a396866406d0752751 SHA512 f9b5fc2788d6b53ac9f317bf6ae91a864dbea79e42338d87c1c8bde4558109ab948f3ef9e37d92d663e3740db3e39b96102b418f63bd32fdbfd2569127f8780f EBUILD bird-2.0.8.ebuild 1257 BLAKE2B 3b9fe5cd1fbdd48497fbd5df6660a8fd212e5e3f7ab2ed54b20a4b564a879e63c2eae6a52bfe59c1d6e710d49c801af7a5184b4dd64b316b8f54e52c4beb8def SHA512 2988f25efd01b765bb9b4c12527da4b6e8c182499cd5ccdd562c481d73e3ed280e3365eac1c73aae652e5f3908508585d8659ca8a099759d4b59657834ae0891 +EBUILD bird-2.0.9.ebuild 1321 BLAKE2B 99b68f344d695e6bafc20d877215a23516f3449ffb5646363ba1e7389b70f130a8bbead65be0f56d49905070bc247cb44ec7c122b7b74f23b768bcab6b19c409 SHA512 5ff43de5db2780a1afe32cbeff8e8409e52140465a6bae9f41e7d6c076a334db22582db35701be5cd24fab44f3a3cc8e316ee350b861b022e6a0b838e896f239 MISC metadata.xml 582 BLAKE2B f2fca917d013e377c042ad09e99a53bda1bd27673e27dc17ed683aec7b691e40e405fef758a3243f6d53804f23ab495ccc7692712d9d941d2517d141b33c0a50 SHA512 0d03e6149698726621a62436740e83b6fcd6c6951d201eead7453ea0b565dcd72d6d54f961e40b1598a1d0b499a5166d84c4208de5c0a6b4134e3d32f84d9eae diff --git a/net-misc/bird/bird-2.0.9.ebuild b/net-misc/bird/bird-2.0.9.ebuild new file mode 100644 index 000000000000..d04ea9812f50 --- /dev/null +++ b/net-misc/bird/bird-2.0.9.ebuild @@ -0,0 +1,70 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools fcaps + +DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6" +HOMEPAGE="https://bird.network.cz" +SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos" +IUSE="+client debug libssh" + +RDEPEND=" + client? ( + sys-libs/ncurses:= + sys-libs/readline:= + ) + filecaps? ( + acct-group/bird + acct-user/bird + ) + libssh? ( net-libs/libssh:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + sys-devel/m4 +" + +FILECAPS=( + CAP_NET_ADMIN usr/sbin/bird + CAP_NET_BIND_SERVICE usr/sbin/bird + CAP_NET_RAW usr/sbin/bird +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}/var" \ + $(use_enable client) \ + $(use_enable debug) \ + $(use_enable libssh) +} + +src_install() { + if use client; then + dobin birdc + fi + dobin birdcl + dosbin bird + newinitd "${FILESDIR}/initd-${PN}-2" ${PN} + newconfd "${FILESDIR}/confd-${PN}-2" ${PN} + dodoc doc/bird.conf.example +} + +pkg_postinst() { + use filecaps && \ + einfo "If you want to run bird as non-root, edit" + einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with" + einfo "the wanted username." +} diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest index 2a64a3615b5b..166e2d3e8720 100644 --- a/net-misc/bridge-utils/Manifest +++ b/net-misc/bridge-utils/Manifest @@ -1,6 +1,8 @@ +AUX bridge-utils-1.7.1-musl.patch 223 BLAKE2B 16545001ffb6d3a4db3af66adda46f76d2436be78b7ebfba732de5d146b909f9ee7be4ad5bbb1dca6edc517ace3d2994fa6c1eab24bf1db3530076d2411a4970 SHA512 9f80083f6893e2ef1b960ffd602307250ef29fe002f6fa3ee769f7e5a0a7b162b1f9fe8fa028431720b1a7e99a2050864ab624e3a4a11a9012a0174010e9dcd4 AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb982957d2e3a1efa0244b4d9f72decbac8990579b19137df82e758589846e4175f3cc9ddc9e2990663b3ae146cf67b9f5a808255115d1a91d53a3d50 SHA512 b4aecaa7e7fae311effc2f9ccd4ee5ca2a1be007cb94e1eb873693805fcdbc880bfb0df53d592eef46d61d433c7b5a36dbe9e7c16b836b6a3f1452e4034f50d6 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02 DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c EBUILD bridge-utils-1.6.ebuild 1436 BLAKE2B 42f9eab53b9e394593c7b9f78f988a5558cbb0aca979e9adbfd96bed3824e2ab1aee9b974df1870a94a639778a90f19b1bd5af3a42dc9f646181bd55dfcb5367 SHA512 002a1d7fbf2f2b756f2c15d73b6d9e7acca1c6d3295a78a19e578de82967d50ace95167a98a060254195719369c5a9e7669b2d262be120f9a1a906619740843a +EBUILD bridge-utils-1.7.1-r1.ebuild 1427 BLAKE2B 6f5b0377ffd000963f040d037d954ec61fe8d2bce5759865d11ebd478808daf6f4e32df5f395287839f6ba3d770faa98425f347dfb1ed5c854cebc2ce04f17b8 SHA512 75edd50388486d5e38075fd2baf2bccb081297ec9e58fcdbf703b979c6fb4bdc5cddaf8c712716233d1e18e82fcf1f188e97abb8d42092321cb1937936eecbad EBUILD bridge-utils-1.7.1.ebuild 1379 BLAKE2B 62267a7aadaaa12fe07c2679c8beb99e6917d6c39ac3697ec696300f897c140fd2cae478cf50e1cd8668f1a3fb96dd5fbcc8c6ba69930e90ba70a679382186c1 SHA512 1283f3f38a9fe0e0065e4101b45d326df424651d708b9c0891fea6a52755cbe313717e37cae25bfd37f385b70c685a4260ea04419d913d1a5fc27279c3dbb5b9 MISC metadata.xml 492 BLAKE2B a62977b2f90df86ceacd84e556618f3adf5338eef114a17ca9a17e4bff142190fa68df777719b91bc4ec3108d3fd13c21205addaf30e4fc4012ff83fb882590f SHA512 216e32dc64a175f83b942cbc24894e055a77f7b9c251d68395cb4635bda446ea197f8feee7957747e68bdb46c8c84e8625b626c82944e161debba3009f9befa8 diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild new file mode 100644 index 000000000000..85a58f61fc89 --- /dev/null +++ b/net-misc/bridge-utils/bridge-utils-1.7.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge" +HOMEPAGE="http://bridge.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="selinux" + +DEPEND="virtual/os-headers" +RDEPEND="selinux? ( sec-policy/selinux-brctl )" + +CONFIG_CHECK="~BRIDGE" +WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel" + +get_headers() { + CTARGET=${CTARGET:-${CHOST}} + dir=/usr/include + tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include + echo "${dir}" +} + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/libbridge-substitute-AR-variable-from-configure.patch + "${FILESDIR}"/${P}-musl.patch #828902 + ) + default + eautoreconf +} + +src_configure() { + # use santitized headers and not headers from /usr/src + local myeconfargs=( + --prefix=/ + --libdir=/usr/$(get_libdir) + --includedir=/usr/include + --with-linux-headers="$(get_headers)" + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS ChangeLog README THANKS \ + doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST} + + [ -f "${ED}"/sbin/brctl ] || die "upstream makefile failed to install binary" +} diff --git a/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch new file mode 100644 index 000000000000..618811e80b7a --- /dev/null +++ b/net-misc/bridge-utils/files/bridge-utils-1.7.1-musl.patch @@ -0,0 +1,10 @@ +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -23,6 +23,7 @@ + #include <sys/socket.h> + #include <sys/time.h> + #include <netinet/in.h> ++#include <limits.h> + + #include <linux/if.h> + #include <linux/if_bridge.h> diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest index a8a71366f5f0..14df16214e86 100644 --- a/net-misc/chrome-remote-desktop/Manifest +++ b/net-misc/chrome-remote-desktop/Manifest @@ -2,5 +2,7 @@ AUX chrome-remote-desktop-91.0.4472.10-always-sudo.patch 593 BLAKE2B 4cba2a48694 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735 DIST chrome-remote-desktop_96.0.4664.9_amd64.deb 62383372 BLAKE2B b7ac12e2f1c16781225b9c74e558e51d817aad5de2d953d94a06d5d3fa0d937dd317f7157c770e01a91c249f0192542da67911899014360c6fadd252bf0908ae SHA512 86d4ac9b15da2b29f7245866dbc78a131c6aad8efb8ac4f150935afdd5ad95e8f2bc4a59cda52849c96aadaa869b05f9eb7a5cdfda711358e5055e08cf9fbd79 +DIST chrome-remote-desktop_99.0.4844.11_amd64.deb 16817980 BLAKE2B 4784fb597722ee8abe3d073c7c2a0c1d1e9796e5c6df9935a2b5d2c4d6ee3629738c0bbfd6528a45b85b95ee192b5760b5137b7d89bd543d5c43d56fd9a030bb SHA512 71c621d1484f80b07b04637b1472baa1072b726109f9786ceabb1393bc1ebd3fe90c546d695871924a3a243840c87e35de78ff07598fbe6f3fe9fcb22b335b65 EBUILD chrome-remote-desktop-96.0.4664.9.ebuild 4808 BLAKE2B 26d9e5c83ac126f414f3dab199f50972965fe777c2bf55db298c2ed82f8fd5cb14cfacb12c249544c2fc7cc24ceb181759e3be0b10dd8df1e943b6f8a51cad39 SHA512 db708de2928e175d476f127a60c5c878cce3db19c6a0298a4a04447c1fb4671ee383a0307b5267c743e4b32630069c4ce49bc5dea56b07e77e9e37efb9867368 +EBUILD chrome-remote-desktop-99.0.4844.11.ebuild 4808 BLAKE2B 1ff119f4d33e81f69d5b34ee743ccd645b7d5cc391012adf63a30d169fe5603264ff061da06377b575a453b31045fa9cbb73cb5cec58637ba284f97200898fe1 SHA512 fa1df0c86ff168a328e086da5903b3c1dfd470ca8b3da173b47ae8303e10a5077370528d95316137b78799cbcd02b2a0c8c0b9e1e2622cbe0d4a0757ba754a19 MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-99.0.4844.11.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-99.0.4844.11.ebuild new file mode 100644 index 000000000000..489accba4990 --- /dev/null +++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-99.0.4844.11.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/ +# Fetch the Release file: +# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release +# Which gives you the Packages file: +# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages +# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages +# And finally gives you the file name: +# pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb +# +# Use curl to find the answer: +# curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename + +EAPI="7" + +PYTHON_COMPAT=( python3_{8,9,10} ) +PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW" + +inherit unpacker python-single-r1 optfeature plocale + +DESCRIPTION="access remote computers via Chrome!" +PLUGIN_URL="https://chrome.google.com/remotedesktop" +HOMEPAGE="https://support.google.com/chrome/answer/1649523 + https://chrome.google.com/remotedesktop" +BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}" +SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )" + +LICENSE="google-chrome" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="bindist mirror" + +# Packages we execute, but don't link. +RDEPEND="app-admin/sudo + ${PYTHON_DEPS}" +# All the libs this package links against. +RDEPEND+=" + >=dev-libs/expat-2 + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + $(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]') + gnome-base/gconf:2 + media-libs/fontconfig + media-libs/freetype:2 + sys-apps/dbus + sys-devel/gcc + sys-libs/glibc + sys-libs/pam + x11-apps/xdpyinfo + x11-apps/setxkbmap + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/pango" +# Settings we just need at runtime. +# TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of xvfb. +# - The env var (CHROME_REMOTE_DESKTOP_USE_XORG) seems to be stripped before being checked. +# - The Xorg invocation uses absolute paths with -logfile & -config which are rejected. +# - The config takes over the active display in addition to starting up a virtual one. +RDEPEND+=" + x11-base/xorg-server[xvfb]" +DEPEND="$(unpacker_src_uri_depends)" + +S=${WORKDIR} + +QA_PREBUILT="/opt/google/chrome-remote-desktop/*" + +PATCHES=( + "${FILESDIR}"/${PN}-91.0.4472.10-always-sudo.patch #541708 +) + +src_prepare() { + default + + gunzip usr/share/doc/${PN}/*.gz || die + + cd opt/google/chrome-remote-desktop + python_fix_shebang chrome-remote-desktop + + cd remoting_locales + # These isn't always included. + rm -f fake-bidi* || die + PLOCALES=${PLOCALES//_/-} plocale_find_changes "${PWD}" '' '.pak' +} + +src_install() { + pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die + rm_pak() { local l=${1//_/-}; rm "${l}.pak" "${l}.pak.info"; } + plocale_for_each_disabled_locale rm_pak + popd >/dev/null + + insinto /etc + doins -r etc/opt + dosym ../opt/chrome/native-messaging-hosts /etc/chromium/native-messaging-hosts #581754 + + insinto /opt + doins -r opt/google + chmod a+rx "${ED}"/opt/google/${PN}/* || die + fperms +s /opt/google/${PN}/user-session + + dodir /etc/pam.d + dosym system-remote-login /etc/pam.d/${PN} + + dodoc usr/share/doc/${PN}/changelog* + + newinitd "${FILESDIR}"/${PN}.rc ${PN} + newconfd "${FILESDIR}"/${PN}.conf.d ${PN} +} + +pkg_postinst() { + optfeature "Dynamic resolution changes" "x11-apps/xrandr" + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "Two ways to launch the server:" + elog "(1) access an existing desktop" + elog " (a) install the Chrome plugin on the server & client:" + elog " ${PLUGIN_URL}" + elog " (b) on the server, run the Chrome plugin & enable remote access" + elog " (c) on the client, connect to the server" + elog "(2) headless system" + elog " (a) install the Chrome plugin on the client:" + elog " ${PLUGIN_URL}" + elog " (b) run ${EPREFIX}/opt/google/chrome-remote-desktop/start-host --help to get the auth URL" + elog " (c) when it redirects you to a blank page, look at the URL for a code=XXX field" + elog " (d) run start-host again, and past the code when asked for an authorization code" + elog " (e) on the client, connect to the server" + elog + elog "Configuration settings you might want to be aware of:" + elog " ~/.${PN}-session - shell script to start your session" + elog " /etc/init.d/${PN} - script to auto-restart server" + fi +} diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest index 664dc2f46f13..4d3f6092169c 100644 --- a/net-misc/chrony/Manifest +++ b/net-misc/chrony/Manifest @@ -2,7 +2,9 @@ AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c32 AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4 AUX chrony-4.1-seccomp-glibc-2-3-4.patch 932 BLAKE2B 89f6f1ee4ece8ce021dd35f20c44749f613049f3aee1007fcbad1f123767e73ebd5567d4aeffd04938d75788b6b42c332903b93cf5c76fdfc404c3c918f52bd8 SHA512 7315f6e08a418b574fc5c9c1100b2fd39320f38d7c20117e5d8e902f71a99ad8f3e743e1cf18a0223710c6321fbac5baae05b1201f156275af404bc81c32796a AUX chrony-4.1-systemd-gentoo.patch 309 BLAKE2B 4824abf9130c6861f2966c4cdec93313429df499c14cd75897ffebdcc1bb9dd4058aa4889f17e4549ed5d0c581208c316bc3bd28cbed96030303f401a4dd7bff SHA512 ae5d80bcf16554a22b624c2def7ccabc72cc3dba5dc0fc8096eeb7367b388d02ad2d3ce6119980fc12d573ea0803eeb58cb5b409b0c475f70e75c8d112553245 +AUX chrony-4.2-seccomp-rseq.patch 1111 BLAKE2B 625d93528c11d4fc37a6ec4f7d32c80940ea33976e9b351c519cccfa1de81b3ddef74cad5a85f28c7196ff169cf14f3ff91704c7278444a6abca0e679d9ca0f4 SHA512 bcb9d17345043049c9990a3939d97100a4be6d17ff23851b3a61b929dd9ea4421ad9f5e7e3adb79675dab8a854a9a2a7f9ddbefc8dea294c7d5639c19e6169b1 AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec +AUX chrony-4.2-test-mawk.patch 1219 BLAKE2B 7cc8d36de7879a500006e6a31d6dde77343616358e6d135efc80181f97fed5e81ada2b5d0ee4ac2d125cf828ac94a0894ffe40ec09ffb5328bf9b8cb71addd24 SHA512 69a9e1bd7c632ecf98992840d2b8aa5bd6e9ac3e7a67485ad9b59286414509001e71c47638059ebfcb952d17e7b6e754d74950dd0ebbdb265c8127e06bb94f34 AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f @@ -10,6 +12,7 @@ DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e7325 DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10 EBUILD chrony-4.1-r2.ebuild 6684 BLAKE2B b366d69c4a2068b512bd7cbb14b7387ccd02947a7cb94f21bfc552ecc904829abc6dee333c4bbc11b9a3cdc97aa6c95d7a1c662fea22cc7df9b1c83f566873d9 SHA512 621e244dbaa0bff3bb74d5d7f92c9db85104f4c7ec02e774cd96fb1a7012141699c711e06b8b5a92be8ac70876ee933280bcabbea7a6f35593eec5d41b203028 +EBUILD chrony-4.2-r1.ebuild 6727 BLAKE2B 9857f48ce520d916a9a7c511da60f38e6a9598436dc0e3e9e39a5e26ca3456ff0b44b163eb343cebd73c2bc94f84588b8d6c7a598f56555007b166c1f8eb6799 SHA512 a2fc960a85636a579ebb89836377d6522303fd1e7230abff4d41d1f344903d352adc8df590946e706d1c2fb07d7c4af54f5e88b8afae09fa4f39889cb9dcdec1 EBUILD chrony-4.2.ebuild 6643 BLAKE2B 42de896b755ab3992c620c440adcfbf088e6b325085fdaa7bf1d2798c5219781b5741052d605541054536925524f78734f8c4cb0ad04d5b4d279422212ecd2a5 SHA512 7843e59659e2c1fdc381c0e2995e198e21e180abbe11faa7425c13348950c2f997d2caef1ee899d3f7e38666f21224e969493a2167e967c6d6ce8445215e8499 EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0 diff --git a/net-misc/chrony/chrony-4.2-r1.ebuild b/net-misc/chrony/chrony-4.2-r1.ebuild new file mode 100644 index 000000000000..9df110347a58 --- /dev/null +++ b/net-misc/chrony/chrony-4.2-r1.ebuild @@ -0,0 +1,255 @@ +# Copyright 1999-2022 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/ https://git.tuxfamily.org/chrony/chrony.git" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc + inherit verify-sig + + SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" + SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )" + + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi +fi + +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux" +# nettle > nss > libtomcrypt in configure +REQUIRED_USE=" + sechash? ( || ( nettle nss libtomcrypt ) ) + nettle? ( !nss ) + nss? ( !nettle ) + libtomcrypt? ( !nettle !nss ) + !sechash? ( !nss ) + !sechash? ( !nts? ( !nettle ) ) +" + +DEPEND=" + caps? ( + acct-group/ntp + acct-user/ntp + sys-libs/libcap + ) + libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) + nettle? ( dev-libs/nettle:= ) + nss? ( dev-libs/nss:= ) + nts? ( net-libs/gnutls:= ) + pps? ( net-misc/pps-tools ) + seccomp? ( sys-libs/libseccomp ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-chronyd ) +" +BDEPEND=" + html? ( dev-ruby/asciidoctor ) + nts? ( virtual/pkgconfig ) + sechash? ( + nettle? ( virtual/pkgconfig ) + nss? ( virtual/pkgconfig ) + ) +" + +if [[ ${PV} == "9999" ]] ; then + # Needed for doc generation in 9999 + REQUIRED_USE+=" html" + BDEPEND+=" virtual/w3m" +else + BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch + "${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch + + "${FILESDIR}"/${P}-test-mawk.patch + "${FILESDIR}"/${P}-seccomp-rseq.patch +) + +src_prepare() { + default + + sed -i \ + -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ + doc/* examples/* || die + + cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die +} + +src_configure() { + if ! use caps ; then + sed -i \ + -e 's/ -u ntp//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + if ! use seccomp ; then + sed -i \ + -e 's/ -F 2//' \ + "${T}"/chronyd.conf examples/chronyd.service || die + fi + + tc-export CC PKG_CONFIG + + # Update from time to time with output from "date +%s" + # on a system that is time-synced. + export SOURCE_DATE_EPOCH=1607976314 + + # Not an autotools generated script + local myconf=( + $(use_enable seccomp scfilter) + + $(usex caps '' '--disable-linuxcaps') + $(usex cmdmon '' '--disable-cmdmon') + $(usex debug '--enable-debug' '') + $(usex ipv6 '' '--disable-ipv6') + $(usex libedit '' '--without-editline') + $(usex libtomcrypt '' '--without-tomcrypt') + $(usex nettle '' '--without-nettle') + $(usex nss '' '--without-nss') + $(usex ntp '' '--disable-ntp') + $(usex nts '' '--disable-nts') + $(usex nts '' '--without-gnutls') + $(usex phc '' '--disable-phc') + $(usex pps '' '--disable-pps') + $(usex refclock '' '--disable-refclock') + $(usex rtc '' '--disable-rtc') + $(usex samba '--enable-ntp-signd' '') + $(usex sechash '' '--disable-sechash') + + --chronysockdir="${EPREFIX}/run/chrony" + --docdir="${EPREFIX}/usr/share/doc/${PF}" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + --sysconfdir="${EPREFIX}/etc/chrony" + --with-hwclockfile="${EPREFIX}/etc/adjtime" + --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" + + ${EXTRA_ECONF} + ) + + # Print the ./configure call + echo sh ./configure "${myconf[@]}" >&2 + sh ./configure "${myconf[@]}" || die +} + +src_compile() { + if [[ ${PV} == "9999" ]] ; then + # Uses w3m + emake -C doc man txt + fi + + 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 + # bug #711058 + 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 examples/chronyd.service + systemd_dounit examples/chrony-wait.service + systemd_enable_ntpunit 50-chrony chronyd.service +} + +pkg_preinst() { + HAD_CAPS=0 + HAD_SECCOMP=0 + HAD_PRE_NEW_SECCOMP_LEVEL=0 + + # See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5 + # in "Ebuild Phases" for an explanation of why we need to save the variable beforehand + if has_version 'net-misc/chrony[caps]' ; then + HAD_CAPS=1 + fi + + if has_version 'net-misc/chrony[seccomp]' ; then + HAD_SECCOMP=1 + fi + + if has_version '>=net-misc/chrony-4.1[seccomp]' ; then + # This version introduced a new filter level: -F 2 + # It's a limited set of seccomp filters designed to be 'bare minimum' + HAD_PRE_NEW_SECCOMP_LEVEL=1 + fi +} + +pkg_postinst() { + tmpfiles_process chronyd.conf + + if [[ -n "${REPLACING_VERSIONS}" ]] ; then + if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then + # bug #719876 + 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" + elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then + ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root" + fi + fi + + # See bug #783915 for general discussion on enabling seccomp filtering + # by default. + local show_seccomp_enable_msg=0 + + # Was seccomp disabled before and now enabled? + if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then + show_seccomp_enable_msg=1 + fi + + # Are we coming from an old version without the new 'minimal' filter? + # (-F 2) + if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then + show_seccomp_enable_msg=1 + fi + + if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then + elog "To enable seccomp in a stricter mode, please modify:" + elog "- /etc/conf.d/chronyd for OpenRC" + elog "- systemctl edit chronyd for systemd" + elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)" + elog "By default, we now use -F 2 which is a baseline/minimal filter." + fi +} diff --git a/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch b/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch new file mode 100644 index 000000000000..e36a7b33186a --- /dev/null +++ b/net-misc/chrony/files/chrony-4.2-seccomp-rseq.patch @@ -0,0 +1,30 @@ +https://git.tuxfamily.org/chrony/chrony.git/patch/?id=8bb8f15a7d049ed26c69d95087065b381f76ec4d + +From: Michael Hudson-Doyle <michael.hudson@canonical.com> +Date: Wed, 9 Feb 2022 09:06:13 +0100 +Subject: sys_linux: allow rseq in seccomp filter + +Libc 2.35 will use rseq syscalls [1][2] by default and thereby +break chrony in seccomp isolation. + +[1]: https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ +[2]: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html + +Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> +Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> +Signed-off-by: Michael Hudson-Doyle <michael.hudson@canonical.com> +Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> + +--- a/sys_linux.c ++++ b/sys_linux.c +@@ -497,6 +497,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) + SCMP_SYS(getrlimit), + SCMP_SYS(getuid), + SCMP_SYS(getuid32), ++#ifdef __NR_rseq ++ SCMP_SYS(rseq), ++#endif + SCMP_SYS(rt_sigaction), + SCMP_SYS(rt_sigreturn), + SCMP_SYS(rt_sigprocmask), +cgit v0.10.2 diff --git a/net-misc/chrony/files/chrony-4.2-test-mawk.patch b/net-misc/chrony/files/chrony-4.2-test-mawk.patch new file mode 100644 index 000000000000..3e9e2eeb422d --- /dev/null +++ b/net-misc/chrony/files/chrony-4.2-test-mawk.patch @@ -0,0 +1,30 @@ +https://git.tuxfamily.org/chrony/chrony.git/patch/?id=b61cbed6895fcd3eae4c8458a69995870a22a5e0 + +From: Vincent Blut <vincent.debian@free.fr> +Date: Wed, 12 Jan 2022 18:08:34 +0100 +Subject: test: ensure awk commands in 008-ntpera return an integer + +Some awk interpreters (e.g. mawk) print long integers in exponential +notation skewing the test result. + +--- a/test/simulation/008-ntpera ++++ b/test/simulation/008-ntpera +@@ -29,7 +29,7 @@ echo "$ntp_start" | grep -q '-' && test_skip + + for time_offset in -1e-1 1e-1; do + for start_offset in 0 "2^32 - $limit"; do +- export CLKNETSIM_START_DATE=$(awk "BEGIN {print $ntp_start + $start_offset}") ++ export CLKNETSIM_START_DATE=$(awk "BEGIN {printf \"%.0f\", $ntp_start + $start_offset}") + run_test || test_fail + check_chronyd_exit || test_fail + check_source_selection || test_fail +@@ -38,7 +38,7 @@ for time_offset in -1e-1 1e-1; do + done + + for start_offset in -$limit "2^32"; do +- export CLKNETSIM_START_DATE=$(awk "BEGIN {print $ntp_start + $start_offset}") ++ export CLKNETSIM_START_DATE=$(awk "BEGIN {printf \"%.0f\", $ntp_start + $start_offset}") + run_test || test_fail + check_chronyd_exit || test_fail + check_source_selection || test_fail +cgit v0.10.2 diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest index 18033a663e45..5df3bec80bdc 100644 --- a/net-misc/cmst/Manifest +++ b/net-misc/cmst/Manifest @@ -1,5 +1,5 @@ -DIST cmst-2021.12.02.tar.gz 3009904 BLAKE2B 47f4f6516668e4c71821754c096a5442614836b5c5fc5290dbf04df407010ae243cd482d7757edf6dd2e091bf166ab3cdfbb84c715a46edb30c3ee8ae1f42e26 SHA512 15875232d6f842bcecebc99f5e59fef1268bb04b319538919d6b5d6b442c3462177719170f16b5b3fa86a5a7c7f669864250c8499e0a444f26f121b80cab5dcf DIST cmst-2022.01.05.tar.gz 3031739 BLAKE2B 19d57e7e62ecc82d9e2d8d54491a46093aa8a6424df6e41a66d6d44a2a49be6d25bcaf699b2da94f26de3ca3fe34a2fa542cc696ce6ab70a799a7a8cab8cb532 SHA512 75f4b611755f24cc193cabd56c053098ebd6be13f6eff0bbde2842f6d35c90111bbf475d7da4dfc1f4462c34e27e526bf8d0ba60ec0ae42ee0cbc582c113bc2f -EBUILD cmst-2021.12.02.ebuild 934 BLAKE2B 7dab06e0e14d7132cd88948a06b8aa3f6a2c0186b26b7f15ca407570328c9cb90e1a194ed256fab3d82f62f00068633f0d5eb5784f1098a48d113c0e68d6fa97 SHA512 d9a7bcb5d8f8dd27a8b9489efd670af1ad051bf71ea73fe267ff6648b4dac0ab7dd807e348ab9064b095fbc9e73a8449705a72cb4e0cbfec823c130c3a1d82e6 -EBUILD cmst-2022.01.05.ebuild 889 BLAKE2B eb54a7fcf2e5dfc74c2f2a3c14f7377dc5cba74c07f1a546888dff89abf0a34f46e94e96d4b2aa92995bca56af848a4ce5dcec969407e40d38423556dfe5a049 SHA512 26b9525df4fafe9b628a43099c3c6f1860ac102e842992378230250d197661b1ebd6a625ee94b2702ae616d11a201d098dec5da6aa590b9de5e056c9747a9282 +DIST cmst-2022.03.13.tar.gz 3178885 BLAKE2B 0f67d4b63c1d9c5925811ae11cd6e0a16c7edefaf802dfcb7847b5e1ce5dac8435343523b5b6ba863c08d49340a06a16df65f057b7297ff874768b929e30d676 SHA512 ed8ccec8c132bfdb42bcd8429d6b25242ff2575eadf5c60afe04477a3962eb474b841c57cc4dca9345cb61b1a2502873ac91bb97b6766e637ca4254d82856a1e +EBUILD cmst-2022.01.05.ebuild 887 BLAKE2B ca3214162a928ab5975c15a02c29ee01bdad629aea7688a81015e3223d8e285ec061f6fe4c2f19dfb4c12e4fea21750c364a763e1002203c3d1a3a4636fb6e23 SHA512 e9bf2d363d20911881d689555e093ca4bc6cde6a733efe6d3d6fdd7292630fc9a24c63a60e0cd5470072de8aa1bcb7ba2879254e1305e53b6f624869bfc263a5 +EBUILD cmst-2022.03.13.ebuild 889 BLAKE2B eb54a7fcf2e5dfc74c2f2a3c14f7377dc5cba74c07f1a546888dff89abf0a34f46e94e96d4b2aa92995bca56af848a4ce5dcec969407e40d38423556dfe5a049 SHA512 26b9525df4fafe9b628a43099c3c6f1860ac102e842992378230250d197661b1ebd6a625ee94b2702ae616d11a201d098dec5da6aa590b9de5e056c9747a9282 MISC metadata.xml 390 BLAKE2B 19055fbf6cc2b268ff117e4cd4e39c894452cd7a3f9c71a113831a142ee4458aae99f86497fc85ee5e29ee73a50d2363ce816e46e2cf3cf47e6be51658d882d2 SHA512 fcc4db887275f29a69ddb8d731f3bc1516734b75bb5ce494d2ddfc13f951a7c1ce9f715383c62725919755b61488943f91c1286d126fb91a24176c24e0e3dcaf diff --git a/net-misc/cmst/cmst-2022.01.05.ebuild b/net-misc/cmst/cmst-2022.01.05.ebuild index 72cbdbb60aab..45b56952a1ac 100644 --- a/net-misc/cmst/cmst-2022.01.05.ebuild +++ b/net-misc/cmst/cmst-2022.01.05.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="dev-qt/qtcore:5 diff --git a/net-misc/cmst/cmst-2021.12.02.ebuild b/net-misc/cmst/cmst-2022.03.13.ebuild index 40a161224521..72cbdbb60aab 100644 --- a/net-misc/cmst/cmst-2021.12.02.ebuild +++ b/net-misc/cmst/cmst-2022.03.13.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="dev-qt/qtcore:5 @@ -31,11 +31,6 @@ src_configure() { eqmake5 DISTRO=gentoo } -src_compile() { - lrelease cmst.pro - default -} - src_install() { emake INSTALL_ROOT="${D}" install rm -r "${D}"/usr/share/licenses || die diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest index 5a84374296be..5d1f0a162545 100644 --- a/net-misc/cni-plugins/Manifest +++ b/net-misc/cni-plugins/Manifest @@ -6,5 +6,5 @@ DIST cni-plugins-0.9.1.tar.gz 2703099 BLAKE2B 878f476e62f12020b39d33a79723fe246b EBUILD cni-plugins-0.8.6.ebuild 887 BLAKE2B 22a40a3a3e6269454c8393f45af4c03fb75d100f1976a89b58e56ee3add1e22d4b60aa4858bc49bdf663369df1f5ffe77e49b727df65efa8aec31e81cf46e917 SHA512 64f51abba277243b73f48e14abfeca29c6c68a1c74acd2023c58c27608ce7b7257102380926bfd982661325b668eb9ae3532cf2e1b64b80fc3a1c70603f19e8a EBUILD cni-plugins-0.8.7.ebuild 888 BLAKE2B 79bf0e6b70ca215ab02e203393dc0d1da9fbe67f5e1b2553fdda95a65083a5e974560e513d29c633a95b6823700052ed516efdb206b7ef87fd850dde26696a36 SHA512 2e183a9fd0587c39803d63eeaf25a04441776ddd993ce2b94167e0bf024c41b333ab4336670dc3ede154b4ac0983c6e8e59fa186378c19661d64cea4f4adad96 EBUILD cni-plugins-0.9.0.ebuild 936 BLAKE2B d59052c6ac0291afc86987e72fad3b6dafb0abae2d452147d50884a9956830e35b7acc5b771bef4b6f9968b1d7b7918480b60417118232b4c7fdf34c5c1de2db SHA512 71e599ad2edccd2d18f86ac9d8c63b2cb28c39db2539714211d8a5fafb7781b8adb3811058b536bdd819fe97cc30763ce8c6065906aff1193fdcf3575c03a5af -EBUILD cni-plugins-0.9.1.ebuild 941 BLAKE2B 5baa6bf97b7a26e6b4441e37219c50417fd0d0be1d27af6d33b7ae150bdcf90b835ab74e581dc70e44170202a12f0662135bb7daa20634dac6e83b5f750bfce9 SHA512 2b7346b9cf365323bc0bbca4da33b2df26f7528be22b958f5e040ed1164989158f3f8ec8c59276d0952383ae6a5b15084152b989a027d0efd6c275b1c34d28cd +EBUILD cni-plugins-0.9.1.ebuild 948 BLAKE2B 340be886eb779358a8a7f6fe7a94bbc45dd53e51b65f729bfc1eb614e2a8e7db1b7b19622b75b8fb382882ce6d4915ab1b9a3282b7cc76de7efbfd07cea40fc6 SHA512 0a25abd6833e459576afdc3174afe57491a86b5eff6aba6d718db439af1acd983ccc769619448683ae42b57a561a785599146a9f6423dbae7395c625819739cd MISC metadata.xml 351 BLAKE2B 3565fe13764f828aed1288724a2939be57e523e0d0a9ccf3c091715e6f1e102155a7fa28191a3c87d669d51a0fa087a89587d83fe6c4747d5d9b31da11c1578c SHA512 6cfe3058d20387245c2f4823c7629d464115783e3c9ed1e45769d6e13f2f35f94656c66c0b1572f8eb229e6bf43510dbc35d117d6a3379e15b5b6ababc077856 diff --git a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild index 54ca770d58f6..5d4529918862 100644 --- a/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild +++ b/net-misc/cni-plugins/cni-plugins-0.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv" IUSE="hardened" CONFIG_CHECK="~BRIDGE_VLAN_FILTERING" diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index bff61cf22034..85edc8e9bd80 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -1,8 +1,10 @@ AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40 +AUX libresolv-musl-fix.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff8289f477e1c4b019f2a854d33022a171d7f16e2b8193c94964806542560e00fbf54e63deea9038845201120aa8 SHA512 c258e747e13b86c81ae96ac1743abf0c1461b9053c5b386d594a49f0b1890f10d89bea92610762ff609a4cc5fea04a43fab83894702f552b05af400f01cb011e DIST connman-1.40.tar.xz 758516 BLAKE2B 66834032f82e80a6f950d7ff823dc5f1f45090f3444b5a0241cabd0346cf9749b8780b624ce6a8e505305cc1a75423e5a95a7b1f77a282d231845bc33389924a SHA512 33df90814b7499aeafcd51fca4f8ffbc07efacfa29dda46d3b9bcd3ff26264dc53c3991e7e53a8563ca403015c345e59c7ad29427c38ee3d88dd282479db7a0f DIST connman-1.41.tar.xz 758556 BLAKE2B 45e522d4a3a8d1a2f8eb21612d85435020f51387d4285da65da56d022df2d521f81a782af82387bdede8b71bdc591b9ffb8b79e1b1dd9d1d83ffa96eede9c1bd SHA512 b7880d908635ab9350c12e207213d20b11c1a50afcb93ae92e1fc57d4345bf792afe1a5534650e18b8cd05a3766ce9993083b2d659e49f87b867e6f2c1a83b2d EBUILD connman-1.40.ebuild 2769 BLAKE2B 35f60256a6caacccab4669f29d4fc85dea55eee4d368590ffaae072e1898a4b892b47efa5e244fd83c6edd7266691ce086b96e55921fc4aa9bb1a08de80b64a1 SHA512 14d15a1134310baa57b5de17619fe06faaffe465a4c9a8219be58d40c65048d03f3c2339a67ae36747db31a3a3e9ccb1247c833cf2755741f520b7a28a8b1dc4 +EBUILD connman-1.41-r1.ebuild 2821 BLAKE2B 02806a41c60c37033f24562c3300a0a319f92acdd9059d738198d5b63d04309dd409718c96e45ff491f02c04bd5fd96c1580997e0549b0eec00004ab0861be21 SHA512 000ec62fbe715919f3effe2604fe70eb2caeb5bdcd9d052c9e1c79a6d5b1ebf6d3165c3f4c669c713da5a22c1e6a2cb7127034ffb377d8cbc5ddbac9859d6b8c EBUILD connman-1.41.ebuild 2775 BLAKE2B 43ffd94a5bc41d57f008c8af34819ab0655c5dc5bbe866375818779f0ffaa304f507fa650f0e40a2c63b750f0708a425448b6808d7866a60d1f2d05b39ade5a7 SHA512 498fa57ed4e5f863c66c1a2b4428f54d964b4e8e91d98b5f7b66c1b7c7dc38da3ac499f5e6de070255d9319c33136e93cd6f0742f7b2ce8c41894dde1082ac14 EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495 MISC metadata.xml 1303 BLAKE2B 5fd7c4c795c7003e86fb1f47f9e4569bfce981b13199efe2021009ba659cf67e2afa554fb99ded6f45985a43b09003e483d4c2283434efe26d4e06f7c97df6b0 SHA512 5575e585a4756330c323a2f000a53d80a9bf76225e294888542b5020c72846b27a4c4432d874b1952ed1c7ed4ee26e35925a75fd89d867b82c276784f50c3620 diff --git a/net-misc/connman/connman-1.41-r1.ebuild b/net-misc/connman/connman-1.41-r1.ebuild new file mode 100644 index 000000000000..d43b15fe372c --- /dev/null +++ b/net-misc/connman/connman-1.41-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +inherit autotools systemd tmpfiles + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" +else + SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" +fi + +DESCRIPTION="Provides a daemon for managing internet connections" +HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/" + +LICENSE="GPL-2" +SLOT="0" + +IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager ++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard +wispr" + +REQUIRED_USE="^^ ( iptables nftables )" +BDEPEND="virtual/pkgconfig" +RDEPEND=">=dev-libs/glib-2.16 + >=sys-apps/dbus-1.2.24 + sys-libs/readline:0= + bluetooth? ( net-wireless/bluez ) + iptables? ( >=net-firewall/iptables-1.4.8 ) + iwd? ( net-wireless/iwd ) + l2tp? ( net-dialup/xl2tpd ) + nftables? ( + >=net-libs/libnftnl-1.0.4:0= + >=net-libs/libmnl-1.0.0:0= ) + ofono? ( net-misc/ofono ) + openconnect? ( net-vpn/openconnect ) + openvpn? ( net-vpn/openvpn ) + policykit? ( sys-auth/polkit ) + pptp? ( net-dialup/pptpclient ) + vpnc? ( net-vpn/vpnc ) + wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) + wireguard? ( >=net-libs/libmnl-1.0.0:0= ) + wispr? ( net-libs/gnutls )" + +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-2.6.39" + +PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir=/var \ + --runstatedir=/run \ + --with-systemdunitdir=$(systemd_get_systemunitdir) \ + --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ + --enable-client \ + --enable-datafiles \ + --enable-loopback=builtin \ + $(use_enable bluetooth bluetooth builtin) \ + $(use_enable debug) \ + $(use_enable ethernet ethernet builtin) \ + $(use_enable examples test) \ + $(use_enable iwd) \ + $(use_enable l2tp l2tp builtin) \ + $(use_enable networkmanager nmcompat) \ + $(use_enable ofono ofono builtin) \ + $(use_enable openconnect openconnect builtin) \ + $(use_enable openvpn openvpn builtin) \ + $(use_enable policykit polkit builtin) \ + $(use_enable pptp pptp builtin) \ + $(use_enable tools) \ + $(use_enable vpnc vpnc builtin) \ + $(use_enable wifi wifi builtin) \ + $(use_enable wireguard) \ + $(use_enable wispr wispr builtin) \ + --with-firewall=$(usex iptables "iptables" "nftables" ) \ + --disable-iospm \ + --disable-hh2serial-gps +} + +src_install() { + default + dobin client/connmanctl + + if use doc; then + dodoc doc/*.txt + fi + keepdir /usr/lib/${PN}/scripts + keepdir /var/lib/${PN} + newinitd "${FILESDIR}"/${PN}.initd2 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} + +pkg_postinst() { + tmpfiles_process connman_resolvconf.conf +} diff --git a/net-misc/connman/files/libresolv-musl-fix.patch b/net-misc/connman/files/libresolv-musl-fix.patch new file mode 100644 index 000000000000..c28a7c1e3589 --- /dev/null +++ b/net-misc/connman/files/libresolv-musl-fix.patch @@ -0,0 +1,61 @@ +musl does not implement res_ninit + +diff --exclude '*.*o' -ru connman-1.24.orig/gweb/gresolv.c connman-1.24/gweb/gresolv.c +--- connman-1.24.orig/gweb/gresolv.c 2014-07-18 20:17:25.000000000 -0300 ++++ connman-1.24/gweb/gresolv.c 2014-07-18 20:24:01.874669130 -0300 +@@ -874,8 +874,6 @@ + resolv->index = index; + resolv->nameserver_list = NULL; + +- res_ninit(&resolv->res); +- + return resolv; + } + +@@ -915,8 +913,6 @@ + + flush_nameservers(resolv); + +- res_nclose(&resolv->res); +- + g_free(resolv); + } + +@@ -1019,24 +1015,19 @@ + debug(resolv, "hostname %s", hostname); + + if (!resolv->nameserver_list) { +- int i; +- +- for (i = 0; i < resolv->res.nscount; i++) { +- char buf[100]; +- int family = resolv->res.nsaddr_list[i].sin_family; +- void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr; +- +- if (family != AF_INET && +- resolv->res._u._ext.nsaddrs[i]) { +- family = AF_INET6; +- sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr; ++ FILE *f = fopen("/etc/resolv.conf", "r"); ++ if (f) { ++ char line[256], *s; ++ int i; ++ while (fgets(line, sizeof(line), f)) { ++ if (strncmp(line, "nameserver", 10) || !isspace(line[10])) ++ continue; ++ for (s = &line[11]; isspace(s[0]); s++); ++ for (i = 0; s[i] && !isspace(s[i]); i++); ++ s[i] = 0; ++ g_resolv_add_nameserver(resolv, s, 53, 0); + } +- +- if (family != AF_INET && family != AF_INET6) +- continue; +- +- if (inet_ntop(family, sa_addr, buf, sizeof(buf))) +- g_resolv_add_nameserver(resolv, buf, 53, 0); ++ fclose(f); + } + + if (!resolv->nameserver_list) + diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest index 7bdafb8aa5d9..0fa4dfd04cdd 100644 --- a/net-misc/croc/Manifest +++ b/net-misc/croc/Manifest @@ -1,7 +1,6 @@ -AUX croc-9.4.2-tcp-const.patch 1572 BLAKE2B b301b110167c4aa20d6486a5c540d0b52b626f36d4a8b1ea4cf25733b5c749ef7a9d780650745d9cf242eb9ec18951a109ba10f7b61e6ab0d1d357a6e4fe0a9a SHA512 4641184ec4b34c41b493823c518737757e566969b0770873929d63f3cecbd09c5c2a5768ff6e19c7990f8fc20af4dc2a5365322156d3750efb76924e2bd34c7f AUX croc-disable-network-tests-r1.patch 763 BLAKE2B daf8248adb801bd16f1a567d1ce16746877617a83a2f63ab640312abf3b1089105e8b71b4fcb21ccdf8cd59987ac4e5826463680634c44d417d8bf5c2b514b35 SHA512 659936bafed02bc2274ee7a9a482c711850a08ed1e871584d978930e5b38b019b42b3308a3550e388e04cbdcd92964cb5326fc5825b7b377c11e6ba99660f772 -DIST croc-9.4.2.tar.gz 2807224 BLAKE2B dce3d065e9e367f9ed472728692f624b759930eb1dd6fa96dbe901efc17d1cf88073ccc68d690610bd5db498f18dc245d2b4f74e56c4f42f3028b68bd5c5afcb SHA512 8207c5c25e9775ec25bdbab7d87ac353e459bda93874122b014e618d173ccff0fbe54a547ba7a36da93e47a6f7532dba5e21df9f1b7339e11d2faf7977eb8b33 -DIST croc-9.5.0.tar.gz 2806464 BLAKE2B 56a15469f31c86a0fd26ba938768fb7a759813a3c974b5f99081231a2da99e5bd517c493338cdf6710ec4d7a37a5bf6af3a723fa360bb84e64f02bd076cb30f0 SHA512 a12b47c1d6fc5ddeac903d7020d82cf21ba8d0efc3275c7282b7a9498632a1ec5b1032b840cc7a66435f17d224f7a499721166d6028594e1f2c59c8aa231a717 +DIST croc-9.5.1.tar.gz 2830832 BLAKE2B 22b70fee5861ce73ba5e1c289008a8af4069527215349830896830fac7e44c137ed7cee1df2c0536fbc8a331059832ab638457d00103f06118d3d3be4bdc3db1 SHA512 a3403681c17bbca9a9ec189d67486ada1c30844f4bbd595bb7961416f602bab827e4130fd45975694af99411d436693368e473f9fe3248d81c771482bfa12bfb +DIST croc-9.5.2.tar.gz 2833379 BLAKE2B de4623932b03b2c882bfa3f31aba45a6cf6383853a429a1bf5f28330ac8ca264fc3bffb9097c2eb2bc4ec3a8ba1a2ea2fe120cb0da2f6a5adf0180150b73e002 SHA512 d407379da195a0fb69b3fdd2b220e3c700d16380e495a30012628e08e5876cccb09ce3eb285285a1c4c63bfe08d0f7c3d6d64d28edc5332b0f4cd6c87b90a0f3 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765 @@ -44,10 +43,10 @@ DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9 DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod 200 BLAKE2B ac3886b13c5b45725a8b53e9f8c03b577cc1ade1d81947bc441e28d107b0cb402621def301c3507ffbae3ad822af7f04307794e6b215209ab12ccc30b0d35b39 SHA512 01d5e9bb9869ab766d61ab82cd383eeabef10b7f93a708271824958ce4f2cd6fa1140b21065809b0141c795c025c22f04501cf8874804a1fa3445ad722e42a13 DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip 11584 BLAKE2B 436025438469ea00bca4fd958a604a29d688bf0c9c205e651d814458a35728d065c7c1af9f5bf3d39b61bf629581656578b9453fb788cbd9c71af83c7f9416be SHA512 c16986d2d0ecda2c9b119abfb4565eab79c829d8eaf0c2be00079f21b4f4988fb13bcd3e61add4a5781511aecbd1411d6a9da3aea12401db89ad41a67c409522 -DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.9.mod 216 BLAKE2B 64dc481114d5b023c2dcce61c230585dc4e78b94918f5273aafffb60a58f750398c627515ce3a3aa43af3574a8ed7c7e502b65c9d45c547e90def848c2b143d2 SHA512 678e2acfe4a5296ac99974a8d50136adc1ccc7d987c356bbd2315685d4b2e865bf22404e55e7f5b8d7e24ce46d9fff9c09a6a24f5a8f8fa9a6ec48cdad88f2ae -DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.9.zip 9468 BLAKE2B 295f884ea1aa05f7db137c6b6087b8da0ea66f41782cc5da1ed61772c3a88d699209238299d0668af4d9a3de98b3b48ed9114cb1c7e6a1d85aea272d19f85d81 SHA512 8ee5004248c49a1b035d8b9c189be1c2e84e0bc08a54a781d6fa3a25a83e99bd1217d5829ccdfbf166eb798fdfe215a81d82ec61a7089c87a8b978f503579ee2 -DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.mod 552 BLAKE2B 4198583a40acaddcb10be35144f3d278a41e7cfbd67defeb4a028e5196cd5826171108dc2d0589dab341af8a85b735c436e122442e5d8ac6661dbc91fab4132b SHA512 2cb9b6c9e1a74f18c08a9d65f9523cbfe74299514d6dcf9c4bb81c3ee32dd0dd27f15031bfc5df929ebba5697633a825025f5bacb9fe13f4920e9b94fd78e8fa -DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.3.zip 606672 BLAKE2B e70ea26b06f35a20fce029fe08660e4cc8bbc9cb914715689939576b4cfe93995c1e721489fef3e5d3d65056966d5727f2c877b592159bcbaf7f108172f87b82 SHA512 f63f3d66b90e6aae2eca380b94fd0cfeb80ef656d182c7ddf5d016e0b858f2f42e638ecb1357d747017abf047a1b0b814bbbdc465d94afbf5154755a26020f07 +DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.11.mod 216 BLAKE2B 56064ed544a1be7c21a6dd1f1a2862f52bb8959c70382ce28d13ea12e429e4919b017a2e0f7e177686e75920457e133de8fa6900e80c3f530a598e9d1e51e692 SHA512 fdfe8293101d4d8bb7019c3efcbbeda88000c0b5a001522310b0e77b5019b438040992b708a2944621ca7a748bc50c4b24c926eb88af7409135a61379cac3904 +DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.11.zip 9448 BLAKE2B d5ed2a4ae8df89db0083447298e8f0c3808eb7d05abcd877c3c560e1e4170074a3da0d8700b5dc3dfbb301dd2c2a3d9125363af9c0d9a3e0c3e9789574eaae17 SHA512 f9fe05bea279c65da6318330ff41a21dfea9b9afcda5e469db10c72e93ead86cf12e12b3ffdae25885be49d2bf40cff8d4424185efab4c51880bf2349c3456b8 +DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.6.mod 552 BLAKE2B 683b60680207a2bc3bcee5186f8b9fc6834a58be1b5309f1012d4b2f5e779ec65b0324c73b2b56cd6e3c4020aac215402de192b8394ff1edf5d1382ad41e9966 SHA512 d48c15518d6ff68847df87b6ad7f6ffa4e82f938386430406a22438a9385a08c99612627661777819ce3d7fc83759106511d72170a9c6e2b3fed7d0b52f1f8b9 +DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.6.zip 608003 BLAKE2B 32fd9f2a1141ae4b62177f8829035f451592572af69767bb494ff58b4dcd1ce8b13bf817ae5b6153e94aaad39213e254de5d3004a26ecad14de8f26daa05a415 SHA512 322bd066768c864ea94d003de31e5fee4d78416fb5c75e1cd9187909559361846aeae4babac385ee3085eef64a79210c8891e3bde870647e2301ef97f35b7027 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25 @@ -62,25 +61,22 @@ DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20210707234609-9bdfc483d499.zip DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.5.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7 DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.mod 40 BLAKE2B 0d12dc1fd09b245563e86708118ecc00ddb9712b290b444c1239c190358ff523f24118c5f69c5ad1861d9056bbeafc5d04f038d6ab4df82d64019c489175716b SHA512 1cece428d8224cbbb52f74138f441ba00fdaa13105a523d6374c7674c6b40e1c784782f105ce6ef9dcf3fcbebd4c8342a81674cace5211d73e5d108d1e9f16a7 DIST github.com%2Ftwmb%2Fmurmur3%2F@v%2Fv1.1.6.zip 18380 BLAKE2B e6a082e9d919f1b442b77137e223cff934a24026f0da5981446a28788837159879ec8465c3c0f830c10243398d497f08f4cd27553bd63b578ab86540c0ec4ccf SHA512 61b2fd87fb9817fc990cff7d23547b6a259d4eea8bd9f327ef461a3e4cde4add511919ded2a19f932fcd810d72ace567bdde99f59c856296e44480167fff2dd5 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.zip 1878482 BLAKE2B 0eef87d2e4c8998450fa976e54b3d00625faad61125a442e3c824763e803257061a05d9046e3c95659cb3a18f8c0f37bea529bcf53c79fc5f7034f1f6d9d1130 SHA512 c49fad474be5b84f99f2cf45970bf1bbdf02f4ed6c8c9d6aab8d672e49972059d4f6f0535bae7647b2d5c40c7a2168a20a0557e1cb29d30811b719f50aa6b226 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210929193557-e81a3d93ecf6.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210929193557-e81a3d93ecf6.zip 1576003 BLAKE2B fdefd86810dcfe675adef45315c41659e2d43c91530bfa963072aa0339c3e5723610f6dab17d9805e4300104321505f3fc7f09372beb7e9501f9d82b77ec78c2 SHA512 17153262f765100d4fa7f544887827e2160962c6a8a62ab4230f16a1aa382ec9d77ae55289e68130bf354af699a6db2504fa68e4b3abb470c525489753aef930 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220131195533-30dcbda58838.mod 255 BLAKE2B 1cd60cf9c3ad1ae263bb27aeb201922fe3d25e4ca9e894e479313837f5c8a09cb1559d361803c72f6de023037d6a473709a755c3ac64c4acee6736d2443100f4 SHA512 8b89bda14a8eea63c73e602efb4f90d9bd5ba816041b8c8eeb516a7edbb70578e2c594f4ac7168b5cef417075b295f6aab908514244cb9bb05f7bb13f1170bb3 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20220131195533-30dcbda58838.zip 1878819 BLAKE2B f97a0cb7bf25872d6cc5b8f158662e176a6b28d99ae049c9f6c850f8ca669051be172c3e767426bb16f64153ea2d54fb0bafd916994e02dfa5ff6acea53ac894 SHA512 b00f515e62a2dba32069eced591069bb5ee7244104c21d8b0186335099162d57345339086f0160b2a3ca3e532ce26144d226c0e22962d4d9d8c95f497dd625ea +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20211112202133-69e39bad7dc2.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220127200216-cd36cc0744dd.mod 179 BLAKE2B aeb0b9d0e68dac6692cf3e9e4a7395ef0a2d4e44eab6ebc7ad8fb33150c264dd86ad609e6c08fdca6084f5ad49e695de45de7032cd999c5b805a94f8a91f610c SHA512 429ece90e145151ec4cff356689cdbc04ab43f85f2dbd594f60176f49b0ee5f9f2bfe7c7bd88bb5564adb8f3d28ea12a2722ad79a80640ede67a3ad4f9e72caa +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20220127200216-cd36cc0744dd.zip 1582089 BLAKE2B 98cac34317e5d6b8b0b0193e8556a16af3d2c7410725ac8a464216f9fbba5c4f35160cafe446d3a9bbfc643190e4a3c39c4dbf4a8030df78dadc8cfa9cb1bcd6 SHA512 4979b9a571e26c1f62e6dcb3ac56e11011d36eb240b9da685f61a7b9c5fa6395deb660597d551139f8629de8bbbe610e8d4f54c3572a7eb894bb0deeb4b477e8 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210910150752-751e447fb3d0.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211002104244-808efd93c36d.zip 1662575 BLAKE2B a40b19411acdba8dc351204a81a40a3c1e132f2a00c2bd6dd6c2139d64a89f99ab34091a1cec9a3a1a00b5fba973b937e7356c395909eb4aa1b9766ff206a334 SHA512 4cd9489cde94b383388f325620a8e9279306e3fc680dbf1c804d08adf298179ba4397817bc4d8b58c7aa8e4c4525905aaaebce1a7dcc89501d313b349834b343 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211216021012-1d35b9e2eb4e.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.zip 1702819 BLAKE2B 91e64d4d0a0954811f723849190a36b785932fc128b8f654e27b948b4422fad527b10ece4e198f76c1968f4dad55e96200161833cf4042a331f79b89c2bdcd03 SHA512 73e4190109fc29a23394a00849d96f97fd11b4857e7dbf35a9cc0faf612288c47a36d60e4d403c6774bcef218117b446563afd3b4f5acb9cf360f7a2c2209526 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 -DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210927222741-03fcf44c2211.zip 21653 BLAKE2B 53f26212f031a9dd420c6e87a1f3e58bd78715475f1e33b7bc2eb65b556d95c8901819ce02be5e7ce6a8842fce670167e302e3311f9c47a9f1ec79bf272c770e SHA512 2f7ff46b02b31f30a73e1d574fafce089e51df788a2b34b18d505d1c191149a70f222b462664218c5451a7beaa7efaf4178470703887f2e438a4455603f359a3 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.mod 97 BLAKE2B cba29395bf9693152732776bde498cfd90a27c053feb5d1ca655e5e792ff68b9cd0a519bdff559450491e918a171c8a4fdbd4c0b4bcc9b578182f63ca37754db SHA512 e77211a503c35d8b6c392fc1b44daed580659b997673cd312ae8e579d1d715d7a53f8f0f0dd2d4dedbc6c5ca5ab7e3d52269a6536a42824cce267c89eb29cbbd DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.zip 8610883 BLAKE2B 768763b6da537c25448ff274da90261ad33a527e58a5749108d9d889b326051f7bb86a64ffea0a8dc2850260223a8b60ada4615290a9ba1b9a0725bb03c3323c SHA512 fb5d646d5f23fbb33acfe486714d647d7da091fc47cc7ec805afa4f78b070ed3ccc0022428f4672280ff85a7b4d8af3543647647f00ce62f2f3a18a6d425f863 @@ -95,6 +91,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8 -EBUILD croc-9.4.2.ebuild 5588 BLAKE2B 7891b61e229cd1d8e1dd0e445f5c880fe9dec4499f75ced3485801dad626b11c92c737fe0a8e7ef6e15b7b68de0648171db69f8bcb7215ce1600f0199a8b63b6 SHA512 6f59f276383cfbf5795439f05a1775beddb48201b417115871b0c3679c4df0b9205a1d8c3c01b7f4470ddbf4154e185b4b891712d1847fd336a754e70e3e7ee0 -EBUILD croc-9.5.0.ebuild 5671 BLAKE2B 8cce99a7dd50ed24a13ca7eedeec977b3b975041ee5c5f788c83098ec72611e0bc60fb2f7b50553112277d0df6d9dda5ec59a8bc55e69f2a62605c0bd31b1b67 SHA512 dce83e2e8bf5f51b3d65b5de0ba822de54ebe52efef84ff5265793a569f4771eb1b9591ef0c903b8d19e90277e1ce1b0c7384585b62231ad9787ad738086dab8 +EBUILD croc-9.5.1.ebuild 5510 BLAKE2B b2b1e93d11846edbbb6f59809547d8a266e96ce97a6a7116140dfb73f5c83d0a3574d68674aa81b0038788592ed802d4f257b3a2b787023a2906fced10778cd2 SHA512 c0b48ede04f26c9f8835ced8543f59107a9b85b721c2d0ad30332b11ec6b0e88483ef2800207082bdcd041c0e4a6599f5dd083d5aa7097fb4d03829a5ae5fc4f +EBUILD croc-9.5.2.ebuild 1031 BLAKE2B f72a0826bf7f95a93413559e0511050f05a73c3483207295d44cc632ac555d967c798501e25531a0d04fdaa2d34acea7ee735f9d96f202228bfd41ba47ed8822 SHA512 2bd13bc734de6f47201769ec0aa5a0bfe7a28aa9d5a28e84f1b531999777589be74c28eeb82f510dbcbb88d52c0b2fefa3514459df98d5dd5c3f7d2d185316ac MISC metadata.xml 327 BLAKE2B f52f36927c80520e4bebaf1e63792cbbf31642eb2a7a4d233446a8328a2c02a69e8662e4f2c0de85228ea2331997f9c432c38d2073a8e1e51f4c024366a8c537 SHA512 531ac4904fbd95dced03613bc852e0d531e8f8498b49741edeefb396be44b8931f716007aaa36cdd1fb257735186a7be9fb6be994881f613dcde5ad6470212a0 diff --git a/net-misc/croc/croc-9.4.2.ebuild b/net-misc/croc/croc-9.4.2.ebuild deleted file mode 100644 index 0b58de198139..000000000000 --- a/net-misc/croc/croc-9.4.2.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 go-module systemd - -DESCRIPTION="Easily and securely send things from one computer to another" -HOMEPAGE="https://github.com/schollz/croc" - -EGO_SUM=( - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/OneOfOne/xxhash v1.2.5" - "github.com/OneOfOne/xxhash v1.2.5/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.1" - "github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/denisbrodbeck/machineid v1.0.1" - "github.com/denisbrodbeck/machineid v1.0.1/go.mod" - "github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod" - "github.com/kalafut/imohash v1.0.2" - "github.com/kalafut/imohash v1.0.2/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/mattn/go-isatty v0.0.14/go.mod" - "github.com/mattn/go-runewidth v0.0.13" - "github.com/mattn/go-runewidth v0.0.13/go.mod" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db" - "github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rivo/uniseg v0.2.0" - "github.com/rivo/uniseg v0.2.0/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/russross/blackfriday/v2 v2.1.0" - "github.com/russross/blackfriday/v2 v2.1.0/go.mod" - "github.com/schollz/cli/v2 v2.2.1" - "github.com/schollz/cli/v2 v2.2.1/go.mod" - "github.com/schollz/logger v1.2.0" - "github.com/schollz/logger v1.2.0/go.mod" - "github.com/schollz/mnemonicode v1.0.1" - "github.com/schollz/mnemonicode v1.0.1/go.mod" - "github.com/schollz/pake/v3 v3.0.2" - "github.com/schollz/pake/v3 v3.0.2/go.mod" - "github.com/schollz/peerdiscovery v1.6.9" - "github.com/schollz/peerdiscovery v1.6.9/go.mod" - "github.com/schollz/progressbar/v3 v3.8.3" - "github.com/schollz/progressbar/v3 v3.8.3/go.mod" - "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" - "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" - "github.com/spaolacci/murmur3 v1.1.0" - "github.com/spaolacci/murmur3 v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod" - "github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499" - "github.com/tscholl2/siec v0.0.0-20210707234609-9bdfc483d499/go.mod" - "github.com/twmb/murmur3 v1.1.5/go.mod" - "github.com/twmb/murmur3 v1.1.6" - "github.com/twmb/murmur3 v1.1.6/go.mod" - "golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod" - "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod" - "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" - "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod" - "golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod" - "golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod" - "golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d/go.mod" - "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" - "golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod" - "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211" - "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/text v0.3.6/go.mod" - "golang.org/x/text v0.3.7" - "golang.org/x/text v0.3.7/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/tylerb/is.v1 v1.1.2" - "gopkg.in/tylerb/is.v1 v1.1.2/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" - ) -go-module_set_globals - -SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - -RDEPEND=" - acct-group/croc - acct-user/croc -" - -PATCHES=( - "${FILESDIR}/${PN}-disable-network-tests-r1.patch" - "${FILESDIR}/${P}-tcp-const.patch" -) - -DOCS=( README.md ) - -src_prepare() { - default - # Replace User=nobody with User=croc - sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die - # Rename bash completion function - sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ - src/install/bash_autocomplete || die -} - -src_compile() { - go build || die -} - -src_install() { - dobin croc - systemd_dounit croc.service - newbashcomp src/install/bash_autocomplete croc - einstalldocs -} - -src_test() { - go test -work ./... || die -} diff --git a/net-misc/croc/croc-9.5.0.ebuild b/net-misc/croc/croc-9.5.1.ebuild index c8aedcc71fc8..0f043cfe8eba 100644 --- a/net-misc/croc/croc-9.5.0.ebuild +++ b/net-misc/croc/croc-9.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -51,10 +51,10 @@ EGO_SUM=( "github.com/schollz/mnemonicode v1.0.1/go.mod" "github.com/schollz/pake/v3 v3.0.2" "github.com/schollz/pake/v3 v3.0.2/go.mod" - "github.com/schollz/peerdiscovery v1.6.9" - "github.com/schollz/peerdiscovery v1.6.9/go.mod" - "github.com/schollz/progressbar/v3 v3.8.3" - "github.com/schollz/progressbar/v3 v3.8.3/go.mod" + "github.com/schollz/peerdiscovery v1.6.11" + "github.com/schollz/peerdiscovery v1.6.11/go.mod" + "github.com/schollz/progressbar/v3 v3.8.6" + "github.com/schollz/progressbar/v3 v3.8.6/go.mod" "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" "github.com/spaolacci/murmur3 v1.1.0" @@ -69,25 +69,22 @@ EGO_SUM=( "github.com/twmb/murmur3 v1.1.5/go.mod" "github.com/twmb/murmur3 v1.1.6" "github.com/twmb/murmur3 v1.1.6/go.mod" - "golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519" - "golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod" - "golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6" - "golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod" + "golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838" + "golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod" + "golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod" + "golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd" + "golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod" "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" "golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod" "golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod" "golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod" - "golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d" - "golang.org/x/sys v0.0.0-20211002104244-808efd93c36d/go.mod" + "golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod" + "golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27" + "golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod" "golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod" - "golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod" "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211" "golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod" "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.3/go.mod" "golang.org/x/text v0.3.6/go.mod" "golang.org/x/text v0.3.7" "golang.org/x/text v0.3.7/go.mod" diff --git a/net-misc/croc/croc-9.5.2.ebuild b/net-misc/croc/croc-9.5.2.ebuild new file mode 100644 index 000000000000..03dce788293d --- /dev/null +++ b/net-misc/croc/croc-9.5.2.ebuild @@ -0,0 +1,50 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 go-module systemd + +DESCRIPTION="Easily and securely send things from one computer to another" +HOMEPAGE="https://github.com/schollz/croc" + +SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_src.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + +RDEPEND=" + acct-group/croc + acct-user/croc +" + +PATCHES=( + "${FILESDIR}/${PN}-disable-network-tests-r1.patch" +) + +DOCS=( README.md ) + +src_prepare() { + default + # Replace User=nobody with User=croc + sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die + # Rename bash completion function + sed -i -e "s|_cli_bash_autocomplete|_croc|g" \ + src/install/bash_autocomplete || die +} + +src_compile() { + ego build +} + +src_install() { + dobin croc + systemd_dounit croc.service + newbashcomp src/install/bash_autocomplete croc + einstalldocs +} + +src_test() { + ego test -work ./... +} diff --git a/net-misc/croc/files/croc-9.4.2-tcp-const.patch b/net-misc/croc/files/croc-9.4.2-tcp-const.patch deleted file mode 100644 index bcd6823983b9..000000000000 --- a/net-misc/croc/files/croc-9.4.2-tcp-const.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2ffb20201c00a4de9c8082c909e2428c2b46d5c2 Mon Sep 17 00:00:00 2001 -From: jolheiser <john.olheiser@gmail.com> -Date: Sun, 3 Oct 2021 16:23:29 -0500 -Subject: [PATCH] Fix TCP constant - -Signed-off-by: jolheiser <john.olheiser@gmail.com> ---- - src/tcp/tcp.go | 7 +++---- - src/tcp/tcp_test.go | 4 ++-- - 2 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go -index 2714e5f1..d271756b 100644 ---- a/src/tcp/tcp.go -+++ b/src/tcp/tcp.go -@@ -37,10 +37,9 @@ type roomMap struct { - sync.Mutex - } - --const ( -- timeToRoomDeletion = 10 * time.Minute -- pingRoom = "pinglkasjdlfjsaldjf" --) -+const pingRoom = "pinglkasjdlfjsaldjf" -+ -+var timeToRoomDeletion = 10 * time.Minute - - // Run starts a tcp listener, run async - func Run(debugLevel, host, port, password string, banner ...string) (err error) { -diff --git a/src/tcp/tcp_test.go b/src/tcp/tcp_test.go -index 165f9537..6ba99677 100644 ---- a/src/tcp/tcp_test.go -+++ b/src/tcp/tcp_test.go -@@ -25,13 +25,13 @@ func TestTCP(t *testing.T) { - log.SetLevel("error") - timeToRoomDeletion = 100 * time.Millisecond - go Run("debug", "localhost", "8281", "pass123", "8282") -- time.Sleep(100 * time.Millisecond) -+ time.Sleep(timeToRoomDeletion) - err := PingServer("localhost:8281") - assert.Nil(t, err) - err = PingServer("localhost:8333") - assert.NotNil(t, err) - -- time.Sleep(100 * time.Millisecond) -+ time.Sleep(timeToRoomDeletion) - c1, banner, _, err := ConnectToTCPServer("localhost:8281", "pass123", "testRoom", 1*time.Minute) - assert.Equal(t, banner, "8282") - assert.Nil(t, err) diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 20f5b0677281..3c945c37d2e1 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -3,7 +3,9 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8 DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab DIST curl-7.81.0.tar.xz 2486388 BLAKE2B bf8a3a03564648a9d7a5b4e7a523d840230f03237cf9eb5b07dcb4f531b036eb8111c1944bedd0c1df188e09a09468b3487d24ea50781124bc33d194546691f4 SHA512 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df +DIST curl-7.82.0.tar.xz 2446764 BLAKE2B 838accae4a45c090909cff91477a023789a79535691c80e507fd9e9712861b0c08e25ecd26079cb8ac8946cdf429a50991a7521e7b550b43c19e455625bc0750 SHA512 a977d69360d1793f8872096a21f5c0271e7ad145cd69ad45f4056a0657772f0f298b04bdb41aefd4ea5c4478352c60d80b5a118642280a07a7198aa80ffb1d57 EBUILD curl-7.79.1.ebuild 7955 BLAKE2B fdfb668aa3523341fe5bf6dcb330b75af3279a58202c4aecb7b61a33cf9f9622c6b79eb20803cfcea2320b3d1c5509ee7e6ed6c850da6364c2dd19b3154d78cf SHA512 b9ca03e8d6e96d8e401ac0fa115788226c490e614f76cb9d6c240f5ca64adcb062ff344cdfe7666979697b9e53a436b56a5a94f1137faf723fd247029c4e873d EBUILD curl-7.80.0.ebuild 7504 BLAKE2B d55d48dcbbf407a8bdd87005b264a755221085d1ecd92b334d2136e54afdf2675b5fce23aa28cd457ef2881e42bd71cc6b2b1a25c7f6d56b979107b3620f765d SHA512 7c35440cefe794b801d8b47d62abcc72a3649fc09e0b11230cf2f7b12296f71421f52707f691faa5f92ae85872a9d90d2c941fb13fc578042ebed75c0bd2c196 EBUILD curl-7.81.0.ebuild 7504 BLAKE2B de1f81f8fcce949d901f6b9bc473c4fb9da3ef6012b38eb3ed7a23c08b35a3f89d7d2a216d3e098c81b26a0e435053c30a3f229c9daaacefc01cde567f57b7fa SHA512 97b03ac7fe5ca2c2509bd477207dbd31e877b843912d2d27201a026bb1d1c9c9836fccece432d69e48e3363f27405ced25f364d183d628317a854d993d2c5636 +EBUILD curl-7.82.0.ebuild 7526 BLAKE2B 910fc715699d55415409cc82cb0edfab2d39ca9276915126231aabbf7d93e644f430bba055f31b6b5ea1841c35e71f44e29a2e452b298c2afb7f2e7ec5680c2f SHA512 363628a912322f245e75bd1055643b722a682965d49e9448e7bc318f5aef5a99b26cee633fec203d52b59d7cce11f9d3f3eeb86e932c1774429fafbd1c91a395 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd diff --git a/net-misc/curl/curl-7.82.0.ebuild b/net-misc/curl/curl-7.82.0.ebuild new file mode 100644 index 000000000000..4da91b2a941c --- /dev/null +++ b/net-misc/curl/curl-7.82.0.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd" +IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl" +IUSE+=" nghttp3 quiche" + +# c-ares must be disabled for threads +# only one default ssl provider can be enabled +REQUIRED_USE=" + threads? ( !adns ) + ssl? ( + ^^ ( + curl_ssl_gnutls + curl_ssl_mbedtls + curl_ssl_nss + curl_ssl_openssl + ) + )" + +# lead to lots of false negatives, bug #285669 +RESTRICT="!test? ( test )" + +RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] ) + brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] ) + ssl? ( + gnutls? ( + net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}] + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + mbedtls? ( + net-libs/mbedtls:0=[${MULTILIB_USEDEP}] + app-misc/ca-certificates + ) + openssl? ( + dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}] + ) + 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-0.3.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}] ) + rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] ) + ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] ) + sys-libs/zlib[${MULTILIB_USEDEP}] + zstd? ( app-arch/zstd:=[${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] ) +# ) + +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig + test? ( + sys-apps/diffutils + )" + +DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/curl/curlbuild.h +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/curl-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-7.30.0-prefix.patch + "${FILESDIR}"/${PN}-respect-cflags-3.patch +) + +src_prepare() { + default + + 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-ssl ) + 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 gnutls || use curl_ssl_gnutls; then + einfo "SSL provided by gnutls" + myconf+=( --with-gnutls --with-nettle ) + fi + if use mbedtls || use curl_ssl_mbedtls; then + einfo "SSL provided by mbedtls" + myconf+=( --with-mbedtls ) + fi + if use nss || use curl_ssl_nss; then + einfo "SSL provided by nss" + myconf+=( --with-nss --with-nss-deprecated ) + fi + if use openssl || use curl_ssl_openssl; then + einfo "SSL provided by openssl" + myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) + fi + + if use curl_ssl_gnutls; then + einfo "Default SSL provided by gnutls" + myconf+=( --with-default-ssl-backend=gnutls ) + 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 ) + 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 + + myconf+=( + $(use_enable alt-svc) + --enable-crypto-auth + --enable-dict + --disable-ech + --enable-file + $(use_enable ftp) + $(use_enable gopher) + $(use_enable hsts) + --enable-http + $(use_enable imap) + $(use_enable ldap) + $(use_enable ldap ldaps) + --enable-ntlm + --disable-ntlm-wb + $(use_enable pop3) + --enable-rt + --enable-rtsp + $(use_enable samba smb) + $(use_with ssh libssh2) + $(use_enable smtp) + $(use_enable telnet) + $(use_enable tftp) + --enable-tls-srp + $(use_enable adns ares) + --enable-cookies + --enable-dateparse + --enable-dnsshuffle + --enable-doh + --enable-symbol-hiding + --enable-http-auth + $(use_enable ipv6) + --enable-largefile + --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 + $(use_with brotli) + --without-fish-functions-dir + $(use_with http2 nghttp2) + --without-hyper + $(use_with idn libidn2) + $(use_with kerberos gssapi "${EPREFIX}"/usr) + --without-libgsasl + --without-libpsl + $(use_with nghttp3) + $(use_with nghttp3 ngtcp2) + $(use_with quiche) + $(use_with rtmp librtmp) + --without-rustls + --without-schannel + --without-secure-transport + --without-winidn + --without-wolfssl + --with-zlib + $(use_with zstd) + ) + + ECONF_SOURCE="${S}" \ + econf "${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_test() { + multilib_is_native_abi && default_src_test +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die + rm -rf "${ED}"/etc/ || die +} diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 7f3adbc43141..b9ccf4d097a4 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -11,6 +11,7 @@ AUX dhcp-4.4.0-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec AUX dhcp-4.4.0-bind-disable.patch 774 BLAKE2B 32f09258aeaa3aa299de1f53008cfb4d4e6d994ee2034904bd7ab80d85189a2179e05acdcf43746349b9906df67c1a967c6371f49a07f1f01c892706c0db5160 SHA512 dee1b6dd62528c8c761fea4a61ddf0057a2f594746bf698b2cc31c5de211614c5b8cb5bab69190f0bdad4d1ec781946e91889fb5fa85ca7370d4357cb9d92dd5 AUX dhcp-4.4.2-fno-common.patch 876 BLAKE2B 004abacf9f6167440b762fd69bcd821df6531cc1d74514841cbc88abdef5f21a51d1907cbb1424eb787fc37d8d869344f9f43dbe908e3fa28d8836d898b6efff SHA512 1a0e0c57bc08e9746e372733fff3a726d99064cde800fc921cbaab0eb19d32bf8cd813d197fd0d64b6d8f4e18c4557d0ef2e81334077d363b995012301bbe176 AUX dhcp-4.4.2-variable-name.patch 699 BLAKE2B fd0ba7636ccd09e171bfbd6efd061335f56ea6f670c1ac3b87bd73d81938862ca065358777c05f3e5a23a8fff3d0257709fce113904afb12009da43e2908f6e2 SHA512 fccc8ab1f48756dfebec0a90ac414731cdb7f2c08e6356c5ad8b7d04f2459d94dc80692d49b304efba17beb6e2585d4250d53b3a3aee6826a934a111ee391c0a +AUX dhcp-4.4.3-bind-disable.patch 974 BLAKE2B 4a833ddbd8f67d44681044ab5393e94929ac64a694b5ebfec7344634ca1dbd71bd5becc9668c89b58c6d2efc5a7ca28fba84e0dc4e3f64be942f183710a4252c SHA512 315261ffdfd349872d2c70f9f7d2ca4a6f6bf3e6b7841ae9513c13a7856b4abc95ec56153730ff0f12826d29e7898a9fa5a053ddb63ae3e0128fcce4f5702a8c AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d AUX dhcpd.init5 2882 BLAKE2B 9ce56c4aef62641508b8f4d366672725dd277c18846f9a001de8d244ca03720aba2c52ca7bd34ac63b08db082489d915c23bd1c685c37699034373bde1a7c37f SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1 AUX dhcpd.tmpfiles 75 BLAKE2B 8e4ddbccb162c620df175dbb39621659f9905c54ba2dc46d3863438e030dee3a04bb4b528bb7ee91a1cb47564081e48ac6937a6aee4ea026adcdb1887e643152 SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb @@ -24,5 +25,7 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9 DIST dhcp-4.4.2-P1.tar.gz 9898311 BLAKE2B 7cc40dfbe578bee13c7dd7868a25d0d88358bf82b02539e933a4eba06039a43f0d99b3ef6ce811b60ed3a991b222844f4a5bd9e597c11d83b09ff551ba0380a6 SHA512 924e8b44f288361dbe837987869e57b929c73cb5e4af37cb2d7b19bca5ea8594048fb41c0792fede003188185f61b25befbc2ccda42f1f68e6b6bc22ef44b040 +DIST dhcp-4.4.3.tar.gz 10078953 BLAKE2B d88570760cc00bd72d1e9c2e76c7a7b9f07cadfbe044220a43ee33fc201c217725c3909a386ae11f28346920dacb0313d78193a9e3d7eac9757384b4fe762597 SHA512 4472d6794af80b482560956cee6895889cc1aca39980f851faf56824627e95731f2983cf7c7454bc3decb0a12c874fcbd29bd6c5a9695412def6bc14c6df17e0 EBUILD dhcp-4.4.2_p1-r1.ebuild 8387 BLAKE2B b8ea00490ae81ab747847b975dc08808c1bdf942a1d78228fe86a04179b885db597ef2fadee505367f490b92d8ee4081ca21195e404a503ca9289a4fc6a4af08 SHA512 81305c4b2da12b23c251d5816ae02b49719749e0b8b6d6fac1c710290e72ca4a8ef52673f12961aead91ecca5d927552d900f9992aa1ef4a86ec4f7d5b3ad2f2 +EBUILD dhcp-4.4.3.ebuild 8511 BLAKE2B 473f78925394d84dfb5122fe55daed8e0eb843d3b0fc3211cc859ee9dc48ae40267df0b9b1b51fda9b42973e41527224eca7e0e87c6f0a7a38546a839d72cd76 SHA512 fccc974b7e43c73df559e75f43ff75d0cb7522dd8f4d07fc1ef405feb839262bbedd801f0d7d0339ab16cd3fb2585fa671203710ac45815f5b17e2bcae2a43d6 MISC metadata.xml 477 BLAKE2B 0e786da79e394f5dcc0812f19f81fa11327f2a173e5debb9b67929aab6100695908a2a1d990a9c25547f58b9ec7495483cd9a73e1e28da09ffcf08e77b9deaf6 SHA512 18add50afc3ff6b795a94f8fd00f13c666682beb60cea990b5a7c0d3e19a104b21d3eb29c7b8438e4386129b90b275821174eb5b7f98f4523026b6e5d714007d diff --git a/net-misc/dhcp/dhcp-4.4.3.ebuild b/net-misc/dhcp/dhcp-4.4.3.ebuild new file mode 100644 index 000000000000..585884b4fc84 --- /dev/null +++ b/net-misc/dhcp/dhcp-4.4.3.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd toolchain-funcs flag-o-matic tmpfiles + +MY_PV="${PV//_alpha/a}" +MY_PV="${MY_PV//_beta/b}" +MY_PV="${MY_PV//_rc/rc}" +MY_PV="${MY_PV//_p/-P}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" +HOMEPAGE="https://www.isc.org/dhcp" +SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz + ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+client ipv6 ldap selinux +server ssl vim-syntax" + +DEPEND=" + acct-group/dhcp + acct-user/dhcp + client? ( + kernel_linux? ( + ipv6? ( sys-apps/iproute2 ) + sys-apps/net-tools + ) + ) + ldap? ( + net-nds/openldap + ssl? ( dev-libs/openssl:0= ) + )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-dhcp ) + vim-syntax? ( app-vim/dhcpd-syntax )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + # handle local bind hell + cd "${S}"/bind + unpack ./bind.tar.gz +} + +PATCHES=( + # Gentoo patches - these will probably never be accepted upstream + # Fix some permission issues + "${FILESDIR}/${PN}-3.0-fix-perms.patch" + + # Enable dhclient to equery NTP servers + "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch" + "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch" + + # Enable dhclient to get extra configuration from stdin + "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch" + # bug #265531 + "${FILESDIR}/${PN}-4.3.6-nogateway.patch" + # bug #296921 + "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" + # bug #437108 + "${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" + # bug #480636 + "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" + # bug #471142 + "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" + # bug #559832 + "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" + + # Possible upstream candidates +) + +src_prepare() { + default + + # Brand the version with Gentoo + sed -i \ + -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + configure || die + + # Change the hook script locations of the scripts + sed -i \ + -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ + -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \ + client/scripts/* || die + + # No need for the linux script to force bash #158540 + sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die + + # Quiet the freebsd logger a little + sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die + + # Remove these options from the sample config + sed -i -r \ + -e "/(script|host-name|domain-name) /d" \ + client/dhclient.conf.example || die + + if use client && ! use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \ + Makefile.in || die + elif ! use client && use server ; then + sed -i -r \ + -e '/^SUBDIRS/s:\<client\>::' \ + Makefile.in || die + fi + + # Only install different man pages if we don't have en + if [[ " ${LINGUAS} " != *" en "* ]]; then + # Install Japanese man pages + if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then + einfo "Installing Japanese documention" + cp doc/ja_JP.eucJP/dhclient* client || die + cp doc/ja_JP.eucJP/dhcp* common || die + fi + fi + # Now remove the non-english docs so there are no errors later + rm -r doc/ja_JP.eucJP || die + + # make the bind build work - do NOT make "binddir" local! + binddir="${S}/bind" + cd "${binddir}" || die + cat <<-EOF > bindvar.tmp + binddir=${binddir} + GMAKE=${MAKE:-gmake} + EOF + eapply -p2 "${FILESDIR}"/${PN}-4.4.3-bind-disable.patch + # Only use the relevant subdirs now that ISC + #removed the lib/export structure in bind. + sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \ + -i bind-*/lib/Makefile.in || die +} + +src_configure() { + # bind defaults to stupid `/usr/bin/ar` + tc-export AR BUILD_CC + export ac_cv_path_AR=${AR} + + # this is tested for by the bind build system, and can cause trouble + # when cross-building; since dhcp itself doesn't make use of libcap, + # simply disable it. + export ac_cv_lib_cap_cap_set_proc=no + + # Use FHS sane paths ... some of these have configure options, + # but not all, so just do it all here. + local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp" + cat <<-EOF >> includes/site.h + #define _PATH_DHCPD_CONF "${e}/dhcpd.conf" + #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf" + #define _PATH_DHCPD_DB "${l}/dhcpd.leases" + #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases" + #define _PATH_DHCLIENT_DB "${l}/dhclient.leases" + #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases" + #define _PATH_DHCPD_PID "${r}/dhcpd.pid" + #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid" + #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid" + #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid" + #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid" + #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid" + EOF + + # Breaks with -O3 because of reliance on undefined behaviour + # bug #787935 + append-flags -fno-strict-aliasing + + # https://bugs.gentoo.org/720806 + if use ppc || use arm || use hppa; then + append-libs -latomic + fi + + local myeconfargs=( + --enable-paranoia + --enable-early-chroot + --sysconfdir=${e} + --with-randomdev=/dev/random + $(use_enable ipv6 dhcpv6) + $(use_with ldap) + $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto) + LIBS="${LIBS}" + ) + econf "${myeconfargs[@]}" + + # configure local bind cruft. symtable option requires + # perl and we don't want to require that. bug #383837. + cd bind/bind-*/ || die + local el + eval econf \ + $(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \ + --with-randomdev=/dev/random \ + --disable-symtable \ + --without-make-clean +} + +src_compile() { + # Build local bind cruft first + emake -C bind/bind-*/lib install + # then build standard dhcp code + emake AR="$(tc-getAR)" +} + +src_install() { + default + + dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters} + docinto html + dodoc doc/References.html + + if [[ -e client/dhclient ]] ; then + # Move the client to / + dodir /sbin + mv "${ED}"/usr/sbin/dhclient "${ED}"/sbin/ || die + + exeinto /sbin + if use kernel_linux ; then + newexe "${S}"/client/scripts/linux dhclient-script + else + newexe "${S}"/client/scripts/freebsd dhclient-script + fi + fi + + if [[ -e server/dhcpd ]] ; then + if use ldap ; then + insinto /etc/openldap/schema + doins contrib/ldap/dhcp.* + dosbin contrib/ldap/dhcpd-conf-to-ldap + fi + + newinitd "${FILESDIR}"/dhcpd.init5 dhcpd + newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay + newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay + newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6 + newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6 + + newtmpfiles "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf + systemd_dounit "${FILESDIR}"/dhcpd4.service + systemd_dounit "${FILESDIR}"/dhcpd6.service + systemd_dounit "${FILESDIR}"/dhcrelay4.service + systemd_dounit "${FILESDIR}"/dhcrelay6.service + systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf + systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf + + sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 + fi + + # the default config files aren't terribly useful #384087 + local f + for f in "${ED}"/etc/dhcp/*.conf.example ; do + mv "${f}" "${f%.example}" || die + done + sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die + + diropts -m0750 -o dhcp -g dhcp + keepdir /var/lib/dhcp +} + +pkg_preinst() { + # Keep the user files over the sample ones. The + # hashing is to ignore the crappy defaults #384087. + local f h + for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do + h=${f#*:} + f="/etc/dhcp/${f%:*}.conf" + if [ -e "${EROOT}"${f} ] ; then + case $(md5sum "${EROOT}"${f}) in + ${h}*) ;; + *) cp -p "${EROOT}"${f} "${ED}"${f};; + esac + fi + done +} + +pkg_postinst() { + if use server ; then + tmpfiles_process dhcpd.conf + fi + + if use client ; then + ewarn "The client and relay functionality will be removed in the next release!" + ewarn "Upstream have decided to discontinue this functionality." + fi + + if [[ -e "${EROOT}"/etc/init.d/dhcp ]] ; then + ewarn + ewarn "WARNING: The dhcp init script has been renamed to dhcpd" + ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and" + ewarn "and dhcp should be removed from the default runlevel" + ewarn + fi +} diff --git a/net-misc/dhcp/files/dhcp-4.4.3-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.4.3-bind-disable.patch new file mode 100644 index 000000000000..7f99f771cd11 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.4.3-bind-disable.patch @@ -0,0 +1,27 @@ +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 2e60091..a155194 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -37,6 +37,7 @@ installdirs = includedir=${binddir}/include libdir=${binddir}/lib + @BIND_ATF_TRUE@all: bind1 atf bind2 + + bind1: ++disable: + # Extract the source from the tarball, if it hasn't been already. + @if test -d ${bindsrcdir} ; then \ + echo ${bindsrcdir} already unpacked... ; \ +@@ -60,6 +61,7 @@ bind1: + fi + + atf: bind1 ++disable: + # Build and copy the ATF support if not yet installed. + @if test -d ./atf ; then \ + echo ATF support already installed ; \ +diff --git a/bind/test b/bind/test +new file mode 100644 +index 0000000..713671f +--- /dev/null ++++ b/bind/test +@@ -0,0 +1 @@ +++--disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --with-gssapi=no --enable-threads=no @BINDCONFIG@ --includedir=${binddir}/include --libdir=${binddir}/lib diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest index 8e1f2bdcbd2c..ffba7b6e91c7 100644 --- a/net-misc/dropbox/Manifest +++ b/net-misc/dropbox/Manifest @@ -2,14 +2,13 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85 DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712 -DIST dropbox-lnx.x86-138.4.2392.tar.gz 100212564 BLAKE2B 901212edd0a0034cf8040bc745d0ce50c38f922305cad9c07d4c48be935758658e729087008ca039273b2213dd756dcfd212aa10a803bc14537a570e06de5d5c SHA512 b17f77267cfe08ed4d5be3a2087eb8c1fdd7112245aa7f63f7d334f404bc6617dfa45f8f38918971bed051d7f3a9e765b910c597de63e2d48a5afd3d3d9a4fa4 -DIST dropbox-lnx.x86-139.4.4896.tar.gz 99109699 BLAKE2B 42de55420b78be67f863a4e53c252afaf7123ced2df2a597c44cdd4f62482a494c078446a6de15301ee2fbcfda08e8232d8964b9c11d40109b397142ceeb0470 SHA512 57d31a961eec14887af5ac1cadd06b202b4d181e864000f10596637602cf55ad9ceebb5442aab06bf09abeadce7ded4b4794ccfc299a4c0e9dbd6945311d45f3 -DIST dropbox-lnx.x86-140.4.1951.tar.gz 99178001 BLAKE2B eb9f6686386ea7f844f9284786fc9f8ec33653c740de8c6b14cf2853fb21fd883cc317ecf57232d479a5964662bfbe65c675871fa946a68869f797b766bb0724 SHA512 857e97d7091fc4c10c693828424ca0df367c8d4456092e44eade0b6d5057a10923db02a23620b5eb5055ddb53913a7ef7b09ff385529a9da7b0ddf39ae13daa3 -DIST dropbox-lnx.x86_64-138.4.2392.tar.gz 101870495 BLAKE2B c9e38624814afd47776a04d0cf8f7ce7fe1392a72bc778d322f91e3aa097e2769acfe696366dd98f53b2af5ff87f88a9bb78bc906a3cfcd6bff0cd436fb16bd5 SHA512 6692711545af89bbde6f43bafb76b8c89d813522849ddfc66892d575ee4c315273a4a489a73f6e80f457c8b2059a62100469c4d43dd12f99a98d803fde9701bf -DIST dropbox-lnx.x86_64-139.4.4896.tar.gz 100772994 BLAKE2B e8e79fb351441f4f619227967c7e74f25ac17d305b97ac51dd71e00dc72ca1d213cfeab2f49ed8bb545386de07c9beac249e881f9dafe485575c57766e29def1 SHA512 7f30247b0caa11dcea1c182644611a66daea43b84a97f829342927b7bb80d71dd0ea0bb602eb107e4b4f83d0f2cc5802a0b07f94c01a48d7af0b8d484dd6237a -DIST dropbox-lnx.x86_64-140.4.1951.tar.gz 100824435 BLAKE2B 03f35dcd651535dbbfaf593119f1ffe58c5c4ee6e1beaac178affdd560e3aad406d36a4b990130915c0152ee9694133142073ad420bf72d6297279f804e358c8 SHA512 97e85eb5426ec26361b57ab07e34b5aefd17925ba2ca73b1f75b006cd6697e42e08b75781ffbef9456ce2e1c36f549c0c7ebf823b495331c98c5fd5c55724471 -EBUILD dropbox-138.4.2392.ebuild 2673 BLAKE2B ea072896d60698af6f9e20e5fe55d846c858748a04d3b7530df6bd5e33b159a76b82046b246a2c38ff56bfc0503c7a71199e5cc2c29731d45349a5f39c3553d0 SHA512 929ebc6094fac362fed2d41379ff535a632da9a9e3c5ade2b1d66a591e9c571b8bb981cfa109a8460918e5e89af49a10071cb7ba4f972d3d66bed673567320c0 -EBUILD dropbox-139.4.4896-r1.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820 -EBUILD dropbox-139.4.4896.ebuild 2675 BLAKE2B b90735c78f9beb3ed1b4b291bd3945fe2abdeadd9bac0580fc9bf0400149f54f8153495a6ce9d0affbeabf515ce3753d7db9e16be304e32c440eea21308aa422 SHA512 57e11c59311c192269b40d2b9025dfec194f0013d5a8714477f7f3c7ca8a0169c2b2d07c8b744fe728f01238de6c96439c0d16ee9cddfd4381f9401e56a5372d -EBUILD dropbox-140.4.1951.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820 +DIST dropbox-lnx.x86-141.4.3299.tar.gz 101154693 BLAKE2B b95f1b1d9ba4673bb8c66129c6221f72f0bd08b86152f4a810e4d7346f52f5bab3488747d007ab6c9f15cf1c9a4df1ca68097f21122465386822a8862f3888dc SHA512 2c9277fa73a5930b2abf113b4f52f205b7dd2cc5b6eb4d46487fb3a70019b77d0fdef7afd24aa9563f527d2b48094d2da865e122523a79f30cbdf0c2c3f87205 +DIST dropbox-lnx.x86-142.4.4197.tar.gz 101203911 BLAKE2B 5f8d299372fb0e6d67eb091ebd95c0f92fc1a1ca7e89b4bbad6c00a7f8b049c9aec46cc330657e797b0125e9c090fec40cbba5475e376262ad38f94ebb9daa58 SHA512 65f77bd6b9906291246a5dd7e5e1ad2771ed4f2e1a969e0335950a88043a0799564ed0d1efa61a2495d4dfd109278edc4b3adeac9b0959cec9e0b3f3f655410f +DIST dropbox-lnx.x86-143.4.4161.tar.gz 101332974 BLAKE2B c81417a3f100c064af4370cac698a46b7f667eb26b819dbc8420ed7bf583cc5e07ac469cb34ffbb5818314c5adb1869b8611b7c5768feb307f62fcbaf49541c9 SHA512 41ad7016feb2560d09877388e423e16364d132abb1ac4d875b19b3d1be71b9c2f313efcc09f18ebdab6fe3b36f6add50137ea36e67737320a7ec0a229643978c +DIST dropbox-lnx.x86_64-141.4.3299.tar.gz 103354049 BLAKE2B 5f2d881d8c8422707ab42b3a4f75ca9a9c32023273f3bb0bacd6eb7a9cf89b45b3aa8442649868814ca8d4063978ddb8f34c5c1bc464274c103075ecc19ea514 SHA512 16dd3c717c7cd578b7a7af53cb3f432ce849b5ee7bd13ba86ff919e59c35b8b5ee8e70784995cdfdf49b877d0c3d9ca5638974ee3cbe863e332978c5fad905bf +DIST dropbox-lnx.x86_64-142.4.4197.tar.gz 103610767 BLAKE2B 005a0b36b9265f6ec9e4b019ac8df1a2e83f56cf15f6f558ab167fa2972a1fad4e605e7553b819877902dbf63685c77c47468882e47c1ef9ec1965d00fe455ce SHA512 30228316033d76dd1204a909f6fb21f21bcb1e2c5752a000619c4a69859299bc441830f5ca5439ea096f2e3f493374257367c90b5d4d6f4c8268bf3010913244 +DIST dropbox-lnx.x86_64-143.4.4161.tar.gz 103726609 BLAKE2B ac611ed45d57d0ffa9f31ba5078e54fdacebc5b59cfc82d101c87db69ad1eff5709159898504c7032e680c4d26d22ccf149299ce874e8709c765fcf9ad5ff41d SHA512 fa885e6ada8000c888cca201127c3511da3e5a007b0984105eb20cb3615addb26dc1558561ab59cecf8835697fd2ed64a357ac28320960b0dbd7778dfbbedd92 +EBUILD dropbox-141.4.3299.ebuild 2865 BLAKE2B 05f3927207125b61497a4ce3c6e76d4e0380bf5f06ef104942036b4663ba6862b64c3ac140753d0199df66aa2556cbb10eb149720bf219f220c7609df970bd11 SHA512 4da3e90183b7f79ce35e50e1b231cd1a3cfb9aeb4fbeafe4cbb922ba45e805e39c2fe91176d52dda7073ff0b8cf300069222fac35fa928fc88ecc936937204d5 +EBUILD dropbox-142.4.4197.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820 +EBUILD dropbox-143.4.4161.ebuild 2867 BLAKE2B 5cb3cbee274db23705e0e5804036332e08450993fe1ffe41ad7ba97b6b85a772b02aed8c4eede759406c65892dd757e49dcccee9be56d66bf47eff1f046add30 SHA512 56e3830c2c7eb74129c91a014ad2ba605df87c5b6e5a98020e2d226375a5343e891c817685375eaf1cc3449d10e427ff5921192cbb3a5373a736781b6e175820 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0 diff --git a/net-misc/dropbox/dropbox-139.4.4896.ebuild b/net-misc/dropbox/dropbox-139.4.4896.ebuild deleted file mode 100644 index 3592a37d70d0..000000000000 --- a/net-misc/dropbox/dropbox-139.4.4896.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop pax-utils systemd xdg - -DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" -HOMEPAGE="https://www.dropbox.com/" -SRC_URI=" - amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )" - -LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="selinux X" - -RESTRICT="mirror strip" - -QA_PREBUILT="opt/.*" -QA_EXECSTACK="opt/dropbox/dropbox" - -BDEPEND="dev-util/patchelf" - -# Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND=" - X? ( - x11-themes/hicolor-icon-theme - ) - selinux? ( sec-policy/selinux-dropbox ) - app-arch/bzip2 - dev-libs/glib:2 - dev-libs/libffi-compat:6 - media-libs/fontconfig - media-libs/freetype - net-misc/wget - sys-libs/zlib - sys-libs/ncurses-compat:5 - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/libxcb -" - -src_unpack() { - unpack ${A} - mkdir -p "${S}" || die - mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die - mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die - rmdir "${S}"/dropbox-lnx.*-${PV}/ || die - rmdir .dropbox-dist || die -} - -src_prepare() { - default - # we supply all of these in RDEPEND - rm -vf libGL.so.1 libX11* libffi.so.6 || die - # some of these do not appear to be used - rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \ - PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \ - wmctrl libdrm.so.2 libpopt.so.0 || die - if use X ; then - mv images/hicolor/16x16/status "${T}" || die - else - rm -vrf images || die - fi - patchelf --set-rpath '$ORIGIN' \ - apex._apex.*.so \ - nucleus_python.*.so \ - tprt.*.so \ - || die - pax-mark cm dropbox - mv README ACKNOWLEDGEMENTS "${T}" || die -} - -src_install() { - local targetdir="/opt/dropbox" - - insinto "${targetdir}" - doins -r * - fperms a+x "${targetdir}"/{dropbox,dropboxd} - dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - - use X && doicon -s 16 -c status "${T}"/status - - make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo" - - newinitd "${FILESDIR}"/dropbox.initd dropbox - newconfd "${FILESDIR}"/dropbox.conf dropbox - systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service" - - dodoc "${T}"/{README,ACKNOWLEDGEMENTS} -} - -pkg_postinst() { - einfo "Warning: while running, dropbox may attempt to autoupdate itself in" - einfo " your user's home directory. To prevent this, run the following as" - einfo " each user who will run dropbox:" - einfo "" - einfo "install -dm0 ~/.dropbox-dist" -} diff --git a/net-misc/dropbox/dropbox-138.4.2392.ebuild b/net-misc/dropbox/dropbox-141.4.3299.ebuild index f3ad56f900ca..f43dae64fff9 100644 --- a/net-misc/dropbox/dropbox-138.4.2392.ebuild +++ b/net-misc/dropbox/dropbox-141.4.3299.ebuild @@ -9,7 +9,9 @@ DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" HOMEPAGE="https://www.dropbox.com/" SRC_URI=" amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )" + x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) + https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg +" LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" SLOT="0" @@ -85,7 +87,10 @@ src_install() { fperms a+x "${targetdir}"/{dropbox,dropboxd} dosym "${targetdir}/dropboxd" "/opt/bin/dropbox" - use X && doicon -s 16 -c status "${T}"/status + if use X; then + doicon -s 16 -c status "${T}"/status + newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg + fi make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo" diff --git a/net-misc/dropbox/dropbox-139.4.4896-r1.ebuild b/net-misc/dropbox/dropbox-142.4.4197.ebuild index 0c3e0f739306..0c3e0f739306 100644 --- a/net-misc/dropbox/dropbox-139.4.4896-r1.ebuild +++ b/net-misc/dropbox/dropbox-142.4.4197.ebuild diff --git a/net-misc/dropbox/dropbox-140.4.1951.ebuild b/net-misc/dropbox/dropbox-143.4.4161.ebuild index 0c3e0f739306..0c3e0f739306 100644 --- a/net-misc/dropbox/dropbox-140.4.1951.ebuild +++ b/net-misc/dropbox/dropbox-143.4.4161.ebuild diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest index ec0383e5cb02..17043ed57405 100644 --- a/net-misc/econnman/Manifest +++ b/net-misc/econnman/Manifest @@ -1,3 +1,5 @@ DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b +DIST econnman-1.1_p20160305.tar.xz 240428 BLAKE2B 6417b30fd110416f6339b4dfad9edaff2888e9fb9562451ffb13661664c1e51d45f513a192f7850f8030caab13ebd914a138ff6cd596ed09c7210940c98ce748 SHA512 c50155a286e8a8d20deb4d5bf30ce91cc97e7323bc6dd209a16c767c3a1d6f30aab0d3b60c3a14df091d086fc10c2584d7bf56c59c95af684af3d2af7eff726c EBUILD econnman-1.1-r2.ebuild 868 BLAKE2B e7fda84fe81a76306006310768da2babde38fcdf492ec0c93acc86ab04ca0bbaaa8e23c9c5a79039060eb5b75f13fc81704a2ec859c0847fcdf8e410779d6253 SHA512 b99a9baedc815e63a74ddecb97ba8d6b5dd7205b3e74afff823cf65368a5cf48ff4c52a11978240649b40db69fdf9da390d0537af71a150351903ac37f1d4644 +EBUILD econnman-1.1_p20160305.ebuild 772 BLAKE2B bb0b4fa8f0616d193bd8f403adca94ed7248cc6b502a400a4e21aa68a2006db1c4f1215532e829aad4a9381b7dbaddacd4f6416d766d6e7678208782b86c229f SHA512 502b61f8724dea73adc5806ed6869b7d0a080e83ff800ad1efe0e8aab5b14e4d00c446a58b291cd0096bd0dc9357d80b147860b2d190529cd6a615a7d1cffd72 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362 diff --git a/net-misc/econnman/econnman-1.1_p20160305.ebuild b/net-misc/econnman/econnman-1.1_p20160305.ebuild new file mode 100644 index 000000000000..be864310ff2f --- /dev/null +++ b/net-misc/econnman/econnman-1.1_p20160305.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools python-single-r1 + +DESCRIPTION="ConnMan User Interface written with EFL & python" +HOMEPAGE="https://phab.enlightenment.org/w/projects/econnman/ https://www.enlightenment.org/" +SRC_URI="https://dev.gentoo.org/~juippis/distfiles/${P}.tar.xz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="amd64 ~riscv x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + dev-libs/efl[X,connman] + $(python_gen_cond_dep ' + dev-python/python-efl[${PYTHON_USEDEP}] + ')" + +src_prepare() { + default + python_fix_shebang econnman-bin.in + eautoreconf +} + +src_install() { + default + rm -r "${ED}"/var/ || die +} diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 7227802805a2..93a3731f6f72 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-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92 +DIST electrum-4.2.0.gh.tar.gz 5065087 BLAKE2B 800667f2661ef45fae7e7f2d73229810eb490e90a9bea7ff84c04c3cf859f07ac71972658a52f802817a42de7eeb0084c6b0e1aba74733918f250228996f0641 SHA512 72c8afcd2f3fc3de2b8b6516dc82355718c7dc9a88b06ba91d8e3a3d1e2bf329c02cfc8ea9dc22aff88fbde622dd443606f14e11e0bf8050da5765cd9be75a83 EBUILD electrum-4.1.5.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d +EBUILD electrum-4.2.0.ebuild 2250 BLAKE2B c7609f6232a501975c536bccc6e5f71261690763d8df18b02ec469b10122f0cb0692247c643f1cb3d70e64cc4f5b71238b79edc152890e87df761309d2a77a80 SHA512 7e8c3165cbe29bf5ab8f80eef0817b49035cf49954011e939ae5abfdbcacb863bc855749429662ae91de8b95f603ae4c222e703c5ebd1ac926c1455f20f03116 MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625 diff --git a/net-misc/electrum/electrum-4.2.0.ebuild b/net-misc/electrum/electrum-4.2.0.ebuild new file mode 100644 index 000000000000..02786de94c6c --- /dev/null +++ b/net-misc/electrum/electrum-4.2.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..9} ) +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.22*[${PYTHON_USEDEP}] + >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}] + dev-python/bitstring[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + >=dev-python/dnspython-2[${PYTHON_USEDEP}] + dev-python/pbkdf2[${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') ) +" +BDEPEND=" + test? ( + dev-python/pyaes[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +src_prepare() { + eapply "${FILESDIR}/3.1.2-no-user-root.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 2d37738a07c5..b63f3161d369 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-r1.ebuild 894 BLAKE2B 8791009c7487ea5ff910fb6ab24afa0c15c970ac8623db12bbb95ea8be9bd4735e5ec68b111be312707df56e70a9b52571c9d92b782df5aaa3c70cfe73200722 SHA512 c132e2e916cd922ecb602faf5821c56c0c90aac1ffc8d3ab2b49cc3b6edc5971b20f4b93d37db69875bd690abdb0549c367991adc2c8282815012d913f760837 +DIST ena-driver-2.6.1-linux.tar.gz 542085 BLAKE2B 1509d3a22478d648426c788e8343ca121883a2d5fc241a8dbd95836ae48160795ae953a2327ea31190caaf8eaa69d72331a1cf250b56fe8af2fcfd98e3ecd313 SHA512 a24c2c062cd66cbfa8fb9b1fa7093650eda1061bd502a3e57bfdbf3b5b36064f457860e4d5cb045f11de6437e03ad2cfb3390be8876a0ee7a474be1d5cdd8f40 EBUILD ena-driver-2.2.3-r1.ebuild 947 BLAKE2B 598eec22ab8ccd9fbe9d9fe01f8c71d849acb6611d2b485cd3556707763157a8a06196ed715f94f9b780d7290359f5e4f018eeb24d592bcc0af3a8d66c8817a4 SHA512 2fb0cb0bc78d7c3e314d1adeafb95161d285875643a0174a7bb8f74ef68c0382e447566dc053e0d20fb66ca54d370bab23993cfb2f1550f2d9cf965b68d12d4c +EBUILD ena-driver-2.6.1.ebuild 947 BLAKE2B 1ab5211b4d31be416aed0004d5835bbed4271b062b673c617509781722d7706459eda36dd90546d0e67ee4dbd9f7c658f4d61e8a3bca1ebc0e1bba446a7eaea5 SHA512 09c5b5c091b6495a4d03732bf9bd715e3cf856e97383a2b57013a33080617bee45df094972ed727b470ff7d2ecdd463b62510d0875872af91e6cfdef4795d6da MISC metadata.xml 347 BLAKE2B b9e95fc5342cb1467213a06e52049e0fe6c3a20069f46a0f9b8b2696ec36ecd8b1c5c01dc536cd644bf9468f0d71dad2db8e960958f217b4d185535db6522ca5 SHA512 4739339c1e6b03df00798098f8a0d55f2739508ce0136173cb449f0308feb06e9403b7c00031dbc63403ef213272ffea315c2e8f0a46515a9059c5676b789392 diff --git a/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild b/net-misc/ena-driver/ena-driver-2.6.1.ebuild index 37619f91213a..ec4ec56c1689 100644 --- a/net-misc/ena-driver/ena-driver-2.0.3-r1.ebuild +++ b/net-misc/ena-driver/ena-driver-2.6.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info linux-mod DESCRIPTION="Amazon EC2 Elastic Network Adapter (ENA) kernel driver" HOMEPAGE="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/enhanced-networking-ena.html" -SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.zip -> ${P}-linux.zip" +SRC_URI="https://github.com/amzn/amzn-drivers/archive/ena_linux_${PV}.tar.gz -> ${P}-linux.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -20,6 +20,8 @@ S="${WORKDIR}/amzn-drivers-ena_linux_${PV}/kernel/linux/ena" MODULE_NAMES="ena(net:${S}:${S})" BUILD_TARGETS="all" +CONFIG_CHECK="PCI_MSI !CPU_BIG_ENDIAN DIMLIB" + pkg_setup() { linux-mod_pkg_setup BUILD_PARAMS="CONFIG_MODULE_SIG=n KERNEL_DIR=${KV_DIR}" diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest index 81568c692d1b..a215b1c8f159 100644 --- a/net-misc/etherdfs/Manifest +++ b/net-misc/etherdfs/Manifest @@ -5,5 +5,5 @@ AUX etherdfs.initd 242 BLAKE2B b3109ef0534637cecb3d116254457c562e59c44042e94b3cf AUX etherdfs.service 210 BLAKE2B 0e3243da13f6be2251239fe43a5c675388175a1e62d4119cba30a2a35f6ca69572ff3176d944e39d55e442cb3cd1b599a8ce6d09bbd5ddefb9bf0c67aff216d5 SHA512 13a555a8c4e82f3b033d946f82064fcb0c3d026393da8abcff9336e6a20d36b2185fac3b3562dde59260c43b8a45b1c6dd1e95faf40abc870605e50f0fc8b381 DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439 DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e -EBUILD etherdfs-20180203-r1.ebuild 1164 BLAKE2B 960bb72bbc35547f40c12c84e35ceebaf64d7f892c971cd992b20279851547981acc791b1fd05a8fcb16bceb32b947d89625f7906a130643b4b793d210c1af7d SHA512 498f706beb677a3cc38e7ab271b8a3845e56f99c6668d9e2e192d52591c23ad4bcca16471a1f92a9f7f5f3c2768356d7cb1c6785f8804f7736a103ad6ac4accd +EBUILD etherdfs-20180203-r2.ebuild 1163 BLAKE2B b3e1a87158a3c6ab551b97c72b00e50e438c23b4d8784f1fbe0b6326a86e60470b3c40a20a923252cb93021df819be017f39859702c3893d3b144a55213595dc SHA512 b38cc4d3807bce39dc2a4783a917e6e5af73bf065619d54151e7a0fcb111e8255e26713342f9b45eee4c80ca9fa62b4ddde7488854eafe1fc97afbcaaf4b6fed MISC metadata.xml 629 BLAKE2B 794c6caaf34566e3add393fe39c9889f30433594e74241e3f3cf56b964f3b765d4cb13e9338df520a398179adad079c272479e0b8dbc7feae7cd42aba4f76df0 SHA512 33afeaa1e364e05170919978cfbed059a5db1a5a0ec2494d8ccf4b63392690d80e68e7e4b151e7ab5cbd38bbc630487be52e6a455b4d2e5fa10a4f0c65c1d30c diff --git a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild b/net-misc/etherdfs/etherdfs-20180203-r2.ebuild index 0245ab3d16a3..50c020777f6f 100644 --- a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild +++ b/net-misc/etherdfs/etherdfs-20180203-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="ethersrv-linux" MY_PV_TSR="0.8.2" @@ -15,6 +15,7 @@ SRC_URI=" mirror://sourceforge/${PN}/${MY_P}.tar.xz tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${P}.zip ) " +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" @@ -23,15 +24,13 @@ IUSE="tsr" BDEPEND="tsr? ( app-arch/unzip )" -S="${WORKDIR}/${MY_P}" +DOCS=( "ethersrv-linux.txt" "history.txt" ) PATCHES=( "${FILESDIR}/${P}-makefile.patch" "${FILESDIR}/${P}-musl.patch" ) -DOCS=( "ethersrv-linux.txt" "history.txt" ) - src_prepare() { default diff --git a/net-misc/ethertypes/Manifest b/net-misc/ethertypes/Manifest index a74abec465d4..6b8cd442e4ff 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 588 BLAKE2B 4a8ca60dd603e39f7c1bfba5b5e6ade918cce49be4fca91f2f8e50e7bda8f935419328c2f55e61658181ed950d4ec5c73e10eff325735f360daedde21fd903b4 SHA512 826e1ac25b01c07f682cdaa1a45fdfe93597d06d48a66a82a19f82af01ba1f6113fd9b5e95e916f58a2f5c3b39aa3538973029be7d8878958981c7e9766aa40a +EBUILD ethertypes-0.ebuild 587 BLAKE2B b99012f3bb120283e684808fdeeb76eda70e364146d6c7e0f796b0f26a5915c1622db496cf06677a552c353d79235d65f380730eadd70964ee86473425525beb SHA512 9b55e4c1fa1c3707d3f73dc37bec00e7b730253ed52250216a3ea64a3a3950f5b9fc605229d7225695314158b84233075ccfb821b00f798844362354eda8c66a MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5 diff --git a/net-misc/ethertypes/ethertypes-0.ebuild b/net-misc/ethertypes/ethertypes-0.ebuild index 7990052a3340..02432aa241e5 100644 --- a/net-misc/ethertypes/ethertypes-0.ebuild +++ b/net-misc/ethertypes/ethertypes-0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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/ethflop/Manifest b/net-misc/ethflop/Manifest index bf7db7aa2edf..bb6ae886d9f2 100644 --- a/net-misc/ethflop/Manifest +++ b/net-misc/ethflop/Manifest @@ -3,5 +3,5 @@ AUX ethflopd.confd 270 BLAKE2B f88ff41ed7b083b3251b0aed5612eefbb4e6d652f4ba7fcba AUX ethflopd.initd 236 BLAKE2B 938ff83700a252586b83b4d3f209a71bafe3b9ec87e1fff8ac86ceecd00ddc245c2e74dc7f66aed940fc7fa858c027c7ea1482343f0c59e86aaba393ec9b16f7 SHA512 974369721f6da77da247bdac70e077f4b93323af4ccb3ba5db30e6901c5a6962007592dcece1650c1e6fec12be9b9c8088b42fddec3db2ecb506e044292a5b8e AUX ethflopd.service 204 BLAKE2B b97258123ec2ef1e9b556fe5f81c33c14b3bfac7a8a345ec4be75d1a12882acbbfd5eb8ad3f766395ef8d3e59a5e71cba338cc2fc43bd61928f01b250a242752 SHA512 83a0421825835c35d0f0c7244e2d444002bde0459ed0aa3e4589aba67a6a7758958a7b8087ec9a181e37f8d5af428d53a06957ed0d5e099a63f9e9dc600c2efe DIST ethflop-20191003.zip 29858 BLAKE2B e5a4068d45c398d6c7bfd08299b57566c3d30bea4ef79692cae065adb61f3c41fd3ed568260e82e19d90e17c7b6d92c0698bb7f7c40edea9d44804a7a61e18ae SHA512 808e65d45e2ff74380bc2f1a31b7bb59fdca4acdf44eb7f60deef9aa0976462ddc64982e8a7b7c225d7f88e11a33dfcdf73fd7169f942018976d4d086e7ec477 -EBUILD ethflop-20191003.ebuild 798 BLAKE2B b86ca09cfcf9c159ffa74b0e29d2dcdb5c8fa3eb8035bdc71f9b74b41d12610b7cbdd0cf6fd9f9d8cb170ea75568009b1a993a51b5a2bfc8efcb2ecddd3ebb6e SHA512 b2501ae191944588e26f273a550c660d6d240e659bc1f084c88c608f7ac3998102ccb4e2f4e74ecd09fbbdce81da28330d51615f064a358d2d94c3e8840d0346 +EBUILD ethflop-20191003-r1.ebuild 797 BLAKE2B 4b394fffc112b5e7a60c1d4eff0943d92b6389e45dbbbc26584a9ac569c43a853214d64e5ab90420460d9e2d5de5f82e409415d01ae29ba53685dd733d5b8527 SHA512 40f6be51cdddc47e5ae76ee806097729aac23490935268190cd6e6a513e755886fa894f87739aa3bcdb926ac074610f8686ee7887506863053ba5e84e7282795 MISC metadata.xml 1005 BLAKE2B 53476c21744a6300cf693817062667c1db71a9fb85c174b37802c5bd875bee9e5a6b396a7d09ffd10c49bc9e8d63daa032823db25bc0245155acb8c89ed1b339 SHA512 fd7a538735fafb244a27a33539650ea56d06e97655843b7fe1436b461a8c113db9a2fee524571b2fb55ec01e8a47a0bd9ee0b63aae623f172a83c56bb0a7315a diff --git a/net-misc/ethflop/ethflop-20191003.ebuild b/net-misc/ethflop/ethflop-20191003-r1.ebuild index 2849cf041382..4c959d92f65d 100644 --- a/net-misc/ethflop/ethflop-20191003.ebuild +++ b/net-misc/ethflop/ethflop-20191003-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd toolchain-funcs DESCRIPTION="A network-backed floppy emulator for DOS" HOMEPAGE="http://ethflop.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.zip" +S="${WORKDIR}" LICENSE="ISC" SLOT="0" @@ -21,8 +22,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) -S="${WORKDIR}" - src_compile() { tc-export CC default diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 1280a728da8e..910e194c4122 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -2,9 +2,11 @@ AUX freerdp-2.4.1-rdpei-free.patch 859 BLAKE2B 2bf990acf4b4294bedb11acd824637b16 DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a DIST freerdp-2.5.0.tar.gz 7303832 BLAKE2B 93f7428f04e0f5faaf93c08acd75cb4af655b52fc89653d470f28175e8d3fad9b61c9c19bfd7fb7e6edf947c9cca12a1d6a98b410409cd9f96007de1bc52b034 SHA512 d9f70bc12175d4ab1c874a2106d37c7d8c0f5e1f81ef30329518eecc5c58c0131429243a3faa6c7d68b187c8f43f93000a1de0e39e81ab71ad626e33f373f33d DIST freerdp-2.5.0_p39.tar.gz 37767 BLAKE2B ae520958e2b1418c46d20c4fb50ecf952d0b0cf2c455dca2d6cf08daf85dabcf2dacb5934240a7c3411ff490903bf15a21f621267a47e81e57edaf520b93c274 SHA512 e7455953f11b82290f6689f4ebaa030e73bf5ea3dac768527027bbb09e4d925208d9b324ae175d28642c161eb0e3227f6c98f4c8717e1f83c81d4399586495db +DIST freerdp-2.6.1.tar.gz 7270692 BLAKE2B c4da1868be5f1fc40fb14ba54b33c7c79c66cf44b464e4f2e62cfd9cad2da3a6980dc5d33fdd93a11bf8138a75e4427c46977a7110f4cb8669827c0940e3b196 SHA512 4de8718924b63b32fb5068c6538ba31f966e3cc14d17ae42dc90a01787dfff388c486263dcc085777baf4ce25b89f12191e1a5d6afb42f17cbcb38282f4868b7 EBUILD freerdp-2.4.1-r1.ebuild 2871 BLAKE2B de9740ea0c2a87abab293645ec75da55f51fb63edd01b7335b8783b06294000ddb56681004ea2c190cd4fceb9da70016370cb8cd1be09852f63401d86a19ef07 SHA512 237d458cdeb28bde23fe764705fad0bf5916faaf8ce775963210c24b8c377d6ede9b8c4f7e114593babd79c31716cb4d689ddb28085b70ed1d67251dfe7e4332 EBUILD freerdp-2.5.0.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124 EBUILD freerdp-2.5.0_p39.ebuild 2919 BLAKE2B f9f712ac341b9d43db123a21313fb7baa84f58fca229d2453d84b56b7e93de954c158596f54e358bb9c0c446359b039503f9704a3be1dbfd2fb4e7530e169ae7 SHA512 778f79acdc9eeb81dfeb0d1fe3c19823e77ac3b7af925d93d0533dbe0b1f39737b71554bc0ce8404c9e1cddb983b43a749d9a1ad92f1de425f41bf02dbc2bdbd -EBUILD freerdp-2.9999.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124 -EBUILD freerdp-9999.ebuild 2818 BLAKE2B 1e4378eda5aa5126b96edc10699ec57e760fb2c0145df2cf2c5013e4a311286f90243965b98ce1b50a2e611b118a9a032578c1d909590988d3e1c1aee973bf13 SHA512 491028d8efd3a5c1bf1d35ef7447514004643689bcea6c8c4506bd7af309b7241b48bfbec3617be81287f2b1c29e8e0080c72812c222dc3ae3cb97c51fffb124 +EBUILD freerdp-2.6.1.ebuild 2818 BLAKE2B 2390a77770c15a1ac37457a6a85619baf14742bf09300aefc020ea40ab4eaa9b71aaded6e4ddb658d70eb558c45f79f962774c6b62a32322d5416e3d8cba1e6c SHA512 8b812c9af873905736533fe0dc8bc8b51faff76faec53430a42c617005a42760b65486f188edcb2104056fdf262c551ce202b0a2fcacac8d3d8513b641242572 +EBUILD freerdp-2.9999.ebuild 2818 BLAKE2B 2390a77770c15a1ac37457a6a85619baf14742bf09300aefc020ea40ab4eaa9b71aaded6e4ddb658d70eb558c45f79f962774c6b62a32322d5416e3d8cba1e6c SHA512 8b812c9af873905736533fe0dc8bc8b51faff76faec53430a42c617005a42760b65486f188edcb2104056fdf262c551ce202b0a2fcacac8d3d8513b641242572 +EBUILD freerdp-9999.ebuild 2818 BLAKE2B 2390a77770c15a1ac37457a6a85619baf14742bf09300aefc020ea40ab4eaa9b71aaded6e4ddb658d70eb558c45f79f962774c6b62a32322d5416e3d8cba1e6c SHA512 8b812c9af873905736533fe0dc8bc8b51faff76faec53430a42c617005a42760b65486f188edcb2104056fdf262c551ce202b0a2fcacac8d3d8513b641242572 MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72 diff --git a/net-misc/freerdp/freerdp-2.6.1.ebuild b/net-misc/freerdp/freerdp-2.6.1.ebuild new file mode 100644 index 000000000000..a9c7d1c5d9bb --- /dev/null +++ b/net-misc/freerdp/freerdp-2.6.1.ebuild @@ -0,0 +1,118 @@ +# Copyright 2011-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git" + case ${PV} in + 2.*) EGIT_BRANCH="stable-2.0";; + 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 ~riscv ~x86" +fi + +DESCRIPTION="Free implementation of the Remote Desktop Protocol" +HOMEPAGE="http://www.freerdp.com/" + +LICENSE="Apache-2.0" +SLOT="0/2" +IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/openssl:0= + sys-libs/zlib:0 + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + usb? ( + virtual/libudev:0= + sys-apps/util-linux:0= + dev-libs/dbus-glib:0= + virtual/libusb:1= + ) + X? ( + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + ffmpeg? ( media-video/ffmpeg:0= ) + !ffmpeg? ( + x11-libs/cairo:0= + ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + x11-libs/libXrandr + ) + jpeg? ( virtual/jpeg:0 ) + openh264? ( media-libs/openh264:0= ) + pulseaudio? ( media-sound/pulseaudio ) + server? ( + X? ( + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + xinerama? ( x11-libs/libXinerama ) + ) + ) + smartcard? ( sys-apps/pcsc-lite ) + systemd? ( sys-apps/systemd:0= ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + X? ( + x11-libs/libX11 + x11-libs/libxkbfile + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + X? ( doc? ( + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + ) ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + -DCHANNEL_URBDRC=$(usex usb ON OFF) + -DWITH_ALSA=$(usex alsa ON OFF) + -DWITH_CCACHE=OFF + -DWITH_CUPS=$(usex cups ON OFF) + -DWITH_DEBUG_ALL=$(usex debug ON OFF) + -DWITH_MANPAGES=$(usex doc ON OFF) + -DWITH_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_SWSCALE=$(usex ffmpeg ON OFF) + -DWITH_CAIRO=$(usex ffmpeg OFF ON) + -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF) + -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF) + -DWITH_JPEG=$(usex jpeg ON OFF) + -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF) + -DWITH_OPENH264=$(usex openh264 ON OFF) + -DWITH_PULSE=$(usex pulseaudio ON OFF) + -DWITH_SERVER=$(usex server ON OFF) + -DWITH_PCSC=$(usex smartcard ON OFF) + -DWITH_LIBSYSTEMD=$(usex systemd ON OFF) + -DWITH_X11=$(usex X ON OFF) + -DWITH_XINERAMA=$(usex xinerama ON OFF) + -DWITH_XV=$(usex xv ON OFF) + -DWITH_WAYLAND=$(usex wayland ON OFF) + ) + cmake_src_configure +} diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 670754db442c..a9c7d1c5d9bb 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 670754db442c..a9c7d1c5d9bb 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest index b133f8121297..5012a949fc55 100644 --- a/net-misc/frr/Manifest +++ b/net-misc/frr/Manifest @@ -2,5 +2,5 @@ AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285eb AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa -EBUILD frr-8.1-r1.ebuild 3430 BLAKE2B ff1bf4e1b3b3ae893eed39c3a4570b0e89b8c23e14c7995cc839778c6fc38530f447570e07fb7a88508a4074d5a3934d3699bd47e5e3d598f4e6369d92ce8cd4 SHA512 0ba76ca5772c7e7e6be997c22f81bbdda2781d58a9d997cf94b413dd180bcd39ada0b49481bcf35af58f587892499036be381708fcff9c08ce4212f5e8e4f778 +EBUILD frr-8.1-r1.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108 diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild index 07f5fe16b909..930f7303dc8f 100644 --- a/net-misc/frr/frr-8.1-r1.ebuild +++ b/net-misc/frr/frr-8.1-r1.ebuild @@ -41,6 +41,7 @@ BDEPEND=" " DEPEND=" ${COMMON_DEPEND} + elibc_musl? ( sys-libs/queue-standalone ) test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) " RDEPEND=" diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest index 7c286d052385..8c0779a1242a 100644 --- a/net-misc/gallery-dl/Manifest +++ b/net-misc/gallery-dl/Manifest @@ -1,8 +1,8 @@ -DIST gallery-dl-1.20.1.tar.gz 408366 BLAKE2B f6a40270dd4e4a9df84c852e1c580ffb84e5b282adec0750f59e8ded130e79f336d1ba81ed0abe66f3bdae18aef05bac6c7c7f889a070a9c23a407dc9c51d890 SHA512 7d2c6daa473f1aaa1bef94f3ac2b38c9ce06d6f19d564e7c2abec9ecba4fa7c4f092f765080a4079020a1d2aa7484894a37d9f4b0cca2efad3ca1bf440ebf0cb -DIST gallery-dl-1.20.2.tar.gz 411489 BLAKE2B e63aaa59d8792edc6e73e70cd46364d893aa39b80b70baec46d5e161111a2eb3e00891ccb092cceff0a07cb5646bb848b94c2a7d929f9aa043716866171aeec8 SHA512 436b8959dd97cea3792be6d87bdedd67d8c7a327f4d332306709850687445d0fd1f2f7b6068a0584ba12b613a975f11185aef0ad34ea8035429c7865435c7839 -DIST gallery-dl-1.20.3.tar.gz 411789 BLAKE2B f2fff5f2bf0c8f5e23625cada06a29078737d6ca869012cd790da4f3f93d8b4cdcd294715a94d6fec41f5184fcd7346fe63144b4dc02bd3680ec171bac0ea523 SHA512 68a53844ed4743f20e17bb4ece168c5dc14cb63f13bce35f25a7d2198894eb18eb84dc2cbc29c1289020db08095783718d14d8fcd3dfed64ed76a235b672861e -EBUILD gallery-dl-1.20.1.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604 -EBUILD gallery-dl-1.20.2.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604 -EBUILD gallery-dl-1.20.3.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604 -EBUILD gallery-dl-9999.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604 +DIST gallery-dl-1.20.4.tar.gz 414744 BLAKE2B 2df2dc3aafebb28c48f3a8a8768b859044826ccf7854214ee7ec8899282bb52b719b6d447c9909a30091dcb24e0839274a54526a22a3115e5fd2be2bfc2fbc1f SHA512 9e4c058f99355c2c957931b0ecc5b0b969ab92a251a020d45e9c269c8329de6d0d0328f5a4c391844c7314cff5b4e01b897d6f9382a6929c75f6e68808ec1bd9 +DIST gallery-dl-1.20.5.tar.gz 417267 BLAKE2B f1f4b34d87b21d4c4c8fa15e9a1f39f3fccf7ed3bdd446fcdec03d435878e708fa2169270a610a6de79c5e57a4cc8becb98399638a353ec92490fe408d822beb SHA512 a53102a9495763e001810c509265affc1594468e3ba73d3a677652e73d8f18d3414e6cf83dd30914e882e7867380f9c0322d42bf418b372f59be6981106d4cd5 +DIST gallery-dl-1.21.0.tar.gz 425507 BLAKE2B ca31b169558385fa6ed6ce9fe8082fddcc7124f945fcfaef2aab13a4357fd9d488bdfde48c27d0a86fb0f626ea831e7dc3600c7e50abce2bbcfd37a350ee2767 SHA512 dc85d522e372e8ec2565029b9dc3d736b546b4cf66bd9242fdfa11aab30975263e221ba50234ace409a4cf3dc6f36d5b1031cfbf74dc4ba3053eded5aea7f38c +EBUILD gallery-dl-1.20.4.ebuild 934 BLAKE2B 0f3b4ca4d6a7b34e2502ebd7b51b8e999edf012c0911f4d73d5d43571d2937e8bae8cfcf348fadce28cd79fb17392613f3500807f524d7495435d4acbe01c3ac SHA512 cb12a2a0a173158c72fdedaab876eb522781f1fd7e20e2cf5b402e7a1783cdeea9566d2d1a729398ec83e0a28ef542114defc02d63c0381da113ac57716eb604 +EBUILD gallery-dl-1.20.5.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 +EBUILD gallery-dl-1.21.0.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 +EBUILD gallery-dl-9999.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394 MISC metadata.xml 606 BLAKE2B 231314cca96ba14b3da1d9876ae9096f321ffd7803dee9c9242b87c7fad20977d9e3a8c5d0fb9060583eea95ec8726c58b9d4a4074972eabd4e6dd34bd263c94 SHA512 8401ded38af47ac11b6a11a1847e6ec5ff4609aef50ec96bca539a2d0601c53d46913decc0a03ffc757f79dc6284072ffd29e2cdab4504e7e1a91a03e006f160 diff --git a/net-misc/gallery-dl/gallery-dl-1.20.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.20.4.ebuild index c33edc550b3f..c33edc550b3f 100644 --- a/net-misc/gallery-dl/gallery-dl-1.20.1.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.20.4.ebuild diff --git a/net-misc/gallery-dl/gallery-dl-1.20.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.20.5.ebuild index c33edc550b3f..d424151deeb1 100644 --- a/net-misc/gallery-dl/gallery-dl-1.20.2.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.20.5.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/mikf/${PN}.git" else SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2" diff --git a/net-misc/gallery-dl/gallery-dl-1.20.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.0.ebuild index c33edc550b3f..d424151deeb1 100644 --- a/net-misc/gallery-dl/gallery-dl-1.20.3.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.21.0.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/mikf/${PN}.git" else SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2" diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild index c33edc550b3f..d424151deeb1 100644 --- a/net-misc/gallery-dl/gallery-dl-9999.ebuild +++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/mikf/${PN}.git" else SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2" diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest index b96b92e08915..500107489cbb 100644 --- a/net-misc/geoipupdate/Manifest +++ b/net-misc/geoipupdate/Manifest @@ -55,5 +55,5 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLA EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7 EBUILD geoipupdate-4.3.0.ebuild 2780 BLAKE2B 8cdd7ec3ee334c87e4944198db1e39d57469a0cf9cfce07bbad7b03aa9b790b40c85f057d93bbd9c92ba20423d52cb0d9386295ef5575e4590a6d257fae06472 SHA512 a80f829eac8e7e22205ce9625ce1948866ffb4c290f728e53d2a0f73000b65914c3b915c0c46d9fbe9951373d2b9141dc4acaf43135d4a9d8c1c7ce8c053dd7a -EBUILD geoipupdate-4.8.0.ebuild 2499 BLAKE2B 3002ac10f9da56e45da2dc4998d7da7374a1a06db0ad4fadca5c44e693ca88970fa6b0cd507fa6d7d2becedce5a4d3a38bf451b471a72085fd6c6a698ed1b26a SHA512 55e50669d3964ca7d6f62d920ab221fd69b431ddd5dab65cf00c8d9f82c2eb0ba9c64d0894da800a1cb18c2e580b27f4803b240bd651e258ad4c0ab63a854ca8 +EBUILD geoipupdate-4.8.0.ebuild 2495 BLAKE2B cef8324e3ffe6274da281bcc2428529ee3f1cb312ac3a38c96bc5c69c5c04a16d8e578166c9e2012d694a7d752f371e3b8bbd0fcca468ddc4e636015377aa74a SHA512 574d5785309c29a1faa305f27b041cf9ab375101ec463b37a210492b434ac142782387ab67ec572b2dd9cbe6c4dd85d1b324eacc754f085553921b73ae423fe6 MISC metadata.xml 365 BLAKE2B fe03fdda21f1ab1dcbf3fe2263aabd4a567e0527a33f551a2c9e5883fc9738607705710f10125fd50127d71e86b6a935d955c12dfa588713b40adeb84001a4c0 SHA512 bbf7afa666726fb1b3b9ddc8a899a8fc404c141bdd1c2adc3a458c9a5b4b7b60697fcf3e43df8a5a4ce3cb96db46d92d0af2887bba7aa52d759171dd240c4415 diff --git a/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild index bbc41d9ed2f3..37475632f16e 100644 --- a/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild +++ b/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,7 +47,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="ISC BSD BSD-2 MIT Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +KEYWORDS="amd64 arm ppc64 x86" DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md ) diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest index 0449189eaeb0..e7a3b6d5142c 100644 --- a/net-misc/gerbera/Manifest +++ b/net-misc/gerbera/Manifest @@ -1,9 +1,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417 -DIST gerbera-1.8.2.tar.gz 3589779 BLAKE2B 120654d5a9d1ac7dd29da401f2ca040e3331a27dd22a52fdc9c9a958a1a8e918ae6ca76926e636184f3b91475797432728462106eb4fbdc146737e88da07d8e7 SHA512 3831030b4960613e487bdba92323a4b8d7ed63352c1c9eb1ca5eacd3c91d4864d48ef1d1bec19a98b6abed0a827d18ba7940a814fe174b44c2808ad7b85a8756 -DIST gerbera-1.9.2.tar.gz 3671452 BLAKE2B 1553370fe35c32ca5925559da05fb4a27db4c8b765eeecabf9c5be967dbd2bd99c2726129e0c2e49930b8e95ddbabb7829c65107c75cda4d6885ff72b695b512 SHA512 91c7215b0bae000d4d8b29797947b29609e81c9387547e199936ce385ef679048a7554d24cd80ab73fc83c4288b29fc4928a23add6f67a1da05501c87afdf7a3 -EBUILD gerbera-1.8.2.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68 -EBUILD gerbera-1.9.2.ebuild 2257 BLAKE2B e75036b2fa785d928adba86f899da90b98bf78d24329e6a27d3cf79750fb0f217ed0ec3070bb6abbbec7191702c2496ef71951e7f475280ae27ad6b1c7ec6b70 SHA512 5df45a7c41fa91063faf09f555760eff315a1f5a7dcfc3bf7a39bea4f927ae69438ff29e4198ce33cbb078182689200c7b061df5455305c00c39a0bc71727fdc -EBUILD gerbera-9999.ebuild 2289 BLAKE2B d3f4d822ce1143179c7823b989882c05a63d5e3e9bab8e4493cb368238969bc282b7e25f8ddc826e4d8eab0899cab218fe388995d40ca625bf25a7b97f909c7c SHA512 ca08c3e4fdcf5081f1a620050a7566a80d4cf67b66c8014ce68f95047d7ff40f4cb784dd81c6076651beb8a72d2103a6262fb05688ee414ae1eb3d0f72dbef68 -MISC metadata.xml 991 BLAKE2B ead3fd232d1355d3521a1837587f21d1de1bd264f86a809554cf5ed83678b9fa4f5dda2d986f43d7c4dfb645a0281e7e56266adfd6de455619f9a81b7dd520c0 SHA512 0b50e94de7c65f0ccc0db9cbdf5097ecfa6321a8ef370e2e44a2d000c875b6dd89d67d92847be1a786ee5520d65100dae58f240e9d400f45d7be751684479ccd +DIST gerbera-1.10.0.tar.gz 3960516 BLAKE2B 9240ff4334f6f018ed27489f3984bd8439eb1ae9784712d23e778f9c3054c37241036a32167fc1c19303f4d68db3862ae09e35b7a3f4c15ee1e960a1aa78086c SHA512 9bb605b6475bddc5b683433bc9c50818e4986fc134bb0a6daaa444d1733624164c6ff7440789af95da2ec3c04b6c2f4fd46a29744b4ef793b10d9fab0c65a881 +EBUILD gerbera-1.10.0.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c +EBUILD gerbera-9999.ebuild 2243 BLAKE2B d01c18d7a95217703f4c3e4e5155716418c5d6fdb59cf4cf29f10695d5213bb881b949f7450c7636939339f833c094b192e906ef01b3ee4729d8137a867703d2 SHA512 fdeaf5d80a85f3d3b5a491e07c01dff949409ca494e18284312bb4587bab7c8db796b6f92f7c01016ce180686c1b168feaa36f8f3351446b41e4a6fb8526862c +MISC metadata.xml 1205 BLAKE2B f0fbdc991782018368d65f2d5475ede1a1a0cb2a8a16de4e7c4ed7586057cac18a2d6fe9bb405c8267337e453b26c69e69042dac3bfd5ef858f23fa7c468ef2c SHA512 a231be2b6829fb2f59fa3e66c830a16358782c915e806bfbee919a6f7ebdf9d33d53aa6860814ba5a5c7251ce2562f313af592ab5fcda701a7673b334627b1a0 diff --git a/net-misc/gerbera/gerbera-1.9.2.ebuild b/net-misc/gerbera/gerbera-1.10.0.ebuild index 49bd780a49a0..f069b91f13cf 100644 --- a/net-misc/gerbera/gerbera-1.9.2.ebuild +++ b/net-misc/gerbera/gerbera-1.10.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake linux-info @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -21,41 +21,43 @@ LICENSE="GPL-2" SLOT="0" IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" -DEPEND=" +RDEPEND=" acct-user/gerbera - >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] - >=dev-db/sqlite-3 - dev-libs/spdlog:= - dev-libs/pugixml - dev-libs/libfmt:0= + dev-db/sqlite dev-libs/libebml:= - mysql? ( dev-db/mysql-connector-c ) - javascript? ( dev-lang/duktape:= ) - taglib? ( >=media-libs/taglib-1.11 ) - lastfm? ( >=media-libs/lastfmlib-0.4 ) + dev-libs/libfmt:= + dev-libs/pugixml + dev-libs/spdlog:= + >=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) + javascript? ( dev-lang/duktape:= ) + lastfm? ( media-libs/lastfmlib ) magic? ( sys-apps/file ) matroska? ( media-libs/libmatroska:= ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) " -RDEPEND="${DEPEND}" + +DEPEND="${RDEPEND}" CONFIG_CHECK="~INOTIFY_USER" src_configure() { local mycmakeargs=( + -DWITH_AVCODEC=$(usex ffmpeg) -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_INOTIFY=1 -DWITH_JS=$(usex javascript) -DWITH_LASTFM=$(usex lastfm) -DWITH_MAGIC=$(usex magic) @@ -63,7 +65,6 @@ src_configure() { -DWITH_MYSQL=$(usex mysql) -DWITH_SYSTEMD=$(usex systemd) -DWITH_TAGLIB=$(usex taglib) - -DWITH_INOTIFY=1 ) cmake_src_configure @@ -82,7 +83,7 @@ src_install() { } pkg_postinst() { - if use mysql ; then + 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." diff --git a/net-misc/gerbera/gerbera-1.8.2.ebuild b/net-misc/gerbera/gerbera-1.8.2.ebuild deleted file mode 100644 index d68414c66ed6..000000000000 --- a/net-misc/gerbera/gerbera-1.8.2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake linux-info - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~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.14.0:=[ipv6,reuseaddr,-blocking-tcp] - >=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" - -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 d68414c66ed6..f069b91f13cf 100644 --- a/net-misc/gerbera/gerbera-9999.ebuild +++ b/net-misc/gerbera/gerbera-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake linux-info @@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/gerbera/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/gerbera/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" S="${WORKDIR}/${P}" fi @@ -21,48 +21,50 @@ LICENSE="GPL-2" SLOT="0" IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib" -DEPEND=" +RDEPEND=" acct-user/gerbera - >=net-libs/libupnp-1.14.0:=[ipv6,reuseaddr,-blocking-tcp] - >=dev-db/sqlite-3 - dev-libs/spdlog:= + dev-db/sqlite + dev-libs/libebml:= + dev-libs/libfmt:= 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 ) + dev-libs/spdlog:= + >=net-libs/libupnp-1.14.12:=[ipv6,reuseaddr,-blocking-tcp] + sys-apps/util-linux + sys-libs/zlib + virtual/libiconv + curl? ( net-misc/curl ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) - ffmpeg? ( >=media-video/ffmpeg-2.2:0= ) + ffmpeg? ( media-video/ffmpeg:= ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - curl? ( net-misc/curl ) + javascript? ( dev-lang/duktape:= ) + lastfm? ( media-libs/lastfmlib ) magic? ( sys-apps/file ) - matroska? ( media-libs/libmatroska ) - sys-apps/util-linux - sys-libs/zlib - virtual/libiconv + matroska? ( media-libs/libmatroska:= ) + mysql? ( dev-db/mysql-connector-c ) + taglib? ( media-libs/taglib ) " -RDEPEND="${DEPEND}" + +DEPEND="${RDEPEND}" CONFIG_CHECK="~INOTIFY_USER" 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_AVCODEC=$(usex ffmpeg) + -DWITH_CURL=$(usex curl) + -DWITH_DEBUG=$(usex debug) + -DWITH_EXIF=$(usex exif) + -DWITH_EXIV2=$(usex exiv2) + -DWITH_FFMPEGTHUMBNAILER=$(usex ffmpegthumbnailer) -DWITH_INOTIFY=1 + -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) ) cmake_src_configure @@ -71,17 +73,17 @@ src_configure() { src_install() { cmake_src_install - newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}" - newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}" + 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 + 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 + 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." diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml index 2196a8fa3a35..46cb19df5ff3 100644 --- a/net-misc/gerbera/metadata.xml +++ b/net-misc/gerbera/metadata.xml @@ -1,17 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription> - <use> - <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag> - <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag> - <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag> - <flag name="lastfm">Enable last.fm support</flag> - <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> - <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag> - </use> - <upstream> - <remote-id type="github">gerbera/gerbera</remote-id> - </upstream> + <maintainer type="person" proxied="yes"> + <email>christian.tietz@mailbox.org</email> + <name>Christian Tietz</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription> + <use> + <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag> + <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag> + <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag> + <flag name="lastfm">Enable last.fm support</flag> + <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag> + <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag> + </use> + <upstream> + <remote-id type="github">gerbera/gerbera</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest index 4132cf411d18..f29bdd4fb6ea 100644 --- a/net-misc/gnome-online-miners/Manifest +++ b/net-misc/gnome-online-miners/Manifest @@ -1,3 +1,3 @@ DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464 -EBUILD gnome-online-miners-3.34.0-r1.ebuild 912 BLAKE2B 51694cc1809a5b5de5f532826d90c2e3bc1d3d30b2cd8ee125d77ad64c7f1f92953f858b34769da5da5db72cb0599b30585f872f21a2e2edad6d3b80b1457d1e SHA512 b59f8843356afa761ea89c282cf546f187abd754312699e127992ed28e31a11f3ebab13926463c0c68ed8f67013318b415c1be3e76920a8aaabf3a0c998997d5 +EBUILD gnome-online-miners-3.34.0-r1.ebuild 911 BLAKE2B 79d001643167f5c3b83b8f545b82a790d5db51fc4a79ecc39b1132e533a4effef3472a9532730b90f9c596b01f171aed88357960a65128c5d77be25f36b193c2 SHA512 484485cfc1b15a875c8da2431b13183df932827c30b1d015f3f3d0712ca8956b969a1480a437cf9be0e03ca3c17472415f0cf8eb9466f917482001f1b54d3e45 MISC metadata.xml 313 BLAKE2B 14b8dc0d350cff3ce60111be31eaab9f7097a90bf3140bbd79e64fd91319819bcf63d50ac77ee4b5d65ec9fbc4df4b5fd73d2de2f242e02e6140aae39e3cf732 SHA512 2f69d70da13321905317bc066afa7c041d154eb4dbc3b86c912a971ad36c07a9d4d56b1bfc18651bcd84058cfeab254269670bdffe04366220132dba3d6ae0e9 diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild index d5adda1e10f7..34df5197128c 100644 --- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild +++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners" LICENSE="GPL-2+" SLOT="0" IUSE="flickr" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" # libgdata[gnome] needed for goa support RDEPEND=" diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest index c25004ea1820..bfbb9ef87ec7 100644 --- a/net-misc/gnome-remote-desktop/Manifest +++ b/net-misc/gnome-remote-desktop/Manifest @@ -1,5 +1,3 @@ -DIST gnome-remote-desktop-40.2.tar.xz 65400 BLAKE2B 47be88529c365e5ab72b225aae1ad0fdca4748c39476ea1251db8f317e7fc25e90acf0b908f64f0a2111e0c59d8a213ede6945fe75151cdca6ab2cf8a77351cc SHA512 f39feb5b4b89d1c504a07c5dcf5962a4340cfc45c70d806a2b6739512ca80671dd8b7928a6dad83165dbba50b17c7961e329ecae0dd59f3f57f4fcf0f7969466 DIST gnome-remote-desktop-41.2.tar.xz 111000 BLAKE2B 1d6dfcc9860a5253cfb2a8111c5c039e7d236f45fa79a74ddc479f449b01ddb231368c4b604d28a8f796ab33f1648a332e110fd2adb9b739032dba67c029b9f8 SHA512 7636c0446c86748ce51c869734a2d33d8285c30616a28a0358f45d8399fd9f5dba7a1bdb830d3ca4753982ac3b9715604eb5934906645a1c11c58b4342c524eb -EBUILD gnome-remote-desktop-40.2-r1.ebuild 1223 BLAKE2B fd00425e6695a63a9c2e3f926eaf31c0ea79f5be4254698f35fbc2efdefd7301915df404a6cac8f8d6105a7d880e23478c0f9bec73e9b22d9763276dc474d08e SHA512 129b288f27d27fa7cd50fc6b1e85a3d605b649343a84eb4abc3e0dd552227295127d7e950c85ea5cf2854e93b6200b84e30c10f8932c681a50822829446f8f7f EBUILD gnome-remote-desktop-41.2.ebuild 1195 BLAKE2B eb6178bfec196d8139080fa5414f5d90670ccde2fa80bad95fa6c9f1b13b5ec59195e4e28935b32ecdd06dcb2955878280a1462917938911dae6028c903d2f1c SHA512 887d7d4ca98c987088f287c0baaf99e559b07fb92d15899a0dc2bc07dd1a2b351d8c8fa2c6fd11661ecef368692726a2945782750720f02b174daf3d4e6edfdc MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132 diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2-r1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2-r1.ebuild deleted file mode 100644 index 073774aa90af..000000000000 --- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) -inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg - -DESCRIPTION="Remote desktop daemon for GNOME using pipewire" -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+rdp +vnc" -REQUIRED_USE="|| ( rdp vnc )" -RESTRICT="test" # Tests run xvfb-run directly - -DEPEND=" - x11-libs/cairo - >=dev-libs/glib-2.68:2 - >=media-video/pipewire-0.3.0:= - app-crypt/libsecret - x11-libs/libnotify - rdp? ( - >=net-misc/freerdp-2.3:=[server] - >=sys-fs/fuse-3.9.1 - >=x11-libs/libxkbcommon-1.0.0 - ) - vnc? ( - net-libs/libvncserver - ) -" -RDEPEND="${DEPEND} - x11-wm/mutter[screencast] -" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/glib-utils - virtual/pkgconfig -" - -src_prepare() { - default - sed -i -e '/systemd_dep/d' meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use rdp) - $(meson_use vnc) - -Dsystemd_user_unit_dir="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest index a232e1ca47a6..20f0458be6d1 100644 --- a/net-misc/gofish/Manifest +++ b/net-misc/gofish/Manifest @@ -2,4 +2,4 @@ AUX gofish-1.2-r1.confd 21 BLAKE2B 3a7fb9d9e622954e7bf2cabc4c3dcfa3b948303810e09 AUX gofish-1.2-r1.rc 276 BLAKE2B 0a0441c2357a0089aced9143de03c628d0b7b2e8fb1544ac7a3a7b7f0364745866977519654d9ebdc9037307424c981f6bb1627605f581a17cc58bd402d2c835 SHA512 0d8ccd935ce7a4d25be0f67d6095fdbcbd5e11b49aabdbd64cfba5f297cdcbc3db70b3759da4158cca00bf50faa6874c6cc3b2cc51dfebfa3c0b1c65c252db3f DIST gofish-1.2.tar.gz 212596 BLAKE2B ca202a55463fbc0b09ed902556d038101b4963ef24920ccd527c2b0c99a2905431c3bdffb2777605010b62db48dd80362ecc68e6ddcfecc7f5f4245bece4d749 SHA512 f7999a5e2b4f80d6402f26d9434f844b26b47b43a6b00055e72ba399426672ed299ca759252d8eb732b23a4c2c369a92c11c0d496f16f4bf3a999398cf6c5bee EBUILD gofish-1.2-r1.ebuild 637 BLAKE2B b5afbe1797212677f509b6cdbb0cd948f3d3cff76f5becbe44968931182b9e7c995dee9261789dc3f1617d7bd756ef70effc34dc0307036527caaa955523b4c8 SHA512 55b4ce851b73d818a2b0c0d571901f66688dbd316d73f4f9d81bc513a56a196aafb73c521972d4349f071f4e7be4aa9bc17380bec07d4c488516ddd9b12ef8f7 -MISC metadata.xml 467 BLAKE2B 15a5bbfa80c8b8f21f51779a445ec7814e3bd6e5c0335d7713f88cbe74902a565e71b4087f834d378090997cf76889340f8fce8bbfc55271979530d5e255ebed SHA512 030832a6db3cc0b6bef27af65018265a3f4624445f6d9be3785b6e3c9891221eed570dad94c384e5e3fe83e7ad3c6abe674b900667f70f7060a22d9a45ade9d3 +MISC metadata.xml 324 BLAKE2B c5992e1119e2fe849724067a1b22377e00be156196f1d3880e77cd6e4875e75fc321645a3bcf47517843af72106d2c42878472c3950a9fca906c886be82b52e3 SHA512 67322b9ac1f25384111ea6a519905a6b37f8b13905872f998e918c6a39e778e969aaea43cd1c6475b08e717ffab67c36cf6132c6f90fe33171f9b56493aa1bf3 diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml index ef42757472da..d6dbc3c876ea 100644 --- a/net-misc/gofish/metadata.xml +++ b/net-misc/gofish/metadata.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>matt@offtopica.uk</email> - <name>Matt Smith</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> </maintainer> <upstream> <remote-id type="sourceforge">gofish</remote-id> diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest index 2e61aabb2755..f6a4907c8100 100644 --- a/net-misc/hashcash/Manifest +++ b/net-misc/hashcash/Manifest @@ -1,3 +1,3 @@ DIST hashcash-1.22.tgz 195193 BLAKE2B 2944dd8a852720af7deff1a85cbfc07e828bf2242996b95d8d05a3a8a3ece90abc47483252920ec14b603978aae2ddb9e770ef7b52904b3d24320b68e6695b37 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2 -EBUILD hashcash-1.22-r2.ebuild 650 BLAKE2B b5db1d10663185b0413120f94f394d7758796a2e2f7ef9101194f850bfadff2673de5f5ac21ca37aa6dd718f882c40e8b5fe038dc0447050dbb69d29d1505c60 SHA512 b977fb72b9d6bf9f4490079e6e51bb10a7ec6d193d51a0baf3836505038d11ab92157a348f002fca61de6111a6aef8be531d56a2d86c7c42f5e8e4b02db18072 +EBUILD hashcash-1.22-r2.ebuild 670 BLAKE2B f6b042f0c1367fa7f5b0b1cca7deb08d28ac09ac7dc560424912f84e7034d212f2f7d9d842315f39795e3c5abc858c683a991ecd97cd190a2f90215b4a3ba61c SHA512 3bec3f7e0f646ae7d40deb894e6c0e137e2403d3f5e1d2b681af2058b94382d20a1152a9e4ffed00e6ff4eefebb4209a1ad76a19d8d468eba160d99b84e400db MISC metadata.xml 398 BLAKE2B 4a45b75d7c691fb1695c055c6a79bdd8a8576a54cb61312031af83aeaa69a435d4d4b748b2562cb19401edf5daed3b9b9694f3826e51c97b7329d727fc80681d SHA512 9f65cfc45897fe22bf54b2a7c6618002b3be7e427af2a9bb3c165f07340e8ef25f23ad7fcf0c79b1ef060fd0e78200da4a2f33a5a77ece8f21b369039063ffc5 diff --git a/net-misc/hashcash/hashcash-1.22-r2.ebuild b/net-misc/hashcash/hashcash-1.22-r2.ebuild index e29148642453..867929119c5a 100644 --- a/net-misc/hashcash/hashcash-1.22-r2.ebuild +++ b/net-misc/hashcash/hashcash-1.22-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ src_install() { dobin hashcash doman hashcash.1 dodoc CHANGELOG - insinto /usr/share/doc/${PF}/examples - doins contrib/hashcash-{request,sendmail{,.txt}} \ - contrib/hashfork.{c,py,txt} + docinto examples + dodoc contrib/hashcash-{request,sendmail{,.txt}} contrib/hashfork.{c,py,txt} + docompress -x /usr/share/doc/${PF}/examples } diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest index a908bc6edf8f..c64c21fa7f31 100644 --- a/net-misc/igmpproxy/Manifest +++ b/net-misc/igmpproxy/Manifest @@ -2,5 +2,5 @@ AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85 AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62c7d62bbae33b59edd23c3b873db29f38eac37c42a9385c223e050fb3ed1e8776472f9fb73533d73200e SHA512 1e4e5d73fe9a734ab7898c2defdef8f9b27c3811109ef8819875a65733c72e48feb683d0001ced759c3195ce30bf31c6af9be7cebf30dd1dcd9141ffbbfe3f53 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be DIST igmpproxy-0.3.tar.gz 168403 BLAKE2B 4dd07936074fbd9b3c869851f5b592f1eec33109be78ee5a05b3658c26afb67c30379f7cc66dfa20af276aae0a1c21dbf5c9fd337c853d623b08126324b06561 SHA512 0b1deca544317e2f0b1ff550e5921e8d6f64565f7cd72b6210fc7d3d7c3a301875088687a31ca5a29d310b2931695bd7a77e41dc5685ab7175ea1d41fe9246af -EBUILD igmpproxy-0.3.ebuild 650 BLAKE2B 21df318b2e20be37ae06f33cbb45c8e07f70ef1ed6a855c48346e3c6583275b3416e6a2f30dc74e4d744ec955c4536869e5bd26d23bcd859d8a6c8c59a1c5441 SHA512 1ee96802558dd4e056a00a3dd5017ec845244cfface597191481ce3389a3b47d0e18588885e93c3ab1cbc1ed62e8d23be4b0894ff07368d3ae6261839f70df63 +EBUILD igmpproxy-0.3-r1.ebuild 650 BLAKE2B 1fa0616b05769e9529965bf6873fc1d4561e30f8ca3c5375eff2ada2005de545d98cbf217059b7b62d003aa0b46a2cac5b681d25041ad6d3d355829c72cd6a3a SHA512 d93f6fcf2fdf219f7aab6d8a940b6c8909f914b870dbf028489b7281dc149471b6187cdbf9a4233dc82f328d68316f4b066c5a78c9f2d36c6e179b901b8652bf MISC metadata.xml 594 BLAKE2B 602cfba461cd39269a09d634d8c9253a58b887818c2f987bacb154147474f69ba66fe10c3fd145cd93ef5204bd8b466b274d27fa968676c51dba5c66945ce48b SHA512 49fa0f3acda2c9d62a4ee0e6ebb1063af3a065499fe4a92fb5cdb634d397871d91d3aa993e7010ad57584de468f8f5e091bc1f1b597cfd30c419e2e3dcf04c34 diff --git a/net-misc/igmpproxy/igmpproxy-0.3.ebuild b/net-misc/igmpproxy/igmpproxy-0.3-r1.ebuild index 243e6209d79a..cfbcbd34dfb9 100644 --- a/net-misc/igmpproxy/igmpproxy-0.3.ebuild +++ b/net-misc/igmpproxy/igmpproxy-0.3-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools linux-info systemd diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 506a36181b42..0d0bc10a3621 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -6,8 +6,10 @@ AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea DIST iperf-3.10.1.tar.gz 636957 BLAKE2B 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b4e7baba23b4bec2808b42582bf76cc4250c529a1eb4a58c7214120f0e3a393a7c2602b838b22d97eb53842b3 SHA512 d1139aed0c7a99e8cfc23c41d606854d48a57db24d45ea31412d81222b09faeee6edccdf4030a00eeb6acbfd540d4b985b4a89f81a4d5b84592339ad5e2e9e41 -EBUILD iperf-2.0.14a.ebuild 856 BLAKE2B d75c7d282707edad5bcf7b8304c1820beb7dbe082f8a0203dd75857ab9ab80a741049acb671bd3383aafa936a51fcaf4cee19e98de64e71456332d6cd676e8b9 SHA512 2dfca97c4d60f56a8977279dd947fc35f0c30d8bc3c36fe308bb72de8287b5975ea20be2b11aaf1b2d858b1e3543ef759a94419e90a9ae0a304e8f852e9a1d34 +DIST iperf-3.11.tar.gz 638521 BLAKE2B b2981c170aac947c407b0a5686cd9708012282044be30ec7e5f993a9d61d55c4517003024890a194f6e55d342be0e60f1bcab27460541d2b9631a3bb88e094a5 SHA512 4be3e407f77a083d826bddc5ce2939047c85f5b816a6aeb3293eacabf2ea23bf13df4226e629ade3bf390c2eb08d6a1cb96f8cdb0fefb290a0fa4c8331d11a17 +EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B 48a3db3ec6b41bad2abef2854e694949a1e14cb71c01b52de2ca28149c9430a9b052f70959b1eb0630ca6ee6460dd54e0e0420a65892e6a86eb3e67875b673b0 SHA512 cd0241a86c550a18572042151c402913ec5e362611580b7a70de5b38c6664c3398f06258be706d311704046f4add0b868a81f913c7afd1d06622307fdc215913 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13 EBUILD iperf-3.10.1.ebuild 956 BLAKE2B c15ea0249e0b0d6b42f8201c906d21cb6cd2c7feddcd5e08c763fa8bd9e80114f77feabd9b800b2b6c55a18593ffe9ca36b604e4308689e06f875bf9bfaf8d36 SHA512 9c189cc81ae98013a401f2224913b8a223f2467b7cf89cea563ffd5995954262daecbfb8defc3dadd117e5cb587d02c4a613ad56ad58b0ca33c22fe7e90d3d25 +EBUILD iperf-3.11.ebuild 934 BLAKE2B 6f73bc2c30297582aa0b1c422b667e2227c7166350098b72a472e7ab42181e478584ff8052a932e4b32d83d2fbb1f0ef0d64542efe1c27cf4f8cfa41c21e5298 SHA512 4802a1f32cebae592b5db1819214d85d8e8422bbe809bdc0583dcb39dd384559329bdb27e64675336bad0f25cee33e307b2d5cde0f1ba81b3a8312ed57bd565f EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild index 1f6705f71ebd..5f924efa8a42 100644 --- a/net-misc/iperf/iperf-2.0.14a.ebuild +++ b/net-misc/iperf/iperf-2.0.14a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-2.0.13" LICENSE="HPND" SLOT="2" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6 threads debug" DOCS=( INSTALL README ) diff --git a/net-misc/iperf/iperf-3.11.ebuild b/net-misc/iperf/iperf-3.11.ebuild new file mode 100644 index 000000000000..af78728922e0 --- /dev/null +++ b/net-misc/iperf/iperf-3.11.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +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" +S="${WORKDIR}"/${P/_/} + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="sctp" + +DEPEND="dev-libs/openssl:= + sctp? ( net-misc/lksctp-tools )" +RDEPEND="${DEPEND}" + +DOCS=( README.md RELNOTES.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch +) + +src_configure() { + econf $(use_with sctp) +} + +src_install() { + default + + newconfd "${FILESDIR}"/iperf.confd iperf3 + newinitd "${FILESDIR}"/iperf3.initd iperf3 + systemd_dounit contrib/iperf3.service + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest index 4b4ffc6f3636..7d7a893fbd17 100644 --- a/net-misc/ipmiview/Manifest +++ b/net-misc/ipmiview/Manifest @@ -1,5 +1,5 @@ AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161 DIST IPMIView_2.19.0_build.210401_bundleJRE_Linux_x64.tar.gz 147779297 BLAKE2B e3a0846e2704c5acc91ec303d40882d3572165b608c875e02d171b78e8158ea388c38da4e22a78ec4008517bbe7a826f89566bd4a16380009ed94b773b476686 SHA512 6bbde5ff7e5ba73d35068e30a6ca34a2993bc96b3ee10a5bbbafbeb321eb98960a176ec6712183e94705c33462791c23e93732b2945c93b2df5304e8e7d95a10 -EBUILD ipmiview-2.19.0.210401.ebuild 2054 BLAKE2B 72516e8d29138f70584b7b5b8be4554cf763b9f42c022c9bbd3f1723011695853f3825f9f27eeaf9bb9aa8c097a10e617b51c5210ab56a7f4174b7dff2db6b37 SHA512 7089690ddd3dad4c4ee9d4728f1694eb99c64534abc1f023d4953709b2fde7745b6707e1114a5370f0545989a395410b016bbf8730724c3c4766f9cbad1ae750 +EBUILD ipmiview-2.19.0.210401-r2.ebuild 2023 BLAKE2B c65f575835a5dcac20ae10b0b7d0cab6397160e6f992c5caa7a178368c2299112114844787e086e845b354116b57eea5165cbe2651ed03a74fedb0160ecafb45 SHA512 28c9666ae443e14e9390a103ce7d353fd7f17ecf4031485c98d0a4c44b37aa04612d285cc113fe915e633b9439cf37c5d7a8b69704733fc5080e7ee181b6ec25 MISC metadata.xml 703 BLAKE2B dc49c70c55ec3fab0bffd75b82500d88c0abcf072e61b96db1653373e6c7f6e01998441c9e107f7eb498ba23eb611c8c18fbf4f187c6aaa127f935754fa49f5a SHA512 e831ad0df261192f11dd6cd89fd62604a474e8810df47bd7a4275ed63a6056ef4d0dd005ed446842e492fc47beaa6d58c4a39ae85e329d80226914219aeeaadf diff --git a/net-misc/ipmiview/ipmiview-2.19.0.210401.ebuild b/net-misc/ipmiview/ipmiview-2.19.0.210401-r2.ebuild index 04196e64d468..0969639c5c31 100644 --- a/net-misc/ipmiview/ipmiview-2.19.0.210401.ebuild +++ b/net-misc/ipmiview/ipmiview-2.19.0.210401-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop java-pkg-2 prefix @@ -20,7 +20,7 @@ KEYWORDS="-* ~amd64" RDEPEND=" net-misc/stunnel sys-libs/ncurses-compat:5 - >=virtual/jre-1.8:* + virtual/jre:1.8 " BDEPEND="app-arch/unzip" @@ -55,9 +55,9 @@ src_install() { local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash) java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}" - java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}" - java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}" - java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}" + java-pkg_dolauncher ikvm --jar iKVM.jar -pre "${pre}" + java-pkg_dolauncher ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}" + java-pkg_dolauncher jviewerx9 --jar JViewerX9.jar -pre "${pre}" java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}" exeinto ${DIR}/jre/bin diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index a8b59e583f88..6f513bd1dfc7 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -5,7 +5,7 @@ DIST iputils-20210722.tar.gz 530745 BLAKE2B 4d6a2afaea1027e7992d374bbaa300f952f5 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1 DIST iputils-manpages-20210722.tar.xz 19208 BLAKE2B 7d6b126debeee2a4e5437b7d26a9fee5c759ae72fa9b7acb1a04bb673f14af742f5580aad6ae1c34048933d95d09c4adcf024fabdc20851297131877cbfa10d0 SHA512 c1521e76f5b8cb99d7226ca1bd916b1861b6c0f9655ad0e396dd8d997be6cdc37ee0e81ac325ea4ebb3b349b394e7f1c45081ddc25b778fd294928a7b2dc0415 EBUILD iputils-20210202.ebuild 4210 BLAKE2B b090f1cd2ceff44eefe1491c796ee6851bfdc78aff2cdadadd808fdc554b6876e164d5d4c89819401e6f2c25b0177d9886700c3abaae042f52fbe707df156a29 SHA512 83f5a2327619765b9d768534ea688fde8099e45162209da26465ef6abe6f49483255ce9c1c862d3f9f2e18eeeffae7f3af0ca8291f2e0a744bee0f88669c3670 -EBUILD iputils-20210722-r1.ebuild 4581 BLAKE2B 44e8c6bd74ce932caa428c85413d9f85bda0b7047f55d96de55f6de1526210ddb0a78e75f2fea8a084a4abe3aad96ba1818e5066e42b24920830b0b7111761c5 SHA512 27c4db1d21ca0d47aaf9c3791574306a978a2fa8be7a6cf74c4794a9fb766e1cb16d6a5c6510cbf1a28d6acc06f30da92564fe36cf5cf8216f2aacadee70afb1 +EBUILD iputils-20210722-r1.ebuild 4497 BLAKE2B 141f0df921a2b3841b1d8befca29f7699b518daef3231a0d6239b10b1663478c7cf0014ce024fb10b718a7bde838f2528c6b630ceb83abdecd3af72384215454 SHA512 516a2d32faca7775076badae729bc0b49d03740b93e707f489d0dadcf417d4adca23c42a2a055a26c0de60fdf5663f72afffa687dcfd39194fb99114776ef61d EBUILD iputils-20210722.ebuild 4512 BLAKE2B 1db6a9919ec592900f53fe4676a31b21059a6f011418616eef131f2d57d869b5af8ee3a0d4b527adc85a65c564a9137d23f631c03376920890d4140d8ceb0435 SHA512 fad6f0ac622ed92df810b9a34c9450853af63ad7ace9707dd1855058ff47188dffa2b134bf50862ab1c52e26c8c2207ac7183115d9c7452e0e116bf1c536538c -EBUILD iputils-99999999.ebuild 4440 BLAKE2B e752bc9085ee4a631a7c93b6f5a533bc2ea88009020aa336add86167cb68296a418e436af05469e06e8d11f6c49bf7bff9534e8258258d8eda5674e7011481bf SHA512 2b30c9bd6a5470381d016ab68338de9da471ebb0f351a19585543a33b77ab4f586a13590f592fc7b5c92a976d04ee9988c6da3d7d83ff15a55f295535021ac52 +EBUILD iputils-99999999.ebuild 4356 BLAKE2B 105fc357e9bc8afe96e2447e7007587f2687a634f6773a2aefd1cefaa129576d6dfcb36be62e82d76b816ad8fe1aa3734762d1fa08a1918dd3a761173b29c687 SHA512 9da7290b239d223034a226d76633f3f77379f388cc3914f524fab294a23621229d7d840dc74f49dcb1c8d0bfa3471adb44863e2efe96f85c9f18cd974b8a9a22 MISC metadata.xml 1510 BLAKE2B 773a096616c325fdef0d4fc5e5cc887d47ab3433be7efdcbfaf99e4d04f82d589ab759a7493e1cd10e80cc047c5288ee2200f7b21cfa24ab801f5b84688f5fd8 SHA512 4e207561d2d42f4bd07b6ded0729688883b6f8fa38d15734ab42ca66b1baac98bf283a71fb80f210f7a1732611e987e85084e615c4ef727126faa29acd154ae9 diff --git a/net-misc/iputils/iputils-20210722-r1.ebuild b/net-misc/iputils/iputils-20210722-r1.ebuild index f572846d61e0..2ae5257319b0 100644 --- a/net-misc/iputils/iputils-20210722-r1.ebuild +++ b/net-misc/iputils/iputils-20210722-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" +IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" RESTRICT="!test? ( test )" BDEPEND=" @@ -91,7 +91,7 @@ src_configure() { -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_TRACEROUTE6="$(usex traceroute6 true false)" -DBUILD_NINFOD="false" -DNINFOD_MESSAGES="false" -DNO_SETCAP_OR_SUID="true" @@ -138,18 +138,12 @@ src_install() { mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die done dosym ping /bin/ping4 + dosym ping /bin/ping6 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 + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi if [[ "${PV}" != 99999999 ]] ; then diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index fe97d131c7f4..34966ccdc145 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # For released versions, we precompile the man/html pages and store @@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" LICENSE="BSD GPL-2+ rdisc" SLOT="0" -IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" +IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tftpd tracepath traceroute6" RESTRICT="!test? ( test )" BDEPEND=" @@ -84,7 +84,7 @@ src_configure() { -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_TRACEROUTE6="$(usex traceroute6 true false)" -DBUILD_NINFOD="false" -DNINFOD_MESSAGES="false" -DNO_SETCAP_OR_SUID="true" @@ -131,18 +131,12 @@ src_install() { mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die done dosym ping /bin/ping4 + dosym ping /bin/ping6 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 + dosym tracepath /usr/bin/tracepath6 + dosym tracepath.8 /usr/share/man/man8/tracepath6.8 fi if [[ "${PV}" != 99999999 ]] ; then diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index f5954844a552..736b4eb00ee2 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -2,7 +2,9 @@ AUX kafka-connect-distributed.init.d 836 BLAKE2B 983a7eff314d7d09e3d6c01de7187b4 AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238f4f4eff4733432ef48ad0d3352c843290e517a195ca89ee39a8c1793d0fac671689cb51946696b3eb62d90e SHA512 96656e81a296c989fa5dcbab4831b6ca12841ef8e902d32b3100196e0dfc1984ba6d4eb426ade14ef8b4299ea9665753a0af22e8e7f4b7947424d5529d2f7010 AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f2514272c16379d302019630add9fa1cf840cbe398afc1d36d5a19522aefbbbad635d050070cdbd6ae0c3 SHA512 578dbbb51ec12220f51ee4e80ebcfc3d20e0d921b262673505f50010522f9f67998293a6081357fc0f8b6d9e4a7dc306d4e5f45d4099bfee80fd5cd3f2940e8d DIST kafka_2.13-2.8.1.tgz 71438574 BLAKE2B 51969ae472665f5716f0ee9df35d627221d1347ea0ddcbc0812774606c3c8251670a7f79eaf93eb3141494042f967e9eeca14ae078937afb6bc29c2ef57bd68c SHA512 91fcd1061247ad0ddb63fa2b5c0251ee0e58e60cc9e1a3ebe2e84e9a31872448a36622dd15868de2c6d3f7e26020a8c61477bc764e2fb6776a25e4344eb8892d -DIST kafka_2.13-3.0.0.tgz 86396520 BLAKE2B a58b3638dd17ead6677db367003c727ad52827ebed0a5dd7772a56821866b867decb8e8e344106b047d40c6c19ce925c468d3879f4a1ce14f965adecf5b5432f SHA512 86cdeb04af123399858d03431e9777948c1c40ec0d843966cf9bd90b8235b47ebbb5cb96d1f0660710b9286da86bbb5ee65e21e757606f5a1e67f970ae5cf57c +DIST kafka_2.13-3.0.1.tgz 86512293 BLAKE2B d1d1a1c4e0ae68a6d30fc36df1e796e55576345f6533027cbe0a1130f9148ea6fb0a3dea5e38a6fd22c8ced87cfee2e62969264a51aefc3d41d982a9020087a3 SHA512 d949fa4be7b601a9b482ae1c7861135a5da007362c4c1c9c218bdca94c45e918527e56738361aedc6b6dfb7abf02b1aa8110c7bc622cc2379b8a2ee557e5756f +DIST kafka_2.13-3.1.0.tgz 88130011 BLAKE2B 1dbd0f0cbc54ee19c47acff6aa25b4867e25fde81239a7b5e2f8ef6f42a727e041c006457964e48caec95cc8dc0b4ccc0f391b67264bcf27a61b9111e707fc2b SHA512 5954c1cf38187134a6e0a21520cbef5cd5320a3e9290e630c3895990e892219917d911fabbc64da5db17bcaa940b8277c23344b50f2ff4256eaca78116e9fdc9 EBUILD kafka-bin-2.8.1.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90 -EBUILD kafka-bin-3.0.0.ebuild 2067 BLAKE2B 8b74c84d3f3defd97d05889bec5cc35feeabcb18eb11f5b3effa0c1aa50ae1bc3c3dd26f2ecbd992d2d83678aa3347d28479f6af1b90e1b64441fee778706304 SHA512 609fe78ff84d5d7fd2f43a2eb99db19eb88dc74cad25bce84230ff5c67373da6c8be19adca2adbbab8945e5cd04284e9e8e6f1b2140f1dfbd06a1b362ba5cf90 +EBUILD kafka-bin-3.0.1.ebuild 2067 BLAKE2B e711e94deefb0d7ea590cf9732401c7659938a28e7367cfcb419a3da1ca1ef706da7a82471e4a89e81c7b7d5871c730af4d17e48c6c19e8d29831e18ad9e2177 SHA512 a1243a3309bf30c32a2c227b6351f3e294f209557308b49cefa1d9aab1e36d69105ea9f8411c48e92583d6d92e3dababaa72bba3c969688c9adad819d03005ef +EBUILD kafka-bin-3.1.0.ebuild 2067 BLAKE2B e711e94deefb0d7ea590cf9732401c7659938a28e7367cfcb419a3da1ca1ef706da7a82471e4a89e81c7b7d5871c730af4d17e48c6c19e8d29831e18ad9e2177 SHA512 a1243a3309bf30c32a2c227b6351f3e294f209557308b49cefa1d9aab1e36d69105ea9f8411c48e92583d6d92e3dababaa72bba3c969688c9adad819d03005ef MISC metadata.xml 390 BLAKE2B b381ee7c8449c21b4036052e12f2442e1480e9790df1e42ac5375dbb13c7c9344e8d2b2f9b80bc75fdafdd023d6a80c2149151233ee7d2908539ef9d998e7445 SHA512 fe9f241db7f81e850901a8d3b7c2d90f043d3b80851132359055e855c9b1c949566aab4a3889b5af56db99e9f18000e40b4f9096221a9bf813ac5e82bb88bf7e diff --git a/net-misc/kafka-bin/kafka-bin-3.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.0.1.ebuild index fb42f54f96da..3ac960f997f4 100644 --- a/net-misc/kafka-bin/kafka-bin-3.0.0.ebuild +++ b/net-misc/kafka-bin/kafka-bin-3.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/net-misc/kafka-bin/kafka-bin-3.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.1.0.ebuild new file mode 100644 index 000000000000..3ac960f997f4 --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-3.1.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 connect" + +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 + sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.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" + + ewarn "Zookeeper owner has been changed to kafka:kafka" + ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper" + ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper" + ewarn "to keep the previous behavior." + ewarn "All logs files have been move to /var/log/kafka/" + fi + + if use "connect"; then + doins config/connect-distributed.properties config/connect-standalone.properties + newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed" + 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.5" "${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 79c6e6efb12a..58acb905ae6b 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -15,8 +15,8 @@ AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039 AUX kea.tmpfiles.conf 61 BLAKE2B a0c31118e028dfbbdb372866b85f99e7b2b73a88bb1c2f27ebe5bb0ff19a77c96b13bb5ddc581af366c8bd104322eef196d849f8a333ca0c9eaffbce980c9443 SHA512 8a155fef71c89dda45b2920bdc62c6ec79946b5f7ba126a9627e35b62b8b283356a8be4a378aa33ff1f103ac608d6460fcd170baa3f097914d398e763a3a6d9e DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0 DIST kea-1.9.11.tar.gz 9739770 BLAKE2B 0215ac48036506018dc869c313d59244e4bf03634be279039fd0dbf7de73a2d87654b11153ec9014b89c815068961633987d44a26b820e4692937c85d29d352c SHA512 5d7739d74b6fbed9733719af1aa068498fcc1eaa1ed423b93b9b4dd92de970e3cd036ad60377534a58e7d22e909404673358fa72307b6c32492f952684c180c0 -EBUILD kea-1.8.2-r1.ebuild 2784 BLAKE2B 06d85eb095b235e6a0f2e734fee54a04dc6f209c2e2bd9757c9a8d2b8048239dfee158a89e9f584b59d049ed30b09d0ddb1965e874d9f137b5094e22baa1e7aa SHA512 6066d196fdef072a45e521349ded515cad42f15eb51884ab2919272b3260e927cbfc2d38723aefb12f973308f596b9e4fa76069f7685b46ef5914fc0eb2bbaf9 -EBUILD kea-1.8.2.ebuild 1804 BLAKE2B ff8dc83bd981c9f38efcc133e6b323c44105117968632f50cfdcc9a85318518bb58686e92c99c6d6a605b2287454280c29d74f8149035039b41d3e21a7d18e59 SHA512 c14e016e300ac6fa3e47e1c8bbc49084bdbcf8a6cabf1166909a854afae3ed4ecdb10db5e148e68d79307113c73be925f1678b3ee1cc9ec500a8fdf882d44074 -EBUILD kea-1.9.11.ebuild 2732 BLAKE2B a1a8b97d44455c1723c6d21d3e0a8d62eddf80cf078892731fda075b73e74aafdf93f4d897d3c382a899b0a3fa25934c7dc742cf4ff5ece4c428228968241629 SHA512 9661e9f8db575f992b81188a59e7035bda3dcdc3445839f3f8b971d107a3e90a8842d19ead003dc8b0bc3a96295170cc1c16bbb7248a13743da06a709ddb7977 -EBUILD kea-9999.ebuild 2509 BLAKE2B 7701620daf4e311ac01ad613aa68cba3dd5edd41be69e5fcbdde640f48fdcbe60d6a3c6acaac5b52cf9154499a03782ee08754573782c178a44a33dda7726fbe SHA512 a31425cb4b65bb7f2d210a44d84c817e56154cfff292d7c8e0b3a73e9abff419c7c3dceda4b7dc1ab6a21bf94e05a9fc49c8a5dab6f869fbd4200cf9880a250c +EBUILD kea-1.8.2-r1.ebuild 2785 BLAKE2B 3726d139e9c04da6c3a345a8665dfa1530a525e6ec7b468c9601f5ab11bb26fa5cee845576b5ca617bc19473b6d4d3f403f23395c3b0662c97080a5bb3593f57 SHA512 b9b921c004baad4a8936ee9e97da876b32b8909b1dd81d886c7a7a28528e9aab84d6e30b46631dc7ae58ed18f243d04f4fba62e8313a1932b18ad1b3aaff339a +EBUILD kea-1.8.2.ebuild 1805 BLAKE2B e3d5971e48a4d1bfc4bb4525dd29a3e9fe773e2e9276966b377f5ed8bdfb5892e5d1a334c16ce9c79735610d802d346ec1da69543eb0daace3dabbec40ddfd0d SHA512 1d6fd14954a0c88f5050f4764a592ec6dd17cb6970413b183e29896842cf2970178766ec29d05e05a8913264984db0da88d4685b709576f8988e97fdd3d4390b +EBUILD kea-1.9.11.ebuild 2733 BLAKE2B d727f315595048996d91c29648d84469f60fd2f0bf4fbbc157b8f64aa307ac794cca76c9a79c1acb1b49f77b289b859ead86c412e344ad812230f1e083ba890e SHA512 f9f1e15b21fe9ae8b8223fa91d45f18fd66e986daafbac62d5305b3b19534752cded898cb5a017daeda772ac77657cf723b68a85f9728e6e1c600995e47838da +EBUILD kea-9999.ebuild 2510 BLAKE2B 642706b5298a0936fd21cf3d8a05d097d90955f87552d6f46f0193044d4f800cd608c91720a5649e108c71b692b4f648eec4a8392fc6d93da0126134443e06f7 SHA512 1cf24522f19a398eff9537fe362621a18693fcfcfdd14d99e76d9717fb028cffc94c4a07e75c17d9a47852432f8d0643983c788a03bc8289e14c1743f508e72d MISC metadata.xml 785 BLAKE2B effb1866745b2c4d1db59f41586c240455aabb707a606fe083503d847a90846ef304c96cd69d3153c133946a1b90978e97db9fead9776b2cf8a6a735a60eba9a SHA512 e026c4948bf1c5f05cc3ffb475f4336e80e179ea7e71af11bdb37e9951514497a9b9a516bf24736b43f8462cd5abd8a59cd6c03a7ba0583c25df89557c24e8f4 diff --git a/net-misc/kea/kea-1.8.2-r1.ebuild b/net-misc/kea/kea-1.8.2-r1.ebuild index 7da321e5b818..1a33c637752a 100644 --- a/net-misc/kea/kea-1.8.2-r1.ebuild +++ b/net-misc/kea/kea-1.8.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="http://www.isc.org/kea/" +HOMEPAGE="https://www.isc.org/kea/" inherit autotools systemd tmpfiles diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild index 0300cc956210..7bf6f71daf2a 100644 --- a/net-misc/kea/kea-1.8.2.ebuild +++ b/net-misc/kea/kea-1.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="http://www.isc.org/kea/" +HOMEPAGE="https://www.isc.org/kea/" if [[ ${PV} = 9999* ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/isc-projects/kea.git" diff --git a/net-misc/kea/kea-1.9.11.ebuild b/net-misc/kea/kea-1.9.11.ebuild index 7a7f2838d8c3..cec8274fa82c 100644 --- a/net-misc/kea/kea-1.9.11.ebuild +++ b/net-misc/kea/kea-1.9.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="http://www.isc.org/kea/" +HOMEPAGE="https://www.isc.org/kea/" inherit autotools systemd tmpfiles diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 0d9eaa837ee0..9f241b088227 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ MY_PV="${MY_PV/_/-}" MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="http://www.isc.org/kea/" +HOMEPAGE="https://www.isc.org/kea/" inherit autotools systemd tmpfiles diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest index 62499cce83b6..6828fa180379 100644 --- a/net-misc/mcproxy/Manifest +++ b/net-misc/mcproxy/Manifest @@ -4,5 +4,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 1102 BLAKE2B 74acb2772b94c138b1b1f2a9b2f3f252465830a5f99786a654e366e7b3a84db89f8963ecc0943b2daea460056f9f64ab138ee6b4f2454d317073f782ea013587 SHA512 eda0a3c1622319d7a0a5ea01b7af3c367c7efd9427a08cba345b2df9e268e825fd400ee2c7c73d237ba135923f6b1ee36e323e302255b4857158701c8bfeff6f +EBUILD mcproxy-1.1.1-r2.ebuild 1101 BLAKE2B 036dfb63c95e0874d550ef0002789c82bb95dee56e1314c94673d05921325758ca74ad325c007a868fb67651e3b3f723333d6380187eeeaaa0764f01801bc534 SHA512 90a55df2a7e76b480a95aa031ea329ae2c3bff4f5decb080937552efecccf400e29aabb8a506b074655073d9babed312e559c50f4fa1d6acfbf5d7f4ef40ac96 MISC metadata.xml 1264 BLAKE2B 13fa61ffbab794e8dd9293a6828f06e143f4abb49a0aff04b08434cb5f47c5939757a135ff7752a31dbecda8440b0b734825cdc83d6c1823c4110c37be13abcf SHA512 d6f09d0d10924cab725e24a7633ff2d0a7c96f460a310e00caf689656705fac48ee0b95d3e62e45587ae3da0a1e21a3e1e7fb232b9e64bf436b65e8fd166d57a diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild index b264a8937f8f..18b13e778d5f 100644 --- a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild +++ b/net-misc/mcproxy/mcproxy-1.1.1-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info qmake-utils systemd DESCRIPTION="A multicast proxy for IGMP/MLD" HOMEPAGE="https://mcproxy.realmv6.org/ https://github.com/mcproxy/mcproxy" SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}/${PN}" KEYWORDS="amd64 x86" LICENSE="GPL-2+" @@ -19,8 +20,6 @@ DEPEND=" doc? ( app-doc/doxygen ) " -S="${WORKDIR}/${P}/${PN}" - PATCHES=( "${FILESDIR}/${P}-clang.patch" "${FILESDIR}/${P}-fix-checksum-calculation.patch" diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest index c46ce8c9d790..243f044f5932 100644 --- a/net-misc/megatools/Manifest +++ b/net-misc/megatools/Manifest @@ -1,3 +1,3 @@ DIST megatools-1.10.3.tar.gz 196361 BLAKE2B 49d7658714074253ab93134bd9fbb6f73a9101e362f219c4394cfe599deeb3cb2ccf01afb89db75691299271fa9dbfdf004abd6dfe26d2a0fda783282561ff51 SHA512 cf431e151f3f7e1a77fcfe07092694f861eca43ab88bb4e0d4de72f01662e9140c51891f8f5cf3cf66d3a04b64a55d57fd766c3febf2fc5cee1720558ff2079b EBUILD megatools-1.10.3.ebuild 713 BLAKE2B 8241d9fbb52a77bc00a8f0b689060068df781200fd679b74ff74302a29c22774ee1cbbedeadee7990c85d4cb982b37815f28dafd36d831a108dba094d97f34ca SHA512 3fe92ee1388e6ed190b8f5eeb183967be92fe3264ca9ab43fde43ccefea6e0aab821fa327a0f743bca6b0a61d7009e8ae430a35e876cab281d7d1b76a5d94091 -MISC metadata.xml 532 BLAKE2B d13adc1cb9c3c5336e173267eaeae9f056bf91d417fd88e78838423d07a8323d2437bf459c00a1661bd8a605eec92698b1f0623d83e4f0c5aad999446bd31a8b SHA512 619f612eab37c26cbe58dff2ec0d85db1b09635b4be47bdbfe9d33bc9deffac2a1159416ed0bb4a11a849427341802149fd28c2570d46fd60671738ad99e31e3 +MISC metadata.xml 539 BLAKE2B 70a4c81ac41274519e398a405996a5792864088c215203b95b92a067cd63767416eb7ec2ea2b5a1af39761353ce50b533c6c6127eab1ad80f687d92666de7655 SHA512 36b93e4ff68d73d24f5d3e4397b32a58c542f2b8049ef9aaeaf0392a656803c3bf4bb70bfbdcc48fba07130fa54d0693014fbba5550905f0bc2831a204e62afc diff --git a/net-misc/megatools/metadata.xml b/net-misc/megatools/metadata.xml index 9c32253388f8..4a33f270c218 100644 --- a/net-misc/megatools/metadata.xml +++ b/net-misc/megatools/metadata.xml @@ -2,15 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>dlan@gentoo.org</email> - <name>Yixun Lan</name> + <email>ajak@gentoo.org</email> + <name>John Helmert III</name> </maintainer> <longdescription lang="en"> -Megatools is a collection of programs for accessing Mega service from +Megatools is a collection of programs for accessing Mega service from a command line of your desktop or server. Mega website can be found at http://mega.co.nz. -</longdescription> + </longdescription> <upstream> <remote-id type="github">megous/megatools</remote-id> </upstream> diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 906371081362..e27ec89e2216 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -6,10 +6,9 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 DIST memcached-1.6.10.tar.gz 609630 BLAKE2B 1b4d632cb57e1f49d6e667aea5a4d2a1c74bbac038db329d84f2b9229e6db8204c2c0b55075ef238a5c3fa3751de5a0fb843a2ee0e71a648a194aed832d6dd36 SHA512 46d41c87afd0fb3a15bd418d757a25f93bee7d052653a488b4bc29a795826b9c238590cd9ee602ca4e5f645ece74685c644a9bb12bb58ff79b098c4fcf5b3835 -DIST memcached-1.6.12.tar.gz 618614 BLAKE2B 45de1c9610781ed6ab27261642db62b65a846651df64d9db2658ce8bc1cd96a798add6099340281c9dadc470e81b86976b855f4bece29189cfcfdb9b4e3a8991 SHA512 6cf41f14679ffac096195c29cf79741f28069e92d8ceddd5039061f1b8d3d4018f2983a6e43a27306ff299f9198e56f9ebd8ee8b62aa4882b38a0aa712ab1779 DIST memcached-1.6.13.tar.gz 1031167 BLAKE2B f65871ad2a110fb4baa96dd57844cfc403bcfc905120bbf13a6be9392a78ae3dafcbb59f05b9d212a1239ede465a3688d5ca90e5d104f654e36c76739545c234 SHA512 3f3ef37f5838d8b1b8100cdb77b2226d8d29eef093bcb2c9a03f2420144aa35a5c8c1c957134eddce1fdd37a05b5ffc19058baf05dd3aad60fca12f8c81eaf1d +DIST memcached-1.6.14.tar.gz 1034514 BLAKE2B 960da79748019cfc6b8c1e2f63e67bede8a472985e738e3998ef41e48bd1c645671cf42661280cd4d97fde8de368f9f5d74e0aa83a7447d7f19fa6eeb303a01c SHA512 607b5c0d4c721c714b6e6e3fbca4845fc24103e1dfb988a2edf818b78f918eeb71b86b211e311dc2bcbc438a9a0ffcb69a3bd6694b591720ede8b5349c804740 EBUILD memcached-1.6.10.ebuild 2861 BLAKE2B 766d0823415f5695f50c3ef538277ca8eaddc0c21c19680bf917acc4c2cda54f942fb4bb742fe87bc2b734f4e3d440a1db1f5f3fde8f9783b611fa4d731e47ef SHA512 f19bc943a41580db184bf036fdc517f59fe8f8418ffa7855a5066160c1427ebfb9eb73d07df62803c5f095fa01e0deba56ae1464bd462610b6f0c4f175897cff -EBUILD memcached-1.6.12-r1.ebuild 2968 BLAKE2B d1683d929f3a1165f0c92645fa33ae16cee48f64bae0427e75228edf2611acb7432012f04d754693fe36bef88ae689a13c1f6fe6af7177bfde399af8201c8a2d SHA512 edde0dcf4d1d46972b7503b4b4ce0ea8ff0ad6ee0086beb12a63148b1e2ea96036842f3e2c47f5c61d2e12dd99c5f9d3286f9e29f1686d7a2cb6fb6f4a811c75 -EBUILD memcached-1.6.12.ebuild 2868 BLAKE2B 637e796bac6f590459dbccd3c6068b1d7bdef9bf92595f6b3def557a4803d8f32e8a391c582a3b824110a136d557247227190ada8d78184c76e05e57b70d4d94 SHA512 d9c61fedbe070116105346ac78e9a310fa4f0a0da7d070387a6477cb0340205f795f5bc4cee283a5bb6faf012c8b4aadb56138df57bb4c9ed6a1ffb0a5b7a61c EBUILD memcached-1.6.13.ebuild 2868 BLAKE2B 5f38656aec2eb9d62cc12ee437410a01d9e666e33856c9755aa3c2add6c75db2614932415933431f545e5f0b1bc90d8af11397ece9ddeddd70fe474f6082432e SHA512 b7388ee5dc5bef4597104a92d3a314207fb35bfc3a66c17b5c691fabc3bbb9bc49587acc0d432b01c1e838c032330ee23c93df4d15bd726bbe300032381deff3 +EBUILD memcached-1.6.14-r1.ebuild 2968 BLAKE2B d1683d929f3a1165f0c92645fa33ae16cee48f64bae0427e75228edf2611acb7432012f04d754693fe36bef88ae689a13c1f6fe6af7177bfde399af8201c8a2d SHA512 edde0dcf4d1d46972b7503b4b4ce0ea8ff0ad6ee0086beb12a63148b1e2ea96036842f3e2c47f5c61d2e12dd99c5f9d3286f9e29f1686d7a2cb6fb6f4a811c75 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de diff --git a/net-misc/memcached/memcached-1.6.12.ebuild b/net-misc/memcached/memcached-1.6.12.ebuild deleted file mode 100644 index 16eba892a140..000000000000 --- a/net-misc/memcached/memcached-1.6.12.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic systemd - -MY_PV="${PV/_rc/-rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance, distributed memory object caching system" -HOMEPAGE="http://memcached.org/" -SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz - https://www.memcached.org/files/old/${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" -IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later - -RDEPEND=">=dev-libs/libevent-1.4:= - dev-lang/perl - sasl? ( dev-libs/cyrus-sasl ) - seccomp? ( sys-libs/libseccomp ) - selinux? ( sec-policy/selinux-memcached )" -DEPEND="${RDEPEND} - acct-user/memcached - test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-1.2.2-fbsd.patch" - "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch" - "${FILESDIR}/${PN}-1.4.4-as-needed.patch" - "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch" -) - -src_prepare() { - default - - sed -i -e 's,-Werror,,g' configure.ac || die - sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die - - eautoreconf - - use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN - - # Tweak upstream systemd unit to use Gentoo variables/envfile. - # As noted by bug #587440 - sed -i -e '/^ExecStart/{ - s,{USER},{MEMCACHED_RUNAS},g; - s,{CACHESIZE},{MEMUSAGE},g; - s,OPTIONS,MISC_OPTS,g; - }; - /Environment=/{s,OPTIONS,MISC_OPTS,g;}; - /EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;}; - ' \ - "${S}"/scripts/memcached.service -} - -src_configure() { - econf \ - --disable-docs \ - $(use_enable sasl) - # The xml2rfc tool to build the additional docs requires TCL :-( - # `use_enable doc docs` -} - -src_compile() { - # There is a heavy degree of per-object compile flags - # Users do NOT know better than upstream. Trying to compile the testapp and - # the -debug version with -DNDEBUG _WILL_ fail. - append-flags -UNDEBUG -pthread - emake testapp memcached-debug CFLAGS="${CFLAGS}" - - filter-flags -UNDEBUG - emake -} - -src_test() { - emake -j1 test -} - -src_install() { - emake DESTDIR="${D}" install - dobin scripts/memcached-tool - use debug && dobin memcached-debug - - dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt} - - newconfd "${FILESDIR}/memcached.confd" memcached - newinitd "${FILESDIR}/memcached.init2" memcached - systemd_dounit "${S}/scripts/memcached.service" -} - -pkg_postinst() { - elog "With this version of Memcached Gentoo now supports multiple instances." - elog "To enable this you should create a symlink in /etc/init.d/ for each instance" - elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/" - elog "Please see Gentoo bug #122246 for more info" -} diff --git a/net-misc/memcached/memcached-1.6.12-r1.ebuild b/net-misc/memcached/memcached-1.6.14-r1.ebuild index 691bb53ad5c0..691bb53ad5c0 100644 --- a/net-misc/memcached/memcached-1.6.12-r1.ebuild +++ b/net-misc/memcached/memcached-1.6.14-r1.ebuild diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index dd3813911b9f..f4802b62cb97 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,13 +1,6 @@ -AUX miniupnpd-2.2.3-testgetifaddr.patch 630 BLAKE2B d5f10c753f471a8f9d658a7c2cbc71ce5c64bc5cb2faae49e280cbaefe1fd6ce34ff0427d7512520a333a63fa4156df76271781cc1193fcd034e9b60d3b1d241 SHA512 6d87c50a64fffdefc3b251174ffc62ad9c855d248b6771343e6bf3e15f36b109c0b9b7eec3f2f47be12f5aac341c04b19c02e72eb30c38dc841c4e75bd5f21bb AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856 -DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B d561916ced9b5c58371382fe0bec68cd0771d1dc3b2c7fa7e3701cb2579db69697fbdcd724bea2350abd46381eda1fd257dede6df99f99fa54e423db4ee52717 SHA512 3cc11ad901e93a9879fe07e35a20f8977df466bb402e0270e46d1dbd0b5dc3b5dc22303467d5022103952d7dd789ac590c17d0fa81fc7ec42676b66223d37ee4 -DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B 461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482 SHA512 8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef -DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775 SHA512 56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9 -DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B 3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468 SHA512 9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21 DIST miniupnpd-2.3.0.tar.gz 256069 BLAKE2B dd21b4ee692cf9958bd996c6fe70e7e1f6cdfe467506676d2335ccf37cd0ed7e55ff435983747cad5d2342019b36597e538fcb9b511872889305330212e88cb0 SHA512 437a4b101bcadd9feb3845d37402c253a0a2114463fd8c5930859c7eae0ffaf7714ef7c9d387be2339c584e2f106fafa008a4364ff347b6640153c9a09919b0a DIST miniupnpd-2.3.0.tar.gz.sig 543 BLAKE2B 312d46521d37c1a2fda146f2c7c964af45ffa4a75bc327dc743b40f96586e0916a674db4a0bb847b5e386f0b781319868d1d6cc74fbffaf3a8e989db18f4f6e6 SHA512 87be539c27d0147fcc62b69a82858518e862f2b593a0e03a9986e3641a0d61f4fa831d79a7ce645b33569234463a9517b9dbbc79ee988c9f561474a4757c4c04 -EBUILD miniupnpd-2.2.2.ebuild 2138 BLAKE2B 44b683c5351bcadb577444cfdc527406840ba7d88e051cbf4f3bdbaafa830fe94982939eb92503c8e5917d7859314c8ec35451b963ba9840fee1c4a897052146 SHA512 1ff9bfd42924d4303cd9d658bfad50e106cd89d0ef7fb4e117bd3bf18434308153b7290c6a237675f4036d3f13f681cd929cfa92c42a71d2ebe37c746cd5b043 -EBUILD miniupnpd-2.2.3.ebuild 2365 BLAKE2B e9330f2e1fe1997f1727a9ec5b7621abbdcad02892973dd8ae5737b91b152a29250b6b5d83c1d0aeb2e379d9480bddd927f5c9a93c4aa786f453cabe2a0ed477 SHA512 194ba80f9f4d1e8f666b0f2bd2e07bc09677939c8fb1f5e2362b67d2a8f50244b8b7c5d9079e53bbd69a4670b6bd6da55f16681b83e61108d583e3f76dc3ad00 -EBUILD miniupnpd-2.3.0.ebuild 2303 BLAKE2B 63acd9ba73444181cf175d0fbbe813a0ef2cab95d2510102b195e8ee3e122bb172a42e90eb676181abdb1d93047b688f4d259ed57442a105530717d839896c88 SHA512 3e0ced2044ffadcd019e3922bd703f29192c40abb2b04c3e135ac931c0e61b6c90917681d84674d93ecd7137f417ee31cdbcdefc089143e974d630c1b85ffe13 +EBUILD miniupnpd-2.3.0-r1.ebuild 2306 BLAKE2B 25d3069c8b96a167d77608c6da46edb4016b1cb2f92a0275ceac123923d2d3d4cb767a7f276b616cfdc31c22b6c30fbdaeddbe130456ebf5a71328f36e54018c SHA512 10718574779b011469ede70cda63994e7f443690e66501725b7f366be67623c1deaa65db402f420d7c412cfd9e8424b286dd5a662d502403f6840aa5e951d262 MISC metadata.xml 903 BLAKE2B 08e36f0ed04a8314bcd5edab87303883dc2dfe454b4ab427bf8f1716922f20465c61971dae2eb95381783589b202b4480f98c0d1f01fb2e7cc8e2a72ee9a294c SHA512 3b253a010b5f5e683c6cd4b60d9e8ef3a1bf6c85856ea18bbb2d97a610af7ca1bfbf0d62096044d3c851067b5203359d1768a58eafe6d06ad48a36013839d811 diff --git a/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch b/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch deleted file mode 100644 index 73e4a87903e8..000000000000 --- a/net-misc/miniupnpd/files/miniupnpd-2.2.3-testgetifaddr.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/miniupnpd/testgetifaddr.sh b/miniupnpd/testgetifaddr.sh -index 7ad56d9..2a26a24 100755 ---- a/testgetifaddr.sh -+++ b/testgetifaddr.sh -@@ -12,7 +12,8 @@ case $OS in - *) - IP="`which ip`" || exit 1 - EXTIF="`LC_ALL=C $IP -4 route | grep 'default' | sed -e 's/.*dev[[:space:]]*//' -e 's/[[:space:]].*//'`" || exit 1 -- EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2 }' | cut -d "/" -f 1`" -+ EXTIF="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/[0-9]+:/ { print $2; exit 0 }' | cut -d ":" -f 1`" -+ EXTIP="`LC_ALL=C $IP -4 addr show $EXTIF | awk '/inet/ { print $2; exit 0 }' | cut -d "/" -f 1`" - ;; - esac - diff --git a/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild deleted file mode 100644 index 7bc2128632d2..000000000000 --- a/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs verify-sig - -MY_P=${P/_rc/-RC} -DESCRIPTION="MiniUPnP IGD Daemon" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz - verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" - -RDEPEND=" - dev-libs/gmp:0= - sys-apps/util-linux:= - dev-libs/openssl:0= - !nftables? ( - >=net-firewall/iptables-1.4.6:0=[ipv6?] - net-libs/libnfnetlink:= - net-libs/libmnl:= - ) - nftables? ( - net-firewall/nftables - net-libs/libnftnl:= - net-libs/libmnl:= - )" -DEPEND="${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone )" -BDEPEND=" - sys-apps/lsb-release - verify-sig? ( sec-keys/openpgp-keys-miniupnp )" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc - -src_configure() { - local opts=( - --vendorcfg - $(usex igd2 '--igd2' '') - $(usex ipv6 '--ipv6' '') - $(usex leasefile '--leasefile' '') - $(usex portinuse '--portinuse' '') - $(usex pcp-peer '--pcp-peer' '') - $(usex strict '--strict' '') - --firewall=$(usex nftables nftables iptables) - ) - - # custom script - ./configure "${opts[@]}" || die - # prevent gzipping manpage - sed -i -e '/gzip/d' Makefile || die -} - -src_compile() { - # By default, it builds a bunch of unittests that are missing wrapper - # scripts in the tarball - emake CC="$(tc-getCC)" STRIP=true miniupnpd -} - -src_install() { - emake PREFIX="${ED}" STRIP=true install - - local confd_seds=() - if use nftables; then - confd_seds+=( -e 's/^iptables_scripts=/#&/' ) - else - confd_seds+=( -e 's/^nftables_scripts=/#&/' ) - fi - if ! use ipv6 || use nftables; then - confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) - fi - - newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} - newconfd - ${PN} < <(sed "${confd_seds[@]}" \ - "${FILESDIR}"/${PN}-conf.d-r2 || die) -} - -pkg_postinst() { - elog "Please correct the external interface in the top of the two" - elog "scripts in /etc/miniupnpd and edit the config file in there too" -} diff --git a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild deleted file mode 100644 index b71fff94e94a..000000000000 --- a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs verify-sig - -MY_P=${P/_rc/-RC} -DESCRIPTION="MiniUPnP IGD Daemon" -HOMEPAGE="http://miniupnp.free.fr/" -SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz - verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" - -RDEPEND=" - dev-libs/gmp:0= - sys-apps/util-linux:= - dev-libs/openssl:0= - !nftables? ( - >=net-firewall/iptables-1.4.6:0=[ipv6?] - net-libs/libnfnetlink:= - net-libs/libmnl:= - ) - nftables? ( - net-firewall/nftables - net-libs/libnftnl:= - net-libs/libmnl:= - )" -DEPEND="${RDEPEND} - elibc_musl? ( sys-libs/queue-standalone )" -BDEPEND=" - sys-apps/lsb-release - verify-sig? ( sec-keys/openpgp-keys-miniupnp )" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/${P}-testgetifaddr.patch - ) - - default - - # fails without a default route - sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die -} - -src_configure() { - local opts=( - --vendorcfg - $(usex igd2 '--igd2' '') - $(usex ipv6 '--ipv6' '') - $(usex leasefile '--leasefile' '') - $(usex portinuse '--portinuse' '') - $(usex pcp-peer '--pcp-peer' '') - $(usex strict '--strict' '') - --firewall=$(usex nftables nftables iptables) - ) - - # custom script - ./configure "${opts[@]}" || die - # prevent gzipping manpage - sed -i -e '/gzip/d' Makefile || die -} - -src_compile() { - # By default, it builds a bunch of unittests that are missing wrapper - # scripts in the tarball - emake CC="$(tc-getCC)" STRIP=true miniupnpd -} - -src_test() { - emake CC="$(tc-getCC)" check -} - -src_install() { - emake PREFIX="${ED}" STRIP=true install - - local confd_seds=() - if use nftables; then - confd_seds+=( -e 's/^iptables_scripts=/#&/' ) - else - confd_seds+=( -e 's/^nftables_scripts=/#&/' ) - fi - if ! use ipv6 || use nftables; then - confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) - fi - - newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} - newconfd - ${PN} < <(sed "${confd_seds[@]}" \ - "${FILESDIR}"/${PN}-conf.d-r2 || die) -} - -pkg_postinst() { - elog "Please correct the external interface in the top of the two" - elog "scripts in /etc/miniupnpd and edit the config file in there too" -} diff --git a/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild index 328c65b49bbc..1ea1f1e65a1e 100644 --- a/net-misc/miniupnpd/miniupnpd-2.3.0.ebuild +++ b/net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( - >=net-firewall/iptables-1.4.6:0=[ipv6?] + >=net-firewall/iptables-1.4.6:0=[ipv6(+)?] net-libs/libnfnetlink:= net-libs/libmnl:= ) diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index 9a6c05762383..dfbe02f6cbb3 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1,5 +1,5 @@ AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460 AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e91495485906572c41c8137f92417f0509d5861e0e96a7472876ee2411e4407651aba8dc4b05880d46e70d7c SHA512 950f5a6b12427f2eb23232f56b054de972650e181abe1d2f0b836af319c34ad272505060caf1a60573ce8c7acea68ae51fc1bf0a600f0ec938422f86d8afbcf4 -DIST ModemManager-1.18.4.tar.xz 2510768 BLAKE2B 726c1a7970fdd13b7a1952abceff1905ed167a5da290d7d48427f221434ad02032cc0590d5701b10d48b93d10c35daadae4b20a026da335a9cf3020f55c4c6c6 SHA512 156193f0e9709e401f3acd66f8bc3028e04de70fca760b42fd9626e616292851cdeadd18685e05f0f83066a21d5c43741e96838e4940767a93b03db9bee7c9db -EBUILD modemmanager-1.18.4.ebuild 3997 BLAKE2B 899f0debecec6c84737ac6abcf6a1bbf09b2caa9c112d138836817acf583d398369791c081362dfdfcd5cdad4f2899334506ba39e0390972f101c6bda6a8ae88 SHA512 3c6d50fb4c231fbaa57394d8a04edb627815be67aa6acead2caa5e8f57e5f5a02d81546a9d6ed86bf28484a826181f6a0c7eee6116ea3eb3dac9aca5b53975c6 +DIST ModemManager-1.18.6.tar.xz 2519572 BLAKE2B 022e461d43a10bfce8d97f39b855cd28e1d165d07ec65db15c4ec3e89d932829b8c88a1834d182bc966c22f0d848cb6bb06bae2cc2930f685c9fa43b277668d9 SHA512 3b154d459e1196494d7f99303f88088215992aadb57a8cc66f838b068e762fa3d25f19a597922c26a138f670e1da46d627de11cf41d83ce96b3197a086f8e91b +EBUILD modemmanager-1.18.6.ebuild 3997 BLAKE2B 899f0debecec6c84737ac6abcf6a1bbf09b2caa9c112d138836817acf583d398369791c081362dfdfcd5cdad4f2899334506ba39e0390972f101c6bda6a8ae88 SHA512 3c6d50fb4c231fbaa57394d8a04edb627815be67aa6acead2caa5e8f57e5f5a02d81546a9d6ed86bf28484a826181f6a0c7eee6116ea3eb3dac9aca5b53975c6 MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee diff --git a/net-misc/modemmanager/modemmanager-1.18.4.ebuild b/net-misc/modemmanager/modemmanager-1.18.6.ebuild index 0b3fef8057f3..0b3fef8057f3 100644 --- a/net-misc/modemmanager/modemmanager-1.18.4.ebuild +++ b/net-misc/modemmanager/modemmanager-1.18.6.ebuild diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest index e6def6cfd48e..ce8fcfad8384 100644 --- a/net-misc/mosh/Manifest +++ b/net-misc/mosh/Manifest @@ -1,6 +1,5 @@ AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769 -EBUILD mosh-1.3.2-r2.ebuild 1489 BLAKE2B 29d6f01b6293dee4248b22109bfc62ae3d869ac4d032d9d707ba83504394afcdbaae5dad77b8f177ef939a7bc05dc18d4ffe3fcbc6596a076b4d4b6c5e6045bf SHA512 1c61bcd4844518aa42bade23ee10d10c28ba1a95f527230ce0bfc51893a1e00f10bcbcb826742eb5b397cd604fdf441a77aedcdabb9bb1871c6f6b57850df23a -EBUILD mosh-1.3.2.ebuild 1432 BLAKE2B 762f107430bdfdff1b200fce097fb298f7fe5ecd1799cb5e4f890552ffaa1a91e84c2fbdc0de18b3472c2aaa8ed8c4b9d6d732279d9e341f6ef4f1f63faaf664 SHA512 93ab6bfd1a7dac29ee7da5a3a8021b18f34acda6d1c8f3df624ee6da05ecdc0757406dfa68644d1cdd588b490b2df7ad73a8691e5c48303fe429878bb6edecdc +EBUILD mosh-1.3.2-r2.ebuild 1488 BLAKE2B 0569f3b88a3ccbe672850cd9d115abbd3f99044d847e498466979b6c6073636c6a47847716d21b39b82920fbaee241dd933ea478c8208c1d60213f52620d9b32 SHA512 87a797af7b99397a91a16ff60c6d71a80db655c7455c6526139e5811f34bc6ae2acb35d3f300888f415deeea7c531eaedc27364b5151a5d6b13d0bc55e0a4eb9 MISC metadata.xml 1047 BLAKE2B 86b2beea09ccbdca70646b00a5af74f253ecd18fed70f364287b122520f4e15f507416c3ef9b40fe28b267e3dad9e8e16f0139dd0966c55d1597a5cae1c411b5 SHA512 3940264e614abb7b646d24e6786503793b3a651af7f802f5ef5bf1d395e89f38542eae2df5b2d737bf2474963215529771c1ba2eabc785a5649ecaa1da4713db diff --git a/net-misc/mosh/mosh-1.3.2-r2.ebuild b/net-misc/mosh/mosh-1.3.2-r2.ebuild index 1d38d71898ba..93b11c32f7b9 100644 --- a/net-misc/mosh/mosh-1.3.2-r2.ebuild +++ b/net-misc/mosh/mosh-1.3.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="+client examples +mosh-hardening +server ufw +utempter" REQUIRED_USE=" diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild deleted file mode 100644 index 81f05b43d28b..000000000000 --- a/net-misc/mosh/mosh-1.3.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools bash-completion-r1 - -DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" -HOMEPAGE="https://mosh.org" -SRC_URI="https://mosh.org/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="+client examples +mosh-hardening +server ufw +utempter" - -REQUIRED_USE=" - || ( client server ) - examples? ( client )" - -RDEPEND=" - dev-libs/protobuf:0= - sys-libs/ncurses:0= - virtual/ssh - client? ( - dev-lang/perl - dev-perl/IO-Tty - ) - dev-libs/openssl:0= - utempter? ( - sys-libs/libutempter - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -# [0] - avoid sandbox-violation calling git describe in Makefile. -PATCHES=( - "${FILESDIR}"/${PN}-1.2.5-git-version.patch -) - -src_prepare() { - MAKEOPTS+=" V=1" - default - - eautoreconf -} - -src_configure() { - econf \ - --disable-completion \ - $(use_enable client) \ - $(use_enable server) \ - $(use_enable examples) \ - $(use_enable ufw) \ - $(use_enable mosh-hardening hardening) \ - $(use_with utempter) -} - -src_install() { - default - - for myprog in $(find src/examples -type f -perm /0111) ; do - newbin ${myprog} ${PN}-$(basename ${myprog}) - elog "${myprog} installed as ${PN}-$(basename ${myprog})" - done - - # bug 477384 - dobashcomp conf/bash-completion/completions/mosh -} diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest index 847dd90d548b..de16f6460c0e 100644 --- a/net-misc/netkit-telnetd/Manifest +++ b/net-misc/netkit-telnetd/Manifest @@ -1,7 +1,10 @@ AUX net.issue.sample 117 BLAKE2B 8b0b60e93aeacd53eb46318317dc54d747fa6a7c009da72944df5012e4dd437eea386ad3936a72929932bc1915da57c4a220ba7205a2580d6e19dadc1e7f4149 SHA512 f290b0fc214dd58acfb186c269180aae29c42768bfeab21aa72604ad8ce50c354f18d9b568d04885554c5d1c27017dd7132e406933050450d8605d16d9263b79 AUX netkit-telnetd-0.17-cflags-gnu_source.patch 828 BLAKE2B 947bb4a47a9e032ab89647b5b30f6e6b494ec3aeeff5bc5c03ba3d5d6137077f435c08bddc284418584119b5001bf4b5f1beddf6b7b15e36608e7001f5498ebe SHA512 9baa5178d32bec960fd7c8c3041468243f14a9554ad82093186df872446d920d3c3073f2773db10f0e1edec9dbc60e194afad2abf189a9a253b2ce0595e6715d +AUX netkit-telnetd-0.17-r13-gentooification.patch 880 BLAKE2B 2727806eb103efa78df375f2e9d192c06b45ef00a8bf1f4f2537f555c74c532c58a677ea5c668782495310768eceefa86453d8b40160a802f39e19b880d85e8f SHA512 d6fbdc90ee4682316c8e41bb41d72813795ebf3cd2afb5d986a44b47ff99c40e16f28ffa428cccaff3abd06dbe710bee06cad689f6c7673b1fa4b9dd6e20f721 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c +DIST netkit-telnet_0.17-42.debian.tar.xz 36068 BLAKE2B 393460c0e7a688c2c200e039ef1f462ecef0eba842982c64563325966148ee659ad1a86a8beea16046d5c1513c426d295787dc75b67f11201cdb091ec523a62a SHA512 0fa374bb4d9feff3a4cc84f7a2a9dcdacfdd22e5da9bcf253199d2e886d01da2cf5034820915ffbf50362814c3ce65ab1b6518e35e01b07c43839810fa3f8459 EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 9f1a59804a601e3243d4b3242d67165060410af13778d3102c36e3e347bff0effb6a6a32856be7b46cf94d2cc38b2bab715c51545cdd8c433aa585d67957229c SHA512 d37d14cf41e7acdf789ff49e1d52b51c09e3a35bff8b01ca588a7656e4d2680d1c4163771ea2b71abbe8b13a2d7b0b9b559fe8c332a62cc9499c47f759031e2e +EBUILD netkit-telnetd-0.17-r13.ebuild 1778 BLAKE2B c5211c7584d8415468584d166c59755d1a14913278f8f0a4c2c76acc1ed88217232e6727b34a1f695d3cc3c271b8fa5179c012591ceeec92dded609c5d0f4e6e SHA512 105b5a685ce80e3572cf7aa32cc2ce1e0fe8c0b17fa49734bc074e44e5d05829d9a21d6712d817c98390067dd547719667d5b0ea62579e142026846252aca6e1 MISC metadata.xml 493 BLAKE2B a6080854dafd01cf999e05149ba76c7d37838db3ebdfbede68b0af3034b0aebf7d6aa72a5242b85dd8aae8f43f8052bf9f43e9ba733000ae186291f997069160 SHA512 fa0a296e9a6394e355a7c94199b430d732695df45479a570e6743f4d8c4c4ebb8e9e546158a2b0b6cbd702089bd2a37bc89d6c303f50373c4ca273159ebe4861 diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch new file mode 100644 index 000000000000..3ca6b15a788a --- /dev/null +++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-r13-gentooification.patch @@ -0,0 +1,43 @@ +diff -Naur a/telnetd/CMakeLists.txt b/telnetd/CMakeLists.txt +--- a/telnetd/CMakeLists.txt 2022-02-07 17:37:04.831149960 +0100 ++++ b/telnetd/CMakeLists.txt 2022-02-07 17:42:48.482998276 +0100 +@@ -6,11 +6,11 @@ + -DNO_REVOKE \ + -DKLUDGELINEMODE \ + -DDIAGNOSTICS \ +- -DLOGIN_WRAPPER='\"/usr/lib/telnetlogin\"' \ ++ -DLOGIN_WRAPPER='\"/usr/sbin/telnetlogin\"' \ + ") + + add_executable( +- in.telnetd ++ telnetd + global.c + setproctitle.c + slc.c +@@ -21,19 +21,22 @@ + utility.c + ) + target_link_libraries( +- in.telnetd ++ telnetd + ncurses + util + ) + install( +- TARGETS in.telnetd ++ TARGETS telnetd + DESTINATION ${SBIN_DIR} + ) + + install( + FILES telnetd.8 + DESTINATION ${MAN_DIR}/man8/ +- RENAME in.telnetd.8 ++) ++install( ++ FILES issue.net.5 ++ DESTINATION ${MAN_DIR}/man5/ + ) + install( + CODE "execute_process( \ diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild new file mode 100644 index 000000000000..7423dd55a7dc --- /dev/null +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r13.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit cmake + +PATCHLEVEL=42 +DESCRIPTION="Standard Linux telnet client and server" +#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" +# This might be the best HOMEPAGE now? +HOMEPAGE="https://launchpad.net/netkit-telnet" +# http://packages.debian.org/stablesource/netkit-telnet +# http://packages.debian.org/testing/source/netkit-telnet +# No upstream mirror exists anymore? +# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz +SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz + mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.debian.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +DEPEND=">=sys-libs/ncurses-5.2:= + !net-misc/telnet-bsd" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/netkit-telnet-${PV} + +src_prepare() { + # Patch: [0] + # Gentoo used to lack a maintainer for this package. + # A security problem arose. While reviewing our options for how + # should we proceed with the security bug we decided it would be + # better to just stay in sync with debian's own netkit-telnet + # package. Lots of bug fixes by them over time which were not in + # our telnetd. + rm "${WORKDIR}/debian/patches/use-cmake-as-buildsystem-debian-extras.patch" || die + eapply "${WORKDIR}/debian/patches" + eapply "${FILESDIR}/netkit-telnetd-0.17-r13-gentooification.patch" + + cmake_src_prepare +} + +src_install() { + cmake_src_install + + dosym telnetd /usr/sbin/in.telnetd + dodoc "${FILESDIR}/net.issue.sample" + newdoc telnet/README README.telnet + newdoc telnet/TODO TODO.telnet + insinto /etc/xinetd.d + newins "${FILESDIR}/telnetd.xinetd" telnetd +} diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 98662b8f66d6..cd79f1018bac 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -3,5 +3,7 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4 DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d5464604b329c8b740a2a143266c0bc05ec6a16079cfdf67770fc75afe523664e2e4234189031a8ffa2f51c0f02d4760f3ab20e04a SHA512 b8dfa409302781fdab19790afeb7f4396875e282d6983e2c5775294c8c13d3c1036dee69a37bf6e4fb2a2e80504c8e792780b6a9c1262616e57860da5ebc0e61 +DIST NetworkManager-1.36.2.tar.xz 5432676 BLAKE2B 8ce2922573ae5b1d244e87d1b979a9fe7443e4fa2cb6caf52b59139ad92169dd46f53460871b44e687860aaee06dd6a4999d0ebce9cde466e61c203ae18dbaa3 SHA512 3d9085bb836000a2354415e5ff35e5e67eacd97680660613128b9befe981d67b6ac8d519581f8635bf219c2db03a92f182066efef3abb2094da2870e12caa353 EBUILD networkmanager-1.32.12-r1.ebuild 12157 BLAKE2B f41710a7b10d2869c5227e3f3059050616445073da2c93e5b503d417867950aa48f25483dcbf052cee0b42c4fa03d01b757afa1352ea27bf3b54956d2db093a2 SHA512 0d345d32d59aae9a5ac30ed4170e474479c441dd3b83ad83988c47826438b3ed50ada13bba73a92c4cc846fc9a75a17798281df711a20bf8f24424383932bc04 +EBUILD networkmanager-1.36.2.ebuild 12422 BLAKE2B 83ab78809afd86c015c8d9a70d2ebfa4d7c2a8b6ec64c3f33ea4364865d9e50c8daf69d2806b6953463a3c40b299276c85bba42e89cfb6dd0f1eccb7113256eb SHA512 a13101efec79eacf7175cf37b9dcc165d2927fe5135c33c28df26cd53e58cdc40a87061925506b6165e73212ccdafa49a580db632389cdcb68cd6d07a055f225 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3 diff --git a/net-misc/networkmanager/networkmanager-1.36.2.ebuild b/net-misc/networkmanager/networkmanager-1.36.2.ebuild new file mode 100644 index 000000000000..40c06d6ef040 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.36.2.ebuild @@ -0,0 +1,408 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +GNOME_ORG_MODULE="NetworkManager" +VALA_USE_DEPEND="vapigen" +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" + +IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + bluetooth? ( modemmanager ) + connection-sharing? ( || ( iptables nftables ) ) + gtk-doc? ( introspection ) + iwd? ( wifi ) + vala? ( introspection ) + wext? ( wifi ) + ^^ ( gnutls nss ) + ?? ( elogind systemd ) + ?? ( dhclient dhcpcd ) + ?? ( syslog systemd ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +COMMON_DEPEND=" + sys-apps/util-linux[${MULTILIB_USEDEP}] + elogind? ( >=sys-auth/elogind-219 ) + >=virtual/libudev-175:=[${MULTILIB_USEDEP}] + sys-apps/dbus + net-libs/libndp + systemd? ( >=sys-apps/systemd-209:0= ) + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) + selinux? ( sys-libs/libselinux ) + audit? ( sys-process/audit ) + teamd? ( + >=dev-libs/jansson-2.7:= + >=net-misc/libteam-1.9 + ) + policykit? ( >=sys-auth/polkit-0.106 ) + nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) + gnutls? ( + >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] + ) + ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) + modemmanager? ( + net-misc/mobile-broadband-provider-info + >=net-misc/modemmanager-0.7.991:0= + ) + bluetooth? ( >=net-wireless/bluez-5 ) + ofono? ( net-misc/ofono ) + dhclient? ( >=net-misc/dhcp-4[client] ) + dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) + ovs? ( >=dev-libs/jansson-2.7:= ) + resolvconf? ( net-dns/openresolv ) + connection-sharing? ( + net-dns/dnsmasq[dbus,dhcp] + iptables? ( net-firewall/iptables ) + nftables? ( net-firewall/nftables ) + ) + psl? ( net-libs/libpsl ) + concheck? ( net-misc/curl ) + tools? ( + >=dev-libs/newt-0.52.15 + libedit? ( dev-libs/libedit ) + !libedit? ( sys-libs/readline:= ) + ) +" +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} + >=sys-kernel/linux-headers-3.18 + net-libs/libndp[${MULTILIB_USEDEP}] +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 + ) + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + introspection? ( + $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + dev-lang/perl + dev-libs/libxslt + ) + vala? ( $(vala_depend) ) + test? ( + >=dev-libs/jansson-2.7 + $(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 -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + if use test; then + has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" && + has_version -b "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 + + # bug 809695 + if tc-is-clang && use lto; then + eerror "Clang does not support -flto-partition" + die "Please use gcc or turn off USE=lto flag when building with clang" + 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." + + default + use vala && vala_setup + + sed -i \ + -e 's#/usr/bin/sed#/bin/sed#' \ + data/84-nm-drivers.rules \ + || die +} + +meson_nm_program() { + usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no" +} + +meson_nm_native_program() { + multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no" +} + +multilib_src_configure() { + local emesonargs=( + --localstatedir="${EPREFIX}/var" + + -Dsystemdsystemunitdir=$(systemd_get_systemunitdir) + -Dsystem_ca_path=/etc/ssl/certs + -Dudev_dir=$(get_udevdir) + -Ddbus_conf_dir=/usr/share/dbus-1/system.d + -Dkernel_firmware_dir=/lib/firmware + -Diptables=/sbin/iptables + -Dnft=/sbin/nft + -Ddnsmasq=/usr/sbin/dnsmasq + #-Ddnssec_trigger= + + -Ddist_version=${PVR} + $(meson_native_use_bool policykit polkit) + $(meson_native_use_bool policykit config_auth_polkit_default) + -Dmodify_system=true + -Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1 + $(meson_native_use_bool selinux) + $(meson_native_use_bool systemd systemd_journal) + -Dhostname_persist=gentoo + -Dlibaudit=$(multilib_native_usex audit) + + $(meson_native_use_bool wext) + $(meson_native_use_bool wifi) + $(meson_native_use_bool iwd) + $(meson_native_use_bool ppp) + -Dpppd=/usr/sbin/pppd + $(meson_native_use_bool modemmanager modem_manager) + $(meson_native_use_bool ofono) + $(meson_native_use_bool concheck) + $(meson_native_use_bool teamd teamdctl) + $(meson_native_use_bool ovs) + $(meson_native_use_bool tools nmcli) + $(meson_native_use_bool tools nmtui) + $(meson_native_use_bool tools nm_cloud_setup) + $(meson_native_use_bool bluetooth bluez5_dun) + -Debpf=true + + -Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default) + -Dconfig_plugins_default=keyfile + -Difcfg_rh=false + -Difupdown=false + + $(meson_nm_native_program resolvconf "" /sbin/resolvconf) + -Dnetconfig=no + -Dconfig_dns_rc_manager_default=auto + + $(meson_nm_program dhclient "" /sbin/dhclient) + -Ddhcpcanon=no + $(meson_nm_program dhcpcd "" /sbin/dhcpcd) + + $(meson_native_use_bool introspection) + $(meson_native_use_bool vala vapi) + $(meson_native_use_bool gtk-doc docs) + -Dtests=$(multilib_native_usex test) + $(meson_native_true firewalld_zone) + -Dmore_asserts=0 + $(meson_use debug more_logging) + -Dvalgrind=no + -Dvalgrind_suppressions= + -Dld_gc=false + $(meson_native_use_bool psl libpsl) + -Dqt=false + + $(meson_use lto b_lto) + ) + + if multilib_is_native_abi && use systemd; then + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=systemd ) + emesonargs+=( -Dsuspend_resume=systemd ) + elif multilib_is_native_abi && use elogind; then + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=elogind ) + emesonargs+=( -Dsuspend_resume=elogind ) + else + emesonargs+=( -Dsession_tracking_consolekit=false ) + emesonargs+=( -Dsession_tracking=no ) + emesonargs+=( -Dsuspend_resume=auto ) + fi + + if multilib_is_native_abi && use syslog; then + emesonargs+=( -Dconfig_logging_backend_default=syslog ) + elif multilib_is_native_abi && use systemd; then + emesonargs+=( -Dconfig_logging_backend_default=journal ) + else + emesonargs+=( -Dconfig_logging_backend_default=default ) + fi + + if multilib_is_native_abi && use dhclient; then + emesonargs+=( -Dconfig_dhcp_default=dhclient ) + elif multilib_is_native_abi && use dhcpcd; then + emesonargs+=( -Dconfig_dhcp_default=dhcpcd ) + else + emesonargs+=( -Dconfig_dhcp_default=internal ) + fi + + if use nss; then + emesonargs+=( -Dcrypto=nss ) + else + emesonargs+=( -Dcrypto=gnutls ) + fi + + if use tools ; then + emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) ) + else + emesonargs+=( -Dreadline=none ) + fi + + # 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 + emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) + fi + + meson_src_configure +} + +multilib_src_test() { + if use test && multilib_is_native_abi; then + python_setup + virtx meson_src_test + fi +} + +multilib_src_install() { + meson_src_install + if ! multilib_is_native_abi; then + rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die + fi +} + +multilib_src_install_all() { + ! 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 + + insinto /usr/lib/NetworkManager/conf.d #702476 + doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf + + 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 || die + [device] + wifi.backend=iwd + EOF + fi + + mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die + rmdir "${ED}"/usr/share/doc/NetworkManager || die + + # Empty + rmdir "${ED}"/var{/lib{/NetworkManager,},} || die +} + +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 c80f2edfe87b..cf6b3f40a7b6 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,6 +1,8 @@ AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a -DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99 DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0 -EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3 +DIST nextcloud-client-3.4.2.tar.gz 14329069 BLAKE2B 5a23e9a7535aff3591d73d2b17abf71cb6302b9acfa41a1de051d42d9acb4cf4d76ed1dff3c73ec989a066c51d4fe9e94d6e71718f9fc0533d0c0e2bb0949060 SHA512 9788fd658c9e7c3b26eb3c41934ee75222aba0afd38e1fd71f8f04472bf4971e5cc7c12469f0b3f909f4dc1e5aa1a063ae1324f6a8b6052cdf9b3c8c1cc8c909 +DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71 EBUILD nextcloud-client-3.3.6.ebuild 2193 BLAKE2B 50f2084e5a1882d928273fcc938ff6258fc88b0fc2c22c47bfe2ff361e6791abb5f9e7baa6c8b8aee0ed696dd90f994f7fc9ddb985ed2ea6088208ce8576a951 SHA512 55038556483e044b6f91906efc6feb9311bde74bb09dab1877af6c92e0d5c70d3e8405541d9a30ee2aa7aa1c121d5d691cbbb4b4711a0bfc2c8289dfd4c69a3d -MISC metadata.xml 605 BLAKE2B c24c20e11e5ddf2ce188c7c80aecacc9af7145aa325b150e9d9b753b11525683938409aa911d65d4e62a2f6177df369005aaba7c10768beba4bb66955126b547 SHA512 5fc64dfed80ed91c89402e22910dc72e8d3649be1bcd27b0a48ecd6a86f129b06d9d37fa7d4f7d54c083b3b04935a28ae982871e7c1cf28a88cbd9dbf9aebc17 +EBUILD nextcloud-client-3.4.2.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a +EBUILD nextcloud-client-3.4.3.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a +MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32 diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml index 48b762c1d592..be33f72f7b7c 100644 --- a/net-misc/nextcloud-client/metadata.xml +++ b/net-misc/nextcloud-client/metadata.xml @@ -5,6 +5,10 @@ <email>voyageur@gentoo.org</email> <name>Bernard Cafarelli</name> </maintainer> + <maintainer type="person"> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> <use> <flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag> <flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag> diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild index 80095a1fb503..df314cf64b74 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake xdg +inherit cmake virtualx xdg DESCRIPTION="Desktop Syncing Client for Nextcloud" HOMEPAGE="https://github.com/nextcloud/desktop" @@ -11,11 +11,13 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}. LICENSE="CC-BY-3.0 GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc dolphin nautilus test" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc dolphin nautilus test webengine" +RESTRICT="!test? ( test )" COMMON_DEPEND=">=dev-db/sqlite-3.34:3 - dev-libs/qtkeychain[gnome-keyring,qt5(+)] + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain:=[qt5(+)] dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 @@ -23,7 +25,6 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3 dev-qt/qtnetwork:5[ssl] dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sys-libs/zlib @@ -31,14 +32,14 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3 kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) - >=dev-libs/openssl-1.1.0:0= - nautilus? ( dev-python/nautilus-python )" + nautilus? ( dev-python/nautilus-python ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" -RDEPEND="${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtxml:5 + gnome-base/librsvg doc? ( dev-python/sphinx dev-tex/latexmk @@ -51,37 +52,43 @@ DEPEND="${COMMON_DEPEND} dev-qt/qttest:5 )" -RESTRICT="!test? ( test )" +RDEPEND="${COMMON_DEPEND}" -S=${WORKDIR}/desktop-${PV/_/-} +S="${WORKDIR}/desktop-${PV/_/-}" src_prepare() { + # We do not package libcloudproviders + sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die + # 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=yes - -DUNIT_TESTING=$(usex test) + -DBUILD_UPDATER=OFF + $(cmake_use_find_package doc Sphinx) + $(cmake_use_find_package doc PdfLatex) + $(cmake_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) + -DBUILD_TESTING=$(usex test) ) cmake_src_configure } +src_test() { + virtx cmake_src_test +} + pkg_postinst() { xdg_pkg_postinst + if ! use doc ; then elog "Documentation and man pages not installed" elog "Enable doc USE-flag to generate them" diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild new file mode 100644 index 000000000000..df314cf64b74 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake virtualx 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 test webengine" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=">=dev-db/sqlite-3.34:3 + >=dev-libs/openssl-1.1.0:0= + dev-libs/qtkeychain:=[qt5(+)] + 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/qtsvg:5 + dev-qt/qtwebsockets:5 + dev-qt/qtwidgets:5 + sys-libs/zlib + dolphin? ( + kde-frameworks/kcoreaddons:5 + kde-frameworks/kio:5 + ) + nautilus? ( dev-python/nautilus-python ) + webengine? ( dev-qt/qtwebengine:5[widgets] )" + +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + dev-qt/qtconcurrent:5 + dev-qt/qtxml:5 + gnome-base/librsvg + 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 + )" + +RDEPEND="${COMMON_DEPEND}" + +S="${WORKDIR}/desktop-${PV/_/-}" + +src_prepare() { + # We do not package libcloudproviders + sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die + + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_UPDATER=OFF + $(cmake_use_find_package doc Sphinx) + $(cmake_use_find_package doc PdfLatex) + $(cmake_use_find_package webengine Qt5WebEngine) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +} + +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/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest deleted file mode 100644 index ef3dc5ef9d1f..000000000000 --- a/net-misc/npapi-sdk/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842 -EBUILD npapi-sdk-0.27.2.ebuild 391 BLAKE2B 3b93c49f2caeab67b89fcc09ec4ef269b2f1a3ca757029869ed099d83ab0a5ba9b894cb2ff915014f4d1ed405ca0669d3e4f3b0c56abb915278ae197026e0a5f SHA512 bf2bf2987748a448c8335a30959141975e73bfc734096d64ccd50b7bdb709c2b64673e4eeb08d37515e06775c214dcc2f2162fc218a6db5422fd5d1727a0e88b -EBUILD npapi-sdk-9999.ebuild 368 BLAKE2B 8e62174832a639f9ad833ef01f76622fd6b5b4e85a233d710d27e71373abfb8ad6084a823d3520ee85614bf88a11186f7b3ae15b1a9d80b7967f2989c4cb5eb7 SHA512 49cf7de5a2e1e97073fff0c3323b7d366029ed10724545734f9850732d96b39257c81ebc5ab4b64495cf15a39d364c443719b1d7e975aea979794b8d6f1ac7e5 -MISC metadata.xml 444 BLAKE2B 47c2f5c9bf2ef2751a50e2f25134bc9de5cc4ed1b071fa239f2906fdf9e3fcad28835553a1c4b1285557d5ad919d40788453d3528fb26a98af55099f1dd31222 SHA512 1fa9378f45d2cc4aacbb0a1492129197ef61c6f798d9c5c533c69d40cf870128e47c857e8b44c2d966387e7953dd8760f993c0d195a725554f006130988a4ea5 diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml deleted file mode 100644 index 7b2b093df953..000000000000 --- a/net-misc/npapi-sdk/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <maintainer type="project"> - <email>mozilla@gentoo.org</email> - <name>Gentoo Mozilla Team</name> - </maintainer> - <upstream> - <remote-id type="github">mgorny/npapi-sdk</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild deleted file mode 100644 index a2433eefbda2..000000000000 --- a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="NPAPI headers bundle" -HOMEPAGE="https://github.com/mgorny/npapi-sdk/" -SRC_URI="https://github.com/mgorny/npapi-sdk/releases/download/${P}/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" - -BDEPEND="virtual/pkgconfig" diff --git a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild deleted file mode 100644 index c7c9e7a3f097..000000000000 --- a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 - -DESCRIPTION="NPAPI headers bundle" -HOMEPAGE="https://github.com/mgorny/npapi-sdk/" -EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" - -LICENSE="BSD" -SLOT="0" - -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 33118b57947f..a7f1b2a4ffc6 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -3,7 +3,6 @@ AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd 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 AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f AUX ntp-4.2.8_p15-gcc10.patch 2019 BLAKE2B df64e28c70d7aa1cf2513b594dc5f79f0be862c6dd0ba3e3e75e6bce394eeaff2bd994e65ad4435d212bd1b2c406e49e587c72a6c8f9fc1f63fa166dac717844 SHA512 15f2756c1ac370f4896ffc1d8bd340bb7c09869c47a78edc66da855855c9dca0adeef0e03d262ace9c7ae408c2bcb080d6e01e4fc32783518fb8db28b08200b7 AUX ntp-4.2.8_p15-glibc-2.34.patch 928 BLAKE2B 993f2c6ab2b4e6242811d553e0021911bbae37ba5febbbf9914bef5481c3b1472c273fc04a6d6f1e420bed2b4eb3193bc4a9532faa6b23e9f2a2802b1664e187 SHA512 474f50f92b105cbd3e9b3700418114ea65c3998e28ddb7a11d45602a7865bdcad07ee251176bf2e4012e3a15792a4334ee85aca198cbb98c757fc12cdd09747d @@ -21,5 +20,5 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 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_p15.ebuild 4508 BLAKE2B 77ef2a82b948ba41a9faa70fa224b28003cf902cfdb9b6da4f3da9ac356f7be5a16286e358a7a762c1820749b16641b66366247e38afa525ba6eb08512a6ddba SHA512 aaa55e1de4599ab2509d93106dda077d931e25262017a78f09c4dfe1a32c22850d4dd8615c9cdef7cc0e354722dad6b99895dd9fa0917ecdeca83dcaa3e80fd4 +EBUILD ntp-4.2.8_p15.ebuild 4442 BLAKE2B f6cfbc92981ced0abad90d0d20366949e4c41580236c0fe92b05dd0f79092ac136087bc95fd56a223d2dc6ff0d3ec81c244b380a5747bbc52ae8a43166f40e2a SHA512 0718ee4bea75e8f2d6378a0a882757adc75e49d67d62c265d2ff6414af73f7f0ee37b61205e0306aaa9f3bee5aaedaa3430ee34f4158dde3cd13e3339b08a6a9 MISC metadata.xml 1015 BLAKE2B e03bcac085561ec53ec02230b618fa01e26dd6167635f0af06434213305d5f4b966f94f0280db24a509990eaade216e7c7a853d9990969de26a8444088c5a444 SHA512 b00dc21b9b06f909812028bbad340d6b1c68b105fec664476cd4222947c687fc16f1925d77fb14e23b31c84a26849dc397acc7657726abfc35a43dfafc10589b diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch deleted file mode 100644 index 1b532c6d8931..000000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix building with libressl or without SSL. - -Origin: http://bugs.ntp.org/attachment.cgi?id=1481 - -LibreSSL fix from Joe Kappus (https://bugs.gentoo.org/show_bug.cgi?id=600668#c2) - ---- a/include/libssl_compat.h -+++ b/include/libssl_compat.h -@@ -37,7 +37,7 @@ - #endif - - /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - # include <openssl/objects.h> ---- a/libntp/libssl_compat.c -+++ b/libntp/libssl_compat.c -@@ -26,7 +26,7 @@ - /* ----------------------------------------------------------------- */ - - /* ----------------------------------------------------------------- */ --#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L -+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) - /* ----------------------------------------------------------------- */ - - #include "libssl_compat.h" ---- a/libntp/ssl_init.c -+++ b/libntp/ssl_init.c -@@ -21,7 +21,7 @@ - - int ssl_init_done; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - static void - atexit_ssl_cleanup(void) diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild index 7e9d8bc04c23..fab96d3d6b6b 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -44,7 +44,6 @@ 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_p14-add_cap_ipc_lock.patch #711530 "${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409 "${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest index 74b378ae5c8b..3e83f521ba76 100644 --- a/net-misc/nyx/Manifest +++ b/net-misc/nyx/Manifest @@ -1,3 +1,3 @@ DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37 -EBUILD nyx-2.1.0-r2.ebuild 638 BLAKE2B 0730483a90bef6c724d32045e57c12a77ce0d407a75ab5923c9af8d747d555a16c7b1c2d3ecd762d41bc723e6ae1e191f28914de258600d921203e0a17e4e508 SHA512 70f425d6b8187afe6dd95d9a50ba2082edc66b0952198d9484240ecfb69c7e9e269edc95475bbe2bf3bbf91572291a0eb530fcacd471cb7a79876682f9400428 +EBUILD nyx-2.1.0-r3.ebuild 656 BLAKE2B 48d773c75726eeee76d53fdb9f62cf79bb9931e55b8bc3ed441f0eff4dec512e1d13390b27344705b9d14361f64212c03da9a27215ea53834fb72d32ac4a2795 SHA512 80063200b3ea7180a25a293370a02a7dcb68f23a66adf32d1a2b4dc6c0533f9133c265fec7cb1080c063265685264f79c303119edd352d1ea15b441f532ed171 MISC metadata.xml 329 BLAKE2B 089c30db84b27384d6b7814fa6f8a5ab3ce4c40cc0c95538fd45262b79df25520c0780013548ed6dc7511fc815c25401d38d37f60ce4ee0e2a53bfbe99f6b183 SHA512 d969896fb35aa789b119ad623b7d4e63518cfb2ff0f46cff3f299db828a0918646b6634c94c901ffd847b1c1e0e4b722f2b0015034354886eb94fc8bc29071e6 diff --git a/net-misc/nyx/nyx-2.1.0-r2.ebuild b/net-misc/nyx/nyx-2.1.0-r3.ebuild index 0a2d0a5d251e..9037fbfab9c0 100644 --- a/net-misc/nyx/nyx-2.1.0-r2.ebuild +++ b/net-misc/nyx/nyx-2.1.0-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..9} pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) PYTHON_REQ_USE='ncurses,sqlite(-)' inherit distutils-r1 @@ -22,7 +22,7 @@ LICENSE="GPL-3" SLOT="0" RDEPEND=" - net-libs/stem[${PYTHON_USEDEP}] + <net-libs/stem-1.8.0_p20211118[${PYTHON_USEDEP}] net-vpn/tor" distutils_enable_tests unittest diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest index 529452de4d56..b29172129f8e 100644 --- a/net-misc/ofono/Manifest +++ b/net-misc/ofono/Manifest @@ -1,6 +1,8 @@ AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241e40e88fdb92c15560f9a8744922fea9cf83114a242315de910fe849918e9e26f7b8ce63831ad SHA512 ef86f8e4d3b30d98eee5849c85fd8fd1bed0d8ac9c76bcce91440483439dbaea36e1ff3529fe8f5c1b0255a91917ab67d98513cafcae8f0031cce1bf3f133704 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20 DIST ofono-1.33.tar.xz 1060408 BLAKE2B 646a96c0926ea032fef0357aabe6a4be6da88f4ccbdff59bb86b5de73a9b469362151b212a05234619f5d616b534343137c66e923782c7d50dfe13d2bf66558c SHA512 8d88226aa2b43eca840c6330045ee7a96c91f6003b06fca5ea55b74fc229f0e0ba0c8d98f7945f8c23ec5a8e7057bffef6335c61842e245686e0ed7c5feda589 +DIST ofono-1.34.tar.xz 1060828 BLAKE2B be0d3787ca9226763fb2bff46f1c3cec813d702730d6231986ec5aa43e2d96e08385fa3f64ccff97cf15844e41a33d6c37d1d35c8b0c5fcf3765848e258e3372 SHA512 79ebf0bc795288f07b58eeaa1a0aa3309b4afecae3abdd26c0749e22a4c2e74b65e93cbcfdfd1738dbcb2d0cfb8c687d182d706696a7c1cd5b4ed3bcec059489 EBUILD ofono-1.31.ebuild 1635 BLAKE2B 45b6875cd3e99ff72d5bde84c7f17f14bb74e75676afb68f006f5befce85c1221fa8249d5c3cb294ce3c2e4eb441b7d80d90af56f26973a3396f59aef6d17711 SHA512 9518abf4fa61f8812f7e5dda459565e3ee5168e3777522256301227152e3e03f6293e39ad41e6c1b7fc946b55997c937cc1193363808c54101ea01a4125a1bb8 -EBUILD ofono-1.33.ebuild 1642 BLAKE2B 9371d2e464683c5c756d62fafdfc8a13fb5ef6a8cf8189467b023f7df40e1c7b6cd5bbbebb62aed9cb5ab379381a5e52e54fca9056ad5f823b1828e119f21261 SHA512 5985af743c2d82bc9cc265fecd362c01fd07bf56454570ebc130a8df434a669daf598e847bb62d5a3c62617fc550c882a0dab8314cfbd9969dbe33e40723405b +EBUILD ofono-1.33.ebuild 1636 BLAKE2B 6c60822a95dddc6f6e017cdfd43a875976984d2d89cad8681aabb46fc259201ed011864aea94b94100de9c27cd358af5ac923dd18e32063770760af10bd95d82 SHA512 b994465fd5043299589d09644225a4a11589ffa6d507cf41a01a686d3603dffcdedc2dfad47d3ebfcb55ae393892d18919646e537feae3831974ff93caaf4289 +EBUILD ofono-1.34.ebuild 1642 BLAKE2B 4fec94e65e7f613febb35e118ef6670b3cba3dffd7961002079239ff54054a59cd71248ec6409f415abc45a1dafb9aa858ed8e3e7234c5848dad823d0cb3f160 SHA512 beb1c80eae1dcbc666c86157e8499c8f7570da72aa8456cf8a14da5353b33a47756c6df835d475287dee034ba887a19741310ffc9632a0c90eb33f7b0dd0db10 MISC metadata.xml 952 BLAKE2B 9980756397330c03bd0f21db6d44e4af119135b9a864d4cdc97a697e7f0013051985c7db3c48d8d17bd592cfaf185a81add398d3e0a3ddc64aa61979a1603d5e SHA512 a745e9cf9a89e3c989cd950651c3d914ffe17e34f32f9623c468127011c6faa35942484d24c34c217b614b295743120a035a56aa30ae79343a72ba5cfbc462f0 diff --git a/net-misc/ofono/ofono-1.33.ebuild b/net-misc/ofono/ofono-1.33.ebuild index 7b3600dc6b80..522dbe691596 100644 --- a/net-misc/ofono/ofono-1.33.ebuild +++ b/net-misc/ofono/ofono-1.33.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" REQUIRED_USE="dundee? ( bluetooth )" diff --git a/net-misc/ofono/ofono-1.34.ebuild b/net-misc/ofono/ofono-1.34.ebuild new file mode 100644 index 000000000000..1afaf2e3612b --- /dev/null +++ b/net-misc/ofono/ofono-1.34.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd + +DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon" +HOMEPAGE="https://01.org/ofono" +SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower" + +REQUIRED_USE="dundee? ( bluetooth )" + +RDEPEND=">=sys-apps/dbus-1.6 + >=dev-libs/glib-2.68 + net-misc/mobile-broadband-provider-info + bluetooth? ( >=net-wireless/bluez-4.99 ) + udev? ( virtual/udev ) + examples? ( dev-python/dbus-python ) + tools? ( virtual/libusb:1 )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( ChangeLog AUTHORS ) + +src_configure() { + econf \ + $(use_enable udev) \ + $(use_enable isimodem) \ + $(use_enable atmodem) \ + $(use_enable cdmamodem) \ + $(use_enable datafiles) \ + $(use_enable dundee) \ + $(use_enable bluetooth) \ + $(use_enable phonesim) \ + $(use_enable provision) \ + $(use_enable qmimodem) \ + $(use_enable tools) \ + $(use_enable examples test) \ + $(use_enable upower) \ + --disable-maintainer-mode \ + --disable-rilmodem + --localstatedir=/var \ + --with-systemdunitdir="$(systemd_get_systemunitdir)" +} + +src_install() { + default + + if use tools ; then + dobin tools/auto-enable \ + tools/huawei-audio \ + tools/lookup-provider-name \ + tools/lookup-apn \ + tools/get-location \ + tools/tty-redirector + fi + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + use doc && dodoc doc/*.txt +} diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest index c4293771e205..1d344b31f28c 100644 --- a/net-misc/oidc-agent/Manifest +++ b/net-misc/oidc-agent/Manifest @@ -1,8 +1,6 @@ AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb AUX oidc-agent-4.1.0_install-perms.patch 1911 BLAKE2B a74915c1ea19c4d8fcfc09b30c60259e361776c458d0f52885ba4399f0599a8094caced14f59cd024331a4d09efe9298061b914faf4e74a700975e2afb7890df SHA512 9390b4ee8a5baccd8de0f5b22c18ea6d2c0a3c83e70b3e3f44af87cf563ec332ce40c6f5cb4f0f7065cb6b17317442daa22de125139823b4b99428c0624fa08d -AUX oidc-agent-4.2.4_makefile-toolchain-vars.patch 1216 BLAKE2B 52a0b1141772b4c0be288909657a8215db635f9a95cadf542d36c421a6fd7a71a38996f691d94838f4f37d28fd49ac7921e4371c13a7d702d07ba75f67a7693f SHA512 1664e44399a7152b632376d6d44ae8ccf360145f705709af24011ca0e637e976393a49898b0666eebba9ccddc7525d38c464e16768c34e8972709739c567eb16 -DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d +AUX oidc-agent-4.2.6_sighandler_t.patch 263 BLAKE2B 02e1c70854ec573ca462e45abf5724799cfd9c1f474477e22d54e752db5cddc9ea819c750761685462412e877cb7df63471915da0655692d851158ec7b448df1 SHA512 56ffdd1c0ea6f79aeb9f6ee4a490d1b31c68780c3f2b2ced06af0685d588a25bba35f12422f9d7f18cade4f5d63246cdf062c36aad169b20033ceabbc515392a DIST oidc-agent-4.2.6.tar.gz 824079 BLAKE2B f7cf810254eae00acc1b4c036fe58dda1c62b3db4d7d02a5782269485200a6a4c1d650a6cfac5f6a0e5764a1b2e19d4885eb7744c84724f927aa6d9f18f5bb55 SHA512 6f23cb13c917ce389eea3bb55e802834ff7c1bf1c421264fdcce27eb5a20b11a498d8d76c002eb92bbf3618942803ddb9937f59d19ff1aff6fe9ca07df40d0bb -EBUILD oidc-agent-4.2.4.ebuild 2072 BLAKE2B b91b60f3c7111cbf82cb5151d9ad36ae0a2e2a16dfe1e03177b43a01b567d57624eabe1b8f73a4d710218d0b2b82ce7815fd2b790f18a47d2bd47d43c5988f2c SHA512 83f314dabcbd38324765ade248ee675adbe7f9609a45472af0a55ebae6bd84fafb46b27cc2332a4bf544e1d9289b99604cdd55af0f34ebdbb66b8c3c852dfbc1 -EBUILD oidc-agent-4.2.6.ebuild 2016 BLAKE2B 273087c56bb3719e2a0ed8a11b7cc0d5712245903afe5fe4ed35054ed7aecdf25806888c35568e92d974e3f06fd726d87dd6ad3d58495874f19691a638d44573 SHA512 8688ad81aa4077e0c1513e880f2e494c627934d88f3370698b469a601768582919aee279e5d372e445f466ed4bd691785944026d93fbb31d5638ce9f65c7fda5 +EBUILD oidc-agent-4.2.6.ebuild 2202 BLAKE2B 8911f7e67eb3930ff21bb14aa45ad95b78aec5bcc8fc1ffbb5820817be9dadf9ea146441a4148eaf30bce6464c3a9d8ad8c2e4adf653098081eb5132ab0a3677 SHA512 ed38d53f84ed28f983b0960b820af34d66410314ca8dcdb1a73e9d18ceed2c69fdc2094b3c3d2faf9bbd8efb7a61673c0b0131d306d2334025179fe2a5beade2 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch deleted file mode 100644 index 7d4bc3b30744..000000000000 --- a/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -92,9 +92,9 @@ - endif - - # Compiler options --CC = gcc -+CC := $(CC) - # compiling flags here --CFLAGS = -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common -+CFLAGS := $(CFLAGS) -g -std=c99 -I$(SRCDIR) -I$(LIBDIR) -Wall -Wextra -fno-common - ifndef MAC_OS - ifndef NODPKG - CFLAGS +=$(shell dpkg-buildflags --get CPPFLAGS) -@@ -106,11 +106,11 @@ - TEST_CFLAGS = $(CFLAGS) -I. - - # Linker options --LINKER = gcc -+LINKER := $(CC) - ifdef MAC_OS - LFLAGS = $(LSODIUM) $(LARGP) - else --LFLAGS = $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now -+LFLAGS := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now - ifndef NODPKG - LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS) - endif -@@ -130,12 +130,12 @@ - ifdef MAC_OS - CLIENT_LFLAGS = -L$(APILIB) $(LARGP) $(LAGENT) $(LSODIUM) - else --CLIENT_LFLAGS = -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) -+CLIENT_LFLAGS := $(LDFLAGS) -L$(APILIB) $(LAGENT) $(LSODIUM) $(LSECCOMP) - ifndef NODPKG - CLIENT_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) - endif - endif --LIB_LFLAGS = -lc $(LSODIUM) -+LIB_LFLAGS := $(LDFLAGS) -lc $(LSODIUM) - ifndef MAC_OS - ifndef NODPKG - LIB_LFLAGS += $(shell dpkg-buildflags --get LDFLAGS) diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch new file mode 100644 index 000000000000..d450d0ec2c7a --- /dev/null +++ b/net-misc/oidc-agent/files/oidc-agent-4.2.6_sighandler_t.patch @@ -0,0 +1,11 @@ +--- a/src/oidc-gen/gen_signal_handler.c ++++ b/src/oidc-gen/gen_signal_handler.c +@@ -12,7 +12,7 @@ + + static char* global_state = NULL; + #ifndef __APPLE__ +-static __sighandler_t old_sigint; ++static sighandler_t old_sigint; + #else + static sig_t old_sigint; + #endif diff --git a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild deleted file mode 100644 index a24c2290d64e..000000000000 --- a/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit xdg-utils - -DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" -HOMEPAGE="https://github.com/indigo-dc/oidc-agent" -SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~riscv" -IUSE="test" - -DEPEND="app-crypt/libsecret - dev-libs/libsodium:= - media-gfx/qrencode - net-libs/libmicrohttpd:= - sys-libs/libseccomp" -RDEPEND="${DEPEND}" -BDEPEND="test? ( dev-libs/check )" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch - "${FILESDIR}"/${PN}-4.1.0_install-perms.patch - "${FILESDIR}"/${PN}-4.2.4_makefile-toolchain-vars.patch -) - -src_prepare() { - default - sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" -} - -src_install() { - emake \ - PREFIX="${ED}" \ - BIN_AFTER_INST_PATH="/usr" \ - INCLUDE_PATH="${ED}"/usr/include \ - LIB_PATH="${ED}"/usr/$(get_libdir) \ - install - - # This file is not compatible with Gentoo and in any case, we generally - # let the users load such agents themselves. - rm -f "${ED}"/etc/X11/Xsession.d/91${PN} -} - -pkg_postinst() { - xdg_desktop_database_update - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog - elog "You should use oidc-gen to initially generate your account configuration" - elog "before it can be loaded into oidc-agent using oidc-add. For details, please" - elog "consult the man page of oidc-gen, or full documentation at" - elog " https://indigo-dc.gitbooks.io/oidc-agent/" - elog - else - local new_major_ver old_ver - new_major_ver=$(ver_cut 1) - for old_ver in ${REPLACING_VERSIONS}; do - if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then - ewarn - ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}" - ewarn "to make sure they are compatible with the updated clients." - ewarn - break - fi - done - fi -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild index fc0c23c79b2e..0d3056b5e583 100644 --- a/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild +++ b/net-misc/oidc-agent/oidc-agent-4.2.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit xdg-utils +inherit flag-o-matic xdg-utils DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line" HOMEPAGE="https://github.com/indigo-dc/oidc-agent" @@ -11,14 +11,15 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" IUSE="test" DEPEND="app-crypt/libsecret dev-libs/libsodium:= media-gfx/qrencode net-libs/libmicrohttpd:= - sys-libs/libseccomp" + sys-libs/libseccomp + elibc_musl? ( sys-libs/argp-standalone )" RDEPEND="${DEPEND}" BDEPEND="test? ( dev-libs/check )" @@ -27,11 +28,16 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch "${FILESDIR}"/${PN}-4.1.0_install-perms.patch + "${FILESDIR}"/${PN}-4.2.6_sighandler_t.patch ) src_prepare() { default sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile" + + # Bug #832552 + append-cflags -D_GNU_SOURCE + use elibc_musl && append-ldflags -largp } src_install() { diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index d23c7c9a043e..9b26f2a0bfbb 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -9,9 +9,14 @@ AUX openssh-8.7_p1-GSSAPI-dns.patch 11576 BLAKE2B 84aa0128ddeccf67e14c20f9d2acb6 AUX openssh-8.7_p1-hpn-15.2-X509-glue.patch 16283 BLAKE2B 7181c63f43398bda89f663c6de4a688e302d382519b0030ece980777d110ec56077dc6e5ca357f67c8a7a932f2df850ddc4ff7db1ea91c59d136767857c8b24e SHA512 525b68bcd9c891ab6be104d30cf4b9cc9214c257bc41a7e9c306dcfe3fb12109f7422118d9fad58698fe9a6d501b27309e675c857d00c04c46acff27eec60154 AUX openssh-8.7_p1-hpn-15.2-glue.patch 7354 BLAKE2B 1b5afc662d39db3ab137b2a389b3a5cebf55e0c6741c12ade4977d8d5d8cb4f4cf2d8e8978150808c6570cba7b8080ace971d20913df9a740c1e03adc7134726 SHA512 ea57ea2c6138a275bce8cb7d62ea8771bf51db4d8dca4ea33f46539b33ab5a17c7c1749fa7b10c90e167846fd087f4084dcf5604017ad5c2821c2c74793ca9c2 AUX openssh-8.8_p1-X509-glue-13.2.3.patch 2238 BLAKE2B a97643157ecf7b808ae9ee76e00cc58c4515bf5a1e2ff863124dd8b8941f390a90e2b52aa7444898782fc062ccef47983e127efaea7acf225d260479da88f12f SHA512 205c499d03f3bc2c767d406021f5f413eeae06ef5593aa11b24ccce75ebe9e90aacce4f53b120f6330326151c8f11ca43e10fe969f7ed832ef3a604f451f129f +AUX openssh-8.9_p1-X509-glue-13.3.1.patch 4141 BLAKE2B aa875e0de69cdb4935b6053415833b1a0d5858f7f63084e5106dd491060a7a56c208a43a97e663289b3b832cef2d208325e573d161792d35ca4bd6a45fa8f1fa SHA512 90342932f8d191640285afc3ba82456b463640b7f30ba8193f5db023e5fcd4969fb7e57ed3637b0ea6088f4a985b85d563a17b4f0e71a1827cd3ee045e2d392a +AUX openssh-8.9_p1-allow-ppoll_time64.patch 396 BLAKE2B b5bb202f79699d9037f12155044328f89ee0573efa43da7cdf8511555e706b6bf66cae069ac95cca900779c6ce293eedec48450f786fd033375e9be17bfb2872 SHA512 9b88024e6a898fc85205fbc038274a3271f787276962150965ab8f599fa355ee73cb48e7e12e3f090034293f9dca94a1ce41dfce2aaeb140693545ff3bc391f0 +AUX openssh-8.9_p1-fzero-call-used-regs.patch 1182 BLAKE2B 45dda480614fd3de6aa6752d3c2f5bb34e8ef1d5576fe75878e349ca56ef451f981dc8e22ce8dd232d6a870cb3c221d8e07bccc45e3f38e43008d48941fafbe4 SHA512 0fb1ae4c4e5d44fa7d6ad301c0c36d4291611a3a34150d2a89499cd486a61b6ce0774be7387e2cd3385aa4b2be9d9b6e9dda7d3783fe1bbf7bfb36067aa973c6 +AUX openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch 419 BLAKE2B c5ef82ed92da96213c84d954541dc3d99040f95a3ce6d81ea585360200128154daaa7717a553a91e693ee11044f11b4a2c3f9f0137c4b92cb1aee01514ec7763 SHA512 cdc0894728e01b132346bf1358b2193d5349f281a086a784a4bbdf1a6ad736632cf4c4fbb900c4ebb6b31a13313ed8660dae95968f4e906d40b2aa0b7a7c2303 +AUX openssh-8.9_p1-hpn-15.2-X509-glue.patch 15810 BLAKE2B 5ef56bee2ce09033d86c5f99a0956d5e3f268dcf18cc4bb32c75de9e81c3873efe643c39d155188cca4812e677223d66621b061897308ed66bbbc1793343519e SHA512 a1903c6ab7842a14d1324e6ea3b1a25cc161e564092ed4679b333a081f1659712a519335fb2cfbdd344bded47a00d538bb5b5a9bfd2e82a321a8347cfeb5bb16 +AUX openssh-8.9_p1-hpn-15.2-glue.patch 8473 BLAKE2B a4616e498db7400702b3c0ba8c6eb6d58b198b1104215b91c0938bb68bf15850f63e3f32e4b99af04ae78ef60818127e17cab68dc3e3bbfe696545057ef3ec63 SHA512 ceff7521accb464c916b5aa695c80de5760272da319f537dc93bb6b6e39de1d408ba4a5335b4071091afb360c5cf44d91429109f84f1e669a175beb3cfcecd26 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27 -AUX sshd-r2.initd 3197 BLAKE2B b992cc2353f23c0f343bd914e6745d0e2b82364450f2baedc5c96b00e181ad7decef609ca41c1dbc57d53894492e98975a00329207a4696a278978ece66f7acb SHA512 bdd908a604f1ae460cb225c0753325381e638d68eeaea4a30e789192ee7d08d690ddf6ae0db5cc8bfbacf35151cfce975b97ccb6e81d22b2d01555f117342d34 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c AUX sshd.service 259 BLAKE2B e65ea7227658295584c3fdee3bf46f098c1c5a53a0b433e88ae8d43f0823fade25846a5f3abbacf939a13af8195a888d0ffb937e8da943478e76eea7c0e13c82 SHA512 9656ae4c045ba47ad28f983e50d1119d51c1d0a7471fe8e792d6f734a71c8d4d900431b591f2f40bb8af3a382e6215933ae32eff56de6da0f2f166d6fb855987 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42 @@ -19,8 +24,14 @@ AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03 DIST openssh-8.8p1+x509-13.2.3.diff.gz 1071138 BLAKE2B dfbe53ccfdfe0a3da9bac927c5bb0ccfeb20f1ba69cef2ffb52999e6f6b0a3282e28a888aab40096fe9eed819f4c9b27592a8771d786580b8fa4f507f6b02557 SHA512 e55e9cdcde1b02b2799600083db8c3b85d207b251b99b4efabe8614bedf1daae28e5ed10cbe1f6a2e5ba766fe1eaf41be9e90fefdaae1352808c504fc0f4e7e6 DIST openssh-8.8p1-sctp-1.2.patch.xz 6744 BLAKE2B 9f99e0abfbfbda2cc1c7c2a465d044c900da862e5a38f01260f388ac089b2e66c5ea7664d71d18b924552ae177e5893cdcbfbccc20eeb3aaeae00b3d552379e3 SHA512 5290c5ef08a418dcc9260812d8e75ce266e22e2258514f11da6fb178e0ae2ef16046523f72a50f74ae7b98e7eb52d16143befc8ce2919041382d314aa05adda0 DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4481e8c74b91ffd2046dc8b6f03d6bf584ecda066c0496acf43cea9ab4085f26a29e34e20736e752f204b8c76c3 SHA512 d44cd04445f9c8963513b0d5a7e8348985114ff2471e119a6e344498719ef40f09c61c354888a3be9dabcb5870e5cbe5d3aafbb861dfa1d82a4952f3d233a8df +DIST openssh-8.8p1.tar.gz.asc 833 BLAKE2B ffe78af226b9c8395e60ca54bcb626cc933ee069f9f0f17f408ca1493cb346aa3fb878efeaccc646f8fa7bf1c40d6d61a81e37342ccf56ae601403bf9d59f4d6 SHA512 165e025305902f884d04d4444fa3143e4ea1a25a1c65aafe05e113537b3d3e50f7cd5f818bc2ca3404699372ca78f69c46b7452faf2d3998c448a5b80a411ae4 +DIST openssh-8.9p1+x509-13.3.1.diff.gz 1113333 BLAKE2B 01fc34ed5c5c64a97db99f8f5a98f5917519474b4c22a2372f76a9c36d5dfc4efe1d03fcc43ed3d1602177f7e674a58676b9d04444d7bb66bc1c096136fd2ed0 SHA512 4fea3cf0dd0f6e0b9e28c16fb88f2a125c3ec7f86111d33e040664ab4976e697b137ffe80d02c979e2eb55a5c004f597299cfec22e730b80279665de61cb1f13 +DIST openssh-8.9p1-sctp-1.2.patch.xz 6752 BLAKE2B 8f87a4e604ce412f45432ae29b6ccb5a10f6bd6ddc3c688b85d75c2126387dc5d4ed2b2396691db016cc0dee3e71a557611bcf34066dee075d62c9e69e887f14 SHA512 88a36e2d87bb8b6136885094729d001953e15799e06885ff1c489300458b6e412520f7a78c48dfd24df46e58f2561051212d7948f8af63082edcb85c33b4d32b +DIST openssh-8.9p1.tar.gz 1820282 BLAKE2B 02934da7f7a2954141888e63e81e38fad4fb8558ddd1032de44f69684802c62771fdd7e9e470e0715059635999c8f9d2ab95f6351217e236573ead83a867f59b SHA512 04bd38ea6fe4be31acc8c4e83de7d3dda66fb7207be2e4ba25d3b8118d13d098a283769da9e8ce1fc4fba7edf739c14efcc6c9137132919261a7f882314b0f6b +DIST openssh-8.9p1.tar.gz.asc 833 BLAKE2B fd44a5545bd0795ee335e480011dbe3c12011dc05b8722fb257bf4c7e8067ab4b515293cf73d23d57b6cf6980eb4e49251b026af9498a237365c5b0440226898 SHA512 fd0bbd285ff2f8791f5a512f087f32bce026b716d5ac213cd4ef28f08722601fb943514bee71b2ac4b9f9363e2f120ce6c60fed952d1d8e53dbcf2a6fe2e706b DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914 -EBUILD openssh-8.8_p1-r4.ebuild 16684 BLAKE2B e09fc74283db0c00f74d995e449dd4a1c58ca1f185dafcc6df629e9fdd1771bfce781a96a87f8cc017ab4e4d695eb2c849453bd16874ce3b2e9988c57ee2f617 SHA512 36106576d162170ede18cfc95fc414b1b793a873ed2203ca138ca34a914e75d3feb75814315e66982b7081eae6756e65cba308aa531621a84cb746cfe0889547 +EBUILD openssh-8.8_p1-r4.ebuild 17077 BLAKE2B 7af036dcdd0bf2a7076529acd1173670f68198b68d86270a09a07f8c2562d40af861300822aefffc402f6f8d998f1843b3961e766130605a9507ee3854c04821 SHA512 74473973c14b51bf40ee5077cbd1402216f03689149db88af45e44210c48631f240db034f24a987cc0c48629770b1e2176858ab28e6662a97fd0f494be6ff684 +EBUILD openssh-8.9_p1-r2.ebuild 17262 BLAKE2B b7bac52dce42f2ea13ae502e5bc86c5b0591ebe27a2c688a196cb8af95b6d9f2e2ba1a882a9ceff878c835a5c5c6a1a3885179d0af7441c80f75e2739d23b678 SHA512 22440a0c0f9b09f19732ed249a6d9453f5833085cb626080cf1941bf764ac811e26b0218c3eacd371d01ad57f14429bb08eca1d54a344879d13c9362263f5025 MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd diff --git a/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch b/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch new file mode 100644 index 000000000000..eab5b5344d6a --- /dev/null +++ b/net-misc/openssh/files/openssh-8.9_p1-X509-glue-13.3.1.patch @@ -0,0 +1,126 @@ +diff -ur '--exclude=.*.un~' a/openssh-8.9p1+x509-13.3.1.diff b/openssh-8.9p1+x509-13.3.1.diff +--- a/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:49:32.673126122 -0800 ++++ b/openssh-8.9p1+x509-13.3.1.diff 2022-03-05 21:52:52.581776560 -0800 +@@ -1002,15 +1002,16 @@ + char b[512]; + - size_t len = ssh_digest_bytes(SSH_DIGEST_SHA512); + - u_char *hash = xmalloc(len); ++- double delay; + + int digest_alg; + + size_t len; + + u_char *hash; +- double delay; +- +++ double delay = 0; +++ + + digest_alg = ssh_digest_maxbytes(); + + len = ssh_digest_bytes(digest_alg); + + hash = xmalloc(len); +-+ ++ + (void)snprintf(b, sizeof b, "%llu%s", + (unsigned long long)options.timing_secret, user); + - if (ssh_digest_memory(SSH_DIGEST_SHA512, b, strlen(b), hash, len) != 0) +@@ -44746,8 +44747,8 @@ + gss_create_empty_oid_set(&status, &oidset); + gss_add_oid_set_member(&status, ctx->oid, &oidset); + +-- if (gethostname(lname, MAXHOSTNAMELEN)) { +-+ if (gethostname(lname, MAXHOSTNAMELEN) == -1) { ++- if (gethostname(lname, HOST_NAME_MAX)) { +++ if (gethostname(lname, HOST_NAME_MAX) == -1) { + gss_release_oid_set(&status, &oidset); + return (-1); + } +@@ -52143,7 +52144,7 @@ + diff -ruN openssh-8.9p1/m4/openssh.m4 openssh-8.9p1+x509-13.3.1/m4/openssh.m4 + --- openssh-8.9p1/m4/openssh.m4 2022-02-23 13:31:11.000000000 +0200 + +++ openssh-8.9p1+x509-13.3.1/m4/openssh.m4 1970-01-01 02:00:00.000000000 +0200 +-@@ -1,200 +0,0 @@ ++@@ -1,203 +0,0 @@ + -dnl OpenSSH-specific autoconf macros + -dnl + - +@@ -52160,6 +52161,8 @@ + - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + -#include <stdlib.h> + -#include <stdio.h> ++-/* Trivial function to help test for -fzero-call-used-regs */ ++-void f(int n) {} + -int main(int argc, char **argv) { + - (void)argv; + - /* Some math to catch -ftrapv problems in the toolchain */ +@@ -52167,6 +52170,7 @@ + - float l = i * 2.1; + - double m = l / 0.5; + - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++- f(0); + - printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + - /* + - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does +@@ -52884,12 +52888,11 @@ + + install-files: + $(MKDIR_P) $(DESTDIR)$(bindir) +-@@ -396,6 +372,8 @@ ++@@ -396,6 +372,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) +@@ -73836,7 +73839,7 @@ + +if test "$sshd_type" = "pkix" ; then + + unset_arg='' + +else +-+ unset_arg=none +++ unset_arg= + +fi + + + cat > $OBJ/sshd_config.i << _EOF +@@ -79691,25 +79694,6 @@ + #ifdef __NR_getrandom + SC_ALLOW(__NR_getrandom), + #endif +-@@ -267,15 +273,15 @@ +- #ifdef __NR_clock_nanosleep_time64 +- SC_ALLOW(__NR_clock_nanosleep_time64), +- #endif +--#ifdef __NR_clock_gettime64 +-- SC_ALLOW(__NR_clock_gettime64), +--#endif +- #ifdef __NR__newselect +- SC_ALLOW(__NR__newselect), +- #endif +- #ifdef __NR_ppoll +- SC_ALLOW(__NR_ppoll), +- #endif +-+#ifdef __NR_ppoll_time64 +-+ SC_ALLOW(__NR_ppoll_time64), +-+#endif +- #ifdef __NR_poll +- SC_ALLOW(__NR_poll), +- #endif + @@ -288,6 +294,9 @@ + #ifdef __NR_read + SC_ALLOW(__NR_read), +@@ -137848,16 +137832,6 @@ + +int asnmprintf(char **, size_t, int *, const char *, ...) + __attribute__((format(printf, 4, 5))); + void msetlocale(void); +-diff -ruN openssh-8.9p1/version.h openssh-8.9p1+x509-13.3.1/version.h +---- openssh-8.9p1/version.h 2022-02-23 13:31:11.000000000 +0200 +-+++ openssh-8.9p1+x509-13.3.1/version.h 2022-03-05 10:07:00.000000000 +0200 +-@@ -2,5 +2,4 @@ +- +- #define SSH_VERSION "OpenSSH_8.9" +- +--#define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1" + diff -ruN openssh-8.9p1/version.m4 openssh-8.9p1+x509-13.3.1/version.m4 + --- openssh-8.9p1/version.m4 1970-01-01 02:00:00.000000000 +0200 + +++ openssh-8.9p1+x509-13.3.1/version.m4 2022-03-05 10:07:00.000000000 +0200 diff --git a/net-misc/openssh/files/openssh-8.9_p1-allow-ppoll_time64.patch b/net-misc/openssh/files/openssh-8.9_p1-allow-ppoll_time64.patch new file mode 100644 index 000000000000..8c46625aa29c --- /dev/null +++ b/net-misc/openssh/files/openssh-8.9_p1-allow-ppoll_time64.patch @@ -0,0 +1,14 @@ +diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c +index 2e065ba3..4ce80cb2 100644 +--- a/sandbox-seccomp-filter.c ++++ b/sandbox-seccomp-filter.c +@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = { + #ifdef __NR_ppoll + SC_ALLOW(__NR_ppoll), + #endif ++#ifdef __NR_ppoll_time64 ++ SC_ALLOW(__NR_ppoll_time64), ++#endif + #ifdef __NR_poll + SC_ALLOW(__NR_poll), + #endif diff --git a/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch b/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch new file mode 100644 index 000000000000..0231ce46d7b1 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.9_p1-fzero-call-used-regs.patch @@ -0,0 +1,32 @@ +From f107467179428a0e3ea9e4aa9738ac12ff02822d Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@debian.org> +Date: Thu, 24 Feb 2022 16:04:18 +0000 +Subject: [PATCH] Improve detection of -fzero-call-used-regs=all support + +GCC doesn't tell us whether this option is supported unless it runs into +the situation where it would need to emit corresponding code. +--- + m4/openssh.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/m4/openssh.m4 b/m4/openssh.m4 +index 4f9c3792dc1..8c33c701b8b 100644 +--- a/m4/openssh.m4 ++++ b/m4/openssh.m4 +@@ -14,6 +14,8 @@ AC_DEFUN([OSSH_CHECK_CFLAG_COMPILE], [{ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include <stdlib.h> + #include <stdio.h> ++/* Trivial function to help test for -fzero-call-used-regs */ ++void f(int n) {} + int main(int argc, char **argv) { + (void)argv; + /* Some math to catch -ftrapv problems in the toolchain */ +@@ -21,6 +23,7 @@ int main(int argc, char **argv) { + float l = i * 2.1; + double m = l / 0.5; + long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; ++ f(0); + printf("%d %d %d %f %f %lld %lld\n", i, j, k, l, m, n, o); + /* + * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/net-misc/openssh/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch b/net-misc/openssh/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch new file mode 100644 index 000000000000..9e08b2a553c2 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.9_p1-gss-use-HOST_NAME_MAX.patch @@ -0,0 +1,13 @@ +diff --git a/gss-serv.c b/gss-serv.c +index b5d4bb2d..00e3d118 100644 +--- a/gss-serv.c ++++ b/gss-serv.c +@@ -105,7 +105,7 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx) + gss_create_empty_oid_set(&status, &oidset); + gss_add_oid_set_member(&status, ctx->oid, &oidset); + +- if (gethostname(lname, MAXHOSTNAMELEN)) { ++ if (gethostname(lname, HOST_NAME_MAX)) { + gss_release_oid_set(&status, &oidset); + return (-1); + } diff --git a/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-X509-glue.patch b/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-X509-glue.patch new file mode 100644 index 000000000000..a98e1adcb54c --- /dev/null +++ b/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-X509-glue.patch @@ -0,0 +1,431 @@ +diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff +--- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2022-02-24 18:48:19.078457000 -0800 ++++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2022-02-24 18:49:22.195632128 -0800 +@@ -3,9 +3,9 @@ + --- a/Makefile.in + +++ b/Makefile.in + @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@ +- CFLAGS_NOPIE=@CFLAGS_NOPIE@ +- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ +- PICFLAG=@PICFLAG@ ++ LD=@LD@ ++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) ++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ + -LIBS=@LIBS@ + +LIBS=@LIBS@ -lpthread + K5LIBS=@K5LIBS@ +@@ -803,8 +803,8 @@ + ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) + { + struct session_state *state; +-- const struct sshcipher *none = cipher_by_name("none"); +-+ struct sshcipher *none = cipher_by_name("none"); ++- const struct sshcipher *none = cipher_none(); +++ struct sshcipher *none = cipher_none(); + int r; + + if (none == NULL) { +@@ -894,24 +894,24 @@ + intptr = &options->compression; + multistate_ptr = multistate_compression; + @@ -2272,6 +2278,7 @@ initialize_options(Options * options) +- options->revoked_host_keys = NULL; + options->fingerprint_hash = -1; + options->update_hostkeys = -1; ++ options->known_hosts_command = NULL; + + options->disable_multithreaded = -1; +- options->hostbased_accepted_algos = NULL; +- options->pubkey_accepted_algos = NULL; +- options->known_hosts_command = NULL; ++ } ++ ++ /* + @@ -2467,6 +2474,10 @@ fill_default_options(Options * options) ++ options->update_hostkeys = 0; + if (options->sk_provider == NULL) + options->sk_provider = xstrdup("$SSH_SK_PROVIDER"); +- #endif + + if (options->update_hostkeys == -1) + + options->update_hostkeys = 0; + + if (options->disable_multithreaded == -1) + + options->disable_multithreaded = 0; + +- /* Expand KEX name lists */ +- all_cipher = cipher_alg_list(',', 0); ++ /* expand KEX and etc. name lists */ ++ { char *all; + diff --git a/readconf.h b/readconf.h + index 2fba866e..7f8f0227 100644 + --- a/readconf.h +@@ -950,9 +950,9 @@ + /* Portable-specific options */ + sUsePAM, + + sDisableMTAES, +- /* Standard Options */ +- sPort, sHostKeyFile, sLoginGraceTime, +- sPermitRootLogin, sLogFacility, sLogLevel, sLogVerbose, ++ /* X.509 Standard Options */ ++ sHostbasedAlgorithms, ++ sPubkeyAlgorithms, + @@ -662,6 +666,7 @@ static struct { + { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, + { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, +diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff +--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2022-02-24 18:48:19.078457000 -0800 ++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2022-02-24 18:54:51.800546480 -0800 +@@ -157,6 +157,36 @@ + + Allan Jude provided the code for the NoneMac and buffer normalization. + + This work was financed, in part, by Cisco System, Inc., the National + + Library of Medicine, and the National Science Foundation. ++diff --git a/auth2.c b/auth2.c ++--- a/auth2.c 2021-03-15 19:30:45.404060786 -0700 +++++ b/auth2.c 2021-03-15 19:37:22.078476597 -0700 ++@@ -229,16 +229,17 @@ ++ double delay; ++ ++ digest_alg = ssh_digest_maxbytes(); ++- len = ssh_digest_bytes(digest_alg); ++- hash = xmalloc(len); +++ if (len = ssh_digest_bytes(digest_alg) > 0) { +++ hash = xmalloc(len); ++ ++- (void)snprintf(b, sizeof b, "%llu%s", ++- (unsigned long long)options.timing_secret, user); ++- if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) ++- fatal_f("ssh_digest_memory"); ++- /* 0-4.2 ms of delay */ ++- delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; ++- freezero(hash, len); +++ (void)snprintf(b, sizeof b, "%llu%s", +++ (unsigned long long)options.timing_secret, user); +++ if (ssh_digest_memory(digest_alg, b, strlen(b), hash, len) != 0) +++ fatal_f("ssh_digest_memory"); +++ /* 0-4.2 ms of delay */ +++ delay = (double)PEEK_U32(hash) / 1000 / 1000 / 1000 / 1000; +++ freezero(hash, len); +++ } ++ debug3_f("user specific delay %0.3lfms", delay/1000); ++ return MIN_FAIL_DELAY_SECONDS + delay; ++ } + diff --git a/channels.c b/channels.c + index b60d56c4..0e363c15 100644 + --- a/channels.c +@@ -209,14 +239,14 @@ + static void + channel_pre_open(struct ssh *ssh, Channel *c, + fd_set *readset, fd_set *writeset) +-@@ -2120,22 +2147,32 @@ channel_check_window(struct ssh *ssh, Channel *c) ++@@ -2164,21 +2191,31 @@ channel_check_window(struct ssh *ssh, Channel *c) + + if (c->type == SSH_CHANNEL_OPEN && + !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && + - ((c->local_window_max - c->local_window > + - c->local_maxpacket*3) || +-+ ((ssh_packet_is_interactive(ssh) && +-+ c->local_window_max - c->local_window > c->local_maxpacket*3) || +++ ((ssh_packet_is_interactive(ssh) && +++ c->local_window_max - c->local_window > c->local_maxpacket*3) || + c->local_window < c->local_window_max/2) && + c->local_consumed > 0) { + + u_int addition = 0; +@@ -235,9 +265,8 @@ + (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || + - (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 || + + (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 || +- (r = sshpkt_send(ssh)) != 0) { +- fatal_fr(r, "channel %i", c->self); +- } ++ (r = sshpkt_send(ssh)) != 0) ++ fatal_fr(r, "channel %d", c->self); + - debug2("channel %d: window %d sent adjust %d", c->self, + - c->local_window, c->local_consumed); + - c->local_window += c->local_consumed; +@@ -337,70 +366,92 @@ + index 70f492f8..5503af1d 100644 + --- a/clientloop.c + +++ b/clientloop.c +-@@ -1578,9 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan) ++@@ -1578,10 +1578,11 @@ client_request_x11(struct ssh *ssh, const char *request_type, int rchan) + sock = x11_connect_display(ssh); + if (sock < 0) + return NULL; + - c = channel_new(ssh, "x11", + - SSH_CHANNEL_X11_OPEN, sock, sock, -1, +-- CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); +-+ c = channel_new(ssh, "x11", +-+ SSH_CHANNEL_X11_OPEN, sock, sock, -1, +-+ /* again is this really necessary for X11? */ +-+ options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, +-+ CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); ++- CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", ++- CHANNEL_NONBLOCK_SET); +++ c = channel_new(ssh, "x11", +++ SSH_CHANNEL_X11_OPEN, sock, sock, -1, +++ /* again is this really necessary for X11? */ +++ options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, +++ CHAN_X11_PACKET_DEFAULT, 0, "x11", CHANNEL_NONBLOCK_SET); + c->force_drain = 1; + return c; + } +-@@ -1608,9 +1610,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan) ++@@ -1608,9 +1609,10 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan) + return NULL; + } + c = channel_new(ssh, "authentication agent connection", + - SSH_CHANNEL_OPEN, sock, sock, -1, + - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, +-- "authentication agent connection", 1); +-+ SSH_CHANNEL_OPEN, sock, sock, -1, +-+ options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size, +-+ CHAN_TCP_PACKET_DEFAULT, 0, +-+ "authentication agent connection", 1); ++- "authentication agent connection", CHANNEL_NONBLOCK_SET); +++ SSH_CHANNEL_OPEN, sock, sock, -1, +++ options.hpn_disabled ? CHAN_X11_WINDOW_DEFAULT : options.hpn_buffer_size, +++ CHAN_TCP_PACKET_DEFAULT, 0, +++ "authentication agent connection", CHANNEL_NONBLOCK_SET); + c->force_drain = 1; + return c; + } +-@@ -1635,10 +1638,13 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, ++@@ -1635,9 +1637,9 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, + } + debug("Tunnel forwarding using interface %s", ifname); + + - c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, +-- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); +-+ c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, ++- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", ++- CHANNEL_NONBLOCK_SET); +++ c = channel_new(ssh, "tun", SSH_CHANNEL_OPENING, fd, fd, -1, + + options.hpn_disabled ? CHAN_TCP_WINDOW_DEFAULT : options.hpn_buffer_size, +-+ CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); +++ CHAN_TCP_PACKET_DEFAULT, 0, "tun", CHANNEL_NONBLOCK_SET); + c->datagram = 1; + +-+ +-+ + #if defined(SSH_TUN_FILTER) +- if (options.tun_open == SSH_TUNMODE_POINTOPOINT) +- channel_register_filter(ssh, c->self, sys_tun_infilter, + diff --git a/compat.c b/compat.c + index 69befa96..90b5f338 100644 + --- a/compat.c + +++ b/compat.c +-@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version) +- debug_f("match: %s pat %s compat 0x%08x", ++@@ -43,7 +43,7 @@ compat_datafellows(const char *version) ++ static u_int ++ compat_datafellows(const char *version) ++ { ++- int i; +++ int i, bugs = 0; ++ static struct { ++ char *pat; ++ int bugs; ++@@ -147,11 +147,26 @@ ++ if (match_pattern_list(version, check[i].pat, 0) == 1) { ++ debug("match: %s pat %s compat 0x%08x", + version, check[i].pat, check[i].bugs); +- ssh->compat = check[i].bugs; + + /* Check to see if the remote side is OpenSSH and not HPN */ +-+ /* TODO: need to use new method to test for this */ + + if (strstr(version, "OpenSSH") != NULL) { + + if (strstr(version, "hpn") == NULL) { +-+ ssh->compat |= SSH_BUG_LARGEWINDOW; +++ bugs |= SSH_BUG_LARGEWINDOW; + + debug("Remote is NON-HPN aware"); + + } + + } +- return; ++- return check[i].bugs; +++ bugs |= check[i].bugs; + } + } ++- debug("no match: %s", version); ++- return 0; +++ /* Check to see if the remote side is OpenSSH and not HPN */ +++ if (strstr(version, "OpenSSH") != NULL) { +++ if (strstr(version, "hpn") == NULL) { +++ bugs |= SSH_BUG_LARGEWINDOW; +++ debug("Remote is NON-HPN aware"); +++ } +++ } +++ if (bugs == 0) +++ debug("no match: %s", version); +++ return bugs; ++ } ++ ++ char * + diff --git a/compat.h b/compat.h + index c197fafc..ea2e17a7 100644 + --- a/compat.h +@@ -459,7 +510,7 @@ + @@ -890,6 +890,10 @@ kex_choose_conf(struct ssh *ssh) + int nenc, nmac, ncomp; + u_int mode, ctos, need, dh_need, authlen; +- int r, first_kex_follows; ++ int r, first_kex_follows = 0; + + int auth_flag = 0; + + + + auth_flag = packet_authentication_state(ssh); +@@ -553,10 +604,10 @@ + #define MAX_PACKETS (1U<<31) + static int + ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +-@@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) ++@@ -1317,7 +1336,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) ++ { + struct session_state *state = ssh->state; + int len, r, ms_remain; +- struct pollfd pfd; + - char buf[8192]; + + char buf[SSH_IOBUFSZ]; + struct timeval start; +@@ -1072,7 +1123,7 @@ + + else + + options.hpn_buffer_size = 2 * 1024 * 1024; + + +-+ if (ssh->compat & SSH_BUG_LARGEWINDOW) { +++ if (ssh_compat_fellows(ssh, SSH_BUG_LARGEWINDOW)) { + + debug("HPN to Non-HPN Connection"); + + } else { + + int sock, socksize; +@@ -1136,14 +1187,14 @@ + } + @@ -2089,6 +2167,11 @@ ssh_session2_open(struct ssh *ssh) + window, packetmax, CHAN_EXTENDED_WRITE, +- "client-session", /*nonblock*/0); ++ "client-session", CHANNEL_NONBLOCK_STDIO); + + + if ((options.tcp_rcv_buf_poll > 0) && !options.hpn_disabled) { + + c->dynamic_window = 1; + + debug("Enabled Dynamic Window Scaling"); + + } + + +- debug3_f("channel_new: %d", c->self); ++ debug2_f("channel %d", c->self); + + channel_send_open(ssh, c->self); + @@ -2105,6 +2188,13 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo) +@@ -1314,7 +1365,29 @@ + /* Bind the socket to the desired port. */ + if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { + error("Bind to port %s on %s failed: %.200s.", +-@@ -1727,6 +1734,19 @@ main(int ac, char **av) ++@@ -1625,13 +1632,14 @@ ++ if (ssh_digest_update(ctx, sshbuf_ptr(server_cfg), ++ sshbuf_len(server_cfg)) != 0) ++ fatal_f("ssh_digest_update"); ++- len = ssh_digest_bytes(digest_alg); ++- hash = xmalloc(len); ++- if (ssh_digest_final(ctx, hash, len) != 0) ++- fatal_f("ssh_digest_final"); ++- options.timing_secret = PEEK_U64(hash); ++- freezero(hash, len); ++- ssh_digest_free(ctx); +++ if ((len = ssh_digest_bytes(digest_alg)) > 0) { +++ hash = xmalloc(len); +++ if (ssh_digest_final(ctx, hash, len) != 0) +++ fatal_f("ssh_digest_final"); +++ options.timing_secret = PEEK_U64(hash); +++ freezero(hash, len); +++ ssh_digest_free(ctx); +++ } ++ ctx = NULL; ++ return; ++ } ++@@ -1727,6 +1735,19 @@ main(int ac, char **av) + fatal("AuthorizedPrincipalsCommand set without " + "AuthorizedPrincipalsCommandUser"); + +@@ -1334,7 +1407,7 @@ + /* + * Check whether there is any path through configured auth methods. + * Unfortunately it is not possible to verify this generally before +-@@ -2166,6 +2186,9 @@ main(int ac, char **av) ++@@ -2166,6 +2187,9 @@ main(int ac, char **av) + rdomain == NULL ? "" : "\""); + free(laddr); + +@@ -1344,7 +1417,7 @@ + /* + * We don't want to listen forever unless the other side + * successfully authenticates itself. So we set up an alarm which is +-@@ -2343,6 +2366,12 @@ do_ssh2_kex(struct ssh *ssh) ++@@ -2343,6 +2367,12 @@ do_ssh2_kex(struct ssh *ssh) + struct kex *kex; + int r; + +@@ -1384,14 +1457,3 @@ + # Example of overriding settings on a per-user basis + #Match User anoncvs + # X11Forwarding no +-diff --git a/version.h b/version.h +-index 6b4fa372..332fb486 100644 +---- a/version.h +-+++ b/version.h +-@@ -3,4 +3,5 @@ +- #define SSH_VERSION "OpenSSH_8.5" +- +- #define SSH_PORTABLE "p1" +--#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +-+#define SSH_HPN "-hpn15v2" +-+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-PeakTput-15.2.diff b/openssh-8_5_P1-hpn-PeakTput-15.2.diff +--- a/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2022-02-24 18:48:19.078457000 -0800 ++++ b/openssh-8_5_P1-hpn-PeakTput-15.2.diff 2022-02-24 18:49:22.196632131 -0800 +@@ -12,9 +12,9 @@ + static long stalled; /* how long we have been stalled */ + static int bytes_per_second; /* current speed in bytes per second */ + @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update) ++ off_t bytes_left; + int cur_speed; +- int hours, minutes, seconds; +- int file_len; ++ int len; + + off_t delta_pos; + + if ((!force_update && !alarm_fired && !win_resized) || !can_output()) +@@ -30,15 +30,17 @@ + if (bytes_left > 0) + elapsed = now - last_update; + else { +-@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update) +- ++@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update) ++ buf[1] = '\0'; ++ + /* filename */ +- buf[0] = '\0'; +-- file_len = win_size - 36; +-+ file_len = win_size - 45; +- if (file_len > 0) { +- buf[0] = '\r'; +- snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s", ++- if (win_size > 36) { +++ if (win_size > 45) { ++- int file_len = win_size - 36; +++ int file_len = win_size - 45; ++ snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ", ++ file_len, file); ++ } + @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update) + (off_t)bytes_per_second); + strlcat(buf, "/s ", win_size); +@@ -63,15 +65,3 @@ + } + + /*ARGSUSED*/ +-diff --git a/ssh-keygen.c b/ssh-keygen.c +-index cfb5f115..986ff59b 100644 +---- a/ssh-keygen.c +-+++ b/ssh-keygen.c +-@@ -2959,7 +2959,6 @@ do_download_sk(const char *skprovider, const char *device) +- +- if (skprovider == NULL) +- fatal("Cannot download keys without provider"); +-- +- pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); +- if (!quiet) { +- printf("You may need to touch your authenticator " diff --git a/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-glue.patch b/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-glue.patch new file mode 100644 index 000000000000..272270b7e985 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.9_p1-hpn-15.2-glue.patch @@ -0,0 +1,238 @@ +diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff +--- a/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2022-02-23 17:10:24.843395097 -0800 ++++ b/openssh-8_5_P1-hpn-AES-CTR-15.2.diff 2022-02-23 17:10:38.206451595 -0800 +@@ -1026,9 +1026,9 @@ + + } + +#endif + + +- debug("Authentication succeeded (%s).", authctxt.method->name); +- } +- ++ if (ssh_packet_connection_is_on_socket(ssh)) { ++ verbose("Authenticated to %s ([%s]:%d) using \"%s\".", host, ++ ssh_remote_ipaddr(ssh), ssh_remote_port(ssh), + diff --git a/sshd.c b/sshd.c + index 6277e6d6..bf3d6e4a 100644 + --- a/sshd.c +diff -ur '--exclude=.*.un~' a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff +--- a/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2022-02-23 17:08:38.124943587 -0800 ++++ b/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 2022-02-23 17:20:59.432070316 -0800 +@@ -536,18 +536,10 @@ + if (state->rekey_limit) + *max_blocks = MINIMUM(*max_blocks, + state->rekey_limit / enc->block_size); +-@@ -954,6 +963,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) ++@@ -954,6 +963,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode) + return 0; + } + +-+/* this supports the forced rekeying required for the NONE cipher */ +-+int rekey_requested = 0; +-+void +-+packet_request_rekeying(void) +-+{ +-+ rekey_requested = 1; +-+} +-+ + +/* used to determine if pre or post auth when rekeying for aes-ctr + + * and none cipher switch */ + +int +@@ -561,27 +553,14 @@ + #define MAX_PACKETS (1U<<31) + static int + ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +-@@ -980,6 +1007,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) +- if (state->p_send.packets == 0 && state->p_read.packets == 0) +- return 0; +- +-+ /* used to force rekeying when called for by the none +-+ * cipher switch methods -cjr */ +-+ if (rekey_requested == 1) { +-+ rekey_requested = 0; +-+ return 1; +-+ } +-+ +- /* Time-based rekeying */ +- if (state->rekey_interval != 0 && +- (int64_t)state->rekey_time + state->rekey_interval <= monotime()) + @@ -1317,7 +1351,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) + struct session_state *state = ssh->state; + int len, r, ms_remain; +- fd_set *setp; ++ struct pollfd pfd; + - char buf[8192]; + + char buf[SSH_IOBUFSZ]; +- struct timeval timeout, start, *timeoutp = NULL; ++ struct timeval start; ++ struct timespec timespec, *timespecp = NULL; + + DBG(debug("packet_read()")); + diff --git a/packet.h b/packet.h +@@ -598,12 +577,11 @@ + }; + + typedef int (ssh_packet_hook_fn)(struct ssh *, struct sshbuf *, +-@@ -155,6 +158,10 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); ++@@ -155,6 +158,9 @@ int ssh_packet_inc_alive_timeouts(struct ssh *); + int ssh_packet_set_maxsize(struct ssh *, u_int); + u_int ssh_packet_get_maxsize(struct ssh *); + + +/* for forced packet rekeying post auth */ +-+void packet_request_rekeying(void); + +int packet_authentication_state(const struct ssh *); + + + int ssh_packet_get_state(struct ssh *, struct sshbuf *); +@@ -627,9 +605,9 @@ + oLocalCommand, oPermitLocalCommand, oRemoteCommand, + + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, + + oNoneEnabled, oNoneMacEnabled, oNoneSwitch, ++ oDisableMTAES, + oVisualHostKey, + oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, +- oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, + @@ -297,6 +300,9 @@ static struct { + { "kexalgorithms", oKexAlgorithms }, + { "ipqos", oIPQoS }, +@@ -637,9 +615,9 @@ + + { "noneenabled", oNoneEnabled }, + + { "nonemacenabled", oNoneMacEnabled }, + + { "noneswitch", oNoneSwitch }, +- { "proxyusefdpass", oProxyUseFdpass }, +- { "canonicaldomains", oCanonicalDomains }, +- { "canonicalizefallbacklocal", oCanonicalizeFallbackLocal }, ++ { "sessiontype", oSessionType }, ++ { "stdinnull", oStdinNull }, ++ { "forkafterauthentication", oForkAfterAuthentication }, + @@ -317,6 +323,11 @@ static struct { + { "securitykeyprovider", oSecurityKeyProvider }, + { "knownhostscommand", oKnownHostsCommand }, +@@ -717,9 +695,9 @@ + + options->hpn_buffer_size = -1; + + options->tcp_rcv_buf_poll = -1; + + options->tcp_rcv_buf = -1; +- options->proxy_use_fdpass = -1; +- options->ignored_unknown = NULL; +- options->num_canonical_domains = 0; ++ options->session_type = -1; ++ options->stdin_null = -1; ++ options->fork_after_authentication = -1; + @@ -2426,6 +2484,41 @@ fill_default_options(Options * options) + options->server_alive_interval = 0; + if (options->server_alive_count_max == -1) +@@ -778,9 +756,9 @@ + int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ + SyslogFacility log_facility; /* Facility for system logging. */ + @@ -120,7 +124,11 @@ typedef struct { +- + int enable_ssh_keysign; + int64_t rekey_limit; ++ int disable_multithreaded; /*disable multithreaded aes-ctr*/ + + int none_switch; /* Use none cipher */ + + int none_enabled; /* Allow none cipher to be used */ + + int nonemac_enabled; /* Allow none MAC to be used */ +@@ -842,9 +820,9 @@ + /* Portable-specific options */ + if (options->use_pam == -1) + @@ -424,6 +434,49 @@ fill_default_server_options(ServerOptions *options) +- } +- if (options->permit_tun == -1) + options->permit_tun = SSH_TUNMODE_NO; ++ if (options->disable_multithreaded == -1) ++ options->disable_multithreaded = 0; + + if (options->none_enabled == -1) + + options->none_enabled = 0; + + if (options->nonemac_enabled == -1) +@@ -975,15 +953,6 @@ + index 306658cb..d4309903 100644 + --- a/serverloop.c + +++ b/serverloop.c +-@@ -322,7 +322,7 @@ static int +- process_input(struct ssh *ssh, fd_set *readset, int connection_in) +- { +- int r, len; +-- char buf[16384]; +-+ char buf[SSH_IOBUFSZ]; +- +- /* Read and buffer any input data from the client. */ +- if (FD_ISSET(connection_in, readset)) { + @@ -608,7 +608,8 @@ server_request_tun(struct ssh *ssh) + debug("Tunnel forwarding using interface %s", ifname); + +@@ -1047,30 +1016,17 @@ + Note that + diff --git a/sftp.c b/sftp.c + index fb3c08d1..89bebbb2 100644 +---- a/sftp.c +-+++ b/sftp.c +-@@ -71,7 +71,7 @@ typedef void EditLine; +- #include "sftp-client.h" +- +- #define DEFAULT_COPY_BUFLEN 32768 /* Size of buffer for up/download */ +--#define DEFAULT_NUM_REQUESTS 64 /* # concurrent outstanding requests */ +-+#define DEFAULT_NUM_REQUESTS 256 /* # concurrent outstanding requests */ +- +- /* File to read commands from */ +- FILE* infile; +-diff --git a/ssh-keygen.c b/ssh-keygen.c +-index cfb5f115..36a6e519 100644 +---- a/ssh-keygen.c +-+++ b/ssh-keygen.c +-@@ -2971,7 +2971,7 @@ do_download_sk(const char *skprovider, const char *device) +- freezero(pin, strlen(pin)); +- error_r(r, "Unable to load resident keys"); +- return -1; +-- } +-+ } +- if (nkeys == 0) +- logit("No keys to download"); +- if (pin != NULL) ++--- a/sftp-client.c +++++ b/sftp-client.c ++@@ -65,7 +65,7 @@ typedef void EditLine; ++ #define DEFAULT_COPY_BUFLEN 32768 ++ ++ /* Default number of concurrent outstanding requests */ ++-#define DEFAULT_NUM_REQUESTS 64 +++#define DEFAULT_NUM_REQUESTS 256 ++ ++ /* Minimum amount of data to read at a time */ ++ #define MIN_READ_SIZE 512 + diff --git a/ssh.c b/ssh.c + index 53330da5..27b9770e 100644 + --- a/ssh.c +@@ -1330,9 +1286,9 @@ + + } + + } + + +- debug("Authentication succeeded (%s).", authctxt.method->name); +- } + ++ #ifdef WITH_OPENSSL ++ if (options.disable_multithreaded == 0) { + diff --git a/sshd.c b/sshd.c + index 6277e6d6..d66fa41a 100644 + --- a/sshd.c +@@ -1359,8 +1315,8 @@ + if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { + error("Bind to port %s on %s failed: %.200s.", + @@ -1727,6 +1734,19 @@ main(int ac, char **av) +- /* Fill in default values for those options not explicitly set. */ +- fill_default_server_options(&options); ++ fatal("AuthorizedPrincipalsCommand set without " ++ "AuthorizedPrincipalsCommandUser"); + + + if (options.none_enabled == 1) { + + char *old_ciphers = options.ciphers; +@@ -1375,9 +1331,9 @@ + + } + + } + + +- /* challenge-response is implemented via keyboard interactive */ +- if (options.challenge_response_authentication) +- options.kbd_interactive_authentication = 1; ++ /* ++ * Check whether there is any path through configured auth methods. ++ * Unfortunately it is not possible to verify this generally before + @@ -2166,6 +2186,9 @@ main(int ac, char **av) + rdomain == NULL ? "" : "\""); + free(laddr); diff --git a/net-misc/openssh/files/sshd-r2.initd b/net-misc/openssh/files/sshd-r2.initd deleted file mode 100644 index 3381fb965dd8..000000000000 --- a/net-misc/openssh/files/sshd-r2.initd +++ /dev/null @@ -1,100 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="checkconfig" -extra_started_commands="reload" - -: ${SSHD_CONFDIR:=${RC_PREFIX%/}/etc/ssh} -: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config} -: ${SSHD_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid} -: ${SSHD_BINARY:=${RC_PREFIX%/}/usr/sbin/sshd} -: ${SSHD_KEYGEN_BINARY:=${RC_PREFIX%/}/usr/bin/ssh-keygen} - -command="${SSHD_BINARY}" -pidfile="${SSHD_PIDFILE}" -command_args="${SSHD_OPTS} -o PidFile=${pidfile} -f ${SSHD_CONFIG}" - -# Wait one second (length chosen arbitrarily) to see if sshd actually -# creates a PID file, or if it crashes for some reason like not being -# able to bind to the address in ListenAddress (bug 617596). -: ${SSHD_SSD_OPTS:=--wait 1000} -start_stop_daemon_args="${SSHD_SSD_OPTS}" - -depend() { - # Entropy can be used by ssh-keygen, among other things, but - # is not strictly required (bug 470020). - use logger dns entropy - if [ "${rc_need+set}" = "set" ] ; then - : # Do nothing, the user has explicitly set rc_need - else - local x warn_addr - for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do - case "${x}" in - 0.0.0.0|0.0.0.0:*) ;; - ::|\[::\]*) ;; - *) warn_addr="${warn_addr} ${x}" ;; - esac - done - if [ -n "${warn_addr}" ] ; then - need net - ewarn "You are binding an interface in ListenAddress statement in your sshd_config!" - ewarn "You must add rc_need=\"net.FOO\" to your ${RC_PREFIX%/}/etc/conf.d/sshd" - ewarn "where FOO is the interface(s) providing the following address(es):" - ewarn "${warn_addr}" - fi - fi -} - -checkconfig() { - checkpath --mode 0755 --directory "${RC_PREFIX%/}/var/empty" - - if [ ! -e "${SSHD_CONFIG}" ] ; then - eerror "You need an ${SSHD_CONFIG} file to run sshd" - eerror "There is a sample file in /usr/share/doc/openssh" - return 1 - fi - - ${SSHD_KEYGEN_BINARY} -A || return 2 - - "${command}" -t ${command_args} || return 3 -} - -start_pre() { - # Make sure that the user's config isn't busted before we try - # to start the daemon (this will produce better error messages - # than if we just try to start it blindly). - # - # We always need to call checkconfig because this function will - # also generate any missing host key and you can start a - # non-running service with "restart" argument. - checkconfig || return $? -} - -stop_pre() { - if [ "${RC_CMD}" = "restart" ] ; then - # If this is a restart, check to make sure the user's config - # isn't busted before we stop the running daemon. - checkconfig || return $? - elif yesno "${RC_GOINGDOWN}" && [ -s "${pidfile}" ] && hash pgrep 2>/dev/null ; then - # Disconnect any clients before killing the master process - local pid=$(cat "${pidfile}" 2>/dev/null) - if [ -n "${pid}" ] ; then - local ssh_session_pattern='sshd: \S.*@pts/[0-9]+' - - IFS="${IFS}@" - local daemon pid pty user - pgrep -a -P ${pid} -f "$ssh_session_pattern" | while read pid daemon user pty ; do - ewarn "Found ${daemon%:} session ${pid} on ${pty}; sending SIGTERM ..." - kill "${pid}" || true - done - fi - fi -} - -reload() { - checkconfig || return $? - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} diff --git a/net-misc/openssh/openssh-8.8_p1-r4.ebuild b/net-misc/openssh/openssh-8.8_p1-r4.ebuild index fb0a37a3290a..346f1afe7e1f 100644 --- a/net-misc/openssh/openssh-8.8_p1-r4.ebuild +++ b/net-misc/openssh/openssh-8.8_p1-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit user-info flag-o-matic autotools pam systemd toolchain-funcs +inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig # Make it more portable between straight releases # and _p? releases. @@ -29,7 +29,9 @@ 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/project/hpnssh/Patches/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} )} + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) " +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc S="${WORKDIR}/${PARCH}" LICENSE="BSD GPL-2" @@ -87,6 +89,7 @@ RDEPEND="${RDEPEND} BDEPEND=" virtual/pkgconfig sys-devel/autoconf + verify-sig? ( sec-keys/openpgp-keys-openssh ) " pkg_pretend() { @@ -112,6 +115,13 @@ pkg_pretend() { fi } +src_unpack() { + default + + # We don't have signatures for HPN, X509, so we have to write this ourselves + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} +} + src_prepare() { sed -i \ -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ diff --git a/net-misc/openssh/openssh-8.9_p1-r2.ebuild b/net-misc/openssh/openssh-8.9_p1-r2.ebuild new file mode 100644 index 000000000000..d56d99980ece --- /dev/null +++ b/net-misc/openssh/openssh-8.9_p1-r2.ebuild @@ -0,0 +1,493 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig + +# Make it more portable between straight releases +# and _p? releases. +PARCH=${P/_} + +# PV to USE for HPN patches +#HPN_PV="${PV^^}" +HPN_PV="8.5_P1" + +HPN_VER="15.2" +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="13.3.1" 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/project/hpnssh/Patches/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} )} + verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc ) +" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc +S="${WORKDIR}/${PARCH}" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 debug hpn kerberos ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss" + +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + hpn? ( ssl ) + ldns? ( ssl ) + pie? ( !static ) + static? ( !kerberos !pam ) + X509? ( !sctp ssl !xmss ) + xmss? ( ssl ) + test? ( ssl ) +" + +# tests currently fail with XMSS +REQUIRED_USE+="test? ( !xmss )" + +LIB_DEPEND=" + audit? ( sys-process/audit[static-libs(+)] ) + ldns? ( + net-libs/ldns[static-libs(+)] + net-libs/ldns[ecdsa(+),ssl(+)] + ) + libedit? ( dev-libs/libedit:=[static-libs(+)] ) + sctp? ( net-misc/lksctp-tools[static-libs(+)] ) + security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) + selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) + ssl? ( >=dev-libs/openssl-1.1.1l-r1: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} + virtual/os-headers + kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) + static? ( ${LIB_DEPEND} ) +" +RDEPEND="${RDEPEND} + pam? ( >=sys-auth/pambase-20081028 ) + !prefix? ( sys-apps/shadow ) + X? ( x11-apps/xauth ) +" +BDEPEND=" + virtual/pkgconfig + sys-devel/autoconf + verify-sig? ( sec-keys/openpgp-keys-openssh ) +" + +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 + local missing=() + check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); } + check_feature hpn HPN_VER + check_feature sctp SCTP_PATCH + check_feature X509 X509_PATCH + if [[ ${#missing[@]} -ne 0 ]] ; then + eerror "Sorry, but this version does not yet support features" + eerror "that you requested: ${missing[*]}" + eerror "Please mask ${PF} for now and check back later:" + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + die "Missing requested third party patch." + 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_unpack() { + default + + # We don't have signatures for HPN, X509, so we have to write this ourselves + use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc} +} + +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.7_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 + eapply "${FILESDIR}"/${PN}-8.9_p1-allow-ppoll_time64.patch #834019 + eapply "${FILESDIR}"/${PN}-8.9_p1-fzero-call-used-regs.patch #834037 + eapply "${FILESDIR}"/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch #834044 + + [[ -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%.*} + + # 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 known 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}"/${PN}-8.9_p1-hpn-${HPN_VER}-glue.patch + use X509 && eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-X509-glue.patch + use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch + popd &>/dev/null || die + + eapply "${hpn_patchdir}" + + use X509 || eapply "${FILESDIR}/openssh-8.6_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 + + # These tests are currently incompatible with PORTAGE_TMPDIR/sandbox + sed -e '/\t\tpercent \\/ d' \ + -i regress/Makefile || die + + 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 + + if [[ ${CHOST} == *-solaris* ]] ; then + # Solaris' glob.h doesn't have things like GLOB_TILDE, configure + # doesn't check for this, so force the replacement to be put in + # place + append-cppflags -DBROKEN_GLOB + fi + + # use replacement, RPF_ECHO_ON doesn't exist here + [[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no + + 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) + $(usex X509 '' "$(use_with security-key security-key-builtin)") + $(use_with ssl openssl) + $(use_with ssl ssl-engine) + $(use_with !elibc_Cygwin hardening) #659210 + ) + + if use elibc_musl; then + # musl defines bogus values for UTMP_FILE and WTMP_FILE + # https://bugs.gentoo.org/753230 + myconf+=( --disable-utmp --disable-wtmp ) + fi + + # 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 tests=( compat-tests ) + local shell=$(egetshell "${UID}") + if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then + ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" + ewarn "user, so we will run a subset only." + tests+=( interop-tests ) + else + tests+=( tests ) + fi + + local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 + mkdir -p "${HOME}"/.ssh || die + emake -j1 "${tests[@]}" </dev/null +} + +# 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 + + if use pam; then + newpamd "${FILESDIR}"/sshd.pam_include.2 sshd + fi + + 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 + + # https://bugs.gentoo.org/733802 + if ! use scp; then + rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \ + || die "failed to remove scp" + fi + + rmdir "${ED}"/var/empty || die + + 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/pimpd/Manifest b/net-misc/pimpd/Manifest index 839fe9f8de84..6157a97cdbd2 100644 --- a/net-misc/pimpd/Manifest +++ b/net-misc/pimpd/Manifest @@ -1,3 +1,3 @@ DIST pimpd_0.8.tar.gz 6763 BLAKE2B 4a9119a0f96b208551a61cc9c3e0ff2e278d7483e57baa0968f9e0949f23d824f75270c3fbc463f9af3e4760ae99e8f8b52fcedf5a2c3d86040486396acb819e SHA512 cb9a60386d5071e21feacf991bb1b2d3d0cb681561a04dc3b9e830336b9d63b4c7026e0a1e43d5276895c733cc0c7d9e072ce1e13ae4b26e83543c53c8147dbe -EBUILD pimpd-0.8-r1.ebuild 494 BLAKE2B b3a3e74cefb5029e1a4493c59346855b767f5d9181150396e86392c32aba58a39f22292d1ee06201ad0d9daf59c5dd6414086674512d2739003f24552b7793b3 SHA512 e9046383d5637f8e38b6a458c981733dd45ade64640c804015f7502425d94a19265aca9eb2df8d35e2b327f46aabf81d147db8257177df9ec62714530e22d8bb +EBUILD pimpd-0.8-r1.ebuild 495 BLAKE2B d11029439bd01d928e56d2ec1938bbba3a0e3cbf3f74d9167839df0b8fb5903dff6a13a168010f1a6c2eccdf5b3569d953cfee76f07055c4225d32d02cae3286 SHA512 d55da28146c41a9aa730926b8f32f7b64331f182e226982410eef0a61b3e9990b67fc775d49c355c0768e1950afd0ccba3312c249b9dc385477f1bc1cb3c5f88 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/net-misc/pimpd/pimpd-0.8-r1.ebuild b/net-misc/pimpd/pimpd-0.8-r1.ebuild index 8c5762a44ff5..444c6799e7cb 100644 --- a/net-misc/pimpd/pimpd-0.8-r1.ebuild +++ b/net-misc/pimpd/pimpd-0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc sparc x86" +KEYWORDS="~amd64 ~ppc sparc x86" src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest index 7e45eb5e2fc8..41c4e2d3fc4c 100644 --- a/net-misc/plowshare/Manifest +++ b/net-misc/plowshare/Manifest @@ -1,6 +1,4 @@ -DIST plowshare-2.1.6.tar.gz 95946 BLAKE2B 1a3c420bc3370e03946f3f813ccecdec6b567245ee49cdf9f7b7788e41fed60b93931e7038e34f6edcbe8a00ed201681c28ae29ffb0aaec10112d03f653231c8 SHA512 bccc72f1add6389fd7fc41a27f9e169c622e3a4e7c9c1040c01a8a4569accc9b0b6910815a013d5e8aff7103ee26d943665ffeccc02db1879eca580b3892190d DIST plowshare-2.1.7.tar.gz 96282 BLAKE2B bfec7fba200d783fcba5051738f98f7cd862eede1661b4d72062bd111b394800406443e52ecf2f0b771b90a9834a87fae01a6055828e8a12446126c593daa01c SHA512 7fe91d3756c55ffc1daf9275bfd2413f2644accd8fa69f2b1064696e1435f9b8be9515907c8249ffde85436dc6966f1d42bad94ccfbde93ae584dcc0d642c215 -EBUILD plowshare-2.1.6-r1.ebuild 1511 BLAKE2B 01e8be107ce8a0dc113c95977de62ee32e522c4631b11e38ee0d831d8f856658cb4a2f1c5d7ee3e95da0e39af29c6234e1bf35391225e888f58f1c3b5f738e74 SHA512 cb8be3bd61142ddebdfa879af555b2fca269585b27cc54d0af04f72aa85e88fe6df15fcaf449843e3da32fe1b566c00675645b9daf490e10c54383ed561df570 -EBUILD plowshare-2.1.7-r1.ebuild 1511 BLAKE2B 01e8be107ce8a0dc113c95977de62ee32e522c4631b11e38ee0d831d8f856658cb4a2f1c5d7ee3e95da0e39af29c6234e1bf35391225e888f58f1c3b5f738e74 SHA512 cb8be3bd61142ddebdfa879af555b2fca269585b27cc54d0af04f72aa85e88fe6df15fcaf449843e3da32fe1b566c00675645b9daf490e10c54383ed561df570 -EBUILD plowshare-9999.ebuild 1471 BLAKE2B 9c66158debb0c162ea7e7f5cea42fa1957e4f33296ed613f334732c8984fa53df4c227a9261e740cfa82494eb807e85d14c736d498fe52c423de417fe99bbee6 SHA512 f8c773141349db717d9b649637125c8863084bd398abedb9743bfe2c8544423b4438cddc7e949cae8d885abf2f828f76d45495594f8a11a9a8eb706aaf943439 +EBUILD plowshare-2.1.7-r2.ebuild 1479 BLAKE2B e849b36b633c55a5b697005f0ff1a8cef97d1f473692aec12244f791c5eb61bf46774e11f23ee32058c556a998dea0c5e934304a5e23efa63fe97a69d694272f SHA512 3419cdbf13152f0f0f587d50b3401bc0317a414e6e98d46571c237e10586b747f8325e433ed09a9e0daa91a27ec4cef3cb65a5400f9d39910f00835054136e46 +EBUILD plowshare-9999.ebuild 1439 BLAKE2B 5f89ae2f4b0cc208b59f45547fbb074099c06d5e416addc5d9049d2d39da2b76e02538a75836586eaff0e98dbd1510d67e4be6dbea2f855ffa5037073bf6e002 SHA512 f4ad2f51c1d4c06d23ff8849d5cf200b6e27f747c3925de946a3fe8591e07049a551a5706406f22eec28a08c47add4dccc34d9d07c14b1d3ee2a95b0cf98d80b MISC metadata.xml 409 BLAKE2B c6b76622caa384b675acdc6bf9f2fea2beac48a58b26862f4dd779eb496c176e1666371be069aad03164bd8a89924f19c628563a971402e0a3fa1ef54e3eda41 SHA512 a656cd950798c01c6f1df5414eb79bdadbe73c004e705498ba21dfb125c105a15e5d0670d5f1a1cf4ee62fe755cfa5fdd9fdfb7c12dce1d01ccbdfc86ad5da35 diff --git a/net-misc/plowshare/plowshare-2.1.7-r1.ebuild b/net-misc/plowshare/plowshare-2.1.7-r1.ebuild deleted file mode 100644 index cacd5eb72e61..000000000000 --- a/net-misc/plowshare/plowshare-2.1.7-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Command-line downloader and uploader for file-sharing websites" -HOMEPAGE="https://github.com/mcrapet/plowshare" -SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="+javascript view-captcha" - -RDEPEND=" - >=app-shells/bash-4 - || ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) ) - dev-vcs/git - net-misc/curl - sys-apps/util-linux - virtual/imagemagick-tools[tiff] - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) - view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" - -# NOTES: -# javascript dep should be any javascript interpreter using /usr/bin/js - -src_prepare() { - # Fix doc install path - sed -i -e "/^DOCDIR/s|plowshare|${PF}|" Makefile || die "sed failed" - - default -} - -src_compile() { - # There is a Makefile but it's not compiling anything, let's not try. - : -} - -src_test() { - # Disable tests because all of them need a working Internet connection. - : -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" \ - PLOWSHARE_FORCE_VERSION="${PV}" install -} - -pkg_postinst() { - elog "plowshare is not delivered with modules by default anymore" - elog "Per-user modules can be installed/updated with the plowmod command" - if ! use javascript; then - ewarn "Without javascript you will not be able to use modules" - ewarn "requering a Javascript shell (/usr/bin/js)" - fi -} diff --git a/net-misc/plowshare/plowshare-2.1.6-r1.ebuild b/net-misc/plowshare/plowshare-2.1.7-r2.ebuild index cacd5eb72e61..f2207e36da41 100644 --- a/net-misc/plowshare/plowshare-2.1.6-r1.ebuild +++ b/net-misc/plowshare/plowshare-2.1.7-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Command-line downloader and uploader for file-sharing websites" HOMEPAGE="https://github.com/mcrapet/plowshare" @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mcrapet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="+javascript view-captcha" +IUSE="javascript view-captcha" RDEPEND=" >=app-shells/bash-4 @@ -19,7 +19,7 @@ RDEPEND=" net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) + javascript? ( dev-java/rhino ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" # NOTES: diff --git a/net-misc/plowshare/plowshare-9999.ebuild b/net-misc/plowshare/plowshare-9999.ebuild index 1c454b8d9c40..314455ade5a5 100644 --- a/net-misc/plowshare/plowshare-9999.ebuild +++ b/net-misc/plowshare/plowshare-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit git-r3 @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/mcrapet/plowshare.git" LICENSE="GPL-3" SLOT="0" -IUSE="+javascript view-captcha" +IUSE="javascript view-captcha" RDEPEND=" >=app-shells/bash-4 @@ -20,7 +20,7 @@ RDEPEND=" net-misc/curl sys-apps/util-linux virtual/imagemagick-tools[tiff] - javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) ) + javascript? ( dev-java/rhino ) view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )" # NOTES: diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest index 64a437e47473..eef60fc1e307 100644 --- a/net-misc/ps3mediaserver/Manifest +++ b/net-misc/ps3mediaserver/Manifest @@ -1,5 +1,5 @@ AUX ps3mediaserver.confd 169 BLAKE2B 9406c426b73e7d4cb349146f2dd975bcdd8de177615c9b5cd7e3f39bf8e5a8917ef7db3d442bdb67decefc1fde3fc86820a9f797c76b971d30e3fe515f06e7e6 SHA512 3ecbd0a99c422f2fad3082ea70d0755d3af9aca3d426865e57fbe8669647603df90006c79064166ca6866e4e61a86f0dccfb5f8c8429476de69b91c4e6e10f37 AUX ps3mediaserver.initd 399 BLAKE2B e45d66c845f47f54217a995bfad68fe5a3bddea5b16a009f94fe610bc26f292450f554fe822fa238e95b57add60f30397328e6d5460c3b983e49e06499c7726f SHA512 bd260d16f7d4b29d922ede6531d774031f548889fdd9156dd025ec7135824362dc4026cc9577ce85733a00b3eed70a8ce96fb894ccfeb81355b818013de12406 DIST pms-1.90.1-generic-linux-unix.tar.gz 15789602 BLAKE2B 6240c4c4e21fdc0a587e26499969a0dd597ffa8a079812ef944268cc13d2437749f95d6671367baba04f52e2c7499b841e6cf845b3f8c708b756295a66ae9f76 SHA512 af5748989dff1b106ba44a952fc68b43d11a929dec56440cf11ffd6f0a0c561febce54557855bf1afc2614cfb904b5997265f0bdf4ecf45535e12bbabc0fd11f -EBUILD ps3mediaserver-1.90.1-r1.ebuild 2089 BLAKE2B 98f3f03ccec6ee835a4b1cbb63767be41775ef983e5eb3080c94cff69b50db90a0ecd6c0e7b63c0f8940a4c51c31ccefdf5eeafc6f7c8af8559a7dad1453a102 SHA512 53de4e363853f86e7814f1aa87d9b9f7b8ef20a6d1be2c6bb615c7469227df0b30c83ba141a4b2574953378118589e889a408b109d084c4d6341fa031e81f9ef +EBUILD ps3mediaserver-1.90.1-r2.ebuild 2110 BLAKE2B 66553c16b1963e927c31fcb1dbedaf554f04aa311ffa8929078fc90085d313ef5338e79278fab508034d2e19579e18e0ec311c6675f7739e2509e13ca7577f9c SHA512 8511b6742248c412d05a7eef2fe32957f8fd9e80d1420b018642e13e2285bdd3201e2f043a0ad1d1165b72ad6ed8fa5ef4694900e549d316d2312f03623d063f MISC metadata.xml 684 BLAKE2B 571394951f8bb79b547a683623ad44ad5dc61ab9dea8daee86567f0ff9b6ef124f5c4094f229e7461bdea30d8469e611b67c25058612f09928d365857fe8e941 SHA512 d6496c974022efbfa541747e2c200941292e30dfed7104fc69ed0b0f8b3d13342b1ababab9c130fbe008169ffb79f87ba1519e61a0b27f23977bac8f03c4a7ce diff --git a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r1.ebuild b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild index 9549e0bea26f..2451c9339969 100644 --- a/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r1.ebuild +++ b/net-misc/ps3mediaserver/ps3mediaserver-1.90.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="multiuser +transcode tsmuxer" BDEPEND="app-arch/unzip" -RDEPEND=">=virtual/jre-1.6.0 +RDEPEND=">=virtual/jre-1.8:* media-libs/libmediainfo media-libs/libzen tsmuxer? ( media-video/tsmuxer ) @@ -28,7 +28,7 @@ src_prepare() { default if use multiuser; then - cat > ${PN} <<-EOF + cat > ${PN} <<-EOF || die #!/bin/sh if [ ! -e ~/.${PN} ]; then echo "Copying ${PMS_HOME} to ~/.${PN}" @@ -38,14 +38,14 @@ src_prepare() { exec "\${PMS_HOME}/PMS.sh" "\$@" EOF else - cat > ${PN} <<-EOF + cat > ${PN} <<-EOF || die #!/bin/sh export PMS_HOME=${PMS_HOME} exec "\${PMS_HOME}/PMS.sh" "\$@" EOF fi - cat > ${PN}.desktop <<-EOF + cat > ${PN}.desktop <<-EOF || die [Desktop Entry] Name=PS3 Media Server GenericName=Media Server diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest index 363ba84263b0..4384ae097a7d 100644 --- a/net-misc/pulseaudio-dlna/Manifest +++ b/net-misc/pulseaudio-dlna/Manifest @@ -1,3 +1,3 @@ AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3 -EBUILD pulseaudio-dlna-9999.ebuild 2019 BLAKE2B 266ac29d3776ff6aa5e9d933eb7d099812899ebb82874453499816195b5ae51ebe4d14842ec0e2a45fdfaec14bc42e205a419af5851b5cea134104461708a7c8 SHA512 db84789f4eab84be3a43a1cf0047f5d09cd4ff57db495c38c57acc94b7f363415925c1e8239c9bb7b9f2410e6e2ee93c1d00627d77a45caf2691ae5787853e90 +EBUILD pulseaudio-dlna-9999.ebuild 2067 BLAKE2B a43c11f87255006748705f6050518b3876ebc9005b4e3be7741f756f214228c535506d12e5b0edae2dc99878ec9997eb186552308f463b50625f5dbc27e0c36c SHA512 e5f090bfc9e7bf5182d83e45fb81a5322766de05b07047bce9c177c0e1b08df83c6460469969c6142338eb6490c9c27c615644e56a649c9db53ff3f226da5e92 MISC metadata.xml 341 BLAKE2B 9add00de1558ff7ed828022b6e7818de975fb233b6b821f9c7bded156081dfd5edca2ae3237fa3cd2324aa615c6ed02008727a002ddb7b3331f6dd25a2ffcabc SHA512 58ad5457eb2dd3c0f926f32f40433899b1fe2a0456136d0b37b45ae3628994349bd60984e83388514e58b778b6c070ab99c53673f56bd1b7c03a927f1e4afe42 diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild index d314e16809df..6fc29c68a643 100644 --- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild +++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -56,7 +56,7 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}] DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - media-sound/pulseaudio" + || ( media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] )" python_prepare_all() { sed -i '/dbus-python/d' setup.py || die diff --git a/net-misc/r8125/Manifest b/net-misc/r8125/Manifest new file mode 100644 index 000000000000..920b7954e60e --- /dev/null +++ b/net-misc/r8125/Manifest @@ -0,0 +1,5 @@ +DIST r8125-9.007.01.tar.bz2 88973 BLAKE2B fda3be9bded138bb6ee6b131c4d89d2dc777153eb1d003f11803d412d28957c944f220452762ca92ebb1cbfe2d5e7bdc0f9944517a0bb58ed0f3f112986c21ee SHA512 753c328d5a962366ea1bd495ca3860309bc6ff8b2f3fb367a9f184441dd7c507d0eb4d63cc9b23851d0287e75ad2d602caee5ffed911691349cf8d0f37477a5c +DIST r8125-9.008.00.tar.bz2 89622 BLAKE2B d1106086d1bca53484f8536072cddd506087b5d49983cbb91e921e86674c074b38c8a01cb51d2ea5793d8ffbff6e97ab05e48720ff00a805c4096a1d62a0cc30 SHA512 ff740a49fcc94b3de826f6299c489ed3f92ba9123ca2b2fe3c9035eecd16d518b6a4e6c2fa2531bb670c52097a52a0fb2fdf71b721efb20c83bb59d94d99c6c6 +EBUILD r8125-9.007.01.ebuild 1264 BLAKE2B c5d1f14d0407c63f45c2182aaaf593ded862d2e0c806a2eba3ba74b1b479ab571d11f322a6e62dda4f83cd974eb8dd5d1f068b65658ff488b3096b94091520d2 SHA512 5b1ec0229839cbd06c690546320752e04f43b54f8b62b1de329691cb5222905fb4c6cf80483adb09239d9c4fe6f8cb6fd22f995debbcc4fbe24d7b274d24364b +EBUILD r8125-9.008.00.ebuild 1266 BLAKE2B 2dba10ff4639ea88b418bf1f96404f9265633138f3ffcc5af68fcc31326f108b24d1f40e8b1269013fc7d520f62b2b5bc5ca5ebb612ee5acf1c0a9d03f0572e1 SHA512 63abe0979940d437e11d3cd5e426470e3bcc56e2f53195001338b17fecad6fa76d737c8793c75246cad5b9a4a0d83309aa3fe5ab26632caab23d1e5cec709c8e +MISC metadata.xml 840 BLAKE2B 6fa88a6b1b49f0abd18ca64abf2ab93a04e89d51c66ebb602ca5070c56723fbe79e4a0fcfa49b4cc90e3ec904730c8e39b1a2159fcae0f036035d5696537a5a4 SHA512 f15e195ac564002f169610c0490f1f377716260e758241d5228a3b6c7d481de135c03a4da1e5c2eb121e4539a2abceabc3a4e1d26d8d987e093b981dd6eaea9f diff --git a/net-misc/r8125/metadata.xml b/net-misc/r8125/metadata.xml new file mode 100644 index 000000000000..a0cb8723713f --- /dev/null +++ b/net-misc/r8125/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>k2k@narod.ru</email> + <name>Evgeny Grin</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription>Official Realtek r8125 vendor linux driver. The following cards are currently supported: +RTL8125 RTL8125A RTL8125B(S)(G)</longdescription> + <use> + <flag name="multi-tx-q">Enable Multiple Tx Queue ("RSS" for sending)</flag> + <flag name="ptp">Enable Precision Time Protocol support</flag> + <flag name="rss">Enable Receive Side Scaling (RSS)</flag> + <flag name="use-firmware">Support automatic firmware loading</flag> + </use> +</pkgmetadata> diff --git a/net-misc/r8125/r8125-9.007.01.ebuild b/net-misc/r8125/r8125-9.007.01.ebuild new file mode 100644 index 000000000000..7389ba42cca3 --- /dev/null +++ b/net-misc/r8125/r8125-9.007.01.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +# The alternative direct URL for the file from the link above with description +# "2.5G Ethernet LINUX driver r8125 for kernel up to 5.6" to avoid CAPTCHA +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +MODULE_NAMES="r8125(net:${S}/src)" +BUILD_TARGETS="modules" +IUSE="multi-tx-q ptp rss use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERNELDIR=${KV_DIR}" + BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)" + BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)" + BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)" + BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" +} + +src_install() { + linux-mod_src_install + einstalldocs +} diff --git a/net-misc/r8125/r8125-9.008.00.ebuild b/net-misc/r8125/r8125-9.008.00.ebuild new file mode 100644 index 000000000000..a028be892582 --- /dev/null +++ b/net-misc/r8125/r8125-9.008.00.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod + +DESCRIPTION="r8125 vendor driver for Realtek RTL8125 PCI-E NICs" +HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software" + +# The alternative direct URL for the file from the link above with description +# "2.5G Ethernet LINUX driver r8125 for kernel up to 5.6" to avoid CAPTCHA +SRC_URI="http://rtitwww.realtek.com/rtdrivers/cn/nic1/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +MODULE_NAMES="r8125(net:${S}/src)" +BUILD_TARGETS="modules" +IUSE="+multi-tx-q ptp +rss use-firmware" + +CONFIG_CHECK="~!R8169" +WARNING_R8169="CONFIG_R8169 is enabled. ${PN} will not be loaded unless kernel driver Realtek 8169 PCI Gigabit Ethernet (CONFIG_R8169) is DISABLED." + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERNELDIR=${KV_DIR}" + BUILD_PARAMS+=" ENABLE_PTP_SUPPORT=$(usex ptp y n)" + BUILD_PARAMS+=" ENABLE_RSS_SUPPORT=$(usex rss y n)" + BUILD_PARAMS+=" ENABLE_MULTIPLE_TX_QUEUE=$(usex multi-tx-q y n)" + BUILD_PARAMS+=" ENABLE_USE_FIRMWARE_FILE=$(usex use-firmware y n)" +} + +src_install() { + linux-mod_src_install + einstalldocs +} diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest index df308ac1bfef..776b3ad8712c 100644 --- a/net-misc/rdate/Manifest +++ b/net-misc/rdate/Manifest @@ -1,7 +1,11 @@ +AUX rdate-1.10.2-fix-musl-compat-stdint.patch 4574 BLAKE2B 8228b520bc94c1fce70416035ed4eeafb98c96ed05171eed18f914b6d4a6516fc232f9a46cc22e3a9413fa7d1a8dd3837dc2f67e5a8cc0c315fd1ad9a21ce972 SHA512 85c3cc5ead5a5909ac613e37a2ddf7d837dba8a57b162d72ccb473bf679a2c1d4783fcf3e7fd44ca388146ee999d3dc7e63a9a68ab8f1b6203207f39980c5c49 +AUX rdate-1.10.2-respect-AR.patch 1117 BLAKE2B ad992ef817847c39c779eb1a251df905b3a9c0c70487433dcb22014717c4b10486d06237bc2b12b6827c7016321a88950ff8d40a5072b81d5e9bf8a2a0f834cf SHA512 66912901b7b052203af8c39de81aab08f9c512d46c8eaf2174fc936c7bdeb7a045ad56cbfb81b65dca7cb8790c95174b4021ce227289f4e4edb63d21020e9409 AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add05971f06773ae992f08e58bb4f5367660e93937baf7bf3d0fe35a508bdaea44bca104c0871cf6ba8 SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157 DIST rdate-1.10.2.tar.gz 19839 BLAKE2B d51ff68303a05abd8049abebafd76a01d8dedff6a294057640989989f851f1b381d75f2ad7ab94a850de76c485340770e06cf086225d641a2fee6d43112b473f SHA512 6e3759e73c05532b54f004592989572f78a0cfef7a2af1ae33708c9d239b63203702466664d39701afbc0012ff53fbf0bc3917ad8bb3df3322c4b613fd2e8aba DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146 -EBUILD rdate-1.10.2.ebuild 917 BLAKE2B 865820dd26fb43906f1f6f90dd2f746f18aca5817a5ec5ded14f93013513b47c9b715ed1bc24d4da3097a136588106efad5bd286186861b9b20bd322ffd379e9 SHA512 864a33b2bd39263cc8c4b217275dd6d484605c5103dd2c15633cb74c479db63bae83b91fe98e51e0a76a21065c0219b0ebf02f37f772220bc7987d872d65e249 +DIST rdate-1.11.tar.gz 20210 BLAKE2B 0ff4abebe08f33b45c753dd2912c36e3895c1745b2d78340c7574116f50cd4d05364c5bee97e883b7ad587fcd5261931d928689cd583aa86b43aac408d2a4a6d SHA512 916952c26cdd51c8666bf62cdd823cf8a07fd4487fbf73213d529525b31a90f056120ea2ff16e6d37ea7c662853ba3c15789fef90724b2dbf17c21a6ff3f415d +EBUILD rdate-1.10.2.ebuild 857 BLAKE2B 8970e5d2d8a0e6b77addb0b09d25ac975a8c10e34e1615a6780eae75d2fa1761434b81810c3c9524c3c78df854852548925457e7d713e935d03877266b4b58cd SHA512 a0fc238d98e0217ff2a79faf32570d1018dbe3e2c3339e3da8f5151dc55ffa4619f9e3bc295f5dddbf0f8a4dbfe768118d092344e0afc2cde6e3a072c1e6968d EBUILD rdate-1.10.ebuild 743 BLAKE2B a3241a2734fbde24280b2a78cbd91b11151d7536504ef01229dca386198c524f417b7c4714e1788a77ffe77515fcbf2b9c92cdb3d0523d1f899fc20a866a29ae SHA512 582511eb5b1c66b6575a4cf7f2e8a9663013a612f25943213d392e418e1f3b8b0786cb8ce45446b84250c3336c0838e72b6a220b2ba78ed7a687c89b4655b480 +EBUILD rdate-1.11.ebuild 750 BLAKE2B 16b8d6cb39bca95bcbfccee9829504ed20dbb512fd533ecdc5e72bdf56c9a2f161a74d5ab08e869d5a4bb93c215c5d9a30bf2aee347662734d5c492fe9c26c9a SHA512 9512a4afe11a5c40c0388f2df68e90ab40315f452ee673d3eb8e600c34457aa44a0710fe33de824cf8cbb46c2028b9b6cab06cae4323aaa349186f9feba7ece5 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2 diff --git a/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch b/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch new file mode 100644 index 000000000000..a6ff70b353d5 --- /dev/null +++ b/net-misc/rdate/files/rdate-1.10.2-fix-musl-compat-stdint.patch @@ -0,0 +1,180 @@ +https://github.com/resurrecting-open-source-projects/openrdate/pull/3 + +From: Sam James <sam@gentoo.org> +Date: Thu, 3 Feb 2022 09:23:35 +0000 +Subject: [PATCH] Use <stdint.h> to fix musl compatibility + +uint32_t and friends are provided by <stdint.h> and the types +previously being relied on are non-standard, so let's swap. + +This fixes building rdate on e.g. musl rather than glibc. + +Bug: https://bugs.gentoo.org/832554 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/src/ntp.c ++++ b/src/ntp.c +@@ -52,6 +52,7 @@ + #include <netdb.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <string.h> + #include <time.h> + #include <unistd.h> +@@ -106,11 +107,11 @@ struct ntp_data { + double receive; + double transmit; + double current; +- u_int64_t recvck; ++ uint64_t recvck; + + /* Local State */ + double originate; +- u_int64_t xmitck; ++ uint64_t xmitck; + }; + + void ntp_client(const char *, int, struct timeval *, struct timeval *, int, int, int); +@@ -282,7 +283,7 @@ write_packet(int fd, struct ntp_data *data) + + packet[0] = (NTP_VERSION << 3) | (NTP_MODE_CLIENT); + +- data->xmitck = (u_int64_t)arc4random() << 32 | arc4random(); ++ data->xmitck = (uint64_t)arc4random() << 32 | arc4random(); + + /* + * Send out a random 64-bit number as our transmit time. The NTP +@@ -300,7 +301,7 @@ write_packet(int fd, struct ntp_data *data) + * the transmit field intelligible. + */ + +- *(u_int64_t *)(packet + NTP_TRANSMIT) = data->xmitck; ++ *(uint64_t *)(packet + NTP_TRANSMIT) = data->xmitck; + + data->originate = current_time(JAN_1970); + +@@ -453,7 +454,7 @@ double + current_time(double offset) + { + struct timeval current; +- u_int64_t t; ++ uint64_t t; + + if (gettimeofday(¤t, NULL)) + err(1, "Could not get local time of day"); +--- a/src/ntpleaps.c ++++ b/src/ntpleaps.c +@@ -45,12 +45,13 @@ + #include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <string.h> + #include <unistd.h> + + #include "ntpleaps.h" + +-static u_int64_t *leapsecs; ++static uint64_t *leapsecs; + static unsigned int leapsecs_num; + + +@@ -81,10 +82,10 @@ ntpleaps_init(void) + } + + int +-ntpleaps_sub(u_int64_t *t) ++ntpleaps_sub(uint64_t *t) + { + unsigned int i = 0; +- u_int64_t u; ++ uint64_t u; + int r = 1; + + if (ntpleaps_init() == -1) +@@ -105,10 +106,10 @@ ntpleaps_sub(u_int64_t *t) + return (r); + } + +-u_int32_t +-read_be_dword(u_int8_t *ptr) ++uint32_t ++read_be_dword(uint8_t *ptr) + { +- u_int32_t res; ++ uint32_t res; + + memcpy(&res, ptr, 4); + return (ntohl(res)); +@@ -120,10 +121,10 @@ ntpleaps_read(void) + { + int fd; + unsigned int r; +- u_int8_t buf[32]; +- u_int32_t m1, m2, m3; +- u_int64_t s; +- u_int64_t *l; ++ uint8_t buf[32]; ++ uint32_t m1, m2, m3; ++ uint64_t s; ++ uint64_t *l; + + fd = open("/usr/share/zoneinfo/right/UTC", O_RDONLY | O_NDELAY); + if (fd == -1) +@@ -153,7 +154,7 @@ ntpleaps_read(void) + close(fd); + return (-1); + } +- if ((l = (u_int64_t *)malloc(r << 3)) == NULL) { ++ if ((l = (uint64_t *)malloc(r << 3)) == NULL) { + close(fd); + return (-1); + } +--- a/src/ntpleaps.h ++++ b/src/ntpleaps.h +@@ -46,11 +46,13 @@ + #ifndef _NTPLEAPS_H + #define _NTPLEAPS_H + ++#include <stdint.h> ++ + /* Offset between struct timeval.tv_sec and a tai64_t */ + #define NTPLEAPS_OFFSET (4611686018427387914ULL) + + /* Hide this ugly value from programmes */ +-#define SEC_TO_TAI64(s) (NTPLEAPS_OFFSET + (u_int64_t)(s)) ++#define SEC_TO_TAI64(s) (NTPLEAPS_OFFSET + (uint64_t)(s)) + #define TAI64_TO_SEC(t) ((t) - NTPLEAPS_OFFSET) + + /* Initializes the leap second table. Does not need to be called +@@ -70,6 +72,6 @@ int ntpleaps_read(void); + * to posix clock tick time. + * returns 0 on success, -1 on error (time is unchanged), 1 on leap second + */ +-int ntpleaps_sub(u_int64_t *); ++int ntpleaps_sub(uint64_t *); + + #endif +--- a/src/rfc868time.c ++++ b/src/rfc868time.c +@@ -50,6 +50,7 @@ + #include <stdio.h> + #include <ctype.h> + #include <err.h> ++#include <stdint.h> + #include <string.h> + #include <netdb.h> + #include <unistd.h> +@@ -68,10 +69,10 @@ rfc868time_client (const char *hostname, int family, struct timeval *new, + { + struct addrinfo hints, *res0, *res; + struct timeval old; +- u_int32_t tim; /* RFC 868 states clearly this is an uint32 */ ++ uint32_t tim; /* RFC 868 states clearly this is an uint32 */ + int s; + int error; +- u_int64_t td; ++ uint64_t td; + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = family; diff --git a/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch b/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch new file mode 100644 index 000000000000..05289f3453c9 --- /dev/null +++ b/net-misc/rdate/files/rdate-1.10.2-respect-AR.patch @@ -0,0 +1,40 @@ +https://github.com/resurrecting-open-source-projects/openrdate/pull/4 + +From: Sam James <sam@gentoo.org> +Date: Thu, 3 Feb 2022 09:30:53 +0000 +Subject: [PATCH] Respect AR from environment + +Detect `AR` from the environment (first the AR environment variable, but +failing that, ${CHOST}-ar). This allows using different toolchains (e.g. +Clang and LLVM's tooling) and also facilitates cross-compilation. + +Bug: https://bugs.gentoo.org/729998 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,8 @@ AC_CONFIG_SRCDIR([src/rdate.c]) + AC_CONFIG_HEADERS([config.h]) + AC_ARG_VAR([kernel_version], [the version of the kernel to build against]) + ++AC_CANONICAL_HOST ++ + # Checks for programs. + AC_PROG_CC + +@@ -22,6 +24,8 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_EGREP + ++AM_PROG_AR ++ + # Checks for libraries. + AC_CHECK_LIB([c], [fork]) + AC_CHECK_LIB([util], [malloc]) +@@ -52,7 +56,6 @@ AC_CHECK_FUNCS([gettimeofday memset select socket]) + AC_PATH_PROG([UNAME], [uname], + [:]) + +-AC_CANONICAL_HOST + # Determine the particulars of the host + case "${host}" in + *-*-linux*) diff --git a/net-misc/rdate/rdate-1.10.2.ebuild b/net-misc/rdate/rdate-1.10.2.ebuild index 85c5f91b3cf8..f64d1f48a116 100644 --- a/net-misc/rdate/rdate-1.10.2.ebuild +++ b/net-misc/rdate/rdate-1.10.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 MY_P="openrdate" -inherit autotools toolchain-funcs +inherit autotools DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine" HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate" @@ -14,16 +14,19 @@ S="${WORKDIR}/${MY_P}-${PV}" 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" DEPEND="dev-libs/libbsd" -RDEPEND=${DEPEND} +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.2-fix-musl-compat-stdint.patch + "${FILESDIR}"/${PN}-1.10.2-respect-AR.patch +) src_prepare() { default - # Don't use hardcoded 'ar' command - sed -s '/^AC_PROG_CC/a m4_ifdef([AM_PROG_AR], [AM_PROG_AR], [AC_SUBST([AR], [$(tc-getAR])])' -i configure.ac || die eautoreconf } diff --git a/net-misc/rdate/rdate-1.11.ebuild b/net-misc/rdate/rdate-1.11.ebuild new file mode 100644 index 000000000000..dd88c82ec3e6 --- /dev/null +++ b/net-misc/rdate/rdate-1.11.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="openrdate" + +inherit autotools + +DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate" +SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}-${PV}" + +LICENSE="BSD-4" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +DEPEND="dev-libs/libbsd" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate + newconfd "${FILESDIR}"/rdate-confd rdate +} diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest index 50e5597c1cd5..a8c75e22ce18 100644 --- a/net-misc/remmina/Manifest +++ b/net-misc/remmina/Manifest @@ -1,3 +1,7 @@ DIST Remmina-v1.4.23.tar.gz 3280050 BLAKE2B b62789dba4a4f0a0a12f4cc1da68431b0c386b618f3bf7babe8946cba3753bdfd8799731a254c18cf58e8a43efe6980d638adc9512303dfb229c5b340d957402 SHA512 151baead9c8e8051f6da2139691aa5644ccdd5752e1dd1be572b72fab01773caf261bfe44ebebc8524a36b447ee335275e6522bd2b6b65d4f0a790c92bd291d4 +DIST Remmina-v1.4.24.tar.gz 3375550 BLAKE2B 3ce777e3493c51915928ae63072c3df2123426563b514aa0cbde076084045e0e08c41fd363244db9dea247ca265486cad2184f7996cddcea941e983371d6af4e SHA512 39fecb82cedcd08720f800a69f778125811a141a152e88e8d657f082c5efcc4525483fb8374712db48743f9a0c2222e2312a9b3ecf5f043761d029edda86609d +DIST Remmina-v1.4.25.tar.gz 3404247 BLAKE2B 59798362b33780041975f8af6c11b14a36876badeaed341f4600e9e920ec2b2ca78f33ddc69bb52608fc45488aefacf6c9ec9751369a4b5c23507519494180c4 SHA512 2409d316894a423de487c264861bda782bac365d13eb77f965863173072da85d228047ca0624bc7664cf6c1a5144598895371a56e37a1cc90df426d19b5719a8 EBUILD remmina-1.4.23-r1.ebuild 2519 BLAKE2B bd58ce95fb25c3d3a4a01333d5cd8cda69ef42fd5c547dfc48fdb77bbac12322ab219dd6ec24838d43ad6f4a8170177dc1d3a04c995f7ef0995fe320f0173ee5 SHA512 fea16348e93f27044260d5d733c45729541ec49241ed5884d5a70e0c65632626d6228d172b0161b6d698d79c9c31c3eb570b42712101e3dfcfb6c40154349825 +EBUILD remmina-1.4.24.ebuild 2521 BLAKE2B c557f52a6b88878c01256463f6cdced00ecaea3a3d3e351a0378102db8e2ffeccf21ad99a38ade887c3628329c3d00fed729e78f1984652f082a2e0f98f7e291 SHA512 f8047454916cfa775041e2d26d53e0a40a70175722e828f48667961046b6999d171dc7cee2c5a30e5c5f6eaa269971c16182cf08e4ab918e1f4ef3520e573080 +EBUILD remmina-1.4.25.ebuild 2521 BLAKE2B c557f52a6b88878c01256463f6cdced00ecaea3a3d3e351a0378102db8e2ffeccf21ad99a38ade887c3628329c3d00fed729e78f1984652f082a2e0f98f7e291 SHA512 f8047454916cfa775041e2d26d53e0a40a70175722e828f48667961046b6999d171dc7cee2c5a30e5c5f6eaa269971c16182cf08e4ab918e1f4ef3520e573080 MISC metadata.xml 1174 BLAKE2B 03a647f7a881a228a2123e269567394dcf5d8e908d223dcc30b87f11e7447ffbadcda0e4a29d9126b6d15c35ddb07a7a4b9b49631156d8efc2de3f460d202bf8 SHA512 fd1632f13bffe28ca6b2349dcd32641393c0fa9fe1dd6b629b2e6d8b88a3f7f1adce8f4dfe0adce7243e5fe485da9eeaf6042ea4f532e086c97cf5d21f34a91b diff --git a/net-misc/remmina/remmina-1.4.24.ebuild b/net-misc/remmina/remmina-1.4.24.ebuild new file mode 100644 index 000000000000..8e269e89a576 --- /dev/null +++ b/net-misc/remmina/remmina-1.4.24.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake optfeature xdg + +MY_P="${PN^}-v${PV}" + +DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client" +HOMEPAGE="https://remmina.org/" +SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf" + +COMMON_DEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libpcre2 + dev-libs/libsodium:= + dev-libs/openssl:0= + net-libs/libsoup:2.4 + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libxkbfile + appindicator? ( dev-libs/libappindicator:3 ) + crypt? ( dev-libs/libgcrypt:0= ) + gnome-keyring? ( app-crypt/libsecret ) + gvnc? ( net-libs/gtk-vnc ) + kwallet? ( kde-frameworks/kwallet ) + rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] + <net-misc/freerdp-3[X] + cups? ( net-print/cups:= ) ) + spice? ( net-misc/spice-gtk[gtk3] ) + ssh? ( net-libs/libssh:0=[sftp] + x11-libs/vte:2.91 ) + vnc? ( net-libs/libvncserver[jpeg] ) + webkit? ( net-libs/webkit-gtk:4 ) + x2go? ( net-misc/pyhoca-cli ) + zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) +" + +DEPEND=" + ${COMMON_DEPEND} + spice? ( app-emulation/spice-protocol ) +" + +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +RDEPEND=" + ${COMMON_DEPEND} + virtual/freedesktop-icon-theme +" + +DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + xdg_environment_reset + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF) + -DWITH_AVAHI=$(usex zeroconf) + -DWITH_CUPS=$(usex cups) + -DWITH_EXAMPLES=$(usex examples) + -DWITH_FREERDP=$(usex rdp) + -DWITH_FREERDP3=OFF + -DWITH_GCRYPT=$(usex crypt) + -DWITH_GETTEXT=$(usex nls) + -DWITH_ICON_CACHE=OFF + -DWITH_KF5WALLET=$(usex kwallet) + -DWITH_LIBSECRET=$(usex gnome-keyring) + -DWITH_LIBSSH=$(usex ssh) + -DWITH_LIBVNCSERVER=$(usex vnc) + -DWITH_NEWS=$(usex telemetry) + -DWITH_SPICE=$(usex spice) + -DWITH_TRANSLATIONS=$(usex nls) + -DWITH_UPDATE_DESKTOP_DB=OFF + -DWITH_VTE=$(usex ssh) + -DWITH_WWW=$(usex webkit) + -DWITH_X2GO=$(usex x2go) + # when this feature is stable, add python eclass usage to optionally enable + -DWITH_PYTHON=OFF + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] +} diff --git a/net-misc/remmina/remmina-1.4.25.ebuild b/net-misc/remmina/remmina-1.4.25.ebuild new file mode 100644 index 000000000000..8e269e89a576 --- /dev/null +++ b/net-misc/remmina/remmina-1.4.25.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake optfeature xdg + +MY_P="${PN^}-v${PV}" + +DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client" +HOMEPAGE="https://remmina.org/" +SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2+-with-openssl-exception" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf" + +COMMON_DEPEND=" + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libpcre2 + dev-libs/libsodium:= + dev-libs/openssl:0= + net-libs/libsoup:2.4 + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libxkbfile + appindicator? ( dev-libs/libappindicator:3 ) + crypt? ( dev-libs/libgcrypt:0= ) + gnome-keyring? ( app-crypt/libsecret ) + gvnc? ( net-libs/gtk-vnc ) + kwallet? ( kde-frameworks/kwallet ) + rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X] + <net-misc/freerdp-3[X] + cups? ( net-print/cups:= ) ) + spice? ( net-misc/spice-gtk[gtk3] ) + ssh? ( net-libs/libssh:0=[sftp] + x11-libs/vte:2.91 ) + vnc? ( net-libs/libvncserver[jpeg] ) + webkit? ( net-libs/webkit-gtk:4 ) + x2go? ( net-misc/pyhoca-cli ) + zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] ) +" + +DEPEND=" + ${COMMON_DEPEND} + spice? ( app-emulation/spice-protocol ) +" + +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +RDEPEND=" + ${COMMON_DEPEND} + virtual/freedesktop-icon-theme +" + +DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + xdg_environment_reset + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF) + -DWITH_AVAHI=$(usex zeroconf) + -DWITH_CUPS=$(usex cups) + -DWITH_EXAMPLES=$(usex examples) + -DWITH_FREERDP=$(usex rdp) + -DWITH_FREERDP3=OFF + -DWITH_GCRYPT=$(usex crypt) + -DWITH_GETTEXT=$(usex nls) + -DWITH_ICON_CACHE=OFF + -DWITH_KF5WALLET=$(usex kwallet) + -DWITH_LIBSECRET=$(usex gnome-keyring) + -DWITH_LIBSSH=$(usex ssh) + -DWITH_LIBVNCSERVER=$(usex vnc) + -DWITH_NEWS=$(usex telemetry) + -DWITH_SPICE=$(usex spice) + -DWITH_TRANSLATIONS=$(usex nls) + -DWITH_UPDATE_DESKTOP_DB=OFF + -DWITH_VTE=$(usex ssh) + -DWITH_WWW=$(usex webkit) + -DWITH_X2GO=$(usex x2go) + # when this feature is stable, add python eclass usage to optionally enable + -DWITH_PYTHON=OFF + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt] +} diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest index 752baff1f107..728797e4a89b 100644 --- a/net-misc/scponly/Manifest +++ b/net-misc/scponly/Manifest @@ -2,5 +2,5 @@ AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8 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-r7.ebuild 6929 BLAKE2B 6acb6a90fa08450656a9edef983620e89fd0e3f30afdeb3c730d06394be0179d63f1e31f894a84c9d4c21883371518a3ba83669b0065cbfb5c3afbae5327a39f SHA512 13052ec55d53c1d8d919c4e5fb3b781be250d07ea17a9a9f226c694c3c5d3b33019643220db85e723a1bc276c9614a8efe7837b7b2de39a2d03598b1d26c9227 +EBUILD scponly-4.8-r7.ebuild 6930 BLAKE2B cc3831790f8f14c427efe8f277c9ee407df55b3143ce190c4702d42a844b0ab1223d7736b250b1308741860d5eb4f80af9164e6ae31ec83821841f3a56bc2c84 SHA512 ab9b9046df09078d5fd42acd1d8fd0991a2bc049e76de49f28b38d33a285dbc223eb51eadc3eb5627332b00f07a9c913c760aae7d482148497afbe41bd105b95 MISC metadata.xml 1761 BLAKE2B a2fbdcc0e9b89e85180548a97a12eeb27a5d973673451972c32184dfc932d6634950e0620fa2a1e2962d8a08508c31439f9a3e29a6e2a3e4f76d53933ac425e5 SHA512 bdfe9ab129bc9c939850756b23510c91908c21aa417529501b2ada83a30335ce4446f5bbc6dcb728df09e1b27d4cf7ba4eee4f43b96a1b92c0ea476d05ca7592 diff --git a/net-misc/scponly/scponly-4.8-r7.ebuild b/net-misc/scponly/scponly-4.8-r7.ebuild index 67f6348fc896..53455a9f74eb 100644 --- a/net-misc/scponly/scponly-4.8-r7.ebuild +++ b/net-misc/scponly/scponly-4.8-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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/smb4k/Manifest b/net-misc/smb4k/Manifest index ae02bc597bed..80b4698cc980 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1,3 +1,3 @@ DIST smb4k-3.1.1.tar.xz 3185504 BLAKE2B c85007bf205a46f7a0c592556d816ed630b91663e443c4b322a611bd64d9b7dcb7ad6627d8b0d194b4dbb350505d95ef43aceb19d8d7fbd1caa14cb6b638c825 SHA512 2a9035f4bfcf982a084f2de20b1b3a1e0b0ceebb262f89b782dfc0229c80d3d43969b6fae90c20bac96749a958fd1f82f1b5cda423562491cba6e2981a79febf -EBUILD smb4k-3.1.1.ebuild 2035 BLAKE2B fbe0c2911b91a14f400dc5fa9884187ecbe52ec9669d49469b0aa896028a5071710b1ee454da77ce4bf509da4143edf4579dfa5ca25f4ce7b4fb901e8597b275 SHA512 9446b71026812dbb33b0c43ea8c0da39e98ffbeea5c47a9127a795f5cb8a612c1ecb5550ef0aa5ff52a1715705b06a6ff55049f5f8317f92c7bf9339a70e6249 +EBUILD smb4k-3.1.1.ebuild 2042 BLAKE2B 9b4edaddb0f9ef9c333d6df926970f07d2fd02ee08d0e10e770535dace05b6c56324014eba8c0997224793cbabccfe0739b5d3688bb6c887016c6cfd7a3c9567 SHA512 4295a76709306a5d889f1bb223c5cf3dc0462e33dc41c884372fe441d4897d4c31c3ee37b9c0eb3f2556ae254a52fe695d261b9647954d321d596017ae2f4271 MISC metadata.xml 473 BLAKE2B 6d6939d13ca2672154cfe76f878fdacfdfff7e28faf8e8a10a06b81385d7d0805b6dba675a82e6fd4da0cbfd7d6f5828adc0dbb42ecc0d95297a83e8ba5ba42c SHA512 d100a9358ed143b814b40346e055dc6f27f66fb00f2628039ba035d4fe7565a08c0e1e2ea44779f015d3f3abce078074f4f320496cbeee65c1098adf5568f53b diff --git a/net-misc/smb4k/smb4k-3.1.1.ebuild b/net-misc/smb4k/smb4k-3.1.1.ebuild index e64d54449eb4..d3a8b0160e1b 100644 --- a/net-misc/smb4k/smb4k-3.1.1.ebuild +++ b/net-misc/smb4k/smb4k-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="amd64 x86" + KEYWORDS="amd64 ~riscv x86" fi LICENSE="GPL-2" diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest index bc51137c74f6..98e81c8ad5f5 100644 --- a/net-misc/sntpd/Manifest +++ b/net-misc/sntpd/Manifest @@ -1,5 +1,5 @@ AUX sntpd.confd 243 BLAKE2B fc2d82b48e8b57e346ebe5fc65750368b09dce96dadbc159033d7181e9bf0a71794969b24310975b72d10faa22753ca3cc751c03b3f0775aa085f39d87f695f0 SHA512 b2ecb3e96418d36504c8ceab5ec88f7415e7fc32c00bd9fee0eb6fb643f207b5c0e481427e1fdb7a3e52a5bc2619b67363e7c27dd48e67eab61910906b86df3f AUX sntpd.initd-r1 281 BLAKE2B e16573772a24d6c6380dcb769a2f87f73249aff34c4bc6ffa67700374ede21ba318d0d5c0c444f304cbea5feb613a2eb70d07e8aebf5fe291f3da0358becc487 SHA512 38d3950d774132114fe7270c8c39a44428e89372bcdb7833cef75e5775579dc88679b9f167ed29e3e7e620927a0365d2de7c94fb263b414439deb061a8c1db9d DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea -EBUILD sntpd-3.0-r1.ebuild 821 BLAKE2B b570f1fafb14542109ca188078b5921f1dbe386d842625ce7292424a0f27fcefc3e476d8030d63062b4f6c6d8d06688bf64215b9af2740de87d42237f9c304e0 SHA512 6f7f2996d5f7101025dfd2be61fe89048cc69afa1e7e63a6006479374f1c295cd3d8d824aa4d4399096987b27d391a660ab56dde60661a300f254c1580480eb7 +EBUILD sntpd-3.0-r2.ebuild 821 BLAKE2B 30e7f09a477c5c32f17c41b716cee4ac37ff8bf4ff80300ce20bb5bce34c940386765f637a0043654aba1b4b0c9aeb198e4b6bb8fd49cc4cf8e5b09a673a8b7b SHA512 1b42c5cb63c5ca2c539e8a39a02c6bdba8b03ddb26242bcf0eadbec3679cbc394571494d6d6152d5720a04dd5024a263ce096fde1b97eb10bc0b53d2049e4f6b MISC metadata.xml 864 BLAKE2B 792f0d4f6bf3a453966216cab177d3153b4c270817105e10c3e6340293d73320f00871e5efac9344932fbc5e98b85ed50ddf9dbdc0297f3fccca5b53e842de20 SHA512 49614bcd58a7a2d0e596d4ab489f7a9f23be574e4aec3f7911b61cd7a6ac417ac39241c594f2a1111af9a9fe542bd4c24a303009ad9cd9726f4800f09bcc1a77 diff --git a/net-misc/sntpd/sntpd-3.0-r1.ebuild b/net-misc/sntpd/sntpd-3.0-r2.ebuild index 7736ca2eb8bf..f7b2bb80a6a1 100644 --- a/net-misc/sntpd/sntpd-3.0-r1.ebuild +++ b/net-misc/sntpd/sntpd-3.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit systemd diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest index 405665752281..0c012c61642d 100644 --- a/net-misc/socat/Manifest +++ b/net-misc/socat/Manifest @@ -5,6 +5,6 @@ DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01 DIST socat-1.7.4.3.tar.gz 655520 BLAKE2B d91de7ef55332001e6439f64130555b9558338fb9b6c15c91ab5efc8f86a2e7e0f5fe0b292754731a198d83be5f511c3388c65c7c7f559c55691f42703f1849b SHA512 81cb34c245052b6a0ae38a711591358460b6070957af4a9eeb11a3cadb4aff184eeaedabbc7ecdc7fdf21a6126c06f90f19b24a87ce74b30bfd60a3879181046 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834 EBUILD socat-1.7.4.2.ebuild 1502 BLAKE2B 35babb2d5719c566afebb8717ed3fdc92b5c611cb097d46851471d2f2b91eb9c15fe90efe2fb2433b6a88f0ebf41ab36afdaefee581ae91f88572b86f4e382b3 SHA512 db8b77987c12436f8db4a89a6b8cfb8fa1c0e818e7d1f2de14bfab0ef0291cff2ae96e624f9d1deadc14fca56d1a1789c8d032abf45a18095eefd4922a4aa6d8 -EBUILD socat-1.7.4.3.ebuild 1515 BLAKE2B a15a9e95af6614f12b2c206087245e1db166852b60739d553a58c63697ee57c193aa888b4e093de7173402258600744a225863659233814a748ccbb5d87cb070 SHA512 448bfe9d6ba9926d31fc0cdfd42e64d25d7609e799505e7bce6b6cd7464c5d0cf3124997e4ca930d669e68c7a851513577a1d96da342feb6e2753b2f1737b057 +EBUILD socat-1.7.4.3.ebuild 1839 BLAKE2B e3abbce79b31b5f8e3811e5f1d3a4a23778c4701a207828dcd82c9a63de90195e724e4802573e4104da86019b8dac71d197ecf9ff3244bcff1b972830d1e810a SHA512 d0c5e16414d25146f4aaf4a545aecf80666c813be9091ac24cb7be9e5347678bd778630d8dae70b8f79d7fd68a111f31d305e19d6d0545d4b75b515e0b14c9f1 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa diff --git a/net-misc/socat/socat-1.7.4.3.ebuild b/net-misc/socat/socat-1.7.4.3.ebuild index 17478f6a210d..79675ef1a190 100644 --- a/net-misc/socat/socat-1.7.4.3.ebuild +++ b/net-misc/socat/socat-1.7.4.3.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="bindist ipv6 readline ssl tcpd" DEPEND="ssl? ( dev-libs/openssl:0= ) @@ -43,6 +43,12 @@ src_configure() { tc-export AR + # getprotobynumber_r doesn't exist on musl, so avoid probing for it + # and possibly getting it wrong. TODO: fix configure? + # (Grabbed from Alpine Linux: https://git.alpinelinux.org/aports/commit/main/socat/APKBUILD?id=5edc9195355ced3db991c1a7cda5648d52019b11) + # bug #831016 + use elibc_musl && export sc_cv_getprotobynumber_r=2 + econf \ $(use_enable ssl openssl) \ $(use_enable readline) \ diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index 326fd8c9d49d..d212921501f3 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,6 +1,6 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e3f84018622b01f51ea2e1967b83f1016cf9e096e798d914e044598dcf6c41359dc95116152409918d7be800fe686dbdaa2d711ce30b SHA512 54140731f5005d2ccbd41358f499be6dfcdf909606c894c3707f686ba80898595484f2509857608c54d60908dbbb1ef4309ae0673f47d1594eb7b543db39fb45 DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2 -EBUILD spice-gtk-0.39-r2.ebuild 3234 BLAKE2B 20b097d6409033f2b2c72c38290d66b8518716cb4cff151748f33d8fd502bdeff86212dd683f333eaf9c199b6d8796a0a15e2aea6a5ebaf91f665c607db46715 SHA512 258f54764d2c9b1bb7ddad7b4f7a3194aa3fcd098261cca9c54db544d5cd04ed184b17a005ac35efb09ddd000d33e4a912b165a615556a4fb5707427bdd237fa +EBUILD spice-gtk-0.39-r2.ebuild 3233 BLAKE2B 26ab9b4fb049b6896a2e94353de79debe37f8aa93cb56f7f83c885a3ade81bdaff1efd66336da1a045742acdf05d389c2b57fc6e5346b3fc729738e44d8e20b0 SHA512 b4445617911c4b4ae8829c496efc115b1314ede37e078953d08b3417419a5bff2cc4c664cac1aa8a408fe33ce3281b7301b37e702c28c52a691de1480123f94e EBUILD spice-gtk-9999.ebuild 3186 BLAKE2B 3c81547b005ed094146cf9fb8d323bef0d937d9853c105397ec9793420dfdbcfad93fd392de4fe2e4640d1f799f410171646a246040edf297dd944533d0f836a SHA512 8806a1e345db874f7e8a0b701d7c4ec7fc88430312cc98977c776e670e1bb964307167f71ab747ca91ce586ba096219c6cbe107ed6e5c472469c0b47e745577f MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild index af1ce907709d..26009d625fee 100644 --- a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild +++ b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-g LICENSE="LGPL-2.1" SLOT="0" SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav" # TODO: diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest index 7beeee5de297..8c40856ccfcb 100644 --- a/net-misc/spiped/Manifest +++ b/net-misc/spiped/Manifest @@ -3,6 +3,8 @@ AUX spiped.confd 639 BLAKE2B f9def241056bee9ca46de9735fdf9083d3a196476934fe4486b AUX spiped.initd 649 BLAKE2B 2d516af5fc78d7ae13ca79ae8fe24756f484f6b7892d9acaa0a2fb7a62425d66bd2f7172bcc6b396380542bfe496434e70d6a0b93c0c29d3b5e064b41d4bf655 SHA512 6acdf82ca2ed469e3b69813e59628d3148b7c3600b5af74a82d6c715d812b74ed1effd43d7e644d872f1faea4a553e365f36cf054c4727fdc902446f0b89f52a DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a DIST spiped-1.6.1.tgz 115055 BLAKE2B d9ee65c10b183cc8d5451adeb65a728052378811e71ee40d7e6f121c00b6003d4b21cc9402b424aac15d115cdbdc158207ef3e6c60b93fab2a4ba63257fd2f1d SHA512 ec69cb49a19e4e5705526ec74ee683ac3923412bc5ca3a45fc8268699367421cd37354ccc03c18c2d48f06cdb8a4c4bce3ef3b60934997c6770547e02e6f66ae +DIST spiped-1.6.2.tgz 142332 BLAKE2B ce9fe45223eec8bbb741eb3106b17a395347de2766c289def9897321cce9907e104b55752ff3b2c9c7deafd178aaeef1e8fa8afe82c2d25582004c8c92982df6 SHA512 d16262a3e8be876ca1ef1aac8bb38fae91f523a9af0d488eb0dfa23e0b9db795d2a021e55f31095d92f5b94e4516e30ea23f537c3b14a2f1b9871297e26cda76 EBUILD spiped-1.6.0-r1.ebuild 1003 BLAKE2B 3fce5eaa3cc07533440f9217be1573e091bfb5de00252b882295b70c2e9be3daeab8166c56b99e3582cfaac75ccffd18a10ad9cfc8cdfb4e6fc20994a883b5b3 SHA512 2a08557de2bb8b99896b9e71e631b1810082a7ff3bee4adf3dd8b4e4c6f5926d5bdeb69eec82f89a31e06d515170f3d4f5a1433be2a1a135b82691e5dbb35f8d EBUILD spiped-1.6.1.ebuild 986 BLAKE2B a9c5f8d71274ca656cfa4025481a9d47febde9dcddb74e0c80ba9838cbe62b18d2ec582de737b04a9051dfc466fb13dc9b69aa5a60382137486398d4eae9030c SHA512 fbce87341ada6bfd415ad8af242e1c3dde0a64c113ca7d45825d032e07c669d0cb108daac5a4ebe531f6051f02932af9d55ad0bc2aa2a4966edb22e364624ec5 +EBUILD spiped-1.6.2.ebuild 986 BLAKE2B 4bee30784a3261e3dd2f27521fb9a780db4ca043e4b8fb9d197e889cff5b44df050e29c172bec3fe1b41441ef53fc2caffc603c05c9548a204262f977c3aa0c1 SHA512 e5dd789d4ac93a0c37ebff1276723218c0be4de61ffe029e24fb9be5c5af1e415a8afa35018a047cd70555407a72f4375b849eeabd205e11bd80c3c3a36d7d98 MISC metadata.xml 699 BLAKE2B eaaa8b3b267d2f2309f680d94e82f70dc0f7f6c2e9ed834df53009826f889fad860c69184d5b978efcab79d809cf164fd457582100ca23dba6fc3c7d5cbc3e23 SHA512 7f650be8cb2d106c9ed2d9b1f58a27a99be3adb9901b5e0681dae889c8f76150c99005d5595f4348c6188eef4bf4f2cb51f410d6c8f3b9159364b6d78b85ce8c diff --git a/net-misc/spiped/spiped-1.6.2.ebuild b/net-misc/spiped/spiped-1.6.2.ebuild new file mode 100644 index 000000000000..3ec7e11ae171 --- /dev/null +++ b/net-misc/spiped/spiped-1.6.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="secure pipe daemon" +HOMEPAGE="http://www.tarsnap.com/spiped.html" +SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +MY_PN="${PN/d/}" + +DEPEND=" + dev-libs/openssl:0=" + +# Blocker added due to #548126 +RDEPEND=" + ${DEPEND} + !net-mail/qlogtools" + +# Some tests fail. +RESTRICT="test" + +src_compile() { + emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin "${MY_PN}/${MY_PN}" + dosbin "${PN}/${PN}" + + doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1" + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + dodir "etc/${PN}" +} + +pkg_postinst() { + elog + elog "You will need to configure spiped via its" + elog "configuration file located in /etc/conf.d/." + elog + elog "Please have a look at this file prior to starting up spiped!" + elog +} diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest index 2191fc78e2f6..234be5815183 100644 --- a/net-misc/sshpass/Manifest +++ b/net-misc/sshpass/Manifest @@ -1,3 +1,5 @@ DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8 +DIST sshpass-1.09.tar.gz 112857 BLAKE2B b19e1b7d057e286a895312c62453b9aa5369efb3c617bb24fc7b6b0e521d4c65fad091c68b93cda17aef8350c243bdc2c22d5d58590f6359715159d9dca57bae SHA512 9b4ba83ca4d34364e7c43e29f98493dc3d595d24dc68c2fe3c244600d92a0f8bc0a6a7f8f43d64c0b4d714eb196516f297d904fa66035a76dae89a3726c0f2ff EBUILD sshpass-1.06.ebuild 424 BLAKE2B ce3ebfd26ed91f6f178e7b243b0a7606703d3786888f71b124e95550a2a3fb5c62f7c2a81d16fe3866d8e1ca6f8a95535d7152ea79c315c10973528ae6b9e59a SHA512 cf54fa3510ef8fef7445f32f2d62350131362b046a8b45eb129610978d6c8863edb97a2e177108413f345f7ba780c9a532a1a930934dda6fb4958126efc1c364 +EBUILD sshpass-1.09.ebuild 419 BLAKE2B 4ca852abef96b99fec5f67b8fcdd29d403fc4b25862861ccc4d1e6b013f7a11d3babd6381efcf69a4d15cb6a6eab3cc18df776c93415558f4cd400068795a95d SHA512 5239a34c08c58e85086ea913504fa8fd9f197e02f96d367823384d7a1754e204d4c1d11002e961ae85ed8c3be94ae63e194ba7c5f9695632e68976af9f4ad648 MISC metadata.xml 245 BLAKE2B 742dd0549c543a09d1713679990f7aed20165c67c2ecca674c272200e3d4f64d7f1b663d4669792dd476eeb7fc8960e87429f702ee1db96563fb816d3ef8ccee SHA512 f88712849405e0e495d0b476eeeb43814f569db2ec6a24b36ef8065f166c2cc977fbc4c64cf3a7fadf145bedbaa25af2ae3a280e6abaa29a7ad4a010c08f19c5 diff --git a/net-misc/sshpass/sshpass-1.09.ebuild b/net-misc/sshpass/sshpass-1.09.ebuild new file mode 100644 index 000000000000..3c67e44e5496 --- /dev/null +++ b/net-misc/sshpass/sshpass-1.09.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tool for noninteractively performing password authentication with ssh" +HOMEPAGE="https://sourceforge.net/projects/sshpass/" +SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" + +RDEPEND="net-misc/openssh" diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 3347322cc1b1..c663baaca179 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,19 +1,20 @@ AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573ed572b20e9ead1e4ded7d830c739dc172a016784902d447dbe8aa78bb5a2e69c4ef6a4357f446af53f7bc569d56108dac SHA512 533ff06e9619cd63ee83dcb3e6a5a35f02f092b32b194f89e2c06f2f17aaf59a3c2adab27d3e87c4a0773f3f82cfec82492d6b031b3a9050d5f0ad4fcf0a0da0 +AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38 +AUX tigervnc-1.12.0.confd 665 BLAKE2B ee1b7296c221538bf8babb4906bf3a5104501e2fe941a5851216e3a32fa308a63a2c9cfcb081ae39737ae0c566e26b2c4e16fd8d237d0514c78cb68da1fbfd57 SHA512 f9f097cacc43596f18dabb793a8a3f23ab54a460d8e7625aebd253a21a56ff5c736a6ef843355a73fc3fa9317dc83414fe0cb8601bc3ad19e46e8fc1e355046a +AUX tigervnc-1.12.0.initd 2202 BLAKE2B dce7b2c613cc2d2fb11376f9bff23b10e5fbbbb031ffd9bbef1ecc58328026d6a626b75a69f01d4c51ea906ae6ecef8f0e30485cb8ea151b60427991ea857620 SHA512 80a95ea9d053491dc3046ec7fc887d12421086f9d9366e1c6eefc13e04fd2fd2ba692a2f00fcae984f589db1ed0e9bb3fd21f4276df40f55fe83db4ec94d4a8d AUX tigervnc-1.9.0-030_manpages.patch 1978 BLAKE2B c9054f599b503d68d19dab1bd5c588ed19e96f3d547482c10acf84acc81fb59089497d1a282d6f8108132c8ed2fc412af9153c1305d6b04fdecf227c4ad42180 SHA512 dd58ab7987e2e619cc544cae77d7234575dbb812073f730ca0abda24e05c95fcc62449f96472a7962202725d2c9277432cf2289ff930d9841852c858977bf44e AUX tigervnc-1.9.0-055_xstartup.patch 1188 BLAKE2B 99f9371fffd6fdddef86b821152833ea7b24b9d121a51e85e04f1b25411a14f629513ed211b1c13f38f60dc48708db40891f1c36eea6b24e7b239f1e480540fe SHA512 b16cbd2360c6eba6210362d138ff5406f472bd4d81277def69460b846169f49cb3f98d29193c4fbc89d7ab06fb04052c2b94f7ceab6003f2b9b17c5b6c51151c AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4 AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432efa9e741f10d341e1a76e2c2a9780ecc7bdbd4a3e78c6286e9749f24a1d07b768584ad6203931477 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8 AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8ffadacd7c394f0bd5ac82a0d5b6a023c020a5125112807762b5260f07180f591009bd22eeb6d9a1324bae64caca7dd6aaba SHA512 aa980e28568df01f4589c258e293df1499c8d7d8d2e37a0bb52c240efb0fcb45f862f382633c389ba60283b6776e33e642acf3544bb89832bd2980bb80908e30 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d -DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d -EBUILD tigervnc-1.11.0-r4.ebuild 4203 BLAKE2B 6e0640b1a200348f3301485410bfb0c85928efa2729d40a76de2be27e5c7d14115fc775528dd0482dd8fb2d7e16eea4d30c6f5f6b5e09c11e655bea8791f76f8 SHA512 7f91cbac0fecc548d7067c54530de96939d081f7297478cad7f006e72648f2dab2156151250dfa5324fcae50226b1a51300c259564830f84e8dd67325db71748 -EBUILD tigervnc-1.12.0-r1.ebuild 4351 BLAKE2B 94a56781ab0d53c915beb70e2838c1252850e6ddb6b26bd90fe9cf75da6c833d80151a50606a3e427133e371cbebc28c06a38f2a547aff3819a9bd3b26bbcf79 SHA512 26e47d615a53ac060893a62b8410bfe81c4d3321d65a810d956f7f0d06091f90eafef465825c879a166556e3f5495fa39554b556225e4cd644468412632bf203 -EBUILD tigervnc-1.9.0-r2.ebuild 4274 BLAKE2B 976aaba3766e4bbec266086c4e7d6b1e197a810bea4e2e0391d986162aeec60373a7358ec2d951f87aab83ecf6a0b4ba4fcc65a92ace997437e47b5fc015d75c SHA512 bc988f43bf23dde99a675f4510946731a5a896a32a043d08a755fd9a6dc94abc3c347abf496066edd2989bf150f5cd995cb2582354b63e885ed9e6d3fe98c5bf -EBUILD tigervnc-9999.ebuild 4124 BLAKE2B b42f5598fb104540af2635ef7047bc165b6f03eeac365d40e592717edc0bed4ea8e085f675ea6049bc6660e0e23fdcf8b8a66a6cfb55fe6d34489f11bf36a64b SHA512 1201929cb06af2cdc4eef70b4ac4b6b483c566c795a370b365f81ff03af02979f4993fa17ab7e10d11f6e0a18fb13115aaf617fe8238b1ce5959658fb0e03361 +EBUILD tigervnc-1.12.0-r2.ebuild 4836 BLAKE2B f63bdd34a19c69841cf92e267d261c156db4887c9f9cfc11b58e2fff68001ba2e269a9809f652c35cee9886871c60695667b0b080646042e7c9b76075e0f7061 SHA512 d2d1d9086e89b1d40721b688e5441a5ad12f34be1a1da4d71285ee2c64e58bf6b6d7049d384c0e6ba0f7903ec9d1d8c15c4cc12406e0c67d48ef23e60c785645 +EBUILD tigervnc-1.9.0-r2.ebuild 4221 BLAKE2B 5d9ee5be8f6a8b23c62959105a5dafac0db043e6c76462b9c8aa5c1fb9ee56985d08d750f754f030055796980ef3e2987d41af6247bc07431403e5494a0cbd19 SHA512 9937b4ef4d969d329fd04ed372cbc079e4f1f17397cc22d41c08cb464625e9ee6cf6f771cef2e5c6d45e947ebe28851bd45dae08186bcd489c418ff1be8642c0 +EBUILD tigervnc-9999.ebuild 4071 BLAKE2B 77cfd1cb406bd37003946fcf5f658b41b5460ea0ca74277bff9584c8d436af0d1b5a5502bdcfc4a325e00aed2690409c85323beab93c0ce2b97e026dc8b645fe SHA512 cd5a0730258c575324ec64d124fa883ee9823a48ffad0b5d20a3d25c400db8d266a168809de23f85bbd95a30af2a89fa722bffc5b0e48578b8b9e011acffabb2 MISC metadata.xml 471 BLAKE2B 450ab613da6c09763bd4d8ccd873b0c808617e5f9c4a95ecbba0bde24601ffc877db8b81a4290cb7574589329d654ea05eecf77195ac481c209000b7ec314773 SHA512 f6811c2155dc2079293bd335d9c6182a2ebe1853ff666f2c28dfba1141cf4d92e845ee8a99da9799aa08fd8f752e9d1d0fd0de8effac1fda9b19c8e464ee2435 diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch new file mode 100644 index 000000000000..bfcf6ceaef16 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch @@ -0,0 +1,28 @@ +Add more possible paths for Xsession, depending on which display manager is +installed. We need an Xsession that executes its command line parameters, so +leave xinit last. + +See also https://bugs.gentoo.org/746227 + +--- a/unix/vncserver/vncserver.in ++++ b/unix/vncserver/vncserver.in +@@ -437,11 +437,14 @@ + die "$prog: couldn't find \"$cmd\" on your PATH.\n"; + } + +- foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") { +- if (-x "$cmd") { +- $Xsession = $cmd; +- last; +- } ++ $Xsession=$ENV{TIGERVNC_XSESSION_FILE}; ++ if (not defined $Xsession) { ++ foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") { ++ if (-x "$cmd") { ++ $Xsession = $cmd; ++ last; ++ } ++ } + } + if (not defined $Xsession) { + die "$prog: Couldn't find suitable Xsession.\n"; diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd b/net-misc/tigervnc/files/tigervnc-1.12.0.confd new file mode 100644 index 000000000000..a65c991eabcc --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.12.0.confd @@ -0,0 +1,15 @@ +# Config file for /etc/init.d/tigervnc + +# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display". +# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space. +# DISPLAYS="myuser:1" +# Do not forget to add them to /etc/tigervnc/vncserver.users too + +# Optionally override the default Xsession file +# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession" +# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession" +# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession" +# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession" + +# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information. +# VNC_OPTS="" diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd b/net-misc/tigervnc/files/tigervnc-1.12.0.initd new file mode 100644 index 000000000000..59da61eed5f7 --- /dev/null +++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd @@ -0,0 +1,75 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License, v2 or later + +depend() { + need net +} + +checkconfig() { + if [ -n "${DISPLAYS}" ]; then + if [ $1 = "start" ]; then + local user + for user in $DISPLAYS; do + if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then + eerror "There are no passwords defined for user ${user%%:*}." + return 1 + elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then + eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}" + eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" + return 1 + elif [ -e "/tmp/.X${user##*:}-lock" ]; then + eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock" + eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" + return 1 + elif ! grep -E "^[^#]*:${user##*:}=${user%%:*}" /etc/tigervnc/vncserver.users > /dev/null 2>&1; then + eerror "User ${user%%:*} is not defined for display :${user##*:} in /etc/tigervnc/vncserver.users" + return 1 + fi + done + fi + return 0 + else + eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc' + return 1 + fi +} + +start() { + checkconfig start || return 1 + ebegin "Starting TigerVNC server" + for user in $DISPLAYS; do + usrname=${user%%:*} + usropts=VNC_OPTS_${usrname} + usrdisp=${user##*:} + usrvar=$usropts"["$usrdisp"]" + [ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar} + + [ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE + + /usr/libexec/vncsession-start :${user##*:} $vnc_opts &>/dev/null + done + eend $? +} + +stop() { + checkconfig stop || return 2 + ebegin "Stopping TigerVNC server" + for user in $DISPLAYS; do + # vncserver no longer provides a `-kill` option + # killing vncsession does not work, we have to kill Xvnc + # run pstree to see exactly what's going on + sessionpid=`cat /run/vncsession-\:${user##*:}.pid` + serverpid=`pstree -p $sessionpid | grep Xvnc | sed -e 's/^.*Xvnc(// + s/).*$//'` + kill $serverpid &>/dev/null + done + # Do not fail if a server is missing + /bin/true + eend $? +} + +restart() { + svc_stop + svc_start +} diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild deleted file mode 100644 index 34e7e078e373..000000000000 --- a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CMAKE_IN_SOURCE_BUILD=1 - -inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg - -XSERVER_VERSION="1.20.0" - -DESCRIPTION="Remote desktop viewer display system" -HOMEPAGE="http://www.tigervnc.org" -SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz - server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule" - -CDEPEND=" - virtual/jpeg:0 - sys-libs/zlib:= - >=x11-libs/fltk-1.3.1 - gnutls? ( net-libs/gnutls:= ) - nls? ( virtual/libiconv ) - pam? ( sys-libs/pam ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/pixman - server? ( - x11-libs/libXau - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/libXtst - >=x11-libs/pixman-0.27.2 - >=x11-apps/xauth-1.0.3 - x11-apps/xsetroot - >=x11-misc/xkeyboard-config-2.4.1-r3 - xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) - drm? ( x11-libs/libdrm ) - dev-libs/openssl:0= - ) - xinerama? ( x11-libs/libXinerama ) - " - -RDEPEND="${CDEPEND} - !net-misc/tightvnc - !net-misc/vnc - !net-misc/xf4vnc - java? ( virtual/jre:1.8 )" - -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext ) - java? ( virtual/jdk:1.8 ) - x11-base/xorg-proto - media-libs/fontconfig - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - server? ( - dev-libs/libbsd - x11-libs/libxkbfile - x11-libs/libxshmfence - virtual/pkgconfig - media-fonts/font-util - x11-misc/util-macros - >=x11-libs/xtrans-1.3.3 - opengl? ( >=media-libs/mesa-10.3.4-r1 ) - )" - -PATCHES=( - # Restore Java viewer - "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch -) - -src_prepare() { - if use server; then - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die - fi - - cmake_src_prepare - - if use server; then - cd unix/xserver || die - eapply "${FILESDIR}"/xserver120.patch - eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch - sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die - eautoreconf - fi -} - -src_configure() { - if use arm || use hppa; then - append-flags "-fPIC" - fi - - local mycmakeargs=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_NLS=$(usex nls) - -DENABLE_PAM=$(usex pam) - -DBUILD_JAVA=$(usex java) - ) - - cmake_src_configure - - if use server; then - cd unix/xserver || die - econf \ - $(use_enable opengl glx) \ - $(use_enable drm libdrm) \ - --disable-config-hal \ - --disable-config-udev \ - --disable-devel-docs \ - --disable-dmx \ - --disable-dri \ - $(use_enable dri3) \ - --disable-glamor \ - --disable-kdrive \ - --disable-libunwind \ - --disable-linux-acpi \ - --disable-record \ - --disable-selective-werror \ - --disable-static \ - --disable-unit-tests \ - --disable-xephyr \ - $(use_enable xinerama) \ - --disable-xnest \ - --disable-xorg \ - --disable-xvfb \ - --disable-xwin \ - --disable-xwayland \ - --enable-dri2 \ - --with-pic \ - --without-dtrace \ - --disable-present \ - --with-sha1=libcrypto - fi -} - -src_compile() { - cmake_src_compile - - if use server; then - # deps of the vnc module and the module itself - local d subdirs=( - fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render - damageext miext Xi xkb composite dix mi os hw/vnc - ) - for d in "${subdirs[@]}"; do - emake -C unix/xserver/"${d}" - done - fi -} - -src_install() { - cmake_src_install - - if use server; then - emake -C unix/xserver/hw/vnc DESTDIR="${D}" install - if ! use xorgmodule; then - rm -rv "${ED}"/usr/$(get_libdir)/xorg || die - else - rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die - fi - - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} - - systemd_douserunit unix/vncserver/vncserver@.service - else - local f - for f in x0vncserver vncconfig; do - rm "${ED}"/usr/bin/${f} || die - rm "${ED}"/usr/share/man/man1/${f}.1 || die - done - rm -r "${ED}"/usr/{sbin,libexec} || die - rm -r "${ED}"/usr/share/man/man8 || die - fi -} diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild index a00c4d13860f..a87123a7d275 100644 --- a/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild +++ b/net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg +inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg XSERVER_VERSION="21.1.1" @@ -18,7 +18,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule" CDEPEND=" @@ -50,10 +50,11 @@ CDEPEND=" " RDEPEND="${CDEPEND} - !net-misc/tightvnc - !net-misc/vnc - !net-misc/xf4vnc - java? ( virtual/jre:1.8 )" + java? ( virtual/jre:1.8 ) + server? ( + dev-lang/perl + sys-process/psmisc + )" DEPEND="${CDEPEND} nls? ( sys-devel/gettext ) @@ -80,6 +81,7 @@ DEPEND="${CDEPEND} PATCHES=( # Restore Java viewer "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch + "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch ) src_prepare() { @@ -171,10 +173,14 @@ src_install() { rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die fi - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN} + newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN} systemd_douserunit unix/vncserver/vncserver@.service + + # comment out pam_selinux.so, the server does not start if missing + # part of bug #746227 + sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die else local f for f in x0vncserver vncconfig; do @@ -185,3 +191,11 @@ src_install() { rm -r "${ED}"/usr/share/man/man8 || die fi } + +pkg_postinst() { + local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" + + use server && \ + optfeature_header "Install any additional display manager package:" && \ + optfeature "proper session support" ${OPTIONAL_DM} +} diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild index 2b4a80d051da..8b4f9d535a12 100644 --- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild +++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -47,9 +47,6 @@ CDEPEND=" " RDEPEND="${CDEPEND} - !net-misc/tightvnc - !net-misc/vnc - !net-misc/xf4vnc java? ( virtual/jre:1.8 )" DEPEND="${CDEPEND} diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index 8b91a1a47c46..53fc1b9c571d 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -47,10 +47,7 @@ CDEPEND=" xinerama? ( x11-libs/libXinerama ) " -RDEPEND="${CDEPEND} - !net-misc/tightvnc - !net-misc/vnc - !net-misc/xf4vnc" +RDEPEND="${CDEPEND}" DEPEND="${CDEPEND} nls? ( sys-devel/gettext ) diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 8adc32578e06..aca7b05f0f49 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,5 +1,3 @@ -DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 -EBUILD turbovnc-2.2.6.ebuild 2196 BLAKE2B 281b187822a2f5631891f86caa7c137110cc8747aebae4ef16f925afc19531dc9e877e7503f236b33022ea24744dbb34a0a8f61c1839917d6c8fce9b7feff4f0 SHA512 398a0b53b23d3ea0e136f7cd0ee79c509c58b4502e2e687f045c67b740871aac6c27e418b720efd767986c89c9afe68dd4bcc98b70960172112c0cb0381e1fef -EBUILD turbovnc-2.2.7.ebuild 2193 BLAKE2B 39274502936ed7ac2f3337eaa5e942497ed354750d640ee9f6b270ee3a402b2c65e9dd7a3d5ac1cd9b381ed5f4dc78e6757f3a13a33c09df3c215bd0556dbb6d SHA512 eb0d89a65bb65f3940bc11a3c0ccf66c2a56d2c3ef9386922e56ba46ab70c8217fc2531fab90f746ad4c519af19a02597e57a29adbfd0d764ebf36597c616ff3 +EBUILD turbovnc-2.2.7-r2.ebuild 2521 BLAKE2B 20eef8401e0309d888febf26f36129df9d056309849eeffdaadf3f060de60ac5f1ec7b372229a74976bf3c8c882e817d4dfc93476ea5e9c256611c06e0970d32 SHA512 1380c77cf9471add17046b57a1b6a72b141a8ba88eba07b9f81cb69ca71c397626dbd7d92ba73400ea262a7b620b9e49da7d4f364887c0810231b8e79739293f MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9 diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild deleted file mode 100644 index a8390bb0b57c..000000000000 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop cmake java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/" -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ssl gnutls" - -DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0[java?] - sys-libs/zlib - virtual/jdk:1.8 - virtual/opengl - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - !net-misc/tigervnc -" -RDEPEND=" - ${DEPEND} - x11-apps/xkbcomp -" - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # We prefer OpenSSL, so default to that if SSL is enabled - if use gnutls ; then - mycmakeargs+=( -DTVNC_USETLS="GnuTLS" ) - else - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS="OpenSSL" - -DTVNC_DLOPENSSL=OFF - ) - fi - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - - mycmakeargs+=( - -DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar" - -DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use java ; then - java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die - einstalldocs -} diff --git a/net-misc/turbovnc/turbovnc-2.2.7.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild index c7db05f8cba5..5b1a5561d896 100644 --- a/net-misc/turbovnc/turbovnc-2.2.7.ebuild +++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit desktop cmake java-pkg-opt-2 +inherit cmake desktop java-pkg-opt-2 DESCRIPTION="A fast replacement for TigerVNC" HOMEPAGE="https://www.turbovnc.org/" @@ -17,9 +17,9 @@ IUSE="gnutls +ssl" DEPEND=" app-arch/bzip2 media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0[java?] + >=media-libs/libjpeg-turbo-2.0.0:=[java?] + sys-libs/pam sys-libs/zlib - virtual/jdk:1.8 virtual/opengl x11-libs/libfontenc x11-libs/libX11 @@ -29,6 +29,10 @@ DEPEND=" x11-libs/libXfont2 x11-libs/libxkbfile x11-libs/pixman + java? ( + >=virtual/jdk-1.8:* + x11-libs/libXi + ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( net-libs/gnutls:= ) @@ -50,7 +54,7 @@ src_configure() { -DTVNC_SYSTEMX11=ON -DTVNC_SYSTEMLIBS=ON -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON + -DTVNC_BUILDNATIVE=$(usex java) -DXKB_BIN_DIRECTORY=/usr/bin -DXKB_DFLT_RULES=base ) @@ -91,13 +95,18 @@ src_install() { if use java ; then java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png + + # turbovnc does not build this file, it merely copies it from media-libs/libjpeg-turbo + # so let's replace it by a symlink + rm "${ED}/"usr/share/turbovnc/classes/libturbojpeg.so || die + dosym -r "/usr/$(get_libdir)/libturbojpeg.so" /usr/share/turbovnc/classes/libturbojpeg.so fi # Don't install incompatible init script rm -rf "${ED}"/etc/init.d/ || die rm -rf "${ED}"/etc/sysconfig/ || die - find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -print0 | xargs -0 rm || die + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die einstalldocs } diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index 141f63dbc822..64dfb8209ebd 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,5 +1,7 @@ DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6 -EBUILD unison-2.51.3_p20201127.ebuild 2775 BLAKE2B 5171b9656a9d6d7b624875d172f6bc19204973e62ecb9dd1b3c5a1a30f16d42a16ac4a0bab9dcfee89b30e96ea46d2a0d04ddf7d49c79e9b610d2f0232432dfa SHA512 bbdefdaf03776ba61885984dcbeedbf5e01577787228e5ace678405c038f61813c91dd3cdddae420ecf2cdd2d1ee5f94b18f2e90d5cd7541b38c1eadf725a7d4 +DIST unison-2.51.5.tar.gz 1385407 BLAKE2B cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8 SHA512 4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440 +EBUILD unison-2.51.3_p20201127.ebuild 2776 BLAKE2B 5240c18e68dd1b70de7f1665bf26a0b33b4e37386d74f19fe4d7f27599b313257296bdbf111de7052905fab1df82027794f1759cfb177d0da2dd7a439747d3ba SHA512 a7b0ae58acb90554ce29105e998bf2f87acd3581f0b5868cb480da48565aa0458cab7cba08e256d3e0b9471d86ed3b8b918d4501c818f2b556e271d3320b8599 EBUILD unison-2.51.4_rc2.ebuild 2673 BLAKE2B ea6dc6f918957077501fffb8e1a51d57e4315af86765a7a3236c44911e91836f1afe9dcbf7db3d6711e93bee0098f827afe9a0965e31db6441dbe0ed47f7db19 SHA512 fa6ef5f4d5b8009031d8a4608d837827121d149bc76e149f55c13087d4238013955ce20fc28cbe3e7b030281e77d2b1fc25977bc39de3c15a66d92eff30480aa +EBUILD unison-2.51.5.ebuild 2598 BLAKE2B 13b60b077b0e6fd6c8cf04075e679168af54b72c77bbb94a5a79438177bd2b65357a3acea35a6c835c29bbf44fdc80b55212c26211641ea06339960ca8b7d90a SHA512 78fad0d9b8db05b058620c33369fb26a274ff7fa969f43545ae547c0b50db895a3a488462b4a1b32bd61666cf576393341bea1c005cac6ecaa30bd04e955d3da MISC metadata.xml 451 BLAKE2B e84c101fb93728a569747cfd4ba69e4e746bde0ec1154aa940dfb963fe4313f6e37a2725df55d7921139b52ea021d1196592d8323617f084f50c18e4cff7cc32 SHA512 708a52b7f47377099de539ee768951d67e98a8173c6b168547135cfa80fda37c8c26cf9dfee038c76bc5bdabc966652e686f818af35905e58bd17396181c02ea diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild b/net-misc/unison/unison-2.51.3_p20201127.ebuild index 484fcb308f39..4c244d239442 100644 --- a/net-misc/unison/unison-2.51.3_p20201127.ebuild +++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P LICENSE="GPL-2" SLOT="$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" IUSE="debug doc gtk +ocamlopt threads" RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0 diff --git a/net-misc/unison/unison-2.51.5.ebuild b/net-misc/unison/unison-2.51.5.ebuild new file mode 100644 index 000000000000..b378e9c13a3c --- /dev/null +++ b/net-misc/unison/unison-2.51.5.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg-utils + +DESCRIPTION="Two-way cross-platform file synchronizer" +HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ https://github.com/bcpierce00/unison" +SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +IUSE="debug doc gtk +ocamlopt threads" + +BDEPEND="dev-lang/ocaml:=[ocamlopt?] + doc? ( app-text/dvipsk + app-text/ghostscript-gpl + dev-texlive/texlive-latex + dev-tex/hevea + www-client/lynx + )" +DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )" +RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] + || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) + >=app-eselect/eselect-unison-0.4" + +DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) + +QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}" + +src_prepare() { + default + # https://github.com/bcpierce00/unison/issues/416 + sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die + # https://github.com/bcpierce00/unison/pull/415 + sed -e "/myName/d" -i doc/docs.ml || die +} + +src_compile() { + local myconf + + if use threads; then + myconf+=( THREADS=true ) + fi + + if use debug; then + myconf+=( DEBUGGING=true ) + fi + + if use gtk; then + myconf+=( UISTYLE=gtk2 ) + else + myconf+=( UISTYLE=text ) + fi + + use ocamlopt || myconf+=( NATIVE=false ) + + if use doc; then + VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=true docs + fi + + # Discard cflags as it will try to pass them to ocamlc... + emake "${myconf[@]}" CFLAGS="" src +} + +src_test() { + emake test CFLAGS="" +} + +src_install() { + # install manually, since it's just too much + # work to force the Makefile to do the right thing. + local binname + cd src || die + for binname in unison unison-fsmonitor; do + newbin ${binname} ${binname}-${SLOT} + done + + if use gtk; then + newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg + make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}" + fi + + if use doc; then + DOCS+=( ../doc/unison-manual.pdf ) + HTML_DOCS=( "../doc/unison-manual.html" ) + fi + + einstalldocs +} + +pkg_postinst() { + elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}" + elog "in your profile files to access exactly this version over ssh." + elog "Or you can use 'eselect unison' to set the version." + eselect unison update || die + + if use gtk; then + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use gtk; then + xdg_icon_cache_update + fi +} diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest index b4928f9dae91..f7270afc2f8c 100644 --- a/net-misc/vinagre/Manifest +++ b/net-misc/vinagre/Manifest @@ -2,5 +2,5 @@ AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9 AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312 AUX vinagre-3.22.0-gcc10-fno-common.patch 690 BLAKE2B 4f552f190f520fb1e09ae91fb8d88a4c31658f99c4e218df1d2362c8b2c20de1b7d67d04a6846041d26a0eaaf38236823381436c05abb2e293491fde2b17e94a SHA512 f6ec1a339aaf0d8a6a9f663cc51ae10c9a15e6c772dcc978c27a54842e8079d68079f5280cec34942921e4265f8fe94f61af9edc29946b6262d36ad321b6c37d DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f -EBUILD vinagre-3.22.0-r3.ebuild 1773 BLAKE2B 5697a84339a4de18f8ce9c6a21ac255811cc946ca08e2dd9d09e8a4a6f9835b73cc7b6dd23402c33279c97bdf73d8572c544fb3f8fc004105bf65625c8407ac9 SHA512 4993c38d025b4156832b36a747c80d700666c357d8b304ac17f05e3a812cc653de6f73527a0f52f08989d790fe0a185752a627d624009a0fd11102c380a10ea9 +EBUILD vinagre-3.22.0-r3.ebuild 1772 BLAKE2B 82db5f93fb9202bb8a9ae78193387a4579e6b02ef75b32e5fa11b64cb27029cdfe539009941b1f15643b50da3c4b037cb8091b1c8d90ea432cfd5419527860f7 SHA512 aea23a5d170b2e3861f55573d3b66558a29b3bfbee9dc380f21c8106a3a2431fef61b4d925e589960580a408d7e9f3d3165b96944aa0f3cb49ca6fdd3de361bf MISC metadata.xml 551 BLAKE2B 59c0171d54fb7a4ae9f9eb9092dae3a3a933a72d68ffd7ca98b3fe43411ca0150f5283235fd1e13eead8fe39af78286991dce5234bbef6911f6c18acb7fc20e3 SHA512 73064bbb94834be628ac91b7a1da25b068ef9a9b37da2398c9adb8eb2e2513ce8be285d826f658b2f5272d612b589633d153fbf30ab41ceb3def7dd884a65a63 diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild index 0d7b0315a0b9..143a016eb411 100644 --- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild +++ b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" IUSE="rdp +ssh spice +telepathy zeroconf" # cairo used in vinagre-tab diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest index 396c49a6c096..a42832414a58 100644 --- a/net-misc/wget/Manifest +++ b/net-misc/wget/Manifest @@ -1,3 +1,5 @@ DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d +DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718 EBUILD wget-1.21.2.ebuild 2873 BLAKE2B b0ca4fa3105c73c9623e788863cd6c46b6da3d4d2f7f158538a7b5468560648d89bfef1900818ddf64343cc8e5d3675b1324835c30964767b51fab2c94e44e90 SHA512 4c2c0e9751fd37ce85be5c9abfa028f0813d17b7d0c902792406e4a94c30590781d00d243e936fd4a107090921d5ec4023c358e712c84aed44bb99d6982936b9 +EBUILD wget-1.21.3.ebuild 3017 BLAKE2B cff69c528c34440837b4b640048b5a69e8647b08894a8d6f47ba9536a22f38ee0c4ba70090674e227848d8df344dd1921338d2c985bc7abfe0c53a228a4d9a1f SHA512 68f1e27eb77b9d0f142eaae57792c46a3f2e55fdc2d836a199fc433fc201e8fbbf64a1cd7657b8273fa52458db5aebc5a98e080bbd9583df2be56a53f0121349 MISC metadata.xml 740 BLAKE2B 1b36b1f6e8add5fcbbc757974dd8d9f89b4fb62ad1cdde882ec464e2348773e28f923c89259fa56b8d080be1b1975d91c113e4f10553fdd87c3d270bf29c393d SHA512 25e2e34967bd2a04f5aae19849353c798084031888a3aa300a4f9d4ef9029c41a4cc013a842c906dcc2720af155085e047ed99e45a102589f59625bc60042238 diff --git a/net-misc/wget/wget-1.21.3.ebuild b/net-misc/wget/wget-1.21.3.ebuild new file mode 100644 index 000000000000..9dd6a70e4a1b --- /dev/null +++ b/net-misc/wget/wget-1.21.3.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit flag-o-matic python-any-r1 toolchain-funcs + +DESCRIPTION="Network utility to retrieve files from the WWW" +HOMEPAGE="https://www.gnu.org/software/wget/" +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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib" +REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )" +RESTRICT="!test? ( test )" + +# * Force a newer libidn2 to avoid libunistring deps. #bug #612498 +# * Metalink can use gpgme automagically (so let's always depend on it) +# for signed metalink resources. +LIB_DEPEND=" + cookie-check? ( net-libs/libpsl ) + idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) + metalink? ( + app-crypt/gpgme + media-libs/libmetalink + ) + pcre? ( dev-libs/libpcre2[static-libs(+)] ) + ssl? ( + gnutls? ( net-libs/gnutls:=[static-libs(+)] ) + !gnutls? ( dev-libs/openssl:=[static-libs(+)] ) + ) + uuid? ( sys-apps/util-linux[static-libs(+)] ) + zlib? ( sys-libs/zlib[static-libs(+)] ) +" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + app-arch/xz-utils + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( + ${PYTHON_DEPS} + dev-perl/HTTP-Daemon + dev-perl/HTTP-Message + dev-perl/IO-Socket-SSL + ) +" + +DOCS=( AUTHORS MAILING-LIST NEWS README ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die +} + +src_configure() { + # fix compilation on Solaris, we need filio.h for FIONBIO as used in + # the included gnutls -- force ioctl.h to include this header + [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 + + if use static ; then + append-ldflags -static + tc-export PKG_CONFIG + PKG_CONFIG+=" --static" + fi + + # There is no flag that controls this. libunistring-prefix only + # controls the search path (which is why we turn it off below). + # Further, libunistring is only needed w/older libidn2 installs, + # and since we force the latest, we can force off libunistring. # bug #612498 + local myeconfargs=( + ac_cv_libunistring=no + --disable-assert + --disable-pcre + --disable-rpath + --without-included-libunistring + --without-libunistring-prefix + $(use_enable debug) + $(use_enable idn iri) + $(use_enable ipv6) + $(use_enable nls) + $(use_enable ntlm) + $(use_enable pcre pcre2) + $(use_enable ssl digest) + $(use_enable ssl opie) + $(use_with cookie-check libpsl) + $(use_enable idn iri) + $(use_with metalink) + $(use_with ssl ssl $(usex gnutls gnutls openssl)) + $(use_with uuid libuuid) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest index 3c7a888ce399..2760d9afc4e8 100644 --- a/net-misc/wget2/Manifest +++ b/net-misc/wget2/Manifest @@ -4,7 +4,7 @@ AUX wget2-1.99.2-avoid_bashisms.patch 3381 BLAKE2B 4c7c246641e2289811905424e541b AUX wget2-1.99.2-remove_ldconfig_call.patch 768 BLAKE2B 203ad8814f1eba1f671ee4e612851c73bb764c125a4db392c3baf0a1eef05652f883f21d9bf0dc4528fa40cda79edc29f836a27782003bb78f336136fcee1e3a SHA512 75e90ad557cb231aafb5d28f8403c9bdeb2d61f64d10084df20ab077b3fc16cf7bd47d880d04ea6f1db0a09870e7161f5ac644d340ba4526354e62d238b477d3 DIST wget2-1.99.2.tar.gz 3173906 BLAKE2B 1fc63de32725d0d980469cc730d17035a01ccb432a91fe24c37e06017c2604a4ef6d8474e76eb757c3a22cc61ea6c70e26af40dffc474a87f8bbdb2a8deced7c SHA512 c2c687124a2463d6a0397cd7dbbc5e475ba815e8d7e13a4b71b529e6be03c9f7dbe5f358702e929ed36034f6fffc698f3b1c5ac486a35e2b00ee6f135060ad7f DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb -EBUILD wget2-1.99.2.ebuild 2102 BLAKE2B da8f7c03ff6e86568f14e58f23e8d0cb6656bccaa3cff04ffe7c9b1073d5007c598052ee668f6c6e8eacdf80e47ae62a3e30df0453c8ce74b016be3d965669f3 SHA512 cf9b5acba95447cd0c30130052c2ddd9a5316744749fe873ed86b454ab8dec5d692abcbfd70a7c33d89624385ec01114aa629c6daa30629d4d6d18795d04816a -EBUILD wget2-2.0.0.ebuild 1846 BLAKE2B cdfc5e05efe8eb44b4811b55ef0ccf1a9a5808e8ab7dd9b05923377429593456c826663f2031734b44151f66acb35efa4ca9a69ef32e8f1932090ba4ba6774f0 SHA512 743fde071d209c716d97b8e23d03556c8381f5c7344bf3e9a4edce6169b098474d2faedc89026aa594878c8efb3f3ea1d7665d3dfd2f6700207f6501f4bd3d02 -EBUILD wget2-9999.ebuild 2465 BLAKE2B 4f8e2a92d09749432c8384c18d7d086bd292f0b884bb368c15373eafda33475da726cdca86dfbcd378c2b68e9d2b8ca2fa3520e277d4c02ec126204f806a2b5d SHA512 2126f18a018c6dc407058e7eb81bdf2bac5a97f3d36801fba52d5a0d0470696926fc1b9c694b96145171c4405683d20fc26199e28929d4f9a20d1c9ac3e87adb +EBUILD wget2-1.99.2-r1.ebuild 2104 BLAKE2B 38100ac5a73934db345d213d554a8e26e7f3280cccf499b3e47253350b39a307bec1fa1a1f9c58d08f6f3b34b0f2e4d1871e04b583a03a12145922d710fbaa8c SHA512 3ccdf6179507af526a964044c21032c4308f74c26673c0f77ce6926b8e746efb668636e4bfef61b5260cc32e3f73af5a96d4562953b01c6fb6022484dff846ac +EBUILD wget2-2.0.0-r1.ebuild 1848 BLAKE2B 29c9e15fa14842d81817b9638a36a2281175992d9704349f9f718b07c42174b7fc8588a41de668498537890abc3a84a21a896882a88074b5f06b80f657a08567 SHA512 cd96f2efa6b7e03fad24c35d6086110b8524d2a1e5138c561aa5ca418662ae571b61c091b1eb0c2a523a5bb9f960d9cf9c992d6d53437e2b614b6c6a37858bf5 +EBUILD wget2-9999.ebuild 2467 BLAKE2B e74a3d694e56e5ab2459ddb81a2fb128dd22a3124eda17390e9e1a37bdd23b5b68f0c730a634f04df95af8e9121196bebc67a5b9e97d75d129e57119aeda195f SHA512 ae8d7ba174e2ec49914b9034b88ce0bbd166fc87f900094f7f72393a0274f453ca97fb33b93eb2df901dd9570d3194aa4eb46b0ab18b9716c34f2a127061fbaa MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40 diff --git a/net-misc/wget2/wget2-1.99.2.ebuild b/net-misc/wget2/wget2-1.99.2-r1.ebuild index bf81f1f8ebb8..162be638c908 100644 --- a/net-misc/wget2/wget2-1.99.2.ebuild +++ b/net-misc/wget2/wget2-1.99.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ RDEPEND=" ) ) gpgme? ( - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) diff --git a/net-misc/wget2/wget2-2.0.0.ebuild b/net-misc/wget2/wget2-2.0.0-r1.ebuild index facb07871d08..3553f054442f 100644 --- a/net-misc/wget2/wget2-2.0.0.ebuild +++ b/net-misc/wget2/wget2-2.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ RDEPEND=" ) ) gpgme? ( - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild index c35c06da76fa..632bafad63f9 100644 --- a/net-misc/wget2/wget2-9999.ebuild +++ b/net-misc/wget2/wget2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,7 +28,7 @@ RDEPEND=" ) ) gpgme? ( - app-crypt/gpgme + app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest index 067c6d48b210..607eaba5835b 100644 --- a/net-misc/whois/Manifest +++ b/net-misc/whois/Manifest @@ -3,7 +3,9 @@ AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305 DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28 DIST whois-5.5.11.tar.gz 102806 BLAKE2B be1a5f04ee5af4987224151116d1d7e37ad580b8cc00c3fd4752e10b2cbc1dc46a528591cf75e95a83a99884c961f20865802246e00508c90e338590e7e0be37 SHA512 a7e400a727dd88b4c8f1df2e850879ece882b9af1d5daaff22bb3e1c88be01b4e5430f74f9d4afd4c73538d87022536e40d5f3f63a501a95845396fe0be595b4 +DIST whois-5.5.12.tar.gz 103268 BLAKE2B f9e132a0de189ede87342383f4b869529efe4d99ffdb12450ab909f4df135dbab40319b16d889533803783ed7de4a518ff81d267d0939b3040bf2e25bff8b711 SHA512 f46065d6df0dc6f7d33996e33f456cef9b313e025515916e0476c36255df2919e49f2dcb7666b179393a4429572ac7e099c2783d72cff73222953ac093484786 EBUILD whois-5.5.10-r1.ebuild 1941 BLAKE2B e187093a1335885c467d0bed56fa1c0f15d37ef25a9047e6fd6a0ca0550dd7bbe7b792b9d1c7bd3c23b572ae83c7df7749a1b7c02465f845530cb150c800165f SHA512 3ea777e829c31260d1951dd9e3efeff28e33df092600e3f7f5d96a1f4f9cb7154671e6dd9283cc97a7efb7fc2d9174ae7e7f0dfc75afe66a142fabf5de803bd2 -EBUILD whois-5.5.11.ebuild 1948 BLAKE2B 271a234070194fbb397d282dec4d40debb66326f7ea3a3c9fcfbac9b7b01ec651dbc11b7466a7149e3e4d6f50a24b21b6aaf3a4497109fd0d4e5a737f486c063 SHA512 ec926cd93a26c3aeb5db411513922dab3e1ad12013f953c39b126928648c8684385bfd776c04366eeb1204080748c4a598a6fa89b5880a906740d484292ca3c5 +EBUILD whois-5.5.11.ebuild 1941 BLAKE2B 22a19b0e416e2629a0970df690d373d6e0dc5892cdb672d159480c038c50b8b3ed5044e90a1620235feb39d5d20f697388803136c13182627848167d9054f143 SHA512 4f4bc41ac5754e630b3192f3550530e2656000c5d25e9665a8dc1e2dd3adfb3674139339ee2ca3586cdd3e2f70910c795b2aab0d7f63623d0337b40e90dc0b68 +EBUILD whois-5.5.12.ebuild 1916 BLAKE2B 5e5ef953551243c44c07f4b65c962813f7270f55c7e13fb00acecef0b0d933a492f84ba42ee8ef56f8460a9bd0b83432686c2afc548871ee64122482bf327574 SHA512 9009d5360b070d4959c6d3d09b997b0da87a4628e81f85347331571bde1a2a4c03ad88efc3a84f65d29ee59e6c439489381f680f1a2d535cea3790a3a01fa571 EBUILD whois-9999.ebuild 1948 BLAKE2B 7efd9c6f3134692756555b99baab4842abcb92b0ff2b4a67ee049497f1fa4cd987d5f851d399c8a66b4c33398e6992383e6b674435f596b1a285520dbe96923c SHA512 083090b9dd254fd4e8c2bfb082c416e3b122697548071462a701be60d32220fa2e5850109bbc6d9cf45facf7cc2a2bd7351d0768146781ea095a15bc82c0cc84 MISC metadata.xml 439 BLAKE2B 609f61e31ef22ab28f06d9f0b6542a0efbcb8a006b05f14ff6339a332bb3f04996d13c9a62b55765ce4611df0e9efe021b6f5b5060b13d00d72eae71eb9f9e3e SHA512 05bf067e25586b2032b137dae008a4c59aed9e633f37b545d6ccdca6dc3d69d8614d8ad26c34e87d956b93d24b7962c3fe908070dcfd6826c8fe916b51f29d2f diff --git a/net-misc/whois/whois-5.5.11.ebuild b/net-misc/whois/whois-5.5.11.ebuild index c6838bbf6f8a..290ecaecebdc 100644 --- a/net-misc/whois/whois-5.5.11.ebuild +++ b/net-misc/whois/whois-5.5.11.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/whois/whois-5.5.12.ebuild b/net-misc/whois/whois-5.5.12.ebuild new file mode 100644 index 000000000000..7ddebc10e44a --- /dev/null +++ b/net-misc/whois/whois-5.5.12.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_P=${P/-/_} +DESCRIPTION="Improved Whois Client" +HOMEPAGE="https://github.com/rfc1036/whois" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/rfc1036/whois.git" +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" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="iconv idn nls xcrypt" + +RDEPEND="iconv? ( virtual/libiconv ) + idn? ( net-dns/libidn2:= ) + nls? ( virtual/libintl ) + xcrypt? ( >=sys-libs/libxcrypt-4.1:= ) + !xcrypt? ( virtual/libcrypt:= )" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/xz-utils + >=dev-lang/perl-5 + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.7.2-config-file.patch + "${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch + "${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch +) + +src_prepare() { + default + + if use nls ; then + sed -i -e 's:#\(.*pos\):\1:' Makefile || die + else + sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die + + # don't generate po files when nls is disabled (bug #419889) + sed -i -e '/^all:/s/ pos//' \ + -e '/^install:/s/ install-pos//' Makefile || die + fi +} + +src_configure() { :; } # expected no-op + +src_compile() { + unset HAVE_ICONV HAVE_LIBIDN + + use iconv && export HAVE_ICONV=1 + use idn && export HAVE_LIBIDN=1 + use xcrypt && export HAVE_XCRYPT=1 + + tc-export CC + + emake CFLAGS="${CFLAGS} ${CPPFLAGS}" +} + +src_install() { + emake BASEDIR="${ED}" prefix=/usr install + + insinto /etc + doins whois.conf + dodoc README debian/changelog + + if ! use userland_GNU ; then + mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die + mv "${ED}"/usr/bin/{whois,mdwhois} || die + fi +} diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest index d4940bce557a..7cd83724e2bd 100644 --- a/net-misc/wol/Manifest +++ b/net-misc/wol/Manifest @@ -1,4 +1,4 @@ AUX wol-0.7.1-musl.patch 347 BLAKE2B 4ebedc009fb77556004f8bdda8679ca2f0eaca22145aa395a69ce6e78319a6c3fb430bc4ea30c4887dd4e870ad1ff36d7369ec3dc50a419bc5e8ebcdd29ebd7e SHA512 b7568aa53f20a0402aeb9ed579fab2846245df134c000cc4483ce63f01ec64943708595fff9f78c73e6c6156ddd06781314dee46a06c216c9abcd0f1ec696208 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3 -EBUILD wol-0.7.1-r2.ebuild 605 BLAKE2B 01808aadcc0e2f4d3d9c6b74f00a131039905b4564560996fd5b6d3d7c547db0ec2e68486cd50680e08d2b3976889b77d28a7a81450fb0da220d1bc947349192 SHA512 307e2042782eff6d4038dc0995106eb9e2d397f80d8e33e8384058ded9a4300b302d5c0912b83bfcafe24255d6f871a46f68ce7e3aa0070eaea3b084e0d49f4c +EBUILD wol-0.7.1-r3.ebuild 605 BLAKE2B a745251d60a5b7b932aa74f379e16101197c3e4891161ca77f83256dd646a4c107b800262b8f8f6faa70a435fc7541ee9146b0b99a7420bcbe08c5a347a50e6e SHA512 7dce445920605d46ad2f97cb69a9022cd7a5a686c665bb4d8c2bf038b6d58b77796243b349cd6de03258d2c63ca1c1eee69334a13774aa3805177dd893747fd5 MISC metadata.xml 617 BLAKE2B bafbe2d18eaafd5934c3d5f341076bd442700e774068cf8f143310a16b689d3140ee72fa600fc7bdcb638c5972199c96cf5534a8612565ab02192bf06507d422 SHA512 e402abeecb6242c052247d9385e3ebfd8fd8c6cf4f70b95bf244edcd32cd9b2efd0a24be8ece1353f56d51e81acc902148c68043d1ab100cc78a471c6b663dfd diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r3.ebuild index 4c9eb1184f11..4b4ba0165cd9 100644 --- a/net-misc/wol/wol-0.7.1-r2.ebuild +++ b/net-misc/wol/wol-0.7.1-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest index 07c2f3148460..2a73e890fee5 100644 --- a/net-misc/xmrig/Manifest +++ b/net-misc/xmrig/Manifest @@ -1,8 +1,6 @@ AUX xmrig-6.12.2-nonotls.patch 578 BLAKE2B 4d71c8d35be47fd12a019d7b8cb6e1b8787e153ab543b9b1e4079c911671ff886042d90cd439552bf364208d9a4afcc7fe088b50598bbc20e347b532dfc92a2d SHA512 fea6041879c414a4fc6006a413b217801d674f7b5d849d95c119d07e191c5d7a5e99fb959d89974b68be9df132ff480f8492645ba6821b369444b102596b06f3 AUX xmrig.service 946 BLAKE2B 1f3b28f8229183da528ac2b4279dd64b5c6f752720c6bdfe90fa9e127108623e4a577a274527249ee7a13969be97e9b1a4348f7c3e0798839d0ed3ee67b16188 SHA512 77da620627272113e7c77a090536b04cb5a89f4010060ffb21ea1c9edc50e0743f913a70e4fb612c23aeea2b8f1a3f9ce024a434076cf9498cce0b5f801faafa -DIST xmrig-6.16.2.tar.gz 2421650 BLAKE2B a850e7dce19dfec87644b1d8c3f445141fbf9bce2f2fe8176a7c5e528da67417728e9c327a05dbc32ca0b7b5d0536a9d5c19dbe5cdb0106763693574e58c62c0 SHA512 b845ed501e8d9829ceaf9ab31b493997cc489dcedb1eef91624d1cffa9a7e8e5baa4f85653eb40a3f27debe1710f5770df0e582ab6e857386b6d5ac3bb101e67 -DIST xmrig-6.16.3.tar.gz 2422531 BLAKE2B fd98c16c05d2eb14092f6472670b04be5dde645dde85afbbd8aa6075b5b5e4182aa8e7ba40cb85836b871a7abcac0472df3f76984b150b501f92d3d2a4e88e54 SHA512 84b0b2c9a134030e1d5be03d66f4d6fde058ebc2864a1cc70957b600ddf08a4498a9d18fcc6529b9a742e60aac17633e1580202488af69f2acc8114ecc8eb78b -EBUILD xmrig-6.16.2.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4 -EBUILD xmrig-6.16.3.ebuild 1341 BLAKE2B 4fd507e2a632944e37457aaba67f22031fbd7f39409f54b4818aa54606e66f2e72bc879093e1558247db5694add5b3b1963700b9ab7d05933962799d653d60b4 SHA512 4618b630f836af9d623c0b72460546c1f16c7f7d5b2c6db5275fe81a3c7e630670c8b975485dcdba976009b3df16a21cbeabd3a755e3b43cd7d43099a9da4f34 +DIST xmrig-6.16.4.tar.gz 2422895 BLAKE2B bdf4c2ee41b11a5a0d72518aadb71677536dee4ec80af191a337bddb9623e9ec8d0d3f5328732be6246eb08b28f845927ae611e2c8dc66d1b42f1c8f56a3451f SHA512 a66f5d8ef217a4ea31d65c03cc863be694947ce536ca66b0b66f523557fba1651accdc196b6ca1dbc34bd5688041248a3c30e9ee122394207f7e47d82d9e987d +EBUILD xmrig-6.16.4.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4 EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af -MISC metadata.xml 1033 BLAKE2B 9f8e1d1a6e6cc807536149bec4b2b2531a49f1915a3628e5ae9b55f5fd4c85a924403807bc34a8c1a065282c8e5c27cf2f87bae4a90d3b182f5a3a058407a601 SHA512 4e47c4fea9083f5bcfdd53d2a53f04fca9a5cb088b71d28d960d3fbf21a91e153fb99a738a986d7bff6ced690a86333801d3f27d2e6ca69b4445a2fba5a17b62 +MISC metadata.xml 1023 BLAKE2B 207d4db4091e38a612d7bf060ca7f58c97454a03d39b0f49e0968f387a1d97d7624834ea0d010b650fc384ab51550693d90710808516082f14a5d51ecd42b9f4 SHA512 93dd1dc29085b6277a5787515449b67c45753cdd00de5a854522907cec0a59078327074c0f3a8577c1d505b0eb30e63267375b3ccc2cf0dcae697b56d163aa39 diff --git a/net-misc/xmrig/metadata.xml b/net-misc/xmrig/metadata.xml index c01c676279c9..37e999606f7e 100644 --- a/net-misc/xmrig/metadata.xml +++ b/net-misc/xmrig/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>matt@offtopica.uk</email> - <name>Matt Smith</name> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> </maintainer> <maintainer type="person" proxied="yes"> <email>telans@posteo.de</email> diff --git a/net-misc/xmrig/xmrig-6.16.3.ebuild b/net-misc/xmrig/xmrig-6.16.3.ebuild deleted file mode 100644 index 0b726e03276b..000000000000 --- a/net-misc/xmrig/xmrig-6.16.3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner" -HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -LICENSE="Apache-2.0 GPL-3+ MIT" -SLOT="0" -IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl" - -DEPEND=" - dev-libs/libuv:= - hwloc? ( >=sys-apps/hwloc-2.5.0:= ) - opencl? ( virtual/opencl ) - ssl? ( dev-libs/openssl:= ) -" -RDEPEND=" - ${DEPEND} - !arm64? ( sys-apps/msr-tools ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.12.2-nonotls.patch -) - -src_prepare() { - if ! use donate ; then - sed -i 's/1;/0;/g' src/donate.h || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1) - -DWITH_HWLOC=$(usex hwloc) - -DWITH_TLS=$(usex ssl) - -DWITH_OPENCL=$(usex opencl) - -DWITH_CUDA=OFF - ) - - cmake_src_configure -} - -src_install() { - default - keepdir /etc/xmrig - systemd_dounit "${FILESDIR}"/xmrig.service - dobin "${BUILD_DIR}/xmrig" - dobin "${S}/scripts/enable_1gb_pages.sh" - dobin "${S}/scripts/randomx_boost.sh" -} diff --git a/net-misc/xmrig/xmrig-6.16.2.ebuild b/net-misc/xmrig/xmrig-6.16.4.ebuild index 1b72caa1898c..1b72caa1898c 100644 --- a/net-misc/xmrig/xmrig-6.16.2.ebuild +++ b/net-misc/xmrig/xmrig-6.16.4.ebuild diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest index d6c16053c0c0..3010e481c22f 100644 --- a/net-misc/you-get/Manifest +++ b/net-misc/you-get/Manifest @@ -1,5 +1,3 @@ -DIST you-get-0.4.1545.tar.gz 165835 BLAKE2B 171aa72dd7d6dc2b9cb1e88262571e92fdc7c253ab0662b9e0278cdf7a5cb3344fa0f8f3c83a2b000f06a796c54d8860327773f398d43eb2c38b26a2446bab39 SHA512 b8ca69737296cf6b1129f14fc1fa840b977ecec9dbe65b2f59c42fb003b5897806f649821326502917783262e7f59f9b77e6a28d218f40b1c32c4e0d7eaa746d DIST you-get-0.4.1555.tar.gz 165932 BLAKE2B 3342441f653703899396cd7a5255bd4498125b332566a149f4528cdab9981caefbf79f12171f031efea93e4b6859ab0cb7c72a0e28b6fd89308fd7747f0f8668 SHA512 8c5a485334c813ec31bf3e72f7df322503cca900272d9c13f6f10f19576bf0b77fcf595d4a5d97a56c8f69b91ccd5a54c2a44a0ac46cc24ec59bf9af196bf8f0 -EBUILD you-get-0.4.1545.ebuild 496 BLAKE2B f195f50c217391b14ec9c605bdd49d7110429fc63d9a5528031d329d49e6e69baa26aac2d7f529f52a39d6da91a7fc1a403757656596212f918583cb30c178b3 SHA512 7f0976782c2f7b8538b36e5dd4017e175e5fb62fe134985c38940168f01218a396e5e30d2a19e32160a5c752757146d4a822d0a25bfe2fd26460bdf8398e36ac -EBUILD you-get-0.4.1555.ebuild 498 BLAKE2B 1f23752b981f6fc8d8d94350dcbb895f669257c18435773f735c943b5e5632224a55cd49ae47bc393466ea506fb13b64b59dc1eb8adc35b9df5525a76f24bcef SHA512 0267767b9ea66d90d9c7d34a9188e41139e5286e4637dc4ccfff2079cef450b9f0aa388448f9c306d426ab1aaa5ad18cc00775169323612faa0e070d81329ec4 +EBUILD you-get-0.4.1555.ebuild 496 BLAKE2B 1641f39759fcdfe9703a6cf20d245d7f93d0fd8503277eaa3a5572b6876e352a35f451b5212ab1e08accbd4ce8e4a0c12a151389c3f56899f77f3fc0c982060b SHA512 4b2891207ae7b7a335524bc9b0f018fd2d22f620e8e87a41bdd46ccb4cc61476f2edcb126ee82b2f29ded31436c15da467443c22802aa739cda78f24b7dd5aa2 MISC metadata.xml 356 BLAKE2B 318d22fcafcc9dc37f3487eaf71e6090352e7cabc9e8e46631777c63e6767a95eac7dd3d40958501e474b55fa50b61d4203ed1136911b73a7fc67a8ace78aae5 SHA512 da3bc209c98f0165f249f083ddb172d47d5bff2e15b836f9bccbb2083c7b7ad90fde4c355fa981d66f75676b4f7efc37ca7120df9e91b33a6c13a9d5a018d89b diff --git a/net-misc/you-get/you-get-0.4.1545.ebuild b/net-misc/you-get/you-get-0.4.1545.ebuild deleted file mode 100644 index 5b6c971dd42f..000000000000 --- a/net-misc/you-get/you-get-0.4.1545.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -DESCRIPTION="Utility to download media contents from the web" -HOMEPAGE="https://you-get.org" -SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RESTRICT="test" -PROPERTIES="test_network" - -RDEPEND=" - media-video/ffmpeg -" - -distutils_enable_tests unittest diff --git a/net-misc/you-get/you-get-0.4.1555.ebuild b/net-misc/you-get/you-get-0.4.1555.ebuild index c89a16365906..b5695c31eaa0 100644 --- a/net-misc/you-get/you-get-0.4.1555.ebuild +++ b/net-misc/you-get/you-get-0.4.1555.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RESTRICT="test" PROPERTIES="test_network" diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index 5b8186929b5c..984a503d2658 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,4 @@ -DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3 DIST youtube-dl-2021.12.17.tar.gz 3332299 BLAKE2B 5c798ad1f54f06cc42fd9a538536310e1084a02ec96969ff8e85ef0c6487ef54f34d58858512ade8b279929d8ebb9dda48175302fa23af9833c2301daa1d49c2 SHA512 bfc8280703b08f66e1108e9ebd9ab4689f064ac7cef03bd3d1fd2bc64928570e4376e389c9bc188eafdbcd74444cfc8aeccc83ee362ad4f478910efef3573ddb -EBUILD youtube-dl-2021.06.06.ebuild 2135 BLAKE2B 9bd1d02f0ad68eb66930fa6095326f06c0cec70d15d37eccbcb02ca11bb92297e81221ded81c3a569461ff15049457a7a59fee7e2f0f11aa09dac2324a3d87b1 SHA512 d1b3e488591accac80bcae305cab64d896efece4c763fa85c7e1a14fc8a63438299581094a4fc3e3b7b06e6913554ce018a6d417e1aa144121986b46f2564cbc -EBUILD youtube-dl-2021.12.17.ebuild 2141 BLAKE2B 6dd1abc54cbfea6f50eb307182710c6e041becd4ca583c32f01b58d5577dd857bde368a6d97c75ffed3373a510dc07fa66a4f5471d75028e2c6334f68b1e12b1 SHA512 ee9060a1417f5f838d23807f8ec2791c848c67dc4c06a6639f111e2e5419b4076d177b078dfa853cb78e07787bd83442ca56081d44c372651d82172ec7751e58 -EBUILD youtube-dl-9999.ebuild 2133 BLAKE2B 65068df0fabb30083664de67ad5d4416d9cb04595479ca531aa67548314c56920ac0cc7a3b2211a514cf777983115634a68df96ec7e51bed3c1347bd68e03098 SHA512 9dd56361b81ee86ceb5481f8a2d61cc359490702bacd310ae76560df648a920a7a52acfe07c5ab9adc3d77cab256fc71595ba5c8754411c962aead2f4a33457e -MISC metadata.xml 378 BLAKE2B 2affaeab2530f0780ed78dbdf847c1548038514574435673144e39daf96451dba415cf0d4799ec8c2bbd13d425165ebc98858498cfdf74ba62b22aa91bf9d54e SHA512 c8489d7732f8cada555d40cf91ea20481102639531ca06b22a3b1d330f34df5fd9d8727521b283dd6ca66bae70071eceb8d31426c614d28f38170671dace96ea +EBUILD youtube-dl-2021.12.17-r1.ebuild 2427 BLAKE2B 80fb9fcb6f3640b5a86ccebae0f94e4d2882c5f370ca95ba3720e327e4d9d15a68d62199dc594af08f1faf6d3cc0adaf4c0f72112f82b8297cbde281ff0eafea SHA512 db8795e72d4e8d71afde1aeab1b86f8aec048223b1de9ee5d41b287ef47aac44eb3aec3dd8e6df0c70cc00d5415950af268f200bf84e3cdf83967318dd59441e +EBUILD youtube-dl-9999.ebuild 2355 BLAKE2B 22f910febb452f9a8cbdbcc9f47ea1b2290fff7d54816d81728f2d8eaf598414095c90d9f80f4829755aee1a2cb0c2a9cc69852fba55950ebdff6bc4403883ff SHA512 d0ee490003ff8e41ffa244c60155fb4f0ee8e33d2062c341087ecf92039124c8dfb96e0703b842d6f53fef229cce642012f46d291093eeec532660bdac627eb5 +MISC metadata.xml 641 BLAKE2B 8c5454a12949d798a299501d1874d63bd86523460620ad1e00d918e4066a0970f373d442e2eaf22a59179c7712999050bca9c5b5f823d4fbaf840612bbff270e SHA512 38cee113f60292620e333733d686b304b8d17ca74a904e23e4e4cb85d1cd4089af139d358b1ab6cb315ab6cde6bbc13c9569d31ddeb4ff24a5fb57675079119c diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml index 3844b2945c05..1597ae3f0442 100644 --- a/net-misc/youtube-dl/metadata.xml +++ b/net-misc/youtube-dl/metadata.xml @@ -2,12 +2,19 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> <maintainer type="person"> <email>marecki@gentoo.org</email> <name>Marek Szuba</name> </maintainer> <stabilize-allarches/> + <use> + <flag name="yt-dlp">Use <pkg>net-misc/yt-dlp</pkg> to provide the command and only install the python module</flag> + </use> + <upstream> + <remote-id type="github">ytdl-org/youtube-dl</remote-id> + <remote-id type="pypi">youtube_dl</remote-id> + </upstream> </pkgmetadata> diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild deleted file mode 100644 index c397d925fb6d..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -S=${WORKDIR}/${PN} - -LICENSE="public-domain" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -SLOT="0" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] -" - -distutils_enable_tests nose - -src_prepare() { - sed -i -e '/flake8/d' Makefile || die - distutils-r1_src_prepare -} - -python_test() { - emake offlinetest -} - -python_install_all() { - doman youtube-dl.1 - - newbashcomp youtube-dl.bash-completion youtube-dl - - insinto /usr/share/zsh/site-functions - newins youtube-dl.zsh _youtube-dl - - insinto /usr/share/fish/vendor_completions.d - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - if ! has_version media-video/ffmpeg; then - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need media-video/ffmpeg." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. ${PN} will detect whether" - elog "ffmpeg is present and automatically pick the best option." - fi - if ! has_version media-video/rtmpdump; then - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when media-video/rtmpdump is installed." - fi - if ! has_version media-video/mplayer && ! has_version media-video/mpv; then - elog - elog "Downloading MMS and RTSP videos requires either media-video/mplayer" - elog "or media-video/mpv to be installed." - fi - if ! has_version media-video/atomicparsley; then - elog - elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails" - elog "from the metadata into the resulting MP4/M4A files." - fi -} diff --git a/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild new file mode 100644 index 000000000000..cbae1a3e9ecc --- /dev/null +++ b/net-misc/youtube-dl/youtube-dl-2021.12.17-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +inherit bash-completion-r1 distutils-r1 optfeature + +DESCRIPTION="Download videos from YouTube.com (and more sites...)" +HOMEPAGE="https://youtube-dl.org/" +SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" +IUSE="+yt-dlp" + +RDEPEND=" + dev-python/pycryptodome[${PYTHON_USEDEP}] + yt-dlp? ( >=net-misc/yt-dlp-2022.2.4-r1 ) + !yt-dlp? ( !net-misc/yt-dlp )" + +distutils_enable_tests nose + +python_prepare_all() { + distutils-r1_python_prepare_all + + sed -i '/flake8/d' Makefile || die +} + +python_test() { + emake offlinetest +} + +python_install_all() { + dodoc AUTHORS ChangeLog README.md docs/supportedsites.md + doman youtube-dl.1 + + newbashcomp youtube-dl.bash-completion youtube-dl + + insinto /usr/share/zsh/site-functions + newins youtube-dl.zsh _youtube-dl + + insinto /usr/share/fish/vendor_completions.d + doins youtube-dl.fish + + rm -r "${ED}"/usr/{etc,share/doc/youtube_dl} || die + + # keep man pages / completions either way given they are useful + # for yt-dlp's compatibility wrapper which tries to mimic options + use !yt-dlp || rm -r "${ED}"/usr/{lib/python-exec,bin} || die +} + +pkg_postinst() { + optfeature "converting and merging tracks on some sites" media-video/ffmpeg + optfeature "embedding metadata thumbnails in MP4/M4A files" media-video/atomicparsley + optfeature "downloading videos streamed via RTMP" media-video/rtmpdump + optfeature "downloading videos streamed via MMS/RTSP" media-video/mplayer media-video/mpv + + ewarn "Note that it is preferable to use net-misc/yt-dlp over youtube-dl for" + ewarn "latest features and site support. youtube-dl is only kept maintained for" + ewarn "compatibility with older software (notably its python module, yt-dlp has" + ewarn "a 'bin/youtube-dl' compatibility wrapper but not for the module)." + + if use yt-dlp; then + ewarn + ewarn "USE=yt-dlp is enabled, so said compatibility wrapper will be used. Man pages" + ewarn "and completions for youtube-dl were still installed but may have slight usage" + ewarn "differences and does not read the same configuration files. It is recommended" + ewarn "to use the yt-dlp command directly instead." + fi +} diff --git a/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild b/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild deleted file mode 100644 index 140eed0ebc77..000000000000 --- a/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" -SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" -S=${WORKDIR}/${PN} - -LICENSE="public-domain" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -SLOT="0" - -RDEPEND=" - dev-python/pycryptodome[${PYTHON_USEDEP}] -" - -distutils_enable_tests nose - -src_prepare() { - sed -i -e '/flake8/d' Makefile || die - distutils-r1_src_prepare -} - -python_test() { - emake offlinetest -} - -python_install_all() { - doman youtube-dl.1 - - newbashcomp youtube-dl.bash-completion youtube-dl - - insinto /usr/share/zsh/site-functions - newins youtube-dl.zsh _youtube-dl - - insinto /usr/share/fish/vendor_completions.d - doins youtube-dl.fish - - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die -} - -pkg_postinst() { - if ! has_version media-video/ffmpeg; then - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need media-video/ffmpeg." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. ${PN} will detect whether" - elog "ffmpeg is present and automatically pick the best option." - fi - if ! has_version media-video/rtmpdump; then - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when media-video/rtmpdump is installed." - fi - if ! has_version media-video/mplayer && ! has_version media-video/mpv; then - elog - elog "Downloading MMS and RTSP videos requires either media-video/mplayer" - elog "or media-video/mpv to be installed." - fi - if ! has_version media-video/atomicparsley; then - elog - elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails" - elog "from the metadata into the resulting MP4/M4A files." - fi -} diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild index 14727bf79b6b..284776e3ee5c 100644 --- a/net-misc/youtube-dl/youtube-dl-9999.ebuild +++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild @@ -1,32 +1,34 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 distutils-r1 git-r3 +inherit bash-completion-r1 distutils-r1 git-r3 optfeature DESCRIPTION="Download videos from YouTube.com (and more sites...)" -HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/" +HOMEPAGE="https://youtube-dl.org/" EGIT_REPO_URI="https://github.com/ytdl-org/${PN}.git" -LICENSE="public-domain" +LICENSE="Unlicense" SLOT="0" +IUSE="+yt-dlp" RDEPEND=" dev-python/pycryptodome[${PYTHON_USEDEP}] -" + yt-dlp? ( >=net-misc/yt-dlp-2022.2.4-r1 ) + !yt-dlp? ( !net-misc/yt-dlp )" distutils_enable_tests nose -src_prepare() { - sed -i -e '/flake8/d' Makefile || die - distutils-r1_src_prepare -} +python_prepare_all() { + distutils-r1_python_prepare_all -src_compile() { - distutils-r1_src_compile + sed -i '/flake8/d' Makefile || die +} +python_compile_all() { emake youtube-dl.{bash-completion,fish,zsh} } @@ -35,7 +37,8 @@ python_test() { } python_install_all() { - # no manpage because it requires pandoc to generate + dodoc AUTHORS ChangeLog README.md docs/supportedsites.md + #doman youtube-dl.1 # would require pandoc in live ebuild newbashcomp youtube-dl.bash-completion youtube-dl @@ -45,33 +48,27 @@ python_install_all() { insinto /usr/share/fish/vendor_completions.d doins youtube-dl.fish - distutils-r1_python_install_all - - rm -r "${ED}"/usr/etc || die - rm -r "${ED}"/usr/share/doc/youtube_dl || die + # keep man pages / completions either way given they are useful + # for yt-dlp's compatibility wrapper which tries to mimic options + use !yt-dlp || rm -r "${ED}"/usr/{lib/python-exec,bin} || die } pkg_postinst() { - if ! has_version media-video/ffmpeg; then - elog "${PN} works fine on its own on most sites. However, if you want" - elog "to convert video/audio, you'll need media-video/ffmpeg." - elog "On some sites - most notably YouTube - videos can be retrieved in" - elog "a higher quality format without sound. ${PN} will detect whether" - elog "ffmpeg is present and automatically pick the best option." - fi - if ! has_version media-video/rtmpdump; then - elog - elog "Videos or video formats streamed via RTMP protocol can only be" - elog "downloaded when media-video/rtmpdump is installed." - fi - if ! has_version media-video/mplayer && ! has_version media-video/mpv; then - elog - elog "Downloading MMS and RTSP videos requires either media-video/mplayer" - elog "or media-video/mpv to be installed." - fi - if ! has_version media-video/atomicparsley; then - elog - elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails" - elog "from the metadata into the resulting MP4/M4A files." + optfeature "converting and merging tracks on some sites" media-video/ffmpeg + optfeature "embedding metadata thumbnails in MP4/M4A files" media-video/atomicparsley + optfeature "downloading videos streamed via RTMP" media-video/rtmpdump + optfeature "downloading videos streamed via MMS/RTSP" media-video/mplayer media-video/mpv + + ewarn "Note that it is preferable to use net-misc/yt-dlp over youtube-dl for" + ewarn "latest features and site support. youtube-dl is only kept maintained for" + ewarn "compatibility with older software (notably its python module, yt-dlp has" + ewarn "a 'bin/youtube-dl' compatibility wrapper but not for the module)." + + if use yt-dlp; then + ewarn + ewarn "USE=yt-dlp is enabled, so said compatibility wrapper will be used. Man pages" + ewarn "and completions for youtube-dl were still installed but may have slight usage" + ewarn "differences and does not read the same configuration files. It is recommended" + ewarn "to use the yt-dlp command directly instead." fi } diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest index 2312295f6520..f35357e4dde1 100644 --- a/net-misc/yt-dlp/Manifest +++ b/net-misc/yt-dlp/Manifest @@ -1,5 +1,5 @@ -DIST yt-dlp-2021.12.27.tar.gz 2102852 BLAKE2B 69a3a9c916771ab2e1b8f86bbc43e03d0543801f587708b638348088d4454aff8ac93420fd8bd2ebb4f493c74acdf23f08a9495dbcdad77d840a95cfece4aa6b SHA512 2c687493736fabe131481d6bf8df13afc1959ac1458675bfe3c4273df7bb64218f84e07ea324b664b0a52c3e39b3e10999e81bc907bfc98a71a28c92dca90737 -DIST yt-dlp-2022.1.21.tar.gz 2160713 BLAKE2B 30ed1c7a317318ca6a6ee183ba8e4396420eb090ddacc64ddde2bb4077c7c45b01c00caca90d1b8be501f90c71407e27d6ef847fdbfea8bed488771f9b59bbe1 SHA512 5844d49dbf50842d4d51dbb00c16efea816322888d16a8dbce16f976f0dd1625ec8243fcdc07e721180a2f02cf14ebaa0d83a1437e331b4aa68c404db3f1e9f4 -EBUILD yt-dlp-2021.12.27.ebuild 2008 BLAKE2B 289ee6fd98fd60002e19aa82c706dc67f72a61c26b82fab1ec6cd9bf9d9461f8373473bfaf1c1be6931d0fcf98283c9868522c1b6fa805be3cb159e58985642c SHA512 cdd1d4390e74f2463a37db297b40ea0ba50c7676a364db00292242ea16a2488900d3f87a7db77724fd0d39cadc22c2b165766353d66f85af80d210ef61f817c9 -EBUILD yt-dlp-2022.1.21.ebuild 2008 BLAKE2B 44e2cbc30a11378f587290b6f259ad5dde2bd59e62f7f85e8fa569edeb152bd31f1af78d5d47a33bd87866904f0d71626f1d8c2aeb75ebea97badc21c69ddda9 SHA512 7a44de9098a8e3ac0296b71b28fa90ba81de9318e4750b5acb7aa318d32afbdfb84332ee6fee05554c57068fd8fd18035ebb0a4a64cf675793e5209832b2e57c -MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff +DIST yt-dlp-2022.2.4.tar.gz 2178642 BLAKE2B 2e6c11bb9fbc30b725dc26db727500c33af944d16fbc46be8fb35a75ab4f5c09ca0c8754f075b9739ca9d47e9b409f8d533c03b417217344f8cac1ec45968b51 SHA512 6bb6bee6f748147a566394bbe0b69781ab415398582cb8e88a49b61a5dd106e666b0429c8f4f6483bc4af0363e88eb95c5159457b7049cc11a2c99a6495c6895 +DIST yt-dlp-2022.3.8.2.tar.gz 2454754 BLAKE2B f07c1eb8d0e1f936298d6516e518f366558107ba9ae65f7c0b52bdcd185b27e501d0d0ffb20e923a94ce5f42c88ae335069876946c411232b9dfc1309ae796ca SHA512 bd6c105f65415e2229781bb1e859167686a5f5f6886e98f9693acc127d4f9124aa2d55f32835f82509f6ab5a82601a5d612ac608063ef9041769fa91e3539c44 +EBUILD yt-dlp-2022.2.4-r1.ebuild 1879 BLAKE2B a4f026c2eb61101e4e14071db83f5e65da5b64dafab6ff9d9e76b8c0be966d772e440f30d976837da4e3956d3ade0de20a87052e85662be3ec7ba35c924498a6 SHA512 3a56e71fdda3e3926acde444a0d0c43184924bf89032c95da92cb1db8d7e6b2d5f6a67a65c6cd958de3a53dfd53ef022a07b9631c43691d451e9be4717a2efdd +EBUILD yt-dlp-2022.3.8.2.ebuild 1877 BLAKE2B b682b846467304818b83ebadee7a23701f1802a70f2e8e7a3e656dda920c2544e60fbf5b99563bc1011fda1d63c52cc311c9471d35ad5231da822c5fc4e0bc52 SHA512 27e1676e2d53594e8441570bfe0eaaf2faed67c73a430a959da43cf42e39971f592bcdd3d7d09101993511246f02c06424c547fb9b4423444f9a4ccf75d120c5 +MISC metadata.xml 505 BLAKE2B 520725078c47caf245904b10aab8929bf9a9a357a70315fda67e7dd59b77cb0c1614e7de03029772288aefa76678c7c4c97c7153364552f5ebe0f951df651e9f SHA512 af72cc5782fe5ed5a6748dcd7ebe7c9393ff7a9ad6d5a1a3a8c2824d323e86f1a97036745570790898fe9a51047601f9a4d95befc0e02b8c16822b7cc94e0734 diff --git a/net-misc/yt-dlp/metadata.xml b/net-misc/yt-dlp/metadata.xml index 1fbaa63f2ecb..0d02b5cb9e5f 100644 --- a/net-misc/yt-dlp/metadata.xml +++ b/net-misc/yt-dlp/metadata.xml @@ -12,5 +12,6 @@ <stabilize-allarches/> <upstream> <remote-id type="github">yt-dlp/yt-dlp</remote-id> + <remote-id type="pypi">yt-dlp</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/yt-dlp/yt-dlp-2022.1.21.ebuild b/net-misc/yt-dlp/yt-dlp-2022.2.4-r1.ebuild index a9f9a75ef095..e7e396f5eace 100644 --- a/net-misc/yt-dlp/yt-dlp-2022.1.21.ebuild +++ b/net-misc/yt-dlp/yt-dlp-2022.2.4-r1.ebuild @@ -12,11 +12,11 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" LICENSE="Unlicense" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86" RDEPEND=" dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl" + !net-misc/youtube-dl[-yt-dlp(-)]" distutils_enable_tests pytest @@ -33,13 +33,6 @@ python_test() { epytest -m 'not download' -p no:markdown } -python_install() { - distutils-r1_python_install - - local sitedir=$(python_get_sitedir) - dosym yt_dlp "${sitedir#${EPREFIX}}"/youtube_dl -} - python_install_all() { dodoc README.md Changelog.md supportedsites.md doman yt-dlp.1 diff --git a/net-misc/yt-dlp/yt-dlp-2021.12.27.ebuild b/net-misc/yt-dlp/yt-dlp-2022.3.8.2.ebuild index f6633c012f81..15fd9ad97135 100644 --- a/net-misc/yt-dlp/yt-dlp-2021.12.27.ebuild +++ b/net-misc/yt-dlp/yt-dlp-2022.3.8.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) inherit bash-completion-r1 distutils-r1 optfeature @@ -12,11 +13,11 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz" LICENSE="Unlicense" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~x64-macos" RDEPEND=" dev-python/pycryptodome[${PYTHON_USEDEP}] - !net-misc/youtube-dl" + !net-misc/youtube-dl[-yt-dlp(-)]" distutils_enable_tests pytest @@ -24,22 +25,15 @@ python_prepare_all() { distutils-r1_python_prepare_all # adjust requires for pycryptodome and optional dependencies (bug #828466) - sed -ri setup.py \ - -e "s/'(pycryptodome)x'/'\1'/" \ - -e "s/'(mutagen|websockets)',?//g" || die + sed -ri requirements.txt \ + -e "s/^(pycryptodome)x/\1/" \ + -e "/^(brotli.*|mutagen|websockets)/d" || die } python_test() { epytest -m 'not download' -p no:markdown } -python_install() { - distutils-r1_python_install - - local sitedir=$(python_get_sitedir) - dosym yt_dlp "${sitedir#${EPREFIX}}"/youtube_dl -} - python_install_all() { dodoc README.md Changelog.md supportedsites.md doman yt-dlp.1 @@ -65,8 +59,7 @@ pkg_postinst() { has_version media-video/atomicparsley || # allow fallback but don't advertise optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen - if [[ ! ${REPLACING_VERSIONS} ]] || - ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; then + if [[ ! ${REPLACING_VERSIONS} ]]; then elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed' elog 'as "youtube-dl". This is strictly for compatibility and it is' elog 'recommended to use "yt-dlp" directly, it may be removed in the future.' diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest index 131f34959820..cd264a1f01b9 100644 --- a/net-misc/ytfzf/Manifest +++ b/net-misc/ytfzf/Manifest @@ -1,3 +1,3 @@ -DIST ytfzf-2.1.tar.gz 3230643 BLAKE2B b296048c976c260b3192f770bdf2dec99f5ad45066deeac23429808254552ea125ea8a8d129c47a5110916c4194f7b7742dd01f095809f4913077600a8205d4b SHA512 a86203bc1dffd05ff3543c44d5612bc8b0ffc675ce0484499cb89aa88c2618c88e832dd95ff2cd6f1803698c1c3264709a1e280ddbb9fb0985c0178f3adc16ea -EBUILD ytfzf-2.1.ebuild 1446 BLAKE2B 6dea43c53ca9eece6a40cd01eac6b332df2c9035f8f2dc1ec901786e119767f6c382a3b228f75086a7c301f7dd42f65cdd467f139fe2f856567573c83a215194 SHA512 39cc4b5c03c8e417dd093d5052375dde09203a2b7a635049fe7cbc4c1047b43061ff13db0962207495dcc15b0d8c2a94e8cf4cc8655289ca8c32ccf94c542256 +DIST ytfzf-2.2.tar.gz 3242266 BLAKE2B 7bc6317ea2ee67ca1d93acc5262d5ebc7f6c9828531f1b97d1fd8e4cfb9e9328cf9955da993d59dcfe05a1a983106cf98f3c93ab4b2c007458154f860e333b55 SHA512 9f47da0e56d096d248b14387c3e34f11cc101fa958945e17bdee83d81c2da57faf384fe87d46132e4cc78a5f4f6057462e28c1a64ea647a98120c37ed4e7f50d +EBUILD ytfzf-2.2.ebuild 1564 BLAKE2B dd76cdd455ad3afa7470a824bff1eb04c7808dd1ec8a75cb91077eea0c6116490300998881e74a3f66c8c5c3a32b8606bfe5f98b4266df54fc66c72e7a26d7f9 SHA512 c538fe597e9d9c1261333ee1c6c840ea4816abcdfc634a5c153281a106a3ac633142979891e9b48adba4b94e1e1b286025f072390dc712ee9fdc69d06eeeabce MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884 diff --git a/net-misc/ytfzf/ytfzf-2.1.ebuild b/net-misc/ytfzf/ytfzf-2.2.ebuild index c11320bd52ab..1a6d408ced73 100644 --- a/net-misc/ytfzf/ytfzf-2.1.ebuild +++ b/net-misc/ytfzf/ytfzf-2.2.ebuild @@ -26,6 +26,12 @@ RDEPEND=" net-misc/yt-dlp )" +src_prepare() { + default + + sed -i "/^: ...YTFZF_SYSTEM_ADDON_DIR/s|/usr/local|${EPREFIX}/usr|" ytfzf || die +} + src_compile() { :; } src_install() { @@ -35,7 +41,7 @@ src_install() { DOCDIR="${EPREFIX}"/usr/share/doc/${PF} ) - emake "${emakeargs[@]}" doc install + emake "${emakeargs[@]}" addons doc install einstalldocs rm -r "${ED}"/usr/share/licenses || die |