diff options
Diffstat (limited to 'net-proxy')
35 files changed, 338 insertions, 1065 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz Binary files differindex 7648bad789c5..b66d059da6b6 100644 --- a/net-proxy/Manifest.gz +++ b/net-proxy/Manifest.gz diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest index 18cd1664ef5a..db27c1262914 100644 --- a/net-proxy/dante/Manifest +++ b/net-proxy/dante/Manifest @@ -12,5 +12,5 @@ AUX sockd.conf-with-libwrap.patch 870 BLAKE2B 8c56ab479f99f6dff61882c01842ef0780 AUX sockd.conf-with-pam.patch 295 BLAKE2B f41c2109e21878d2b473c6cffb4fe845d59ac0478f5196f7ccdc42baafd674e0960169e3a9dbc4fedb4a27cb7df8bd0dfc255595a72c39185c7ffb177fb53da8 SHA512 78728605362360650e6a20869744fc941782b75d149c0835542faaad931104cb32dda56de77a7b4f9a4fa683053139c551bcf77607a047fb1be68b6da9388630 AUX socks.conf 4185 BLAKE2B cb41b40e858c83d06bd5e199c4fc991e8dda0ee64d48fd94e52d6ef836e79d6a6f5f50b6dd55074e92b6f96f20db65922f53869f08506100ae8b59b722643cdd SHA512 d15ea77e20ad750f10285a42c9c6305cbed48313dea205139d8cf59fda4a4640bdd5c5bd2c295b32e0015b774d463f9ad34fa5a22fb188ae921dba1a533553eb DIST dante-1.4.1.tar.gz 1284288 BLAKE2B 34c78007245339088d79e0b969b8f55d20b0ee59d89c1bf19510b563799ac3c54c6b8b5f37bfb64410d60e893beb0e2d1d79893c0264b7481aeb4cdab2037e90 SHA512 1c8e2966ba68c8584fb99ff76ae1d9c8dfe669c7e5e61c7e6e7f87295d1280c3e7849491a6369ce27795040f951dcc11f4f2b3d7e46c54219594c89315d0487e -EBUILD dante-1.4.1-r6.ebuild 2767 BLAKE2B 951097ac7799bacca3052713d0647f395119c5b65915357c42bf0f73818a852faf54c4e37afaadbe2062edda0a576ae1a2bb624bee5c56cf9f17ddb2a04c4b34 SHA512 04b6bde686387ccda5b63dcf75ef5b1b680083284be6948f026bf04a69418157501131594997b669b8060cb27b24b40c283c886e54baa44132b2057a7898e9ae +EBUILD dante-1.4.1-r6.ebuild 2774 BLAKE2B c6a5e0a9acc67cab042c4b762224b1e72d2a0580500d16527e5334779dc8e81452dc56201af8023ec225fbe3c479772529650289cd7004664109b41bc453c745 SHA512 263f62b062376a6001aabfa0f80c780b3ea15ad8f0d47b98e65acab2c16077a3122a8688761992228866c53169e6039aa30cdf7b525bb712f242abe1d4905f56 MISC metadata.xml 213 BLAKE2B 8999188a1062bf7ec3ba841f532113bb39808fbdbfd3cba1107aec6c8796e897b1ade98d0ea8e92eb504f132a51aa46fb49b6ad1a04c5b389d333f054c2589b8 SHA512 7d3e51679dce13a213e18c54e9072c88a121abad190a83dd7d1ce224b075ac639e4a0d0d8a2b98ca8a59da3a1576629b021afb9fe48c180345e609605c6aef0e diff --git a/net-proxy/dante/dante-1.4.1-r6.ebuild b/net-proxy/dante/dante-1.4.1-r6.ebuild index 85808412bb40..19b891151a24 100644 --- a/net-proxy/dante/dante-1.4.1-r6.ebuild +++ b/net-proxy/dante/dante-1.4.1-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="debug kerberos pam selinux static-libs tcpd upnp" CDEPEND=" diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index 940a439fd4dd..d983dd1dc71e 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -1,35 +1,26 @@ +AUX haproxy-lua54.patch 3224 BLAKE2B 104a5406ff2fdf0ca031e19acccfa7cbec34bbb3431f36d9160a55a4279420a1e55d9677b37aa3dcca3c968a0ce8aa78961afe10b4becafb6f3d6957d566771c SHA512 b455640c7f40db99f408c2f12b6196ef41aaa1d46cd40206a000ee1c34cf9fa0dcc063501342f7c2e398f99e3600be07d287936abd17beb8d8e16e805d59f5a6 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753 AUX haproxy.initd-r7 1705 BLAKE2B 6592a149144680d0a0fe124a1c87f26d4a5ef222d1b80bc940f6c8eeaca4cb24c6eb1766b75e1334d3331955c1b7bc65bddc337d7f1ab01813e70ca77e046313 SHA512 1acdd4806539656daf32277d66b1596de4c91ece34a8ec43b4948cf8c95b65ccdea58b152717596659db2c14d63602653e3858a108927fa6091ffae1a5a08d7e -DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790 SHA512 2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155 -DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63 SHA512 339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891 -DIST haproxy-2.0.28.tar.gz 2721568 BLAKE2B c4c7db2836e6296b038825de2467144ec40995182363f7924638f0edb91bdbca383e2a2114f6973445aa2b5933a7c2014643cde66fec81dff562123f89525cfc SHA512 77d1d6cc4a03476e2216568ff687163c98abe380063700fded384fec5bc217f2cfebe335b0c64b8f4adfb80e75eddb7a71b6217064daa73290756871514bf550 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67 SHA512 174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284 SHA512 2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b -DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20 SHA512 4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615 -DIST haproxy-2.2.23.tar.gz 2950408 BLAKE2B a718355c1ecaf4d5728b4464fee0b65bcd4c133929be315e17e8a782618031a7508c2172d7e66790b819b884df8d813d399af9aa12cd395079b8e035e37bb76a SHA512 8e4f0e72fbeae0bf31533c74f9d518f4825702f1f7b36137a224a35ba08cbeefbbf587fa0b7ca11cb7306bf64eebc0d0e8aead505a1d53037148e1572c831ff4 +DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c SHA512 021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799 SHA512 a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943 -DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899 SHA512 da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71 -DIST haproxy-2.4.16.tar.gz 3621231 BLAKE2B 6cce1d230b0e1068421968adaa75fbaf26b029a6d54eab21ddd1e0e378fbd0d9a39060d946ca676393951e0565d3587eee49fd3badddac11b48794134be87801 SHA512 98c52699fbfeef8699a0d007664ff5be023f02e3eb32ba4d05a71bb4b1bcfa7ff0cb9fbcdd3d863c053cf6d7041168f63ef3fa04d11ab9aa0753c9be6812c0d8 +DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999 SHA512 98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87 -DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5 SHA512 f68af2be330b0fa817f7611ff46e0d3e0cc52d024b20394a5f1eedf33e6774115ee6f35ecd82d33b9ecedea2fe5afcfa32270cee33a1f6ce1726d96cc8c0d821 -DIST haproxy-2.5.6.tar.gz 3826838 BLAKE2B 571acbb5dd9fad6ee560a3db25e88815dad4278640730337257ac18ad670b1d69cd9669c7e6a60e03a784adc9c7d8aba8d4e035152d3c13072c1a05a1534facb SHA512 e97f422379af0589edf5c1dea949e95f76a7d1ce05ece75580248607f6c05cfda4a430390aca74f4d37c35de8af6d73c9a0768a699c231e11c8bb4194cb98d41 -EBUILD haproxy-2.0.25.ebuild 5356 BLAKE2B 3e66fd23b24ac10f251ca4c0b20b9fc7f51c55a7235ea362b22f71f9e581c36c93dcb4046cc14dcf687669eb64a71e221f7affd9e811cf94361e4e86754fb3bd SHA512 316ba774a164527afb0c56da9fe3433cc3c96becef081388b5756d819e0962d15a61d67388e9776ee194582a1e7dd97105ee58e194c94689047aad38b20509c1 -EBUILD haproxy-2.0.27.ebuild 5358 BLAKE2B 74e840c6a726c6c00e26de01e8ed0e9923a7a7623a9984a67a5d2322fe7be38eb26559cce3fc1bcfadeb00246e42c0ed076a2b2662776f596e14a8f9ab1f5d12 SHA512 2049483a3f1eb1907573fcb134d9cfff2b27dc50a45df9025c3e734a1bde76d4cc7f5c0affdf52877889d267b32bb1fcc402dd1f8d9338004e9aac2aac879dd7 -EBUILD haproxy-2.0.28-r1.ebuild 5360 BLAKE2B d24fc1ded9025265f690e012f0faed1a820cd7b08b43b85617d6ccc2d6b57c05e9d14557327a6ce0fb524268d0a8784b62ac8dc582e0939225b4a7282aaf1526 SHA512 c845dd7919e180ec5fc36b90bb3c29d251cf5e679c93b926819eccac00377b676249db99288b8efa5277a6d021629208b30cad5ffc107f18651932681db21bef -EBUILD haproxy-2.0.9999.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490 +DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c SHA512 cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9 +DIST haproxy-2.6.1.tar.gz 3976025 BLAKE2B 0ddb100edce46b4d2ab80b6812f139657352464afab7187c7572e1c930230778fcb652f395c356f496b746d0aae17098604b1bc7f1db41b82522796f822e822c SHA512 003c74cb7acfd5da71b8b3cdc2d75820fd7c354c411d2703c60824bd4babfd4a209f87f5a94b1488a1fb4c575db1f694209072cc99821553407b6a8ba4d2d9e5 EBUILD haproxy-2.2.17.ebuild 5356 BLAKE2B 3e66fd23b24ac10f251ca4c0b20b9fc7f51c55a7235ea362b22f71f9e581c36c93dcb4046cc14dcf687669eb64a71e221f7affd9e811cf94361e4e86754fb3bd SHA512 316ba774a164527afb0c56da9fe3433cc3c96becef081388b5756d819e0962d15a61d67388e9776ee194582a1e7dd97105ee58e194c94689047aad38b20509c1 EBUILD haproxy-2.2.21.ebuild 5358 BLAKE2B 74e840c6a726c6c00e26de01e8ed0e9923a7a7623a9984a67a5d2322fe7be38eb26559cce3fc1bcfadeb00246e42c0ed076a2b2662776f596e14a8f9ab1f5d12 SHA512 2049483a3f1eb1907573fcb134d9cfff2b27dc50a45df9025c3e734a1bde76d4cc7f5c0affdf52877889d267b32bb1fcc402dd1f8d9338004e9aac2aac879dd7 -EBUILD haproxy-2.2.22-r1.ebuild 5360 BLAKE2B d24fc1ded9025265f690e012f0faed1a820cd7b08b43b85617d6ccc2d6b57c05e9d14557327a6ce0fb524268d0a8784b62ac8dc582e0939225b4a7282aaf1526 SHA512 c845dd7919e180ec5fc36b90bb3c29d251cf5e679c93b926819eccac00377b676249db99288b8efa5277a6d021629208b30cad5ffc107f18651932681db21bef -EBUILD haproxy-2.2.23.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490 +EBUILD haproxy-2.2.24.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490 EBUILD haproxy-2.2.9999.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490 -EBUILD haproxy-2.4.14.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b -EBUILD haproxy-2.4.15-r1.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae -EBUILD haproxy-2.4.16.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c -EBUILD haproxy-2.4.9999.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c -EBUILD haproxy-2.5.4.ebuild 5595 BLAKE2B 2c7a17200dd15b6ef8bc59f42914e1dfe4ffd74ab8aec5c2d3d3ecd889bf253581df48455a0620e33cc0874913dc3ad77e93aef62a4472b98de927054091e286 SHA512 b69000bb71d34920f46d981750e840af9c2cb89dc42cec9c3201cfdf1e8f2bd7358fd78810d7fc6a5e1c0fc6c91688f1d427485d86a388e1d9aae36cbb0f6c7b -EBUILD haproxy-2.5.5-r1.ebuild 5597 BLAKE2B 4279dcf4971efc73c4e5b636e2d15fd4dfe754a62d1f197ce9f38e1626513df92f662e78c648a6c21c15ae623cf95b2b310b7ee61a70bee84b6822162ac60b19 SHA512 447c3ec8b502d8dbc0aa5b8134f7b0a7910b34815f2c819b1d6c1e2f480bcc2f5daf6a2f80398ddb0633f6bed34861557b4e9452cf928fa7d19a89c7691976ae -EBUILD haproxy-2.5.6.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c -EBUILD haproxy-2.5.9999.ebuild 5563 BLAKE2B 8199d8f64a3c48447ce0d0dcc0456178aae13ac678a7c676978b74d049e481db6431dc8e651b318b9c94c3df119a760ed4771bfc17e23f9caa77c6642c2248dc SHA512 d735985a274c1a3101a9ac7929b5640074530122047c6442aaf3c92cd74219e1e8687503189f82753d11877a268e66814a201267820f34fe58be655ed54e959c -EBUILD haproxy-9999.ebuild 5554 BLAKE2B d154b64099f67f7347e760cc8babedb166224d7d28e28c9e917742290d5038b6b28c55def2c510fdaa2817a8c9f5e95600b2a95e59bd9008f7d3d290ef1eed1a SHA512 1d3684c6f83d9b6682e6b38eefe1d5cbea375cd223520af80440af70bb535e171548d9ecb4ede2d92e603ad14d652703ed24d28efa373600af85bcd5683c4f1c +EBUILD haproxy-2.4.14.ebuild 5603 BLAKE2B fe8ce7c4e262f9c7ec28b0409192a4165eaba2beb70eaea23affe3623eb0c977a6402dfca1bc70e48e09441a8918caed2632c63855963799eb8d9cb3b07dbf10 SHA512 2d10f3f0aebc2ca6d8cb0835a5b58a37d74b19850e80be1b819256a330bd1d14666fddcd8f0f80551cd426e015953f44d4cabcf95fccc8b95bae9b7d41f91a97 +EBUILD haproxy-2.4.17.ebuild 5624 BLAKE2B 2bb250df90ffe2f545ae3767ba91fbcf435a1fe7403463d2a875454c2d0c871ebf7e1e5572af78f47d2767511fbb70e35c54be50b93073c6a649b985e8c9440d SHA512 262bebe786f159b771fc582cad856620c9b13fcf26204fcf19fb199753d7cd59de29a93e4d97e1a02be1f172ad41e113891fc7b96dd25416397ba8cdd86f47bb +EBUILD haproxy-2.4.9999.ebuild 5624 BLAKE2B 2bb250df90ffe2f545ae3767ba91fbcf435a1fe7403463d2a875454c2d0c871ebf7e1e5572af78f47d2767511fbb70e35c54be50b93073c6a649b985e8c9440d SHA512 262bebe786f159b771fc582cad856620c9b13fcf26204fcf19fb199753d7cd59de29a93e4d97e1a02be1f172ad41e113891fc7b96dd25416397ba8cdd86f47bb +EBUILD haproxy-2.5.4.ebuild 5603 BLAKE2B fe8ce7c4e262f9c7ec28b0409192a4165eaba2beb70eaea23affe3623eb0c977a6402dfca1bc70e48e09441a8918caed2632c63855963799eb8d9cb3b07dbf10 SHA512 2d10f3f0aebc2ca6d8cb0835a5b58a37d74b19850e80be1b819256a330bd1d14666fddcd8f0f80551cd426e015953f44d4cabcf95fccc8b95bae9b7d41f91a97 +EBUILD haproxy-2.5.7.ebuild 5571 BLAKE2B 4a356c40d93c8f3aa2c88cb37bbe541fa897ab0fe0b7bb88302288c7b988d68e08f71a74f63a007b4fe5e701ffd74b44afd40ee8f7574f1d56ddce2259ab858d SHA512 33371bd457ddbfbd4e63d36a08841a1567ecac63cbebbc318fda193b634899deb6471b1c17e235655bd6152138f8360d7ddf1751d578b6e736233d181dde40bd +EBUILD haproxy-2.5.9999.ebuild 5571 BLAKE2B 4a356c40d93c8f3aa2c88cb37bbe541fa897ab0fe0b7bb88302288c7b988d68e08f71a74f63a007b4fe5e701ffd74b44afd40ee8f7574f1d56ddce2259ab858d SHA512 33371bd457ddbfbd4e63d36a08841a1567ecac63cbebbc318fda193b634899deb6471b1c17e235655bd6152138f8360d7ddf1751d578b6e736233d181dde40bd +EBUILD haproxy-2.6.1.ebuild 5616 BLAKE2B d40107699f1b1fa608bfb49db002b73185c36de1705ecd5289d31d63b3a803df3a704d93f5d5abfc2e4094e7e565687e09d5952941e80a19cf3286d09f8bc075 SHA512 7f66322eaef76800bd330a3762fd04267982cdd99aa515d657b55ff60b7c5851541e82c1f791d502f0ae70b13b45a2f496422071a015853066bb5deb949b00b8 +EBUILD haproxy-2.6.9999.ebuild 5616 BLAKE2B d40107699f1b1fa608bfb49db002b73185c36de1705ecd5289d31d63b3a803df3a704d93f5d5abfc2e4094e7e565687e09d5952941e80a19cf3286d09f8bc075 SHA512 7f66322eaef76800bd330a3762fd04267982cdd99aa515d657b55ff60b7c5851541e82c1f791d502f0ae70b13b45a2f496422071a015853066bb5deb949b00b8 +EBUILD haproxy-9999.ebuild 5616 BLAKE2B d40107699f1b1fa608bfb49db002b73185c36de1705ecd5289d31d63b3a803df3a704d93f5d5abfc2e4094e7e565687e09d5952941e80a19cf3286d09f8bc075 SHA512 7f66322eaef76800bd330a3762fd04267982cdd99aa515d657b55ff60b7c5851541e82c1f791d502f0ae70b13b45a2f496422071a015853066bb5deb949b00b8 MISC metadata.xml 2063 BLAKE2B ddd51cff72847b617a457ac2baee4dd18a90a6a23e0982bc932ab8d3d101312dc2265884d38fcdc1a1cbb3d982b078e5b03a3c13fce07568d9d477688d210b09 SHA512 2198d3735f32f9c22787b1b43fd59bd6a0018ae25e104ee34ce0f27682ad8d6405a37c1c890b5eb41deabe5a5011d07d379e5df780bd8ab2877bd435bb875a1e diff --git a/net-proxy/haproxy/files/haproxy-lua54.patch b/net-proxy/haproxy/files/haproxy-lua54.patch new file mode 100644 index 000000000000..c89310120ab8 --- /dev/null +++ b/net-proxy/haproxy/files/haproxy-lua54.patch @@ -0,0 +1,63 @@ +From 4634eb54a7dbfb38b0d2db8282ce281aa9ff5296 Mon Sep 17 00:00:00 2001 +From: Christian Ruppert <idl0r@qasl.de> +Date: Tue, 28 Jun 2022 10:03:00 +0200 +Subject: [PATCH] Add Lua 5.4 autodetect + +This patch is based on: +https://www.mail-archive.com/haproxy@formilux.org/msg39689.html +Thanks to Callum Farmer! + +Signed-off-by: Christian Ruppert <idl0r@qasl.de> +--- + INSTALL | 6 +++--- + Makefile | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/INSTALL b/INSTALL +index 96936ea46..9269051af 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -324,9 +324,9 @@ Lua is an embedded programming language supported by HAProxy to provide more + advanced scripting capabilities. Only versions 5.3 and above are supported. + In order to enable Lua support, please specify "USE_LUA=1" on the command line. + Some systems provide this library under various names to avoid conflicts with +-previous versions. By default, HAProxy looks for "lua5.3", "lua53", "lua". If +-your system uses a different naming, you may need to set the library name in +-the "LUA_LIB_NAME" variable. ++previous versions. By default, HAProxy looks for "lua5.4", "lua54", "lua5.3", ++"lua53", "lua". If your system uses a different naming, you may need to set the ++library name in the "LUA_LIB_NAME" variable. + + If Lua is not provided on your system, it can be very simply built locally. It + can be downloaded from https://www.lua.org/, extracted and built, for example : +diff --git a/Makefile b/Makefile +index 814837133..85f6c632d 100644 +--- a/Makefile ++++ b/Makefile +@@ -104,7 +104,7 @@ + # LUA_LIB : force the lib path to lua + # LUA_INC : force the include path to lua + # LUA_LIB_NAME : force the lib name (or automatically evaluated, by order of +-# priority : lua5.3, lua53, lua). ++# priority : lua5.4, lua54, lua5.3, lua53, lua). + # OT_DEBUG : compile the OpenTracing filter in debug mode + # OT_INC : force the include path to libopentracing-c-wrapper + # OT_LIB : force the lib path to libopentracing-c-wrapper +@@ -648,11 +648,11 @@ OPTIONS_CFLAGS += $(if $(LUA_INC),-I$(LUA_INC)) + LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) $(if $(LUA_LIB),-L$(LUA_LIB)) + ifeq ($(LUA_LIB_NAME),) + # Try to automatically detect the Lua library +-LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS)))) ++LUA_LIB_NAME := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS)))) + ifeq ($(LUA_LIB_NAME),) +-$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME=<name> (where <name> can be lua5.3, lua53, lua, ...)) ++$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME=<name> (where <name> can be lua5.4, lua54, lua, ...)) + endif +-LUA_INC := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/"))) ++LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/"))) + ifneq ($(LUA_INC),) + OPTIONS_CFLAGS += -I$(LUA_INC) + endif +-- +2.35.1 + diff --git a/net-proxy/haproxy/haproxy-2.0.25.ebuild b/net-proxy/haproxy/haproxy-2.0.25.ebuild deleted file mode 100644 index 6009c169081c..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.25.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -LUA_COMPAT=( lua5-3 ) - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="amd64 arm ppc x86" -else - EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/$(ver_cut 1-2)" -IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter -ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" -REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) - lua? ( ${LUA_REQUIRED_USE} ) - ?? ( slz zlib )" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - crypt? ( virtual/libcrypt:= ) - pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( - dev-libs/libpcre2:= - pcre2-jit? ( dev-libs/libpcre2:=[jit] ) - ) - ssl? ( - dev-libs/openssl:0= - ) - slz? ( dev-libs/libslz:= ) - systemd? ( sys-apps/systemd ) - zlib? ( sys-libs/zlib ) - lua? ( ${LUA_DEPS} )" -RDEPEND="${DEPEND} - acct-group/haproxy - acct-user/haproxy" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # Bug #668002 - if use ppc || use arm || use hppa; then - TARGET_LDFLAGS=-latomic - fi - - if use prometheus-exporter; then - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r6" ${PN} - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-2.0.27.ebuild b/net-proxy/haproxy/haproxy-2.0.27.ebuild deleted file mode 100644 index 75cceb7c91f7..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.27.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -LUA_COMPAT=( lua5-3 ) - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="amd64 ~arm ~ppc x86" -else - EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/$(ver_cut 1-2)" -IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter -ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" -REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) - lua? ( ${LUA_REQUIRED_USE} ) - ?? ( slz zlib )" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - crypt? ( virtual/libcrypt:= ) - pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( - dev-libs/libpcre2:= - pcre2-jit? ( dev-libs/libpcre2:=[jit] ) - ) - ssl? ( - dev-libs/openssl:0= - ) - slz? ( dev-libs/libslz:= ) - systemd? ( sys-apps/systemd ) - zlib? ( sys-libs/zlib ) - lua? ( ${LUA_DEPS} )" -RDEPEND="${DEPEND} - acct-group/haproxy - acct-user/haproxy" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # Bug #668002 - if use ppc || use arm || use hppa; then - TARGET_LDFLAGS=-latomic - fi - - if use prometheus-exporter; then - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r6" ${PN} - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild b/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild deleted file mode 100644 index f85333d3df83..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -LUA_COMPAT=( lua5-3 ) - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" -else - EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/$(ver_cut 1-2)" -IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter -ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" -REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) - lua? ( ${LUA_REQUIRED_USE} ) - ?? ( slz zlib )" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - crypt? ( virtual/libcrypt:= ) - pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( - dev-libs/libpcre2:= - pcre2-jit? ( dev-libs/libpcre2:=[jit] ) - ) - ssl? ( - dev-libs/openssl:0= - ) - slz? ( dev-libs/libslz:= ) - systemd? ( sys-apps/systemd ) - zlib? ( sys-libs/zlib ) - lua? ( ${LUA_DEPS} )" -RDEPEND="${DEPEND} - acct-group/haproxy - acct-user/haproxy" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # Bug #668002 - if use ppc || use arm || use hppa; then - TARGET_LDFLAGS=-latomic - fi - - if use prometheus-exporter; then - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r7" ${PN} - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-2.2.22-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.22-r1.ebuild deleted file mode 100644 index f85333d3df83..000000000000 --- a/net-proxy/haproxy/haproxy-2.2.22-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -LUA_COMPAT=( lua5-3 ) - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" -else - EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/$(ver_cut 1-2)" -IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter -ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" -REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) - lua? ( ${LUA_REQUIRED_USE} ) - ?? ( slz zlib )" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - crypt? ( virtual/libcrypt:= ) - pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( - dev-libs/libpcre2:= - pcre2-jit? ( dev-libs/libpcre2:=[jit] ) - ) - ssl? ( - dev-libs/openssl:0= - ) - slz? ( dev-libs/libslz:= ) - systemd? ( sys-apps/systemd ) - zlib? ( sys-libs/zlib ) - lua? ( ${LUA_DEPS} )" -RDEPEND="${DEPEND} - acct-group/haproxy - acct-user/haproxy" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # Bug #668002 - if use ppc || use arm || use hppa; then - TARGET_LDFLAGS=-latomic - fi - - if use prometheus-exporter; then - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r7" ${PN} - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-2.2.23.ebuild b/net-proxy/haproxy/haproxy-2.2.23.ebuild deleted file mode 100644 index 4ec0188ead43..000000000000 --- a/net-proxy/haproxy/haproxy-2.2.23.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -LUA_COMPAT=( lua5-3 ) - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -elif [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" - EGIT_BRANCH=master -else - EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/$(ver_cut 1-2)" -IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter -ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl" -REQUIRED_USE="pcre-jit? ( pcre ) - lua? ( ${LUA_REQUIRED_USE} ) - ?? ( slz zlib )" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - crypt? ( virtual/libcrypt:= ) - pcre? ( - dev-libs/libpcre2:= - pcre-jit? ( dev-libs/libpcre2:=[jit] ) - ) - ssl? ( - dev-libs/openssl:0= - ) - slz? ( dev-libs/libslz:= ) - systemd? ( sys-apps/systemd ) - zlib? ( sys-libs/zlib ) - lua? ( ${LUA_DEPS} )" -RDEPEND="${DEPEND} - acct-group/haproxy - acct-user/haproxy" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - use lua && lua-single_pkg_setup - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - # Switching to PCRE2 by default, bug 838013 - PCRE= - PCRE_JIT= - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE2) ) - args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - # Bug #668002 - if use ppc || use arm || use hppa; then - TARGET_LDFLAGS=-latomic - fi - - if use prometheus-exporter; then - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN}.initd-r7" ${PN} - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.24.ebuild index 4ec0188ead43..4ec0188ead43 100644 --- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.2.24.ebuild diff --git a/net-proxy/haproxy/haproxy-2.4.14.ebuild b/net-proxy/haproxy/haproxy-2.4.14.ebuild index 931074ca6e03..177ad6df9650 100644 --- a/net-proxy/haproxy/haproxy-2.4.14.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.14.ebuild @@ -99,15 +99,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ diff --git a/net-proxy/haproxy/haproxy-2.5.6.ebuild b/net-proxy/haproxy/haproxy-2.4.17.ebuild index 959a7a9dac4f..fe83c6a1fb10 100644 --- a/net-proxy/haproxy/haproxy-2.5.6.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.17.ebuild @@ -3,7 +3,7 @@ EAPI="7" -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 lua5-3 ) [[ ${PV} == *9999 ]] && SCM="git-r3" inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} @@ -53,6 +53,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack ) +PATCHES=( + "${FILESDIR}"/${PN}-lua54.patch +) + haproxy_use() { (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" @@ -97,15 +101,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild index 959a7a9dac4f..fe83c6a1fb10 100644 --- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 lua5-3 ) [[ ${PV} == *9999 ]] && SCM="git-r3" inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} @@ -53,6 +53,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack ) +PATCHES=( + "${FILESDIR}"/${PN}-lua54.patch +) + haproxy_use() { (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" @@ -97,15 +101,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ diff --git a/net-proxy/haproxy/haproxy-2.5.4.ebuild b/net-proxy/haproxy/haproxy-2.5.4.ebuild index 931074ca6e03..177ad6df9650 100644 --- a/net-proxy/haproxy/haproxy-2.5.4.ebuild +++ b/net-proxy/haproxy/haproxy-2.5.4.ebuild @@ -99,15 +99,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ diff --git a/net-proxy/haproxy/haproxy-2.4.16.ebuild b/net-proxy/haproxy/haproxy-2.5.7.ebuild index 959a7a9dac4f..2b772750ef60 100644 --- a/net-proxy/haproxy/haproxy-2.4.16.ebuild +++ b/net-proxy/haproxy/haproxy-2.5.7.ebuild @@ -97,15 +97,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild index 959a7a9dac4f..2b772750ef60 100644 --- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild @@ -97,15 +97,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ diff --git a/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild b/net-proxy/haproxy/haproxy-2.6.1.ebuild index e50349eab9a2..dbf2cbf0aea1 100644 --- a/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.1.ebuild @@ -3,7 +3,7 @@ EAPI="7" -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 lua5-3 ) [[ ${PV} == *9999 ]] && SCM="git-r3" inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} @@ -15,6 +15,9 @@ HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" + EGIT_BRANCH=master else EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -22,11 +25,9 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0/$(ver_cut 1-2)" -IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) ?? ( slz zlib )" @@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig" DEPEND=" crypt? ( virtual/libcrypt:= ) pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( dev-libs/libpcre2:= - pcre2-jit? ( dev-libs/libpcre2:=[jit] ) + pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= @@ -56,6 +53,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack ) +PATCHES=( + "${FILESDIR}"/${PN}-lua54.patch +) + haproxy_use() { (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" @@ -74,16 +75,17 @@ src_compile() { local -a args=( V=1 TARGET=linux-glibc + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= ) # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) + args+=( $(haproxy_use pcre PCRE2) ) + args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) args+=( $(haproxy_use ssl OPENSSL) ) args+=( $(haproxy_use slz SLZ) ) args+=( $(haproxy_use zlib ZLIB) ) @@ -99,15 +101,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ @@ -135,7 +137,7 @@ src_install() { doins examples/errorfiles/* if use doc; then - dodoc ROADMAP doc/*.txt + dodoc doc/*.txt #if use lua; then # TODO: doc/lua-api/ #fi diff --git a/net-proxy/haproxy/haproxy-2.5.5-r1.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild index e50349eab9a2..dbf2cbf0aea1 100644 --- a/net-proxy/haproxy/haproxy-2.5.5-r1.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 lua5-3 ) [[ ${PV} == *9999 ]] && SCM="git-r3" inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} @@ -15,6 +15,9 @@ HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" + EGIT_BRANCH=master else EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master @@ -22,11 +25,9 @@ fi LICENSE="GPL-2 LGPL-2.1" SLOT="0/$(ver_cut 1-2)" -IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter +IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) lua? ( ${LUA_REQUIRED_USE} ) ?? ( slz zlib )" @@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig" DEPEND=" crypt? ( virtual/libcrypt:= ) pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( dev-libs/libpcre2:= - pcre2-jit? ( dev-libs/libpcre2:=[jit] ) + pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= @@ -56,6 +53,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack ) +PATCHES=( + "${FILESDIR}"/${PN}-lua54.patch +) + haproxy_use() { (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" @@ -74,16 +75,17 @@ src_compile() { local -a args=( V=1 TARGET=linux-glibc + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= ) # TODO: PCRE2_WIDTH? args+=( $(haproxy_use threads THREAD) ) args+=( $(haproxy_use crypt LIBCRYPT) ) args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) + args+=( $(haproxy_use pcre PCRE2) ) + args+=( $(haproxy_use pcre-jit PCRE2_JIT) ) args+=( $(haproxy_use ssl OPENSSL) ) args+=( $(haproxy_use slz SLZ) ) args+=( $(haproxy_use zlib ZLIB) ) @@ -99,15 +101,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ @@ -135,7 +137,7 @@ src_install() { doins examples/errorfiles/* if use doc; then - dodoc ROADMAP doc/*.txt + dodoc doc/*.txt #if use lua; then # TODO: doc/lua-api/ #fi diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild index 9b0bc07daa75..dbf2cbf0aea1 100644 --- a/net-proxy/haproxy/haproxy-9999.ebuild +++ b/net-proxy/haproxy/haproxy-9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 lua5-3 ) [[ ${PV} == *9999 ]] && SCM="git-r3" inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM} @@ -24,7 +24,7 @@ else fi LICENSE="GPL-2 LGPL-2.1" -SLOT="0/${PV}" +SLOT="0/$(ver_cut 1-2)" IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl" REQUIRED_USE="pcre-jit? ( pcre ) @@ -53,6 +53,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack ) +PATCHES=( + "${FILESDIR}"/${PN}-lua54.patch +) + haproxy_use() { (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" @@ -97,15 +101,15 @@ src_compile() { fi # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} - emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) SBINDIR=/usr/sbin + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} + emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin if use tools ; then for extra in ${EXTRAS[@]} ; do if [ "${extra}" = "admin/halog" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} admin/halog/halog + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog elif [ "${extra}" = "dev/hpack" ]; then - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB=${ESYSROOT}/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} + emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht} else # Those two includes are a workaround for hpack Makefile missing those emake -C ${extra} \ @@ -133,7 +137,7 @@ src_install() { doins examples/errorfiles/* if use doc; then - dodoc ROADMAP doc/*.txt + dodoc doc/*.txt #if use lua; then # TODO: doc/lua-api/ #fi diff --git a/net-proxy/hatop/Manifest b/net-proxy/hatop/Manifest index aae1afccc5c1..0eccbe639312 100644 --- a/net-proxy/hatop/Manifest +++ b/net-proxy/hatop/Manifest @@ -1,5 +1,3 @@ -DIST hatop-0.8.0.tar.gz 134737 BLAKE2B bc5b1f878dc3ff388c788b6f4a07d9a3076ca3c2c11de15ec6d1ad17d5b2295162568791e4dc9e3edf091a08c80662ceb4d5a6d276e69dd3c96132cb78d007ee SHA512 1776da58a12835434d7b8f59582bad44fb3bf9479f05fedb45f84bc73792b331dda63f989c8b202436801a30600283ec782380e16aa75abf7643ffa5da029718 DIST hatop-0.8.1.tar.gz 136760 BLAKE2B 3692e9dd307d5f098bd3a66a3a75be5184e17d246dc94b3581d2742c9629d558dc4768baaef1c1e290825e57a651dccc926f22b4ecc98074cc8309fdda4b4b57 SHA512 25026ddd62ef43f02cfb3ef41a815adf232c8a4b3053e925dcea69696c207ffbf22966ce1177ef460071e683f5a4ec8d011d2bb2b0aa06f4a9b3e5932aae93b6 -EBUILD hatop-0.8.0.ebuild 665 BLAKE2B 2a317267949c00ee7a0ece49941958a200bfe637049d352cd79fc2a79aee378c9102a756db5200582ba032e7bfb5d95043df336b3ba87ff28cca1b0dd8d3b8e7 SHA512 ecfcf0935a758064db223706f72f88753437c1818c2364a4dc05a70ba593cd186070e6af8884fa7f249268dcddf8289d2f68b34f8e5ca74739d0c451dedb64d0 -EBUILD hatop-0.8.1.ebuild 665 BLAKE2B 74c6b60f0511cf71715c1d3fb6befbb9c6c60e42a746e300b95f99963d566c65dc251ccb2994fa55f9c59f31a3ccaa0c14802478ee17e737b8178baa19a70304 SHA512 e252c91723da1c521da86c59af759da1602db454639f7bdcc733a9b8a804b2fda3b77104ca2db86ceeca36274202d14b3f7d2e3f029fddd01eeee85788498d9f +EBUILD hatop-0.8.1.ebuild 666 BLAKE2B 0404a7a4c04d4d804bb86b6f712cdccb016aeb5d7ca23d5c62d89a8c14431087eabc79ffded1241766376235e78c312e74232b09237806f6868b260c376f0456 SHA512 1440b1ee3ee8126d10870d0ffbb6bb71db6eef66781174a5a72dc6c439e13635389ce3abf75e0a1dc205d69c69417dc7e4d667c8fa9cc5aaaf0d8e3bd0ac34a9 MISC metadata.xml 250 BLAKE2B 127d3b63d96953a7263c1ecb0f0cd905cbba9006349ae20351476072eb08aa6e5d0da402e3a90fea218e2e05971096bbfd13d2bb6f57221d8772885075dc6523 SHA512 a8423fb0d09057a311f01b4fe8bc03d0535b701a96846a7617e9ea61d7aa3ccd7e8de31451488a7db435e8f8178a5dd70e5511080eccee8880d6959d9de4c0d5 diff --git a/net-proxy/hatop/hatop-0.8.0.ebuild b/net-proxy/hatop/hatop-0.8.0.ebuild deleted file mode 100644 index 2b54555e554b..000000000000 --- a/net-proxy/hatop/hatop-0.8.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="ncurses" - -inherit python-r1 - -DESCRIPTION="Ncurses client and real-time monitoring and displaying of HAProxy status" -HOMEPAGE="https://github.com/jhunt/hatop" -SRC_URI="https://github.com/jhunt/hatop/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND}" - -src_install() { - python_foreach_impl python_doscript bin/hatop - - doman man/hatop.1 - - dodoc CHANGES.rst KEYBINDS README.rst -} diff --git a/net-proxy/hatop/hatop-0.8.1.ebuild b/net-proxy/hatop/hatop-0.8.1.ebuild index 9b40160d20ed..15c530c52d75 100644 --- a/net-proxy/hatop/hatop-0.8.1.ebuild +++ b/net-proxy/hatop/hatop-0.8.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) PYTHON_REQ_USE="ncurses" inherit python-r1 diff --git a/net-proxy/mitmproxy/Manifest b/net-proxy/mitmproxy/Manifest index f51f7f9a29c3..8128b71bf5f6 100644 --- a/net-proxy/mitmproxy/Manifest +++ b/net-proxy/mitmproxy/Manifest @@ -1,5 +1,7 @@ DIST mitmproxy-7.0.4.tar.gz 27312748 BLAKE2B a23db472adab33db615b0daa93694211450e8899885dc75601d40a4964cc505437db6a106622eb8051263db23280261134937b6567482dd584eed29cc592e42b SHA512 4224b44e609f84b974b5419c6ceb576845957968c786ee437bffb5fa5df685ce0712d5ef8c402d40c568406242f44692cc7f04037fadd19ecece8b112d73b7ae DIST mitmproxy-8.0.0.tar.gz 27902148 BLAKE2B 73ef46fea3a668cb4cf9992e8de969c7ccac78ac84997a82aa59c841d7b5d1dfc6df5a3bd76f910f318c191421a99bb7a24fd53b50e8529968acdae1e934f322 SHA512 abb0855322ca74ef34756db860f491b49057fd8d4fb26ffafc4038e40fe30444c6736fcff7b683e32c21a2d7339ebfeeb6eaf7b9e586b965d191a59eddfe15b6 -EBUILD mitmproxy-7.0.4.ebuild 2167 BLAKE2B b60531fb28c28b5e5a148a1c6b3ec5ee8b5a6198e59ff0d244416530bba8f7820e929d7f7bee879b5a602d76c58801d3077b3f02e281dffd6b8fa1d820190fc4 SHA512 728430ef35e34f350cf70a5347232cf7c19bf84ccfacf919dbbde4d8dad7d3b672d181212bda81df1eae0c5bc93693dd74f70cc95a65b2b40d64a6d3ef872717 -EBUILD mitmproxy-8.0.0.ebuild 2204 BLAKE2B 6ed9aa6901c15e196c7531184ce752e82ba2cd85664005c212648ad885e4c6666e6c7bce6d8f44bd3dccd35222855308e8d420cb33d52aaf58f211b771e2ea7d SHA512 087a861fca980074f5e2a3fc9da5ca9d9143acac7a043b89a4d3e193aa134d41ba9c78f483dcd3472019fecfb7130b4576e045b4393b6c24269fef59f6ceae89 +DIST mitmproxy-8.1.0.tar.gz 27940706 BLAKE2B 6d4293f30257e88eafea21127d4f499a7734f3d450c07114f83652d73a8aaadf1523737fee96e04b1bd39d47b73263d7f62f177b5c02357b258c898ccc58a9d1 SHA512 47e0924b1fc2999cbc038295dbb43a78eef4120a31c9445aba7b1f31e90aa4d859c5e2665a429f16c5cf7a6f9f29a7d6a50bb09a1e54c2e1693714c28d5153e1 +EBUILD mitmproxy-7.0.4.ebuild 2170 BLAKE2B bcefd4ae98b9dec6093f5e937e70ea3c0284a2e47be80260670712054c530f1d3074fa44a41fd72554ad7da9ca1886b84c7af6bbb1b249f65d73cc10f2a9e7f5 SHA512 a64e9ce2244eaa1e899baa37e2c5bb39ba1deb1dc8d0aa366a1af79381b09fab405d4cb44b3c3505dc3679ec11d1a13db2797489b194751e1b608ffb92be363d +EBUILD mitmproxy-8.0.0.ebuild 2207 BLAKE2B c7788d0cb1b6f96984eb29566f164ba7e9756a901114c4ae28a0efb140bb85a16e03a91bf27229b336a4305192c51178a1f9c03837e414335daa9d39d24d1a2b SHA512 d60faa509bc7132c3924c6b2fee8eaa6b692b9e3976849ca2fae25dc21f625ac00076aa07461cdeba5a4d53f684cfd9525a6d0048f6247aed38da9a544b56e15 +EBUILD mitmproxy-8.1.0.ebuild 2205 BLAKE2B 88f42abc8e8c97b912f7b8e5e9ef4bca0ff26a75eee3cc77a33d88f31bd618e5cef2fce5997c16240857149533280e2701631a7481b28d0071354897d59d7e26 SHA512 bbedfeb5813a5163f2a0c317f2af5684e4a8d43164b8bc09a5a06f8d0b965b40964037365d149bac813f3515d79ab0de52aecc43756cec73d29c399e634cfdf9 MISC metadata.xml 923 BLAKE2B 00d3790b8e1810b193babedab5b14f35c1275c5d544b4ae031cab41e886bb55130a5187a02a0adab6b00c1ad6d38ba485f9ebd68422549e4e4b62a21b7bcdc13 SHA512 50d52876c7f9d71b2cc31a697cec73c8cce041076c8057e9e3e1f0b2218b883898735f545f85f4e28ab1bd2f8091b764ebc6c92e98c291962cb6f1d52e5aa605 diff --git a/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild b/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild index 69d150f29461..1c941837097b 100644 --- a/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild +++ b/net-proxy/mitmproxy/mitmproxy-7.0.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 diff --git a/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild b/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild index 840a63b77041..f8b403ee6b30 100644 --- a/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild +++ b/net-proxy/mitmproxy/mitmproxy-8.0.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 diff --git a/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild b/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild new file mode 100644 index 000000000000..c30ef41ab876 --- /dev/null +++ b/net-proxy/mitmproxy/mitmproxy-8.1.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_REQ_USE="sqlite" +inherit distutils-r1 + +DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy" +HOMEPAGE="https://mitmproxy.org/" +SRC_URI="https://github.com/mitmproxy/mitmproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +RDEPEND=" + >=app-arch/brotli-1.0.0[python,${PYTHON_USEDEP}] + >=dev-python/asgiref-3.2.10[${PYTHON_USEDEP}] + >=dev-python/blinker-1.4[${PYTHON_USEDEP}] + >=dev-python/certifi-2015.11.20.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-37.0.0[${PYTHON_USEDEP}] + >=dev-python/flask-1.1.1[${PYTHON_USEDEP}] + >=dev-python/h2-4.0.0[${PYTHON_USEDEP}] + >=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}] + >=dev-python/kaitaistruct-0.7[${PYTHON_USEDEP}] + >=dev-python/ldap3-2.8[${PYTHON_USEDEP}] + >=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}] + >=dev-python/passlib-1.6.5[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}] + >=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.3.1[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-22.0[${PYTHON_USEDEP}] + >=dev-python/pyparsing-2.4.2[${PYTHON_USEDEP}] + >=dev-python/pyperclip-1.6.0[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.16[${PYTHON_USEDEP}] + >=dev-python/sortedcontainers-2.3.0[${PYTHON_USEDEP}] + >=dev-python/urwid-2.1.1[${PYTHON_USEDEP}] + >=dev-python/wsproto-1.0.0[${PYTHON_USEDEP}] + >=dev-python/zstandard-0.11.0[${PYTHON_USEDEP}] + dev-libs/openssl:0 + >=www-servers/tornado-6.1[${PYTHON_USEDEP}] +" + +BDEPEND=" + test? ( + >=dev-python/click-7.0[${PYTHON_USEDEP}] + >=dev-python/hypothesis-5.8[${PYTHON_USEDEP}] + >=dev-python/parver-0.1[${PYTHON_USEDEP}] + >=dev-python/pytest-asyncio-0.17.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.9.1[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + # loosen dependencies + sed -i \ + -e '/>/s/>.*/",/g' \ + -e '/python_requires/d' \ + setup.py || die + + # remove failing test + sed -i 's/test_get_version/_&/g' test/mitmproxy/test_version.py || die + + distutils-r1_python_prepare_all +} diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest index a2b0808d7e81..c454e021e74d 100644 --- a/net-proxy/tinyproxy/Manifest +++ b/net-proxy/tinyproxy/Manifest @@ -2,5 +2,7 @@ AUX tinyproxy-1.10.0.initd 855 BLAKE2B 4bd9a260a930958ea449a08edce1f9e8633429a52 AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca809aca67b658bb13917869e5203d66730f52670fb9030dd9f6cf249d09f357bbdd143436f6b358377d8f78036 SHA512 7721b986326f82b03d79983be33047fdf4b37b5c63992645a321bf8bd3edea63680a2bf81b2d51fbeab2a5884773a0598dba14f9d597d3db0eea7c7f6b4c79d3 AUX tinyproxy.tmpfiles.conf 44 BLAKE2B a4e1cf0c8cbd78360175b8260c7d83885dfc9560a78faa6fc111f8611b6dd43c3cbf9fa62e60f8333cac4d0bededbe048c626d8a85d4f3c6c1bfa1ae249c599e SHA512 59d1efcc996e94ae684708ef06263c61f17680a776938a90ce145cf6f0243ed253d402cd886dab7c2c287f47dbc6f02f0e34904433e7b6756cfaa18a1b766b4e DIST tinyproxy-1.11.0.tar.xz 177664 BLAKE2B 6ea74ef0fff22fbc6e04b37519151fda771a7d3e789d94cbd2a77a76dce7b16151cfbad83ac665a5c1fdb7334cd4d26ed6d2bc73f70b3858ffe439b16698fd2e SHA512 c0ff2a90da2352e6021efc87d1293b85f2a7588b2a1ab13bd96d906382eda8188b22b01f9acb2d200fd570bf3ec9484fa370cae6834d1f055c0af1631d22ae9d +DIST tinyproxy-1.11.1.tar.xz 182080 BLAKE2B d39fa1986343af60cdfd07c6a049962e646a72874f7058fd082b9758bae3c7bc1a2288103527e0e1054ab098a3a41fc67eb3e08cd160e2bd4bd030e114326a6f SHA512 2e3435bbfece3797c11ccce222eef494ed92e00dd82bea2c40a54e454b7e03c8abc8e09b244f2da7192209c39047369439d08974b79eebc996fb3095230d0374 EBUILD tinyproxy-1.11.0-r1.ebuild 1719 BLAKE2B b4987e58b93d3e6bba9005766d882629a505b5c5509c7bbc0b12d823962f4bf19c5fae80cf1e3d074b638e99de76a97a3ab873f6613129f5a828cedc67903069 SHA512 aea1be8126aa552d56fd43716c6aafa3fc4098d80f1d3d99cc34dbf6ab184fdbc99c5610c5d7affde99c85ca26274a03a89a4157a6abad737b719be509c0c954 +EBUILD tinyproxy-1.11.1.ebuild 1722 BLAKE2B a9c60ba219e08a5a634286faf5d8cb198fc32f1df468bffdb938519e3be86d1829c2556d11ffdddc17d7f1cb73c6715c3c5dcb9ec7cb72bc555b24f42d58d808 SHA512 6f62adb2fe0a70773f64b7ee5a68f3c9e3ab838c99eef7ba0992373e45713f4b29d2fa9d1bddbc9a051ccf35871e02d44a590a42893e08d8fd9750df47762e8d MISC metadata.xml 563 BLAKE2B 07ee935476f241bbe02aef78b978263fbc0bc0440f191a61d9ca99ffe59a5c3c5d5e84e77e032159dc9aff83a18a453bbdbb18f4a2e14478b6249cae22a7aadb SHA512 c6495e76d667793098e3697854e68acc8fe8cce28cb70ca115fb8f48ea3ccad48b4f31f0c709fd6887435c06a015434596896eb8e8fef1d78a2406b672146c1e diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild new file mode 100644 index 000000000000..6c987419d72d --- /dev/null +++ b/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd tmpfiles + +MY_PV=${PV/_/-} + +DESCRIPTION="A lightweight HTTP/SSL proxy" +HOMEPAGE="https://github.com/tinyproxy/tinyproxy/" +SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" + +IUSE="test debug +filter-proxy reverse-proxy transparent-proxy ++upstream-proxy +xtinyproxy-header" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( xtinyproxy-header )" + +S="${WORKDIR}"/${PN}-${MY_PV} + +DEPEND=" + acct-group/tinyproxy + acct-user/tinyproxy +" + +RDEPEND="${DEPEND}" + +src_prepare() { + default + + sed -i \ + -e "s|nobody|${PN}|g" \ + etc/${PN}.conf.in || die "sed failed" + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable filter-proxy filter) \ + $(use_enable reverse-proxy reverse) \ + $(use_enable transparent-proxy transparent) \ + $(use_enable upstream-proxy upstream) \ + $(use_enable xtinyproxy-header xtinyproxy) \ + --localstatedir=/var +} + +src_test() { + # The make check target does not run the test suite + emake test +} + +src_install() { + default + + dodoc AUTHORS ChangeLog NEWS README TODO + + diropts -m0775 -o ${PN} -g ${PN} + keepdir /var/log/${PN} + + newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy + systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service + dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf +} + +pkg_postinst() { + tmpfiles_process ${PN}.tmpfiles.conf + + elog "For filtering domains and URLs, enable filter option in the configuration" + elog "file and add them to the filter file (one domain or URL per line)." +} diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest index d3290fe484fd..bb67121fdff5 100644 --- a/net-proxy/torsocks/Manifest +++ b/net-proxy/torsocks/Manifest @@ -1,6 +1,6 @@ AUX torsocks-2.3.0-fix-syscall.patch 2687 BLAKE2B 2ef527aa1618af20da02e2b08ddc59d2f66322c63ac0ed6245e52367124b13122ad2d6686790ef0823022bce6de53c13e4127dc97bd37d329266fe1f562c6396 SHA512 4baf4f7d8a218d255fa23004ffb9669de8938caffcb1107ff182bf8fe7c466edc32171635adb4cf69896b7cd9f3afe2ca45efedb37c2afc188568925ae9a07d6 -DIST torsocks-2.2.0.tar.gz 115269 BLAKE2B e6e376dbe9b248bcb51fb0c3c16346f4888310abd6e84942acca69f67ae15afe5dfeba9a6b3a8d1fa562f87548450af93cea3bea4d899980ca6acb651658cfaa SHA512 903d11d58ece76eaf75ff8fc11a27e4a29f94be530f2d77d1a6f0982d556a4b9c78677a43eed88f2451054d0e985672900ecf73b360fa09e80195c3b9006622b DIST torsocks-2.3.0.tar.gz 118033 BLAKE2B a4329ffa5e20204024c4f7dda8619ba2d3e2a5f370727acdc720527688bdb3f8735b0386dfa07758fe59e1890f9ce88bb148a1b0c401bbb5966d2fe17934ca61 SHA512 139f4cf60191632add8bc845b2d68d25a0285e9746988167d832e50cedb8083f2765571429d3a11350fa2d327a1ff0a0ead9b464dac90d897b13ab948f609114 -EBUILD torsocks-2.2.0.ebuild 1010 BLAKE2B 3a9fe259df34618bd7156b544051e09c13c957736803d78524bd9319328eebc408c663c732322f366dae443aa06386978d5f74e1b18e3ad3b05e96ab6d589a2d SHA512 bcb08ee5636cc37573f456c22af6e0a1b56ade236263e56a8392d2f267bf64819e80343088e8483a9353978d8d128a529a934bfdb30aba4e3caf11a1fcc01a79 +DIST torsocks-2.4.0.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e EBUILD torsocks-2.3.0.ebuild 1026 BLAKE2B b7ec706ca0d001952893f21983f26fcf7dae8a7e694b9966dfafde1f11038dc6169a47443d36c1b5190117976ba7992c2cf10f49f9ade06d081783257f043a22 SHA512 1721265f13357ada138dd0a6768754e0ece133ebbe952bc8b8144461d2bf0f03cbb03252bb53a5153640bfa06e2ea038254e34f3c2529550ccacb1a3530688da +EBUILD torsocks-2.4.0.ebuild 1001 BLAKE2B 24ea27dc25a26ed098ca6de11a3f7cce1d05e476cb0e6d40368afb79146dc689a02c1e4c1eea62f5b41fb4ecc02d1e5ad2fb861e5ee22a87dcd0c72dd9a6de81 SHA512 ff031df06c5bd558752171535e06ef806202de643599b90ee451fbc8caaa2d01efc203332ada2458eb461b7425dadc00d5e81ec922de3c9b754b61add96c369a MISC metadata.xml 387 BLAKE2B ae2839753c5bcf74c79d3931d8a0d7525475c89646ebf050f87744ae85915c740dc05cb695942ae6d042abe68099802581ef1730b9b0cc4d62277d9d0da17339 SHA512 8e71f9eeb801270df3f8e9855f2158eaa460bf02ff6ec4cf13cca9daaa7bc8e9febc2d410d6b9f33529831c713888dbb94b121bad5721efe324572d817097764 diff --git a/net-proxy/torsocks/torsocks-2.2.0.ebuild b/net-proxy/torsocks/torsocks-2.4.0.ebuild index e6454f696b72..4b2ee2aea47a 100644 --- a/net-proxy/torsocks/torsocks-2.2.0.ebuild +++ b/net-proxy/torsocks/torsocks-2.4.0.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools versionator +inherit autotools -MY_PV="$(replace_version_separator 3 -)" -MY_PF="${PN}-${MY_PV}" -S=${WORKDIR}/${MY_PF} +UPSTREAM_PF="${PN}-v${PV}" +S=${WORKDIR}/${UPSTREAM_PF} DESCRIPTION="Use most socks-friendly applications with Tor" -HOMEPAGE="https://github.com/dgoulet/torsocks" -SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz" +HOMEPAGE="https://gitlab.torproject.org/tpo/core/torsocks" +SRC_URI="https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v${PV}/${UPSTREAM_PF}.tar.gz -> ${PF}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="static-libs" # We do not depend on tor which might be running on a different box diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest index 503edd38ba89..3637e2a4b295 100644 --- a/net-proxy/trojan/Manifest +++ b/net-proxy/trojan/Manifest @@ -1,5 +1,5 @@ AUX README.gentoo 418 BLAKE2B ee8bd518461641a83a67f28ce0e93fe0c2763cda74cddae26ca547010b8a9095982e7ee1339bea9fcbcb248f6a800a1fed63902dd2ac9724e8d6a0d47fbd1f02 SHA512 54594e7813f6618e959f8c52cab5804f9403a8f0afbbdbc3bfadb46899c5d383ec3b9ff28a2721912f1b348f7e6c53a783745b5e0fddaca689c97a0ba9ef83fa AUX trojan.initd 981 BLAKE2B 8c021142a6c59dc2fde43bdc75d80c784600583aa997d4bc74539963ec41bdb7a15e57eb7b31ff4ea69e6d3f0034df8bf04fa3f971ca927d306bd9fe12ef9ab5 SHA512 6d419e1c142d8f6c091acb29f0a128742129b7c87f625a7b13e11fdaca6a58c1d2e528cd9ba34658109413735bd6ed8095f16e5eff258ac76f06a727e514793e DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153 -EBUILD trojan-1.16.0-r2.ebuild 1462 BLAKE2B 0bfc9e3c2c797c46f1e3d218c623b15165a4f254d9d110c3ad69f523ac872e173ddf70c91d33e491abda63a84f9f67f57fd783e510670d2cae2634cde3f43766 SHA512 a5172c9b1fd56e55c3ca73e18e296affbb13418c1eecd5290161b98fcd7dcf0124956423ad69bbf5ff9701ccc183ecd73c3e5d03dc2f72f43d4092629b3a5123 +EBUILD trojan-1.16.0-r2.ebuild 1463 BLAKE2B 215d817dbdae9ab821e4e426064fb7b0d9c21dbc9eb78c4d5e2fd69584f7ac1d695d15c21a1ca9f1861d203043e4a2fbe6b81df05e0c7ed9bd2c4747ef0efe11 SHA512 77c030917f6221b1109ebc7176866739aef154e06b8389b5458c80a6a42c4d2a6ca2b8d0ec0267a0e17a01cc051bd3c3cf825594713d38d9c5ce4899c3a00f6c MISC metadata.xml 1155 BLAKE2B 4b36b42fd226c7ffb5b28eed065d16bbf10abf68108044d64ae97b5ca46e4b2d38a95f472da080d8884a10ba06a942e9a2aa6a9c3cc79b13a51d33cb06b28859 SHA512 bdbcab7001c48932fdc01158e9b0345141ffc66f0dd413c8d387882b01c73a08dfe5668cc27cdf7f028da7ec3f18613fca46509496d37b1e8ee66efd7fc1f12f diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild b/net-proxy/trojan/trojan-1.16.0-r2.ebuild index 181c880f56cb..36c1a9d0370e 100644 --- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild +++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DISABLE_AUTOFORMATTING=1 FORCE_PRINT_ELOG=1 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-any-r1 systemd readme.gentoo-r1 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest index 54d75e0bccf8..1f8d2d39e846 100644 --- a/net-proxy/tsocks/Manifest +++ b/net-proxy/tsocks/Manifest @@ -6,5 +6,5 @@ AUX tsocks-1.8_beta5-poll.patch 617 BLAKE2B 974277a260d0947e16b096eb38a0234d0fd4 AUX tsocks-1.8_beta5-rename.patch 3104 BLAKE2B 6eec6173d8bd4cbb2e4b78096521abbfc5a57b37c6a492ef6de2de7d55d99a621e2641764038c0fe0a4ec3166c268b8eaa652ae25d86085655756471af5cf23b SHA512 d9c4b015c9408a455b357718fd40cf07f40430aef45acb1680a939b414e75ccdef43bac6e3d046268990c228aa402e9917dcf08a13d605264925c5766e9f0758 DIST tsocks-1.8b5-tordns1-gentoo-r4.patch.xz 18464 BLAKE2B 99bd4c210c2fa4c797c4d827df4ae53d13198b91083975b9f6d327bd762193663c1a0c8530ea5e65e82d54ccf6900a11aba50e19a2fb6209e0e8f1131985374b SHA512 711b2e3f5ac9b1a4fd63e32b6cb8090066ece8882e2ec0048bee6cba868712c80ca7f601f79405be40404af625c2ff6fefa8cba98b8a6ced95abe6becf34954f DIST tsocks-1.8beta5.tar.gz 83928 BLAKE2B a58b4866154deb72b551961578f90b270a7cc1fd2c5b4c08a5ddf99472e3c8e338cc9116c0c9d2d2e1e1c350a077b46cd08fb24390156eb1e60c4d7a10510e6d SHA512 b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9 -EBUILD tsocks-1.8_beta5-r9.ebuild 2283 BLAKE2B a83a39072da6b40e00cfb0c0af800a8811bec6374de2a6e1fa823278b8b78012cde2aecb0326a954fcc326bd4ead7426c88147e41e8f53ad16d9ffa6b65b59f0 SHA512 7791583106d1d27a3b3fa6a129fff6b1796df26bdec2cd4120dbecda580de4b85e3f231caae84e0ae6e66bacd9f3e207d3cdbab47a68930c05dcb4e9e1ef834c +EBUILD tsocks-1.8_beta5-r9.ebuild 2290 BLAKE2B 118fbd349951a93e59128f109700e3e851c475a2adc46da9e6d6fc47b239baa662d12a80187d48919c98fe1a7fc78f55ba7fb12077b7cc118c199121faa502a1 SHA512 3d8a269384fc2e818c9eb460c56680d4fe7c24c56d0e05ea0c41187b8e0febc89220c5b0b057e37439c1e51851d0fbc83ee628b4e584e69162783802d3e1ef9a MISC metadata.xml 982 BLAKE2B f34a45e793e8b78f3c5f8c7e93c0aeecc20e8fc795bb28dab4c9721ccdc426eee96e19e4ebc09f9a96efa52f3e77ed67904e27846ed7fad2793149cf87ec2ca0 SHA512 90a9c91fe8d7b22f6b4caa58603128c2c33cc25820b6d25229f127dc8948e84cd9c179e1fbc0e9dadc326b6e3c962bad6fcb1ae2f5920ab75662bb351509454d diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild index 5dec8a20c460..ccad4e386d3b 100644 --- a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild +++ b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="debug dns envconf tordns server-lookups" REQUIRED_USE=" |