From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66BD413835A for ; Sat, 26 Sep 2020 20:43:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FDA5E083D; Sat, 26 Sep 2020 20:43:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2620EE083D for ; Sat, 26 Sep 2020 20:43:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 720A3335DA9 for ; Sat, 26 Sep 2020 20:42:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3175E378 for ; Sat, 26 Sep 2020 20:42:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1601152935.a47cec5305ebab864083eb338e0926fc1887eb81.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/rejik/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/rejik/Manifest net-proxy/rejik/rejik-3.2.11.ebuild X-VCS-Directories: net-proxy/rejik/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a47cec5305ebab864083eb338e0926fc1887eb81 X-VCS-Branch: master Date: Sat, 26 Sep 2020 20:42:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bc53b2f8-f166-47e0-82d3-6516e3dc241c X-Archives-Hash: b9e8809a422fa7789c63a26a5a65eeff commit: a47cec5305ebab864083eb338e0926fc1887eb81 Author: Sam James gentoo org> AuthorDate: Sat Sep 26 20:41:13 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 26 20:42:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47cec53 net-proxy/rejik: bump to 3.2.11 Closes: https://bugs.gentoo.org/706766 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> net-proxy/rejik/Manifest | 1 + net-proxy/rejik/rejik-3.2.11.ebuild | 85 +++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest index 530edd43f2a..a501b0e8736 100644 --- a/net-proxy/rejik/Manifest +++ b/net-proxy/rejik/Manifest @@ -1,2 +1,3 @@ DIST banlists-2.x.x.tgz 116100 BLAKE2B 401d3cd995b7e2adcb28055c4f107799a87397a1ed06c698d70b2a4b755565759d7f56eb70a8d59a5ea04cdc51c6142d6bd03ebdd414133fd71792c66c5fe54e SHA512 068d01685e01679b2726da1cbc5f31f6aba54ab2194e8ab145bd2409e7fc71e3662445a8274b08746e5cdeadea2197f5a72a1abef98ec91267df851615b188b3 DIST redirector-3.2.10.tgz 45407 BLAKE2B 735cab04b58d62a5772b2da540f1f358d20a1bf4612ab1d838066e9319bf28e3288a988e2fbebd5a7f7e6ad3912a59f3fadbed3bddf99b557ee562cd45779751 SHA512 6e82341e402b149464b048e763cfa6f7bc514bae48514b482eded9288af9705942fbfd2e11b5701d3540489ec5ccab358848108fe15f25c5ab2915e44f3f1033 +DIST redirector-3.2.11.tgz 45758 BLAKE2B 39f83c8245d8a24c7454d40d607c851250bd9844f56ee8e9f43d64f32ac3cb52d9c1d9091e3d5126133d94fe59d5be8e8d99b7f2cb253c7731a73e344604a1ce SHA512 e4b20f11a46a84d47c8e6adc74f88f6092f9791e1b6050a3e3b4685cf4c510b55f32ea3d4c9a334dbe5753ee486b98ca73bb7e2d9854e2c8d299b7fd50fce2f8 diff --git a/net-proxy/rejik/rejik-3.2.11.ebuild b/net-proxy/rejik/rejik-3.2.11.ebuild new file mode 100644 index 00000000000..b7da9c359d0 --- /dev/null +++ b/net-proxy/rejik/rejik-3.2.11.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="A squid redirector used for blocking unwanted content" +HOMEPAGE="https://rejik.ru/" +SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz + banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )" +S="${WORKDIR}/redirector-${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="banlists" + +DEPEND="dev-libs/libpcre" +RDEPEND="${DEPEND} + dev-perl/Text-Iconv + dev-perl/XML-Parser + net-proxy/squid" + +src_prepare() { + # Workaround for GCC 10 failure, bug #706766 + append-cflags -fcommon + + sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${ED}/opt/rejik:g" Makefile || die + sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h || die + sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile || die + sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile || die + # Respect CFLAGS + sed -i -e "s;CC=gcc -Wall;CC=$(tc-getCC) $CFLAGS;" Makefile || die + # Respect LDFLAGS + sed -i -e "s:LIBS=-L/lib \`pcre-config --libs\`:LIBS=-L/lib \`pcre-config --libs\` $LDFLAGS:" Makefile || die + # + sed -i -e "s:error_log /usr/local/rejik3:error_log /var/log/rejik:g" redirector.conf.dist || die + sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist || die + sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist || die + + default +} + +src_install() { + dodir /opt/rejik + exeinto /opt/rejik + insinto /opt/rejik + + doexe make-cache + doexe redirector + doins redirector.conf.dist + + dodir /opt/rejik/tools + insinto /opt/rejik/tools + exeinto /opt/rejik/tools + + doexe tools/kill-cache + doexe tools/benchmark + doins tools/IN.gz + + fowners -R squid:squid /opt/rejik + fperms 750 /opt/rejik + + keepdir /var/log/rejik + fowners -R squid:squid /var/log/rejik + + if use banlists; then + insinto /opt/rejik + doins -r "${WORKDIR}/banlists" + fi +} + +pkg_postinst() { + einfo "" + einfo "Copy /opt/rejik/redirector.conf.dist to /opt/rejik/redirector.conf and add line" + einfo "for squid 3.*" + einfo "url_rewrite_program /opt/rejik/redirector /opt/rejik/redirector.conf " + einfo "for squid 2.*" + einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf" + einfo "to /etc/squid/squid.conf" + einfo "" + einfo "Don't forget to edit /opt/rejik/redirector.conf" + einfo "Be sure redirector.conf has right permissions" +}