Sync with portage [Mon Aug 10 09:33:08 MSK 2020].

master
root 4 years ago
parent ea2cc974c4
commit 57e23fa16d

@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
MANIFEST Manifest.files.gz 29448 BLAKE2B f4ab650d96ef44f47e0a08d288ff196178480c1a2f763da938f2cbe3fc55f7e5e1dd61288f1f9bca0998a3268c8165a9c68c3ebddac12404770b864db50f8e00 SHA512 341d5ab953eea60f98e3838c860bf29f790cc5bb2a3fdcd7b8e529ceb3288eb21cf490da59a2f89f21f0964159f30ba222bc629c661cb868b58b547814979a16
TIMESTAMP 2020-08-08T17:08:29Z
MANIFEST Manifest.files.gz 29457 BLAKE2B 1d55dfa4a8574c11582ffc11f6c39f8faf1637fc9fca86dbfa3bb0b90f87009633edd889d7e5f9e6a1f36115dffb4f5192c893093aecb2dd20925419f61ff101 SHA512 afdd0b1accea1b3331bf2f84b51be307e74809c1fa7308347b75c926eba832227afdd32b43b8c296e4ce325ff1bdb7044839a6e18da1d00fcb56ca951671de12
TIMESTAMP 2020-08-10T05:38:26Z
-----BEGIN PGP SIGNATURE-----
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8u3A1fFIAAAAAALgAo
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8w3VJfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
klDuIQ//Zcb/Xzw55GlckDpibpI5CVmI+NLpXVbOgAbIi4VMEdTt07bcmEmfaLDC
r9Vg1jr5KsKARJy1kIwVXEJtyUguuNt6raHBHX1GGcdgl4j/wf9zFWZ4lz7OOge/
2vCZpolVuis8Kp/gSSpmAE4moklSg5C3XyTpLkGm7aqx+wOcZ8RBaI02LafebI/p
iyIKD+cRDeiz9Rj3rwejqC4xkxhZ4PwgqSh/2fSOxhriritt0Z42QQ7t8fPge6qH
GZ9NNJZVplry/Wz2C8aJD/almocZD/HqCwXxp6b1xq4ZA2N6f68zjqfhlwUCvTEh
+KG0CVreIkPvHzUockppcWPYHlMbUSp93xZzslQyRK+jHURCDJifp4+78AagsVjm
0LNYxFgogdZwK9doV4J7xvlSxV/sSwPL0svkqN6SaHmyTjF+TtAukMXg6NbJvUAj
FAjsnIPyTKRQQQsBa/lFA+Ws3DOZOofY+MvIxw47wDJRGS3yoXgJd+oPooaPu2xt
W1wQ01AY9W2SxH9Ty2Wjc2S0puVmeau3sxVTmArJdqhqD+b835WSTqdJ4JuBCtHo
Rjx11LSWZBKHw2sye/UVKW1ga1rMfG6yjjPs6seCdfKympsGGQ1LZp7gFdrcVCVh
Y65srY8u6V1MaO8AMrzFS4Rl08qzxYk4aMm+0SImSGjZRAldhO0=
=aOaT
klDQuQ/+LsEmdYj+mXyQQJi9AoS2jlfYOOU2zroENyIE1+y7TQ2Sq9QR1XZtpzh7
e2JnZPArA192pShIj0DNrtQVP/XoSQkmnh924ZHEM9l5V8o3zk601WfOWLMXhYqN
DkVosEp+tyQRyLp9U8iM5LbzFTCrWHMwTkF9vmUDpb1ydydOBTzOobc8ny1QEPlO
VLsrtzlte4jRVMa0jsYR0jEogAdhfJj3181IA6mt6+/RiajVIioaHl+bd93+0j+d
KdPop1CIg3fKBfE2Clan8UUSS+a+0/oqoxiPmpIKZwKbhR1RfFc/3DL6hTjeACnq
xE9I0bHmQaoaAaX1x1ht7QXMzxu/Yc9I9oC+/X+Fmm8FEjG5o+rVYryVlZL4Om57
JCXRnlBhsGbnCV0H7EURDjxlVWkQBIZOcQFFhIMKSJH8fPfcrEWGP4l3sXD+d80m
XD0vTLcX6xpW/nOMcJy3sCnCVxHVWlSpr3iNyKNr15Q/Y7IGDfKOoQL5aHC78Ic9
4270HD601XAr0jf84nkNSX7YotErYx+DOwMrwhVdwMRu3UW5JpTcDAId5ym/JzNT
eVY8Vm+cKxvRtKCBwVuD4kXZXQQNXfYzL1EdYODqkiNFIk2m2suZZSOyCErZAkWW
TSHiSO2WeeRxUAHwMvNuSqTgZ0VOL+JM1J0sQGyGXILdkGbo6Eg=
=Ya11
-----END PGP SIGNATURE-----

Binary file not shown.

Binary file not shown.

@ -4,5 +4,5 @@ DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf54
DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
EBUILD apache-tools-2.4.41.ebuild 2552 BLAKE2B bc670330d77922c330dbd5daffe6377d71e4842ad61825de0bb34a2c9f77767ce540fc2372fbb91eb1ab83e9b01f469b87bb4667393fccb4a939b4099b600100 SHA512 26bae9a18cd88d274412a224be8e07c15685da56024b0c747d0c738a6d17e2f132032d2867e9f6530470d39ccabe2922406455c722a30105653b5ff2ae9a9ada
EBUILD apache-tools-2.4.43.ebuild 2552 BLAKE2B bc670330d77922c330dbd5daffe6377d71e4842ad61825de0bb34a2c9f77767ce540fc2372fbb91eb1ab83e9b01f469b87bb4667393fccb4a939b4099b600100 SHA512 26bae9a18cd88d274412a224be8e07c15685da56024b0c747d0c738a6d17e2f132032d2867e9f6530470d39ccabe2922406455c722a30105653b5ff2ae9a9ada
EBUILD apache-tools-2.4.46.ebuild 2555 BLAKE2B 439cc29f8adae1e8d59219263c849629b68b3fe89949de8b98350e1880741bb695d355bf6e6349294cf0dec52b8c1b292e860fca29075cd68d36c8688654cd6f SHA512 e8c1eefefcf25c6d9536cfe1a8e8f70ce0970fe40d8bc45e9cbdca67db58c0371bfc9c307df3b81c4ccdb5dd8b5f7ed2db249186d368a0a5451ce9e3046b22f6
EBUILD apache-tools-2.4.46.ebuild 2554 BLAKE2B 78297e86ce8f19f484ce11d7179b179f1189dae623f9c8d201472591f74a751413419488a3d2c5879f7d62ebda5ee1ee42e4436abc0c48360bb806beb605629a SHA512 87e205c16d0fb2447d8f8fdac179b4c1e44fef6e3b4a4e40b386dbc4f00ef5eeb8d53de60b8f51a448b285a3fb286576141a83df2344eddde00d585fbaba5fd9
MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122

@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="libressl ssl"
RESTRICT="test"

@ -1,3 +1,3 @@
DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
EBUILD dio-1.5.2-r1.ebuild 866 BLAKE2B 67446d17c74b52e5e59d62ee1cfde36b8947805e5f8f67bb6376f07ceef57e7bb9410b4781e138efe0740d3be7f36a81ff9531d5aaa4ff010547fe49cc4d27fd SHA512 4f340cf0311191745672dfea523fb2a8b0b721181e60700e026b5d6cffd5a9cb0e31ad35c1e41fb5052def7046abd3084201f4c929d6f25d7d76b1f3402f9daf
EBUILD dio-1.5.2-r1.ebuild 864 BLAKE2B 21d4534ca92e2eae1234efc1136be510f092ebf93f034f9e50035fee7fa9b0fef7756f255571c52c9f340304c9da58e55ac36c21ba9b8ef51727768e974dc014 SHA512 2bba0907947285946c1e3c07a98de3ef20012c29200bc5c40f6a48a78f0ae94508cb1e9018392f28b3dd39e7480f075b100db3bf0e1cadc4f99819526aa51be1
MISC metadata.xml 793 BLAKE2B cc48bcda030360c69a517a4c76e91dca8adc6d5228d6982c21cd4a07afc474a4ef03daedd773f9a22564eccfadd5fcc6eb528cc2631358b5ca602144f2bf8559 SHA512 9875ed341acd30db1009dc29da6d024b433a77a8212690911286798aeabb4206d3af91452976931bacd3db81159a393efdbd95058fa6d740b22d6ad1a81f2c82

@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
EAPI=7
inherit toolchain-funcs

@ -4,4 +4,4 @@ AUX rsyncd.conf 611 BLAKE2B 2842f2fe86d3d84e6385d979337a523db12fa8f39316652d2cc0
AUX rsyncd.motd 44 BLAKE2B 764e92b05ece7c7c114106e3cb634cce9383b96b7e076b2cc95217aba5eff6a849e32da1acd2d1cb34316b81701ecf4c7b09bc304e43eff992014128048170bf SHA512 812c0e738274222e65e5bc57379ebc6150c232cd8bf98e72b500763828bfcfa45fb8e89c7cccd5e34685f4e5d4787d9cd2ab03ace64bc76f5c5416deb03c17f3
AUX rsynclogparse-extended.pl 3476 BLAKE2B 230fc0a15cb5341f3bbf1455b86e5bd0a92bd12eaf5d8ece373bfcac0d1b45b310b0a3194d2200676b351e5b5931be51319801b1e5df87cb7d41c799447dca8a SHA512 60656deb0e501c51c4a37d2f9cce2829faea830ae42d1f33db52f37b337b71a125b7d350e893fb6098b405e1439cbde160d9e7ecda3ebd8a8f8c34b84acf80b3
EBUILD gentoo-rsync-mirror-1.0-r5.ebuild 1978 BLAKE2B ecea9be8d187fafe4ef4b82f4d04840c094ba6ae5871afd568dc729dee512657f16d24bab1f19431cbe74a45bb1e9c1efccedcf9c8aa9dced8755cee73254d67 SHA512 f2585fa372d66066d63255cb48bb2d8702c65acb376042c349cba5a064b14aae4dc963c04bed3777525593554b4a86cbbc5a56b9b8fcda6373130983d9722d7e
MISC metadata.xml 365 BLAKE2B e228fe06455e1d2619852d44b50a114e425c0cd1027877b01a4920186d50a6ee1ca39742f75d33cc3ea6fc7bc45744c9c0667582881534793090c974cfa8be72 SHA512 7fce97c62f40d7472b6fedb12be020aa53037a4049885c1ec6c2735b419b3f40462a848360fb33db65aedf2b829d491f2fa521b82ac158b1d15cec115b524115
MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d

@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>rgkmg25@gmail.com</email>
<name>Robert Kowalski</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>

@ -1,12 +1,10 @@
DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075a00c3e0d338c9892570a416a2b3a8f19940c0893715f4eeab991e804831a87ef656ffd91e7f1ba047c119261 SHA512 b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a
DIST sudo-1.8.31p1.tar.gz 3351312 BLAKE2B 85775ef574a3a1a9cc749809fe81f8350f7a4e3f46a905bc3392790b20bb7bc8e3c99fb504e01776f3a92aa6afa7972d3ff1c071aadd3a08ee1d2281f8b9ba50 SHA512 9344fd1d8a8445e8afb9c5628cdc832fe32ea29199f071f35fb6ec694371801556df560f4382afec199f468b1f3264ad5e3a89e964612e571b8d911f823724cc
DIST sudo-1.9.0.tar.gz 3743850 BLAKE2B 47d557afb13eee300d379ae31aae34cf7cf1e5ad140c6d7e599f687cca2cc259ec17f9ec0b3ca6f0badef81bb6e9d659e3e2bb77d9994218a9a3d88ec7ff2c19 SHA512 f2a191ea5fc65865718b110d4aca187cb5e2cd55c9c891fab32f21401e56f825f34c373e346c55c64fa49cec4d802efb63ccebf3d4a4e31d9a433077daf013b1
DIST sudo-1.9.1.tar.gz 3834744 BLAKE2B 835eaae5b61627da65f40f04646b261093c56f77bdfb1b64f746e569a4bfafcfbb31d88ab301bf8544a8714f43d3416a792ee8b0fdcb75d81dbc6fcf29551f0b SHA512 7994c7d8f020188eda51787bb5f6fe7668518cc89b711e7840470db7e5bac1219490ffccc73854fecb14ceb3ffaf0fc605f3438c87b83f27921ea3626365105c
DIST sudo-1.8.31p2.tar.gz 3353538 BLAKE2B 274c72232e18c8ff5006b61ad4d384582ec0296af6326377f08ff4e59c6a4a4fc5e2245874bf9a7c6b010addae600dd41f042660d5bf9c4bc8eb98983704a5da SHA512 ad1bbbde74d3ab6e947071c6f21e436ebabcf5af11ecc75cde8f0c01ca0b8c6ae1cce2ff42f21612816c636e96722a2a14daa57757644ceab6577091f82242be
DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
EBUILD sudo-1.8.31.ebuild 6863 BLAKE2B 605dcb95b2668e74e9fbc915c98aad1c787919036b450476e9c9d50e2151489154d2232d0c1e445bfc6647cccecc240f508c2ef636e64331fcfbce385025ad72 SHA512 ccf9c659c89e469ad9cd0282ef2165a549344734dd3638226506944e39a39574af5f56d96ff0108880571a56a9eb457077fd2e73889fbb9c27a0e766b88f9abc
EBUILD sudo-1.8.31_p1.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
EBUILD sudo-1.9.0-r1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9
EBUILD sudo-1.9.1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9
EBUILD sudo-1.8.31_p2.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
EBUILD sudo-1.9.2.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
EBUILD sudo-9999.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6

@ -3,7 +3,7 @@
EAPI=7
inherit pam multilib libtool systemd tmpfiles
inherit pam multilib libtool tmpfiles
MY_P="${P/_/}"
MY_P="${MY_P/beta/b}"
@ -30,11 +30,10 @@ fi
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
DEPEND="
sys-libs/zlib:=
gcrypt? ( dev-libs/libgcrypt:= )
ldap? (
>=net-nds/openldap-2.1.30-r1
sasl? (
@ -45,11 +44,14 @@ DEPEND="
pam? ( sys-libs/pam )
sasl? ( dev-libs/cyrus-sasl )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
sssd? ( sys-auth/sssd[sudo] )
system-digest? (
gcrypt? ( dev-libs/libgcrypt:= )
!gcrypt? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
)
"
RDEPEND="
${DEPEND}
@ -135,34 +137,36 @@ src_configure() {
# until `make` time, so we have to use a full path here rather than
# basing off other values.
myeconfargs=(
# requires some python eclass
--disable-python
--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--enable-zlib=system
--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
--with-rundir="${EPREFIX}"/run/sudo
$(use_with secure-path secure-path "${SECURE_PATH}")
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
--without-opie
$(use_enable gcrypt)
$(use_enable nls)
$(use_enable sasl)
$(use_enable ssl openssl)
$(use_with ldap)
$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
$(use_with offensive insults)
$(use_with offensive all-insults)
$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
$(use_with ldap)
$(use_with pam)
$(use_with pam pam-login)
$(use_with secure-path secure-path "${SECURE_PATH}")
$(use_with selinux)
$(use_with sendmail)
$(use_with skey)
$(use_with sssd)
$(use_with selinux)
$(use_with sendmail)
)
if use system-digest && ! use gcrypt; then
myeconfargs+=("--enable-openssl")
else
myeconfargs+=("--disable-openssl")
fi
econf "${myeconfargs[@]}"
}
@ -198,7 +202,6 @@ src_install() {
fi
pamd_mimic system-auth sudo auth account session
pamd_mimic system-auth sudo-i auth account session
keepdir /var/db/sudo/lectured
fperms 0700 /var/db/sudo/lectured
@ -206,7 +209,7 @@ src_install() {
# Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
rm -rf "${ED}"/run || die
rm -rf "${ED}"/run
find "${ED}" -type f -name "*.la" -delete || die #697812
}

@ -1,260 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit pam multilib libtool systemd tmpfiles
MY_P="${P/_/}"
MY_P="${MY_P/beta/b}"
DESCRIPTION="Allows users or groups to run commands as other users"
HOMEPAGE="https://www.sudo.ws/"
if [[ ${PV} == "9999" ]] ; then
inherit mercurial
EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
else
uri_prefix=
case ${P} in
*_beta*|*_rc*) uri_prefix=beta/ ;;
esac
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
fi
fi
# Basic license is ISC-style as-is, some files are released under
# 3-clause BSD license
LICENSE="ISC BSD"
SLOT="0"
IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
DEPEND="
sys-libs/zlib:=
gcrypt? ( dev-libs/libgcrypt:= )
ldap? (
>=net-nds/openldap-2.1.30-r1
sasl? (
dev-libs/cyrus-sasl
net-nds/openldap[sasl]
)
)
pam? ( sys-libs/pam )
sasl? ( dev-libs/cyrus-sasl )
skey? ( >=sys-auth/skey-1.1.5-r1 )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
)
sssd? ( sys-auth/sssd[sudo] )
"
RDEPEND="
${DEPEND}
>=app-misc/editor-wrapper-3
virtual/editor
ldap? ( dev-lang/perl )
pam? ( sys-auth/pambase )
selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
BDEPEND="
sys-devel/bison
"
S="${WORKDIR}/${MY_P}"
REQUIRED_USE="
pam? ( !skey )
skey? ( !pam )
"
MAKEOPTS+=" SAMPLES="
src_prepare() {
default
elibtoolize
}
set_secure_path() {
# FIXME: secure_path is a compile time setting. using PATH or
# ROOTPATH is not perfect, env-update may invalidate this, but until it
# is available as a sudoers setting this will have to do.
einfo "Setting secure_path ..."
# first extract the default ROOTPATH from build env
SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
echo "${ROOTPATH}")
case "${SECURE_PATH}" in
*/usr/sbin*) ;;
*) SECURE_PATH=$(unset PATH;
. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
;;
esac
if [[ -z ${SECURE_PATH} ]] ; then
ewarn " Failed to detect SECURE_PATH, please report this"
fi
# then remove duplicate path entries
cleanpath() {
local newpath thisp IFS=:
for thisp in $1 ; do
if [[ :${newpath}: != *:${thisp}:* ]] ; then
newpath+=:${thisp}
else
einfo " Duplicate entry ${thisp} removed..."
fi
done
SECURE_PATH=${newpath#:}
}
cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
# finally, strip gcc paths #136027
rmpath() {
local e newpath thisp IFS=:
for thisp in ${SECURE_PATH} ; do
for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
newpath+=:${thisp}
done
SECURE_PATH=${newpath#:}
}
rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
einfo "... done"
}
src_configure() {
local SECURE_PATH
set_secure_path
# audit: somebody got to explain me how I can test this before I
# enable it.. - Diego
# plugindir: autoconf code is crappy and does not delay evaluation
# until `make` time, so we have to use a full path here rather than
# basing off other values.
myeconfargs=(
# requires some python eclass
--disable-python
--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--enable-zlib=system
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
--with-rundir="${EPREFIX}"/run/sudo
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
--without-opie
$(use_enable gcrypt)
$(use_enable nls)
$(use_enable sasl)
$(use_enable ssl openssl)
$(use_with ldap)
$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
$(use_with offensive insults)
$(use_with offensive all-insults)
$(use_with pam)
$(use_with pam pam-login)
$(use_with secure-path secure-path "${SECURE_PATH}")
$(use_with selinux)
$(use_with sendmail)
$(use_with skey)
$(use_with sssd)
)
econf "${myeconfargs[@]}"
}
src_install() {
default
if use ldap ; then
dodoc README.LDAP
cat <<-EOF > "${T}"/ldap.conf.sudo
# See ldap.conf(5) and README.LDAP for details
# This file should only be readable by root
# supported directives: host, port, ssl, ldap_version
# uri, binddn, bindpw, sudoers_base, sudoers_debug
# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
EOF
if use sasl ; then
cat <<-EOF >> "${T}"/ldap.conf.sudo
# SASL directives: use_sasl, sasl_mech, sasl_auth_id
# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
EOF
fi
insinto /etc
doins "${T}"/ldap.conf.sudo
fperms 0440 /etc/ldap.conf.sudo
insinto /etc/openldap/schema
newins doc/schema.OpenLDAP sudo.schema
fi
pamd_mimic system-auth sudo auth account session
pamd_mimic system-auth sudo-i auth account session
keepdir /var/db/sudo/lectured
fperms 0700 /var/db/sudo/lectured
fperms 0711 /var/db/sudo #652958
# Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
rm -rf "${ED}"/run || die
find "${ED}" -type f -name "*.la" -delete || die #697812
}
pkg_postinst() {
tmpfiles_process sudo.conf
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
chmod 711 "${sudo_db}" || die
fi
if use ldap ; then
ewarn
ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
ewarn
if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
ewarn "configured in /etc/nsswitch.conf."
ewarn
ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
ewarn " sudoers: ldap files"
ewarn
fi
fi
if use prefix ; then
ewarn
ewarn "To use sudo, you need to change file ownership and permissions"
ewarn "with root privileges, as follows:"
ewarn
ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
ewarn
fi
elog "To use the -A (askpass) option, you need to install a compatible"
elog "password program from the following list. Starred packages will"
elog "automatically register for the use with sudo (but will not force"
elog "the -A option):"
elog ""
elog " [*] net-misc/ssh-askpass-fullscreen"
elog " net-misc/x11-ssh-askpass"
elog ""
elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
elog "variable to the program you want to use."
}

Binary file not shown.

@ -1,7 +1,9 @@
DIST clamtk-6.03.tar.xz 227940 BLAKE2B 08364ba8c3b4fcdb49364cd2721413c7f487aaff23dfa0fb0e7b28f9baf9d267589099cc159558dd004fe882d762b6ece272672aab962b4a666fb8c244671d19 SHA512 4e81b161b17ae15a307d026766efcab2ea0433437e68dd7e3465e07c999e66c556372adc29cee093a1cec5a8f37861d1b8cddd08ed6e4cfbd59f5333d4f03fac
DIST clamtk-6.05.tar.xz 230076 BLAKE2B 577a2f6cec4cde7d72be2ee519d3fb26b9b713f199f1b526eea8a4bc3fd997ca60ceff1c2478fea568c27a648a16f1962c406c7ed00b75c3e545d4ee0f6ece45 SHA512 d7d49c186cce226649f9b449802a1ada52ddb51e2954de16ca379618e0ab8517ed80f934e2ee0f03d5dbc6c0fd2015f76b0f32230e0a526d71008692dd817fd2
DIST clamtk-gnome-0.05.tar.xz 15148 BLAKE2B d72ad0c9b3272c1a21d3722994152e23aeb01bd79d006cbcd3545c2689887b4f596daeeef72a13d9cdd9cfc89c4091963b4a1917824bbb06be4678f2c446a114 SHA512 a5d3b0e87889880272aa61a0feebca8e885c7fa964bad767351c826188c236f2152b3c43328b6aa720c5942b2bf1da69916d3664358c274813a6ac032ee4dea0
DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
EBUILD clamtk-6.03-r1.ebuild 3804 BLAKE2B ff2578f9d19368b4c001beba7a359271e98b0a02f5187851f3701bf6a8b11a3c993d04d98b337d2c40f6065cd5abf01d46efecef50fc093453802f2a312558c9 SHA512 efe15487bb10add7ae4b7f0052a844a45c11b506e86d47ad70a6778604d339c6fbd6f1114d50eb6da545e11d70c71b21f36cb189c8a188eb737b2687b2dd7a38
EBUILD clamtk-6.05.ebuild 3806 BLAKE2B 918b3cd9005fc1dba7e405fa782e9b34cffa1372ff3ac715c05ddcdcadbe859f0046b67755c5141ed167e8a5145bda43b1ab5f64398f656ab6ed72c369927fe4 SHA512 24c9688454550c0b46d49d59e652324ac0f5a0f2d15d951de19811d30ee16201f1425fa7512d763d601fd641ccc7a425a29561a971977c5053e13423b7e3030b
MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7

@ -0,0 +1,142 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
inherit desktop perl-functions python-single-r1 xdg-utils
MY_PV_KDE="0.18"
MY_PV_NAUTILUS="0.05"
MY_PV_NEMO="0.04"
MY_PV_THUNAR="0.06"
DESCRIPTION="A graphical front-end for ClamAV"
HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
SRC_URI="
https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
"
LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="kde nautilus nemo +nls thunar"
REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
app-antivirus/clamav
dev-perl/File-chdir
dev-perl/Gtk3
dev-perl/JSON
dev-perl/LWP-Protocol-https
dev-perl/LWP-UserAgent-Cached
dev-perl/Locale-gettext
dev-perl/Text-CSV
dev-perl/glib-perl
dev-perl/libwww-perl
virtual/perl-Digest-MD5
virtual/perl-Digest-SHA
virtual/perl-Encode
virtual/perl-MIME-Base64
virtual/perl-Time-Piece
nautilus? (
${PYTHON_DEPS}
dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
)
"
BDEPEND="nls? ( sys-devel/gettext )"
DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
pkg_setup() {
use nautilus && python-single-r1_pkg_setup
}
src_unpack() {
default
unpack "${S}"/clamtk.1.gz
use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
}
src_install() {
dobin clamtk
perl_set_version
insinto "${VENDOR_LIB}"/ClamTk
doins lib/*.pm
use nls && domo po/*.mo
doicon images/clamtk.png images/clamtk.xpm
domenu clamtk.desktop
doman ../clamtk.1
if use kde; then
insinto /usr/share/kservices5/ServiceMenus
doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
doman ../clamtk-kde.1
docinto dolphin
dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
fi
if use nautilus; then
insinto /usr/share/nautilus-python/extensions
doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
doman ../clamtk-gnome.1
docinto nautilus
dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
fi
if use nemo; then
insinto /usr/share/nemo/actions/
doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
doman ../nemo-sendto-clamtk.1
docinto nemo
dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
fi
if use thunar; then
insinto /usr/share/Thunar/sendto
doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
doman ../thunar-sendto-clamtk.1
docinto thunar
dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
fi
einstalldocs
}
pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
}
pkg_postrm() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
}

Binary file not shown.

@ -1,5 +1,8 @@
AUX 3.32-packages.match 645 BLAKE2B 7bb6ec28fb8150e1f1989a9db4514556d857b4dea8b8225b1515f3f53b70a1e81b6a0a1068a0d356a33086d0127993a394cb0500e2991384c404dce7faaf32a0 SHA512 3c837c18afa12c5e022a80f85ccc83e5f55fc8fdd5ee8f19f1b2222d08560ad1fd349ed8b1bb7255119f6d6101399fa0dcd79e6a1754c719c0409343c231f65b
AUX 3.36-packages.match 664 BLAKE2B 5ff5f4066c1b085829321280d0f86d9a9eda071a23bfb01aba94594ad2815d6f68d67b8c0b6d053ee442a0b3e70d81c2bde3788b14c98ed3e1e37fb16b101959 SHA512 e4518a143a164b699aeeb4309bf41697f9aab12de401217126513018352163ed034f3e8ef30fb22db0cb966650f08fc9b68079d171a861bd6185c13fa6b4a4c9
AUX file-roller-3.32.4-fno-common.patch 693 BLAKE2B 2a2cd45f9bc5fd73d9bf1324944f70890bd52878d03c0197f0b4759f6a780fac5c964c240269bbcb89056591306fc87df4bb3403b18346079853541d9b81a644 SHA512 31c425704802c2d2095b8778177f7cfbd31fd1447a3e4b8fa3ffcc9c952231d400a11458d26a6db7e2595d6bae1ba9eec01fa6d925ed727660cba7af2589bbb5
DIST file-roller-3.32.4.tar.xz 854444 BLAKE2B 04264e64af8ab4376fa6985683b16be7fef730a4e24044f726933b885aaaa6b630f347a256b09c2ce6183d0a0a392b33b4328715bf6d19cf7128c1980f9f4792 SHA512 16b5ddbdeacf4e9e61265ecff05e8f2e0034147c67ae7355d2442f9b26098ff253d24cb34c8e686c2ac031da6acac8e1e3c8a9f978e1eb2b446b1e045babafc7
DIST file-roller-3.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
EBUILD file-roller-3.32.4.ebuild 2274 BLAKE2B 996cac999d6d1c1f4b4deba986f6001371d1b5f6c05c370e531679c6486a796c75a6e2679ef65c655cfed6af1dbde06840d1b6b916ec3cc5f89325cdc440d90b SHA512 a3e66c14e06a337a41591a55a1d8a6d273f57bacec3edb202bca83bbf952d980e2b4131c338a2ea71b31f76116195a772a4261a4b9caa634795de4f249ea632a
EBUILD file-roller-3.36.3.ebuild 2178 BLAKE2B 996c772b93bcb58f50dbe7a2bf4f4bfb0314a64ef78362a0dd68bf7bf8ba99f007899a1ace76bceb8ca542320ceb52607bbc993abb1140938ccf0654707ebe49 SHA512 8ccdd2d59211f47a2d6243606747b56c783c1944ecbfe712e9e8a191fec61b72c0553ec3bbcb8c703daf3c5c9c2b38f1fe78a113ff85f27af089f5f094e390b7
MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf

@ -0,0 +1,92 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
DESCRIPTION="Archive manager for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="libnotify nautilus packagekit"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
# pango used in fr-window
RDEPEND="
>=app-arch/libarchive-3:=
>=dev-libs/glib-2.38:2
>=dev-libs/json-glib-0.14
>=x11-libs/gtk+-3.22.0:3
x11-libs/cairo
x11-libs/gdk-pixbuf:2
x11-libs/pango
libnotify? ( >=x11-libs/libnotify-0.4.3:= )
nautilus? ( >=gnome-base/nautilus-3.28.0 )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/glib-utils
dev-util/itstool
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
"
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="
${PN} is a frontend for several archiving utilities. If you want a
particular archive format support, see ${HOMEPAGE}
and install the relevant package. For example:
7-zip - app-arch/p7zip
ace - app-arch/unace
arj - app-arch/arj
brotli - app-arch/brotli
cpio - app-arch/cpio
deb - app-arch/dpkg
iso - app-cdr/cdrtools
jar,zip - app-arch/zip and app-arch/unzip
lha - app-arch/lha
lzop - app-arch/lzop
lz4 - app-arch/lz4
rar - app-arch/unrar or app-arch/unar
rpm - app-arch/rpm
unstuff - app-arch/stuffit
zstd - app-arch/zstd
zoo - app-arch/zoo"
src_prepare() {
# File providing Gentoo package names for various archivers
cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
xdg_src_prepare
}
src_configure() {
local emesonargs=(
-Drun-in-place=false
$(meson_use nautilus nautilus-actions)
$(meson_use libnotify notification)
$(meson_use packagekit)
-Dlibarchive=true
)
meson_src_configure
}
src_install() {
meson_src_install
readme.gentoo_create_doc
}
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
readme.gentoo_print_elog
}
pkg_postrm() {
xdg_pkg_postrm
gnome2_schemas_update
}

@ -0,0 +1,35 @@
[Package Matches]
arj=app-arch/arj
binutils=sys-devel/binutils
brotli=app-arch/brotli
bzip2=app-arch/bzip2
cpio=app-arch/cpio
dpkg=app-arch/dpkg
genisoimage=virtual/cdrtools
gzip=app-arch/gzip
lha=app-arch/lha
lrzip=app-arch/lrzip
lz4=app-arch/lz4
lzip=app-arch/lzip
lzma=app-arch/xz-utils
lzop=app-arch/lzop
ncompress=app-arch/ncompress
p7zip=app-arch/p7zip
p7zip-full=
p7zip-rar=
rar=app-arch/rar
rpm=app-arch/rpm
rzip=app-arch/rzip
tar=app-arch/tar
unace=app-arch/unace
unalz=
unarchiver=app-arch/unar
unrar=app-arch/unrar
unsquashfs=sys-fs/squashfs-tools
unstaff=
unzip=app-arch/unzip
xz=app-arch/xz-utils
zip=app-arch/zip
zoo=app-arch/zoo
zstd=app-arch/zstd

Binary file not shown.

@ -1,4 +1,4 @@
AUX cpuburn-1.4a-variables.patch 879 BLAKE2B b1ede6e0c0086caf3b87bd13753a120b47079339aa8d898661119afa2f9c90c4074c2e05e16a5980afcdc31370867b2a72c53d737c7fe66541cb2c8a998bc5e4 SHA512 eef2f5dfc3a49712568001a273be117126beac27560b6e4386e89893ef30acda76c956b96a9a86bf1a0a424003f3eb9214a8a4a1c828fcbbf809eed82a5a7af7
DIST cpuburn-1.4a.tar.gz 9277 BLAKE2B f362380d0f57fd888ee5e5cf8fdf1809ffbc44fc3c3935b64adbd2c29ad0b3f93e5c032fdc265355574625417e7f5f9e9012e6f637c87fe0ae5e2043258f0822 SHA512 db84cabe70af0b6b3579c746f6df08c268b7145c9521fc609ce5b4cfd497dbb0639e52ab55f34110cff297ec23cf1413db28c6bff4e6f81a69722626886df7ce
EBUILD cpuburn-1.4a-r3.ebuild 1360 BLAKE2B 71ed48cd60d3565e2ca1dee195c4da3aa4b4d077def0b100f78950b8d930ec86f6cd8bd2c3ce32e73de2f1db5b1341625922aa200163c64d81a10d47eb8fc28c SHA512 22a7db9db6a388d1870d15cfcf1bb8f7b0742eb637b5a0591cd9e8e286295a9c99b3c823ff6069a9a9dec5dc457d66ac3da676d896f9df5982ad72469bc06684
EBUILD cpuburn-1.4a-r3.ebuild 1358 BLAKE2B 61eed5731e5f1244521f229cd7ce420138c1e8af5820a3e0dc467171174fb6e293d4b31a6452f9ef85b908c5b811bb7baaf30ff4a9c48f336aba5b9e04478f07 SHA512 54357193326c9586fc80772bcc8200dba4646942c3e19662cf7fd77bfdcf66cf9b79b77957b5cdac094d8d082bd8cf9ee5e1f31a20c2bda2facc1138ea037fd7
MISC metadata.xml 483 BLAKE2B bdcff8e39301ded7c0b82902705c2ea042b5cbd47a83c37297cb03e839824cdb053ad08179a609732bf6a49c4e81ecb4d82a2dcf91d1faaf3418db7354d4c80f SHA512 68622fc4b0eb6b6df0025befd216eb6d6e8a502d7e2c176251963510221261834d3dd046c7e9d141794530ea504dcbe3087e8336711b4c131b38ad345dc1dd1a

@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
EAPI=7
MY_PV="${PV/./_}"

@ -3,11 +3,11 @@ DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a1
DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
DIST Geekbench-5.1.1-Linux.tar.gz 92622793 BLAKE2B 178b57d02de43e995f4dc39bd9514bb30fbe470d82572ba43aac08004609c07c656285beb543b3e3832df39bc2e26e41bb8c7d1f617f0846f930183e67a73436 SHA512 0f0a8206ced8cbaf271d964ece273a800bdd1d5b5918130aca2e31cab59f7d716c1b714b96a934e5b0fab8a9b73d1fcdc7ea9cd7ef37963b1a923cdefb542a78
DIST Geekbench-5.2.1-Linux.tar.gz 92898328 BLAKE2B 8a989b3921e8da467ffcaea1a466053ce1eae2d30991e8ad0a468cdb2c167e39729381e2f465abc9002eaa1569a4d912bdda3c1774689b35d8edb4778ab0bc90 SHA512 5d462cbb78b0b2a132fc5fbe0e65e9755d67232b22b6f2a541fa5aa1a90bc6768b3255759019218a94df0bb82eb9aeaad7dbb6b7cb0e8cc79a95d21fb9a8960b
DIST Geekbench-5.2.3-Linux.tar.gz 93047726 BLAKE2B 22cf414d89ef8854b8797ed7ad6b674ff6162daa003745d94c0481a71a2b7c1b7fbfd06d7a0e997b41da2107feb27a69af768196bf4114681c8bce39d2640112 SHA512 cacc1014b1522de281704e5210c44b81a51b24b63fb4c4be3c28e729261af2f12c5a52ad2a79b10bf597a1b24378cf03d7483d032d5e0c483069f8dc2695339e
EBUILD geekbench-2.4.2.ebuild 1029 BLAKE2B 325e02bfccabae6f54f24fd7a5f601517eebaec7e51f6d9c4fb15adead8eaa255423fd69a2ed0788fa6e407c4cc7c228e23c2357f4d3699f2f1f725770eee79b SHA512 19d8807a97e5bfbea9155857740c2c3c6138c6366f426defde44976a224f89c48b7dd366bd1ec1079b49b45df0c0aaefaae6e5ca8d367a3034c2c26296385a53
EBUILD geekbench-2.4.3.ebuild 1089 BLAKE2B 010a26131e1de8b5eb4d7735f10603dc9bcef864ee688b9ba71e6d20c79424b9818b0a99a33d0ad48804872964b4ecce0e69c5a6bafaba865c03a057a6f76e97 SHA512 58ced2485af8de54dfc1a6736b0ddac21089f208c895665aa043efc381a9f04db359bcc0c2db360455b6a55b02d0bcc489c7a65c9414f43d9006b821ce3e6a02
EBUILD geekbench-3.4.2.ebuild 1089 BLAKE2B 8512afa8c9dc00969d53b4b743158ddc1f5abb94dcfca1312a55e5a75b4204abc67ad86d4902dd95fd1139934c7d2c3c83389434b5466cec490608b76870118a SHA512 ecb7293edca2f48939fe0736dc24c1b4ab71601ff434dfdb0b3e85fabeca6f6f64c343d49edc8ab4bd69a09a598bc7122e3b34be30a91de0aebd2521136a17b2
EBUILD geekbench-4.4.1.ebuild 1083 BLAKE2B 58703fd44f5a9276dcb69c0a976e25afad4e3ff39eb4657dc2650fc804242193618ae6187d526343db8534396e91954d5bbda75a1c6f50ef49471f2c33ea47fb SHA512 82f9440171735d13befa0aa0120d4e722c416d7633ee08a46e7f8089bc177d8b206f546d34265dfd54428cd4c9a17d589f4b322ebd87434183e05c0592c268c3
EBUILD geekbench-5.1.1.ebuild 1030 BLAKE2B 942a330df0da458054979c0137d63a06ffd94aaa139a29c5cf291438cc64f7b1563df1d66ecf3e6d3779c860ea060f84efb66daf48871d22f51d798d43c12f10 SHA512 8885a9815bf0788ca460fe8f063c68fb215c0d8888649a49c05d0331182d98f05ae82cff35efec13366a2bb07a480d08fb578d17e01d6fc04b304db7c9d9ebbf
EBUILD geekbench-5.2.1.ebuild 1031 BLAKE2B 9ed111d7e9a060d502d7056da19f99b7606f3b037cb0503c2f68e9f3e6907248f4ae123d740a90a2ce4977ca554dcd616cb67ecaf73c244c8857ea19d91587fa SHA512 d6a4212be1eae1094b32ed614b436c199f7a952d6b151321ed79237b3d4694691812ad0881c63984d17b1da9f6403a40f226ad7e65ea19d46db4265fc2491e5f
EBUILD geekbench-5.2.3.ebuild 1031 BLAKE2B 9ed111d7e9a060d502d7056da19f99b7606f3b037cb0503c2f68e9f3e6907248f4ae123d740a90a2ce4977ca554dcd616cb67ecaf73c244c8857ea19d91587fa SHA512 d6a4212be1eae1094b32ed614b436c199f7a952d6b151321ed79237b3d4694691812ad0881c63984d17b1da9f6403a40f226ad7e65ea19d46db4265fc2491e5f
MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca

@ -1,4 +1,4 @@
AUX stress-ng-0.11.02-makefile.patch 1802 BLAKE2B 1fa9fb57e31a8f0ff60e9a60140e8e85064840f215ba00e82d292737ec37889c3c3bb92cefd94a56104a5e80df69468e3ad7b38cbebed3f8c009dcf23932194b SHA512 7a697fc4c1dfc8e462362e0d3fe99d5432afbf921f2de91963f623163bbcbc0642e61444bb053e673661659d11c22f5a6932668b8a25d9d7564b19eb87467554
DIST stress-ng-0.11.10.tar.xz 443208 BLAKE2B 273d98c8e8a7664e2ecd6431f0988b417980d9faf05550a80a0a90505907eec24eae5f717f4bd813f128f22870343861472bc1157373deb0aaef365b85de44fa SHA512 ae83fa107d17fe55c27429d4b0763db2b56c83d5ab88f4738f9b0be74a34c8adbb6d1dd7a5417ff1399c394c9a18c900265705f21c1cf123e0cc8361cb8214fe
EBUILD stress-ng-0.11.10.ebuild 762 BLAKE2B 0ae9493eb2c03f913c6115f54608a43eaba6370296a2a824ff6040b236e118645c7a7344b23b873b414f56ba625cc752eb260e38387104720f72401d59f55746 SHA512 c3fcadf84d8a0ec0e37bf568e0920bb1f24b12eec08f544a1383ec2503c1472d56b27829ee017d813f0ffc3f1c4ef0ea64954839362642219a0db9320f098191
AUX stress-ng-0.11.17-makefile.patch 1752 BLAKE2B 999a2bd729c0b3d3184010ffe5ffb5d59cf82fead7a16199c2ce1abd37dcfd3a665f4644b8d740ece4b92fa2f543e84d57952b13bac728a78ed0f749d106459c SHA512 affe4f5a324e009f10f0ed26dd8dc6d1ab7938da8574392c2514f307c1e4a46a85b0fcf7c3820e6f147f1150483f811b314d82b73ca7f605167ffa8d50c4691d
DIST stress-ng-0.11.17.tar.xz 467156 BLAKE2B fab734e0dcd7633e6a47a3b6a41111dd900a2dfb2e3666d8fbf439d2d40ea6b7f5f25763aba5d774cf20ce43598e0bce2229e321c2a9512d5f26d8a795d70ce8 SHA512 8320e10fb2a2f224b23efe72af7d84e6beb73bbd54eff0a6c04afee14de5cbbf6584e1a6d936f52651467138e9647dfb0ff092aa7e73a9f8304627a603546f79
EBUILD stress-ng-0.11.17.ebuild 845 BLAKE2B 4b9188d58644d0746355fab936e7553a2d8ebd3d2279793cd5c1abc4cc0096c920f2bea11039a22d6e6b10068ccb2468a947956c8039f1ca807cae3c7301acaf SHA512 a8870c9880a3acf73d8914b4668cdb2ccc37ecb64e9bb2006a0f59bb9b0eb2059be53ca6e1924daa99eaea5384e842219a07550e1e48d8c9ad522e72a74febb8
MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1

@ -1,8 +1,5 @@
Always respect users CFLAGS, enable verbose output when compiling
and don't install compressed man pages.
--- a/Makefile
+++ b/Makefile
--- stress-ng-0.11.17.orig/Makefile 2020-07-27 13:38:23.000000000 +0200
+++ stress-ng-0.11.17/Makefile 2020-08-09 13:43:30.919796477 +0200
@@ -21,7 +21,7 @@
# Codename "synthetic system strainer"
#
@ -12,10 +9,10 @@ and don't install compressed man pages.
#
# Pedantic flags
@@ -357,12 +357,10 @@
@@ -358,12 +358,10 @@
.o: stress-ng.h Makefile
.c.o: stress-ng.h Makefile $(SRC)
.c.o:
- @echo "CC $<"
- @$(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) -c -o $@ $<
@ -27,7 +24,7 @@ and don't install compressed man pages.
@sync
makeconfig:
@@ -383,7 +381,7 @@
@@ -384,7 +382,7 @@
sed '$$ s/.$$//' >> apparmor-data.c
@echo "};" >> apparmor-data.c
@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
@ -36,9 +33,9 @@ and don't install compressed man pages.
@$(CC) -c apparmor-data.c -o apparmor-data.o
@rm -rf apparmor-data.c apparmor-data.bin
@@ -399,12 +397,12 @@
core-perf.o: core-perf.c core-perf-event.c
@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
@@ -401,12 +399,12 @@
@$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
sed 's/,/ /' | sed s/'^ *//' | \
awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
- @echo CC $<
- @$(CC) $(CFLAGS) -c -o $@ $<
@ -53,7 +50,7 @@ and don't install compressed man pages.
@touch stress-ng.c
$(OBJS): stress-ng.h Makefile
@@ -453,7 +451,7 @@
@@ -459,7 +457,7 @@
mkdir -p ${DESTDIR}${BINDIR}
cp stress-ng ${DESTDIR}${BINDIR}
mkdir -p ${DESTDIR}${MANDIR}

@ -3,7 +3,7 @@
EAPI=7
inherit toolchain-funcs
inherit eutils toolchain-funcs
DESCRIPTION="Stress test for a computer system with various selectable ways"
HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
@ -17,10 +17,8 @@ DEPEND="
dev-libs/libaio
dev-libs/libbsd
dev-libs/libgcrypt:0=
net-misc/lksctp-tools
sys-apps/attr
sys-apps/keyutils:=
sys-libs/libapparmor
sys-libs/libcap
sys-libs/zlib
"
@ -29,10 +27,15 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
PATCHES=( "${FILESDIR}/${PN}-0.11.02-makefile.patch" )
PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
src_compile() {
tc-export CC
default
}
pkg_postinst() {
optfeature "AppArmor support" sys-libs/libapparmor
optfeature "SCTP support" net-misc/lksctp-tools
}

@ -1,3 +1,3 @@
DIST stress-1.0.4-r1.tar.gz 191800 BLAKE2B 560065d963823e734bb706840908998a58c07c82b21ab579f7a0fd5163e7a8591ca0f6abe430bba058bafd9a2dac1fcf33f011663cd6c3d2fdefb221a49e5e8f SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4
EBUILD stress-1.0.4-r2.ebuild 510 BLAKE2B 18bba376b45331590ea482d9fb10aa434ffac26e62a5ee3d8a0350a002a9126f243ece62fbaeb991db929aa19475970209f215dae24c5e031e06af8115982be2 SHA512 9d93425d466e7a2a2cf5afa9e7a0b6aa81fc037c455d780284657483ffe318d578b9cc686111c166c5e5a3468c1e3a9bedf5903dc4d10b4abc0f7bb99a6cc05b
EBUILD stress-1.0.4-r2.ebuild 508 BLAKE2B 135bd5cade1e0c0207b165fe8b3ec8d25ea6e5543ff11abfd9412abbae3c8854c6c5a8c46630465ff37f1e3960550cf2eb5181723fab049930daa7d7317c1b63 SHA512 df7987d9b8bf1cfdf45ae9f4d0deb24c161c0d58737d697024618b224ab709d9d8bcc417f38a3001890bcfc83163937de8b246d44d16787faa504e90aa8a379a
MISC metadata.xml 448 BLAKE2B 32fcc7cc3e3426402d1616ce702ae6c58ee7e440d6e1c42858f081a31933af35645300bad9dd228129714230cc1da58ca9f1f8706e5a8c66abab0edfbed2d5f7 SHA512 dec4009823731cbc2dd66b560aa8071cfc41bc8c2624bccf28749e93abde54ee0ab5964983d03ec02cb2380d7661c5fd5c34781fddd4c3ebecec7eef96bca6e8

@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
EAPI=7
DESCRIPTION="A deliberately simple workload generator for POSIX systems"
HOMEPAGE="https://people.seas.harvard.edu/~apw/stress"

Binary file not shown.

@ -1,8 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
EBUILD acme-1.5.0.ebuild 1735 BLAKE2B 6672a6522b20e85a4d8e2181674bf87dde72ebeb762db91415efb051077b191c7193ba1eb55a8ea387ae09dbdf57b766423cc62909fde4a673f14d545551f5b4 SHA512 2c555871d0ed02df90b9149282dab1a0aacd5d662a9dc9d25b5887d56a3c2cc9200503197edb7b736a960fa374918813e33a826eec28f7565d883fabb613a2e7
EBUILD acme-1.6.0.ebuild 1737 BLAKE2B 0ff95a7344d44408e8075d0aa006a33ca276db92499ed404e549b960a23da8a63a0f6604251b0066666976e07eb809bd2cab05ee9fda3a64b1b423e1993c599a SHA512 1f850adad3937d447e9c03523ffcc8ec01551d1d35eabf26215c4ed0eaa81ca4285a0a2191b05655274a4132bef18be1b791ebd7f911f4481e33f621929cdca8
EBUILD acme-1.6.0.ebuild 1735 BLAKE2B 28009274945d1cb06c434a4a717f31a8783289b5b057bdbcce347c5b32c4f52cd8d88f1b20d4685b4def7455be19f49bb2f177fb9d586e65194aa14f4bff4dfd SHA512 6aea1eed8444f0b37001d6d2e715ff5467b07467f3a984ce08d91a47e25f9f8f65133e037ac4fd0183510ff4e61144aeb2e9ecf5ea2d05fbfcf412b4827913db
EBUILD acme-1.7.0.ebuild 1737 BLAKE2B 0ff95a7344d44408e8075d0aa006a33ca276db92499ed404e549b960a23da8a63a0f6604251b0066666976e07eb809bd2cab05ee9fda3a64b1b423e1993c599a SHA512 1f850adad3937d447e9c03523ffcc8ec01551d1d35eabf26215c4ed0eaa81ca4285a0a2191b05655274a4132bef18be1b791ebd7f911f4481e33f621929cdca8
EBUILD acme-9999.ebuild 1737 BLAKE2B 0ff95a7344d44408e8075d0aa006a33ca276db92499ed404e549b960a23da8a63a0f6604251b0066666976e07eb809bd2cab05ee9fda3a64b1b423e1993c599a SHA512 1f850adad3937d447e9c03523ffcc8ec01551d1d35eabf26215c4ed0eaa81ca4285a0a2191b05655274a4132bef18be1b791ebd7f911f4481e33f621929cdca8
MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1

@ -1,69 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
inherit git-r3
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
S=${WORKDIR}/certbot-${PV}/acme
fi
inherit distutils-r1
DESCRIPTION="An implementation of the ACME protocol"
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc test"
RESTRICT="!test? ( test )"
RDEPEND="
>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/requests-2.10[${PYTHON_USEDEP}]
>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
"
DEPEND="
doc? (
dev-python/sphinx[${PYTHON_USEDEP}]
dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
)
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
src_compile() {
python_foreach_impl run_in_build_dir default
distutils-r1_src_compile
if use doc ; then
cd docs || die
sphinx-build -b html -d _build/doctrees . _build/html
fi
}
python_test() {
nosetests -w ${PN} || die
}
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
distutils-r1_python_install_all
}

@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
S=${WORKDIR}/certbot-${PV}/acme
fi

@ -1,8 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
EBUILD certbot-apache-1.5.0.ebuild 1072 BLAKE2B 73e318d9dc7ecc5cf5ad2bff3d73d99e4eb9b8edc0ca730019180c7d4233cb2f05b895fef4652282c448fc9007bf0493f5abf879afa1b12a2c06cded5306e2e6 SHA512 a35d8194e596e1f793e50581587356521a76763c394ad41f710fa5fef870c26318b348b79ce48ac0cda71f33b0e6a56784d9d6a549361337a7fed4a328136a36
EBUILD certbot-apache-1.6.0.ebuild 1074 BLAKE2B 0983132ac6377f462fcaad0510241c4c3005a6d0ae8eda4dfd732ea54c23517ad7840199cbc8597526930a85bd9d97b79a1d00919bc8ef4c8b4d7f073339f15e SHA512 ed4de8e9eff1fa01e58f159a024e97e86f0c06841fb6de51e6d4fd60817f892ad04480cfcd5734cc37f5aec890ca0c8b7c06f1e562fd40e57bd1e37b0003c29d
EBUILD certbot-apache-1.6.0.ebuild 1072 BLAKE2B 1bf17482d560ed83a9b84b81c79b614b0ae57bd1d21bffc21209829514c604df9bc4732bf76b61251dc5a96903e26c47a498437d7c33982abfebbee674be82d9 SHA512 df69d3665659a2232bbc66a5e798468534826cb859c5b0b0e92c81da4c8d4ee019f8cac8a66ef7a23ff6c4bf60a1965ab343ab94df5049dc61f68d1f9666345b
EBUILD certbot-apache-1.7.0.ebuild 1074 BLAKE2B 0983132ac6377f462fcaad0510241c4c3005a6d0ae8eda4dfd732ea54c23517ad7840199cbc8597526930a85bd9d97b79a1d00919bc8ef4c8b4d7f073339f15e SHA512 ed4de8e9eff1fa01e58f159a024e97e86f0c06841fb6de51e6d4fd60817f892ad04480cfcd5734cc37f5aec890ca0c8b7c06f1e562fd40e57bd1e37b0003c29d
EBUILD certbot-apache-9999.ebuild 1074 BLAKE2B 0983132ac6377f462fcaad0510241c4c3005a6d0ae8eda4dfd732ea54c23517ad7840199cbc8597526930a85bd9d97b79a1d00919bc8ef4c8b4d7f073339f15e SHA512 ed4de8e9eff1fa01e58f159a024e97e86f0c06841fb6de51e6d4fd60817f892ad04480cfcd5734cc37f5aec890ca0c8b7c06f1e562fd40e57bd1e37b0003c29d
MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f

@ -1,38 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
inherit git-r3
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
KEYWORDS="amd64 ~arm64 x86"
S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
fi
inherit distutils-r1
DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
dev-python/python-augeas[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}] )
dev-python/setuptools[${PYTHON_USEDEP}]"
python_test() {
esetup.py test || die
}

@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 x86"
S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
fi

@ -1,8 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
EBUILD certbot-nginx-1.5.0.ebuild 971 BLAKE2B c8260b5ca404e7b48c4adef76f613f25b001200a0c10b91fdd86ea8a3164548a014e304bb929908e784bb92ebeb9e46f093338b836c2b3271eea0f26710efe70 SHA512 946a11ba13884e78bf781c9e1a0ef18182402f5cda67a4333b8778135b4ede4ea15114bd401e4d78688eed12799f1da5898e8955f1de9b9390556f66707e6ddc
EBUILD certbot-nginx-1.6.0.ebuild 973 BLAKE2B 99723e412b2282e6ecb4f74b9d9b8a694c8ccaa9e4f0c4e38efde37e3745e076ed53e1a178c234be7cfad3034daf53b1b4af1439da2e15eed311e3ef832dd4f8 SHA512 bf912fdbca7c54e3928ea9758d71da456b324eca5dd47eb0a4d912bebd90d6b8be13e4a31d22ef72c399c9cbd1ab97ee032084c9122fd2c0bb45611e25a6cc67
EBUILD certbot-nginx-1.6.0.ebuild 971 BLAKE2B 0eb84b5e406a9ec7787648921cd5f8ce8c96811f82c02c78b86cd7bb37576b0f10e09ab318512d62b96df1ad4b0d0f4d08b1ea3b590a2f0db16eb478e6c8d00b SHA512 99924175b91aa873c5438b58a4e7feb7e4d8d94a253c8093eb42574bc1019ef627ba183cb5f7334f25c5ee1206c74818b882eb46be859a7df34d786e56dc2d14
EBUILD certbot-nginx-1.7.0.ebuild 973 BLAKE2B 99723e412b2282e6ecb4f74b9d9b8a694c8ccaa9e4f0c4e38efde37e3745e076ed53e1a178c234be7cfad3034daf53b1b4af1439da2e15eed311e3ef832dd4f8 SHA512 bf912fdbca7c54e3928ea9758d71da456b324eca5dd47eb0a4d912bebd90d6b8be13e4a31d22ef72c399c9cbd1ab97ee032084c9122fd2c0bb45611e25a6cc67
EBUILD certbot-nginx-9999.ebuild 973 BLAKE2B 99723e412b2282e6ecb4f74b9d9b8a694c8ccaa9e4f0c4e38efde37e3745e076ed53e1a178c234be7cfad3034daf53b1b4af1439da2e15eed311e3ef832dd4f8 SHA512 bf912fdbca7c54e3928ea9758d71da456b324eca5dd47eb0a4d912bebd90d6b8be13e4a31d22ef72c399c9cbd1ab97ee032084c9122fd2c0bb45611e25a6cc67
MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f

@ -1,33 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
inherit git-r3
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
fi
inherit distutils-r1
DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.4.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"

@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
fi

@ -1,8 +1,6 @@
DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
DIST certbot-1.7.0.tar.gz 1416764 BLAKE2B de678a222e8c8e3e7834470f87763763671bfae37a5c8320a4c1a2552ec979b5391094713e7e13526f73fdf8cd32f70f8c4350f422505892c4fdd0ae77742c80 SHA512 f81242e68b7e261bbb6294ffe92e47bc1687128344816d71a495a94a2646e209e46c147bc76eedce0c477cc140dc6ae0fba76d2d5d01b828fce78875f5a2886a
EBUILD certbot-1.5.0.ebuild 1446 BLAKE2B 9daef0f298f1d00450d3c9d87f6f4c731633b224c920feb0902f7d1fd7fab3c4f58385a2c917c9aa556e34769f90597be056003ed03a8cb718b2d48a7788a441 SHA512 e6cca25c2a6e2ac172fa3e936618ab36d9b71ed5b3fb838c73bae456b9979e286afae53f7d7f98317326d691bf66a03744ea0b7b01f236401d2b334c6be6da7f
EBUILD certbot-1.6.0.ebuild 1448 BLAKE2B 800c168ba8c51cddb5ba84372c4161673c1b276ce8ecd113550d2c24b008d368161e52b6771fe1d511c83ae65b18b7d92cd09d2eb0384e0aee1dbd5ae8ea91e5 SHA512 c435e77b29bf1cf8ad3c9637954544d9e433beefee63a3ebe5c5709e8d781d0fa33be3105d0617e583a7d3ac28334b1c605fa69a9f362e1e2940098a18760885
EBUILD certbot-1.6.0.ebuild 1446 BLAKE2B 7e57c0d4bfee4f0a445acf808ecdce10cc39b7515b73df1f30a382ce5190b35ce981b880c4bc7928f7e63db052808430967538c9a97cb2765f08e5f80f0befeb SHA512 66c1b49d4be612dad1f30b95dce20590d6965e3cbefeb50f982e97431db070e651dd8fe9bf3f7b794eebbc9fdccdd0b9bc9b51c5804741a18331c6d27bec4e63
EBUILD certbot-1.7.0.ebuild 1448 BLAKE2B 800c168ba8c51cddb5ba84372c4161673c1b276ce8ecd113550d2c24b008d368161e52b6771fe1d511c83ae65b18b7d92cd09d2eb0384e0aee1dbd5ae8ea91e5 SHA512 c435e77b29bf1cf8ad3c9637954544d9e433beefee63a3ebe5c5709e8d781d0fa33be3105d0617e583a7d3ac28334b1c605fa69a9f362e1e2940098a18760885
EBUILD certbot-9999.ebuild 1448 BLAKE2B 800c168ba8c51cddb5ba84372c4161673c1b276ce8ecd113550d2c24b008d368161e52b6771fe1d511c83ae65b18b7d92cd09d2eb0384e0aee1dbd5ae8ea91e5 SHA512 c435e77b29bf1cf8ad3c9637954544d9e433beefee63a3ebe5c5709e8d781d0fa33be3105d0617e583a7d3ac28334b1c605fa69a9f362e1e2940098a18760885
MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70

@ -1,48 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
S=${WORKDIR}/${P}/${PN}
inherit distutils-r1
DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
${CDEPEND}
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}"
distutils_enable_tests pytest
python_prepare_all() {
# required as deps of deps can trigger this too...
echo ' ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
distutils-r1_python_prepare_all
}

@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
fi
S=${WORKDIR}/${P}/${PN}

@ -1,3 +1,5 @@
DIST scdtools-0.3.4.tar.gz 254227 BLAKE2B d2959d1be860b4809f4b20b5b3e2b06534bb49220b6818b4ac9c8e73751c31dfa4a6c0200cc6bbb33d4a627f0d55b1c3cefda3def6a78bde925a0c58d9c0429a SHA512 ff25f6360c9bd73e63cefd8fe37103dc1ef2528d87ddf7c1006e913c921e78569ff6f12096d1407bfabf626e73376f13e25f606f8c45cba79803689176801b73
DIST scdtools-0.3.5.tar.gz 155529 BLAKE2B 9b0791d8a5d92240968be82fbffd1838229586ce33b857d13fa40732bf3424df88c33c5f792e8178b52fbe06ff91c9c74e59ee686552973f7a8bbf8b1249589b SHA512 5c45948f7e6b6357aa6305c942bb388f9693908991049b2b279bbf1f27bb2de3df1b8278da30b1cc423975880890cf4533f10ca3de42c9dc88182aacc6466ced
EBUILD scdrand-0.3.4.ebuild 725 BLAKE2B 4e17b08da3816d491153209c6bdec8eac2f3e81acc63134972b534fad2db20abd610a9bbb196de2a0407f35a34aff5edc5ac47bcf265be8ff245a9b2638c204e SHA512 297cc015cf40cceba7fea13b837b715698d9aaf61f9efb97efdd6ddaa0d5b82df2026686850620a99f42b35fa923897f26e7ddcbdd59a2ba499d22acc8e9d728
EBUILD scdrand-0.3.5.ebuild 730 BLAKE2B 95794d69b38276185ba14e123d8ebd95317641fd16f3f277e9a04ffd409a10bff76ac74ea43c255c99f5cf3307b012586ecbb4ce439d3bf2a620f22cd35356c6 SHA512 03e9e4dee3bc1e0124f2c37ba7d4e9f2f6b39fc3e377c7b7203fc8923387b141a16ac665184c37b9445955439cf2c600f34d0876c89a8f6b617eef46ee549b97
MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282

@ -0,0 +1,34 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MY_P=scdtools-${PV}
DESCRIPTION="Feed kernel entropy pool from smartcard's TRNG"
HOMEPAGE="https://incenp.org/dvlpt/scdtools.html"
SRC_URI="https://incenp.org/files/softs/scdtools/$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-libs/libgcrypt:=
dev-libs/libassuan:=
dev-libs/libgpg-error:="
RDEPEND="${DEPEND}
app-crypt/gnupg"
S=${WORKDIR}/${MY_P}
src_compile() {
emake -C lib
emake -C src scdrand
}
src_test() { :; }
src_install() {
emake DESTDIR="${D}" -C man man_MANS="scdrand.1" install
emake DESTDIR="${D}" -C src bin_PROGRAMS="scdrand" install
}

Binary file not shown.

@ -14,5 +14,5 @@ DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef
DIST libvirt-6.5.0.tar.xz 9407160 BLAKE2B 592aace555a3b72311cb430784587180fa7dbf74f75509cd8373a046339b9c4c0707bf530dd2d06146d78a85f8af3dba5d0b146ecec180d3cc4d3bf78c19da61 SHA512 30a032270304b97945ff2c5087c72c2f5510634186f2eaf7c3d834a72cddcaec97bbe5ccc86802728a59f4c80b5bb54757400683df5f20175757cfe07ce67453
EBUILD libvirt-6.2.0-r2.ebuild 8737 BLAKE2B c5ec7d389d67e93c53a494c1d585d06292413fa6ace2757d8906885ca35a31c97858ebc1c9aab44275392b766590b34fa17195fed932c1477850e4d853ac92e5 SHA512 52460fa384383a3f22b3b91a4ee6e05b3771f9c749592a299e11cb1d65d3f098dcce61ba9614e9389b278bd4594034547709f1665b80e878a4eae8a4276e20c8
EBUILD libvirt-6.5.0.ebuild 8708 BLAKE2B 22835f2786b4bbc8d6060c8a58775b6a81fb789b0ad4742572ba81fc8ed9e7ef9b1ac96ca0dbf9fedc16726d48a3207af74eabe50b9b8e178d29555f23871ee9 SHA512 11fa732bc07ed559dbf28e372cac67a8a55f07c7b54e597170e73e992dc72d09e4aa05f023fa753ab37240f010ef0869bd015f4504de44a5151424f3baf2b3ed
EBUILD libvirt-9999.ebuild 8680 BLAKE2B 26205e602b03eb3eb866e1c59dc2013e99ea062644e77907dd9595bb3f45ac32051e5e15257ff7e76b25629e29f3f5a7006dd8807b26e23204b55db38b86380a SHA512 50b1d8a61b5a51d58489f4a647dd6a0a42e1295c47fabc76c7f0a0a68b601655fb3b33974af0eecea8520c4d1cad368dcac7003df3cfe451914963e753a78340
EBUILD libvirt-9999.ebuild 8486 BLAKE2B cf00f2a3060cc6c7cfc269c6b637559441c744a6b2571d23032e722e977eae99aa00c8dca41f89ab3eac7c23bd4dd013c1f99830e870df59d6b5d652d2257304 SHA512 c9aaece6ef165138c00b58d4ed920cd065eb48d594ad76a2e9c7090227cae17fb08a6c61a1bdfadfbbd01eeef5382a782559177a325924ee5869a42b51bf7f55
MISC metadata.xml 3620 BLAKE2B 896dbfd54e204d33a00187e5c97dabaa292b13b17589e177d72385355ac72899fe10e4a6bf11e56590ce60c5b56db297be7464841c64bc5bcf22e27cc07c628a SHA512 1e1f0ac3b1664efec145fc138dad04417241f30462e45379b95c59a81f2148709fdb5a659366156a3092f1b55ee5d6d41cd24331fdb173ce411abe2681c2f828

@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7} )
inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@ -125,7 +125,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-6.5.0-do-not-use-sysconfig.patch
)
pkg_setup() {
@ -220,79 +219,67 @@ src_prepare() {
cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-i "${S}/libvirtd.init" || die "sed failed"
eautoreconf
}
my_src_configure() {
local myeconfargs=(
$(use_with apparmor)
$(use_with apparmor apparmor-profiles)
$(use_with audit)
$(use_with caps capng)
$(use_with dbus)
$(use_with dtrace)
$(use_with firewalld)
$(use_with fuse)
$(use_with glusterfs)
$(use_with glusterfs storage-gluster)
$(use_with iscsi storage-iscsi)
$(use_with iscsi-direct storage-iscsi-direct)
$(use_with libvirtd)
$(use_with libssh)
$(use_with lvm storage-lvm)
$(use_with lvm storage-mpath)
$(use_with lxc)
$(use_with macvtap)
$(use_enable nls)
$(use_with numa numactl)
$(use_with numa numad)
$(use_with openvz)
$(use_with parted storage-disk)
$(use_with pcap libpcap)
$(use_with policykit polkit)
$(use_with qemu)
$(use_with qemu yajl)
$(use_with rbd storage-rbd)
$(use_with sasl)
$(use_with selinux)
$(use_with udev)
$(use_with vepa virtualport)
$(use_with virt-network network)
$(use_with wireshark-plugins wireshark-dissector)
$(use_with xen libxl)
$(use_with zfs storage-zfs)
--without-hal
--without-netcf
--without-sanlock
--with-esx
--with-init-script=systemd
--with-qemu-group=$(usex caps qemu root)
--with-qemu-user=$(usex caps qemu root)
--with-remote
--with-storage-fs
--with-vmware
--disable-static
--disable-werror
--localstatedir=/var
--with-runstatedir=/run
--enable-dependency-tracking
src_configure() {
local emesonargs=(
$(meson_feature apparmor)
$(meson_use apparmor apparmor-profiles)
$(meson_feature audit)
$(meson_feature caps capng)
$(meson_feature dbus)
$(meson_feature dtrace)
$(meson_feature firewalld)
$(meson_feature fuse)
$(meson_feature glusterfs)
$(meson_feature glusterfs storage-gluster)
$(meson_feature iscsi storage-iscsi)
$(meson_feature iscsi-direct storage-iscsi-direct)
$(meson_feature libvirtd driver_libvirtd)
$(meson_feature libssh)
$(meson_feature lvm storage_lvm)
$(meson_feature lvm storage_mpath)
$(meson_feature lxc driver_lxc)
$(meson_feature macvtap)
$(meson_feature nls)
$(meson_feature numa numactl)
$(meson_feature numa numad)
$(meson_feature openvz driver_openvz)
$(meson_feature parted storage_disk)
$(meson_feature pcap libpcap)
$(meson_feature policykit polkit)
$(meson_feature qemu driver_qemu)
$(meson_feature qemu yajl)
$(meson_feature rbd storage_rbd)
$(meson_feature sasl)
$(meson_feature selinux)
$(meson_feature udev)
$(meson_feature vepa virtualport)
$(meson_feature virt-network driver_network)
$(meson_feature virtualbox driver_vbox)
$(meson_feature wireshark-plugins wireshark_dissector)
$(meson_feature xen driver_libxl)
$(meson_feature zfs storage_zfs)
-Dhal=disabled
-Dnetcf=disabled
-Dsanlock=disabled
-Ddriver_esx=enabled
-Dinit_script=systemd
-Dqemu_user=$(usex caps qemu root)
-Dqemu-user=$(usex caps qemu root)
-Ddriver_remote=enabled
-Dstorage_fs=enabled
-Ddriver_vmware=enabled
-Drunstatedir=/run
)
if use virtualbox && has_version app-emulation/virtualbox-ose; then
myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
else
myeconfargs+=( $(use_with virtualbox vbox) )
fi
econf "${myeconfargs[@]}"
meson_src_configure
}
my_src_test() {
src_test() {
# remove problematic tests, bug #591416, bug #591418
sed -i -e 's#commandtest$(EXEEXT) # #' \
-e 's#virfirewalltest$(EXEEXT) # #' \
@ -301,14 +288,11 @@ my_src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
HOME="${T}" emake check
meson_src_test
}
my_src_install() {
emake DESTDIR="${D}" \
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
find "${D}" -name '*.la' -delete || die
src_install() {
meson_src_install
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand

Binary file not shown.

@ -1,3 +1,3 @@
DIST sndpeek.eselect-1.0.1.bz2 1263 BLAKE2B ab2ed4019fd3bd991803375dd6219e4ca8bcade739c435beaf034d701324db52d12b0967821716351455f39d181657d6153d889cc313c2a3761994afbd79194d SHA512 39cc065d4fbe408db9c406d84a0ebf4a69a9c50f440f26b714b5f154bf7b5de497df4226434d60c0b1e4e073bbe3a0ca96c3bd574148772a4912e2fc9c9c6b5b
EBUILD eselect-sndpeek-1.0.1.ebuild 494 BLAKE2B b49f51ce32d3e090c7f6e4752c4f25f8e5c82e8d851c863e7b895c031e1faddfc33960ba42bdac1e667f9dc6016661bf4981055d8d66565588980503d1dfe142 SHA512 251e7a0d63e0102c713c1be9089562dd5765aa139797ba11b185cb0c5dd9f80c7182962fef4aec8dbfefd2700aa1b33ff93de6082bbbc7fb9712df0f61a5d24a
AUX sndpeek.eselect-1.0.2 3421 BLAKE2B 3a878997876345421b86bbb95dbdf0a4f50562449236bac050d5fc7ff2432315f45160c5a74486814a71691178ce97a48480f56ac3957a3d24edc447446befd8 SHA512 f72e13fad3d2acda398c8e6674d45236effa1060e2e801397ffc80ab06ee61f881564e72de8d83c28286fc09ee3cae6e46d7560d156be9b8cfbdcfd2d46e6f20
EBUILD eselect-sndpeek-1.0.2.ebuild 452 BLAKE2B 455ac3fe09169af1e99fa9e7703a8fde43f8f8d657fff3627a093fb167d5cd3d2ddbbcfb93835e4f2f975489ff12ac950780bb746c877f2e550ff1565357e90b SHA512 5bf579b600c81d8aa7d4b12bd4d59f4f3793091b25413127a7892bfec5583c80b241933faac59da4fdcd792834465ac7c5c4eb3f6b0df4e4f2b29bba662ec69f
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84

@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
DESCRIPTION="Manages the /usr/bin/sndpeek symlink"
HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
SRC_URI="mirror://gentoo/sndpeek.eselect-${PVR}.bz2"
SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
@ -18,5 +18,5 @@ S="${WORKDIR}"
src_install() {
insinto /usr/share/eselect/modules
newins "${WORKDIR}/sndpeek.eselect-${PVR}" sndpeek.eselect
newins "${FILESDIR}/sndpeek.eselect-${PV}" sndpeek.eselect
}

@ -0,0 +1,143 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
DESCRIPTION="Manage /usr/bin/sndpeek audio engine"
MAINTAINER="cedk@gentoo.org"
# find a list of sndpeek symlink targets, best first
find_targets() {
local f
for f in \
${ROOT}/usr/bin/sndpeek-alsa \
${ROOT}/usr/bin/sndpeek-jack \
${ROOT}/usr/bin/sndpeek-oss \
; do
if [[ -f ${f} ]] ; then
echo $(basename ${f} )
fi
done
}
# try to remove the sndpeek symlink
remove_symlinks() {
rm -f "${ROOT}"/usr/bin/sndpeek &>/dev/null
}
# set the sndpeek symlink
set_symlinks() {
local target="${1}" targets
if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
targets=( $(find_targets ) )
target=${targets[$(( ${target} - 1 ))]}
fi
if [[ -f "${ROOT}/usr/bin/${target}" ]] ; then
remove_symlinks
# it's not okay if these fail
ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/sndpeek" || \
die "Couldn't set ${target} /usr/bin/sndpeek symlink"
else
die -q "Target \"${1}\" doesn't appear to be valid!"
fi
}
### show action ###
describe_show() {
echo "Show the current sndpeek audio engine"
}
do_show() {
[[ -z "${@}" ]] || die -q "Too many parameters"
write_list_start "Current sndpeek audio engine:"
if [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/sndpeek ) )" ""
elif [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
write_kv_list_entry "(not a symlink)" ""
else
write_kv_list_entry "(unset)" ""
fi
}
### list action ###
describe_list() {
echo "List available sndpeek audio engines"
}
do_list() {
[[ -z "${@}" ]] || die -q "Too many parameters"
local i targets
targets=( $(find_targets ) )
write_list_start "Available sndpeek audio engines:"
for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
[[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/sndpeek ) ) ]] && \
targets[${i}]=$(highlight_marker "${targets[${i}]}")
done
write_numbered_list -m "(none found)" "${targets[@]}"
}
### set action ###
describe_set() {
echo "Set a new sndpeek audio engines"
}
describe_set_options() {
echo "target : Target name or number (from 'list' action)"
}
describe_set_parameters() {
echo "<target>"
}
do_set() {
if [[ -z "${1}" ]] ; then
die -q "You didn't give me an audio engine"
elif [[ -n "${2}" ]] ; then
die -q "Too many parameters"
elif [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
if ! remove_symlinks ; then
die -q "Can't remove existing provider"
elif ! set_symlinks "${1}" ; then
die -q "Can't set new provider"
fi
elif [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
die -q "Sorry, ${ROOT}/usr/bin/sndpeek confuses me"
else
set_symlinks "${1}" || die -q "Can't set a new audio engine"
fi
}
### update action ###
describe_update() {
echo "Automatically update the audio engine"
}
describe_update_options() {
echo "--if-unset : Do not override existing audio engine"
}
do_update() {
[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
die -q "Usage error"
if [[ -L "${ROOT}/usr/bin/sndpeek" ]] ; then
[[ ${1} == "--if-unset" ]] && return
remove_symlinks || die -q "Can't remove existing link"
fi
if [[ -e "${ROOT}/usr/bin/sndpeek" ]] ; then
die -q "Can't set a new provider"
elif ! [[ -z $(find_targets ) ]] ; then
set_symlinks 1 || die -q "Can't set a new provider"
fi
}
# vim: set ft=eselect :

Binary file not shown.

@ -3,8 +3,7 @@ AUX node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4
AUX node_exporter.initd 701 BLAKE2B 6dbe6f147332580c2f1433d293649d818bcb0033faf0cd14567eb1f017a677b3a5568a51c3fe9929d3e6f9f96455d96138709444cba8024235084dbfcaf5b78b SHA512 9af0a58796aa087f1dfbe00bc25e4af0d3a7e4054071bfecd76b9e3dbc3c222b649fe0f7c2a5907ce733d3c0cc3eba127d5815366a749fc16952d1c6b9d397ae
AUX node_exporter.service 188 BLAKE2B 3e8c0598afc0d52193912cd34e8daaccad1ec6c58d93ee442789851d471b3b89bb6195c3e499560024b4259d8845df11efd51827f9e3f338987083d84601b5aa SHA512 2f61c1b651ec30d8a75da137d6da1cd82b51e87e11264e3109ff28c7269493c746feba52d63b25441dae82dd04d48cca94eb049fed6e63e6cd4297830260499c
DIST node_exporter-0.18.1.tar.gz 2110072 BLAKE2B 48c73d00cba892e34e95d40bd29c9ca70bc5748590f00cb7f8adcd25d8a9504f669d887b1273cc65316ca55b06c36d97a3e19a66382f35d5768db7c315981a13 SHA512 cf2b854fbec1ba39b18432cdc11ab507ebc5b2828e6b34b4f49af9b949fcd365cb3e5eb1e265d0825783810c6b1572a8b3512ec27a46e5c83f89a505590159c0
DIST node_exporter-1.0.0_rc0.tar.gz 2753717 BLAKE2B 2e1984d080ce2a16ca710a3da882b311510b2741836d615075281f5fce2641be35084090d9bcedcb8bf4f6a18333c5fcd53eb98817d1efed4c1a26261a02bffd SHA512 ec1d79367c69a7ccdacc9482a38625ffc9adab6d781b789cc226eed0bd893deca5cfc420a096f790ccd57834492551d36e2f307ad27a6c67585c8ef31887b50f
DIST node_exporter-1.0.1.tar.gz 2792033 BLAKE2B 4e86c348a293e8a4a8d5e22fe99871d84a817cfbbe3ac10b0e7b4fbba3ae7b12352c619f140e3568aa2fb3e4cdfdbde0d19d792497a0b0007b634cb3a4d21e38 SHA512 0643042a04494a65d1ebdedf78671a1e3473b7ac6f3bc606fa2c52e893dfc68b591ef7e38ac6768c4c529c25b831811c01839475a4fde9baeb0a6c581a57839f
EBUILD node_exporter-0.18.1.ebuild 1452 BLAKE2B 9bfd50a37838b40c36a94197ff5cd39ef38b9f553d2fe3169bdf33cbd2055f40825fd0e4645369fdf0c375d15fd82e62885316b5772556db26e4345d8cbe9149 SHA512 80791542bbbdca7b3ec58f8f25d3c84a13b52809d1981af94bb91cdf5edc0f613e93ce53c4b71da8d805a0f19935bace4c941b4f8d4f20e82e70bea3eed37699
EBUILD node_exporter-1.0.0_rc0-r1.ebuild 1251 BLAKE2B ff2b7020ed98f0a79d5f51e54db83df2315ff04b7f4c175a3fce3b084007ac7499b27facf98c0e4b6158814cc4c162e6b657e7b0d78fd7f4a5517ed2666b9d9f SHA512 8862c1e98df69ee9567908d9761c341deca56e1daee0910573ed3fb69f872ddf531909c67b7581a2096f4f71739b8322a5a421767bec58b8945a80fa62b5e85c
EBUILD node_exporter-1.0.0_rc0.ebuild 1526 BLAKE2B 0fd95b50428006f3417061163ed21593f687a8901951123add14927adaa809b3290668b2614146f78a79b9a5f7e89088ccad889191736e4cb02a9704158afd0c SHA512 6c15ec90a199386990b1e88861c62a19a3c5ef314ed58ad1c372a520089a971bfc38df015542c39ff3ccec818295d01f8b9ca2985718c22c357e3607756082c1
EBUILD node_exporter-1.0.1.ebuild 1251 BLAKE2B 9bd450bb2b143043912e8aeff59ac161516f1b220b026898ab31fd80eaeada00f46d206152e8d2b89c76167e3d7cdb6ad47a0673e87ab7200edb76d8d144319f SHA512 7ba2b66ff69a33596eb6ed08523da98f2a25726e1a60c255528b3d7490e049c7396eeb71d86e1a3e60f9862ce8d9963b5eb3e05c84226fe98b6c2a806805f150
MISC metadata.xml 337 BLAKE2B d9d866eca2162bd2c647a92d7c2c21eea95e944d81f9f4eb0911f0b111ed4eb62f2bf2c6042afe1a12caf58694ac692498923f9da2733c4fcb4419946e3eb613 SHA512 9a616d85dc1a26ce5bdd84f6a08f5cfaed1f273ee62d3fdec395507b0cfe0cbd23db13c8380671caada62f81e202a2a9ea4793dca6b6f6a88fe6dea9bcf7b8c0

@ -1,53 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit golang-build golang-vcs-snapshot systemd
EGO_PN="github.com/prometheus/node_exporter"
EGIT_COMMIT="v${PV/_rc/-rc.}"
NODE_EXPORTER_COMMIT="ef7c058"
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
DESCRIPTION="Prometheus exporter for machine metrics"
HOMEPAGE="https://github.com/prometheus/node_exporter"
SRC_URI="${ARCHIVE_URI}"
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
IUSE=""
CDEPEND="acct-group/node_exporter
acct-user/node_exporter"
DEPEND=">=dev-lang/go-1.12
>=dev-util/promu-0.3.0
${CDEPEND}"
RDEPEND="${CDEPEND}"
src_prepare() {
default
sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
}
src_compile() {
pushd src/${EGO_PN} || die
mkdir -p bin || die
GO111MODULE=on GOPATH="${S}" GOCACHE="${T}"/go-cache promu build -v --prefix node_exporter || die
popd || die
}
src_install() {
# binary and docs
dobin src/"${EGO_PN}"/node_exporter/node_exporter
dodoc src/"${EGO_PN}"/{README,CHANGELOG,CONTRIBUTING}.md
# systemd
systemd_dounit "${FILESDIR}/${PN}.service"
insinto /etc/sysconfig
newins src/"${EGO_PN}"/examples/systemd/sysconfig.node_exporter node_exporter
# openrc
newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
# maintence
keepdir /var/lib/node_exporter /var/log/node_exporter
fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
}

@ -4,7 +4,7 @@
EAPI=7
inherit go-module systemd
MY_PV="v${PV/_rc/-rc.}"
NODE_EXPORTER_COMMIT=ef7c058
NODE_EXPORTER_COMMIT=3715be6
DESCRIPTION="Prometheus exporter for machine metrics"
HOMEPAGE="https://github.com/prometheus/node_exporter"

Binary file not shown.

@ -1,4 +1,6 @@
AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec25750868455214c4557f42a57448b8b5785a6793df2ff412d089af0e88743a7c361ab4284a9a6d98fda1c6cdccbb227628afa65beb7d5919ff6d9 SHA512 a967a30379e6fb07cd00cf133068409c24dfd660fc84a200fca8feae5664ce90598f23984b73e32e1dae9c4af31f0289f82cb24d6a4b74956c88c266d9c9e485
DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
DIST ddate-0.2.2_p20160627.tar.gz 8079 BLAKE2B 7885dd34762297df801f9fe5736d1409280646cc9295780f3fa6da0a06127fa455c96117883e1087b0390498de1b58ac31071434e6b9e30a0f6a15b2e4c6c279 SHA512 279e02e1846cc2f505466882828aa699eaa7206e0025575babdb33738b920291d65ac4082f58c77e6046e69c2604b05de67f5b9b3cbc64589ff28a27e2256eef
EBUILD ddate-0.2.2.ebuild 514 BLAKE2B a8a35a87f6df49c2a907bce74ed184af0720308265bfee13e7d4fdf9c95ad2477530a1be92e98877e6c9b2d5d1fda1752f0df61216877204a7b583f7d2c66e5f SHA512 c75d4c255ce6455cbbc249b40c99fcfa5d358534b3485843a652e264048f5c4933cbbe9e148e3266252ad3e7598546fbfa2d5d0b263715746d3fe8e1a784e236
EBUILD ddate-0.2.2_p20160627.ebuild 556 BLAKE2B 87a40721b3a3fd0d0d4d7f53fcbf686b8ae2fd31929e7bb97eb013c582d813c982ee57660ec6596c651ab65b0843da2df48d0e32f592bcde67ae9f2f345f3d0b SHA512 148fca981abb4006e21866ef2a03d9d86e1947548334c715260d8806eaaced6b4752301c75d3a284915c7327b1f62d44f483891f56974631abbd9bbd95150bf9
MISC metadata.xml 592 BLAKE2B 61ca3e0a009926931b30da1413a9080ad3f147339990b70598c75f5a2521fb224dc8d326f3dfc5aeddc762d4e15d58941c2d37e93a437b73fe98d6af7d8e424f SHA512 3bf37c63caa2e55da6f44545dd78866df4e72b822e76a33a7d37a634a794d24b7375117432e84ed5b64f0177bc3d994ddd04052181c396d695e4d75a5bb7a009

@ -0,0 +1,20 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EGIT_COMMIT="899ca665a0cb725990c33415dc3c0261dac7fe46"
inherit cmake
DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
HOMEPAGE="https://github.com/bo0ts/ddate"
SRC_URI="https://github.com/bo0ts/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
LICENSE="public-domain"
SLOT="0"
S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
PATCHES=( "${FILESDIR}/${PN}-0.2.2-dont-compress-manpage.patch" )

@ -1,4 +1,6 @@
DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
DIST kryoflux_3.00_windows.zip 18502294 BLAKE2B f8e60b0feb6e7d7b9a43480b0b4cf67b79c5431fa20ee9e771ee7adf214e1c992d080c2eb6a043f141936f2de873d63079e994b90e994051a29391c6a308f190 SHA512 12de0c7d28b0abca2eb35748770fe96906c12940b7148103f56713fe1144e09759d362a24c094a7088713557da467b90f4e3d0ace59252cb84e3349dc73ee5bd
EBUILD kryoflux-dtc-2.6-r1.ebuild 2455 BLAKE2B 67019b9cb6419a4a0927f8f061540294afcfddecd41e1b9a720949fefa99e61b83d5842b4d1e3d69fe1591bf974c5e1787b80d89d684160e92d292b75a69392d SHA512 e9d3c723458997b3ef1e4e5bccdca84a09d7412680438ea61ea05ca5b71113633f9be419610fa9be5cfd8d1dbe8b6496d8d96dfb42b5676c13e466920e122acb
EBUILD kryoflux-dtc-2.6.ebuild 2411 BLAKE2B 08707c2e94ee349226b8e1fbc6c7ce4d63c73a3f12a74fb9c5da26d6af4c1c8ae3c2d88e5c71291b9a2e4ebc293760d6c4b8f650000975f5af2957fa3d480bdb SHA512 b8f561d7da48a9b80235b47c8fb04a7eb7bac506a4b7fe6ab89559ce40b8283f78121a5749fe9a3466ff11a905a8672dea8f6749874e542bdb0fb73b0e91c91e
MISC metadata.xml 412 BLAKE2B 4a92b64039475119e84a4c9f11b1c6dac92d92139b195d37adcc710b274436a69b538d68b66393ef6f090338aa162d159929a498ba3b7d95dbcaad3b29d9204c SHA512 e8844f948a8f53b8b932311dd12c36b8148e985cb9f6927c384c131d914bd2dc42a240d45b98354a5cde3c6d6e4915c177ebed7c780c4f0b1f065571ac54ccda

@ -0,0 +1,108 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MY_P="kryoflux_${PV}_linux"
MY_P_WINDOWS="kryoflux_3.00_windows"
inherit desktop eutils udev xdg-utils
DESCRIPTION="KryoFlux Host Software"
HOMEPAGE="https://www.kryoflux.com"
SRC_URI="
https://www.kryoflux.com/download/${MY_P}.tar.bz2
gui? ( https://www.kryoflux.com/download/${MY_P_WINDOWS}.zip )
"
KEYWORDS="-* ~amd64 ~x86"
LICENSE="SPS"
SLOT="0"
IUSE="demos doc fast-firmware gui static"
RDEPEND="
dev-libs/spsdeclib
virtual/libusb:1
virtual/udev
gui? ( virtual/jre )
"
BDEPEND="app-arch/unzip"
RESTRICT="bindist mirror"
S="${WORKDIR}/${MY_P}"
QA_PREBUILT="/usr/bin/kryoflux-dtc"
src_unpack() {
unpack "${MY_P}".tar.bz2
if use gui; then
unpack "${MY_P_WINDOWS}".zip
# Extract kryoflux-ui.jar to get a logo for the meny entry
unpack "${MY_P_WINDOWS}"/dtc/kryoflux-ui.jar
fi
}
src_install() {
newbin dtc/$(usex amd64 x86_64 i686)/$(usex static static dynamic)/dtc kryoflux-dtc
cat <<-EOF > "${T}"/80-kryoflux.rules || die
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
EOF
udev_dorules "${T}"/80-kryoflux.rules
if use gui; then
insinto /usr/share/kryoflux-ui
doins "${WORKDIR}"/"${MY_P_WINDOWS}"/dtc/kryoflux-ui.jar
dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
newicon "${WORKDIR}"/images/disk.png kryoflux-ui.png
make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
dodoc dtc/kryoflux-ui_README.txt
fi
if use fast-firmware; then
insinto /lib/firmware
doins dtc/firmware_fast/firmware_kf_usb_rosalie.bin
dodoc dtc/firmware_fast/firmware_fast_README.txt
else
insinto /lib/firmware
doins dtc/firmware_kf_usb_rosalie.bin
fi
if use demos; then
dodoc -r g64_demo ipf_demo
fi
if use doc; then
dodoc -r docs schematics
fi
local DOCS=( "DONATIONS.txt" "RELEASE.txt" "README.linux" )
einstalldocs
}
pkg_postinst() {
elog "If you want to access your Kryoflux without root access,"
elog "please add yourself to the floppy group."
if use fast-firmware; then
elog ""
elog "You have enabled the fast firmware. Please keep in mind,"
elog "that this firmware can cause trouble with older floppy drives."
fi
if use gui; then
xdg_desktop_database_update
xdg_mimeinfo_database_update
fi
}

@ -1,5 +1,5 @@
AUX lcd4linux-0.11.0_pre20170527-python3.patch 1437 BLAKE2B b6b3e3267761d4b8df64687137451bba8cb564e9de2c5e1891061d0adf7927aeb1834ef40d46594569f3fa04141083ef43957efa54dbbac7a83a1ffa742e1f76 SHA512 ea4ddb89702d37200e0118df019d3971dd85f977ffeb1f50b3b54d48536efa91e9f0747bd235a68b0b0a33f7a7a3be76b4a29e852431a17887b370200e2cfe62
AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6015 BLAKE2B 01eea9e40a9822be2f339d1774e62808897d87453af9982aae6e065013972e97bcc7f8bcadaca5885df66a545ac4ef5bbc587687b70855e3b47d2aa2654e7546 SHA512 c1d037ca28096d18bad46ab532ca6ae35d3b96fcea187bdddb1e0f5878c42857151c76dff2f3fb280273a9509cf0d47e63aff827fce21dba0dc44c0442f50e0c
MISC metadata.xml 3436 BLAKE2B 7c72d72e9be5929fac6f655c2607e5b4140ffb499b4dd3dadfb8a23202c9dedc80650de7593331cb617dfdd04a321679c91e23f7ad187569ab54790eb1dcac49 SHA512 e38a9292bd89f0fa2027b131c60b9faa82c3e12c76caf22d3ec36fe33b51cf3dba3d5e753e2a2587dbc576d5c6a89662806f006d6a665ad1b00f87a6c1b6f29e
EBUILD lcd4linux-0.11.0_pre20170527-r5.ebuild 6022 BLAKE2B 25a6ed8c7bb2f7f722bb8bc2cf14af4ca48e288e787b47f06a970531f1df0843c3ab5daff2238303264771b154b6357938cc04d6be5a65ff95838e1cb2ea40dc SHA512 bf818e0d9bc24e2653d2886a8671fcf965c94133211cca8e79d4ceabde3c9ea13a24e89c5c6d99d31a56b4ba413afcb797d928286cec9d087f727dbf40b1116c
MISC metadata.xml 3520 BLAKE2B 061b85175547ddd4e0571cfca26438e324313143eb7435f358c9ee4eccc12eef8c5ffcd31bcb0318bd1d7b283d0da8075d1e8bc0338ec9702d42459be25066ed SHA512 9d26b18c84e6f1cff74fb8a5007f5ef1e7ef1b42aba4cc1fb408af1105433db8e1eef8ff24406071f0b7009bd29fdc924855a8a9e0bee954118c736c9e7fe4fe

@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit autotools flag-o-matic python-single-r1
DESCRIPTION="A small program that grabs information and displays it on an external LCD"
HOMEPAGE="https://lcd4linux.bulix.org/"
HOMEPAGE="https://github.com/jmccrohan/lcd4linux/"
SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.bz2"
LICENSE="GPL-2"
@ -73,7 +73,7 @@ DEPEND_LCD_DEVICES="
lcd_devices_lcd2usb? ( virtual/libusb:0= )
lcd_devices_ledmatrix? ( virtual/libusb:0= )
lcd_devices_luise? (
dev-libs/luise-bin
dev-libs/luise
virtual/libusb:0=
)
lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )

@ -49,4 +49,7 @@
<flag name="w1retap">Enable the w1retap plugin.</flag>
<flag name="wireless">Enable the wireless plugin, to get wireless statistics.</flag>
</use>
<upstream>
<remote-id type="github">jmccrohan/lcd4linux</remote-id>
</upstream>
</pkgmetadata>

@ -3,4 +3,4 @@ DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd
DIST screenie-20120406.tar.gz 3437 BLAKE2B 354410d41e1aa9c6bcef3951f26aafcabf8e5af5ba4abd69627e62575127c1190abc78db4ee72552b02ad5cbcde0b6c910dfbb9191f2fd8444e57dff36d16701 SHA512 73e9c9cf53792c51785d45319f65559f5d8f1c97f8637d3c3262384eb1a3835f3ba380e4c9284858e163e8d2021938c2ef3ab50f2854d5f932e96847b9a4c153
EBUILD screenie-1.30.0-r1.ebuild 501 BLAKE2B 14ac796383358ce287b47d8712d9c8c5d67c48006c51639140d193fb8878754b4c0f11dd0cb5b051be0912159c9a4767e042fca7147488e77729b76206fc7ead SHA512 0c124ecbdadec4605d554f02fefca829710238010cb00ac9a6f78544677d42eda379d6a594b2b7d206a0b73cd7b7bbc307c1b2bfb3d91ff7e0f26d12dc83ef53
EBUILD screenie-20120406.ebuild 474 BLAKE2B cfd40ec8d9484b36bb1465c0c678835ace922dde4f15606eb084772145c2d4493c5a90f14f4c6c9deb5cc08ad9e4be8bc54edf04f8fd5c5ca5d862d657b963dd SHA512 3211f3795d0c715e476c09cc6e70624d7d5f4c41fd9451f6dbca78899b4c7335cfe355375ebd8f3eb001ab5ba6cdc9a2ee8d4decfe5edc637c2113a720526fec
MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
MISC metadata.xml 662 BLAKE2B 0c32c03641dcd4c9bb279e3c17ba672258ccfa45ef03dcba773344bad57ed910372425d12debf1af02a15f6a9971e32ca0716b7260b8f641bc84e199c31c423c SHA512 7e94f65c55ea3e466d07eaee0f69f5669da66c02ef433b75c766bdaaf403a88e9124a96cddc6a8621278e36ac68e83cdb197410faf2adfd6255f87ab7469da25

@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<maintainer type="person">
<email>rgkmg25@gmail.com</email>
<name>Robert Kowalski</name>
</maintainer>
<!-- maintainer-needed -->
<longdescription lang="en">
Screenie is a small and lightweight GNU screen(1) frontend that is
designed to be a session handler that simplifies the process of

Binary file not shown.

@ -1,3 +1,5 @@
DIST push-2.0.tar.gz 2211 BLAKE2B 5875962c3aaa2e3eec2dcd3b70a0b5325684dffaf0b01b8f336db835bcfc4b24fc5d28817eb9032d8a10c5759089e2bbf42fba058403ebf420a77bb7d2754c95 SHA512 03c40bd8b3b09473952ecf13edd622533616de47638741214b40856b33993f9310d62be34fac6f68b950f58167c3111082554961a800a43a3ecf8a7d138ffdff
DIST push-3.3.tar.gz 2794 BLAKE2B 98bc36a27e10e4b548f35802eb56ccab0ecd59ae512cde946382653aff0d8744c9908abda748e07b7eb398780a7bc4e2fdbe157b409cc71c9a184d36fe4debb8 SHA512 e0b26af53eb89ba706c681d8fbdc77f7be8d18e02446aa9a1096faa2ead714fcea4687f4dd28c422a598465721b69b075485ef29289effc9c9dd58ed0d915c9a
EBUILD push-2.0-r1.ebuild 640 BLAKE2B b4d5973bc0b1f1a16326c0d886cc7cf844af312e2792524befd0ffb474eedc62a3158387508f8ee7c4ef2fa5166330f33ff7711ad51878cddcdf026df7a99137 SHA512 8922475dbd40d4c4e883d377702ff02355b99494039fc73e45149f11ae6310789cdb80099900705ea1170b72f107ef8aec4ad2e92384271a42cb1feef41b55a5
EBUILD push-3.3.ebuild 666 BLAKE2B 911ba62286ef202a9f9bfdbbca22d8fc97f3d1ab0a7b762756c0aba42901888a71d35f26a5e54e921c0501889cef73111f06e126aa554ffbd542fe313adef227 SHA512 895017850f3600e78e2b35a9b07dfe76feb594933c459be64bf8ded39b747839fea99cb9c9dfdbcbdce82ab3d8dfaeddfec67574a322cb4f5848177e0ac388f8
MISC metadata.xml 698 BLAKE2B 69740256ef4db99512953ae2e9b896410814d64f45c8fd6f2b45628948e1c7bf3ed66e53605c0611e30bf9af75d59b554b6c8bfa942777d55a3db1fb0e4bb944 SHA512 ebd59b8ea97e30788644f33eaa98c2618fa2f90a62bc17bb5c9027253df3c04b6ab1e25671dfcbbf31101bb4cfe2aa2236c7d287a40b49a2b83c09734967fbc1

@ -0,0 +1,20 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
HOMEPAGE="https://github.com/vaeth/push/"
SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
src_compile() { :; }
src_install() {
insinto /usr/share/${PN}
doins bin/push.sh
dodoc README.md
}

@ -1,3 +1,5 @@
DIST quoter-3.0_p2.tar.gz 10691 BLAKE2B 2fb196977c5c16654813e6077c148577e4629da25fb1aaf2131c19e33fbfbc670ad4d9af87611405f0b45a1365bc7b4b3f1b8cad47573ffae4939cc0329d50a4 SHA512 23d77105fa05d79a7d0bcaa3f6aead25b7cb3b6f459d2740314616da587e03cd3e6b0b1e8af8f79904309bbe76603db848d42996ed7ae5ef779e27184a434fb5
DIST quoter-4.2.tar.gz 11128 BLAKE2B 6b13a8eabae57c50c12dcbf9a65e28990ee6d74ee2c45c4a6127f5ed98c2ae029fd5d00f82444c46ab6a21057c6279e9f3d19c432f921d04ca3bf3eaa9507cb0 SHA512 0080ae6d5f5308b9e2f9e414619049f10246c221a9524f9f0dc0d329af3592694ae9d6ef6a086615b895c5f6598fbed7ec7164b5a847d11108fbe3687316c02d
EBUILD quoter-3.0_p2-r1.ebuild 759 BLAKE2B 834746ed908c95f45f09c08e4a93a1e0a054b606628f79a10a48be823660cc73ff2f4157d51438ffb2ac92f6e0fb48559db69025832a994029448b6e6816973d SHA512 8da8ce840b416bfa2ce03e653e33d0ca06dec49b6a43016ef69a164c95b1ac54650e6e4b88432e888536b8e2a2b27c2620dd4dfd5219f028460e7b979051c447
EBUILD quoter-4.2.ebuild 768 BLAKE2B d8824eb44ad83bdcc0630f983f7b2db41af9769c950effd75544dfa492782abe4f3ed02e8ccf7acf5cff69ca4b506c531bcf0391d399fd3fbcba73c7aa8306cb SHA512 0d71a65f004e0de0f8d4d7d614417d80eb9daae4c3fbcdd6fca78dc19a8cd75ef73e915de5dd5c41670accbe7d74fe299b5d5b57096ec237d0a076d1c050ee13
MISC metadata.xml 700 BLAKE2B 6dc4829d807dbc1ed2a511689c3fbe3ceb322236525770a55c86ddb3956bf974a58dedc1c0a7ff74b936e76c8729e1e2463ee0a51ac9e51ac89472a28dcee63f SHA512 c3cda33bc2aedb177d4734ad02cb2dbe0b2d52bc73406ee5277b7db57ff73c047cc174514c516ba3486c1ad5d93d414f77d2655c9cbff9de1820effac312a284

@ -0,0 +1,25 @@
# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit toolchain-funcs
DESCRIPTION="Quote arguments or standard input for usage in POSIX shell by eval"
HOMEPAGE="https://github.com/vaeth/quoter/"
SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
src_configure() {
tc-export CC
}
src_install() {
emake DESTDIR="${ED}" install
rm -f "${ED}"/usr/bin/quoter_pipe.sh || die
insinto /usr/share/${PN}
doins bin/quoter_pipe.sh
}

Binary file not shown.

@ -1,7 +1,5 @@
DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
DIST cb2bib-1.9.9.tar.gz 1292720 BLAKE2B 7263d09ab077d1029129b81abbf7a745405d476776ab91d4b73dc9799b3d945e46283fe565fee32b08df7a8734c027cbeacf0e7a44c4e15efaa6c992c69f9b7a SHA512 66e81ea8d86cdf374c9e1109d26e02c0b3101608e751ab6bbded76cca42eb8c2c1d43f6a993b9003b6013d815683f644bff7513ce63dc750ffa8d608cccb49b3
DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
EBUILD cb2bib-1.9.8.ebuild 1778 BLAKE2B 6d381621b9d13fdc8459c95017a7ffe1814278d86112b843b3f3bfa714a38cf9aa47050ba6ec8d3e10adc8a62f590fa42df4eaca91bab8577fc09170e8ba3c23 SHA512 afbd9c421d77e9b46cb341e41c13929dd7a7169cba634dd54c584c39f5d6757c098c931ab149746acfd3c2a9e9782345a88b4b35da975ad7a2c31585d0e8ca42
EBUILD cb2bib-1.9.9.ebuild 1777 BLAKE2B 3f71e35f3a27fe137e17bfdb0d605fb20b397f1f3144ceb0ce6d14038ef119675cfbd8ae0e3aa54085da54548b21edaf4e8198ab09e2f6ea5354822bda3205b0 SHA512 8092905d8d12e49ae68e204d78289c8a2c6ddf007349e61883183982821248f6a0a04ea946b69e1565c12df3928b06e260a73a85f87b4d781721113fdc4b2767
EBUILD cb2bib-2.0.0.ebuild 1882 BLAKE2B ac145533edc970e58f57da2ddad3269b3af26d780fb4c30ff5d5993fc02e87c720717143a9d7524c8e92eba6b2ec11b27fc463973a49a2d322681df545bc19e0 SHA512 f1200c6efd5b2a03e1d3b181e6b52d0258607bf71a0c09916d31fca8404fdde475f8a989738bff811d3cd72dd53e416b281b40dc7b6c23e3dc841546bcabbae8
EBUILD cb2bib-2.0.0.ebuild 1927 BLAKE2B 9451815c8db5c93694b5f05e5f03d7c24481d19c15ad39f8a7355d24b73e9b7f071913a0425a5037c919812fbbf200e94926d7bbc2297e2d6b55f035d1b6af74 SHA512 6094017c3fab59ec36d301116624806c4c41c40afc50c1954c0b661bbbe8e5da9bfd94e1aef59e0c035338627cb7d42dba17aaec8778a16f0be17fd799578c7e
MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a

@ -1,61 +0,0 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit qmake-utils
DESCRIPTION="Tool for extracting unformatted bibliographic references"
HOMEPAGE="https://www.molspaces.com/cb2bib/"
SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+lzo webengine +webkit"
REQUIRED_USE="?? ( webkit webengine )"
DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
lzo? ( dev-libs/lzo:2 )
webengine? ( dev-qt/qtwebengine:5[widgets] )
webkit? ( dev-qt/qtwebkit:5 )
"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS CHANGELOG COPYRIGHT )
src_prepare() {
default
sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
}
src_configure() {
eqmake5 \
$(use !lzo && echo -config disable_lzo)
}
src_install() {
emake INSTALL_ROOT="${D}" install
einstalldocs
}
pkg_postinst() {
elog "For best functionality, emerge the following packages:"
elog " app-text/poppler[utils] - for data import from PDF files"
elog " app-text/dvipdfm - for data import from DVI files"
elog " app-text/bibutils - for data import from ISI, endnote format"
elog " media-fonts/jsmath - for displaying mathematical notation"
elog " media-libs/exiftool - for proper UTF-8 metadata writing in PDF"
elog " text strings"
elog " virtual/latex-base - to check for BibTeX file correctness and to get"
elog " nice printing through the shell script bib2pdf"
}

@ -43,6 +43,11 @@ src_configure() {
$(use !lzo && echo -config disable_lzo)
}
src_compile() {
# bug #709940
emake -j1
}
src_install() {
emake INSTALL_ROOT="${D}" install
einstalldocs

Binary file not shown.

@ -1,25 +1,7 @@
AUX 5.3-cmake-doc-path.patch 1480 BLAKE2B 5f89253a86fa97fbf4103fbe797f60449245195e9c8d0f6d7f065e654a402de0461459dd11d9d878f0794089261ee5ee9fac3240bf90f7c8382edb54d84b27a6 SHA512 aa2303161af2b53608acc127464951cf77492a1a90e869a58893ba10a014077d7f8f319325b77713fffceeaa002943f4ce52b6cb9571b0b3d3d7ab562601968d
AUX 5.3.10-cxxlinkage.patch 1027 BLAKE2B b3df78658e4fb3243debb6f95cea6c5530db309ffc50f3a6afaff8bce143d147b4645a4bef4a54f6d04203ea132d4245812f5a2473ad7e9899f6e6b3c0799213 SHA512 f4d6df55313ccba995c8bd2e182397ce2652c2fbc0f0706474386654fb890fc47cad3a18f306206e840a47b729569e9a0ccb1cc2401c5280792afc4f544b41fd
AUX 5.3.10-mariadb.patch 1744 BLAKE2B a9e33c86f999394d77757f69f1f314238123fa4158297961b4ce0f501e6fb743927e892c1f6640945842e843da56a826e5da1a968d84f7e5dcf3b2b4a590c0e8 SHA512 ebf62a2e0cc901fce81d0ad358f62d1c41494a5e35fb5a4df6913d1f4d5b8bbb638a23cabfe483818efa39688744b7be8b98d922b4bdff830de701c665da0fa0
AUX 8.0-cmake-doc-path.patch 1384 BLAKE2B 96f2bb290e48363c9cfababb845732291f709a4f996f13ea39cb2dd5fc0a19a68dd87cbf3454fd48c5f2281ebb0f786f2415b6e45f5714c967e5ba5b5005bd5d SHA512 d2a007d9c6846ad22a1f43c621f0376085802f3b15ca846fa1dd5bc8c3fb6ec1dc913240cb1135ab16f9dd369c8680aba5f600c7d28660dd28bb06873d97cce3
AUX 8.0.16-cxxlinkage.patch 1890 BLAKE2B 0b19115acada4abea75466891cced6979011736de9a64686b8ef5ec1f9bfad8c6297ac48f26d3297f24b6817cfaced033a3d42120bfb948cc1e9e7204665abc4 SHA512 460aad29170b8694cc6776553fef8ac15ca715f7dceea392f4a0c75fef98ac6e7a40cdd57c86ae4bcd216b942fa0a2ea92862defc54f8466ea32c74f6a6832e5
AUX cmake-doc-path.patch 1498 BLAKE2B b79110c92b7fc80c64fdf05b469c4bb333d68610ff4fadc78bd307689651e41bcd66f33fd782db1b69c863ef81faee3d5eb485d5c9bd284db8be3948d2bec7e7 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e
AUX myodbc-8.0.19-cxxlinkage.patch 812 BLAKE2B 18e0f62ceb6bb33ad282972a8aae2f755c0324dbff09b450230d7eafb054a37b2f2ea47d6ab9eed42b0ce0682383c6a9e00d222dd5d7c81bb0ea4f4fe470808e SHA512 f4eb1f8c2182a1a6002548a3ef1fa37e859613b8ab31c67c34d6d7f237f435fe2cdada05e75a518d67c05175e5a6535ece55541bfde477df9820a871e83347d3
AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a566668be17f595ca7ba SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e SHA512 02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d SHA512 b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B 6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e SHA512 474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
DIST mysql-connector-odbc-8.0.19-src.tar.gz 3770465 BLAKE2B 7c57d85c13c17c08e1aed1deff3d60851ff68474c42971ea796fc50e3b766d7c49e5d993527691534c30f4007a94be852ac240bf50244cd3adf0f9500fbfc68c SHA512 4761d9d3eeccc932bfd76b9b27be4672e65b6125e85312dcfcb0b8b3cfe0ccf19982d40b2f85ae26e936e968d35d3136bab201b7dcb47eb4ad460c178c0d9f88
DIST mysql-connector-odbc-8.0.20-src.tar.gz 3734268 BLAKE2B 606e8fe88712371da74bee8f44b21a56a2572603b1af693733fdd9ccd7ab62cb16a224593b368a40a021ed87ee433213a1a03b775c07b6bd28bbc44b7f905288 SHA512 483eb5c1d4a75ec4ec8681b33633bf89db708737191d149e1fed3c8bf0f839ab70951982a664fbf078c73fdfc114b126b5146682238faa244c904becf80858d7
DIST mysql-connector-odbc-8.0.21-src.tar.gz 3744268 BLAKE2B d43942cc94858023ae0c2140ffba8a0a676a763b167ef4cbf500b2b9c14d2b3486696f68d03b2cc4607cb7f302e2af25f1e5ce564441ecf6d44a03874e489c07 SHA512 dca83db2ae25e08e44eaf814cad7234c8b17c2935de69bec7d238881404b2bc062fd7e28c626b594a062ee488123be545b9384742e09168e64a1423425a41c40
EBUILD myodbc-5.3.10-r3.ebuild 3591 BLAKE2B 0b7fb7976b32eb39b4e77c1d95011a623eab9ae83f02414911e7408614126a6a838d9ad8142092505c060d4142f1ac3f22f561ab6997e548999626c8c7b1e783 SHA512 73827923259949c1054f52727ec692312c37d887a6f56b8116d83dc9a91a2928ec2bacad723d9b41a32be56aea654cd94959f93237591d0aeb67df69ea563b41
EBUILD myodbc-5.3.9.ebuild 3071 BLAKE2B 505f2c1707196ce3cf18a6923e06a441b61586658456fd4c7785ad8ce05e66794084c72d010a0ec00ee980fa8ec343e1df277ec2547573b81ad10607ba68a694 SHA512 abbc5624fbe6aac4a6dfb2483e697141f6c16ea3ce3060fb5b4e12c3c9c78a50cb1d0678f8967b9383944ae3a3c94d9d9f6f4bdb4b9103ee9d26cc182bdee86a
EBUILD myodbc-8.0.16.ebuild 3101 BLAKE2B 28664fd845b3bfb251e2f754c06b1b21ac1fb0ce85fbcaf620ff4ebea4ee181fe3c2f7c00ff8b47a084dc2e31a893c35f2d28e6176a4a40d508a6b0ebdfd57cd SHA512 856408b130fad4e4fc70fd48d841a2969aa85df46eeebb1d1476e5054b5d78af8e799463a7314f6db4131e4868146d6838c528b85f5bec1c569230231516a2cc
EBUILD myodbc-8.0.17.ebuild 3111 BLAKE2B 4b0f0391bb0b71fc277da100630891bfca04d4ca87c3852eb728c1ba19c3de875654ee7fc1c5c66de1071f9c732c5bd2203ebd83f3654d616617895fa7a936ed SHA512 c5f960395fdb30f398dd182dafd4b75fcb6d7270ac327637e3d2fe169727cb377ee66a4e46e1a14221fc6c7aa34a617d5da636bc96f909eef772f73ec56b6a00
EBUILD myodbc-8.0.19.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
EBUILD myodbc-8.0.20.ebuild 3116 BLAKE2B e1d9057d6619769695a2035f3c130c4a7568a61f7ebdbdd95536d958ccdb0059324a2eecdaa5c9a24e71f3d0ef705218f1d9ff0f7f83f9f8211e58eb9332040c SHA512 89da191c673dd03bdc1189a1b79230158b3dc3d67644a1242e70db4f202b9f5d39aec001c04abe5d6da00f7aab41c1a36fd4815d5484f2373aed6f8a072c1f9a
EBUILD myodbc-8.0.21.ebuild 3113 BLAKE2B e27fc21290dfa09309813f047e0c72bad42c2cc5ca6aa54c3698b0456b42007d3c7676c5062838be9ecb8033d8b1e12dae01a7bc213cd7ce3356bdd30dee7a86 SHA512 f34dc7a7aaa9825c42ffca24cb9ffa136a8e0abeb5de0871bb3413f7b28cc8587fb01768d60ca55434787ca818acb29d97b13b6ba3ef9e3791e38c8f7b445652
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b

@ -1,43 +0,0 @@
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt 2013-03-09 09:51:06 +0000
+++ b/CMakeLists.txt 2013-03-09 11:05:27 +0000
@@ -33,6 +33,12 @@
INCLUDE(version.cmake)
+IF(WITH_DOCUMENTATION_INSTALL_PATH)
+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
+ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
+
#Default is to build both drivers
IF(UNICODE OR NOT ANSI)
MESSAGE(STATUS "Configuring to build Unicode driver")
@@ -329,19 +335,17 @@
ELSE(WIN32)
- INSTALL(FILES ChangeLog DESTINATION .)
- INSTALL(FILES README DESTINATION .)
- INSTALL(FILES README.debug DESTINATION .)
- INSTALL(FILES INSTALL DESTINATION .)
+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH})
IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
- INSTALL(FILES COPYING DESTINATION .)
ELSE()
- INSTALL(FILES LICENSE.mysql DESTINATION .)
ENDIF()
ENDIF(WIN32)
-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH})
INCLUDE(CPack)

@ -1,29 +0,0 @@
diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
--- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500
+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500
@@ -747,7 +747,7 @@
endif()
if(NOT MYSQL_CXXFLAGS)
- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
+ if(MYSQL_CXX_LINKAGE)
_mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
set(MYSQL_CXX_LINKAGE 1)
else()
diff -aurN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500
+++ b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500
@@ -379,10 +379,9 @@
SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
-SET(LIB_SUBDIR "lib")
-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
- SET(LIB_SUBDIR "lib64")
-ENDIF()
+IF(NOT LIB_SUBDIR)
+ MESSAGE(ERROR "LIB_SUBDIR is not set")
+ENDIF(NOT LIB_SUBDIR)
MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")

@ -1,58 +0,0 @@
--- a/include/sys_main.h 2018-01-19 05:36:38.000000000 -0500
+++ b/include/sys_main.h 2018-03-01 11:40:04.554713079 -0500
@@ -20,6 +20,8 @@
extern "C" {
#endif
+#include "sys/mysql/psi/psi_memory.h"
+
#define MY_FAE 8 /* Fatal if any error */
#define MY_WME 16 /* Write message on error */
#define MY_ZEROFILL 32 /* my_malloc(), fill array with zero */
--- a/driver/connect.c 2018-01-19 05:36:38.000000000 -0500
+++ b/driver/connect.c 2018-03-01 11:39:51.458676373 -0500
@@ -179,7 +179,7 @@
/* Set other connection options */
if (ds->allow_big_results || ds->safe)
-#if MYSQL_VERSION_ID >= 50709
+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long);
#else
/* max_allowed_packet is a magical mysql macro. */
@@ -252,7 +252,7 @@
ds_get_utf8attr(ds->rsakey, &ds->rsakey8));
}
#endif
-#if MYSQL_VERSION_ID >= 50710
+#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION)
{
char tls_options[128] = { 0 };
if (!ds->no_tls_1)
@@ -323,7 +323,7 @@
#endif
mysql->options.use_ssl = !ds->disable_ssl_default;
-#if MYSQL_VERSION_ID >= 50703
+#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION)
{
if (ds->ssl_enforce)
{
@@ -332,7 +332,7 @@
}
#endif
-#if MYSQL_VERSION_ID >= 50711
+#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION)
if (ds->sslmode)
{
unsigned int mode = 0;
@@ -510,7 +510,7 @@
}
}
-#if MYSQL_VERSION_ID >= 50709
+#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_len);
#else
// for older versions just use net_buffer_length() macro

@ -1,63 +0,0 @@
diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
--- a/cmake/FindMySQL.cmake 2016-11-29 07:40:13.000000000 -0500
+++ b/cmake/FindMySQL.cmake 2017-02-17 13:59:18.115389096 -0500
@@ -747,7 +747,7 @@
endif()
if(NOT MYSQL_CXXFLAGS)
- if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
+ if(MYSQL_CXX_LINKAGE)
_mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
set(MYSQL_CXX_LINKAGE 1)
else()
diff -aurN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2018-02-10 21:41:13.161553751 -0500
+++ b/CMakeLists.txt 2018-02-10 21:45:20.038398824 -0500
@@ -379,10 +379,9 @@
SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
-SET(LIB_SUBDIR "lib")
-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64|aarch64)")
- SET(LIB_SUBDIR "lib64")
-ENDIF()
+IF(NOT LIB_SUBDIR)
+ MESSAGE(ERROR "LIB_SUBDIR is not set")
+ENDIF(NOT LIB_SUBDIR)
MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
diff -aurN a/driver/CMakeLists.txt b/driver/CMakeLists.txt
--- a/driver/CMakeLists.txt 2019-06-11 13:46:37.863345781 -0400
+++ b/driver/CMakeLists.txt 2019-06-11 14:04:25.758997218 -0400
@@ -194,29 +194,3 @@
ENDWHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
-IF(MYSQL8)
- SET(ssl_libs_to_find
- libcrypto.*
- libssl.*
- libeay32.*
- ssleay32.*
- )
-
- SET(_SSL_PATH)
-
- IF(WIN32)
- SET(_SSL_PATH ${MYSQL_DIR}/bin/)
- ELSE(WIN32)
- SET(_SSL_PATH ${MYSQL_DIR}/lib/)
- ENDIF(WIN32)
-
- FOREACH(_lib_to_find IN LISTS ssl_libs_to_find)
- INSTALL(DIRECTORY ${_SSL_PATH} DESTINATION ${LIB_SUBDIR}
- FILES_MATCHING
- PATTERN "mecab" EXCLUDE
- PATTERN "pkgconfig" EXCLUDE
- PATTERN "plugin" EXCLUDE
- PATTERN ${_lib_to_find})
- ENDFOREACH()
-
-ENDIF(MYSQL8)
\ No newline at end of file

@ -1,43 +0,0 @@
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-03-09 09:51:06 +0000
+++ CMakeLists.txt 2013-03-09 11:05:27 +0000
@@ -33,6 +33,12 @@
SET(CONNECTOR_MAJOR "5")
SET(CONNECTOR_MINOR "2")
+IF(WITH_DOCUMENTATION_INSTALL_PATH)
+ set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
+ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
+ set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
+ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
+
IF(CONNECTOR_MINOR LESS 10)
SET(CONNECTOR_MINOR_PADDED "0${CONNECTOR_MINOR}")
ELSE(CONNECTOR_MINOR LESS 10)
@@ -329,19 +335,17 @@
ELSE(WIN32)
- INSTALL(FILES ChangeLog DESTINATION .)
- INSTALL(FILES README DESTINATION .)
- INSTALL(FILES README.debug DESTINATION .)
- INSTALL(FILES INSTALL DESTINATION .)
+ INSTALL(FILES ChangeLog DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ INSTALL(FILES README DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ INSTALL(FILES README.debug DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ INSTALL(FILES INSTALL DESTINATION ${DOCUMENTATION_INSTALL_PATH})
IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
- INSTALL(FILES COPYING DESTINATION .)
ELSE()
- INSTALL(FILES LICENSE.mysql DESTINATION .)
ENDIF()
ENDIF(WIN32)
-INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION .)
+INSTALL(FILES Licenses_for_Third-Party_Components.txt DESTINATION ${DOCUMENTATION_INSTALL_PATH})
INCLUDE(CPack)

@ -1,130 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# Build is broken with ninja
CMAKE_MAKEFILE_GENERATOR=emake
inherit cmake-multilib flag-o-matic versionator
MAJOR="$(get_version_component_range 1-2 $PV)"
MY_PN="mysql-connector-odbc"
MY_P="${MY_PN}-${PV/_p/r}-src"
DESCRIPTION="ODBC driver for MySQL"
HOMEPAGE="http://www.mysql.com/products/myodbc/"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="${MAJOR}"
KEYWORDS="amd64 ppc x86"
IUSE=""
# Does not build with libmariadb
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
<dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
!>=dev-db/mariadb-10.2.0[client-libs(+)]
!dev-db/mariadb-connector-c[mysqlcompat(-)]
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
# Careful!
DRIVER_NAME="${PN}-${SLOT}"
# Patch document path so it doesn't install files to /usr
PATCHES=(
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/5.3.10-cxxlinkage.patch"
"${FILESDIR}/5.3.10-mariadb.patch"
)
src_prepare() {
# Remove Tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
"${S}/CMakeLists.txt"
# Fix as-needed on the installer binary
# echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
cmake-utils_src_prepare
}
multilib_src_configure() {
# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
mycmakeargs+=(
-DMYSQL_CXX_LINKAGE=0
-DWITH_UNIXODBC=1
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)"
-DMYSQLCLIENT_NO_THREADS=ON
-DDISABLE_GUI=ON
# The NUMA and LIBWRAP options are not really used.
# They are just copied from the server code
-DWITH_NUMA=OFF
-DWITH_LIBWRAP=OFF
)
cmake-utils_src_configure
}
multilib_src_install_all() {
debug-print-function ${FUNCNAME} "$@"
dodir /usr/share/${PN}-${SLOT}
for i in odbc.ini odbcinst.ini; do
einfo "Building $i"
sed \
-e "s,__PN__,${DRIVER_NAME},g" \
-e "s,__PF__,${MAJOR},g" \
-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
>"${D}"/usr/share/${PN}-${SLOT}/${i} \
<"${FILESDIR}"/${i}.m4 \
|| die "Failed to build $i"
done;
mv "${D}/usr/bin/myodbc-installer" \
"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
}
pkg_config() {
[ "${ROOT}" != "/" ] && \
die 'Sorry, non-standard ROOT setting is not supported :-('
local msg='MySQL ODBC driver'
local drivers=$(/usr/bin/odbcinst -q -d)
if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
local sources=$(/usr/bin/odbcinst -q -s)
msg='sample MySQL ODBC DSN'
if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
}
pkg_postinst() {
elog "If this is a new install, please run the following command"
elog "to configure the MySQL ODBC drivers and sources:"
elog "emerge --config =${CATEGORY}/${PF}"
elog "Please note that the driver name used to form the DSN now includes the SLOT."
elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
}

@ -1,112 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MULTILIB_COMPAT=( abi_x86_{32,64} )
inherit multilib-minimal versionator
MAJOR="$(get_version_component_range 1-2 $PV)"
MY_PN="mysql-connector-odbc"
MY_P="${MY_PN}-${PV/_p/r}-linux-debian9-x86"
DESCRIPTION="ODBC driver for MySQL"
HOMEPAGE="http://www.mysql.com/products/myodbc/"
BASE_URI="https://cdn.mysql.com/Downloads/Connector-ODBC/${MAJOR}/${MY_P}"
#https://cdn.mysql.com//Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.8-linux-debian8-x86-64bit.tar.gz
SRC_URI="amd64? ( ${BASE_URI}-64bit.tar.gz abi_x86_32? ( ${BASE_URI}-32bit.tar.gz ) )
x86? ( ${BASE_URI}-32bit.tar.gz )"
LICENSE="GPL-2"
SLOT="${MAJOR}"
KEYWORDS="-* ~amd64 ~x86"
IUSE=""
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]"
S=${WORKDIR}
#src_configure() { :; }
src_compile() { :; }
multilib_src_install() {
cd "${S}" || die
local prefix
if use amd64 && multilib_is_native_abi ; then
prefix="${MY_P}-64bit"
else
prefix="${MY_P}-32bit"
fi
exeinto /usr/$(get_libdir)/${PN}-${MAJOR}
doexe ${prefix}/lib/libmyodbc5a.so ${prefix}/lib/libmyodbc5w.so
# use gtk && doexe ${prefix}/lib/libmyodbc5S.so
}
multilib_src_install_all() {
local DRIVER_NAME="${PN}-${SLOT}"
local prefix
if use amd64 ; then
prefix="${MY_P}-64bit"
else
prefix="${MY_P}-32bit"
fi
exeinto /usr/bin
newexe "${prefix}/bin/myodbc-installer" myodbc-installer-${MAJOR}
dodir /usr/share/${PN}-${SLOT}
for i in odbc.ini odbcinst.ini; do
einfo "Building $i"
sed \
-e "s,__PN__,${DRIVER_NAME},g" \
-e "s,__PF__,${MAJOR},g" \
-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
-e "s,lib/libmyodbc,$(get_libdir)/${DRIVER_NAME}/libmyodbc,g" \
>"${D}/usr/share/${DRIVER_NAME}/${i}" \
<"${FILESDIR}"/${i}.m4 \
|| die "Failed to build $i"
done;
dodoc ${prefix}/{ChangeLog,INSTALL,README,Licenses_for_Third-Party_Components.txt}
}
pkg_config() {
[ "${ROOT}" != "/" ] && \
die 'Sorry, non-standard ROOT setting is not supported :-('
local msg='MySQL ODBC driver'
local drivers=$(/usr/bin/odbcinst -q -d)
if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
local sources=$(/usr/bin/odbcinst -q -s)
msg='sample MySQL ODBC DSN'
if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
}
pkg_postinst() {
elog "If this is a new install, please run the following command"
elog "to configure the MySQL ODBC drivers and sources:"
elog "emerge --config =${CATEGORY}/${PF}"
elog "Please note that the driver name used to form the DSN now includes the SLOT."
elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
}

@ -1,119 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-multilib
MAJOR="$(ver_cut 1-2)"
MY_PN="mysql-connector-odbc"
MY_P="${MY_PN}-${PV/_p/r}-src"
DESCRIPTION="ODBC driver for MySQL"
HOMEPAGE="http://www.mysql.com/products/myodbc/"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="${MAJOR}"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
# Careful!
DRIVER_NAME="${PN}-${SLOT}"
# Patch document path so it doesn't install files to /usr
PATCHES=(
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/8.0.16-cxxlinkage.patch"
)
src_prepare() {
# Remove Tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
"${S}/CMakeLists.txt"
cmake-utils_src_prepare
}
multilib_src_configure() {
mycmakeargs+=(
-DMYSQLCLIENT_STATIC_LINKING=1
-DMYSQL_CXX_LINKAGE=1
-DWITH_UNIXODBC=1
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-DMYSQLCLIENT_NO_THREADS=ON
-DDISABLE_GUI=ON
# The NUMA and LIBWRAP options are not really used.
# They are just copied from the server code
-DWITH_NUMA=OFF
-DWITH_LIBWRAP=OFF
)
cmake-utils_src_configure
}
multilib_src_install_all() {
debug-print-function ${FUNCNAME} "$@"
dodir /usr/share/${PN}-${SLOT}
for i in odbc.ini odbcinst.ini; do
einfo "Building $i"
sed \
-e "s,__PN__,${DRIVER_NAME},g" \
-e "s,__PF__,${MAJOR},g" \
-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
>"${D}"/usr/share/${PN}-${SLOT}/${i} \
<"${FILESDIR}"/${i}.m4 \
|| die "Failed to build $i"
done;
mv "${D}/usr/bin/myodbc-installer" \
"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
}
pkg_config() {
[ "${ROOT}" != "/" ] && \
die 'Sorry, non-standard ROOT setting is not supported :-('
local msg='MySQL ODBC driver'
local drivers=$(/usr/bin/odbcinst -q -d)
if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
local sources=$(/usr/bin/odbcinst -q -s)
msg='sample MySQL ODBC DSN'
if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
}
pkg_postinst() {
elog "If this is a new install, please run the following command"
elog "to configure the MySQL ODBC drivers and sources:"
elog "emerge --config =${CATEGORY}/${PF}"
elog "Please note that the driver name used to form the DSN now includes the SLOT."
elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
}

@ -1,119 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-multilib
MAJOR="$(ver_cut 1-2)"
MY_PN="mysql-connector-odbc"
MY_P="${MY_PN}-${PV/_p/r}-src"
DESCRIPTION="ODBC driver for MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="${MAJOR}"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
# Careful!
DRIVER_NAME="${PN}-${SLOT}"
# Patch document path so it doesn't install files to /usr
PATCHES=(
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/8.0.16-cxxlinkage.patch"
)
src_prepare() {
# Remove Tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
"${S}/CMakeLists.txt"
cmake-utils_src_prepare
}
multilib_src_configure() {
mycmakeargs+=(
-DMYSQLCLIENT_STATIC_LINKING=1
-DMYSQL_CXX_LINKAGE=1
-DWITH_UNIXODBC=1
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-DMYSQLCLIENT_NO_THREADS=ON
-DDISABLE_GUI=ON
# The NUMA and LIBWRAP options are not really used.
# They are just copied from the server code
-DWITH_NUMA=OFF
-DWITH_LIBWRAP=OFF
)
cmake-utils_src_configure
}
multilib_src_install_all() {
debug-print-function ${FUNCNAME} "$@"
dodir /usr/share/${PN}-${SLOT}
for i in odbc.ini odbcinst.ini; do
einfo "Building $i"
sed \
-e "s,__PN__,${DRIVER_NAME},g" \
-e "s,__PF__,${MAJOR},g" \
-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
>"${D}"/usr/share/${PN}-${SLOT}/${i} \
<"${FILESDIR}"/${i}.m4 \
|| die "Failed to build $i"
done;
mv "${D}/usr/bin/myodbc-installer" \
"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
}
pkg_config() {
[ "${ROOT}" != "/" ] && \
die 'Sorry, non-standard ROOT setting is not supported :-('
local msg='MySQL ODBC driver'
local drivers=$(/usr/bin/odbcinst -q -d)
if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
local sources=$(/usr/bin/odbcinst -q -s)
msg='sample MySQL ODBC DSN'
if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
}
pkg_postinst() {
elog "If this is a new install, please run the following command"
elog "to configure the MySQL ODBC drivers and sources:"
elog "emerge --config =${CATEGORY}/${PF}"
elog "Please note that the driver name used to form the DSN now includes the SLOT."
elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
}

@ -1,118 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-multilib
MAJOR="$(ver_cut 1-2)"
MY_PN="mysql-connector-odbc"
MY_P="${MY_PN}-${PV/_p/r}-src"
DESCRIPTION="ODBC driver for MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="${MAJOR}"
KEYWORDS="amd64 ppc x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
# Careful!
DRIVER_NAME="${PN}-${SLOT}"
# Patch document path so it doesn't install files to /usr
PATCHES=(
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
)
src_prepare() {
# Remove Tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
"${S}/CMakeLists.txt"
cmake-utils_src_prepare
}
multilib_src_configure() {
mycmakeargs+=(
-DMYSQLCLIENT_STATIC_LINKING=1
-DMYSQL_CXX_LINKAGE=1
-DWITH_UNIXODBC=1
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-DMYSQLCLIENT_NO_THREADS=ON
-DDISABLE_GUI=ON
# The NUMA and LIBWRAP options are not really used.
# They are just copied from the server code
-DWITH_NUMA=OFF
-DWITH_LIBWRAP=OFF
)
cmake-utils_src_configure
}
multilib_src_install_all() {
debug-print-function ${FUNCNAME} "$@"
dodir /usr/share/${PN}-${SLOT}
for i in odbc.ini odbcinst.ini; do
einfo "Building $i"
sed \
-e "s,__PN__,${DRIVER_NAME},g" \
-e "s,__PF__,${MAJOR},g" \
-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
>"${D}"/usr/share/${PN}-${SLOT}/${i} \
<"${FILESDIR}"/${i}.m4 \
|| die "Failed to build $i"
done;
mv "${D}/usr/bin/myodbc-installer" \
"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
}
pkg_config() {
[ "${ROOT}" != "/" ] && \
die 'Sorry, non-standard ROOT setting is not supported :-('
local msg='MySQL ODBC driver'
local drivers=$(/usr/bin/odbcinst -q -d)
if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
local sources=$(/usr/bin/odbcinst -q -s)
msg='sample MySQL ODBC DSN'
if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
}
pkg_postinst() {
elog "If this is a new install, please run the following command"
elog "to configure the MySQL ODBC drivers and sources:"
elog "emerge --config =${CATEGORY}/${PF}"
elog "Please note that the driver name used to form the DSN now includes the SLOT."
elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
}

@ -1,118 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-multilib
MAJOR="$(ver_cut 1-2)"
MY_PN="mysql-connector-odbc"
MY_P="${MY_PN}-${PV/_p/r}-src"
DESCRIPTION="ODBC driver for MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="${MAJOR}"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
# Broken when built dynamically against libmysqlclient.so
RDEPEND="
dev-db/unixODBC[${MULTILIB_USEDEP}]
>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
# Careful!
DRIVER_NAME="${PN}-${SLOT}"
# Patch document path so it doesn't install files to /usr
PATCHES=(
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
)
src_prepare() {
# Remove Tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
"${S}/CMakeLists.txt"
cmake-utils_src_prepare
}
multilib_src_configure() {
mycmakeargs+=(
-DMYSQLCLIENT_STATIC_LINKING=1
-DMYSQL_CXX_LINKAGE=1
-DWITH_UNIXODBC=1
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
-DMYSQLCLIENT_NO_THREADS=ON
-DDISABLE_GUI=ON
# The NUMA and LIBWRAP options are not really used.
# They are just copied from the server code
-DWITH_NUMA=OFF
-DWITH_LIBWRAP=OFF
)
cmake-utils_src_configure
}
multilib_src_install_all() {
debug-print-function ${FUNCNAME} "$@"
dodir /usr/share/${PN}-${SLOT}
for i in odbc.ini odbcinst.ini; do
einfo "Building $i"
sed \
-e "s,__PN__,${DRIVER_NAME},g" \
-e "s,__PF__,${MAJOR},g" \
-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
>"${D}"/usr/share/${PN}-${SLOT}/${i} \
<"${FILESDIR}"/${i}.m4 \
|| die "Failed to build $i"
done;
mv "${D}/usr/bin/myodbc-installer" \
"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
}
pkg_config() {
[ "${ROOT}" != "/" ] && \
die 'Sorry, non-standard ROOT setting is not supported :-('
local msg='MySQL ODBC driver'
local drivers=$(/usr/bin/odbcinst -q -d)
if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
local sources=$(/usr/bin/odbcinst -q -s)
msg='sample MySQL ODBC DSN'
if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
ebegin "Installing ${msg}"
/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
rc=$?
eend $rc
[ $rc -ne 0 ] && die
else
einfo "Skipping already installed ${msg}"
fi
}
pkg_postinst() {
elog "If this is a new install, please run the following command"
elog "to configure the MySQL ODBC drivers and sources:"
elog "emerge --config =${CATEGORY}/${PF}"
elog "Please note that the driver name used to form the DSN now includes the SLOT."
elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
}

@ -1,18 +1,6 @@
AUX 20028_all_mysql-5.6-gcc7.patch 603 BLAKE2B f03dc2e39dca4496cc084b427daa60014464876df456bf290a5de3431b481691a35ac9ac00d71cc86931efe3bca70dae012bedefc6d29ad7fec2feeb07cce014 SHA512 f9dab813418f38f3a877b8672cdec153d6f0f289144c35277e8275cc7a58195f974b7bf76b74f8dd2403643b1199f5e6d6bcde661ce5f79f614ff10347b52278
AUX 6.1.11-openssl-1.1.patch 8987 BLAKE2B 8bd00bb778e086cbdcd04b6ac904f36bd64bbbb332f913129eb3acbaf6da4d044fdc65523626a9fed47d6bf5859826af489bd9ae7ae51664c613c966a88708ba SHA512 46af56504ed2a69ce74a5e2040ee8b3355f5ac48fb80e4668b635f01a2650d07f50dd098ad43239e8b35a80e975a5a9549bd1b1a9c1a0612ed9e4750b537bb76
AUX mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch 684 BLAKE2B 10007011b38462ffa8b539f9ac531c715fcead4e6bb1d1c04ea8055decc0aa6eda8b22e3967d91773316d04062ca231cf8561ce72ab2b5aaeaf37a0bb425c7f5 SHA512 d0e60dff5faa7b6c71878803d598b46266021029c874c8f6834d496de10ddf42d3b806fae3c6d532c1890cb5f491bbd69235bd1ac919848011a9ca57c465ce1c
AUX mysql-connector-c-8.0.18-always-build-decompress-utilities.patch 874 BLAKE2B 1622ba22ebb68d8b72499efec3075bbbe157b1ceaab5651dbc6dea996c831159161878a859972119dd4d5c20bb631681efb00b8d9715b3097890def8016898f4 SHA512 02ae005e8ac710dcc75f07011006df63a6d22f030b4eff0c6d28f78b083b1d7385190c9080812b5c9c2a84ad66972594b7d79a1485285c9ad76245577d42e528
AUX mysql-connector-c-8.0.19-do-not-install-comp_err.patch 307 BLAKE2B 864c07e9d4fb9a38ac418476f4b7738caa1f2a5dc633ad5921859793983c7b42acd87263ce2703df5a8c7d3bc3d7a60efb28a3ff17c311d89cc7b12edd22574f SHA512 cbb9be24a67a649b68230fe3482063d2d16fb629233e070289eb1ab0011bd8c43b0c056e4b6ca430a62ce0e8f47bb9490cb6746b7dc3fe06a05670b078cd084f
AUX mysql-connector-c-8.0.19-libressl.patch 10501 BLAKE2B 73a31afdbbb591cadd45f158ca16c39344f540459b20683e5998f0e0f0d593dfd06e7198d3d8a5e06f8e65ff6b7a5f79435a1face9997f3316e487ef1e081459 SHA512 1d8e75e8ba6866ff4d0dced7211607e41033bbdfabd0f8a670ac221e7366e272cfc2b9c4d0f259e5d33ed486e9697bcefbdb0e6a0cd65ed2811b63e9cf1610f3
AUX mysql-connector-c-8.0.20-libressl.patch 11923 BLAKE2B a545f2570e744cce7e4e59109daebfd2f29d2065bfeadbb48f9d910c3d2d24e5fe24064e6453e6f423a241b59a69f26492a0cd82801e81f2eec13674291a4abe SHA512 cee40efd1ce9806fb36d0d36374b2d231a45553a2ff595d5e752f1b0ae80a9bb61cfeaa7a280f51f290580de777517524eac563028c747dbc2ac7b269cc1dcb4
AUX mysql-connector-c-8.0.21-libressl.patch 13288 BLAKE2B 5aad519f99103e579356d89ae92dda1e2496268cebdfe8dd3797138a5efe03370365225581399bb2373b847f61e2b4be726d940cde624d3cdda94b5c69904a3a SHA512 f4d057ce159153133e100c71c65f75bd558ba1ea914cd878023dc4e4a628d63b60d0ac671a97d26863b3f48c3dc8984317bb09362378c3b96b8ed47f08c1f6ea
AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49
DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B 2aeb9d6c575ed9dc2d00d3e51e6391c59ffa39156491d9ed2c07e19bb2efb88a14d5a9d4b537c137d71854e39fa3a7fc2b93618118d4fd062e92ba2d83783c6f SHA512 7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
DIST mysql-boost-8.0.21.tar.gz 278292192 BLAKE2B 9e5a14d1401f58f6f620c8691d2d4d3ada122a79a4e081380050961f0add93bf32b682c60ea2a6e58f50a4fcedbd323d8efe2d5f3e1f2bba5010e201a2df5d44 SHA512 18128edd7d9604ea69bd308f372d6663ef3629503969148e3a2117175c4ef625358b31b96e0e1b8d10a87037719e3cb61d5c71eee1e26ab0e0a1731977a2d7c1
DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
EBUILD mysql-connector-c-6.1.11-r2.ebuild 2287 BLAKE2B 831b0960af0f087357840434bf61ef773df2a98357fec736c9279fff8f44e9d68384aca45381aa9b332137f5ba6b3ab9478fb3c21169893a520f9017508ee827 SHA512 f06aef9d2d5e2bc0a607d66d10b7cd755e34cf5167f0fb2b2ed5595f50b8f8d6f41e839879c343ec272121f4c1c1d71ff6ada70e40f7cd9ea69b8fd385b85abd
EBUILD mysql-connector-c-8.0.19.ebuild 2927 BLAKE2B 37b57beb51549b94d75bf1695b93914042303f933e5294e9b73804ab7a6bae986ac89db6e648f78e9b1fcf106cfab143f4942da76ed930cf71b5f14fde9c7709 SHA512 d6404f3558f254a08702dea0036d346155e83dc6695b1237e0da9d17cb5aa85e32a3c60195d461cf33d976be2ec9af2519abb16aab16a1b73c27c34e38bd88b2
EBUILD mysql-connector-c-8.0.20.ebuild 2936 BLAKE2B cc7571d0d64f102259368c247f8c992997965f985b3582c72d36457798e6341844f349b4de635dd0a94bb2092505e071eff4de64b8e96f90f145123a8f6b462a SHA512 5b7b0134429713e44c6c4f98ce8b04cdd0bedc9520c72772a274cb522a3590e856455553cbb83d868b3fee606e9a00fff233a6358bb0d635811d4c2a0b1f5450
EBUILD mysql-connector-c-8.0.21.ebuild 2839 BLAKE2B dac1542e11fb5c720e2f998ca134eb8e539fa3aa9db829c6615a8fdefe9f6118c843425842490cdb9c73f1a350189520b7c68e8b9272903c570ca6ef2c080910 SHA512 77eb2585f3609bb4a9cef61724d922881411129374e812e20b6c46f348361919534d3c46e6f6cd82dd17991c2426faaf4ead48ea0df7f88dabff2a3336f9b0bb
EBUILD mysql-connector-c-8.0.21.ebuild 2838 BLAKE2B 6c6d62c6c85132ed172062c0d2d13d06534a74895a60be1d3f56af025e47a1e5ae983ac4bc574de1a0f874c9477a9df8fbd0dd0b3abad15266674e9e525f70e6 SHA512 ef52ef79aae5ac28dca32d85444f04a2b95c620e2a9c4ea6315bb0e78c1ebea0f1caccee8cdc6ebab45db7cf314d03aca7a0bd156af3dc120524e059a3f9aa09
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b

@ -1,13 +0,0 @@
diff --git a/sql-common/client_authentication.cc b/sql-common/client_authentication.cc
index eaeb2d4..035ecd2 100644
--- a/sql-common/client_authentication.cc
+++ b/sql-common/client_authentication.cc
@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
if (mysql->options.extension != NULL &&
mysql->options.extension->server_public_key_path != NULL &&
- mysql->options.extension->server_public_key_path != '\0')
+ mysql->options.extension->server_public_key_path[0] != '\0')
{
pub_key_file= fopen(mysql->options.extension->server_public_key_path,
"r");

@ -1,300 +0,0 @@
From 7961393dd45e4ad1cdc7544b4bba2e98a5d2760c Mon Sep 17 00:00:00 2001
From: eroen <eroen@occam.eroen.eu>
Date: Fri, 20 Jan 2017 14:43:53 +0100
Subject: [PATCH] Don't use deprecated API with openssl 1.1
If openssl 1.1.0 is built with `--api=1.1 disable-deprecated`, using
deprecated APIs causes build errors.
X-Gentoo-Bug: 606600
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=606600
---
mysys_ssl/my_aes_openssl.cc | 54 ++++++++++++++++++++++++++++++++-------------
sql-common/client.c | 16 ++++++++++++--
vio/viossl.c | 8 +++++++
vio/viosslfactories.c | 23 +++++++++++++++++++
4 files changed, 84 insertions(+), 17 deletions(-)
diff --git a/mysys_ssl/my_aes_openssl.cc b/mysys_ssl/my_aes_openssl.cc
index 261ba8a..59a95e3 100644
--- a/mysys_ssl/my_aes_openssl.cc
+++ b/mysys_ssl/my_aes_openssl.cc
@@ -22,6 +22,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/bio.h>
+#include <openssl/opensslv.h>
+
+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
+#undef OPENSSL_VERSION_NUMBER
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
+#endif
/*
xplugin needs BIO_new_bio_pair, but the server does not.
@@ -122,7 +128,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,
enum my_aes_opmode mode, const unsigned char *iv,
bool padding)
{
- EVP_CIPHER_CTX ctx;
+ EVP_CIPHER_CTX *ctx;
const EVP_CIPHER *cipher= aes_evp_type(mode);
int u_len, f_len;
/* The real key to be used for encryption */
@@ -132,23 +138,31 @@ int my_aes_encrypt(const unsigned char *source, uint32 source_length,
if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
- if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
+ if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
goto aes_error; /* Error */
- if (!EVP_CIPHER_CTX_set_padding(&ctx, padding))
+ if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
goto aes_error; /* Error */
- if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
+ if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
goto aes_error; /* Error */
- if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
+ if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else
+ EVP_CIPHER_CTX_free(ctx);
+#endif
return u_len + f_len;
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else
+ EVP_CIPHER_CTX_free(ctx);
+#endif
return MY_AES_BAD_DATA;
}
@@ -159,7 +173,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
bool padding)
{
- EVP_CIPHER_CTX ctx;
+ EVP_CIPHER_CTX *ctx;
const EVP_CIPHER *cipher= aes_evp_type(mode);
int u_len, f_len;
@@ -170,24 +184,34 @@ int my_aes_decrypt(const unsigned char *source, uint32 source_length,
if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
return MY_AES_BAD_DATA;
- EVP_CIPHER_CTX_init(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_init(ctx);
+#endif
- if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
+ if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
goto aes_error; /* Error */
- if (!EVP_CIPHER_CTX_set_padding(&ctx, padding))
+ if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
goto aes_error; /* Error */
- if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
+ if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
goto aes_error; /* Error */
- if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
+ if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
goto aes_error; /* Error */
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else
+ EVP_CIPHER_CTX_free(ctx);
+#endif
return u_len + f_len;
aes_error:
/* need to explicitly clean up the error if we want to ignore it */
ERR_clear_error();
- EVP_CIPHER_CTX_cleanup(&ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ EVP_CIPHER_CTX_cleanup(ctx);
+#else
+ EVP_CIPHER_CTX_free(ctx);
+#endif
return MY_AES_BAD_DATA;
}
diff --git a/sql-common/client.c b/sql-common/client.c
index 9e88e9f..fe7daf7 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -86,6 +86,14 @@ my_bool net_flush(NET *net);
# include <sys/un.h>
#endif
+#ifdef HAVE_OPENSSL
+#include <openssl/opensslv.h>
+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
+#undef OPENSSL_VERSION_NUMBER
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
+#endif
+#endif
+
#ifndef _WIN32
#include <errno.h>
#define SOCKET_ERROR -1
@@ -2685,7 +2693,7 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
{
SSL *ssl;
X509 *server_cert= NULL;
- char *cn= NULL;
+ const char *cn= NULL;
int cn_loc= -1;
ASN1_STRING *cn_asn1= NULL;
X509_NAME_ENTRY *cn_entry= NULL;
@@ -2757,7 +2765,11 @@ static int ssl_verify_server_cert(Vio *vio, const char* server_hostname, const c
goto error;
}
- cn= (char *) ASN1_STRING_data(cn_asn1);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ cn= (const char *) ASN1_STRING_data(cn_asn1);
+#else
+ cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
+#endif
// There should not be any NULL embedded in the CN
if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git a/vio/viossl.c b/vio/viossl.c
index 5622cb7..94b0f09 100644
--- a/vio/viossl.c
+++ b/vio/viossl.c
@@ -24,6 +24,12 @@
#ifdef HAVE_OPENSSL
+#include <openssl/opensslv.h>
+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
+#undef OPENSSL_VERSION_NUMBER
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
+#endif
+
#ifndef DBUG_OFF
static void
@@ -310,8 +316,10 @@ void vio_ssl_delete(Vio *vio)
}
#ifndef HAVE_YASSL
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_remove_thread_state(0);
#endif
+#endif
vio_delete(vio);
}
@@ -427,7 +427,12 @@
for (j = 0; j < n; j++)
{
SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DBUG_PRINT("info", (" %d: %s\n", c->id, c->name));
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ DBUG_PRINT("info",
+ (" %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
}
}
#endif
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c
index da5449a..87b30c3 100644
--- a/vio/viosslfactories.c
+++ b/vio/viosslfactories.c
@@ -16,6 +16,14 @@
#include "vio_priv.h"
#ifdef HAVE_OPENSSL
+#include <openssl/bn.h>
+#include <openssl/dh.h>
+#include <openssl/opensslv.h>
+
+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
+#undef OPENSSL_VERSION_NUMBER
+#define OPENSSL_VERSION_NUMBER 0x1000107fL
+#endif
#define TLS_VERSION_OPTION_SIZE 256
#define SSL_CIPHER_LIST_SIZE 4096
@@ -121,10 +129,18 @@ static DH *get_dh2048(void)
DH *dh;
if ((dh=DH_new()))
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
if (! dh->p || ! dh->g)
{
+#else
+ if (! DH_set0_pqg(dh,
+ BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL),
+ NULL,
+ BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL)))
+ {
+#endif
DH_free(dh);
dh=0;
}
@@ -247,6 +263,8 @@ typedef struct CRYPTO_dynlock_value
} openssl_lock_t;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+
/* Array of locks used by openssl internally for thread synchronization.
The number of locks is equal to CRYPTO_num_locks.
*/
@@ -389,9 +407,11 @@ static void deinit_lock_callback_functions()
{
set_lock_callback_functions(FALSE);
}
+#endif
void vio_ssl_end()
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
int i= 0;
if (ssl_initialized) {
@@ -409,6 +429,7 @@ void vio_ssl_end()
ssl_initialized= FALSE;
}
+#endif
}
#endif //OpenSSL specific
@@ -419,6 +440,7 @@ void ssl_start()
{
ssl_initialized= TRUE;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_library_init();
OpenSSL_add_all_algorithms();
SSL_load_error_strings();
@@ -427,6 +449,7 @@ void ssl_start()
init_ssl_locks();
init_lock_callback_functions();
#endif
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
}
}
--
2.11.0

@ -1,24 +0,0 @@
https://bugs.gentoo.org/692644
--- a/include/mysql.h.pp
+++ b/include/mysql.h.pp
@@ -175,7 +175,7 @@ struct rand_struct {
unsigned long seed1, seed2, max_value;
double max_value_dbl;
};
-#include <mysql/udf_registration_types.h>
+#include "mysql/udf_registration_types.h"
enum Item_result {
INVALID_RESULT = -1,
STRING_RESULT = 0,
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -1002,7 +1002,7 @@ struct rand_struct {
};
/* Include the types here so existing UDFs can keep compiling */
-#include <mysql/udf_registration_types.h>
+#include "mysql/udf_registration_types.h"
/**
@addtogroup group_cs_compresson_constants Constants when using compression

@ -1,297 +0,0 @@
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -229,13 +229,14 @@ MACRO (MYSQL_CHECK_SSL)
OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
)
ENDIF()
- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
+ IF(HAVE_TLS1_3_VERSION)
ADD_DEFINITIONS(-DHAVE_TLSv13)
ENDIF()
IF(OPENSSL_INCLUDE_DIR AND
OPENSSL_LIBRARY AND
CRYPTO_LIBRARY AND
- OPENSSL_MAJOR_VERSION STREQUAL "1"
+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
)
SET(OPENSSL_FOUND TRUE)
FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
--- a/mysys/my_md5.cc
+++ b/mysys/my_md5.cc
@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
int compute_md5_hash(char *digest, const char *buf, int len) {
int retval = 0;
int fips_mode = 0;
+#ifndef LIBRESSL_VERSION_NUMBER
fips_mode = FIPS_mode();
+#endif
/* If fips mode is ON/STRICT restricted method calls will result into abort,
* skipping call. */
if (fips_mode == 0) {
--- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
@@ -329,6 +329,7 @@ error:
return 1;
}
+#ifndef LIBRESSL_VERSION_NUMBER
#define OPENSSL_ERROR_LENGTH 512
static int configure_ssl_fips_mode(const uint fips_mode) {
int rc = -1;
@@ -352,6 +353,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
EXIT:
return rc;
}
+#endif
static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
const char *ca_path) {
@@ -555,10 +557,12 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
int verify_server = SSL_VERIFY_NONE;
int verify_client = SSL_VERIFY_NONE;
+#ifndef LIBRESSL_VERSION_NUMBER
if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
G_ERROR("Error setting the ssl fips mode");
goto error;
}
+#endif
SSL_library_init();
SSL_load_error_strings();
@@ -622,7 +626,7 @@ error:
void xcom_cleanup_ssl() {
if (!xcom_use_ssl()) return;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
}
--- a/plugin/x/client/xconnection_impl.cc
+++ b/plugin/x/client/xconnection_impl.cc
@@ -520,6 +520,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
return XError(CR_SSL_CONNECTION_ERROR, buffer);
}
+#ifndef LIBRESSL_VERSION_NUMBER
/**
Set fips mode in openssl library,
When we set fips mode ON/STRICT, it will perform following operations:
@@ -559,6 +560,7 @@ int set_fips_mode(const uint32_t fips_mode,
EXIT:
return rc;
}
+#endif
XError Connection_impl::activate_tls() {
if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
@@ -569,12 +571,14 @@ XError Connection_impl::activate_tls() {
if (!m_context->m_ssl_config.is_configured())
return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
+#ifndef LIBRESSL_VERSION_NUMBER
char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
if (set_fips_mode(
static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
err_string) != 1) {
return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
}
+#endif
auto ssl_ctx_flags = process_tls_version(
details::null_when_empty(m_context->m_ssl_config.m_tls_version));
--- a/router/src/http/src/tls_client_context.cc
+++ b/router/src/http/src/tls_client_context.cc
@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) {
void TlsClientContext::cipher_suites(const std::string &ciphers) {
// TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
+#ifdef TLS1_3_VERSION
if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) {
throw TlsError("set-cipher-suites");
}
--- a/router/src/http/src/tls_context.cc
+++ b/router/src/http/src/tls_context.cc
@@ -91,7 +91,7 @@ static int o11x_version(TlsVersion version) {
return TLS1_1_VERSION;
case TlsVersion::TLS_1_2:
return TLS1_2_VERSION;
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
+#ifdef TLS1_3_VERSION
case TlsVersion::TLS_1_3:
return TLS1_3_VERSION;
#endif
@@ -120,9 +120,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) {
switch (min_version) {
default:
// unknown, leave all disabled
+#ifdef TLS1_3_VERSION
// fallthrough
case TlsVersion::TLS_1_3:
opts |= SSL_OP_NO_TLSv1_2;
+#endif
// fallthrough
case TlsVersion::TLS_1_2:
opts |= SSL_OP_NO_TLSv1_1;
@@ -170,8 +172,10 @@ TlsVersion TlsContext::min_version() const {
return TlsVersion::TLS_1_1;
case TLS1_2_VERSION:
return TlsVersion::TLS_1_2;
+#ifdef TLS1_3_VERSION
case TLS1_3_VERSION:
return TlsVersion::TLS_1_3;
+#endif
case 0:
return TlsVersion::AUTO;
default:
@@ -230,7 +234,8 @@ TlsContext::InfoCallback TlsContext::info_callback() const {
}
int TlsContext::security_level() const {
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
+ !defined(LIBRESSL_VERSION_NUMBER)
return SSL_CTX_get_security_level(ssl_ctx_.get());
#else
return 0;
--- a/router/src/http/src/tls_server_context.cc
+++ b/router/src/http/src/tls_server_context.cc
@@ -166,7 +166,8 @@ void TlsServerContext::init_tmp_dh(const std::string &dh_params) {
}
} else {
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
+ !defined(LIBRESSL_VERSION_NUMBER)
dh2048.reset(DH_get_2048_256());
#else
/*
--- a/sql-common/client.cc
+++ b/sql-common/client.cc
@@ -7730,7 +7730,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
#endif
break;
case MYSQL_OPT_SSL_FIPS_MODE: {
-#if defined(HAVE_OPENSSL)
+#if defined(HAVE_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
ENSURE_EXTENSIONS_PRESENT(&mysql->options);
mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4818,7 +4818,7 @@ static int init_thread_environment() {
static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define FILE_LINE_ARGS
#else
#define FILE_LINE_ARGS , const char *, int
@@ -4854,12 +4854,14 @@ static void init_ssl() {
}
static int init_ssl_communication() {
+#ifndef LIBRESSL_VERSION_NUMBER
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
if (ret_fips_mode != 1) {
LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
return 1;
}
+#endif
if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -4417,6 +4417,7 @@ static Sys_var_ulong Sys_max_execution_time(
HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
+#ifndef LIBRESSL_VERSION_NUMBER
static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
@@ -4427,15 +4428,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
return false;
}
}
+#endif
+#if defined(LIBRESSL_VERSION_NUMBER)
+static const char *ssl_fips_mode_names[] = {"OFF", 0};
+#else
static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
+#endif
static Sys_var_enum Sys_ssl_fips_mode(
"ssl_fips_mode",
"SSL FIPS mode (applies only for OpenSSL); "
+#ifndef LIBRESSL_VERSION_NUMBER
"permitted values are: OFF, ON, STRICT",
+#else
+ "permitted values are: OFF",
+#endif
GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
- ON_CHECK(NULL), ON_UPDATE(update_fips_mode), NULL);
+ ON_CHECK(NULL),
+#ifndef LIBRESSL_VERSION_NUMBER
+ ON_UPDATE(update_fips_mode),
+#else
+ ON_UPDATE(NULL),
+#endif
+ NULL);
#if defined(HAVE_OPENSSL)
static Sys_var_bool Sys_auto_generate_certs(
--- a/vio/viossl.cc
+++ b/vio/viossl.cc
@@ -45,7 +45,7 @@
BIO_set_callback_ex was added in openSSL 1.1.1
For older openSSL, use the deprecated BIO_set_callback.
*/
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
#define HAVE_BIO_SET_CALLBACK_EX
#endif
@@ -637,7 +637,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
#if !defined(DBUG_OFF)
{
STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
- ssl_comp_methods = SSL_COMP_get_compression_methods();
+ ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
n = sk_SSL_COMP_num(ssl_comp_methods);
DBUG_PRINT("info", ("Available compression methods:\n"));
if (n == 0)
@@ -645,7 +645,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
else
for (j = 0; j < n; j++) {
SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
DBUG_PRINT("info", (" %d: %s\n", c->id, c->name));
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
DBUG_PRINT("info",
--- a/vio/viosslfactories.cc
+++ b/vio/viosslfactories.cc
@@ -420,6 +420,7 @@ void ssl_start() {
}
}
+#ifndef LIBRESSL_VERSION_NUMBER
/**
Set fips mode in openssl library,
When we set fips mode ON/STRICT, it will perform following operations:
@@ -473,6 +474,7 @@ EXIT:
@returns openssl current fips mode
*/
uint get_fips_mode() { return FIPS_mode(); }
+#endif
long process_tls_version(const char *tls_version) {
const char *separator = ",";

@ -1,332 +0,0 @@
From 2108922a8292d74874ede834158c208d81c3cf76 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Thu, 30 Apr 2020 20:01:48 +0200
Subject: [PATCH 5/5] Add LibreSSL support
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
cmake/ssl.cmake | 5 +++--
mysys/my_md5.cc | 2 ++
.../bindings/xcom/xcom/xcom_ssl_transport.c | 6 +++++-
plugin/x/client/xconnection_impl.cc | 4 ++++
router/src/http/src/tls_client_context.cc | 2 +-
router/src/http/src/tls_context.cc | 9 ++++++--
router/src/http/src/tls_server_context.cc | 3 ++-
sql-common/client.cc | 2 ++
sql/mysqld.cc | 4 +++-
sql/sys_vars.cc | 21 +++++++++++++++++--
vio/viossl.cc | 8 +++----
vio/viosslfactories.cc | 2 ++
12 files changed, 54 insertions(+), 14 deletions(-)
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -222,13 +222,14 @@ MACRO (MYSQL_CHECK_SSL)
OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
)
ENDIF()
- IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
+ IF(HAVE_TLS1_3_VERSION)
ADD_DEFINITIONS(-DHAVE_TLSv13)
ENDIF()
IF(OPENSSL_INCLUDE_DIR AND
OPENSSL_LIBRARY AND
CRYPTO_LIBRARY AND
- OPENSSL_MAJOR_VERSION STREQUAL "1"
+ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
)
SET(OPENSSL_FOUND TRUE)
FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
--- a/mysys/my_md5.cc
+++ b/mysys/my_md5.cc
@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf,
int compute_md5_hash(char *digest, const char *buf, int len) {
int retval = 0;
int fips_mode = 0;
+#ifndef LIBRESSL_VERSION_NUMBER
fips_mode = FIPS_mode();
+#endif
/* If fips mode is ON/STRICT restricted method calls will result into abort,
* skipping call. */
if (fips_mode == 0) {
--- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
+++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
@@ -329,6 +329,7 @@ error:
return 1;
}
+#ifndef LIBRESSL_VERSION_NUMBER
#define OPENSSL_ERROR_LENGTH 512
static int configure_ssl_fips_mode(const uint fips_mode) {
int rc = -1;
@@ -352,6 +353,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
EXIT:
return rc;
}
+#endif
static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
const char *ca_path) {
@@ -555,10 +557,12 @@ int xcom_init_ssl(const char *server_key_file, const char *server_cert_file,
int verify_server = SSL_VERIFY_NONE;
int verify_client = SSL_VERIFY_NONE;
+#ifndef LIBRESSL_VERSION_NUMBER
if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
G_ERROR("Error setting the ssl fips mode");
goto error;
}
+#endif
SSL_library_init();
SSL_load_error_strings();
@@ -622,7 +626,7 @@ error:
void xcom_cleanup_ssl() {
if (!xcom_use_ssl()) return;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
ERR_remove_thread_state(0);
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
}
--- a/plugin/x/client/xconnection_impl.cc
+++ b/plugin/x/client/xconnection_impl.cc
@@ -511,6 +511,7 @@ XError Connection_impl::get_ssl_error(const int error_id) {
return XError(CR_SSL_CONNECTION_ERROR, buffer);
}
+#ifndef LIBRESSL_VERSION_NUMBER
/**
Set fips mode in openssl library,
When we set fips mode ON/STRICT, it will perform following operations:
@@ -550,6 +551,7 @@ int set_fips_mode(const uint32_t fips_mode,
EXIT:
return rc;
}
+#endif
XError Connection_impl::activate_tls() {
if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
@@ -560,12 +562,14 @@ XError Connection_impl::activate_tls() {
if (!m_context->m_ssl_config.is_configured())
return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
+#ifndef LIBRESSL_VERSION_NUMBER
char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
if (set_fips_mode(
static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
err_string) != 1) {
return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
}
+#endif
auto ssl_ctx_flags = process_tls_version(
details::null_when_empty(m_context->m_ssl_config.m_tls_version));
--- a/router/src/http/src/tls_client_context.cc
+++ b/router/src/http/src/tls_client_context.cc
@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) {
void TlsClientContext::cipher_suites(const std::string &ciphers) {
// TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
+#ifdef TLS1_3_VERSION
if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) {
throw TlsError("set-cipher-suites");
}
--- a/router/src/http/src/tls_context.cc
+++ b/router/src/http/src/tls_context.cc
@@ -91,7 +91,7 @@ static int o11x_version(TlsVersion version) {
return TLS1_1_VERSION;
case TlsVersion::TLS_1_2:
return TLS1_2_VERSION;
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
+#ifdef TLS1_3_VERSION
case TlsVersion::TLS_1_3:
return TLS1_3_VERSION;
#endif
@@ -120,9 +120,11 @@ void TlsContext::version_range(TlsVersion min_version, TlsVersion max_version) {
switch (min_version) {
default:
// unknown, leave all disabled
+#ifdef TLS1_3_VERSION
// fallthrough
case TlsVersion::TLS_1_3:
opts |= SSL_OP_NO_TLSv1_2;
+#endif
// fallthrough
case TlsVersion::TLS_1_2:
opts |= SSL_OP_NO_TLSv1_1;
@@ -170,8 +172,10 @@ TlsVersion TlsContext::min_version() const {
return TlsVersion::TLS_1_1;
case TLS1_2_VERSION:
return TlsVersion::TLS_1_2;
+#ifdef TLS1_3_VERSION
case TLS1_3_VERSION:
return TlsVersion::TLS_1_3;
+#endif
case 0:
return TlsVersion::AUTO;
default:
@@ -230,7 +234,8 @@ TlsContext::InfoCallback TlsContext::info_callback() const {
}
int TlsContext::security_level() const {
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
+ !defined(LIBRESSL_VERSION_NUMBER)
return SSL_CTX_get_security_level(ssl_ctx_.get());
#else
return 0;
--- a/router/src/http/src/tls_server_context.cc
+++ b/router/src/http/src/tls_server_context.cc
@@ -167,7 +167,8 @@ void TlsServerContext::init_tmp_dh(const std::string &dh_params) {
}
} else {
-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
+ !defined(LIBRESSL_VERSION_NUMBER)
dh2048.reset(DH_get_2048_256());
#else
/*
--- a/sql-common/client.cc
+++ b/sql-common/client.cc
@@ -7752,6 +7752,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
return 1;
break;
case MYSQL_OPT_SSL_FIPS_MODE: {
+#if !defined(LIBRESSL_VERSION_NUMBER)
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
ENSURE_EXTENSIONS_PRESENT(&mysql->options);
mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
@@ -7763,6 +7764,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_option option,
"Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string);
return 1;
}
+#endif
} break;
case MYSQL_OPT_SSL_MODE:
ENSURE_EXTENSIONS_PRESENT(&mysql->options);
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4857,7 +4857,7 @@ static int init_thread_environment() {
static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define FILE_LINE_ARGS
#else
#define FILE_LINE_ARGS , const char *, int
@@ -4891,12 +4891,14 @@ static void init_ssl() {
}
static int init_ssl_communication() {
+#ifndef LIBRESSL_VERSION_NUMBER
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
if (ret_fips_mode != 1) {
LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
return 1;
}
+#endif
if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -4459,6 +4459,7 @@ static Sys_var_ulong Sys_max_execution_time(
HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
+#ifndef LIBRESSL_VERSION_NUMBER
static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
@@ -4469,15 +4470,31 @@ static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
return false;
}
}
+#endif
+
+#if defined(LIBRESSL_VERSION_NUMBER)
+static const char *ssl_fips_mode_names[] = {"OFF", 0};
+#else
+static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
+#endif
-static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr};
static Sys_var_enum Sys_ssl_fips_mode(
"ssl_fips_mode",
"SSL FIPS mode (applies only for OpenSSL); "
+#ifndef LIBRESSL_VERSION_NUMBER
"permitted values are: OFF, ON, STRICT",
+#else
+ "permitted values are: OFF",
+#endif
GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
- ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr);
+ ON_CHECK(NULL),
+#ifndef LIBRESSL_VERSION_NUMBER
+ ON_UPDATE(update_fips_mode),
+#else
+ ON_UPDATE(NULL),
+#endif
+ NULL);
static Sys_var_bool Sys_auto_generate_certs(
"auto_generate_certs",
--- a/vio/viossl.cc
+++ b/vio/viossl.cc
@@ -45,7 +45,7 @@
BIO_set_callback_ex was added in openSSL 1.1.1
For older openSSL, use the deprecated BIO_set_callback.
*/
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
#define HAVE_BIO_SET_CALLBACK_EX
#endif
@@ -634,8 +634,8 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
#if !defined(DBUG_OFF)
{
- STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;
- ssl_comp_methods = SSL_COMP_get_compression_methods();
+ STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
+ ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
n = sk_SSL_COMP_num(ssl_comp_methods);
DBUG_PRINT("info", ("Available compression methods:\n"));
if (n == 0)
@@ -643,7 +643,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
else
for (j = 0; j < n; j++) {
SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
DBUG_PRINT("info", (" %d: %s\n", c->id, c->name));
#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
DBUG_PRINT("info",
--- a/vio/viosslfactories.cc
+++ b/vio/viosslfactories.cc
@@ -472,6 +472,7 @@ void ssl_start() {
}
}
+#ifndef LIBRESSL_VERSION_NUMBER
/**
Set fips mode in openssl library,
When we set fips mode ON/STRICT, it will perform following operations:
@@ -525,6 +526,7 @@ EXIT:
@returns openssl current fips mode
*/
uint get_fips_mode() { return FIPS_mode(); }
+#endif
long process_tls_version(const char *tls_version) {
const char *separator = ",";
--
2.26.2

@ -1,31 +0,0 @@
--- a/include/mysql_com.h 2014-06-10 23:10:43.000000000 -0400
+++ b/include/mysql_com.h 2015-08-11 15:20:54.487091000 -0400
@@ -179,7 +171,7 @@
#define CLIENT_IGNORE_SIGPIPE 4096 /* IGNORE sigpipes */
#define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */
#define CLIENT_RESERVED 16384 /* Old flag for 4.1 protocol */
-#define CLIENT_RESERVED2 32768 /* Old flag for 4.1 authentication */
+#define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */
#define CLIENT_MULTI_STATEMENTS (1UL << 16) /* Enable/disable multi-stmt support */
#define CLIENT_MULTI_RESULTS (1UL << 17) /* Enable/disable multi-results */
#define CLIENT_PS_MULTI_RESULTS (1UL << 18) /* Multi-results in PS-protocol */
@@ -226,7 +216,7 @@
| CLIENT_IGNORE_SIGPIPE \
| CLIENT_TRANSACTIONS \
| CLIENT_RESERVED \
- | CLIENT_RESERVED2 \
+ | CLIENT_SECURE_CONNECTION \
| CLIENT_MULTI_STATEMENTS \
| CLIENT_MULTI_RESULTS \
| CLIENT_PS_MULTI_RESULTS \
--- a/libmysql/client_settings.h 2015-02-25 16:09:49.000000000 -0500
+++ b/libmysql/client_settings.h 2015-08-11 15:44:10.804091000 -0400
@@ -31,7 +31,7 @@
CLIENT_LONG_FLAG | \
CLIENT_TRANSACTIONS | \
CLIENT_PROTOCOL_41 | \
- CLIENT_RESERVED2 | \
+ CLIENT_SECURE_CONNECTION | \
CLIENT_MULTI_RESULTS | \
CLIENT_PS_MULTI_RESULTS | \
CLIENT_PLUGIN_AUTH | \

@ -1,83 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-multilib
MULTILIB_WRAPPED_HEADERS+=(
/usr/include/mysql/my_config.h
)
# wrap the config script
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
DESCRIPTION="C client library for MariaDB/MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/connector/c/"
LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
S="${WORKDIR}/${P}-src"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
SUBSLOT="18"
SLOT="0/${SUBSLOT}"
IUSE="libressl static-libs"
CDEPEND="
sys-libs/zlib:=[${MULTILIB_USEDEP}]
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
"
RDEPEND="${CDEPEND}
!dev-db/mariadb-connector-c[mysqlcompat]
"
DEPEND="${CDEPEND}"
DOCS=( README )
PATCHES=(
"${FILESDIR}/mysql_com.patch"
"${FILESDIR}/20028_all_mysql-5.6-gcc7.patch"
"${FILESDIR}/6.1.11-openssl-1.1.patch"
)
src_prepare() {
sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
if use libressl ; then
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
"${S}/cmake/ssl.cmake" || die
fi
cmake-utils_src_prepare
}
multilib_src_configure() {
local mycmakeargs=(
-DINSTALL_LAYOUT=RPM
-DINSTALL_LIBDIR=$(get_libdir)
-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-DWITH_DEFAULT_FEATURE_SET=OFF
-DENABLED_LOCAL_INFILE=ON
-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_ZLIB=system
-DENABLE_DTRACE=OFF
-DWITH_SSL=system
-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-DSHARED_LIB_PATCH_VERSION="0"
)
cmake-utils_src_configure
}
multilib_src_install_all() {
if ! use static-libs ; then
find "${ED}" -name "*.a" -delete || die
fi
}
pkg_preinst() {
if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
elog "Due to ABI changes when switching between different client libraries,"
elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
elog "Please run: revdep-rebuild --library libmysqlclient.so.${SUBSLOT}"
ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
fi
}

@ -1,111 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-multilib
# wrap the config script
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
DESCRIPTION="C client library for MariaDB/MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/"
LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
SLOT="0/21"
IUSE="ldap libressl static-libs"
RDEPEND="
>=app-arch/lz4-0_p131:=
sys-libs/zlib:=[${MULTILIB_USEDEP}]
ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}"
# Avoid file collisions, #692580
RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
RDEPEND+=" !=dev-db/mysql-5.7.23*"
RDEPEND+=" !=dev-db/mysql-5.7.24*"
RDEPEND+=" !=dev-db/mysql-5.7.25*"
RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
DOCS=( README )
S="${WORKDIR}/mysql-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch
"${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
"${FILESDIR}"/${PN}-8.0.19-libressl.patch
)
src_prepare() {
sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
# All these are for the server only.
# Disable rpm call which would trigger sandbox, #692368
sed -i \
-e '/MYSQL_CHECK_LIBEVENT/d' \
-e '/MYSQL_CHECK_RAPIDJSON/d' \
-e '/MYSQL_CHECK_ICU/d' \
-e '/MYSQL_CHECK_EDITLINE/d' \
-e '/MYSQL_CHECK_CURL/d' \
-e '/ADD_SUBDIRECTORY(man)/d' \
-e '/ADD_SUBDIRECTORY(share)/d' \
-e '/INCLUDE(cmake\/boost/d' \
-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
CMakeLists.txt || die
# Skip building clients
echo > client/CMakeLists.txt || die
# Forcefully disable auth plugin
if ! use ldap ; then
sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
echo > libmysql/authentication_ldap/CMakeLists.txt || die
fi
cmake-utils_src_prepare
}
multilib_src_configure() {
local mycmakeargs=(
-DINSTALL_LAYOUT=RPM
-DINSTALL_LIBDIR=$(get_libdir)
-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-DWITH_DEFAULT_FEATURE_SET=OFF
-DENABLED_LOCAL_INFILE=ON
-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
-DWITH_ZLIB=system
-DWITH_SSL=system
-DWITH_NUMA=OFF
-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-DSHARED_LIB_PATCH_VERSION="0"
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DWITHOUT_SERVER=ON
)
cmake-utils_src_configure
}
multilib_src_install() {
cmake-utils_src_install
}
multilib_src_install_all() {
doman \
man/my_print_defaults.1 \
man/perror.1 \
man/zlib_decompress.1
if ! use static-libs ; then
find "${ED}" -name "*.a" -delete || die
fi
}

@ -1,111 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake-multilib
# wrap the config script
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
DESCRIPTION="C client library for MariaDB/MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/"
LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
SLOT="0/21"
IUSE="ldap libressl static-libs"
RDEPEND="
>=app-arch/lz4-0_p131:=
sys-libs/zlib:=[${MULTILIB_USEDEP}]
ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
"
DEPEND="${RDEPEND}"
# Avoid file collisions, #692580
RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
RDEPEND+=" !=dev-db/mysql-5.7.23*"
RDEPEND+=" !=dev-db/mysql-5.7.24*"
RDEPEND+=" !=dev-db/mysql-5.7.25*"
RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
DOCS=( README )
S="${WORKDIR}/mysql-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-8.0.18-always-build-decompress-utilities.patch
"${FILESDIR}"/${PN}-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch
"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
"${FILESDIR}"/${PN}-8.0.20-libressl.patch
)
src_prepare() {
sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
# All these are for the server only.
# Disable rpm call which would trigger sandbox, #692368
sed -i \
-e '/MYSQL_CHECK_LIBEVENT/d' \
-e '/MYSQL_CHECK_RAPIDJSON/d' \
-e '/MYSQL_CHECK_ICU/d' \
-e '/MYSQL_CHECK_EDITLINE/d' \
-e '/MYSQL_CHECK_CURL/d' \
-e '/ADD_SUBDIRECTORY(man)/d' \
-e '/ADD_SUBDIRECTORY(share)/d' \
-e '/INCLUDE(cmake\/boost/d' \
-e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \
CMakeLists.txt || die
# Skip building clients
echo > client/CMakeLists.txt || die
# Forcefully disable auth plugin
if ! use ldap ; then
sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die
echo > libmysql/authentication_ldap/CMakeLists.txt || die
fi
cmake-utils_src_prepare
}
multilib_src_configure() {
local mycmakeargs=(
-DINSTALL_LAYOUT=RPM
-DINSTALL_LIBDIR=$(get_libdir)
-DWITH_DEFAULT_COMPILER_OPTIONS=OFF
-DWITH_DEFAULT_FEATURE_SET=OFF
-DENABLED_LOCAL_INFILE=ON
-DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock"
-DWITH_ZLIB=system
-DWITH_SSL=system
-DWITH_NUMA=OFF
-DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient
-DSHARED_LIB_PATCH_VERSION="0"
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DWITHOUT_SERVER=ON
)
cmake-utils_src_configure
}
multilib_src_install() {
cmake-utils_src_install
}
multilib_src_install_all() {
doman \
man/my_print_defaults.1 \
man/perror.1 \
man/zlib_decompress.1
if ! use static-libs ; then
find "${ED}" -name "*.a" -delete || die
fi
}

@ -13,7 +13,7 @@ HOMEPAGE="https://dev.mysql.com/downloads/"
LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
SLOT="0/21"
IUSE="ldap libressl static-libs"

Binary file not shown.

@ -1,4 +1,5 @@
AUX wavy-0.1.0.0-binary-0.8.patch 454 BLAKE2B 8865e15588ef0a9fa603da3aefa793ad7b26c0f39aa93ca3fe3ffdd04a6d3e64fea28c647acd775df0a1a6c88042496cc92387f9f5de0250a885a61cc5ce7914 SHA512 01e86475fcb6b022bf5560b4338e2d7a574bbafbcaf8b71be32d54809ebffc76dd2a88a101f5fcc8333bd494fe02dc953895cec2b071668fe42f557918b3be79
AUX wavy-0.1.0.0-ghc-8.8.patch 519 BLAKE2B 35d8b175c3fc6b63e2fa58b8113799479fdfadcbab492df69a83bc4c7d2f810cdba672851ed919e5b3926f3f10caa6429f1b1f362178e69d6445489cb70d6e35 SHA512 059b239ecd843a90f08eed43347d623d2303fe83eadcdad4e5667fc3c0051cd60459850ca94f3a82f2cd9358af8c344268491f6d407d4c87613aaf06205e23e0
DIST wavy-0.1.0.0.tar.gz 25100 BLAKE2B 5c4926c22b0a874b84a02fdff9218aa78f78a97dd736ae1243e99bfe368c8d136dc463346c3905e794b70deaeba5dab7223a54fa43304d67234cb16f0bd489e2 SHA512 25103aeae5104f6525b75cae4aea1b70e3998a56e4c262462a8dd7b8edfee2749fbd099e81a2c2bde0bfb0211e2194d0e4df705bd8882e526516c85be0fdd94d
EBUILD wavy-0.1.0.0.ebuild 1012 BLAKE2B a1530b10c898537302638049c8c131ce33eb3e4e2aa9c314270209682b3c3c90713cdc38b065a4f8ec8eca3b01980b0f3f8f282a2bc70f44c87f31a8fb013e9a SHA512 d243b2ce4f5d0d2c0b35d2f9c5dec8912a072966daf4d6da877118294977ea0c60c15a85a6f5752c7a367cb3d5793a93befd769a70910638f8ca860afe9f98fc
EBUILD wavy-0.1.0.0.ebuild 1048 BLAKE2B a7954a781900c426d32b3c6ad22bce9c3b698a14bdd8d3cbf0062bcfbad21c3fb98918c1664c2507770c4f3a362e217964aa0b897588a274a0a0bed4092ea02b SHA512 0f93b4fecc1d154c6e48bd4c35468c8d0a05d1e53cb13678d8ad76c0cf1ec41d755cf8fbd54ba0573c2ffb11d61294daca07cc4391e43c64e2a3f002e259959b
MISC metadata.xml 624 BLAKE2B c3a9f576830d189dc88e76910ea9857b6d77fb9bfb12ee8187512b81c41a4a42097efd24daf05b63da4c91029eb7044a4013772b6b5045c3638fa1852d9ababd SHA512 8442163e564335e43e3010df0183a5b6e15fcda2650ce97cc59c410bc978171b49a65b926229c7d02c8f7ffad4232b160a326fddca89e20822d4930e84c6ff8b

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save