From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- www-servers/sniproxy/Manifest | 3 +- .../sniproxy/files/sniproxy-0.6.0-fno-common.patch | 24 +++++++ www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild | 77 ++++++++++++++++++++ www-servers/sniproxy/sniproxy-0.6.0.ebuild | 83 ---------------------- 4 files changed, 103 insertions(+), 84 deletions(-) create mode 100644 www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch create mode 100644 www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild delete mode 100644 www-servers/sniproxy/sniproxy-0.6.0.ebuild (limited to 'www-servers/sniproxy') diff --git a/www-servers/sniproxy/Manifest b/www-servers/sniproxy/Manifest index 3e192091ad73..1c9236202aeb 100644 --- a/www-servers/sniproxy/Manifest +++ b/www-servers/sniproxy/Manifest @@ -1,6 +1,7 @@ +AUX sniproxy-0.6.0-fno-common.patch 541 BLAKE2B cc1bb1edcb25bb12c5d5ac70088f38e61958104fbe4c81586c90f86dc3e1c53ea29de1aae82b7bbf17fea6e135572bc9e026b30a473411cbc09680b9eec20b58 SHA512 deb08ce08b4fc4060b5f2652b1946174a7771b81a9f288b9ec6368a50cfa3d327edef598b3e1fe7f668c4244adfbbc770644acab9772a451f1058e8362f71681 AUX sniproxy.init 493 BLAKE2B 4021f98063b76628abd60e52afc3cef2d6860c3fd639c21d0e2d4a62acc6fe7f505bc715c69116474748c122d031a8df1f101d0c13b80524980911a6010fe86f SHA512 6dc6ba017c18cc5c4b15b2085e95157c396c44b8d368b6ee28c559c9d4072460604afca3a20c46c639c5b095a3da65e3b2b15fc20d738e41651cc77615dd3ca0 DIST sniproxy-0.5.0.tar.gz 72654 BLAKE2B 11f2a66af0d5a19807178687b2a5044aa0cca18a9586c60a6e15604b90f4c32d16d9ac8d037df2cafe57a2dc3a576e1ff72b8f58b59e6822d2a45520b9c770f4 SHA512 52dbb217193d2b7bf9dea37b13fde395b5c56d0a6627508a245f2807920deb282aae3c1ae7e6b5fa68432990e48998989fd28027b65cb7310f214b29f98e5e5d DIST sniproxy-0.6.0.tar.gz 78515 BLAKE2B 1ac8decc793e7b3d73d833bc392b3ef035bd2ba7d515c54ff46de16ee8897c0c5392929d5c7a22a131c1f017897cc6f8e9c50aff8164e4afbdc23155b804b613 SHA512 8a99573673bdd57e528c5781cb166d39c80daed699382b24c3fa18a6011d074a1d9e470fee404d24b4450cf067c9995125910b2941b5216d88d189a1d79ebf73 EBUILD sniproxy-0.5.0.ebuild 1358 BLAKE2B 85992e780c92ed4903e42e703c5391092cc5f2aa01868b4a160e8c260e2aca1d7af3e13f1af009c1f19fbd6cb3ccae956c421f78c3b81afa34fcbffc233f50a0 SHA512 0f0e254ce173b2c8f563db051cc2647cdad62b09d5fcabf82a43e172c11cdf3406146eb18da087a6ee306fef7299f115592c6d394f2cbcdfb95782b696a2c769 -EBUILD sniproxy-0.6.0.ebuild 1625 BLAKE2B 1dfd5f28a60401b8aacd4268c81c8050b03de3979bd1ff3f51dd07ea508f54798f1ad74c42a24ba0612111c5b749f6017e4a4bfbaf89fdcb2c671f4cd898d71b SHA512 1f6d965e68923d7793286a3d8611dd4b87dd3d08d52c8e2f7197ee968c56deffda3e7a5a30ee4c471f0cedac6313a3306594bb0ceb885bb5b6a9b7750078b8cb +EBUILD sniproxy-0.6.0-r1.ebuild 1603 BLAKE2B 722ccab3459ee93ca63d6152d95c99ff097b7ee4f7fbf64f3f292c99fd8d9fbb489f5e98bcc15c6ffe8ee08957e2c7930b0b469c8e4771f7d0fae9cc1114b78e SHA512 ae52cac6a2b16ba32d0cc873283e5cb9e284b4195d51d4c17665b20e2f21f91247eba0039cef92c407579ef9b174fee98346954177604dad02d087e8f6bb1ec3 MISC metadata.xml 630 BLAKE2B ebf3d19da137583e30cd2d19d19280c8f18c9e05beb0dc6a35d7863687ff9d28c4ee473ff9fbd97a05dee4cdc96bcb6785f41a22911a00ddc4645c20fc18f655 SHA512 263e1b4f405a67f6e402cd842d95640664c9f961ee29c614022787be76a2d83b5dcb3c4e784bef4369424680bdf1888d440eeb0a195dd8dfa65132c137a2fb55 diff --git a/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch new file mode 100644 index 000000000000..f718bfca736c --- /dev/null +++ b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch @@ -0,0 +1,24 @@ +Taken from: https://github.com/dlundquist/sniproxy/commit/822bb80df9b7b345cc9eba55df74a07b498819ba +Author: Pierre-Olivier Mercier + +--- a/src/http.h ++++ b/src/http.h +@@ -29,6 +29,6 @@ + #include + #include "protocol.h" + +-const struct Protocol *const http_protocol; ++extern const struct Protocol *const http_protocol; + + #endif +--- a/src/tls.h ++++ b/src/tls.h +@@ -28,6 +28,6 @@ + + #include "protocol.h" + +-const struct Protocol *const tls_protocol; ++extern const struct Protocol *const tls_protocol; + + #endif + diff --git a/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild new file mode 100644 index 000000000000..9dc8e5a03ef1 --- /dev/null +++ b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/dlundquist/sniproxy.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://github.com/dlundquist/sniproxy/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Proxies incoming HTTP and TLS connections based on the hostname" +HOMEPAGE="https://github.com/dlundquist/sniproxy" + +LICENSE="BSD-2" +SLOT="0" +IUSE="+dns +largefile rfc3339 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/sniproxy + acct-user/sniproxy + dev-libs/libev + >=dev-libs/libpcre-3 + dns? ( net-libs/udns )" +DEPEND="${RDEPEND} + test? ( net-misc/curl )" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) + +src_prepare() { + default + eautoreconf + + sed -i "/user/s/daemon/sniproxy/" debian/sniproxy.conf || die "Unable to replace configuration" + sed -i "/create/s/daemon/sniproxy/" debian/logrotate.conf || die "Unable to replace logrotate configuration" +} + +src_configure() { + local my_conf=( + $(use_enable dns) + $(use_enable largefile) + $(use_enable rfc3339 rfc3339-timestamps) + ) + + econf "${my_conf[@]}" +} + +src_test() { + emake -j1 check +} + +src_install() { + default + + newinitd "${FILESDIR}/sniproxy.init" sniproxy + + insinto /etc/sniproxy + doins debian/sniproxy.conf + + keepdir /var/log/sniproxy + + insinto /etc/logrotate.d + newins debian/logrotate.conf sniproxy + + dodoc ARCHITECTURE.md AUTHORS README.md + doman man/sniproxy.8 + doman man/sniproxy.conf.5 +} diff --git a/www-servers/sniproxy/sniproxy-0.6.0.ebuild b/www-servers/sniproxy/sniproxy-0.6.0.ebuild deleted file mode 100644 index 458f1e8ac793..000000000000 --- a/www-servers/sniproxy/sniproxy-0.6.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools user - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/dlundquist/sniproxy.git" - EGIT_BRANCH="master" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/dlundquist/sniproxy/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Proxies incoming HTTP and TLS connections based on the hostname" -HOMEPAGE="https://github.com/dlundquist/sniproxy" - -LICENSE="BSD-2" -SLOT="0" -IUSE="+dns +largefile rfc3339 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libev - >=dev-libs/libpcre-3 - dns? ( net-libs/udns ) -" -BDEPEND=" - ${RDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -DEPEND=" - test? ( net-misc/curl ) -" - -src_prepare() { - default - eautoreconf - - sed -i "/user/s/daemon/sniproxy/" debian/sniproxy.conf || die "Unable to replace configuration" - sed -i "/create/s/daemon/sniproxy/" debian/logrotate.conf || die "Unable to replace logrotate configuration" -} - -src_configure() { - local my_conf=( - $(use_enable dns) - $(use_enable largefile) - $(use_enable rfc3339 rfc3339-timestamps) - ) - - econf "${my_conf[@]}" -} - -src_install() { - default - - newinitd "${FILESDIR}/sniproxy.init" sniproxy - - insinto /etc/sniproxy - doins debian/sniproxy.conf - - keepdir /var/log/sniproxy - - insinto /etc/logrotate.d - newins debian/logrotate.conf sniproxy - - dodoc ARCHITECTURE.md AUTHORS README.md - doman man/sniproxy.8 - doman man/sniproxy.conf.5 -} - -src_test() { - emake -j1 check -} - -pkg_postinst() { - enewgroup "${PN}" - enewuser "${PN}" -1 -1 /var/lib/sniproxy "${PN}" -} -- cgit v1.2.3