diff options
Diffstat (limited to 'net-proxy')
53 files changed, 1765 insertions, 526 deletions
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz Binary files differindex 4d0fe9908e17..4363e08c5484 100644 --- a/net-proxy/Manifest.gz +++ b/net-proxy/Manifest.gz diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest index 03bc947372d6..64862249a073 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 2786 BLAKE2B ab5f9fe4711e2c384045410e35fb31e7a9518561c352619e9a0673424fe77974d7bef4b2a5c21b9eeb7198c3ff4b2ea41603be80166ee1976c216f84964e39b8 SHA512 fc9302ec30dbaa4f3bb3f751342b7bf67b59216c2016e507dd494ab0730f82b2f6e9913fc312558b53e0c37e9ee0da4a49a408945c1ac98c5c3938d7f6cc5bfe +EBUILD dante-1.4.1-r6.ebuild 2780 BLAKE2B f0b1d5d30fd514fb996317a0ccfc36c31c2db2d78fe08a882ecd2331a8aa27ecbfed36db790d3f9f3f208eb33c0a899acb52c9a411c53d69f7abb8d262cd5901 SHA512 506a193e250f6c3331b626d3d79a700d113497aa511383521c2bfe1ede96d33c04f32e1081f667579c9d757450c070bd83cb9bbc9dc7db43db93862d3d11b214 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 816b15f70428..b0e1f561ad5b 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~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-dataplaneapi/Manifest b/net-proxy/haproxy-dataplaneapi/Manifest index 88b8f7668afc..d125200a93bd 100644 --- a/net-proxy/haproxy-dataplaneapi/Manifest +++ b/net-proxy/haproxy-dataplaneapi/Manifest @@ -1,10 +1,7 @@ -DIST haproxy-dataplaneapi-2.8.0-vendor.tar.xz 2346260 BLAKE2B 9c8dbd3de567bb910bc52bc1cf008cb36326cbc40f79108acc1d984d45ed8f34fa7179b4e1d8d7917f1a13da847b1d4f249e4b64a57361a5cd3c6287b6050199 SHA512 0742aae5270a150239654b94d0a8ff226a47932825dfd908c9a531a5f6a9d8d5263761cc83f1dcc206bcae39fba498f80a66a1e6f2df501695ca38e75961200f -DIST haproxy-dataplaneapi-2.8.0.tar.gz 739904 BLAKE2B 1e1c1b504f070489808a101fafabcc499e1ba1369b08a9cf1b930f6adc8a315506225ba7535d626cbec9fc6483e4ae262e49809557a80b7e7aa712e37da01b4e SHA512 601eb1c1d37525a1e406c9eb99e933bb785ac2ffe430f9e53cb5c551695856283cd42aef16ff239e6525eec686c09582e05f2ddea8c63bda2fcf1a86610ea027 -DIST haproxy-dataplaneapi-2.8.1-vendor.tar.xz 2400460 BLAKE2B 9993a94eb24ba505f4916cd5493973cbb2d98eb374a30f3ad3b685f0751e8712d184903b6e2af8ab546c0ceceae563cb7b87774f1c96b83bd854f1124fabd57c SHA512 73d84ff4d94fac7af7420537ddd480f25f361f768854135bc53bc9117bb6b004e98415f2b31660b743feacfedcce3ac0bbc045069f70f13cc4644d55c1f7d2a3 -DIST haproxy-dataplaneapi-2.8.1.tar.gz 749241 BLAKE2B 1dafb2f91fb2372151bb8e07a011305ecfb10f8cc0f27849e40b88672d81fe22dcd068de45bc6027bedb1581dabe69a44cff61a3cd5a5d1ba093ac924204610a SHA512 840f3d4826a4aa999e812e598d4c5c63dae30c6059c66567fa8f3215492ba2dd8edaa4a38a74c0c57da014cd5684408493a7b334c98998832787767f45abf270 DIST haproxy-dataplaneapi-2.9-vendor.tar.xz 2385844 BLAKE2B 9e4dbaabb6c53eb331b5b8a589bd8910bf4eac7dcb4ceee3392c83f45337c7b6d66e8c41c4286b955f502994ac6f40b05eb80865a69bdf96b21b5bd26ea636e3 SHA512 0c0e1df60b1339ed568ad6531fb0ec701ab8d971c2e310bb216afc7c3859dd5687029cab9e62bfb4368a751bc1fd40be29f9cf1ee8de4d52c77e98f60e82c7fd DIST haproxy-dataplaneapi-2.9.tar.gz 759654 BLAKE2B 0666668902ffa4e806d86d8079819504bd79b60cf4c254c3eef72618e15734b5f3d0dde410fcc3e26d1965bb6af62f1ffee91fab8c491d59d28cf1e264630611 SHA512 8a709f94ea67d15dc55bdd262d4b423398cc6a82136ce3af7b4d052963f51eeb9d364949639c2d46a227aa6b1cdb2aee6a9f307b0975634aacbfa0e9988adf86 -EBUILD haproxy-dataplaneapi-2.8.0.ebuild 663 BLAKE2B e6dcd08d75b94d97b523153e526aef3d5480969a5bc879554e3ae5377b8feb9653da83d978a62bfbd69eadc8fe2b21495ff3f34e45df983223dbab5414210b85 SHA512 691d5d06b283680f70d52b36ad480fd7c94aebf068fb79dfa0ff5252cec377a387ec4f362efb6978e45b25b61e3f68516d6ae0d112d430105d5b293fdd51cf09 -EBUILD haproxy-dataplaneapi-2.8.1.ebuild 663 BLAKE2B c2c8309eabf63a18391d1bb14591e4fa4469880d6557656835d0d9f60db164baeab42afe5f674821f8fb03a9fb679f052cd7bc28492fbba8e9404f3276fb2446 SHA512 7fbb3eaff332c966b2d5e1a16f32f4f724de941ecfd62674d84e7c4af23a777fbed0d3dff2a49ab6107d78d0e7a57a22e9357259e1877c75e1fd97e82c9636ac +DIST haproxy-dataplaneapi-3.0.1-vendor.tar.xz 2892440 BLAKE2B 88a5487c01f8001e5af7b554f2ef781213c0f11962007b170a221495deeabb413aa1d3f508c111dbba0f402a5a7dc9d679989e9137f7cafab95703503088b6e0 SHA512 a5136c6fe2761a70dc2e1496a9b91c73f2179fe8b55f81289b7629d1ba1b72f498404142c15d99dfb78aa2561dae20dbf0965caa7d4a798753a53e424d86c93e +DIST haproxy-dataplaneapi-3.0.1.tar.gz 919178 BLAKE2B e1deebc80b227ef39c1355fe6bdf6137a89f32ab29afe95d9921bbbba3ceeddf8e9ca6613198343d7fc16d54e907c32eb7ddf9592eb2aa3812645e73d5398202 SHA512 5a6d142d88c352108dcdf106006f98b42ed90a17c114fda3e4f8831f77b4496acf7c5e47ffe7680ae101ff5811020cde9c596bf48283abd457bdcd6591ca0e47 EBUILD haproxy-dataplaneapi-2.9.ebuild 663 BLAKE2B c2c8309eabf63a18391d1bb14591e4fa4469880d6557656835d0d9f60db164baeab42afe5f674821f8fb03a9fb679f052cd7bc28492fbba8e9404f3276fb2446 SHA512 7fbb3eaff332c966b2d5e1a16f32f4f724de941ecfd62674d84e7c4af23a777fbed0d3dff2a49ab6107d78d0e7a57a22e9357259e1877c75e1fd97e82c9636ac -MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47 +EBUILD haproxy-dataplaneapi-3.0.1.ebuild 663 BLAKE2B c2c8309eabf63a18391d1bb14591e4fa4469880d6557656835d0d9f60db164baeab42afe5f674821f8fb03a9fb679f052cd7bc28492fbba8e9404f3276fb2446 SHA512 7fbb3eaff332c966b2d5e1a16f32f4f724de941ecfd62674d84e7c4af23a777fbed0d3dff2a49ab6107d78d0e7a57a22e9357259e1877c75e1fd97e82c9636ac +MISC metadata.xml 337 BLAKE2B a5451437f791b1398ad4c3f6415e4bd36cdb5e6b33ab04138b1c02049ae77a23beef15f70db7dd51868824662c2f5486a670a3509d6f20c8a591e4245af49f16 SHA512 44e8a3b96308ab2247acf4173f55d88b7efee5c0315eecca2a026aef58733e257cc3e0ac2862efc46a4c4e360b93414171e7c5afc2dffcb2b84dd69b5c02b653 diff --git a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.8.0.ebuild b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.8.0.ebuild deleted file mode 100644 index 7f31a72b4a64..000000000000 --- a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.8.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit go-module - -DESCRIPTION="haproxy dataplane api / sidecar" -HOMEPAGE="https://github.com/haproxytech/dataplaneapi https://www.haproxy.com/documentation/dataplaneapi/latest/" - -SRC_URI="https://github.com/haproxytech/dataplaneapi/archive/v${PV}.tar.gz -> ${P}.tar.gz - http://gentooexperimental.org/~patrick/${P}-vendor.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -S="${WORKDIR}/dataplaneapi-${PV}" - -src_compile() { - ego build -o ./build/dataplaneapi ./cmd/dataplaneapi/ -} - -src_install() { - dobin build/dataplaneapi - dodoc README.md -} diff --git a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.8.1.ebuild b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-3.0.1.ebuild index 10b3b3affc66..10b3b3affc66 100644 --- a/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-2.8.1.ebuild +++ b/net-proxy/haproxy-dataplaneapi/haproxy-dataplaneapi-3.0.1.ebuild diff --git a/net-proxy/haproxy-dataplaneapi/metadata.xml b/net-proxy/haproxy-dataplaneapi/metadata.xml index 2ce0e74f9864..decd4c87afd9 100644 --- a/net-proxy/haproxy-dataplaneapi/metadata.xml +++ b/net-proxy/haproxy-dataplaneapi/metadata.xml @@ -5,4 +5,7 @@ <email>patrick@gentoo.org</email> <name>Patrick Lauer</name> </maintainer> + <upstream> + <remote-id type="github">haproxytech/dataplaneapi</remote-id> + </upstream> </pkgmetadata> diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index 28744cb54705..d4492f9c0f8f 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -1,34 +1,43 @@ AUX haproxy.confd-r1 637 BLAKE2B 5b79a652f0cd124ab9349ceee026c7b54de10c5c4ceccba189c856204fb149b2be667f1bcbd73cb438848d7b34f1ce15812c4fd0e3445b5a6d8c3bd77bdfeda4 SHA512 19cd0dad0fabf579b86c4de74f291e6caf6f5b91d9ae37da2315169dbb75fd35337a7a3e07f4d9e424cfe9776f39952c91f69abd6580c2df16b0d2cc8f3f099a AUX haproxy.initd-r8 1668 BLAKE2B 2d5b6ec27af7cc067eff402d71322fa1776d95437ae515b56729a4d380338c29d128724b429009512380ac3f841510ddec89bb2ccfdf62eeea1fcf24a34bd838 SHA512 0c160c3850e32bccf8757f2e4a066d4d2ddea80cfd307d3cd83fccece98719fd0688b5bc6e1360c8f44306f08f241efe76a2d25c36269f4f309a88f32ffa5c88 DIST VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz 196700 BLAKE2B d740e19104a91b4cf978596ccda861974e96c9ed85a49c91e996c5bc6dde40f1cdcf49e6a75243aba7bf59abfd8d2c051a7ee574bab22f9e512d74376c9e1738 SHA512 cdc62271bb75ef7032745a457e1a54a84bcaadce73324272462b647383177338c5c2c8a17993d6344840e8ce0308a7e6f0df9bb766ebe0e8d4ee6dd4914e188c -DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685 SHA512 d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227 DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B b02eca0ef2719fad33c8db65b6568706cff3af9b19e2e0656970986b59116c054972341b5efd010907adb8d664fe1f72dd29feeab6a7b8bb9508e65c3bed9076 SHA512 bffe50c4155f28743fc4368e08f5912d137ac8fcad2bea70b9fb171be6a1c46c82e24059634add0b42a1d8da7d6fc76bf5287ffa8d4d530d46dbe522ad51a9e1 -DIST haproxy-2.4.26.tar.gz 3670267 BLAKE2B 073ca954935021fe1986492181137324b8e4a3cdcae0e079e7a817e8dd7ad8b0097a4da57de116ed9c5932565e30962504dc18bf0ce40ac77fb384aa6527e6d2 SHA512 6397e5938fde77915786514def120472791f58e273cffb4562c9a74bda02300413f862e1dfcea33f5ba7b67753c156a326b4a63efadb107f85f6922fc2b89427 -DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d SHA512 5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601 +DIST haproxy-2.4.27.tar.gz 3671596 BLAKE2B 987df4b07686e68805ff31a6832498ad8a7487a63b37e8d5ba9cd20be245a91c42e50d754d7d580d0899fed630a6bf99bd594cfec7b3a9d00ccac744a09da19b SHA512 97227805acd6131df8b4d398099bd9b89d1cd2aaddce4a3f334bf5b8b4dd01a30a0c3b56a7c23268456cf0e3a39244ddfd3ea0c27ee44f2c3bdf49c045b5fd8c DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc SHA512 81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147 -DIST haproxy-2.6.17.tar.gz 4094829 BLAKE2B c1be1ef756883ca8edbad738630bbabae5c108d34c7eee6833029210c06be481dd0eb6261fb27959bb8c0cd5eebab432b6b6c2ca7a6da258f7a5dab8dbc81688 SHA512 b8e9768e768d6de10bec5811998ecbfed27d51d32dcb821ac320d02930530a950f5e2833e804284a1ae46df15bd636145bc147e55ffc7a0ca78008ebdb0d3f81 +DIST haproxy-2.6.18.tar.gz 4103766 BLAKE2B e55f401ede25e54b199b33b7fc3dd788a45e9abbeef10fde5be6939124ab14e119ace3a2dd9d191b7c32270989c98787bdc30d2defa80c012215e2761538ce4c SHA512 44bc0504b62c9553fe084c607e8e4d73df100b371a3493663f82fe661d07852046e1be5dc7d195a3d85f1170d9096c6a0770251ed10c1bc88f8f982ce740042f +DIST haproxy-2.6.19.tar.gz 4110701 BLAKE2B fe003ac433a7756e57751db8f5430fb5f16e20d328bd28c0c5595304570a1450cecc19ca600fae515b21af00bfd6699ba08bd8ccfe43a09b6719e0f90b985a02 SHA512 cdcf6c2108d844c08b586e0e4ee4bd64dde3ef0da7487d65ea68f6fb52d9a1c2c34f4438ffacebea1d0f2400aac9f9f1b9000714a08cbac192a9f302dcc6c345 DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0 SHA512 1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2 SHA512 774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495 +DIST haproxy-2.8.10.tar.gz 4392333 BLAKE2B 4afc387970adbd6f882aa9b1d95cf6cc914d98ce69648282798fe2d97be82adc60c6ad4d0f3a78f56e2eca26d91a47044de2ca7277ca2567ecfdd2233ad64f32 SHA512 0a36f1e17702f4ab6eccf1c10643f4685e8c8b272cc71cbf5feb61c8c95ea52b5fc47eeefc97390bb8cb4ac1d52db0c9ad3c0510f8ca017bf10204690554c6d2 +DIST haproxy-2.8.11.tar.gz 4400628 BLAKE2B 0daccc4dbae5cecae3ad0bc1d164ea78a9584a0f4cb71e15664aff4b76fc05a828030dee355722c99a77270427bd3e9e43939ae59a3f3b1cabcc0179faff34b9 SHA512 59517187a5c0e0dbcb8629d2a922f7a865e1ebdbb9fe0f4fbe273913e0f15a1a26767808bd1607f10e79d3abcdd8c35c1ae648df149a1d5c0df32604df553655 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc SHA512 dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464 -DIST haproxy-2.8.9.tar.gz 4383096 BLAKE2B 5db0bc2d568989f4c319d0c9f1d7cbf2b0e235fce76ccc2c5688059ffbdcfda0f0d3958c5fc332f01e6fbcf38fb3d9e5e453c44df9baae5bbba16a9db8e0d761 SHA512 087dfe318bd56c3b1e834975277a35f5ebf434fdc4d342a78a24e8bec2f1d5a07d958383581eae6277754cd138e69f465e1d8fe6f1eae2f94f14a9914082bb7f +DIST haproxy-2.9.10.tar.gz 4532342 BLAKE2B a015b04cb008b6b0d0397e57caa0ae2fda7c91cf0c21f581cc58088fc853d962a5fc1750cd07012e03e3a063e9710803c5100e326aa89bc013b87d638764b11b SHA512 3aea657c37251cdeed295e90cbe0b54a87821c87ef17f80cd057a16102212fb1b992c6fe8b7c4f1a5d6f1890170f470a703b74bd17e2546cfd9847323d2c687f +DIST haproxy-2.9.11.tar.gz 4540689 BLAKE2B 53f81c845e2bb8b3c9935a6035cb28d49708337e16081c2197cab60e4c1f01642cc64f1b2162bdabef07ab79cf72af9fac136bfa19fe89518b7de110433a1789 SHA512 316ab1dfbc60da4fe39acd4f9dc62d352690b35f0787f4fc0ae51853c7d35c656417e97945650bd79900d815414ad9504e4ff368e852657690f20ddc69bd3693 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692 SHA512 4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a DIST haproxy-2.9.7.tar.gz 4516225 BLAKE2B 60590f2ff726bce2078c2075fe7f5476b870bda935560bcbecaf2deeb097c031d458105920f04b441dd59418b7a45b451b16be142f3bb89ddc5efd92ba98303c SHA512 23f320d49f822761cc0a4d8b7e15c8a58b804e4601c9421fa2433afe19798944d5a7264bf83502534b99236dda7c44ec72b97c1e6cdbcf203ab3090ae5313b3b -EBUILD haproxy-2.4.23.ebuild 6637 BLAKE2B 53be34d7dbb5ccb6d871dceae60492769ef48a44f484b85d2bfe5024224cb4fc1eca299fd660333a59865be563aa8bdfcfd092af879ef19071429834c4f1ab18 SHA512 306d7f23b250c1537f4b62745211724b89990442c40037a464358d494387dc5c66ba175dcc824ac791b55cc1c5fc9002f8d5070c92c230f467246eb21066c5f2 +DIST haproxy-3.0.4.tar.gz 4689835 BLAKE2B bb3691ac99db91a4a9faecce14f032d152d2fec36bc7722e7a71a8218e05e258c2667e45109af2006f20df38739d911db0be2f4845789824e7a012d4adc7bc38 SHA512 354d441d39a981ca16d844b64e06fde62df9ba0bc7fdd9e79e4890312be18378d7231ac997b035d5ef990f67f0b2cf8e60592026634777ccdb99286078c12867 +DIST haproxy-3.0.5.tar.gz 4698022 BLAKE2B c64d8799755fddaf5b45a9e2b67c5f03b25af98fbddde68ab1206c288d9a65f91938810b150c4398ee138d9154c90f1af9fb05c3d0bbc80394e71430e1cc4396 SHA512 8c16b026d5e26fc030178ecd354c68e8ea32c2b971f143cb2aa2f1b2d16fbfc0a27e3975f78873a0cefe3f904b5f1999f8d75622a04234b9cf88f90161d9ea91 EBUILD haproxy-2.4.25.ebuild 6637 BLAKE2B 53be34d7dbb5ccb6d871dceae60492769ef48a44f484b85d2bfe5024224cb4fc1eca299fd660333a59865be563aa8bdfcfd092af879ef19071429834c4f1ab18 SHA512 306d7f23b250c1537f4b62745211724b89990442c40037a464358d494387dc5c66ba175dcc824ac791b55cc1c5fc9002f8d5070c92c230f467246eb21066c5f2 -EBUILD haproxy-2.4.26.ebuild 6640 BLAKE2B 864d85bf9a3dc16f5f07f98e77df7934fa30a0fbbfd3c9756d1bb8f7c0946a4fa74aa55bc6fb30faf98fd8fb9afee3d3db0457979ece3655ddd952058c485622 SHA512 609657d4907172d55051a4dfc104573222f86e1a1f8320543b73e6505c6d431672f404cb754139a43cdb8486f7d4910ad734aa58c4b13ab66f159058e7e5241d -EBUILD haproxy-2.4.9999.ebuild 6640 BLAKE2B 864d85bf9a3dc16f5f07f98e77df7934fa30a0fbbfd3c9756d1bb8f7c0946a4fa74aa55bc6fb30faf98fd8fb9afee3d3db0457979ece3655ddd952058c485622 SHA512 609657d4907172d55051a4dfc104573222f86e1a1f8320543b73e6505c6d431672f404cb754139a43cdb8486f7d4910ad734aa58c4b13ab66f159058e7e5241d -EBUILD haproxy-2.6.14.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630 +EBUILD haproxy-2.4.27.ebuild 6640 BLAKE2B 01b5855988197a1cf18619ca10400699ecdab66db56fca87714833bedbf32e608f596ed3c3476db6ca73c87a438e991cce579a8114c0cad4f58ce4fe172a1f6b SHA512 8cd574c578a7dbaa1fed5357d0af31b4a661055c3c79aabeaade71c67fff139b01193293042704112ebb1e0b767289e50fd0416b5cb4fc00e1124d27613d7141 +EBUILD haproxy-2.4.9999.ebuild 6640 BLAKE2B 01b5855988197a1cf18619ca10400699ecdab66db56fca87714833bedbf32e608f596ed3c3476db6ca73c87a438e991cce579a8114c0cad4f58ce4fe172a1f6b SHA512 8cd574c578a7dbaa1fed5357d0af31b4a661055c3c79aabeaade71c67fff139b01193293042704112ebb1e0b767289e50fd0416b5cb4fc00e1124d27613d7141 EBUILD haproxy-2.6.16.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630 -EBUILD haproxy-2.6.17.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 -EBUILD haproxy-2.6.9999.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 +EBUILD haproxy-2.6.18.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 +EBUILD haproxy-2.6.19.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 +EBUILD haproxy-2.6.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 EBUILD haproxy-2.7.11.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 EBUILD haproxy-2.7.9.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630 -EBUILD haproxy-2.7.9999.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 +EBUILD haproxy-2.7.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 +EBUILD haproxy-2.8.10.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 +EBUILD haproxy-2.8.11.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 EBUILD haproxy-2.8.7.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630 -EBUILD haproxy-2.8.9.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 -EBUILD haproxy-2.8.9999.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 +EBUILD haproxy-2.8.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 +EBUILD haproxy-2.9.10.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 +EBUILD haproxy-2.9.11.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 EBUILD haproxy-2.9.6.ebuild 6633 BLAKE2B 19be9b673125e5065bd26f05a74a17cc69b1241ad5c60163ba018ab2c98b08bc5b8292eee6e4409168101946a113fa4499613eaaf45e512c4bf34863d2a01b7a SHA512 774e6c1bf3ffcc1a11f4dcbb0cef1dfb264ec331b1635abe8d145c19343ecdac38232dfb04448b1a84c45f129463c986edfca2b67c47ffbc2327d358bf0c3630 -EBUILD haproxy-2.9.7.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 -EBUILD haproxy-2.9.9999.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 -EBUILD haproxy-9999.ebuild 6637 BLAKE2B 68f64c5674901f80b5a670b6b70295622214e0b4bd8878269685888cf1b5c8721d38820d2db2140e98f8f9b0cde169a117e37a901c56901a1e504add1c6daeda SHA512 fa340d159a0dc699793879bcddf48d6718104b120de757379e8bd7fd448a135f852b8d9cf6b3760628e6fc9ebaf992d5b66215aa94c4019252960f56e2d8cb06 +EBUILD haproxy-2.9.7.ebuild 6635 BLAKE2B 2f7647df104b260d33088b3e2d2db3833e697e1d8a014982e64194809e42a8f07163f3aa942d7321ec46b06c73a2920f329ded843cccae91816940795fca4b38 SHA512 7c6374320c5752202645fbf69c478be712146e05beefaf0ba6950696d3cb8ade628704170b8d5d662455add9e04dc294388dbc90344eff2bf474ae6604463e6a +EBUILD haproxy-2.9.9999.ebuild 6637 BLAKE2B fe6c095b954243d47f4a64539177c2aad4a60d214606d5748ac7682866d46a071ef22b578edc628ad9ae0ed69aad9b8730c1a56575875cdd93145e4f879cae37 SHA512 91d0c3d9445c53a8b421936e21c223e5057f6c0e8700eb5547b8e5779697044596ba01f8481acbca7ffd19c2e0e821b0c36240a45900091ca432003437249557 +EBUILD haproxy-3.0.4.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130 +EBUILD haproxy-3.0.5.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130 +EBUILD haproxy-3.0.9999.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130 +EBUILD haproxy-9999.ebuild 6494 BLAKE2B c09f2732b205f44c2b4467b5cee231a6502e1825ef81dc077137f8161b5110441e2a69c3ad7fdb7122acd35103e6e3484d4e68ed557adb3e32df2f8c7348aa00 SHA512 a9eb7923952d9c08b4f6ebc774325dcf6319e093ceb217d78ab74fb0454b5722f15ee27a33edf1102321ab42af0846bf5e6702b15828c2be676bd0448166d130 MISC metadata.xml 1950 BLAKE2B ac55c0bbf5c5d26f92eb2e7cf4c7bf9ab6a432e45c192c6d591a3ba8c5457f3e17ecee6ad3fcbf13108d1893e3c8e582a4c6a5a3d842f0376b32869a59373526 SHA512 bbd3bc13f40649db82489e2f50acec08ec2cc7b401b81c071eabf3508bccda789da6d0bd50267d81b5d08c2eadee4cf3ce7fe8a2b57a04841cab38623025f121 diff --git a/net-proxy/haproxy/haproxy-2.4.26.ebuild b/net-proxy/haproxy/haproxy-2.4.27.ebuild index d8800bf0af84..62cd2fd227c9 100644 --- a/net-proxy/haproxy/haproxy-2.4.26.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.27.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild index d8800bf0af84..62cd2fd227c9 100644 --- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-2.6.17.ebuild b/net-proxy/haproxy/haproxy-2.6.18.ebuild index dca3aa00891c..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.6.17.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.18.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-2.8.9.ebuild b/net-proxy/haproxy/haproxy-2.6.19.ebuild index dca3aa00891c..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.8.9.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.19.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild index dca3aa00891c..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-2.7.9999.ebuild b/net-proxy/haproxy/haproxy-2.7.9999.ebuild index dca3aa00891c..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.7.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.7.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-2.6.14.ebuild b/net-proxy/haproxy/haproxy-2.8.10.ebuild index 1e57b8694cc7..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.6.14.ebuild +++ b/net-proxy/haproxy/haproxy-2.8.10.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) @@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" - KEYWORDS="amd64 arm64 ppc x86" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" elif [[ ${PV} == 9999 ]]; then VTEST_DIR="${WORKDIR}/VTest" EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" diff --git a/net-proxy/haproxy/haproxy-2.4.23.ebuild b/net-proxy/haproxy/haproxy-2.8.11.ebuild index 74bb3576a796..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.4.23.ebuild +++ b/net-proxy/haproxy/haproxy-2.8.11.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) @@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" - KEYWORDS="amd64 arm64 x86" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" elif [[ ${PV} == 9999 ]]; then VTEST_DIR="${WORKDIR}/VTest" EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" @@ -173,7 +173,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.8.9999.ebuild b/net-proxy/haproxy/haproxy-2.8.9999.ebuild index dca3aa00891c..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.8.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.8.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-2.9.10.ebuild b/net-proxy/haproxy/haproxy-2.9.10.ebuild new file mode 100644 index 000000000000..ce11ece1a066 --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.9.10.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +LUA_COMPAT=( lua5-4 lua5-3 ) + +[[ ${PV} == *9999 ]] && SCM="git-r3" +inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing + +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 + # This is arbitrary; upstream uses master. Try to update when possible + VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366" + VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" + SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz + test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + VTEST_DIR="${WORKDIR}/VTest" + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" + EGIT_BRANCH=master +else + VTEST_DIR="${WORKDIR}/VTest" + 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 test +threads tools zlib lua 51degrees wurfl" +REQUIRED_USE="pcre-jit? ( pcre ) + lua? ( ${LUA_REQUIRED_USE} ) + ?? ( slz zlib )" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + crypt? ( virtual/libcrypt:= ) + pcre? ( + dev-libs/libpcre2:= + pcre-jit? ( dev-libs/libpcre2:=[jit] ) + ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + lua? ( ${LUA_DEPS} ) + test? ( + dev-libs/libpcre2 + sys-libs/zlib + )" +RDEPEND="${DEPEND} + acct-group/haproxy + acct-user/haproxy" + +S="${WORKDIR}/${MY_P}" + +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) +EXTRAS=( admin/halog admin/iprange dev/tcploop dev/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_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + git-r3_src_unpack + EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack + fi +} + +src_compile() { + local -a args=( + V=1 + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= + ) + + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + + # 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) ) + args+=( $(haproxy_use prometheus-exporter PROMEX) ) + + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + 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 + + 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 + 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} + else + # Those two includes are a workaround for hpack Makefile missing those + emake -C ${extra} \ + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" ${args[@]} + fi + done + fi +} + +src_test() { + # https://github.com/vtest/VTest/issues/12 + emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result" + ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests" + env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \ + HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel" +} + +src_install() { + dosbin haproxy + + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + + doman doc/haproxy.1 + + systemd_dounit admin/systemd/haproxy.service + + einstalldocs + + # The errorfiles are used by upstream defaults. + insinto /etc/haproxy/errors/ + doins examples/errorfiles/* + + if use doc; then + dodoc doc/*.txt + #if use lua; then + # TODO: doc/lua-api/ + #fi + fi + + if use tools ; then + has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog + has admin/iprange "${EXTRAS[@]}" && { + newbin admin/iprange/iprange haproxy_iprange + newbin admin/iprange/ip6range haproxy_ip6range + } + has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop + has dev/hpack "${EXTRAS[@]}" && { + newbin dev/hpack/gen-rht haproxy_gen-rht + newbin dev/hpack/gen-enc haproxy_gen-enc + newbin dev/hpack/decode haproxy_decode + } + fi + + if use examples ; then + docinto examples + dodoc examples/*.cfg + dodoc doc/seamless_reload.txt + fi + + insinto /usr/share/vim/vimfiles/syntax + doins admin/syntax-highlight/haproxy.vim +} + +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.9.11.ebuild b/net-proxy/haproxy/haproxy-2.9.11.ebuild new file mode 100644 index 000000000000..ce11ece1a066 --- /dev/null +++ b/net-proxy/haproxy/haproxy-2.9.11.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +LUA_COMPAT=( lua5-4 lua5-3 ) + +[[ ${PV} == *9999 ]] && SCM="git-r3" +inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing + +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 + # This is arbitrary; upstream uses master. Try to update when possible + VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366" + VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" + SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz + test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + VTEST_DIR="${WORKDIR}/VTest" + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" + EGIT_BRANCH=master +else + VTEST_DIR="${WORKDIR}/VTest" + 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 test +threads tools zlib lua 51degrees wurfl" +REQUIRED_USE="pcre-jit? ( pcre ) + lua? ( ${LUA_REQUIRED_USE} ) + ?? ( slz zlib )" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + crypt? ( virtual/libcrypt:= ) + pcre? ( + dev-libs/libpcre2:= + pcre-jit? ( dev-libs/libpcre2:=[jit] ) + ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + lua? ( ${LUA_DEPS} ) + test? ( + dev-libs/libpcre2 + sys-libs/zlib + )" +RDEPEND="${DEPEND} + acct-group/haproxy + acct-user/haproxy" + +S="${WORKDIR}/${MY_P}" + +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) +EXTRAS=( admin/halog admin/iprange dev/tcploop dev/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_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + git-r3_src_unpack + EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack + fi +} + +src_compile() { + local -a args=( + V=1 + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= + ) + + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + + # 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) ) + args+=( $(haproxy_use prometheus-exporter PROMEX) ) + + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + 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 + + 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 + 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} + else + # Those two includes are a workaround for hpack Makefile missing those + emake -C ${extra} \ + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" ${args[@]} + fi + done + fi +} + +src_test() { + # https://github.com/vtest/VTest/issues/12 + emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result" + ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests" + env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \ + HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel" +} + +src_install() { + dosbin haproxy + + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + + doman doc/haproxy.1 + + systemd_dounit admin/systemd/haproxy.service + + einstalldocs + + # The errorfiles are used by upstream defaults. + insinto /etc/haproxy/errors/ + doins examples/errorfiles/* + + if use doc; then + dodoc doc/*.txt + #if use lua; then + # TODO: doc/lua-api/ + #fi + fi + + if use tools ; then + has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog + has admin/iprange "${EXTRAS[@]}" && { + newbin admin/iprange/iprange haproxy_iprange + newbin admin/iprange/ip6range haproxy_ip6range + } + has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop + has dev/hpack "${EXTRAS[@]}" && { + newbin dev/hpack/gen-rht haproxy_gen-rht + newbin dev/hpack/gen-enc haproxy_gen-enc + newbin dev/hpack/decode haproxy_decode + } + fi + + if use examples ; then + docinto examples + dodoc examples/*.cfg + dodoc doc/seamless_reload.txt + fi + + insinto /usr/share/vim/vimfiles/syntax + doins admin/syntax-highlight/haproxy.vim +} + +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.9.7.ebuild b/net-proxy/haproxy/haproxy-2.9.7.ebuild index dca3aa00891c..5bd41962b345 100644 --- a/net-proxy/haproxy/haproxy-2.9.7.ebuild +++ b/net-proxy/haproxy/haproxy-2.9.7.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} != *9999 ]]; then VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" - KEYWORDS="~amd64 ~arm64 ~ppc ~x86" + KEYWORDS="amd64 ~arm64 ~ppc x86" elif [[ ${PV} == 9999 ]]; then VTEST_DIR="${WORKDIR}/VTest" EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" diff --git a/net-proxy/haproxy/haproxy-2.9.9999.ebuild b/net-proxy/haproxy/haproxy-2.9.9999.ebuild index dca3aa00891c..ce11ece1a066 100644 --- a/net-proxy/haproxy/haproxy-2.9.9999.ebuild +++ b/net-proxy/haproxy/haproxy-2.9.9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) diff --git a/net-proxy/haproxy/haproxy-3.0.4.ebuild b/net-proxy/haproxy/haproxy-3.0.4.ebuild new file mode 100644 index 000000000000..019b7ed1219f --- /dev/null +++ b/net-proxy/haproxy/haproxy-3.0.4.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +LUA_COMPAT=( lua5-4 lua5-3 ) + +[[ ${PV} == *9999 ]] && SCM="git-r3" +inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing + +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 + # This is arbitrary; upstream uses master. Try to update when possible + VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366" + VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" + SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz + test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + VTEST_DIR="${WORKDIR}/VTest" + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" + EGIT_BRANCH=master +else + VTEST_DIR="${WORKDIR}/VTest" + 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 test +threads tools zlib lua 51degrees wurfl" +REQUIRED_USE="pcre-jit? ( pcre ) + lua? ( ${LUA_REQUIRED_USE} ) + ?? ( slz zlib )" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + crypt? ( virtual/libcrypt:= ) + pcre? ( + dev-libs/libpcre2:= + pcre-jit? ( dev-libs/libpcre2:=[jit] ) + ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + lua? ( ${LUA_DEPS} ) + test? ( + dev-libs/libpcre2 + sys-libs/zlib + )" +RDEPEND="${DEPEND} + acct-group/haproxy + acct-user/haproxy" + +S="${WORKDIR}/${MY_P}" + +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) +EXTRAS=( admin/halog admin/iprange dev/tcploop dev/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_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + git-r3_src_unpack + EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack + fi +} + +src_compile() { + local -a args=( + V=1 + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= + ) + + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + + # 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) ) + args+=( $(haproxy_use prometheus-exporter PROMEX) ) + + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + fi + + emake CFLAGS="${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}" 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}" 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}" 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} \ + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" ${args[@]} + fi + done + fi +} + +src_test() { + # https://github.com/vtest/VTest/issues/12 + emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result" + ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests" + env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \ + HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel" +} + +src_install() { + dosbin haproxy + + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + + doman doc/haproxy.1 + + systemd_dounit admin/systemd/haproxy.service + + einstalldocs + + # The errorfiles are used by upstream defaults. + insinto /etc/haproxy/errors/ + doins examples/errorfiles/* + + if use doc; then + dodoc doc/*.txt + #if use lua; then + # TODO: doc/lua-api/ + #fi + fi + + if use tools ; then + has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog + has admin/iprange "${EXTRAS[@]}" && { + newbin admin/iprange/iprange haproxy_iprange + newbin admin/iprange/ip6range haproxy_ip6range + } + has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop + has dev/hpack "${EXTRAS[@]}" && { + newbin dev/hpack/gen-rht haproxy_gen-rht + newbin dev/hpack/gen-enc haproxy_gen-enc + newbin dev/hpack/decode haproxy_decode + } + fi + + if use examples ; then + docinto examples + dodoc examples/*.cfg + dodoc doc/seamless_reload.txt + fi + + insinto /usr/share/vim/vimfiles/syntax + doins admin/syntax-highlight/haproxy.vim +} + +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-3.0.5.ebuild b/net-proxy/haproxy/haproxy-3.0.5.ebuild new file mode 100644 index 000000000000..019b7ed1219f --- /dev/null +++ b/net-proxy/haproxy/haproxy-3.0.5.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +LUA_COMPAT=( lua5-4 lua5-3 ) + +[[ ${PV} == *9999 ]] && SCM="git-r3" +inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing + +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 + # This is arbitrary; upstream uses master. Try to update when possible + VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366" + VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" + SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz + test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + VTEST_DIR="${WORKDIR}/VTest" + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" + EGIT_BRANCH=master +else + VTEST_DIR="${WORKDIR}/VTest" + 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 test +threads tools zlib lua 51degrees wurfl" +REQUIRED_USE="pcre-jit? ( pcre ) + lua? ( ${LUA_REQUIRED_USE} ) + ?? ( slz zlib )" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + crypt? ( virtual/libcrypt:= ) + pcre? ( + dev-libs/libpcre2:= + pcre-jit? ( dev-libs/libpcre2:=[jit] ) + ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + lua? ( ${LUA_DEPS} ) + test? ( + dev-libs/libpcre2 + sys-libs/zlib + )" +RDEPEND="${DEPEND} + acct-group/haproxy + acct-user/haproxy" + +S="${WORKDIR}/${MY_P}" + +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) +EXTRAS=( admin/halog admin/iprange dev/tcploop dev/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_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + git-r3_src_unpack + EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack + fi +} + +src_compile() { + local -a args=( + V=1 + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= + ) + + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + + # 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) ) + args+=( $(haproxy_use prometheus-exporter PROMEX) ) + + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + fi + + emake CFLAGS="${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}" 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}" 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}" 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} \ + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" ${args[@]} + fi + done + fi +} + +src_test() { + # https://github.com/vtest/VTest/issues/12 + emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result" + ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests" + env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \ + HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel" +} + +src_install() { + dosbin haproxy + + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + + doman doc/haproxy.1 + + systemd_dounit admin/systemd/haproxy.service + + einstalldocs + + # The errorfiles are used by upstream defaults. + insinto /etc/haproxy/errors/ + doins examples/errorfiles/* + + if use doc; then + dodoc doc/*.txt + #if use lua; then + # TODO: doc/lua-api/ + #fi + fi + + if use tools ; then + has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog + has admin/iprange "${EXTRAS[@]}" && { + newbin admin/iprange/iprange haproxy_iprange + newbin admin/iprange/ip6range haproxy_ip6range + } + has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop + has dev/hpack "${EXTRAS[@]}" && { + newbin dev/hpack/gen-rht haproxy_gen-rht + newbin dev/hpack/gen-enc haproxy_gen-enc + newbin dev/hpack/decode haproxy_decode + } + fi + + if use examples ; then + docinto examples + dodoc examples/*.cfg + dodoc doc/seamless_reload.txt + fi + + insinto /usr/share/vim/vimfiles/syntax + doins admin/syntax-highlight/haproxy.vim +} + +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-3.0.9999.ebuild b/net-proxy/haproxy/haproxy-3.0.9999.ebuild new file mode 100644 index 000000000000..019b7ed1219f --- /dev/null +++ b/net-proxy/haproxy/haproxy-3.0.9999.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +LUA_COMPAT=( lua5-4 lua5-3 ) + +[[ ${PV} == *9999 ]] && SCM="git-r3" +inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing + +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 + # This is arbitrary; upstream uses master. Try to update when possible + VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366" + VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}" + SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz + test? ( https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz -> VTest-${VTEST_COMMIT}.tar.gz )" + KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +elif [[ ${PV} == 9999 ]]; then + VTEST_DIR="${WORKDIR}/VTest" + EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/" + EGIT_BRANCH=master +else + VTEST_DIR="${WORKDIR}/VTest" + 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 test +threads tools zlib lua 51degrees wurfl" +REQUIRED_USE="pcre-jit? ( pcre ) + lua? ( ${LUA_REQUIRED_USE} ) + ?? ( slz zlib )" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + crypt? ( virtual/libcrypt:= ) + pcre? ( + dev-libs/libpcre2:= + pcre-jit? ( dev-libs/libpcre2:=[jit] ) + ) + ssl? ( + dev-libs/openssl:0= + ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + lua? ( ${LUA_DEPS} ) + test? ( + dev-libs/libpcre2 + sys-libs/zlib + )" +RDEPEND="${DEPEND} + acct-group/haproxy + acct-user/haproxy" + +S="${WORKDIR}/${MY_P}" + +DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) +EXTRAS=( admin/halog admin/iprange dev/tcploop dev/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_unpack() { + if [[ ${PV} != *9999 ]]; then + default + else + git-r3_src_unpack + EGIT_REPO_URI="https://github.com/vtest/VTest" EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack + fi +} + +src_compile() { + local -a args=( + V=1 + # Switching to PCRE2 by default, bug 838013 + PCRE= + PCRE_JIT= + ) + + if use elibc_musl; then + args+=( TARGET=linux-musl ) + else + args+=( TARGET=linux-glibc ) + fi + + # 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) ) + args+=( $(haproxy_use prometheus-exporter PROMEX) ) + + # Bug #668002 + if use ppc || use arm || use hppa; then + TARGET_LDFLAGS=-latomic + fi + + emake CFLAGS="${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}" 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}" 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}" 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} \ + CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" ${args[@]} + fi + done + fi +} + +src_test() { + # https://github.com/vtest/VTest/issues/12 + emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS} -Wno-error=unused-result" + ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536 for tests" + env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j "$(makeopts_jobs)" \ + HAPROXY_PROGRAM="${S}/haproxy" VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel" +} + +src_install() { + dosbin haproxy + + newconfd "${FILESDIR}/${PN}.confd-r1" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + + doman doc/haproxy.1 + + systemd_dounit admin/systemd/haproxy.service + + einstalldocs + + # The errorfiles are used by upstream defaults. + insinto /etc/haproxy/errors/ + doins examples/errorfiles/* + + if use doc; then + dodoc doc/*.txt + #if use lua; then + # TODO: doc/lua-api/ + #fi + fi + + if use tools ; then + has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog + has admin/iprange "${EXTRAS[@]}" && { + newbin admin/iprange/iprange haproxy_iprange + newbin admin/iprange/ip6range haproxy_ip6range + } + has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop + has dev/hpack "${EXTRAS[@]}" && { + newbin dev/hpack/gen-rht haproxy_gen-rht + newbin dev/hpack/gen-enc haproxy_gen-enc + newbin dev/hpack/decode haproxy_decode + } + fi + + if use examples ; then + docinto examples + dodoc examples/*.cfg + dodoc doc/seamless_reload.txt + fi + + insinto /usr/share/vim/vimfiles/syntax + doins admin/syntax-highlight/haproxy.vim +} + +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-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild index dca3aa00891c..019b7ed1219f 100644 --- a/net-proxy/haproxy/haproxy-9999.ebuild +++ b/net-proxy/haproxy/haproxy-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" LUA_COMPAT=( lua5-4 lua5-3 ) @@ -121,21 +121,20 @@ src_compile() { TARGET_LDFLAGS=-latomic 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}" \ + emake CFLAGS="${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)" \ + emake -C admin/systemd CFLAGS="${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)" \ + emake CFLAGS="${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)" \ + emake CFLAGS="${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 diff --git a/net-proxy/lyrebird/Manifest b/net-proxy/lyrebird/Manifest index 9f96adce300a..445531f58bfd 100644 --- a/net-proxy/lyrebird/Manifest +++ b/net-proxy/lyrebird/Manifest @@ -1,4 +1,4 @@ DIST lyrebird-0.1.0-deps.tar.xz 88991580 BLAKE2B ba9113d847bc900ad3001e91a67ac939a7fbd8f7423f256be92a5fb2461604c00e05edd581a28f456f493997d31a40fa1673fead1cd15ae192e02ca480b9db5b SHA512 af6e245ac333de1c14ba1f648548123f11ceaffb894d4057e2e7ed5c1fa8cd0f023e308ccf20d74696b2ef0b8a0489fe2f73c868dc23e087f8ae04ea6688db4d DIST lyrebird-0.1.0.tar.bz2 76753 BLAKE2B af168a25093b68b10b489adc282f1ee65b70193602f79d9cc352c78e2a9c71205191dc6487ea58584f76ce1cbbf653d3fd0e1f645d7972d3e73173a90ae39361 SHA512 f9b8686d1c5f9ddb41a255a1a8954e05cefd50523ada7360432b456c62475ba606872df407ba8ebd7714d4f185eef0efae63e3e53c5c1c18fd323a97912f951e EBUILD lyrebird-0.1.0.ebuild 1244 BLAKE2B f2e4d055be1e48a370ad6e4e9661e7879fbe776ecd758670392627438b35df2aa503032c4dbe3905cfd71cfdaefbca8a9af4469301bfd0d1b8bd953c360eed8d SHA512 a345ab35b49908b78986318400544409ae2872c9aa49df353434a17782aa29bd2ceda416b1e390b222227846f50e9fbc38e22c9660c608b6b1886a57a363530b -MISC metadata.xml 246 BLAKE2B f808bbbcb9c53d005d1a1667cd6217a601a3bd3bd2267121c0043a870ae44bb91bb27bc9825d5d6eafe01b73fe58a553655aa252737c0b066f2286ff9415d65e SHA512 b620abb7732628010a8a3792d40bde878492be97ce14c99c4d2466240df2f25edf7734ad4d210bc954f27323f0e26698e660766c65be5868646a3866020373fd +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-proxy/lyrebird/metadata.xml b/net-proxy/lyrebird/metadata.xml index beac02a9af14..115e9d64a669 100644 --- a/net-proxy/lyrebird/metadata.xml +++ b/net-proxy/lyrebird/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-proxy/privoxy/Manifest b/net-proxy/privoxy/Manifest index ddd5dfa3c9da..acc188aa7b8e 100644 --- a/net-proxy/privoxy/Manifest +++ b/net-proxy/privoxy/Manifest @@ -1,13 +1,9 @@ AUX privoxy-3.0.28-strip.patch 1784 BLAKE2B 4f92d7a34a9023405cca813629bb9b200d802061c49d72c0aa413d16b3e714d723c4aba48640e050b0960559a0170bc688742deeb8bcd233eee96be0cfc1bb7b SHA512 78713e7bf1379a0e65c775e415e15ed140873cc48b388d46ce79a24acf64f5c777f1e0e489d912fa7bff8b6acc910fd074e0d755116e4e5d52194d483a30ed67 AUX privoxy-3.0.32-gentoo.patch 4309 BLAKE2B 609960b124bbd66d3246f071f93c43a552a48937b8c3540d2b0267845f64ce84d2daeefb0880895291b698f22660d86b2bb089621ccaf250a343b3b80dab1425 SHA512 fb6a0f4ea2b0d3ee22c605f25339c80a7b5448cd8cdfd3e7a50c825ddf6a887121771e475f1c17be4ba6fc5ac00b4524f3819e5ba6ae25e772fed68b3d879914 AUX privoxy-3.0.33-configure-c99.patch 868 BLAKE2B 70a88ddc893ed8207707635ca77aa73134ad18faf4012febe34ba548ddffd94593e6f2008132a4e6f8ffeca36e31996a12df0df9356bdb59e5e8a9a056f08ab2 SHA512 993b9b84647c1eb149ea32da7de3fdabbda9d45b94ce8a7fd776d69ac3d72c6af5ac03f6602e8d47b57be7774b6a56f9894cc5b6c0cb8451d6652234e7f71b2a -AUX privoxy-3.0.33-configure-msan.patch 525 BLAKE2B 0d48ca986762a37478284653b509f9c2d4b3935b3a438a6cefa5d6cefd0b2e6ac65737ad9e4f2ab5d8951917bd43a19b7e9f9c89fab9098a4b2ada5184a2b833 SHA512 52336a47fac816b1b9ecc43693f6312e45be7e1ef9ad1d7ddf696f2357bb92301074c9151e20ca38fa43ee1ed2da75fba597fa72133e4399b465b3f750e29622 AUX privoxy.initd-3 639 BLAKE2B 69d935e42ef4bf79868e0b457751b1dfb6a0b5805d19c74bdef007b54ad60adab784f98c4a9898306778cc41157f91b029978a6534aa00c0b00fcecdbc1ca11f SHA512 0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b AUX privoxy.logrotate 191 BLAKE2B 587f6211d4938481a1dac77b79a1c32ea491c88514ed7dd42f1cdd7e2c344bfa1a4cde29010a5700f7a1847df1f91e9e59ffed45a386ba12a3cf29fac12a5488 SHA512 118caaeac3aba751584c5bdfc737bf5bfeddf1a62fda1f44bcd4654ae2e33183bc1ce6fc66d4a1bdd79766e42e669b1615a6d46d528a1bd49cabdf98385a3bb9 AUX privoxy.service 248 BLAKE2B 4b39a4a55af8557458d3d087ab335431b39eb156bc5a3d32979627608f2a3926b2459822c827d557a86c20da5c8c6291941eb01db9adc7fb458e913672d574a0 SHA512 0f3484f06521a66b984fda7238f175a135b22fa5a00dc0c8caadd380d21bfecdae7a6c8d2c0d9a4a3c2858539913722be2b7d4fddd17ea2c95f4e151c3f74ca0 -DIST privoxy-3.0.33-stable-src.tar.gz 1579540 BLAKE2B 4b76aa2e84160bab346d0548019158edb5562ca1dbf5356f765a6b91967f352f99c45c852254acf3d8e85cf8e8d210c050d1cf69ace3e5dbda8cdd13c1138df3 SHA512 9684455dbce7f6d8f5defd31aa9a7316e0c1dc896525ab4d562d0359462b541b1c366dea9db07b798f3e00b9cbcc44f494d8c431bcb10f2cb05b5bca3cfeaf75 DIST privoxy-3.0.34-stable-src.tar.gz 1589785 BLAKE2B d879d3827dc1e6dd6a3d13ab07b788a235a16dcc4b050f17dd43543c0fad1cf9c9ceb2a0ae1ec3885798db5041a6c1fc2c270befd4d8ecf10254a58533458dba SHA512 f963419ae2cb6dd72cd892fa043768d99a4118792833de2e666d6a800fbe9a7fcb0641f15e3211e0b01a74609c65aeb60af1051f1a19daa1048314599679b685 -EBUILD privoxy-3.0.33-r1.ebuild 4481 BLAKE2B 877c91cc1ea7ae01c22f8604c1bc715e000cb23aa3917e60ef2c4d9215bd94652ef5b34442650ea5808c3c71ab233030121c57f2d7464dd761e6f631131362e2 SHA512 02f37c09d22bc900e3801b3d2730443bc1c7ceb76bac61fc0e761337ffb9ed3b60ba2f058bac19121a370b2432d965f8561ef1b16a54e198d273d96379f26856 -EBUILD privoxy-3.0.33.ebuild 4430 BLAKE2B a003ce2d7a8fc3ca5d82c9f1a5cdf8d662086a9778c165670639970ec8bf641d74898fd18c5e287d09a0aa0ce97beeb826ac04cabbd7cb2068c6445ae357c6df SHA512 2517ff141ce5712b68e06c820a12bba8e9adaa753541d58232671c3bd0fb4ba426fef9d3f37f34c21dd140dfafe1ba5735c87adf7130ac3ddbba6252b2ddf2c4 -EBUILD privoxy-3.0.34.ebuild 4432 BLAKE2B a06aa4abee34a05c73448b9167236a9b72cf7456e9c101a60bd03f62ff1e98987564db2613b8f393899f3eb04d43ff5c2039017c329806ccb5f0f81f9f03bf8f SHA512 f1ff6c824bc32df248dc4f90b6dc3fe90eab533800db92166ecb442ba585b5899e5e998afd29222f218045f179c4577ac66672440069ddb697a5089e7c7c39e6 +EBUILD privoxy-3.0.34.ebuild 4426 BLAKE2B f08db345d5ee13ce00b8df736666f5f36962a0fa6f46bca2e9be69f683b9bf194267995642c5675a16ff0457967b67b80b93a0fbc0f02838589ca7ff04958d08 SHA512 245e5f333f86b2e8661d316eb7f8a7bbf5ac1114b6341894b444b4ce684819a503eab12af3e0be0611e7ec80af225d441a9271d09fdd56fcde23c7cd8a28fe12 MISC metadata.xml 3115 BLAKE2B d50dc83a207733323276a71df61dc3ac631a2a4030a61559976844ba88087b0bea18bcb2b7bc72cdf63d33a21a46292d3bd069ecce584df85282237947762161 SHA512 c98295871135407a797597d791960b24c4d31be9f0069cec5eec963c6a56271647b48e714a22382a3acd0acd7cbf3c41db15eb7c4071eb359577479d2cd788e4 diff --git a/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch b/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch deleted file mode 100644 index c89fed3947f3..000000000000 --- a/net-proxy/privoxy/files/privoxy-3.0.33-configure-msan.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.in b/configure.in -index 84f6a0db7..e7e68be0c 100644 ---- a/configure.in -+++ b/configure.in -@@ -168,7 +168,7 @@ if test "x$with_asan" = "xyes"; then - LDFLAGS="$LDFLAGS -fsanitize=address" - fi - --AC_ARG_WITH(asan, [ --with-msan Enable MemorySanitizer. Requires compiler support.]) -+AC_ARG_WITH(msan, [ --with-msan Enable MemorySanitizer. Requires compiler support.]) - if test "x$with_msan" = "xyes"; then - CFLAGS="$CFLAGS -fsanitize=memory" - LDFLAGS="$LDFLAGS -fsanitize=memory" diff --git a/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild b/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild deleted file mode 100644 index c7271be14a3d..000000000000 --- a/net-proxy/privoxy/privoxy-3.0.33-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd toolchain-funcs - -[ "${PV##*_}" = "beta" ] && - PRIVOXY_STATUS="beta" || - PRIVOXY_STATUS="stable" - -HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/" -DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy" -SRC_URI="https://downloads.sourceforge.net/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz" - -IUSE="+acl brotli client-tags compression editor extended-host-patterns -extended-statistics external-filters +fast-redirects +force fuzz -graceful-termination +image-blocking ipv6 +jit lfs +mbedtls openssl -png-images sanitize selinux ssl +stats +threads toggle tools whitelists -+zlib" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -LICENSE="GPL-2+" - -DEPEND=" - acct-group/privoxy - acct-user/privoxy - dev-libs/libpcre - brotli? ( app-arch/brotli ) - ssl? ( - mbedtls? ( net-libs/mbedtls:= ) - openssl? ( dev-libs/openssl:= ) - ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND="${DEPEND} - extended-host-patterns? ( dev-lang/perl ) - selinux? ( sec-policy/selinux-privoxy ) - tools? ( - net-misc/curl - dev-lang/perl - ) -" -REQUIRED_USE=" - brotli? ( zlib ) - client-tags? ( threads ) - compression? ( zlib ) - extended-statistics? ( threads ) - fuzz? ( zlib ) - ssl? ( ^^ ( mbedtls openssl ) threads ) - toggle? ( editor ) -" - -S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.32-gentoo.patch - "${FILESDIR}"/${PN}-3.0.28-strip.patch - "${FILESDIR}"/${PN}-3.0.33-configure-msan.patch - "${FILESDIR}"/${PN}-3.0.33-configure-c99.patch -) - -pkg_pretend() { - if ! use threads; then - ewarn - ewarn "Privoxy may be very slow without threads support, consider enabling it." - ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS" - ewarn "Additionally some features may not build or work poperly. You are on your own." - ewarn - fi -} - -src_prepare() { - default - mv configure.in configure.ac || die - sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die - - # autoreconf needs to be called even if we don't modify any autotools source files - # See main makefile - eautoreconf -} - -src_configure() { - local myconf="--without-mbedtls --without-openssl" - if use ssl; then - myconf="$(use_with mbedtls) $(use_with openssl)" - fi - if use sanitize; then - myconf+=" --with-usan" - # msan is available in clang only - # asan is broken with current configure tests in gcc - tc-is-clang && myconf+=" --with-msan --with-asan" - fi - - # --with-debug only enables debug CFLAGS - # --with-docbook and --with-db2html and their deps are useless, - # since docs are already pregenerated in the source tarball - econf \ - --sysconfdir=/etc/privoxy \ - --disable-accept-filter \ - --enable-dynamic-pcre \ - --without-assertions \ - --with-user=privoxy \ - --with-group=privoxy \ - $(use_enable acl acl-support) \ - $(use_enable compression) \ - $(use_enable client-tags) \ - $(use_enable editor) \ - $(use_enable extended-host-patterns pcre-host-patterns) \ - $(use_enable extended-statistics) \ - $(use_enable fast-redirects) \ - $(use_enable force) \ - $(use_enable fuzz) \ - $(use_enable graceful-termination) \ - $(use_enable image-blocking) \ - $(use_enable jit pcre-jit-compilation) \ - $(use_enable ipv6 ipv6-support) \ - $(use_enable lfs large-file-support) \ - $(use_enable png-images no-gifs) \ - $(use_enable stats) \ - $(use_enable threads pthread) \ - $(use_enable toggle) \ - $(use_enable whitelists trust-files) \ - $(use_enable zlib) \ - $(use_with brotli) \ - ${myconf} -} - -src_install() { - default - - newinitd "${FILESDIR}/privoxy.initd-3" privoxy - systemd_dounit "${FILESDIR}"/${PN}.service - - insinto /etc/logrotate.d - newins "${FILESDIR}/privoxy.logrotate" privoxy - - diropts -m 0750 -g privoxy -o privoxy - keepdir /var/log/privoxy - - use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl - if use tools; then - dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl} - newbin tools/uagen.pl privoxy-uagen.pl - fi - - rmdir "${ED}/var/run" || die - chown privoxy:root "${ED}/etc/privoxy" || die -} - -pkg_postinst() { - if use extended-host-patterns; then - ewarn - ewarn "You enabled extended-host-patterns, now you *must* convert all action files in" - ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool" - ewarn "privoxy-url-pattern-translator.pl is available." - ewarn - fi -} diff --git a/net-proxy/privoxy/privoxy-3.0.33.ebuild b/net-proxy/privoxy/privoxy-3.0.33.ebuild deleted file mode 100644 index 7bb2a6c39864..000000000000 --- a/net-proxy/privoxy/privoxy-3.0.33.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd toolchain-funcs - -[ "${PV##*_}" = "beta" ] && - PRIVOXY_STATUS="beta" || - PRIVOXY_STATUS="stable" - -HOMEPAGE="https://www.privoxy.org https://sourceforge.net/projects/ijbswa/" -DESCRIPTION="A web proxy with advanced filtering capabilities for enhancing privacy" -SRC_URI="https://downloads.sourceforge.net/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src.tar.gz" - -IUSE="+acl brotli client-tags compression editor extended-host-patterns -extended-statistics external-filters +fast-redirects +force fuzz -graceful-termination +image-blocking ipv6 +jit lfs +mbedtls openssl -png-images sanitize selinux ssl +stats +threads toggle tools whitelists -+zlib" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86" -LICENSE="GPL-2+" - -DEPEND=" - acct-group/privoxy - acct-user/privoxy - dev-libs/libpcre - brotli? ( app-arch/brotli ) - ssl? ( - mbedtls? ( net-libs/mbedtls:= ) - openssl? ( dev-libs/openssl:= ) - ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND="${DEPEND} - extended-host-patterns? ( dev-lang/perl ) - selinux? ( sec-policy/selinux-privoxy ) - tools? ( - net-misc/curl - dev-lang/perl - ) -" -REQUIRED_USE=" - brotli? ( zlib ) - client-tags? ( threads ) - compression? ( zlib ) - extended-statistics? ( threads ) - fuzz? ( zlib ) - ssl? ( ^^ ( mbedtls openssl ) threads ) - toggle? ( editor ) -" - -S="${WORKDIR}/${P%_*}-${PRIVOXY_STATUS}" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.32-gentoo.patch - "${FILESDIR}"/${PN}-3.0.28-strip.patch - "${FILESDIR}"/${PN}-3.0.33-configure-msan.patch -) - -pkg_pretend() { - if ! use threads; then - ewarn - ewarn "Privoxy may be very slow without threads support, consider to enable them." - ewarn "See also https://www.privoxy.org/faq/trouble.html#GENTOO-RICERS" - ewarn "Additionally some features may not build or work poperly. You are on your own." - ewarn - fi -} - -src_prepare() { - default - mv configure.in configure.ac || die - sed -i "s|/p\.p/|/config.privoxy.org/|g" tools/privoxy-regression-test.pl || die - - # autoreconf needs to be called even if we don't modify any autotools source files - # See main makefile - eautoreconf -} - -src_configure() { - local myconf="--without-mbedtls --without-openssl" - if use ssl; then - myconf="$(use_with mbedtls) $(use_with openssl)" - fi - if use sanitize; then - myconf+=" --with-usan" - # msan is available in clang only - # asan is broken with current configure tests in gcc - tc-is-clang && myconf+=" --with-msan --with-asan" - fi - - # --with-debug only enables debug CFLAGS - # --with-docbook and --with-db2html and their deps are useless, - # since docs are already pregenerated in the source tarball - econf \ - --sysconfdir=/etc/privoxy \ - --disable-accept-filter \ - --enable-dynamic-pcre \ - --without-assertions \ - --with-user=privoxy \ - --with-group=privoxy \ - $(use_enable acl acl-support) \ - $(use_enable compression) \ - $(use_enable client-tags) \ - $(use_enable editor) \ - $(use_enable extended-host-patterns pcre-host-patterns) \ - $(use_enable extended-statistics) \ - $(use_enable fast-redirects) \ - $(use_enable force) \ - $(use_enable fuzz) \ - $(use_enable graceful-termination) \ - $(use_enable image-blocking) \ - $(use_enable jit pcre-jit-compilation) \ - $(use_enable ipv6 ipv6-support) \ - $(use_enable lfs large-file-support) \ - $(use_enable png-images no-gifs) \ - $(use_enable stats) \ - $(use_enable threads pthread) \ - $(use_enable toggle) \ - $(use_enable whitelists trust-files) \ - $(use_enable zlib) \ - $(use_with brotli) \ - ${myconf} -} - -src_install() { - default - - newinitd "${FILESDIR}/privoxy.initd-3" privoxy - systemd_dounit "${FILESDIR}"/${PN}.service - - insinto /etc/logrotate.d - newins "${FILESDIR}/privoxy.logrotate" privoxy - - diropts -m 0750 -g privoxy -o privoxy - keepdir /var/log/privoxy - - use extended-host-patterns && newbin tools/url-pattern-translator.pl privoxy-url-pattern-translator.pl - if use tools; then - dobin tools/{privoxy-log-parser.pl,privoxy-regression-test.pl} - newbin tools/uagen.pl privoxy-uagen.pl - fi - - rmdir "${ED}/var/run" || die - chown privoxy:root "${ED}/etc/privoxy" || die -} - -pkg_postinst() { - if use extended-host-patterns; then - ewarn - ewarn "You enabled extended-host-patterns, now you *must* convert all action files in" - ewarn "PCRE-compatible format, or privoxy will fail to start. Helper tool" - ewarn "privoxy-url-pattern-translator.pl is available." - ewarn - fi -} diff --git a/net-proxy/privoxy/privoxy-3.0.34.ebuild b/net-proxy/privoxy/privoxy-3.0.34.ebuild index caa72d8f71b5..20df6ca09563 100644 --- a/net-proxy/privoxy/privoxy-3.0.34.ebuild +++ b/net-proxy/privoxy/privoxy-3.0.34.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/ijbswa/${P%_*}-${PRIVOXY_STATUS}-src. LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv sparc x86" IUSE="+acl brotli client-tags compression editor extended-host-patterns extended-statistics external-filters +fast-redirects +force fuzz graceful-termination +image-blocking ipv6 +jit lfs +mbedtls openssl diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest index e4272326023c..332e660b3d22 100644 --- a/net-proxy/rejik/Manifest +++ b/net-proxy/rejik/Manifest @@ -1,4 +1,4 @@ DIST banlists-2.x.x.tgz 116100 BLAKE2B 401d3cd995b7e2adcb28055c4f107799a87397a1ed06c698d70b2a4b755565759d7f56eb70a8d59a5ea04cdc51c6142d6bd03ebdd414133fd71792c66c5fe54e SHA512 068d01685e01679b2726da1cbc5f31f6aba54ab2194e8ab145bd2409e7fc71e3662445a8274b08746e5cdeadea2197f5a72a1abef98ec91267df851615b188b3 DIST redirector-3.2.11.tgz 45758 BLAKE2B 39f83c8245d8a24c7454d40d607c851250bd9844f56ee8e9f43d64f32ac3cb52d9c1d9091e3d5126133d94fe59d5be8e8d99b7f2cb253c7731a73e344604a1ce SHA512 e4b20f11a46a84d47c8e6adc74f88f6092f9791e1b6050a3e3b4685cf4c510b55f32ea3d4c9a334dbe5753ee486b98ca73bb7e2d9854e2c8d299b7fd50fce2f8 EBUILD rejik-3.2.11.ebuild 2374 BLAKE2B 14283a74cfef4686ecb0bb35d793376c9be59631be67515a86501d26f2b13fdb8c638b413e568bf99d187e0868cf1bf5a01f1724e0f9952bb9de5142ea020b92 SHA512 bcc318e80da39475396632e91dba1d3397af744d0659af43d67b0b4b3552f25141330b22506f0d9ba65b2a877d6e780d7dc63da6874e038e42ed4bda36b7527a -MISC metadata.xml 346 BLAKE2B df9b3b9dd2f4da88403dee1ff6820672a80d65313e84f0afae04fe7b46153f9a28e353af26cbe14ae67aaf311ba335341c212619911480e9036d4a21e783222a SHA512 3b60967ad98afc03b626ca0f26fc3da2cd84fa198c31d8ac555cd7ec6709b99ce42a5e20d955743a297ef40cd6aa8932c4e0bcd2f7999a15caa98a651a70fedb +MISC metadata.xml 261 BLAKE2B 63705e4da8dd8d5d49c780a018f3d821d5c8775ecb0dff16e168d95022e2860623ab5924f6d454750e010efc6b8faa7ca02d4dd943b0e7d0e991527f3e4d51ca SHA512 71e035507007a7c07de5829d16603e3b6760a67de5038ec814be0c985025c9e6b642efebf9e024beabe22cf5cbb523e0451754fa6172023a9362f3c8b6960795 diff --git a/net-proxy/rejik/metadata.xml b/net-proxy/rejik/metadata.xml index 03bf78158e70..b065aa0b631b 100644 --- a/net-proxy/rejik/metadata.xml +++ b/net-proxy/rejik/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="banlists">Install upstream provided simple banlists</flag> </use> diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index cad925d7e783..16b89b56c452 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -3,15 +3,23 @@ AUX squid-6.2-gentoo.patch 2494 BLAKE2B 8115a9ad312c6dd639ab92b8673532e61341acf9 AUX squid-6.4-gcc14-algorithm.patch 233 BLAKE2B f6be1bf9907397a3510987a235f963276da4b4f36ac4e558a1a12811c8d83c5fb327b0348f5ed92139bcbf3c973177a3f810c7b059386ceab6081047a49e5871 SHA512 42d78b26847af56a788412496ef19ccffa1c8953d8d2369900c5b1c26cb245dadeb0c3d3859f9bbcb2d72b64bf8b284ed812de7aec291e4cf6a7b2482da4c7ee AUX squid.confd-r2 707 BLAKE2B 9fce12f6c6d395448b1e70c95ef75418d1844e7409738df60bee7c1adab786ca7e504070eacdd2b6e30a35df8a7322cccdfb950e60bcde352d35d090d55c6be9 SHA512 37435f808b1dab1ca3ceecafd6cd9007c44e10d257f135ba6baf1a51b1e3408f2a76b71d85a08ce6dcb7f86b9841b7bfcd870b0d312a2365699290e28f72314a AUX squid.cron 143 BLAKE2B 17b1bccea20771a481a5b4745c9832a4b762132a500eaeb091349a59b870c14b680d8ea97e03bb7a0b2d67e1ca1d4ee1db31dc43b9dbf02be8953d15f214b033 SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749 +AUX squid.cron-r1 594 BLAKE2B 8c00bbfeb31428f3952f9af255f921cc652dd617a8ad4e3e319d0412f470eacaeab552df9f1b78adaa33172e0ba6220195633901770425e44e6453ca17399ced SHA512 93bfcb31db378bfcf1e38e9d6208334962e0fedc99b1b8586626650186d4815c48bcc4f1197123652130b277634d2dce8590358a9797c9eba36e867fc83a3696 AUX squid.initd-r6 4513 BLAKE2B 46406790dcc86048cdf4d98e648d266733ebf671ccf4f5b7c23d2fd25d97b161d00e05ff0d749af810cc9d1ad1300efef5a43caf62ac534e026b75c099dfc1b4 SHA512 4205350ace938f7eda0b62c4aedc8af3f5a14b011fad76a8e6ad6138358f835592453ac168e58ff3dcb3fb0bbcffd9b97acf4ce2060e34a47c2b92946f86164e +AUX squid.initd-r7 4473 BLAKE2B e5fd96a8bb6492c31c452791dce185fc4d6fa655f0c05d0b752ab83d7bfcbacd3df6dc26912d94489c691f43811d68362b2532ecf1d68128629f636c609942e0 SHA512 183d48913458d382665a2412f4065bcd7ed3c585a6bfe3e8cfe019899104c9c1184ca814891bfdf414f765bd903d9bb3f849b01ea46c015f499fdd9d6456689b AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 +AUX squid.logrotate-r1 166 BLAKE2B 62bd821aabd7394e4644e19d2d243775154fca1c09776373d62bd56d1bbfbc3f4ec440ac17d44a29afbe0692e3b4ccb311ad5cd5790b18737ce15f2bfca5de31 SHA512 e26f661d07029c86a82e635c741252f1c5861764e5a695ab980750a238047d9fe74f80f63552f47d0a32960c74b5435d458f2f88d267c7b5950a27e62f0ecb19 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594 -DIST squid-6.5.tar.xz 2554492 BLAKE2B 91ed91f9b0f56f440a7f15a63bbc3e19537b60bc8b31b5bf7e16884367d0da060c5490e1721dbd7c5fce7f4a4e958fb3554d6bdc5b55f568598f907722b651de SHA512 d3a40f5f390f0042a8e981ca28755a90dd520230a06b4246ba7bec0c98025ce1cdc7426797a666f769addd60238e28e1f04d2c701ea2ef2d7329dbe87b830d70 +DIST squid-6.10.tar.xz 2558208 BLAKE2B 608b49c25549e73bc58ee4ec82a4d582f6f28b6dd324261806931eb2e37f0b5d63f6c2f6373a3db43823e805f5d6df56b2a4b5a8324cd6e623c4302d2c4b9421 SHA512 c0b75c3d383b1cd234b30dd02e84e1c5655fc53f63b75704bf4bac9ee0b86ba27e4656116893aff8b95dea19ff1befabcbb9dab3875da52fcb65f1d30f0fe5a9 +DIST squid-6.10.tar.xz.asc 647 BLAKE2B 22c41fae76b5e2efb5adc7d34beac0dce8218af0a4e77268989078acb91b6822a41f9a44cb60796548bb392040ad35317b5cfde9fdc51a37ffae616bbe9faede SHA512 5e9d053db90549760f7a675d9f4703ecde460906cb09dff489f9db5d0f7826fb30487c9b009cc4577f3f061f3c7b3a667418af298f55f882f696884dc536bf53 DIST squid-6.6.tar.xz 2554824 BLAKE2B 7c3c96f5cd5f819f6f020fb3e63ee8d9bb26b7fb4ff4405d7963a643c6766344e6492505bc1b33f3040ad800b3d7a3ad6a4b067b031ac4d178ddcac04c6e74dc SHA512 4ab261ed85ad674288467500aca9d8a48e3918b55f777635c0ba7a2551f248d35536848a5fbf2c946490a818004727f2aed33144f0a3ebab0be36cc4cffb020c DIST squid-6.6.tar.xz.asc 1193 BLAKE2B c37a400c51c30de35c6fe52123389c134d05670a36b1ffae4d67e7d06981bbf94788343daf2fdeafb782d464a977ee31bc601e3b1b92b45cd40ba6a6725b9a16 SHA512 08550569759c403a1a9747d08ea7055751fbf251355691074f6d09baca76a0987c5dff36e1f01b64edd446d568c7244b14124f6f8a1b19ccfc30293eed83a297 DIST squid-6.7.tar.xz 2427468 BLAKE2B 0cd892213085326d1f4cc065778d95d74c03edaaf98b839b4422397fdcd449716b022e74adcbac636ca98e9d5c45a8f7aa156c3edc9f306fb13fc5cc21125dd6 SHA512 6221437056c600119fe9ff1ceeeaa9955cf9f21df481ad29a3515f8439a41b779d51f37b820b75641d0d4d6de54554f6f924dbd347834bf4a6ad6b5b317084a0 DIST squid-6.7.tar.xz.asc 646 BLAKE2B 6d4e6075b261f54269577fc31b28e7cb74b835c851741542c322b226d29325128cdbaadd156070e9fe6c5af5c33149c78f71b01272934a62676e08f3f75f8628 SHA512 4a1f9d123ce6b5a600d9d2dd3af95a7ce98bfe28ba42d1281ab1f3d7f220f8738a4320afb85eeba1bf9d31e722ffaccd2d89cbefcd11e6b6ea31fe237ccf9a8c -EBUILD squid-6.5.ebuild 9625 BLAKE2B 92fa2fea7223aa8623de5c0b4699e9e562760984730e6f711707ab18227937d9e9edca0c8eebc2361ecbfeccacfff68ace2994b9a493bba44da1cc6231de07d2 SHA512 3510bfa80603db991a5fc74f5e3e86b8d4ac642a77d7e492ebcd1c963f524e8301ba761ad4c117651cb0a8f746e72e4c7e4fed83cdec6de4849cf9ecc5d15218 -EBUILD squid-6.6.ebuild 9837 BLAKE2B f8b4826ed09f36b6bf1e56d01099b60b371de35fa3c0772dfe49fec939e38de5aad88362ccd2591364abe9a7390811357b9ee5b1a1dc325aff5b4b410ca034b5 SHA512 7d177f1cd2c4fcc8ca4ea630c339a76d715c9c0251668512d95b6e38500b672d6006d953d2a0b5739ef804e15479e75eef4f9902cfc6d821381457bbd500934f -EBUILD squid-6.7.ebuild 9840 BLAKE2B 02eaff938405892c095b760cfc393eba182b74f0c87949605ee9d47836a48669af4bb4fbd70a03d171442c5a6ef1ea1cbb9f2d4306077e72c2faabf73be90d70 SHA512 717c71669293d9240aaf9ce64d074fc60585000170ec6633b414d2090ef18412b838bfa52384741e2e6462e62430adf0a50321e6e82aadeefdc278dcd52fa916 +DIST squid-6.9-memleak_fix.patch 22178 BLAKE2B bf87a98ac3ddcf27b817b7b09a1a7656cb6547c7c157d02a3daf4b337669180718e1df06040b9b4be252a9f60fc767d94ed698014113c072dd9b91ada08a1adc SHA512 38754b1f593dde3e7ab70601bdaaabf8c1c40beea0ae9913684d3de78d76cec4243abac8e315af2009b98e096a3b04c56181940f0528716278aaf7c44ea76dad +DIST squid-6.9.tar.xz 2557992 BLAKE2B cac10d3a16fe31a9becfcd0fc278413d53c52285cdca9ece897ca4e3a0e50806e186960091f9050243180996382c6b5209360d9fff249d26b20d1e529285a038 SHA512 2666551caca39fa6ca49b56b537645dd043ee0c99b805c433cf714172e6062590fd6ed942043df1a3b543f30c039f3ab701493187dc6a0a4a8311217417c366e +DIST squid-6.9.tar.xz.asc 646 BLAKE2B fafa49d40af849103d04c0f07e19e5b9007306ba0f85bcabed761b53f94015aefc65ec2035963c95fd938cb04dfdb878363fcf5150a06889b563fa48922ef289 SHA512 ccd053476e91544bf797cf38a7e57acdc1c02c1edb2804230f061d9b24abbbd2e06abbaaa0fe2b209951631c0369510f60f0b7137fe950f3ccf59e8a212bc0fa +EBUILD squid-6.10.ebuild 10166 BLAKE2B 9ace8bbfa59f62e4b7216f6988fe20e8aad07d8115fc48e74a233b596cb93d4c81abbf2944529bb00a4f3e701083685708cd5154869048ba5cde5a92d151e1e0 SHA512 ee4bc16b9b408e744b3bba2270a645de5b7b47ccc70e1bf572e2c6f70a9ed5b3a4bd9d49312d9e3208aca6509e97914258219248ab38f828527c3c9e3fe33d66 +EBUILD squid-6.6.ebuild 9831 BLAKE2B 0d51d025dd91cc309dadb56c70cafe2085f7d8c4c1cf44b08555d747803da390d5d788f8ee1df77685fa5daea480ce77805060efc17574bdea72c21ff0ad55e5 SHA512 1c47307cb92232e035537880523e7e62d25db13f10f69f370979f5f1acfe58f0704f751b37527ad84534f6aaf73cd1f5f9b16605f800f808f96d7fca8e36a778 +EBUILD squid-6.7.ebuild 9834 BLAKE2B 163c8ec770ff03f2f2e29e27431af65bcfb31e776f6079ebcea0266b8f400097810c962488288788aaf76b0d0c7714429a545f0ece683db1663fdeab82a13621 SHA512 589fa8c6348ab18b17c87ee89572f873607542723133adcad95a56c03c2d4cc11548856b888fe549e6044314ee381836f64e1b0be970d71531f8c30f9404c7cc +EBUILD squid-6.9.ebuild 10166 BLAKE2B 9ace8bbfa59f62e4b7216f6988fe20e8aad07d8115fc48e74a233b596cb93d4c81abbf2944529bb00a4f3e701083685708cd5154869048ba5cde5a92d151e1e0 SHA512 ee4bc16b9b408e744b3bba2270a645de5b7b47ccc70e1bf572e2c6f70a9ed5b3a4bd9d49312d9e3208aca6509e97914258219248ab38f828527c3c9e3fe33d66 MISC metadata.xml 1351 BLAKE2B 8a6ea8bc939b5900572bd323fb3be78e0dfa9b4d7436f2d5e27fa59905f57af5cd9b7fe9a2903f8f57859a88176aab17c1a5d507a69765aab0f5320ceec69c96 SHA512 db7a47668d220a16f10d25319ffc4cd33270209d7d00f488d45680150f094d70776c4bf3c7b203b6ec8c69be18e5ac3a78d3d4367ec90a9ffb91ffd29f66890f diff --git a/net-proxy/squid/files/squid.cron-r1 b/net-proxy/squid/files/squid.cron-r1 new file mode 100644 index 000000000000..f0fa84ed2cb3 --- /dev/null +++ b/net-proxy/squid/files/squid.cron-r1 @@ -0,0 +1,15 @@ +#!/bin/sh + +# OpenRC init script supports multiple Squid instances, and exposes 'rotate'. +if command -v rc-service >/dev/null; then + SQUID_SERVICES=$(rc-status | awk '/ *squid.* started /{print $1}') + for SQUID_SERVICE in $SQUID_SERVICES ; do + rc-service "${SQUID_SERVICE}" rotate + done + +# Systemd unit file supports only a single default squid instance, +# and no 'rotate' support, so call squid directly. +elif command -v systemctl >/dev/null; then + SQUID_ACTIVE=$(systemctl --type=service --state=active | awk '/^ *squid\.service / {print $1}') + [ -n "${SQUID_ACTIVE}" ] && squid -k rotate +fi diff --git a/net-proxy/squid/files/squid.initd-r7 b/net-proxy/squid/files/squid.initd-r7 new file mode 100644 index 000000000000..7215b774736d --- /dev/null +++ b/net-proxy/squid/files/squid.initd-r7 @@ -0,0 +1,133 @@ +#!/sbin/openrc-run +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +SQUID_SVCNAME=$( echo "${RC_SVCNAME}" | tr -cd '[a-zA-Z0-9]' ) + +extra_started_commands="reload rotate" + +depend() { + use dns net +} + +_getconfig() { + # Make PIDFILE, CHROOTDIR, and CACHE_SWAP visible to other functions + local CONFFILES="/etc/squid/${RC_SVCNAME}.conf /etc/squid/${RC_SVCNAME}.include /etc/squid/${RC_SVCNAME}.include.*" + if [ ! -f /etc/squid/${RC_SVCNAME}.conf ]; then + eerror "You need to create /etc/squid/${RC_SVCNAME}.conf first." + eerror "The main configuration file and all included file names should have the following format:" + eerror "${CONFFILES}" + eerror "An example can be found in /etc/squid/squid.conf.default" + return 1 + fi + PIDFILE=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }') + CHROOTDIR=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*chroot[ \t]+/ { print $2 }') + if [ -n "${CHROOTDIR}" ] && [ -n "${PIDFILE}" ]; then + CHROOTDIR="${CHROOTDIR%/}" + PIDFILE="${CHROOTDIR}${PIDFILE}" + fi + [ -z ${PIDFILE} ] && PIDFILE=/run/squid.pid + if [ "${CHROOTDIR}/run/${RC_SVCNAME}.pid" != ${PIDFILE} ]; then + eerror "/etc/squid/${RC_SVCNAME}.conf must set pid_filename to" + eerror " /run/${RC_SVCNAME}.pid" + if [ -n "${CHROOTDIR}" ]; then + eerror "with chrootdir ${CHROOTDIR} set." + fi + eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" + eerror " in any other instance of squid." + eerror "Make sure the main configuration file and all included file names have the following format:" + eerror "${CONFFILES}" + return 1 + fi + CACHE_SWAP=$(cat ${CONFFILES} 2>/dev/null 3>/dev/null | awk '/^[ \t]*cache_dir[ \t]+/ { if ( $2 == "rock" ) printf "%s/rock ", $3; else if ( $2 == "coss" ) printf "%s/stripe ", $3; else printf "%s/00 ", $3; }') + [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" + + return 0 +} + +checkconfig() { + _getconfig || return 1 + local x + for x in $CACHE_SWAP ; do + if [ ! -e $x ] ; then + ebegin "Initializing cache directory ${x%/*}" + local ORIG_UMASK=$(umask) + umask 027 + + if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then + eend 1 + return 1 + fi + + local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} 2>&1)" + if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then + umask $ORIG_UMASK + eend 1 + echo "$INIT_CACHE_RESPONSE" + return 1 + fi + + umask $ORIG_UMASK + eend 0 + break + fi + done + + return 0 +} + +start() { + checkconfig || return 1 + checkpath -d -q -m 0750 -o squid:squid /run/${RC_SVCNAME} + + # see https://wiki.squid-cache.org/MultipleInstances + ebegin "Starting ${RC_SVCNAME} (service name ${SQUID_SVCNAME}) with KRB5_KTNAME=\"${SQUID_KEYTAB}\" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}" + KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} + eend $? && sleep 1 +} + +stop() { + _getconfig || return 1 + ebegin "Stopping ${RC_SVCNAME} with /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}" + if /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} ; then + if [ "x${SQUID_FAST_SHUTDOWN}" = "xyes" ]; then + einfo "Attempting fast shutdown." + /usr/sbin/squid -k shutdown -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} + fi + # Now we have to wait until squid has _really_ stopped. + sleep 1 + if [ -f ${PIDFILE} ] ; then + einfon "Waiting for squid to shutdown ." + cnt=0 + while [ -f ${PIDFILE} ] ; do + cnt=$(expr $cnt + 1) + if [ $cnt -gt 90 ] ; then + # Waited 180 seconds now. Fail. + echo + eend 1 "Failed." + break + fi + sleep 2 + printf "." + done + echo + fi + else + eerror "Squid shutdown failed, probably service is already down." + fi + eend 0 +} + +reload() { + checkconfig || return 1 + ebegin "Reloading ${RC_SVCNAME} with /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}" + /usr/sbin/squid -k reconfigure -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} + eend $? +} + +rotate() { + service_started ${RC_SVCNAME} || return 1 + ebegin "Rotating ${RC_SVCNAME} logs with /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME}" + /usr/sbin/squid -k rotate -f /etc/squid/${RC_SVCNAME}.conf -n ${SQUID_SVCNAME} + eend $? +} diff --git a/net-proxy/squid/files/squid.logrotate-r1 b/net-proxy/squid/files/squid.logrotate-r1 new file mode 100644 index 000000000000..03cbca9b5f4a --- /dev/null +++ b/net-proxy/squid/files/squid.logrotate-r1 @@ -0,0 +1,11 @@ +/var/log/squid/*.log { + copytruncate + compress + notifempty + missingok + sharedscripts + postrotate + squid -k rotate 2>/dev/null + endscript +} + diff --git a/net-proxy/squid/squid-6.5.ebuild b/net-proxy/squid/squid-6.10.ebuild index d182d0e1c386..9eddf39bf0be 100644 --- a/net-proxy/squid/squid-6.5.ebuild +++ b/net-proxy/squid/squid-6.10.ebuild @@ -3,25 +3,31 @@ EAPI=8 -inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/squid.gpg +inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs verify-sig DESCRIPTION="Full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" +HOMEPAGE="https://www.squid-cache.org/" MY_PV_MAJOR=$(ver_cut 1) # Upstream patch ID for the most recent bug-fixed update to the formal release. #r=-20181117-r0022167 r= if [[ -z ${r} ]]; then - SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz" + SRC_URI=" + http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz + https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch + verify-sig? ( http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz.asc ) + " else - SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2" + SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2 + https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch" S="${S}${r}" fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap" IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2" RESTRICT="!test? ( test )" @@ -72,12 +78,13 @@ BDEPEND=" dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit ) + verify-sig? ( sec-keys/openpgp-keys-squid ) " PATCHES=( "${FILESDIR}"/${PN}-6.2-gentoo.patch "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch - "${FILESDIR}"/${PN}-6.4-gcc14-algorithm.patch + "${DISTDIR}"/${PN}-6.9-memleak_fix.patch ) pkg_pretend() { @@ -87,6 +94,15 @@ pkg_pretend() { fi } +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + + default +} + src_prepare() { default @@ -349,14 +365,14 @@ src_install() { fi newconfd "${FILESDIR}"/squid.confd-r2 squid - newinitd "${FILESDIR}"/squid.initd-r6 squid + newinitd "${FILESDIR}"/squid.initd-r7 squid if use logrotate ; then insinto /etc/logrotate.d - newins "${FILESDIR}"/squid.logrotate squid + newins "${FILESDIR}"/squid.logrotate-r1 squid else exeinto /etc/cron.weekly - newexe "${FILESDIR}"/squid.cron squid.cron + newexe "${FILESDIR}"/squid.cron-r1 squid.cron fi diropts -m0750 -o squid -g squid diff --git a/net-proxy/squid/squid-6.6.ebuild b/net-proxy/squid/squid-6.6.ebuild index 3f7036a1cbcc..4ac6d0104447 100644 --- a/net-proxy/squid/squid-6.6.ebuild +++ b/net-proxy/squid/squid-6.6.ebuild @@ -25,7 +25,7 @@ fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap" IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2" RESTRICT="!test? ( test )" diff --git a/net-proxy/squid/squid-6.7.ebuild b/net-proxy/squid/squid-6.7.ebuild index 0f87a54910f4..8f094753c314 100644 --- a/net-proxy/squid/squid-6.7.ebuild +++ b/net-proxy/squid/squid-6.7.ebuild @@ -25,7 +25,7 @@ fi LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap" IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2" RESTRICT="!test? ( test )" diff --git a/net-proxy/squid/squid-6.9.ebuild b/net-proxy/squid/squid-6.9.ebuild new file mode 100644 index 000000000000..9eddf39bf0be --- /dev/null +++ b/net-proxy/squid/squid-6.9.ebuild @@ -0,0 +1,402 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/squid.gpg +inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs verify-sig + +DESCRIPTION="Full-featured web proxy cache" +HOMEPAGE="https://www.squid-cache.org/" + +MY_PV_MAJOR=$(ver_cut 1) +# Upstream patch ID for the most recent bug-fixed update to the formal release. +#r=-20181117-r0022167 +r= +if [[ -z ${r} ]]; then + SRC_URI=" + http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz + https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch + verify-sig? ( http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}.tar.xz.asc ) + " +else + SRC_URI="http://static.squid-cache.org/Versions/v${MY_PV_MAJOR}/${P}${r}.tar.bz2 + https://dev.gentoo.org/~juippis/distfiles/squid-6.9-memleak_fix.patch" + S="${S}${r}" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap" +IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2" +RESTRICT="!test? ( test )" +REQUIRED_USE="tproxy? ( caps ) qos? ( caps ) ssl-crtd? ( ssl )" + +DEPEND=" + acct-group/squid + acct-user/squid + dev-libs/libltdl + sys-libs/tdb + virtual/libcrypt:= + caps? ( >=sys-libs/libcap-2.16 ) + ecap? ( net-libs/libecap:1 ) + esi? ( + dev-libs/expat + dev-libs/libxml2 + ) + ldap? ( net-nds/openldap:= ) + gnutls? ( >=net-libs/gnutls-3.1.5:= ) + logrotate? ( app-admin/logrotate ) + nis? ( + net-libs/libtirpc:= + net-libs/libnsl:= + ) + kerberos? ( virtual/krb5 ) + pam? ( sys-libs/pam ) + qos? ( net-libs/libnetfilter_conntrack ) + ssl? ( + dev-libs/nettle:= + !gnutls? ( + dev-libs/openssl:= + ) + ) + sasl? ( dev-libs/cyrus-sasl ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND=" + ${DEPEND} + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + perl? ( dev-lang/perl ) + samba? ( net-fs/samba ) + selinux? ( sec-policy/selinux-squid ) + sqlite? ( dev-perl/DBD-SQLite ) +" +DEPEND+=" valgrind? ( dev-debug/valgrind )" +BDEPEND=" + dev-lang/perl + ecap? ( virtual/pkgconfig ) + test? ( dev-util/cppunit ) + verify-sig? ( sec-keys/openpgp-keys-squid ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.2-gentoo.patch + "${FILESDIR}"/${PN}-4.17-use-system-libltdl.patch + "${DISTDIR}"/${PN}-6.9-memleak_fix.patch +) + +pkg_pretend() { + if use tproxy; then + local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" + linux-info_pkg_setup + fi +} + +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + + default +} + +src_prepare() { + default + + # Fixup various paths + sed -i -e 's:/usr/local/squid/etc:/etc/squid:' \ + INSTALL QUICKSTART \ + scripts/fileno-to-pathname.pl \ + scripts/check_cache.pl \ + tools/cachemgr.cgi.8 \ + tools/purge/conffile.hh \ + tools/purge/purge.1 || die + sed -i -e 's:/usr/local/squid/sbin:/usr/sbin:' \ + INSTALL QUICKSTART || die + sed -i -e 's:/usr/local/squid/var/cache:/var/cache/squid:' \ + QUICKSTART || die + sed -i -e 's:/usr/local/squid/var/logs:/var/log/squid:' \ + QUICKSTART \ + src/log/access_log.cc || die + sed -i -e 's:/usr/local/squid/logs:/var/log/squid:' \ + src/log/access_log.cc || die + sed -i -e 's:/usr/local/squid/libexec:/usr/libexec/squid:' \ + src/acl/external/unix_group/ext_unix_group_acl.8 \ + src/acl/external/session/ext_session_acl.8 || die + sed -i -e 's:/usr/local/squid/cache:/var/cache/squid:' \ + scripts/check_cache.pl || die + # /var/run/squid to /run/squid + sed -i -e 's:$(localstatedir)::' \ + src/ipc/Makefile.am || die + sed -i 's:/var/run/:/run/:g' tools/systemd/squid.service || die + + sed -i -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \ + libltdl/configure.ac || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --cache-file="${S}"/config.cache + + --datadir=/usr/share/squid + --libexecdir=/usr/libexec/squid + --localstatedir=/var + --sysconfdir=/etc/squid + --with-default-user=squid + --with-logdir=/var/log/squid + --with-pidfile=/run/squid.pid + + --enable-build-info="Gentoo ${PF} (r: ${r:-NONE})" + --enable-log-daemon-helpers + --enable-url-rewrite-helpers + --enable-cache-digests + --enable-delay-pools + --enable-disk-io + --enable-eui + --enable-icmp + --enable-ipv6 + --enable-follow-x-forwarded-for + --enable-removal-policies="lru,heap" + --disable-strict-error-checking + --disable-arch-native + + --with-large-files + --with-build-environment=default + + --with-tdb + + --without-included-ltdl + --with-ltdl-include="${ESYSROOT}"/usr/include + --with-ltdl-lib="${ESYSROOT}"/usr/$(get_libdir) + + $(use_with caps cap) + $(use_enable snmp) + $(use_with ssl openssl) + $(use_with ssl nettle) + $(use_with gnutls) + $(use_with ldap) + $(use_enable ssl-crtd) + $(use_with systemd) + $(use_with test cppunit) + $(use_enable ecap) + $(use_enable esi) + $(use_enable esi expat) + $(use_enable esi xml2) + $(use_enable htcp) + $(use_with valgrind valgrind-debug) + $(use_enable wccp) + $(use_enable wccpv2) + ) + + # Basic modules + local basic_modules=( + NCSA + POP3 + getpwnam + + $(usev samba 'SMB') + $(usev ldap 'SMB_LM LDAP') + $(usev pam 'PAM') + $(usev sasl 'SASL') + $(usev nis 'NIS') + $(usev radius 'RADIUS') + ) + + use nis && append-cppflags "-I${ESYSROOT}/usr/include/tirpc" + + if use mysql || use postgres || use sqlite; then + basic_modules+=( DB ) + fi + + # Digests + local digest_modules=( + file + + $(usev ldap 'LDAP eDirectory') + ) + + # Kerberos + local negotiate_modules=( none ) + + myeconfargs+=( --without-mit-krb5 --without-heimdal-krb5 ) + + if use kerberos; then + # We intentionally overwrite negotiate_modules here to lose + # the 'none'. + negotiate_modules=( kerberos wrapper ) + + if has_version app-crypt/heimdal; then + myeconfargs+=( + --without-mit-krb5 + --with-heimdal-krb5 + ) + else + myeconfargs+=( + --with-mit-krb5 + --without-heimdal-krb5 + ) + fi + fi + + # NTLM modules + local ntlm_modules=( none ) + + if use samba ; then + # We intentionally overwrite ntlm_modules here to lose + # the 'none'. + ntlm_modules=( SMB_LM ) + fi + + # External helpers + local ext_helpers=( + file_userip + session + unix_group + delayer + time_quota + + $(usev samba 'wbinfo_group') + $(usev ldap 'LDAP_group eDirectory_userip') + ) + + use ldap && use kerberos && ext_helpers+=( kerberos_ldap_group ) + if use mysql || use postgres || use sqlite; then + ext_helpers+=( SQL_session ) + fi + + # Storage modules + local storeio_modules=( + aufs + diskd + rock + ufs + ) + + # + local transparent + if use kernel_linux; then + myeconfargs+=( + --enable-linux-netfilter + $(usev qos '--enable-zph-qos --with-netfilter-conntrack') + ) + fi + + tc-export_build_env BUILD_CXX + export BUILDCXX="${BUILD_CXX}" + export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" + tc-export CC AR + + # Should be able to drop this workaround with newer versions. + # https://bugs.squid-cache.org/show_bug.cgi?id=4224 + tc-is-cross-compiler && export squid_cv_gnu_atomics=no + + # Bug #719662 + append-atomic-flags + + print_options_without_comma() { + # IFS as ',' will cut off any trailing commas + ( + IFS=',' + options=( $(printf "%s," "${@}") ) + echo "${options[*]}" + ) + } + + myeconfargs+=( + --enable-storeio=$(print_options_without_comma "${storeio_modules[@]}") + --enable-auth-basic=$(print_options_without_comma "${basic_modules[@]}") + --enable-auth-digest=$(print_options_without_comma "${digest_modules[@]}") + --enable-auth-ntlm=$(print_options_without_comma "${ntlm_modules[@]}") + --enable-auth-negotiate=$(print_options_without_comma "${negotiate_modules[@]}") + --enable-external-acl-helpers=$(print_options_without_comma "${ext_helpers[@]}") + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + systemd_dounit tools/systemd/squid.service + + # Need suid root for looking into /etc/shadow + fowners root:squid /usr/libexec/squid/basic_ncsa_auth + fperms 4750 /usr/libexec/squid/basic_ncsa_auth + + if use pam; then + fowners root:squid /usr/libexec/squid/basic_pam_auth + fperms 4750 /usr/libexec/squid/basic_pam_auth + fi + + # Pinger needs suid as well + fowners root:squid /usr/libexec/squid/pinger + fperms 4750 /usr/libexec/squid/pinger + + # These scripts depend on perl + if ! use perl; then + local perl_scripts=( + basic_pop3_auth ext_delayer_acl helper-mux + log_db_daemon security_fake_certverify + storeid_file_rewrite url_lfs_rewrite + ) + + local script + for script in "${perl_scripts[@]}"; do + rm "${ED}"/usr/libexec/squid/${script} || die + done + fi + + # Cleanup + rm -r "${D}"/run "${D}"/var/cache || die + + dodoc CONTRIBUTORS CREDITS ChangeLog INSTALL QUICKSTART README SPONSORS doc/*.txt + newdoc src/auth/negotiate/kerberos/README README.kerberos + newdoc src/auth/basic/RADIUS/README README.RADIUS + newdoc src/acl/external/kerberos_ldap_group/README README.kerberos_ldap_group + dodoc RELEASENOTES.html + + if use pam; then + newpamd "${FILESDIR}"/squid.pam squid + fi + + newconfd "${FILESDIR}"/squid.confd-r2 squid + newinitd "${FILESDIR}"/squid.initd-r7 squid + + if use logrotate ; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/squid.logrotate-r1 squid + else + exeinto /etc/cron.weekly + newexe "${FILESDIR}"/squid.cron-r1 squid.cron + fi + + diropts -m0750 -o squid -g squid + keepdir /var/log/squid /etc/ssl/squid /var/lib/squid + + # Hack for bug #834503 (see also bug #664940) + # Please keep this for a few years until it's no longer plausible + # someone is upgrading from < squid 5.7. + mv "${ED}"/usr/share/squid/errors{,.new} || die +} + +pkg_preinst() { + # Remove file in EROOT that the directory collides with. + rm -rf "${EROOT}"/usr/share/squid/errors || die + + # Following the collision protection check, reverse + # src_install's rename in ED. + mv "${ED}"/usr/share/squid/errors{.new,} || die +} + +pkg_postinst() { + elog "A good starting point to debug Squid issues is to use 'squidclient mgr:' commands such as 'squidclient mgr:info'." + + if [[ ${#r} -gt 0 ]]; then + elog "You are using a release with the official ${r} patch! Make sure you mention that, or send the output of 'squidclient mgr:info' when asking for support." + fi +} diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest index b3c1f0033a5d..e28be4a3c507 100644 --- a/net-proxy/squidguard/Manifest +++ b/net-proxy/squidguard/Manifest @@ -6,4 +6,4 @@ AUX squidguard-1.6.0-gentoo.patch 982 BLAKE2B 9858c7778fbf52573061fd12d3c3941c4f AUX squidguard-1.6.0-stdlib.patch 531 BLAKE2B 14d62576ff058d542c296073612f8c27d96ec476def77a54adbb26534dc84f5ed172a5b25b080d3380c37d3f0ecd05bf73ac5917f1144381e3ed29d4a72c1ced SHA512 6b352f5ff3bfb93899fe29eaa5f5200f9d9c9e243e0dc6746deffb03cbc543a3f5226b6579bdc3ab30b0b4f0df5e4d760064d65acd8aa962c7cf729fe303e690 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e EBUILD squidguard-1.6.0-r1.ebuild 2398 BLAKE2B 051ac6d30be1f2210fb5e463afde555eb4c6e07b29dfdb0856efa368b27b25df10d1c1b21449472cd01d7799b8a138fbfcda929ae6a2359a5467db73d26eb16d SHA512 93528ed7e83ecfdce6c948a66e0b1a8b64dfe715766bbcf907138e381e48d5e3258704ab3ee5d99cf88d7e079e0bbfd11714a08a3ad61ddcad4f82934235ec88 -MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93 +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/net-proxy/squidguard/metadata.xml b/net-proxy/squidguard/metadata.xml index a3862b8ec2fc..115e9d64a669 100644 --- a/net-proxy/squidguard/metadata.xml +++ b/net-proxy/squidguard/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest index 667f749a870c..967a4ee597ba 100644 --- a/net-proxy/sshuttle/Manifest +++ b/net-proxy/sshuttle/Manifest @@ -1,7 +1,4 @@ -DIST sshuttle-1.1.1-docs.tar.xz 8048 BLAKE2B f6318110f67a4882a733d9b389c52eefd2e769b70f3282e7699425b6e6d3a9c5a60219978e248aaf1e7f184491db9aea4aab2efad09eb0af3ee095e0cf527d54 SHA512 c2ef822f872f6afd1d9c64e7a412ad65cca0486115dcfa0673a7a1b0554bfd1413f673248e30fa01759daaf1a1a0061f48a42170d7b234448093d3562f757cd9 -DIST sshuttle-1.1.1.tar.gz 93639 BLAKE2B 63725146dd5fcd07f4b291f981ca947a514735014f4f8173023d3982796ce4ef96b9defb39beef026d32b2162d11951742c57dee1f04cd453cf85ca08c8d2468 SHA512 07a3371c4998f37410692f9c5eaa456ff28b2dbffff731a0be3877d96c820b42c83cb386ec3ab54b524d4b333edd1a2289cd949c7d59b98a11b1ee2d6867da4f DIST sshuttle-1.1.2-docs.tar.xz 8300 BLAKE2B efbffcda40422b76e18ad8e85b1ccd392a5ca342897d3a179b31b5f000954b2021c877680eda6a0aae70c8594704afb8a81599f2c79dd1c954665c437ad789f2 SHA512 b48896b48da2540e561fec10ae20a8b53ffc8df59c7917e7166f138b6c2ad2d3555949d9f10934886e3c6d5a062e20460e985c064b1502a3951149265c332956 DIST sshuttle-1.1.2.gh.tar.gz 111767 BLAKE2B 7f2a63df0a6e2815e8787c6e02cd81924ff3d80d4b2309d8ebb875b49db33ff5b7b8c8249760b27a942f69db049c862041433099a06f009fe3532c4cb4493bac SHA512 c24a6490c1877b9ded8f5f4f44571953c4c204c33f0238c709ca32c7a581ddc919bfc48beb4fafd3a4d346cccd9b02dc7051b6233ff989a0ad329d55c1c5ec47 -EBUILD sshuttle-1.1.1.ebuild 2072 BLAKE2B 492868bc3fee22a3a1dfde28a41042bbb7723f6f34c311c2305850809738010852eb5b298630ca3ec457a67183cd84b38d790e628ae5bf60458dbb63df35fa02 SHA512 ffb90f6f59c6c79582893e3fb52fd4ba0410e331618e244edc7f16693a8d3b8f8f70a7aeb587586c6078bb70de3a76693a3eeb2bab06ad4df074aec8cb533e43 -EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B a06ef6457069e926537f8ac77e435b551d30100175720100b7f61dd57df825f876faa865a6a5c9d24926c91c02382632e41a9ba7b097a70a4409894d4348fe72 SHA512 5ab4f0e4685da38071a304248de80a6f7912ac66a87b595ca4585b29a5b525363ea287a0f0a3d6dd2aa09af30ae3597e5a78553d482b0300e40de8ba1903b89b +EBUILD sshuttle-1.1.2.ebuild 2202 BLAKE2B 262310d7f620e32f502688e05d8813800307115c26e5c1577c3361bb2462bc966c48dfb819e135491082ffc310f471e67db19e2d10540491c6858a9fa7483cc7 SHA512 87bbc5ce6d45eed71dd3e65c36bbebc5629feb111fec73ab081baf3b635a0f2593617836124ae686158fc290b695fbbdf7f8d5231e50b77f84272cee0597195c MISC metadata.xml 368 BLAKE2B 8781826aa94f38296cb3c0ef628c931875cf7d8c1f3080970be16c3dd01862d067d4051f4d2c271bc63dd9260c4652ba5fd48002eb5747eab68ba9f02a6a3629 SHA512 a4609eb161d14b0b12d93406a257774465e377c432731cd6d72267baa3396545f45e5df9a16577ff143254797e872aa988213af190d47134d9f09de8d820b6d2 diff --git a/net-proxy/sshuttle/sshuttle-1.1.1.ebuild b/net-proxy/sshuttle/sshuttle-1.1.1.ebuild deleted file mode 100644 index f2826293e380..000000000000 --- a/net-proxy/sshuttle/sshuttle-1.1.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-sshuttle-docs -# Set to 1 if prebuilt, 0 if not -# (the construct below is to allow overriding from env for script) -: ${SSHUTTLE_DOCS_PREBUILT:=1} - -SSHUTTLE_DOCS_PREBUILT_DEV=sam -SSHUTTLE_DOCS_VERSION=${PV} -# Default to generating docs (inc. man pages) if no prebuilt; overridden later -SSHUTTLE_DOCS_USEFLAG="+doc" - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 linux-info pypi - -DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh" -HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/" -if [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${SSHUTTLE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${SSHUTTLE_DOCS_VERSION}-docs.tar.xz )" - - SSHUTTLE_DOCS_USEFLAG="doc" -fi - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="${SSHUTTLE_DOCS_USEFLAG}" - -BDEPEND=" - doc? ( dev-python/sphinx ) - test? ( - dev-python/mock[${PYTHON_USEDEP}] - ) -" -RDEPEND=" - dev-python/psutil[${PYTHON_USEDEP}] - || ( net-firewall/iptables net-firewall/nftables ) -" - -CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT" - -distutils_enable_tests pytest - -python_prepare_all() { - # Don't run tests via setup.py pytest - sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die - - # Don't require pytest-cov when running tests - sed -i "s/^addopts =/#\0/" setup.cfg || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc ; then - emake -j1 -C docs html man - fi -} - -python_install_all() { - # If USE=doc, there'll be newly generated docs which we install instead. - if ! use doc && [[ ${SSHUTTLE_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${SSHUTTLE_DOCS_VERSION}-docs/sshuttle.1 - else - HTML_DOCS=( docs/_build/html/. ) - doman docs/_build/man/* - fi - - distutils-r1_python_install_all -} diff --git a/net-proxy/sshuttle/sshuttle-1.1.2.ebuild b/net-proxy/sshuttle/sshuttle-1.1.2.ebuild index 0c3c7b286c31..6580b9328e37 100644 --- a/net-proxy/sshuttle/sshuttle-1.1.2.ebuild +++ b/net-proxy/sshuttle/sshuttle-1.1.2.ebuild @@ -14,7 +14,7 @@ SSHUTTLE_DOCS_VERSION=${PV} SSHUTTLE_DOCS_USEFLAG="+doc" DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 linux-info DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh" diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest index bb3a1560c9e7..275a0b4294fd 100644 --- a/net-proxy/tinyproxy/Manifest +++ b/net-proxy/tinyproxy/Manifest @@ -3,6 +3,6 @@ AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca AUX tinyproxy.tmpfiles.conf 44 BLAKE2B a4e1cf0c8cbd78360175b8260c7d83885dfc9560a78faa6fc111f8611b6dd43c3cbf9fa62e60f8333cac4d0bededbe048c626d8a85d4f3c6c1bfa1ae249c599e SHA512 59d1efcc996e94ae684708ef06263c61f17680a776938a90ce145cf6f0243ed253d402cd886dab7c2c287f47dbc6f02f0e34904433e7b6756cfaa18a1b766b4e DIST tinyproxy-1.11.2.tar.xz 185864 BLAKE2B ae8f1cc0fcfa3f2a6b239ad1f0f34bf21843cbf85613643b221359904e672d5c28c69bcb6b61f0244c5a3e6fd901b0c24488c3b80a0aa1f95b87ff90b175dc62 SHA512 008e43b770f946965d5a3fbad1881859e30b66a3a4a97cf9982e63d81139da7a8f23937601b72f32276166cd170008cafec9231b616fc840f05cae3c1329be35 DIST tinyproxy-31339cb1615765f2fbb4ec7779400535bad6da46.tar.gz 112886 BLAKE2B 82af9f671b31c9be46624400d726e428837763ab763942c335df1aa63499e33c17384b55ea2f68790cd3b8b1e4eff3b61b40f25e1d55506ce0f0694c7cddaddb SHA512 638ae0731aa2d9f498643aa883871f7b3978c68ee5098fcbeb234234e5432d1a833c33fb0cc1944504369bdf975baa0bd6166664c340825b9b55664d8afdf94c -EBUILD tinyproxy-1.11.1_p20230201.ebuild 1830 BLAKE2B 826404cdd80e376f217747a5166f8c3a684112a4e5857aa3b85f1478d5e85d1995fb817be206663172a5cf56d5db051bece2430fb04c949a3d069604f6a71d68 SHA512 87a32d424ee2727b56790ca11a73d6ca7da6b77ff40119ddd3da99312319e553c608c1e1d5631c9efda9a0c571d389d6bc36266df66e0358de10df4d991f81c4 -EBUILD tinyproxy-1.11.2.ebuild 1720 BLAKE2B 7d7128afbc40356358351f631a502cd63458769914b016f9fced5a723c2f882b633a24cd42030d2876f7e6a34e93862c42edcaf1a6d3ad11172000063a8c8d4a SHA512 6c3b99cabe706f36651f970fc95502f19bd2fbb3a54fa936c4f05ef134663b35729de32b6864b33a3c8fd8478e1b608a74151ee65faf957f37e81ad888931907 +EBUILD tinyproxy-1.11.1_p20230201.ebuild 1824 BLAKE2B c8c44add2ee379b9d5b06d0ab6fcae37403a75da1c1946c9a01ff2e9d3434613155a0c29852d836d4be88bd21fecadcc2270c4b6e7b8f27dc3e72ca7b64dcbdb SHA512 0faea60253d65408016047b7c8f3cc7bf3228ed24e6e856d87209d2e8031d4441848656a040463a9890779721a8b2ccd335a499aa60c7333bcc1083921590860 +EBUILD tinyproxy-1.11.2.ebuild 1711 BLAKE2B aca8c04fd089c0e73fcb1a56ea9751a955cd307a9718064bc5f0ee5a0989a6be489a5da9b0630b43146c3f716b9f876d78da25c5b8a4ba06f4494249a670e1d9 SHA512 f15961883b29a3db9fdc1c3d56e198cac75be9f1cd4b8ac4c0bc0728672972d3a6b7a28327460c3a51c150087bb67a7a194e125d559760e101f01561e2d1d392 MISC metadata.xml 718 BLAKE2B 3afc0958e86832552618442ab17be839a9cdab7a16b09c6c818c40aba1dfa7ac5d38030295b9377241a60c363263a7b1dd95b710fcf1ff4cb3bd8ed570779ff7 SHA512 dee3edacaa08d3d006e6b762a23859bb0d903a13fa386512f2117093c761073fdded8b04a172e41993525d1baefb3e46fe90f3cb950149c6a2409d84386950c1 diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.1_p20230201.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.1_p20230201.ebuild index 5a8bcbd50069..abdc192cc4c4 100644 --- a/net-proxy/tinyproxy/tinyproxy-1.11.1_p20230201.ebuild +++ b/net-proxy/tinyproxy/tinyproxy-1.11.1_p20230201.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/tinyproxy/tinyproxy/archive/${COMMIT}.tar.gz -> ${PN LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86" IUSE="test debug +filter-proxy reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header" diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.2.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.2.ebuild index 4cbde7982d63..3d72d958bdad 100644 --- a/net-proxy/tinyproxy/tinyproxy-1.11.2.ebuild +++ b/net-proxy/tinyproxy/tinyproxy-1.11.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${PV}/${P}.tar LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86" IUSE="test debug +filter-proxy reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header" diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest index 48f3c5bc3d59..0c90d9efd00d 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 1455 BLAKE2B 53749e4f3d755888821aa1923a1cbc4aeb5f30c833c97d2e8fa217614f035debe5f931c93b2305dfb7a49ca0b9386ca664536a0e41ba07f2d53a043e71469171 SHA512 685801e95cb43e804cbe6fbfc036a56b22fb99fb7e6b1cabe372fcd3a0ce890dd6739189c601aa800d21fd626a53b772ae68e1b8962fbd6aecf8fa6afb1eb997 -MISC metadata.xml 1155 BLAKE2B 4b36b42fd226c7ffb5b28eed065d16bbf10abf68108044d64ae97b5ca46e4b2d38a95f472da080d8884a10ba06a942e9a2aa6a9c3cc79b13a51d33cb06b28859 SHA512 bdbcab7001c48932fdc01158e9b0345141ffc66f0dd413c8d387882b01c73a08dfe5668cc27cdf7f028da7ec3f18613fca46509496d37b1e8ee66efd7fc1f12f +EBUILD trojan-1.16.0-r3.ebuild 1593 BLAKE2B d024064eed3c92e4c309263aa5272190d56871d50424160079345459556f4951fd4e8513a872dc343b24e107b49eb81cc729685e75af00e5f432ba35d644545f SHA512 2bc07fefc50098219d93fcd5215eb0cb2d58da2b8dedc260443d9240c610203083f37054865b79c620742c0ea5252df265359e34816da020c5927e7f96602cb5 +MISC metadata.xml 1341 BLAKE2B 8f28f3a075c3e6f6342ec0f767d135df4e4b91737ad866ba90f34097abac622eea5ec4887b3de4b5c3c736b6b54586d6dfd800b201a1dcb76ce255dc7d47ca6e SHA512 035045fb694f354ca1d669d435882a21e7f9c174a70a80c8215403ed91c0240ed01572c0b5172de8a7bb3441782956ef84c3e8a66491dc672408f16f7d0614dd diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml index c141a430b420..c04b8ddb549e 100644 --- a/net-proxy/trojan/metadata.xml +++ b/net-proxy/trojan/metadata.xml @@ -25,6 +25,9 @@ </longdescription> <use> <flag name="mysql">build with MySQL support</flag> + <flag name="nat">Build with NAT support</flag> + <flag name="reuseport">Build with SO_REUSEPORT support</flag> + <flag name="tcpfastopen">Force build with TCP Fast Open support</flag> </use> <upstream> <remote-id type="github">trojan-gfw/trojan</remote-id> diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild b/net-proxy/trojan/trojan-1.16.0-r3.ebuild index b5b332947cbb..f77acffb22dc 100644 --- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild +++ b/net-proxy/trojan/trojan-1.16.0-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISABLE_AUTOFORMATTING=1 FORCE_PRINT_ELOG=1 @@ -20,7 +20,7 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="mysql test" +IUSE="mysql +nat +reuseport tcpfastopen test" # Some hiccups setting up local network server. RESTRICT="test" @@ -50,6 +50,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DENABLE_MYSQL=$(usex mysql) + -DENABLE_NAT=$(usex nat) + -DENABLE_REUSE_PORT=$(usex reuseport) + -DFORCE_TCP_FASTOPEN=$(usex tcpfastopen) -DSYSTEMD_SERVICE=ON -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir) ) |