diff options
Diffstat (limited to 'net-proxy')
50 files changed, 253 insertions, 1537 deletions
diff --git a/net-proxy/3proxy/3proxy-0.8.12.ebuild b/net-proxy/3proxy/3proxy-0.8.12.ebuild deleted file mode 100644 index 5ebf6061b3da..000000000000 --- a/net-proxy/3proxy/3proxy-0.8.12.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A really tiny cross-platform proxy servers set" -HOMEPAGE="https://www.3proxy.ru/" -SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86" -IUSE="" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.12-gentoo.patch -) - -DOCS=( README cfg ) -HTML_DOCS=( doc/html/. ) - -src_prepare() { - default - cp Makefile.Linux Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" LN="$(tc-getCC)" -} - -src_install() { - local x - - pushd src >/dev/null || die - dobin 3proxy - for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do - newbin ${x} ${PN}-${x} - [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8 - done - popd >/dev/null - - doman man/3proxy*.[38] - - einstalldocs -} diff --git a/net-proxy/3proxy/3proxy-0.8.13.ebuild b/net-proxy/3proxy/3proxy-0.8.13.ebuild index 5ebf6061b3da..345db508eed8 100644 --- a/net-proxy/3proxy/3proxy-0.8.13.ebuild +++ b/net-proxy/3proxy/3proxy-0.8.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://www.3proxy.ru/" SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86" IUSE="" PATCHES=( diff --git a/net-proxy/3proxy/3proxy-0.8.9.ebuild b/net-proxy/3proxy/3proxy-0.8.9.ebuild deleted file mode 100644 index ba16aeca0092..000000000000 --- a/net-proxy/3proxy/3proxy-0.8.9.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A really tiny cross-platform proxy servers set" -HOMEPAGE="https://www.3proxy.ru/" -SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ~sparc x86" -IUSE="" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8-gentoo.patch -) - -DOCS=( README cfg ) -HTML_DOCS=( doc/html/. ) - -src_prepare() { - default - cp Makefile.Linux Makefile || die -} - -src_install() { - local x - - pushd src >/dev/null || die - dobin 3proxy - for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do - newbin ${x} ${PN}-${x} - [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8 - done - popd >/dev/null - - doman man/3proxy*.[38] - - einstalldocs -} diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest index ba9e218ab462..ca1ccb22f2a5 100644 --- a/net-proxy/3proxy/Manifest +++ b/net-proxy/3proxy/Manifest @@ -1,9 +1,4 @@ AUX 3proxy-0.8.12-gentoo.patch 1749 BLAKE2B 8ee153ae343989faef6f36dbdc072b933fbee2d2ad129b0e6573dd57e465916d94f0868fcfd03a2099879b3c7bc925ac3be1adb7be52043fbb9996cbc8ff0ed2 SHA512 b8c3a9d5cf1ad20ef517ec6ec5626cf9f6094777c0870e53fd35e32f49a518fecdfa05a5806514957d10943da7bdcaa63e2ad6fce32506d7fd1a467bb7b2e652 -AUX 3proxy-0.8.8-gentoo.patch 1471 BLAKE2B daccc5f278ba4ac59aad24b463557a49e177f0dea679deea0b1282ba31eac21d76ee4587c3a6523da29ea8130ac24c75ee8b0ceecceb1ec57a53cc6028c9bb51 SHA512 9c41df962691f8b2b832495a5e644fcbe58805839b2b40dd65564dc3eb9897de1a744677e2c4a032e39d64b34c4190893049f2ed86be8908f739f720633b2f3a -DIST 3proxy-0.8.12.tar.gz 528990 BLAKE2B fb338c93e25fe4d03d626118f8c3ef52af7104599e11d535dfa572c4fb47d609da66f199406a3c6bb9739766163bb7b54b529f71d4d6ff637567f2f67d3a9ed1 SHA512 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d DIST 3proxy-0.8.13.tar.gz 529072 BLAKE2B 45b756bf1ddaaf560f4f35c88e78d24dbafa28c3144de5317d9f5177c51da85a2148a7db743a656ddf853325e18edbcb200b37ff02afae2f203c3bfab66e1b58 SHA512 94b4a2568917c1d720276e38050a13e144d3e92ff41edd02eeebac0a6c21e6a839a58ea7dcb3abc03370e0f18452c953cfd7ad15ebac87e66b78d94fa52fbd79 -DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815 -EBUILD 3proxy-0.8.12.ebuild 923 BLAKE2B 1a29d1e6f61fe79a9db6a1963794fb7276ae4364caa6d4549506ac65b947daf7344512c902e1428f10cf55be5e27d75416927be6f6c41872c423c91997f29426 SHA512 55101f5091f615a6411680b737ea82f275e910d9d9bc93ceacb42ab297cbe4099aa7746cf1578a34bcc1b187e822f9ff118bf80866e75166ad1554bca500c006 -EBUILD 3proxy-0.8.13.ebuild 923 BLAKE2B 1a29d1e6f61fe79a9db6a1963794fb7276ae4364caa6d4549506ac65b947daf7344512c902e1428f10cf55be5e27d75416927be6f6c41872c423c91997f29426 SHA512 55101f5091f615a6411680b737ea82f275e910d9d9bc93ceacb42ab297cbe4099aa7746cf1578a34bcc1b187e822f9ff118bf80866e75166ad1554bca500c006 -EBUILD 3proxy-0.8.9.ebuild 837 BLAKE2B 7f5666c6d09b04d57be1147421436435f0ce8487ae5957a474cee81064642bde3b4b80b52d9a14c6a9e0c16e61518cf6b1a412dddf354edc2cbec821e2351207 SHA512 ef8abe07dff61866d3b2a887511aaaba995fbdf3173213790f71a42f64d61b2fa224f41cb1f11d9d42ffbca04c579a013f2adc8ce19c06f03b9b5491552009c4 +EBUILD 3proxy-0.8.13.ebuild 920 BLAKE2B f61bf2068cdd65548fc280e4c248c95acd0463eecdd5aab7f3d7caa994014c95d2d4e966ee9278619bdd910a9d19e0ea061579b33859d205dd26c548b0d231fe SHA512 dacf4aa0da9a417946142888e718f81a9717268858f3c2b6e645f21cafb0696076e4502d156cf0963cd4cb52d3ccfaab4bd8137c6a9364a78e7d1e3a5b1627bf MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076 diff --git a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch deleted file mode 100644 index 1f8d478cd086..000000000000 --- a/net-proxy/3proxy/files/3proxy-0.8.8-gentoo.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/Makefile.Linux 2016-12-16 20:24:53.809856430 +0200 -+++ b/Makefile.Linux 2016-12-16 20:26:24.912859170 +0200 -@@ -10,11 +10,11 @@ - BUILDDIR = - CC = gcc - --CFLAGS = -g -O2 -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL -+CFLAGS += -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL - COUT = -o - LN = gcc - DCFLAGS = -fpic --LDFLAGS = -O2 -pthread -+LDFLAGS += -pthread - DLFLAGS = -shared - DLSUFFICS = .ld.so - # -lpthreads may be reuqired on some platforms instead of -pthreads -@@ -39,12 +39,12 @@ - include Makefile.inc - - allplugins: -- @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done -+ @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ; cd ../.. ; done - - DESTDIR = --prefix = /usr/local -+prefix = - exec_prefix = $(prefix) --man_prefix = $(prefix)/share -+man_prefix = $(prefix)/usr/share - - INSTALL = /usr/bin/install - INSTALL_BIN = $(INSTALL) -m 755 ---- a/src/stringtable.c 2016-12-16 20:24:53.811856430 +0200 -+++ b/src/stringtable.c 2016-12-16 20:26:48.288859873 +0200 -@@ -38,7 +38,7 @@ - /* 24 */ NULL, - #ifndef TPROXY_CONF - #ifndef _WIN32 --/* 25 */ (unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg", -+/* 25 */ (unsigned char *)"/etc/3proxy/3proxy.cfg", - #else - /* 25 */ (unsigned char *)"3proxy.cfg", - #endif diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz Binary files differindex a9f69b31124a..20199938329e 100644 --- a/net-proxy/Manifest.gz +++ b/net-proxy/Manifest.gz diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest index 364353dd355d..df8fe88e01ad 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-r1.ebuild 2687 BLAKE2B 20395f4fe92faaaf703e59011bac65d79948dee668a92671f1c0dbc58b42e2221f3674c0325d6bdcb8fb8d04ff7f9a0494e09bc0a33aeb9e6655bc9078ceea6c SHA512 d306aca46bfa0ac66728ebdb5efb356dcc8f123ced06126ad0631a364af807a1a5ee51ad9538b5777bf83dbac97a9c041f653f49ab40231cc375cacff80ed6bf +EBUILD dante-1.4.1-r2.ebuild 2685 BLAKE2B 04121f835399e9b46e13452ceb8283022f8718e0e0de62323812a4c0e31c96e82985b099543fc0c4d56418e784c7b9976c281f7d1089bd60ef1bb0b8e00d0034 SHA512 20fbbe8a291b336e4cee35ed66b3b503278b7864ca4fb62072599ba5a1c06bd492deae688eb0c5660f6bb3d914f3e19ddf811f3c50120ea03d72bdbd6856dff6 MISC metadata.xml 296 BLAKE2B f91f0392a93ffe384cc2879ce1a83cb8f7d92867d1376ebe2480687a8ffe2a5b5c6e0581c0bcf1b2c9708558da60371e1c24ab9fd6950e89f4b13f2f393664c7 SHA512 af311f739f67a9e4d7386aa2ba575f2d0ba5e6d1cd9710dc107876c6876a05ce301568da03c4287e2557665d1ca5cba174ca31b41c6788b1f1300c2fed9005ab diff --git a/net-proxy/dante/dante-1.4.1-r1.ebuild b/net-proxy/dante/dante-1.4.1-r2.ebuild index af2e73de3948..040fefa416f3 100644 --- a/net-proxy/dante/dante-1.4.1-r1.ebuild +++ b/net-proxy/dante/dante-1.4.1-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.inet.no/dante/files/${P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" IUSE="debug kerberos pam selinux static-libs tcpd upnp" CDEPEND=" @@ -18,7 +18,7 @@ CDEPEND=" pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) upnp? ( net-libs/miniupnpc:= ) - userland_GNU? ( virtual/shadow ) + userland_GNU? ( sys-apps/shadow ) " DEPEND="${CDEPEND} sys-devel/bison diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest index 5905614436bd..e42a2d55456b 100644 --- a/net-proxy/haproxy/Manifest +++ b/net-proxy/haproxy/Manifest @@ -1,30 +1,26 @@ AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753 DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5 -DIST haproxy-1.8.23.tar.gz 2101424 BLAKE2B e1be06fd604f8715d52ad66ea77a1eb56d38eae46442eca9d497bd4eb5f34124ba32f5c9f44d0232063af3f3803e37b205eda9bd21266064de6db287b49fabe6 SHA512 bfd65179345285f6f4581a7dce42e638b89e12717d4cb9218afa085759161e04b6c78307d04265a6c97cd484b67949781639da5236edb89137585c625130be4f DIST haproxy-1.8.24.tar.gz 2178823 BLAKE2B 4b040133b22f78fa8c4cdbe04183c6ae6a70fb20703907c63b6437d441ba260a41cb2d6067833700a230553648152dde0cbd3a443f05ec7935ff76939db996ae SHA512 1c53c7f579ee7eb95c3e614441745c644e5cb5b00efb1da4db9b202e2ae58ffb331ce0b94da9fe5dd4db591c5a0995030739dd3f925f66bd5b9dcce70d6b6de6 +DIST haproxy-1.8.25.tar.gz 2184002 BLAKE2B d6ea39af0109eee679d87dde258038bbb38ccf12796b2e6a7172067fce6bd0f10485e2a3d89ca5b3596529db4e34d511bbb194b019c7403703cb636573b0438d SHA512 655eb4056989a3fee321ea9278a2085b0a999e522293f1f6229ebb8d17f3d33cb78abb4fd55a06d0218082e632b2d42de105575d0acd0c1b49996d4b45aa78e8 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd -DIST haproxy-1.9.10.tar.gz 2386066 BLAKE2B 4dea3f42686cd41d9f6f6849c42f9cf604b26f33925747ec5311243117bcf51729d16e5c09c5eb2cfc9fea88cf49c976a0542dcd90ddee4016b467de699e8bdc SHA512 b204c91633949d20dd06c29c69d2c783134819493f132430aaedddd2aad74eac08da7de7ddc1c45b250446273c35b268ab37fcb3b98eaa6b97b6caf5530ed628 -DIST haproxy-1.9.13.tar.gz 2395999 BLAKE2B 1b54aa732e7972b151ea00d76c6dd152fd6e0537f2885a75adf7cee9237ea344b79d7e45cf384c7836bfd2484848fbd8dbe6df0b146a7b6cfce8854caecb049b SHA512 3b5f76da7ebfa9ed6aefa5c3b49c43c103591c1d52168d587f787724cc88d7f13b2cf4ee6a643fb3ecbcbac31ef8c507ad71bde68156d44efe61d4b758e7e0a8 DIST haproxy-1.9.14.tar.gz 2476753 BLAKE2B 3bf2b685b04b77fec6637b2c56e824681fe6fbd32de0b66a03fbdc9e71e52357b74eb315c17e72f345d255d9763b719c5d201f994a11c62e96f8f6e50208cb2e SHA512 ee0b0a994f25dff9538326c0e124e291a74a1381f9526352fe01317756ab59dfb523ee7968587f31883c59dabeb5b17effa699e65dbb67a4a18d094f32fab88a -DIST haproxy-2.0.10.tar.gz 2557865 BLAKE2B 0e98fd2461414b4b55fc2bf100c80f17cbc34da2cae6d5c09fdbf708b4606f564c51bf54f77b98a2f455b61f31ac793fdc92873beb269dcbd15ea45379f0aca1 SHA512 d3f0c0a7cce49d394dda7553ed79102cfef2c21ea6d640fbc325246806c93d862cb48c40f4717d9e1b50b2390698466282fe8c4d8b305259e3057f3711e69a39 -DIST haproxy-2.0.12.tar.gz 2634202 BLAKE2B 0f2ea426076cdda20b18f068e7a5f5e92045056115a057ac4785fb5ad528697e2ecfdc482c5291c28f803ee817b8cb569ed966fbcc2db886d70e3f897285ac3f SHA512 bc81a5f88278b56bddfec52dba5231a06567177fe806faeb5ffb1965d8c4731704e0b92949cc72de0b4738c8baad28c5211d46d1dc980c4145c90081fc2d838c +DIST haproxy-1.9.15.tar.gz 2480346 BLAKE2B 9ebdef0cb038324b1cbe74198e73fd7f3adf5d1c6ec4000fb02e2640fe79e4b64257bfb5d6da5f1ee73486969a47e13f386313d1923893d290ef368775a08d79 SHA512 618799c9c9c5ce2c9e42aaf22abe6018d1071a72ce54273c330538007d44568a29f643d53e4861d26dbc4fc5acd1b927361948dfc1c846574d6183b6ae81429c DIST haproxy-2.0.13.tar.gz 2643134 BLAKE2B a14ff8488b6d187feea2b0ed81253392b4f26d546b602597bf7dc2802a2b4b2119d5769668cc0eeda1bf448d2f544ce3e456ef78af43719ab6a4c0e0829ab291 SHA512 b0a218e1cebd2c356e81605157d6cee9f448bad59172d31d9b67eb2bab4c72dbc32f48690d84c92faac8c47d8c22002b3a93af49b61a3e7bb97fcf3fa8fe081a -DIST haproxy-2.1.2.tar.gz 2663193 BLAKE2B ebe48e25fb636b71fc5d621d57822dfc6c6a530ae7e79aeec29a72631643158d99d69ff94cb056e834c8905cdb94dbc7375a9e465e93e9024c0f728e07caa249 SHA512 929d244a67f93337e3c791b1a29f9643ac288acdf0090dc7a05c72caf61c3b04ef376b84737351f0c54d58bca66ed8af18faa20ec3adc97067313732e0dfcd7d +DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993 DIST haproxy-2.1.3.tar.gz 2675529 BLAKE2B be663fd629c001c1c91d6e3db5a8d940ed5ee674d5b886283284d2077ed8e0d13d295aeb376f6580131bdeb105c9d88f7afe367f2279d6c548d5888bd943e2b6 SHA512 4728c1177b2bba69465cbc56b1ed73a1b2d36891ba2d94d29bb49714ad98ccfac4b52947735aded211f0cd8070002f5406ddd77cabd2f8230b00438189dd7a60 +DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98 EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65 -EBUILD haproxy-1.8.23.ebuild 4886 BLAKE2B 94d1654d71261f4d4e3d4984cf2afae1721c3f5d85f5caec1f7ba7be2a2f3c0889a2de02fd542b18f8a2fe0222debfd35f47c3fdcde0cbb8122dc493fec021a5 SHA512 a006987c4cf8f56bca0347537cf86e9282d5f0b5cb1864665104d1e93da53084711bac338dce99b1f6cdccfa1fec7534dc58cb7139c126fcc3b6131d371b7dce EBUILD haproxy-1.8.24.ebuild 4886 BLAKE2B 1408220c0147fa84297d0f87a834f5a44e69b34a7b2c48b216de4971b16f8fa2e125120d9fce05c20882577685a792f1b82735fda94aaaed01ac11fe4e06772a SHA512 a7d1789de3f46c2561cffe26786ae8fece3313993c536f7072208793b8b4e8c0b0c70f8b1d103e29e2c15f38fef37edda7cd5ba6c7ab73b59c0b44663348c042 +EBUILD haproxy-1.8.25.ebuild 4886 BLAKE2B 1408220c0147fa84297d0f87a834f5a44e69b34a7b2c48b216de4971b16f8fa2e125120d9fce05c20882577685a792f1b82735fda94aaaed01ac11fe4e06772a SHA512 a7d1789de3f46c2561cffe26786ae8fece3313993c536f7072208793b8b4e8c0b0c70f8b1d103e29e2c15f38fef37edda7cd5ba6c7ab73b59c0b44663348c042 EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8 -EBUILD haproxy-1.9.10.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d -EBUILD haproxy-1.9.13.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d EBUILD haproxy-1.9.14.ebuild 5018 BLAKE2B fa166d23ef442cba45d4362ff480946dda97f3fca49cfc11bdafbc82c2c6ffd158d788af4b8218983a17a604623b0b97d08b670382f807b3143ee51e25a7711b SHA512 7eb2b7e1010ae2e962db93aff0740c875dfacea4b976c5378b5f81e4f5406a5ab6b33a86945301e4520c8d120597fed632d798849a874be485a27faf81005ac7 +EBUILD haproxy-1.9.15.ebuild 5018 BLAKE2B fa166d23ef442cba45d4362ff480946dda97f3fca49cfc11bdafbc82c2c6ffd158d788af4b8218983a17a604623b0b97d08b670382f807b3143ee51e25a7711b SHA512 7eb2b7e1010ae2e962db93aff0740c875dfacea4b976c5378b5f81e4f5406a5ab6b33a86945301e4520c8d120597fed632d798849a874be485a27faf81005ac7 EBUILD haproxy-1.9.9999.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d -EBUILD haproxy-2.0.10.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc -EBUILD haproxy-2.0.12.ebuild 5245 BLAKE2B 8a92ac753a2722fa580a24bfb5a51e735c2467b41ebbfb9b3e31bf5bbc55b23cf48ac338f2cf3a813bac8a24284b4fa8a4c2586f9ed8bbbe73a80966cb815d64 SHA512 0edeb36bcb0676a045523cf3aeaf69e81a6201442a6aa970f2e85174e4f4c1407a920c0c2794ae9c6a05ba22d833b88ae05a978e90c25702d2a3e5ce36762f67 -EBUILD haproxy-2.0.13.ebuild 5245 BLAKE2B 8a92ac753a2722fa580a24bfb5a51e735c2467b41ebbfb9b3e31bf5bbc55b23cf48ac338f2cf3a813bac8a24284b4fa8a4c2586f9ed8bbbe73a80966cb815d64 SHA512 0edeb36bcb0676a045523cf3aeaf69e81a6201442a6aa970f2e85174e4f4c1407a920c0c2794ae9c6a05ba22d833b88ae05a978e90c25702d2a3e5ce36762f67 +EBUILD haproxy-2.0.13.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235 +EBUILD haproxy-2.0.14.ebuild 5243 BLAKE2B 9e83fd592b402209b0599dafffc649a0c74ac147e35bbd61bb8177501557ca815450654de254afb08f9e323c9cabdeaf6b36e6ec62f0737b42cb1080005ac2da SHA512 a55f799d887b132e9f69881385ee38ecb35ca762d40b457d0b2cf33eab4a9011e84303fae5bd5e3572926e2a7efb10fc2939adebe97a3806b09d3a6cfa2b1caa EBUILD haproxy-2.0.9999.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc -EBUILD haproxy-2.1.2.ebuild 5245 BLAKE2B 8a92ac753a2722fa580a24bfb5a51e735c2467b41ebbfb9b3e31bf5bbc55b23cf48ac338f2cf3a813bac8a24284b4fa8a4c2586f9ed8bbbe73a80966cb815d64 SHA512 0edeb36bcb0676a045523cf3aeaf69e81a6201442a6aa970f2e85174e4f4c1407a920c0c2794ae9c6a05ba22d833b88ae05a978e90c25702d2a3e5ce36762f67 -EBUILD haproxy-2.1.3.ebuild 5245 BLAKE2B 8a92ac753a2722fa580a24bfb5a51e735c2467b41ebbfb9b3e31bf5bbc55b23cf48ac338f2cf3a813bac8a24284b4fa8a4c2586f9ed8bbbe73a80966cb815d64 SHA512 0edeb36bcb0676a045523cf3aeaf69e81a6201442a6aa970f2e85174e4f4c1407a920c0c2794ae9c6a05ba22d833b88ae05a978e90c25702d2a3e5ce36762f67 +EBUILD haproxy-2.1.3.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235 +EBUILD haproxy-2.1.4.ebuild 5243 BLAKE2B 9e83fd592b402209b0599dafffc649a0c74ac147e35bbd61bb8177501557ca815450654de254afb08f9e323c9cabdeaf6b36e6ec62f0737b42cb1080005ac2da SHA512 a55f799d887b132e9f69881385ee38ecb35ca762d40b457d0b2cf33eab4a9011e84303fae5bd5e3572926e2a7efb10fc2939adebe97a3806b09d3a6cfa2b1caa EBUILD haproxy-2.1.9999.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d diff --git a/net-proxy/haproxy/haproxy-1.8.23.ebuild b/net-proxy/haproxy/haproxy-1.8.25.ebuild index be9a23a9cd27..840825cd8eaf 100644 --- a/net-proxy/haproxy/haproxy-1.8.23.ebuild +++ b/net-proxy/haproxy/haproxy-1.8.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" diff --git a/net-proxy/haproxy/haproxy-1.9.13.ebuild b/net-proxy/haproxy/haproxy-1.9.13.ebuild deleted file mode 100644 index 0eacacdc48d8..000000000000 --- a/net-proxy/haproxy/haproxy-1.9.13.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" -else - EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl -systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" -REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) - device-atlas? ( pcre ) - ?? ( slz zlib )" - -DEPEND=" - pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( - dev-libs/libpcre - pcre2-jit? ( dev-libs/libpcre2[jit] ) - ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[zlib?] ) - libressl? ( dev-libs/libressl:0= ) - ) - slz? ( dev-libs/libslz:= ) - zlib? ( sys-libs/zlib ) - lua? ( dev-lang/lua:5.3 ) - device-atlas? ( dev-libs/device-atlas-api-c )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - enewgroup haproxy - enewuser haproxy -1 -1 -1 haproxy - - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux2628 - USE_GETADDRINFO=1 - USE_TFO=1 - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use device-atlas DEVICEATLAS) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" $PN - newinitd "${FILESDIR}/${PN}.initd-r6" $PN - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc examples/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins examples/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-1.9.10.ebuild b/net-proxy/haproxy/haproxy-1.9.15.ebuild index 0eacacdc48d8..9c532b354464 100644 --- a/net-proxy/haproxy/haproxy-1.9.10.ebuild +++ b/net-proxy/haproxy/haproxy-1.9.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" diff --git a/net-proxy/haproxy/haproxy-2.0.10.ebuild b/net-proxy/haproxy/haproxy-2.0.10.ebuild deleted file mode 100644 index 06e10c936692..000000000000 --- a/net-proxy/haproxy/haproxy-2.0.10.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -[[ ${PV} == *9999 ]] && SCM="git-r3" -inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM - -MY_P="${PN}-${PV/_beta/-dev}" - -DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" -HOMEPAGE="http://www.haproxy.org" -if [[ ${PV} != *9999 ]]; then - SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" -else - EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" - EGIT_BRANCH=master -fi - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter -ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl" -REQUIRED_USE="pcre-jit? ( pcre ) - pcre2-jit? ( pcre2 ) - pcre? ( !pcre2 ) - device-atlas? ( pcre ) - ?? ( slz zlib )" - -DEPEND=" - pcre? ( - dev-libs/libpcre - pcre-jit? ( dev-libs/libpcre[jit] ) - ) - pcre2? ( - dev-libs/libpcre - pcre2-jit? ( dev-libs/libpcre2[jit] ) - ) - ssl? ( - !libressl? ( dev-libs/openssl:0=[zlib?] ) - libressl? ( dev-libs/libressl:0= ) - ) - slz? ( dev-libs/libslz:= ) - zlib? ( sys-libs/zlib ) - lua? ( dev-lang/lua:5.3 ) - device-atlas? ( dev-libs/device-atlas-api-c )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README ) -CONTRIBS=( halog iprange ) -# ip6range is present in 1.6, but broken. -ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop ) -# TODO: mod_defender - requires apache / APR, modsecurity - the same -ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack ) - -haproxy_use() { - (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>" - - usex "${1}" "USE_${2}=1" "USE_${2}=" -} - -pkg_setup() { - enewgroup haproxy - enewuser haproxy -1 -1 -1 haproxy - - if use net_ns; then - CONFIG_CHECK="~NET_NS" - linux-info_pkg_setup - fi -} - -src_compile() { - local -a args=( - V=1 - TARGET=linux-glibc - ) - - # TODO: PCRE2_WIDTH? - args+=( $(haproxy_use threads THREAD) ) - args+=( $(haproxy_use crypt LIBCRYPT) ) - args+=( $(haproxy_use net_ns NS) ) - args+=( $(haproxy_use pcre PCRE) ) - args+=( $(haproxy_use pcre-jit PCRE_JIT) ) - args+=( $(haproxy_use pcre2 PCRE2) ) - args+=( $(haproxy_use pcre2-jit PCRE2_JIT) ) - args+=( $(haproxy_use ssl OPENSSL) ) - args+=( $(haproxy_use slz SLZ) ) - args+=( $(haproxy_use zlib ZLIB) ) - args+=( $(haproxy_use lua LUA) ) - args+=( $(haproxy_use 51degrees 51DEGREES) ) - args+=( $(haproxy_use device-atlas DEVICEATLAS) ) - args+=( $(haproxy_use wurfl WURFL) ) - args+=( $(haproxy_use systemd SYSTEMD) ) - - # For now, until the strict-aliasing breakage will be fixed - append-cflags -fno-strict-aliasing - - if use prometheus-exporter; then - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - fi - - # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing - emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]} - emake -C contrib/systemd SBINDIR=/usr/sbin - - if use tools ; then - for contrib in ${CONTRIBS[@]} ; do - # Those two includes are a workaround for hpack Makefile missing those - emake -C contrib/${contrib} \ - CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]} - done - fi -} - -src_install() { - dosbin haproxy - dosym ../sbin/haproxy /usr/bin/haproxy - - newconfd "${FILESDIR}/${PN}.confd" $PN - newinitd "${FILESDIR}/${PN}.initd-r6" $PN - - doman doc/haproxy.1 - - systemd_dounit contrib/systemd/haproxy.service - - einstalldocs - - # The errorfiles are used by upstream defaults. - insinto /etc/haproxy/errors/ - doins examples/errorfiles/* - - if use doc; then - dodoc ROADMAP doc/*.txt - #if use lua; then - # TODO: doc/lua-api/ - #fi - fi - - if use tools ; then - has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog - has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange - has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range - has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example - has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example - has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop - has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack - fi - - if use examples ; then - docinto examples - dodoc examples/*.cfg - dodoc doc/seamless_reload.txt - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax - doins contrib/syntax-highlight/haproxy.vim - fi -} - -pkg_postinst() { - if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then - ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service." - ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created." - ewarn "Make use of them with the \"user\" and \"group\" directives." - - if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then - einfo "Please consult the installed documentation for learning the configuration file's syntax." - einfo "The documentation and sample configuration files are installed here:" - einfo " ${EROOT}/usr/share/doc/${PF}" - fi - fi -} diff --git a/net-proxy/haproxy/haproxy-2.0.13.ebuild b/net-proxy/haproxy/haproxy-2.0.13.ebuild index 9d63986726c7..4dd1e0979a36 100644 --- a/net-proxy/haproxy/haproxy-2.0.13.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.13.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" + KEYWORDS="amd64 arm ~ppc x86" else EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master diff --git a/net-proxy/haproxy/haproxy-2.0.12.ebuild b/net-proxy/haproxy/haproxy-2.0.14.ebuild index 9d63986726c7..8b0340f13d9c 100644 --- a/net-proxy/haproxy/haproxy-2.0.12.ebuild +++ b/net-proxy/haproxy/haproxy-2.0.14.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" + KEYWORDS="amd64 arm ~ppc ~x86" else EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master diff --git a/net-proxy/haproxy/haproxy-2.1.3.ebuild b/net-proxy/haproxy/haproxy-2.1.3.ebuild index 9d63986726c7..4dd1e0979a36 100644 --- a/net-proxy/haproxy/haproxy-2.1.3.ebuild +++ b/net-proxy/haproxy/haproxy-2.1.3.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" + KEYWORDS="amd64 arm ~ppc x86" else EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master diff --git a/net-proxy/haproxy/haproxy-2.1.2.ebuild b/net-proxy/haproxy/haproxy-2.1.4.ebuild index 9d63986726c7..8b0340f13d9c 100644 --- a/net-proxy/haproxy/haproxy-2.1.2.ebuild +++ b/net-proxy/haproxy/haproxy-2.1.4.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments" HOMEPAGE="http://www.haproxy.org" if [[ ${PV} != *9999 ]]; then SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" + KEYWORDS="amd64 arm ~ppc ~x86" else EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/" EGIT_BRANCH=master diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest deleted file mode 100644 index 4dc74aabb5cd..000000000000 --- a/net-proxy/http-replicator/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX http-replicator-3.0-callrepcacheman-0.1 86 BLAKE2B 70095254d21cdbf403cc81998c879b80fa6df52c8a4e8be677dfa1960d0faa044eadfc44948c699d5dcec1a481275a8c5527f600e322a8b06dcd63531654a2a2 SHA512 144490fd854e22fce95e6a6891a3e65e8af001b5e421bec39b20ee4cf39709424a922f7852bf48ecf43b5b9755213e7149a2a3784bbc3a3e5542072d8d3bda3d -AUX http-replicator-3.0-repcacheman-0.44-r2 5337 BLAKE2B 3b6c8b16b34cb3ef9b98408cb0272aa2fec51b87d011dc9de7014e6d7fc5e995343a7447ca79a8b951544a642e38d685ec0ac7f0137a1975780686a6e4a62791 SHA512 c917d47327a55699deb346e53aef1ba9a5eda81f6947ac4efe8422422a2cba668a3ed12c0f89bf840e4ad94dd6272b3d6eb705d1e78e58ddef90b21307ff8d15 -AUX http-replicator-4.0_alpha2-ipv6.patch 2266 BLAKE2B c5f7f87346adc5c237eb34a7cb1497eac2de58388c296eaf00d80a02f0d0bd34619e0044fb4674065e43489461d506c76dc52b04b80c1be2ea92a52b21eed4eb SHA512 70793ee864630156cd25453c2bae4c1bde40b7378d938f45e39b94e8ac8fa1e7a779d6535fbe3a5a5f1b44a4297c6910ac51ce4cb80321f96d26a08559b1f22e -AUX http-replicator-4.0_alpha2-r2.conf 1440 BLAKE2B 1ab4c03ff638ec90c6c29884713522c4b7f2092618752309e66ae93d4e7955e09bb9f9941e87d6b14223f7b27edb0cb8c29510ce259437719099d3ad11cb1e29 SHA512 e6237c8b7eeb319615d45abdef4feaca6bbeb741bc75e80173e42328e4eb5f4192edfbf42c7e6e307c14d258e7ec67a0ae6451ff7daef631b2d1e39fe17a48fb -AUX http-replicator-4.0_alpha2-r3-pid.patch 2681 BLAKE2B 4ae5e263c5476f402dde1bcb2f1b668e648611c46a785bbdeb58dfc75abab4ddabf95783848eb20c3d447448b1c9c5aa210601669de2a4926aba9ff08ee04103 SHA512 9ceb6ede3ec31fd7f702ac77a51897301fd7b16baee869a82180f388949ff7388f0917d667786b45643603c0e9d655cd8686948d5e34896c1fe5932fd76e42b5 -AUX http-replicator-4.0_alpha2-r3.init 644 BLAKE2B cf017fcd078532960e16e4c9735ab4df62d65794ac961798ffd39760fb860199d87322e0792ec759f48d2e9ddaa3134bbc52d9ed39c6d4f564b981d6873cdb72 SHA512 b1a8bd956d35cc536b835aac6cb82202f0b6b775d7eae81ac30f501d1c72877d093711e0f00a28eb7645a383e211d3196379b37da1e0421773c1b91ed6d3837b -AUX http-replicator.service 258 BLAKE2B 15b50f430e58794115060e37350c5e6cc18225a0fbe27b07fc71a12979e3420cf5029554ee031bed8762af883a165d2b27f3f1c661124410569231fe16437102 SHA512 0da767205c21c226563eb2210a12d92d7933431245fad9bf8766eda59b1f4a16905cadcfb796b3aef86978eb06b153eb976b12f4f7e19d468654c1722e266352 -AUX http-replicator.service.conf 164 BLAKE2B 28006ec4c4b27eb1f75276432e30c0f9b33cb432ea0123794db0b25c5f36d4fd9f771c23d6852b8e061a9d30ab0ed2b86b42b0cdf3d8b2f29be0ac6cf4276c35 SHA512 0a1854ddb9f5b8631bdf6a837f1c91b895652803b3e1b6b98fba8f67dba0488a61f8864ddd4128d8072353a38349d9848e91a5109b317c37e1ca2598d0ac2333 -DIST http-replicator_4.0alpha2.tgz 27575 BLAKE2B 48138bc8fa9695ddb31ce89c4638adda4a1d1b58c904cd98d0ee1dbab006f79ef7d19495db8eb4de0113f8e45da425950524c48ec9e3e864d8595ccdef9f7cfa SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c -EBUILD http-replicator-4.0_alpha2-r7.ebuild 2043 BLAKE2B cbd3074454afce3164e8ee2fc81a8af29c9b991ea8c3098a2f2fa482165e3dac4bcc9745e07fd6c55361c8c0294d00d0f0f1f1d91516b4cdad29a0db0c6fa705 SHA512 16231c53131e94f63fe401acfb155354e83313895dc0596ab5d945f8f6fac6fbbb57bd257db0763e9a285afb5cc5ca8149e4c10f6a570f9e3688862b2f95f385 -MISC metadata.xml 252 BLAKE2B 5386635b038f2498cadf1730fa7ae823427900b961296f4acca678ea12eb7c66ed7ad6cbca15afd26042c7af8d687958c702a9c48fc00856b460e2b49e55b2ac SHA512 ffd7c4cd77545f753618c9e9cfeba05b557044879ce332c01deaad820e184329cf383c8488ba777e9653029d3f75e5c99936ca225ebc4a5fb9b4d4e257ba8e7d diff --git a/net-proxy/http-replicator/files/http-replicator-3.0-callrepcacheman-0.1 b/net-proxy/http-replicator/files/http-replicator-3.0-callrepcacheman-0.1 deleted file mode 100644 index 14cd0a70a53b..000000000000 --- a/net-proxy/http-replicator/files/http-replicator-3.0-callrepcacheman-0.1 +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash -source /etc/conf.d/http-replicator -/usr/bin/repcacheman.py $GENERAL_OPTS diff --git a/net-proxy/http-replicator/files/http-replicator-3.0-repcacheman-0.44-r2 b/net-proxy/http-replicator/files/http-replicator-3.0-repcacheman-0.44-r2 deleted file mode 100644 index 35d0a9e39fa2..000000000000 --- a/net-proxy/http-replicator/files/http-replicator-3.0-repcacheman-0.44-r2 +++ /dev/null @@ -1,201 +0,0 @@ -#! /usr/bin/python -# -# repcacheman ver 0.44 -# -# Cache Manager for Http-Replicator -# deletes duplicate files in PORTDIR. -# imports authenticated (checksum + listed in portage) -# files from PORTDIR to replicator's cache directory. -# -# Uses portage to perform checksum and database functions. -# All else, Copyright(C)2004-2007 Tom Poplawski (poplawtm@earthlink.net) -# Distributed under the terms of the GNU General Public License v2 -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -import portage.manifest -import portage.checksum -import portage.exception -import portage -import string -import os -import pwd,sys,optparse - -if os.getuid(): - print"Must be root" - sys.exit(1) - -# Parse Options - -parser = optparse.OptionParser() -parser.add_option('-d', '--dir', type='string', default="/var/cache/http-replicator", help='http-replicators cache DIR') -parser.add_option('-u','--user', type='string', default="portage", help='http-replicator USER') -options, args = parser.parse_args() # parse command line - -if options.user: - try: - uid=pwd.getpwnam(options.user)[2] - gid=pwd.getpwnam(options.user)[3] - except: - print "User \'" + options.user + "\' Doesn't exist on system - edit config or add user to system." - sys.exit(1) -else: - print "Error\n\tunable to get USER from /etc/http-replicator.conf" - sys.exit(1) - -# dir is replicator's cache directory -dir=options.dir+"/" - -if os.path.isdir(dir) : - newdir=0 -else : - print"\n\nBegin Http-Replicator Setup...." - try: - os.makedirs(dir) - print "\tcreated " + dir - newdir=1 - except: - print "\tcreate " + dir + " failed" - print '\terror:', sys.exc_info()[1] - sys.exit(1) - try: - os.chown(dir,uid,gid) - print "\tchanged owner of " + dir + " to " + options.user - except: - print "\tchange owner " + dir + " to " + options.user + " failed:" - print '\terror:', sys.exc_info()[1] - -print "\n\nReplicator's cache directory: " + dir - -# Import Portage settings - -distdir=portage.settings["DISTDIR"]+"/" -if distdir: - print "Portage's DISTDIR: " + distdir -else: - print"Unable to get Portage's DISTDIR" - sys.exit(1) - -# Start Work - -print "\nComparing directories...." - -# Create filecmp object -import filecmp -dc=filecmp.dircmp (distdir,dir,['cvs-src','git-src','hg-src','egit-src','.locks']) -print "Done!" - -dupes=dc.common -deleted=0 - -if dupes: - print "\nDeleting duplicate file(s) in " + distdir - - for s in dupes: - print s - try: - os.remove(distdir + s ) - deleted +=1 - except: - print "\tdelete " + distdir + s + " failed:" - print '\terror:', sys.exc_info()[1] - - print "Done!" - - -newfiles=dc.left_only -nf=len(dc.left_only) - -if nf: - print "\nNew files in DISTDIR:" - for s in newfiles: - print s - print"\nChecking authenticity and integrity of new files..." - added=0 - errors=0 - badsum=0 - -# search all packages - - for mycp in portage.db["/"]["porttree"].dbapi.cp_all(): - manifest = portage.manifest.Manifest("/usr/portage/" + mycp , distdir) - if manifest == None: - portage.writemsg("Missing manifest: %s\n" % mycpv) - - remove=[] - for file in newfiles: - if manifest.hasFile("DIST",file): - try: - myok, myreason = manifest.checkFileHashes("DIST",file) - - try: - os.rename(distdir+file,dir+file) - added += 1 - except: - try: - import shutil - shutil.copyfile(distdir+file,dir+file) - added += 1 - os.remove(distdir+file) - except: - print "\tmove/copy " + file + " failed:" - print '\terror:', sys.exc_info()[1] - errors+=1 - - try: - os.chown(dir+file,uid,gid) - except: - print "\tchown " + file + " failed:" - print '\terror:', sys.exc_info()[1] - errors +=1 - - remove.append( file ) - - except portage.exception.DigestException, e: - print("\n!!! Digest verification failed:") - print("!!! %s" % e.value[0]) - print("!!! Reason: %s" % e.value[1]) - print("!!! Got: %s" % e.value[2]) - print("!!! Expected: %s" % e.value[3]) - badsum+=1 - if remove: - for rf in remove: - newfiles.remove ( rf ) - - -print "\nSUMMARY:" -print "Found " + str(len(dupes)) + " duplicate file(s)" -if deleted: - print "\tDeleted " + str(deleted) + " dupe(s)" - -if nf: - print "Found " + str(nf) + " new file(s)" - print "\tAdded " + str(added) + " of those file(s) to the cache" - - print "Rejected " +str(len(newfiles)) + " File(s) - ", - print str(badsum) + " failed checksum(s)" - for s in newfiles: - print "\t%s" %s - if errors: - print "Encountered " +str(errors) + " errors" -# if badsum: -# print str(badsum) + " partial/corrupted file(s)" - -if newdir: - print"\n\nexecute:\n/etc/init.d/http-replicator start" - print"to run http-replicator.\n\nexecute:\nrc-update add http-replicator default" - print"to make http-replicator start at boot" - print"\n\nexecute:\n/usr/bin/repcacheman\nafter emerge's on the server to delete" - print"dup files and add new files to the cache" - -print "\n\nHTTP-Replicator requires you delete any partial downloads in " + distdir -print "run rm -f " + distdir +'*' - diff --git a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-ipv6.patch b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-ipv6.patch deleted file mode 100644 index 906844fd9586..000000000000 --- a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-ipv6.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -ur a/fiber.py b/fiber.py ---- a/fiber.py 2018-10-27 12:52:10.536264605 -0400 -+++ b/fiber.py 2018-10-27 12:57:26.688730570 -0400 -@@ -180,10 +180,10 @@ - os.dup2( nul.fileno(), sys.stdin.fileno() ) - - --def spawn( generator, port, debug, log, pidfile ): -+def spawn( generator, port, debug, log, pidfile, listenfamily ): - - try: -- listener = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) -+ listener = socket.socket( listenfamily, socket.SOCK_STREAM ) - listener.setblocking( 0 ) - listener.setsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR, listener.getsockopt( socket.SOL_SOCKET, socket.SO_REUSEADDR ) | 1 ) - listener.bind( ( '', port ) ) -diff -ur a/http-replicator b/http-replicator ---- a/http-replicator 2018-10-27 12:52:10.542931816 -0400 -+++ b/http-replicator 2018-10-27 12:59:36.345978943 -0400 -@@ -9,7 +9,7 @@ - - def Replicator( client, address ): - -- print 'Accepted request from %s:%i' % address -+ print 'Accepted request from [%s]:%i' % address[0:2] - - request = Request.HttpRequest() - while not request.Protocol: -@@ -60,4 +60,4 @@ - print 'Transaction successfully completed' - - --fiber.spawn( Replicator, Params.PORT, Params.DEBUG, Params.LOG, Params.PIDFILE ) -+fiber.spawn( Replicator, Params.PORT, Params.DEBUG, Params.LOG, Params.PIDFILE, Params.LISTENFAMILY ) -diff -ur a/Params.py b/Params.py ---- a/Params.py 2018-10-27 12:52:10.549599026 -0400 -+++ b/Params.py 2018-10-27 12:55:31.772685822 -0400 -@@ -9,6 +9,7 @@ - TIMEOUT = 15 - PIDFILE = False - FAMILY = socket.AF_INET -+LISTENFAMILY = socket.AF_INET - FLAT = False - STATIC = False - ONLINE = True -@@ -63,6 +64,7 @@ - sys.exit( 'Error: %s requires a positive numerical argument' % _arg ) - elif _arg in ( '-6', '--ipv6' ): - FAMILY = socket.AF_UNSPEC -+ LISTENFAMILY = socket.AF_INET6 - elif _arg == '--flat': - FLAT = True - elif _arg == '--static': -diff --git a/Protocol.py b/Protocol.py ---- a/Protocol.py -+++ b/Protocol.py -@@ -13,7 +13,7 @@ def connect( addr ): - - family, socktype, proto, canonname, sockaddr = DNSCache[ addr ][ 0 ] - -- print 'Connecting to %s:%i' % sockaddr -+ print 'Connecting to [%s]:%i' % sockaddr[0:2] - sock = socket.socket( family, socktype, proto ) - sock.setblocking( 0 ) - sock.connect_ex( sockaddr ) --- -2.18.1 - diff --git a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.conf b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.conf deleted file mode 100644 index cea7c9632a34..000000000000 --- a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.conf +++ /dev/null @@ -1,46 +0,0 @@ -## Configuration file for HTTP Replicator automatically sourced by init script. - -################# -## REPCACHEMAN ## -################# - -## Set the cache dir. -GENERAL_OPTS="--dir /var/cache/http-replicator/" - -## Change UID/GID to user after opening the log and pid file. -## 'user' must have read/write access to cache dir. -GENERAL_OPTS="$GENERAL_OPTS --user portage" - -##################### -## HTTP-REPLICATOR ## -##################### - -## Specify which file to log too, use /dev/null to disable. -LOG_FILE="/var/log/http-replicator.log" - -# Set cache root directory. -DAEMON_OPTS="--root /var/cache/http-replicator/" - -## Try IPv6 addresses if available. -# DAEMON_OPTS="$DAEMON_OPTS --ipv6" - -## The proxy port on which the server listens for http requests, default 8080. -# DAEMON_OPTS="$DAEMON_OPTS --port 8080" - -## Break connection after so many seconds of inactivity, default 15. -# DAEMON_OPTS="$DAEMON_OPTS --timeout 15" - -## Limit download rate at a fixed K/s. -# DAEMON_OPTS="$DAEMON_OPTS --limit RATE" - -## Do you need the proxy to work offline, never connecting to a server? -# DAEMON_OPTS="$DAEMON_OPTS --offline" - -## Show http headers and other info in log messages. -# DAEMON_OPTS="$DAEMON_OPTS --verbose" - -## Switch from gather to debug output module. -# DAEMON_OPTS="$DAEMON_OPTS --debug" - -## More options (eg --flat and --static) are listed in `http-replicator --help`, -## the --daemon parameter is automatically passed by the init script.
\ No newline at end of file diff --git a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r3-pid.patch b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r3-pid.patch deleted file mode 100644 index a1cf5eddbfcb..000000000000 --- a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r3-pid.patch +++ /dev/null @@ -1,101 +0,0 @@ -Bring back the --pid functionality of 3.x, needed for our init script. - -Patch contributed by Nikita Kozlov (klnikita / klnikita_ on IRC). - -Slight adjustments made to use --pid instead of --pidfile and reordered --help. - -URL: https://dpaste.org/Menvq/ -BUG: https://bugs.gentoo.org/show_bug.cgi?id=472422 - ---- a/fiber.py -+++ b/fiber.py -@@ -136,11 +136,13 @@ - self.__stdout.flush() - self.__newline = string.endswith( '\n' ) - - --def fork( output ): -+def fork( output, pidfile ): - - try: -+ if pidfile: -+ pidout = open(pidfile, 'w') # open pid file for writing - log = open( output, 'w' ) - nul = open( '/dev/null', 'r' ) - pid = os.fork() - except IOError, e: -@@ -166,17 +168,20 @@ - print 'error:', e - sys.exit( 1 ) - - if pid: -+ if pidfile: -+ pidout.write(str(pid)) -+ pidout.close() - print pid - sys.exit( 0 ) - - os.dup2( log.fileno(), sys.stdout.fileno() ) - os.dup2( log.fileno(), sys.stderr.fileno() ) - os.dup2( nul.fileno(), sys.stdin.fileno() ) - - --def spawn( generator, port, debug, log ): -+def spawn( generator, port, debug, log, pidfile ): - - try: - listener = socket.socket( socket.AF_INET, socket.SOCK_STREAM ) - listener.setblocking( 0 ) -@@ -187,9 +192,9 @@ - print 'error: failed to create socket:', e - sys.exit( 1 ) - - if log: -- fork( log ) -+ fork( log, pidfile ) - - if debug: - myFiber = DebugFiber - else: ---- a/http-replicator -+++ b/http-replicator -@@ -59,5 +59,5 @@ - - print 'Transaction successfully completed' - - --fiber.spawn( Replicator, Params.PORT, Params.DEBUG, Params.LOG ) -+fiber.spawn( Replicator, Params.PORT, Params.DEBUG, Params.LOG, Params.PIDFILE ) ---- a/Params.py -+++ b/Params.py -@@ -6,8 +6,9 @@ - PORT = 8080 - ROOT = os.getcwd() + os.sep - VERBOSE = 0 - TIMEOUT = 15 -+PIDFILE = False - FAMILY = socket.AF_INET - FLAT = False - STATIC = False - ONLINE = True -@@ -21,8 +22,9 @@ - - options: -+ --pid FILE write process ID to FILE - -h --help show this help message and exit - -p --port PORT listen on this port for incoming connections, default %(PORT)i - -r --root DIR set cache root directory, default current: %(ROOT)s - -v --verbose show http headers and other info - -t --timeout SEC break connection after so many seconds of inactivity, default %(TIMEOUT)i - -6 --ipv6 try ipv6 addresses if available -@@ -74,8 +76,10 @@ - except: - sys.exit( 'Error: %s requires a numerical argument' % _arg ) - elif _arg == '--daemon': - LOG = _args.next() -+ elif _arg == '--pid': -+ PIDFILE = _args.next() - elif _arg == '--debug': - DEBUG = True - else: - sys.exit( 'Error: invalid option %r' % _arg )
\ No newline at end of file diff --git a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r3.init b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r3.init deleted file mode 100644 index 3dc4297855c2..000000000000 --- a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r3.init +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting HTTP Replicator" - start-stop-daemon --start --pidfile /var/run/http-replicator.pid \ - --name http-replicator --exec /usr/bin/http-replicator -- --static \ - --flat --daemon $LOG_FILE $DAEMON_OPTS --pid /var/run/http-replicator.pid - eend $? "Failed to start HTTP Replicator" -} - -stop() { - ebegin "Stopping HTTP Replicator" - start-stop-daemon --stop --pidfile /var/run/http-replicator.pid --name http-replicator --signal 2 - eend $? "Failed to stop HTTP Replicator" -} diff --git a/net-proxy/http-replicator/files/http-replicator.service b/net-proxy/http-replicator/files/http-replicator.service deleted file mode 100644 index 6a2a7e5f5dff..000000000000 --- a/net-proxy/http-replicator/files/http-replicator.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=http-replicator daemon -After=network.target - -[Service] -ExecStart=/usr/bin/http-replicator -s -f \ - --dir /var/cache/http-replicator --user portage --log /var/log/http-replicator.log \ - $DAEMON_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/net-proxy/http-replicator/files/http-replicator.service.conf b/net-proxy/http-replicator/files/http-replicator.service.conf deleted file mode 100644 index da7445d080c4..000000000000 --- a/net-proxy/http-replicator/files/http-replicator.service.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Set various parameters for http-replicator -[Service] -Environment="DAEMON_OPTS= --alias /usr/portage/packages:packages --ip 192.168.*.* --ip 10.*.*.* --port 8080" diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild deleted file mode 100644 index c43d5f026639..000000000000 --- a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r7.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit python-r1 readme.gentoo-r1 systemd - -MY_P="${PN}_${PV/_/}" - -DESCRIPTION="Proxy cache for Gentoo packages" -HOMEPAGE="https://sourceforge.net/projects/http-replicator" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ~sparc x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - sys-apps/portage[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -# Tests downloads files as well as breaks, should be turned into local tests. -RESTRICT="test" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Before starting ${PN}, please follow the next few steps: - -- Modify /etc/conf.d/${PN} if required. -- Run \`repcacheman\` to set up the cache. -- Add HTTP_PROXY=\"http://serveraddress:8080\" to make.conf on -the server as well as on the client machines. -- Make sure GENTOO_MIRRORS in /etc/portage/make.conf -starts with several good HTTP mirrors. - -For more information please refer to the following forum thread: -https://forums.gentoo.org/viewtopic-t-173226.html - -Starting with 4.x releases, the conf.d parameters have changed. -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.0_alpha2-r3-pid.patch - "${FILESDIR}"/${PN}-4.0_alpha2-ipv6.patch #669078 -) - -src_test() { - ./unit-test && die -} - -src_install() { - python_foreach_impl python_doscript http-replicator - - newbin "${FILESDIR}"/${PN}-3.0-callrepcacheman-0.1 repcacheman - - python_foreach_impl python_domodule *.py - - python_foreach_impl python_newscript "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py - - newinitd "${FILESDIR}"/${PN}-4.0_alpha2-r3.init http-replicator - newconfd "${FILESDIR}"/${PN}-4.0_alpha2-r2.conf http-replicator - - systemd_dounit "${FILESDIR}"/http-replicator.service - systemd_install_serviced "${FILESDIR}"/http-replicator.service.conf - - dodoc README.user README.devel RELNOTES - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-proxy/http-replicator/metadata.xml b/net-proxy/http-replicator/metadata.xml deleted file mode 100644 index 2700375c94e8..000000000000 --- a/net-proxy/http-replicator/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">http-replicator</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-proxy/obfs4proxy/Manifest b/net-proxy/obfs4proxy/Manifest index 19a017e27614..872b56624d97 100644 --- a/net-proxy/obfs4proxy/Manifest +++ b/net-proxy/obfs4proxy/Manifest @@ -1,9 +1,29 @@ -DIST git.schwanenlied.me-yawning-bsaes-26d1add596b6d800bdeeb3bc3b2c7b316c056b6d.tar.gz 18848 BLAKE2B 35458f0f2f674564813ea8f65246c8463fe1a89bd0e171c7d7ecda16e79fac4a7976d7c28e8b791e11afd61052538be00bb4f5a8601366fd5f638f78f4b9c03d SHA512 0bb32ea0a0a246406428786287701418d2b620a14de06828cd9a88de06ef61973fd01a42f9aabf396e74db94157cccdcb15afbf73f00a3d97ed224f7a86c4d39 -DIST github.com-dsnet-compress-v0.0.1.tar.gz 9962544 BLAKE2B 58e5bd8eb7a50071da2764e90051f18fb3e4237b684a2584daf6ef7f74d4509525f09678feba3d6e8b0233cfd7a995ddd01374b138dbd2beaa2eab76218220dc SHA512 24b545fdfa6e5dcd942c9fc09614f755db341a16734f95dead2d344f06c74ca1c14e0b2674977066dee6094fd4d3bd7581ed9fe0285aeb1c62d2c68e0a3a095b -DIST github.com-golang-crypto-a5d413f7728c81fb97d96a2b722368945f651e78.tar.gz 1656797 BLAKE2B 6b7e3f776b396786125582332fcf90e6b2452a06856a8b13cb2d84a882c5c563af79b8c37232f15410ae90b309e93044dcb6e0a5948d4e25b9730cc541534d16 SHA512 57a9606845a27459703d3757e001303d2f67c88efa4d021d4aa09314ddcc85fe95c9db2ff4aa08639b6be49cc751d82c35134a587987a896f64bb103af89adee -DIST github.com-golang-net-74de082e2cca95839e88aa0aeee5aadf6ce7710f.tar.gz 976643 BLAKE2B 6a64e95b90379cc72f93391ebc46d064c22e980dffd788c438b87ed9bb7da4a6dbdbdb6865722bb274a03359ca745165adf73b24b50c3038dc7347abf873043c SHA512 afd0169a4de53a36ed87c4510e4bf02147bc10b2fb3de22b3608a05feb72b571e8a560ea1ce4b3953385b6627ba012e5da54dc8c264194e01ea9d83745c5e9da -DIST github.com-golang-sys-9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560.tar.gz 1262620 BLAKE2B ffa03ba8cb0fbdb9d2b68bf00920dd7695a0dcbfc190f26cff2045b0612103dee8fa1ede2b64ed384d59889b0af11088c6e7586d1314ec2265a028e63d0641a3 SHA512 eee9be21a6be3c84127e1bb0c90f6c872aec2b3dc88d1dffd9421b8ff18e1e517b3d1f39f06f47339a21aa78a9570884c64a37d31b1816ac67ba0dc0b3f15cce -DIST gitlab.com-yawning-utls---v0.0.11-1.tar.gz 560616 BLAKE2B 68fa15c07bccbf58ca7666453d53cb892777160ea2843095024d4811891803d0a1a4f876247ca2fe5ff08cac24e96d50ada838bde9afbaf34a7208f8b30b8f01 SHA512 debea4bfe2b2686d181fa0f6a583833728d154b4262c6a7fe9354d3d953739355aade92c927fa3a10d5b78efe37d9707ab4c59beaa765c64b6fe99dbc54f1722 +DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.mod 45 BLAKE2B 2eaf520004fc4a4a3283bba8b12bca561c042fa9ac35be8d152f232b71f8431b099f452edaa2ecdfc54e56d8de989eaa46f1d21428fbd1431d6e52fe353aaed4 SHA512 7f919bb78329c34c2e2c667fd4621885fe8ef3ed7b916de65ceaf4d6fa739fb540c2f453a16cf6f5add0f0540d06e0c7cf1eb92a2d3751bba2cc26ea285756a7 +DIST git.schwanenlied.me%2Fyawning%2Fbsaes.git%2F@v%2Fv0.0.0-20190320102049-26d1add596b6.zip 39367 BLAKE2B 451710920a0fb77caa7cc1a22284faced216d54eb0fe77d70e375ac063c91d7c5dde17a85bacecd06092f1dce7d28e19ddaa28408a95954e76c6c4d4fb4a2bf2 SHA512 6b0f5ab0b9d99f2bd1acf140a8d16ad247743a3989b1a69ef9377aefb860f6d73cae911aaf5c21a251aa668b45da946d6a82321bff9918efb8044794c69d5697 +DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.mod 59 BLAKE2B c741382a34677abe777f42d88210a2da3ba6dfaebc557e28d1a49a5f46822d94838469b7d7b72476b45b55b0c557ec132cbee805173c5607a6cfcd2b2e090c1c SHA512 15340017e0579bd8d102bda61ea62c5b894fcaca9f320efabacd7a2158fc2beb28b686302a3002b53765004e9a0be08deee8618f8ad662ddc2430d0b2d78d91e +DIST git.torproject.org%2Fpluggable-transports%2Fgoptlib.git%2F@v%2Fv1.0.0.zip 32116 BLAKE2B c9d113cc09a7da3e8c6cb56001633dd31b793f275596d1fb46608929b4475a7787b68239f7044096ee9301fe7be3e55db61d42d88e870227ef2a8c37e294077f SHA512 81a1ea071d7561a631c55844395f8d8d8773f4d8a5ea25e2c66ee2bb17bde8f79ff29d5d87f2bfd7ba42a31907c923f8f8616cd8fdaf21d99217ba1bb4c117e7 +DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930 +DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip 104690 BLAKE2B 7c52d737b8bf2f9a4b4ad4a7b2a843b715cd991dc18d61b0c2c68ec25ef8f8bc00ee0b5cdc95b91a1c64715d1990597dafe29c070a090227b2b7d1244a8b80a0 SHA512 8d15276c2a6e82ae72d903946fbcb2adc6446b964492d8c5653fee885e4c1b1d75f119a3fdcb0a35044929810d31420ac218b7ec077d1d07acaf2f586d869854 +DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.mod 33 BLAKE2B 8a7ad09e58eb232d947fee3583f03948dda02432dc94ae8916330347dbce328b9e1e445aa96b9ce00cb770583eda50344d160662eaee8f2d8290fe1c63511bdb SHA512 e9671d1c7e7aa422e139098e1977bdcd61f48b382d75a7234cdb3849eec4232b0cf7528ed37d534430317f7b2649b3c5b3476a23c0aca735279940f89fae11ef +DIST github.com%2Fdchest%2Fsiphash%2F@v%2Fv1.2.1.zip 17069 BLAKE2B e70bcfb611691e43750b11f6e4e655ead44526d3c72a5bcbbb18732e0f23dd891da22b7f5961baae4cfb9d3d0e07af60f5a6afe48e3241bafef76333ef901f0f SHA512 fb9f43083ab6c28d26cf729ab56ca3e85a876fa50bd445f714da5de404578f35ae094b7619a6f10011f98b442137ebbc016b639138679fffff28bcc944e05e55 +DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.mod 230 BLAKE2B 26d8e2a5e9603273dd84ed9aae1bcf49e1fece530a5dc41cae3b5d2ca8bb4288023ac8eeedd0ecc76fa355bc9dd808d06196db03ccda186df5184fc6134e121b SHA512 132067629eb47d7ba22dcedd81467693f7abda7b050244bac8b8ddc9f8dec5d1ff4fd64a6ed0ed1537f400c516594df0f3a2aa392258dfc817176e4030f81cac +DIST github.com%2Fdsnet%2Fcompress%2F@v%2Fv0.0.1.zip 10103918 BLAKE2B d484c7a50585a27d9910c4f9c4c0f179346bea4f373c0fec5b6af24205f69ca6afc4dda6f9b069f23617487f8edd7422379478d88a5a1e113104098fb2476cf3 SHA512 5c16e51cd71051795ca20e338b3eb4fe17e423fa26c4e188d966761ee7d23cf5b21d37a6cca7faf8f31c3110289d2da4e18e6777b8b26cc69563b244d94fc17d +DIST github.com%2Fdsnet%2Fgolib%2F@v%2Fv0.0.0-20171103203638-1ea166775780.mod 30 BLAKE2B 3601cf72262d9c828eff3520a9375eb981b2a9193aee46e93406d491cb8db7b864c3eb32f65f02b75284170856b2264a1a24cc63196695e58365210b216cedbc SHA512 36ff5f52bec7fbf395cce04f20bc61cbe4e5f77ed550a5a869967d1e145e2dcd8e7bca23c3cf81882d8f7053e566dd95e78e97cdcf06c1556b78a5b9b51662d1 +DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec +DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887 +DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.6.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e +DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.mod 330 BLAKE2B 12d6ca5517b27cb05da57741c8bde2601c14a0fea76a8df627681038e03095cd3f9a6cc0975837271deaf469715b510ea8d04d943f8ded8a9b36198bdfcd5b1a SHA512 db40c5be3fa8f7320ec134b3b801022dbc1b5d80cc9eeeb9366724bcd0df479e702d72a42f28cd2c9353e35b2e78a2ad95c0b575bbb5cad0ed04fd1cb629c84c +DIST gitlab.com%2Fyawning%2Futls.git%2F@v%2Fv0.0.11-1.zip 818363 BLAKE2B ae79d47071ecded190c34851f4e82786d7db51cdd8cacf664fac543b95a77a55e7d1a308b2b9b09eb40ae0dfe8d55e00d4c8928ded0ec798e5a52ddd3f777f53 SHA512 dcb0ef6aa71b7d88fc2a5ee2b197e46c33d490dabb84a0a8cead68bbecb5b8bc36928eeae691754a7771f84c9a48975b0971c335d5b5086a013549b42cd87f44 +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e +DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.zip 1781592 BLAKE2B 13d91c26bc1b3f13d8deb7ce2572853fae269db0f8384f94a8b59436d3351cb79f2e2b3ce3664b5c38e696be8ee67a7860aaedacf3019aa94079c160fb991fbd SHA512 42da234a20b3c6a8cfc83b3dce98d3fd11c07912e79d7943bfe6fd8baefae4756cadf5ec1688d4227d7151653fab29fc4a27fd562766f9fb10c758602d5b6f57 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 +DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190328230028-74de082e2cca.zip 1276380 BLAKE2B 95b24bac24917089c0140ff02154cdf170b1d459cf77b0ca11b15c778040d58e1b4369d7f7c5e913cb3b19b8cbedf202eca28b8045df054317a8a3bfdd14759e SHA512 ee4d522713f90dd3bd7942655b0b2e9a64b0f6b8cfa491be7f22216c9e016b3b1131da5dee2ff0eefbdef000ab041e64e0a9385239db20135cf6101e8d2c23fc +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab +DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190329044733-9eb1bfa1ce65.zip 1605582 BLAKE2B 35ea8cfc90f9986ee687b6f4d644d7af2ec786740e427534aefcbe8e5b7c725b4fec2d8323d09193aa4fdc98c8baa0ae42503164f6920e5de05bdb551e33bf35 SHA512 160668e809021d409e7447d83235b127275edd1601ed61f9975c585ea4b9900b2c3fb70c98d1a8addd0e5cae27840da3276caecd77bf168f1625641b03ed689f +DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d +DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7 DIST obfs4proxy-0.0.11.tar.gz 85557 BLAKE2B 9b56433fa4a1023ce2c2b75cec598a1f55fb8229659ee66604b636d2269b243d347e34eb1b539b71db5ac0cb45c868d249844a82e04b20faa6dc1785fe4b78dc SHA512 3eb50bc8067802f8260e0926999a659919e55cb34247f443f66a4852c9ceceacae361602a57ad1fd28a84e4ed54f3800c3258e67266eb23d45b1d09e31c5d869 -EBUILD obfs4proxy-0.0.11.ebuild 1524 BLAKE2B 6e66d38cba88d4dec6686cb86141c9689dff588dcf2311788ba10964452d8b3eb00c4dbe059223aa45a0d73dc2b70ab674df03f10ef644f586c9302fe763542a SHA512 b742f0d77dfd0a36a9bc775500b4cb10dbbc184899356829bbc08fc359a82d0a309bd76c541aae6a2daa2e3c6dcf1bdeb680f52f4d490d6aec8dbaeaefe0de41 +EBUILD obfs4proxy-0.0.11-r1.ebuild 2122 BLAKE2B e18baccd7a8d948c7e4b906c9d26e7ac3f4c63ba459b06f7c8ccf0f38a1cbcb52df6e6d9d8d9c27aa2ac0abaf163e60c849adb8b858f5b6ebc04c19961b9d9e0 SHA512 c6bc9f0b076ed01e96f574157529f192df113b828c3ff96799e4a9a8084fa3a9ec7f7a292cd17621bed000fd8a5cac1fc1bffa1629b398c0d9ea0b00b4089030 MISC metadata.xml 436 BLAKE2B a31742b53be9467a5b916219f3d76ce32f4c59d6d72c867f0d8cec5669b1fba84453efea7fa886ac4dc5d0528c3763188fe6736c5b76b4475a31ecd44d78a1a3 SHA512 0077fbce7545acc98c3964643cc51be782d7aa0fe82fc1b3b44b89a6611e9b95bd579ae143c57a5c16f58c16c406f7fcbdd79e8b4e50f433092903ba6e2d3989 diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild new file mode 100644 index 000000000000..1c40f48bade1 --- /dev/null +++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module + +DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4" +HOMEPAGE="https://gitlab.com/yawning/obfs4" + +EGO_SUM=( + "git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6" + "git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6/go.mod" + "git.torproject.org/pluggable-transports/goptlib.git v1.0.0" + "git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod" + "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412" + "github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod" + "github.com/dchest/siphash v1.2.1" + "github.com/dchest/siphash v1.2.1/go.mod" + "github.com/dsnet/compress v0.0.1" + "github.com/dsnet/compress v0.0.1/go.mod" + "github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod" + "github.com/klauspost/compress v1.4.1/go.mod" + "github.com/klauspost/cpuid v1.2.0/go.mod" + "github.com/ulikunitz/xz v0.5.6/go.mod" + "gitlab.com/yawning/utls.git v0.0.11-1" + "gitlab.com/yawning/utls.git v0.0.11-1/go.mod" + "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" + "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c" + "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod" + "golang.org/x/net v0.0.0-20190328230028-74de082e2cca" + "golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65" + "golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod" + "golang.org/x/text v0.3.0" + "golang.org/x/text v0.3.0/go.mod" + ) +go-module_set_globals +SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +S="${WORKDIR}/obfs4-${P}" + +DOCS=( README.md ChangeLog doc/obfs4-spec.txt ) + +src_compile() { + go build -o ${PN}/${PN} ./${PN} || die +} + +src_install() { + default + dobin ${PN}/${PN} + doman doc/"${PN}.1" +} diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild deleted file mode 100644 index c5626e850c86..000000000000 --- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGO_SRC=gitlab.com/yawning/obfs4.git -EGO_PN=${EGO_SRC}/... - -EGO_VENDOR=( - "github.com/dsnet/compress v0.0.1" - "gitlab.com/yawning/utls.git v0.0.11-1 gitlab.com/yawning/utls/-" - "git.schwanenlied.me/yawning/bsaes.git 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d git.schwanenlied.me/yawning/bsaes" - # Newer versions of packages which are in the tree - "golang.org/x/crypto a5d413f7728c81fb97d96a2b722368945f651e78 github.com/golang/crypto" - "golang.org/x/net 74de082e2cca95839e88aa0aeee5aadf6ce7710f github.com/golang/net" - "golang.org/x/sys 9eb1bfa1ce65ae8a6ff3114b0aaf9a41a6cf3560 github.com/golang/sys" -) - -inherit golang-build golang-vcs-snapshot - -DESCRIPTION="An obfuscating proxy supporting Tor's pluggable transport protocol obfs4" -HOMEPAGE="https://gitlab.com/yawning/obfs4" -SRC_URI="https://gitlab.com/yawning/obfs4/-/archive/${P}/obfs4-${P}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -LICENSE="BSD BSD-2 CC0-1.0 BZIP2 GPL-3+ MIT public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND=">=dev-go/ed25519-0_pre20170117 - >=dev-go/go-text-0.3.0 - >=dev-go/goptlib-1.0.0 - >=dev-go/siphash-1.2.1" -RDEPEND="" - -src_compile() { - golang-build_src_compile - local binfile=$(find "${T}" -name a.out) - [[ -x ${binfile} ]] || die "a.out not found" - cp -a ${binfile} obfs4proxy -} - -src_install() { - default - dobin obfs4proxy - cd src/${EGO_SRC} - doman doc/obfs4proxy.1 - dodoc README.md ChangeLog doc/obfs4-spec.txt -} diff --git a/net-proxy/pingtunnel/Manifest b/net-proxy/pingtunnel/Manifest index 628dd0945b90..7b3b580fd2e0 100644 --- a/net-proxy/pingtunnel/Manifest +++ b/net-proxy/pingtunnel/Manifest @@ -1,4 +1,5 @@ -AUX pingtunnel-0.72_makefile.patch 1587 BLAKE2B f1941e175920004648d76a4db848aee5339498f845d9577190525096911cb337a4f6dd1a3197ad108a388bbd20cf14c10799ed89374fe14230165bfa74a28af7 SHA512 901258ec0f299441ab65bc38240f735fd46a5faf6c33d8011bc3dd88c40bf85ec267cdf6a7e90bdb8abc7f688fb6332d9571c4949321fa8dfa4403d175f3eb32 +AUX pingtunnel-0.72-musl.patch 191 BLAKE2B aa5bf67d3f4addabacf495d8c72039f3c012b8a2b1dc6088da92d178e892fefb2454e2fc7ea91cd85c7d6a35de07f3570a2de6753cf41d20fe3384ccf7a5dba1 SHA512 cb8eae3f77d4a8f4759119aab210045094b4b3f09b08d5b0ed22e0e5667144b2d933542e693a5164f9028c6ce58aa175664596d54c86f0e14d0136459beddcb5 +AUX pingtunnel-0.72_makefile.patch 1591 BLAKE2B 32d9a40264ce124d7b9946a9f83b6fe32ecc0c4203402e94e5c151fc132351c3cbdc7261ebdd24c9fb1939a7f773c1bcf83586dd66004d1c41c6eb141b2700d8 SHA512 5265aa2dbca662ecca54492d3cacc2ebd01b4d9d1cc9326bc7321395f26abb7dda9878f052baa33ac609cf74d0bba1299d8cef9aad37731443f291489edc6876 DIST PingTunnel-0.72.tar.gz 64188 BLAKE2B 414a7e528f66c72f878eef73a48fa0d6e7ceeae51ea2d8ff33f4a4fae61a9427f669d29e9b06f502ded96d87a3fa6680236bca7f9ce90a9a14f94583bffa0716 SHA512 943fc571ca95bb6af59f2a74458470865a89a502145bb1e5cf9b86159d61d897418d10d100691337f299892af7aba65964624462068a77ef1645890a4abf5d17 -EBUILD pingtunnel-0.72.ebuild 694 BLAKE2B f07f1d528eed77af7883f56ae6ad0654376e0ffcb2c47ef8ea65f60eebbff17106ab33400e2a7ba3e25e5f49205e2f4582c42172dd9e924eb2b47fee86af5e19 SHA512 8e4aa1740068df050fad5b7e2a44b108adeba22e25e4f23b8264f56481a48003b9f1f295baa52abff695eb01b95a9bfb8a7b9262f93edcb6be5ae40dad0bf34a +EBUILD pingtunnel-0.72.ebuild 673 BLAKE2B 6ba490c2d2df44d3753e33f663f803e984f6a2d8f2d8a53d848bb184d9d38ad5e6b5428a6364d8d315ddc107cb302f93df8ff4a76dba8628e0a6ff7ca1af0947 SHA512 3b47407afde27f870aa41adda0eb1080152b5818fc57750969ce37f2b88a2c84ec4b5fe48bb8710bd2a5d2042b6d24fef805ecb9d9983085a56e7beb9bf7e86a MISC metadata.xml 436 BLAKE2B 0d1d2604b16e91db8564f8568b49f2f103dd39746452a8d13ade27eeeb1dbc947ed98d349a72d89c41be2de2b6d321dc53603088df7d980643ac2b9ec3837519 SHA512 013ade7657982958b210224c87210ff270c2b045973b93482d1e3758ab2539b1c7cba9b8d4414cc0d86fa53f6edd6158cd28b5f60b2acb2c00d3fc0dea29a049 diff --git a/net-proxy/pingtunnel/files/pingtunnel-0.72-musl.patch b/net-proxy/pingtunnel/files/pingtunnel-0.72-musl.patch new file mode 100644 index 000000000000..cf421365917d --- /dev/null +++ b/net-proxy/pingtunnel/files/pingtunnel-0.72-musl.patch @@ -0,0 +1,10 @@ +--- a/ptunnel.h ++++ b/ptunnel.h +@@ -45,7 +45,6 @@ + + // Includes + #ifndef WIN32 +- #include <sys/unistd.h> + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> diff --git a/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch index 9dce0992cbda..27576bfd434f 100644 --- a/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch +++ b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch @@ -1,5 +1,5 @@ ---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -2,11 +2,26 @@
# (c) 2004-2009 Daniel Stoedle, daniels@cs.uit.no
# ptunnel.exe target added by Mike Miller, mike@mikeage.net
diff --git a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild index 9f41ef3c3154..a9c9139962cd 100644 --- a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild +++ b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Tunnel TCP over ICMP" HOMEPAGE="https://www.cs.uit.no/~daniels/PingTunnel" @@ -11,27 +11,26 @@ SRC_URI="https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${PV}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86" -IUSE="doc selinux" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="selinux" -DEPEND=" +RDEPEND=" net-libs/libpcap - selinux? ( sys-libs/libselinux ) -" -RDEPEND="${DEPEND}" + selinux? ( sys-libs/libselinux )" +DEPEND="${RDEPEND}" S="${WORKDIR}"/PingTunnel -src_prepare() { - epatch "${FILESDIR}"/${P}_makefile.patch -} +PATCHES=( + "${FILESDIR}"/${P}_makefile.patch + "${FILESDIR}"/${P}-musl.patch +) +HTML_DOCS=( web/. ) -src_compile() { +src_configure() { tc-export CC - emake $(usex selinux "SELINUX=1" "SELINUX=0") } -src_install() { - default - use doc && dohtml web/* +src_compile() { + emake SELINUX=$(usex selinux 1 0) } diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 4ab1f7855bbd..69b247bb0fce 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -5,7 +5,5 @@ AUX squid.initd-r5 4339 BLAKE2B 3529ddaab2e708215e6674514ce8e20e9d28d26e45860e19 AUX squid.logrotate 103 BLAKE2B f6d190d1914b76b08d90a2c3b3b07ff9cd332cdb2e595f4849537d1f1d32d8be1386fcdfffb40d073bcdd715a62c1c44727f1e10b75cfaff69c0d042c2a7e904 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdbb8d4c6a0248ec9fa1a0f5f1d6136643c9abc4c5f67e8ef75305414b374763e2055272950d5 SHA512 5501e3d9319aea99f0deed98748366d4dfbeccdde96d842474fe144a4584394d8f5563372cd7b2437a389378c49b61b646403cca1be4362c888750d027b2f594 DIST squid-4.10.tar.xz 2445848 BLAKE2B 8161626f0fc448f62c9afe13194e10a3ac21c1fe25cd6a9e6a85dcc3cebc2a84750ae78235134ada38f730923e7d1815ca5fb5a6aec7ae70623798c66beaf160 SHA512 033891f84789fe23a23fabcfb6f51a5b044c16892600f94380b5f0bcbceaef67b95c7047154d940511146248ca9846a949f00a609c6ed27f9af8829325eb08e0 -DIST squid-4.9.tar.xz 2444664 BLAKE2B ac9006519773809034176cf350f31400ddc02e03aaa67df725fc9f59245337a319526463b3f96916f7d6544b99bd623b0969c8b1787b50ee142dc2fe38bb5b75 SHA512 ca3db39379ea0582ff28297dde21899d02916ea499fb9c0f86aa60301829b7c601bb21ee274f841555047bc911e878717b38670b8796e5d717862b7a285ef84f -EBUILD squid-4.10.ebuild 8063 BLAKE2B 09c61443e5bcc56c7656350c01dd6c3c402070c233f04b2b55e011523aac7bfc4e7ceaa8e8a5cbd6b893153ccf46a952566e87e49da8ddfbb9bec8a654d05ec8 SHA512 d41b8a52c9abea94d09f7090b2b0a56589bbcda3bc9af3dc732b58fced45e26d5f9f1fd72be34c30431f528cb34e113c2594bb3ea5b9ba648d7cc0d01017c6c7 -EBUILD squid-4.9.ebuild 8121 BLAKE2B 569fa26685e77ba169f871825a6664645ac856b5ed0ca95483bb07de6cf27330947d75156f03d65ddc5991581e7d88eaa581e0f0f36ca3d60d22c120e660a756 SHA512 7aed222f8e3b2fa3ec8ea2290cc21a104f4c6105c2fa098471768ddc6493799a5f59f71e9bc3fc9a5032a25f33f56ed81162e174c6e958f3ee4e1167fcebee14 +EBUILD squid-4.10.ebuild 8058 BLAKE2B 35a1e7e6899d723d99fcc67e93d454725b7e12862d4a666148b829902b38552671414cb54a0fce2a2bd8fdcc637dc8fbcbef96e224007732a158ac1f19fb2ec1 SHA512 457ee367ebcf2a8252ffd8039f07eb1e8430ac6039f3021507c063f590242c69a27b906609c07156d65d5af9aac4c27254824a6479a6b7978925f712d1a92bcf MISC metadata.xml 1472 BLAKE2B ba8020d30b7fb7740a160a06f2f4323f1ae181c79bc89fe390b25b156000a5c751a68333a634753cb1a96a9097577b379369226db8ee6e04c22c4b9f0e8626bc SHA512 19fce272b91077d6114ee400adc6360993558c02bc6595c50fdf43323eb7aebd0f2c0d7cb6d688fd8f1db6af06305de24a7c5a0cddce62d150391c50da46e056 diff --git a/net-proxy/squid/squid-4.10.ebuild b/net-proxy/squid/squid-4.10.ebuild index a738f7035bc7..610eb4ea4231 100644 --- a/net-proxy/squid/squid-4.10.ebuild +++ b/net-proxy/squid/squid-4.10.ebuild @@ -22,7 +22,7 @@ fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" IUSE="caps gnutls ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ ecap esi ssl-crtd \ mysql postgres sqlite \ diff --git a/net-proxy/squid/squid-4.9.ebuild b/net-proxy/squid/squid-4.9.ebuild deleted file mode 100644 index 76687eb647d2..000000000000 --- a/net-proxy/squid/squid-4.9.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WANT_AUTOMAKE="1.15" - -inherit autotools linux-info pam toolchain-funcs - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" - -# Upstream patch ID for the most recent bug-fixed update to the formal release. -r= -#r=-20181117-r0022167 -if [ -z "$r" ]; then - SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}.tar.xz" -else - SRC_URI="http://www.squid-cache.org/Versions/v${PV%.*}/${P}${r}.tar.bz2" - S="${S}${r}" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86" -IUSE="caps gnutls ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap esi ssl-crtd \ - mysql postgres sqlite \ - perl qos tproxy \ - +htcp +wccp +wccpv2 \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux" - -RESTRICT="!test? ( test )" - -BDEPEND="dev-lang/perl" - -COMMON_DEPEND="acct-group/squid - acct-user/squid - caps? ( >=sys-libs/libcap-2.16 ) - pam? ( sys-libs/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - qos? ( net-libs/libnetfilter_conntrack ) - ssl? ( - !gnutls? ( - libressl? ( dev-libs/libressl:0 ) - !libressl? ( dev-libs/openssl:0 ) ) - dev-libs/nettle:= ) - sasl? ( dev-libs/cyrus-sasl ) - ecap? ( net-libs/libecap:1 ) - esi? ( dev-libs/expat dev-libs/libxml2 ) - gnutls? ( >=net-libs/gnutls-3.1.5 ) - logrotate? ( app-admin/logrotate ) - >=sys-libs/db-4:* - dev-libs/libltdl:0" - -DEPEND="${COMMON_DEPEND} - ${BDEPEND} - ecap? ( virtual/pkgconfig ) - test? ( dev-util/cppunit )" - -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - perl? ( dev-lang/perl ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - selinux? ( sec-policy/selinux-squid ) - sqlite? ( dev-perl/DBD-SQLite )" - -REQUIRED_USE="tproxy? ( caps ) - qos? ( caps )" - -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_prepare() { - eapply "${FILESDIR}/${PN}-4.3-gentoo.patch" - 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 -e 's:_LTDL_SETUP:LTDL_INIT([installable]):' \ - libltdl/configure.ac || die - - eapply_user - eautoreconf -} - -src_configure() { - local basic_modules="NCSA,POP3,getpwnam" - use samba && basic_modules+=",SMB" - use ldap && basic_modules+=",SMB_LM,LDAP" - use pam && basic_modules+=",PAM" - use sasl && basic_modules+=",SASL" - use nis && ! use elibc_uclibc && basic_modules+=",NIS" - use radius && basic_modules+=",RADIUS" - if use mysql || use postgres || use sqlite ; then - basic_modules+=",DB" - fi - - local digest_modules="file" - use ldap && digest_modules+=",LDAP,eDirectory" - - local negotiate_modules="none" - local myconf="--without-mit-krb5 --without-heimdal-krb5" - if use kerberos ; then - negotiate_modules="kerberos,wrapper" - if has_version app-crypt/heimdal ; then - myconf="--without-mit-krb5 --with-heimdal-krb5" - else - myconf="--with-mit-krb5 --without-heimdal-krb5" - fi - fi - - local ntlm_modules="none" - use samba && ntlm_modules="SMB_LM" - - local ext_helpers="file_userip,session,unix_group,delayer,time_quota" - use samba && ext_helpers+=",wbinfo_group" - use ldap && ext_helpers+=",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 - - local storeio_modules="aufs,diskd,rock,ufs" - - local transparent - if use kernel_linux ; then - transparent+=" --enable-linux-netfilter" - use qos && transparent+=" --enable-zph-qos --with-netfilter-conntrack" - fi - - if use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - transparent+=" $(use_enable kqueue)" - if use pf-transparent; then - transparent+=" --enable-pf-transparent" - elif use ipf-transparent; then - transparent+=" --enable-ipf-transparent" - fi - 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 - - econf \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/libexec/squid \ - --localstatedir=/var \ - --with-pidfile=/run/squid.pid \ - --datadir=/usr/share/squid \ - --with-logdir=/var/log/squid \ - --with-default-user=squid \ - --enable-removal-policies="lru,heap" \ - --enable-storeio="${storeio_modules}" \ - --enable-disk-io \ - --enable-auth-basic="${basic_modules}" \ - --enable-auth-digest="${digest_modules}" \ - --enable-auth-ntlm="${ntlm_modules}" \ - --enable-auth-negotiate="${negotiate_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-log-daemon-helpers \ - --enable-url-rewrite-helpers \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-eui \ - --enable-icmp \ - --enable-follow-x-forwarded-for \ - --with-large-files \ - --with-build-environment=default \ - --disable-strict-error-checking \ - --disable-arch-native \ - --with-included-ltdl=/usr/include \ - --with-ltdl-libdir=/usr/$(get_libdir) \ - $(use_with caps libcap) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_with ssl openssl) \ - $(use_with ssl nettle) \ - $(use_with gnutls) \ - $(use_enable ssl-crtd) \ - $(use_enable ecap) \ - $(use_enable esi) \ - $(use_enable htcp) \ - $(use_enable wccp) \ - $(use_enable wccpv2) \ - ${transparent} \ - ${myconf} -} - -src_install() { - default - - # 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 - for f in basic_pop3_auth \ - ext_delayer_acl \ - helper-mux \ - log_db_daemon \ - security_fake_certverify \ - storeid_file_rewrite \ - url_lfs_rewrite; do - rm "${D}"/usr/libexec/squid/${f} || 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 - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd-r2" squid - newinitd "${FILESDIR}/squid.initd-r5" squid - if use logrotate; then - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - diropts -m0750 -o squid -g squid - keepdir /var/log/squid /etc/ssl/squid /var/lib/squid -} - -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 6a80d17b5aef..62cbd813b7b1 100644 --- a/net-proxy/squidguard/Manifest +++ b/net-proxy/squidguard/Manifest @@ -3,9 +3,10 @@ AUX squidGuard.conf.blocksites 192 BLAKE2B 0bbb4b05d91bc2ca78a5ba52213967bb5e428 AUX squidGuard.conf.minimal 61 BLAKE2B ddc399b51d396868be42a7dd1709e0b2df372dc95696da06916542c12a19ec15a7e596e04aa6454fc81315ee27dc1fddb4bb23fe1d31fcde3ca8c4b42298f85b SHA512 301263fcfaf345c34b5a988ce237bc578fb48f63ab2187b5dd2f146e4cf914bf823fcce49c27f8282e745f3125e32455d9c5a5f425d40ce7785f492663eb959c AUX squidguard-1.5_beta-gentoo.patch 1562 BLAKE2B 38d0623b8f1f621a3522695966ab1aca26bc939d366f2e586962640164391a93d5834d4ba994a9d8d9a6ce8ed0bcfe846dfdb1edd7e2ed050ba5e51c74bb9a67 SHA512 bdeb6b5a526200f290ce39e3e9c7f4142eb168ec3c47cf4ec2c6dc713fd9c5915c92ca4188c9bfc8c6795f6f170ade62bca3ace0ccfa5149addb0ae932064f8a AUX squidguard-1.5_beta-protocol.patch 4489 BLAKE2B 13b406850f20c41a0cb07c95cf241d7f0b4eb8e879e0afc0abcc62a09c067338c60b9fb44bfdb6053c483b944295abbfde7111d8807af9ad3a9ceeaa6e7e81dc SHA512 f8828d10b7ca55debf5aa80ef7e88741b10e9c566921fc2fd38652080fef025bff91851a14c1ee610fabce2562b1c8ca797dd9ae924a1fcc62ab95cb365ff8b1 +AUX squidguard-1.6.0-gcc-10.patch 1351 BLAKE2B f13224eb35e98fb5ec83d286016404fcbb55976f4616d0dfea52472a29ca2ea8686d5450d32fee99c8198d0d3804bfa07624228c3d843294f34357edf5ddaed7 SHA512 906b8ad819f043115958aac90e88c1c8b17ea1a330d6fd734403bee67b4d7e6bf448ff14cd012df893ae5f5e58e126d8ac31c77e4f1b9447e7317c7cc5f749be AUX squidguard-1.6.0-gentoo.patch 982 BLAKE2B 9858c7778fbf52573061fd12d3c3941c4f5b5011c09e7cd54859d6fdd9e969f9e7033abd8cfafa019000309aad50ceac63cc082f5b394ea9ee67c30561376879 SHA512 58b8f9a469fe1ca563f1e9e9425362a594eb7a472f0c019f54d42c06dcee2b6a207ee6dded297c86e06288e78ed62879170b8305b20aa29b37d0b658ef843288 DIST squidGuard-1.5-beta.tar.gz 1983030 BLAKE2B 60405e097babb15eb099649d4ffe23a798207c6d3ac490b8c0c7da777a0136fecb867537214aa90c58ff246a86a0cf7ce59b021e29071ecc43ad002f3a0e3def SHA512 37ddc2ac82596e9d24aac6a610763f2eeb7c15b3a2d7babb85948e1da912aebb1dc85309766f7d8c3d7c22713e24a51f4cdef4520117a03d839662ef2494b6e7 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e EBUILD squidguard-1.5_beta-r2.ebuild 2276 BLAKE2B 10cb29c4b29f3bffe7e9c67a2af09c744ee317b0231fac54f0e577554e47b263014ed4b0f620f46a27be7c191d76447603acb1d885279a52871f9b01879101c5 SHA512 fcfce62692dc0d9cac271cca6cf4a344e4c67d1e9bee780fc508ed46f84ed5ff42098ea929f72b7161f57b4f6165d1e9f45f5ed4ee886861d22e3b82c4ac6391 -EBUILD squidguard-1.6.0.ebuild 2252 BLAKE2B 61ccbbe8d0465a99477c93f98f8fa0c6165e8438925c39a80ee28081ae42e178fd72f9ff97b01e43720ebd0a6988943d4da9c7966bf247753e2e19638157d716 SHA512 5496a2a296836d16a4d601e6062bb5bdc3a0be6d38feb1a5613d19ff0f0993890fcf194aae113d8e403120082e7d8459ef5fe43c33642186856a2e0c223fe6f4 +EBUILD squidguard-1.6.0.ebuild 2237 BLAKE2B b2cd2d511739a44dca912478c9f08990d9a096c4ceefbcf53083c033e9faf630ca56c3e7b9934663bf5661ecdd00693c349e2d8fb23516d309adf0ee0caba228 SHA512 d08aa81e2d95cc3b1d4916b8c7b548df6c3560532b71770b11b4fb558472eeb0968f6838aae1d7a70749c924911ce993aee403fcbc532e551855d7f48fbbe697 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a diff --git a/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch b/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch new file mode 100644 index 000000000000..650153f28011 --- /dev/null +++ b/net-proxy/squidguard/files/squidguard-1.6.0-gcc-10.patch @@ -0,0 +1,54 @@ +--- a/src/y.tab.c.bison 2020-03-08 20:05:00.750000000 +0300 ++++ b/src/y.tab.c.bison 2020-03-08 20:04:42.160000000 +0300 +@@ -217,7 +217,7 @@ + + #include "sgEx.h" + +-FILE *yyin, *yyout; ++extern FILE *yyin, *yyout; + char *configFile; + + int numTimeElements; +--- a/src/sg.h.in 2020-03-08 20:02:46.900000000 +0300 ++++ b/src/sg.h.in 2020-03-08 20:03:22.110000000 +0300 +@@ -115,7 +115,7 @@ + #define REDIRECT_PERMANENT "301:" + #define REDIRECT_TEMPORARILY "302:" + +-char *progname; ++extern char *progname; + + struct LogFileStat { + char *name; +@@ -337,7 +337,7 @@ + struct AclDest *next; + }; + +-int lineno; ++extern int lineno; + + char *sgParseRedirect __P((char *, struct SquidInfo *, struct Acl *, struct AclDest *)); + char *sgAclAccess __P((struct Source *, struct Acl *, struct SquidInfo *)); +--- a/src/main.c.in 2020-03-08 20:10:55.650000000 +0300 ++++ b/src/main.c.in 2020-03-08 20:11:13.590000000 +0300 +@@ -21,6 +21,9 @@ + #include <syslog.h> + #endif + ++char *progname; ++int lineno; ++ + struct Setting *lastSetting = NULL; + struct Setting *Setting = NULL; /* linked list, Calloc */ + +--- a/src/sg.y.in 2020-03-08 20:14:46.180000000 +0300 ++++ b/src/sg.y.in 2020-03-08 20:14:57.110000000 +0300 +@@ -35,7 +35,7 @@ + + #include "sgEx.h" + +-FILE *yyin, *yyout; ++extern FILE *yyin, *yyout; + char *configFile; + + int numTimeElements; diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild b/net-proxy/squidguard/squidguard-1.6.0.ebuild index 30193a1ef08d..c4bce1009a7e 100644 --- a/net-proxy/squidguard/squidguard-1.6.0.ebuild +++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools db-use user +inherit autotools db-use DESCRIPTION="Combined filter, redirector and access controller plugin for Squid" HOMEPAGE="http://www.squidguard.org" @@ -11,11 +11,14 @@ SRC_URI="mirror://debian/pool/main/s/squidguard/${PN}_${PV}.orig.tar.gz -> ${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86" IUSE="ldap" -RDEPEND="|| ( +RDEPEND=" + acct-group/squid + acct-user/squid + || ( sys-libs/db:5.3 sys-libs/db:4.8 ) @@ -36,14 +39,10 @@ suitable_db_version() { die "No suitable BerkDB versions found, aborting" } -pkg_setup() { - enewgroup squid - enewuser squid -1 -1 /var/cache/squid squid -} - src_prepare() { eapply \ - "${FILESDIR}/${P}-gentoo.patch" + "${FILESDIR}/${P}-gentoo.patch" \ + "${FILESDIR}/${P}-gcc-10.patch" # Link only with specific BerkDB versions db_version="$(suitable_db_version)" diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest index 286ca8564db1..5fcc31941112 100644 --- a/net-proxy/tinyproxy/Manifest +++ b/net-proxy/tinyproxy/Manifest @@ -3,5 +3,5 @@ AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca AUX tinyproxy.service 172 BLAKE2B d2e6199bfee2bac52e08d4c5506131f19e2630ebe1d9ed12f71d575cef37454c229e9e08b1fc89d9e26052a1192913289ed3602d69686d6894eb68b8639e7a5a SHA512 4c4cd36a7e34d9ee27c05475b72d1b61f90592ccb44c9deb96a1375bb681b7901702f078ed24b7c633074c83e450275a4a66829f3b270f75fc786a50d1ef393f AUX tinyproxy.tmpfiles.conf 48 BLAKE2B f2cd35878580eb198920f5db8493e3e266b4325160a9590a0b59bef1cf0577d0129bb636d99442cdb2154b444a8cdc1c6d01b4850b57df774be00338c61902e4 SHA512 24440cdaed0af6cbdb191acb1769e0a17871ef95e03e62a6621a413a2616e5d90d748d909bb5d18c029b25d7bf91485dbe46ee11e8703a1cb9008be470536715 DIST tinyproxy-1.10.0.tar.xz 176060 BLAKE2B 58f9b443c731de6b74d689a80ebd422d3b6f51f643546ee144b37fb3262725246f6a5fa1015267a94f192f8715eaf71ffc078ead75e6225a210f58ec28ee8fcf SHA512 8d82598c5f9c89bc672f4632139ac52696d5c7788963de51688a8aeb576c69004f8338fe1e1897bf704a21dfd25ab1effb092003b6afaa9a88c2b5d0608310f5 -EBUILD tinyproxy-1.10.0-r1.ebuild 1661 BLAKE2B 8e09663a9694cf48d051784b36ca56e7ef9bfa56fb486b5fc43e5dee7b48cc1b95c2dfef9a31d58bbdf3069e4e8ca730ff0dd1735003cbf80a079573154e1584 SHA512 3e7940a3128a37c7e16c723f1f7874217fead40bf949bfa9a8d2dbc29bb07a565bfa7184261e025ba159d889f08c774d3ed54178f4a7db23e60957bf4c479ce7 +EBUILD tinyproxy-1.10.0-r1.ebuild 1662 BLAKE2B 247a724e2aafb0b189ffaf6e413b1a47004dce4401f13289b967171015659e81ff8413857e1c085f426bd3fb092d038e05d67185f21999c67e412e6768805322 SHA512 17248ee440d1096e4afee14ebff144a456e932af77d81e15aeea77c001ef3abbe5062dd1d1afe2e7894c60f33ed837d689ab3241fc86861b57bb38f840ddd30a MISC metadata.xml 627 BLAKE2B 3acd13c1d7a698ad83efa30c8471d5241533d66c09c103cda58c20d420d3bec2de5fcd42535d6b0b8197ae1d1aea445674e563177237ee20c348beeaf44aaf2d SHA512 96b439d626b40c45952059c1e3599a0e1743e50644c605e1519e685337a3eff806c73a8e1b3fd13920908d44eb256bc39657c9c76535a8806193581053e7a657 diff --git a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild index 51ab4ab054be..1bc212ef1284 100644 --- a/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.ebuild +++ b/net-proxy/tinyproxy/tinyproxy-1.10.0-r1.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 ~ia64 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 3b834a60870e..6691cca64309 100644 --- a/net-proxy/trojan/Manifest +++ b/net-proxy/trojan/Manifest @@ -1,10 +1,6 @@ -AUX trojan.initd 539 BLAKE2B 1dcca22a0647d109928570ab58780237a67bf5bd5952da6a0e68cc4b8d75348b392ea309beddda64e3f00619f3ce2744a29445794338c406b50b28cd44687fcd SHA512 d032f840d2e3dc0a9f3fe92d40aad3946a9c70217c673ecb89a9da8bf14fa9c4e764431534f63edf70d38fed293903aa8a298af474ddc8343e10d169855d81e6 -DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf -DIST trojan-1.12.3.tar.gz 41786 BLAKE2B f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296 SHA512 f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f -DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74 SHA512 5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab +AUX trojan.initd 753 BLAKE2B a0dab04f6abe08a00bfcf4e8eb2f7c2f1368e346c485d5ccec40f9aeb798ee9e3b838ac06b98d252a9823f3ad96d798fec193791c042c041b49999cd0e46fa08 SHA512 73e84faa009436215793a39e19f5664bc7b1ddcd9d82a205b98ff16378f13cfc1dfb4380ab58804cbae988b7796b51149c11c4cd227ee0e4b15a6ca68e888b7f DIST trojan-1.14.1.tar.gz 45884 BLAKE2B 2498476f7e1a2190e21d85b2572fbc91a77b50f9f2adc2d3c3c5cef2554da17f322fbdb23232a55c66c38a4f680175f5c2aa87cefc25853b2007de4bb8bac84d SHA512 c8fcdae584e742d958c896e3a18605f22073341a8227a1d7cb116e9f2ddadd6e5007bfe40ff765d564f8659cd9e9d11731d95a5c74459b0698cc48dac49ead19 -EBUILD trojan-1.10.0.ebuild 1018 BLAKE2B 06f93c7c4672a215fcc139a17b2f17ce6d5eec88b11d598d7409db5000f11bf91ed1159a17df95b836a94602a7eaf686b1b3e2afaf98cd0478f9844ef9bfa2ca SHA512 50d3b4acd48770c5b4ebd19aec6f69c75b1c44ee0bdc1958cec7d67eea9834ce6edfc9483c802b24728babdbee19e97201335aa7bf697984316221f47d9bbb7e -EBUILD trojan-1.12.3.ebuild 953 BLAKE2B 90151ee22e7c2f4cbe748ba3cbb450dcab5a1fbd7d85c121a939e3bd38e451e7800d37b9bf6590ce2c1ef9b49461e8fed272812d657c1a9e1e006f7fdde13fcd SHA512 1dea01ddce5a14f536f0abdd9ba2da7450a92c773045714fb024870dfcfa31a71a38feef35c86715f75f7655cea86c7c699887cd8d66e51155117d465ab6d361 -EBUILD trojan-1.13.0.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e -EBUILD trojan-1.14.1.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e -MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b +DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431 SHA512 5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f +EBUILD trojan-1.14.1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f +EBUILD trojan-1.15.1.ebuild 1318 BLAKE2B 82970b3afbef707e54a9f4612a8632edff3ecbcece6658537e6930a65eee8aadee14e413436f123108949c50378a41f4e88dc718e272fb8157bd11e1df144adc SHA512 fb2938164b0be2248b0143d6d3b67ea434aa973e72bda6bdc1a0dbfc3edb7844ebdd05004183306c21c26336bf9187022283ccf9e6d13be2ef55fc3b9e7e958f +MISC metadata.xml 1124 BLAKE2B 0d11d3625f824da33597ff489cb1170cac018279c80ce230c0b0233c7bc1e19a279adbea4f2aa9d83077ac8359d37714326dddb3c8f7f8503dbc9e17857a08d5 SHA512 2c912d390ff5483dc5458ff887958e259bdd6897754a3374d5d978729b692d0fc99768bd12975dc6c9e44b4080046914d9f55bc67045f68e792e2712cc513f30 diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd index cee794ad4d72..2990245430db 100644 --- a/net-proxy/trojan/files/trojan.initd +++ b/net-proxy/trojan/files/trojan.initd @@ -1,10 +1,17 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -TJ_CONFIG="/etc/trojan/config.json" -TJ_PIDFILE="/run/trojan.pid" -TJ_LOG="/var/log/trojan.log" +TJ_NAME=${SVCNAME##*.} +if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then + TJ_PIDFILE="/run/trojan.${TJ_NAME}.pid" + TJ_CONFIG="/etc/trojan/${TJ_NAME}.json" + TJ_LOG="/var/log/trojan.${TJ_NAME}.log" +else + TJ_PIDFILE="/run/trojan.pid" + TJ_CONFIG="/etc/trojan/config.json" + TJ_LOG="/var/log/trojan.log" +fi depend() { need net diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml index 9b97efd6cb49..097dc1718605 100644 --- a/net-proxy/trojan/metadata.xml +++ b/net-proxy/trojan/metadata.xml @@ -5,6 +5,10 @@ <email>yangmame@icloud.com</email> <name>Xin Yang</name> </maintainer> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild b/net-proxy/trojan/trojan-1.10.0.ebuild deleted file mode 100644 index 9926cef05ccd..000000000000 --- a/net-proxy/trojan/trojan-1.10.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{3_6,3_7} ) - -inherit cmake-utils python-any-r1 systemd - -DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" -HOMEPAGE="https://github.com/trojan-gfw/trojan" -SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="mysql test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/boost-1.54.0:= - >=dev-libs/openssl-1.0.2:= - mysql? ( dev-db/mysql-connector-c:= ) -" -DEPEND=" - ${RDEPEND} - test? ( net-misc/curl ${PYTHON_DEPS} ) -" - -src_configure() { - local mycmakeargs=( - -DENABLE_MYSQL=$(usex mysql) - -DSYSTEMD_SERVICE=ON - -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir) - -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/trojan.initd" trojan -} - -src_test() { - cmake-utils_src_test -j1 -} diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild b/net-proxy/trojan/trojan-1.12.3.ebuild deleted file mode 100644 index 5a088c7f2987..000000000000 --- a/net-proxy/trojan/trojan-1.12.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7} ) - -inherit cmake python-any-r1 systemd - -DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" -HOMEPAGE="https://github.com/trojan-gfw/trojan" -SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="mysql test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/boost-1.66.0:= - >=dev-libs/openssl-1.0.2:= - mysql? ( dev-db/mysql-connector-c:= ) -" -DEPEND=" - ${RDEPEND} - test? ( net-misc/curl ${PYTHON_DEPS} ) -" - -src_configure() { - local mycmakeargs=( - -DENABLE_MYSQL=$(usex mysql) - -DSYSTEMD_SERVICE=ON - -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - newinitd "${FILESDIR}/trojan.initd" trojan -} - -src_test() { - cmake_src_test -j1 -} diff --git a/net-proxy/trojan/trojan-1.14.1.ebuild b/net-proxy/trojan/trojan-1.14.1.ebuild index aa4fa9f95beb..21f494f1364d 100644 --- a/net-proxy/trojan/trojan-1.14.1.ebuild +++ b/net-proxy/trojan/trojan-1.14.1.ebuild @@ -45,3 +45,17 @@ src_install() { src_test() { cmake_src_test -j1 } + +pkg_postinst() { + elog "Running Trojan with multi instances" + elog "" + + elog "Prepare /etc/trojan/\${blah}.json first" + elog "Config with Openrc" + elog " ln -s /etc/init.d/trojan{,.\${blah}}" + elog " rc-update add trojan.\${blah} default" + elog "" + elog "Config with Systemd" + elog " systemctl enable trojan.\${blah}" + elog "" +} diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild b/net-proxy/trojan/trojan-1.15.1.ebuild index aa4fa9f95beb..21f494f1364d 100644 --- a/net-proxy/trojan/trojan-1.13.0.ebuild +++ b/net-proxy/trojan/trojan-1.15.1.ebuild @@ -45,3 +45,17 @@ src_install() { src_test() { cmake_src_test -j1 } + +pkg_postinst() { + elog "Running Trojan with multi instances" + elog "" + + elog "Prepare /etc/trojan/\${blah}.json first" + elog "Config with Openrc" + elog " ln -s /etc/init.d/trojan{,.\${blah}}" + elog " rc-update add trojan.\${blah} default" + elog "" + elog "Config with Systemd" + elog " systemctl enable trojan.\${blah}" + elog "" +} |