* [gentoo-commits] repo/gentoo:master commit in: net-proxy/rejik/
@ 2020-09-26 20:44 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-09-26 20:44 UTC (permalink / raw
To: gentoo-commits
commit: a9b1f753824f1f3b9c921e2fa138b7f92a50c1ea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 20:44:23 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 20:44:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b1f753
net-proxy/rejik: fix RedundantDodir
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/rejik/rejik-3.2.10.ebuild | 2 --
net-proxy/rejik/rejik-3.2.11.ebuild | 2 --
2 files changed, 4 deletions(-)
diff --git a/net-proxy/rejik/rejik-3.2.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
index 9a336dac0fd..e566d009210 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.10.ebuild
@@ -40,7 +40,6 @@ src_prepare() {
}
src_install() {
- dodir /opt/rejik
exeinto /opt/rejik
insinto /opt/rejik
@@ -48,7 +47,6 @@ src_install() {
doexe redirector
doins redirector.conf.dist
- dodir /opt/rejik/tools
insinto /opt/rejik/tools
exeinto /opt/rejik/tools
diff --git a/net-proxy/rejik/rejik-3.2.11.ebuild b/net-proxy/rejik/rejik-3.2.11.ebuild
index b7da9c359d0..da5a1a17a73 100644
--- a/net-proxy/rejik/rejik-3.2.11.ebuild
+++ b/net-proxy/rejik/rejik-3.2.11.ebuild
@@ -43,7 +43,6 @@ src_prepare() {
}
src_install() {
- dodir /opt/rejik
exeinto /opt/rejik
insinto /opt/rejik
@@ -51,7 +50,6 @@ src_install() {
doexe redirector
doins redirector.conf.dist
- dodir /opt/rejik/tools
insinto /opt/rejik/tools
exeinto /opt/rejik/tools
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/rejik/
@ 2022-10-15 15:13 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-10-15 15:13 UTC (permalink / raw
To: gentoo-commits
commit: e984227fed8a30889577731e0734350cb72f56cc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 15:09:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 15:09:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e984227f
net-proxy/rejik: drop 3.2.10
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/rejik/Manifest | 1 -
net-proxy/rejik/rejik-3.2.10.ebuild | 80 -------------------------------------
2 files changed, 81 deletions(-)
diff --git a/net-proxy/rejik/Manifest b/net-proxy/rejik/Manifest
index a501b0e87363..7ab17756ec29 100644
--- a/net-proxy/rejik/Manifest
+++ b/net-proxy/rejik/Manifest
@@ -1,3 +1,2 @@
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.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
deleted file mode 100644
index e566d009210b..000000000000
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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() {
- 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() {
- exeinto /opt/rejik
- insinto /opt/rejik
-
- doexe make-cache
- doexe redirector
- doins redirector.conf.dist
-
- 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"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/rejik/
@ 2020-09-26 20:42 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-09-26 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 96c89b27019b5b9f1c2bcaca4909729d12b40290
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 20:36:40 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 20:42:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c89b27
net-proxy/rejik: port to EAPI 7
Closes: https://bugs.gentoo.org/742026
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-proxy/rejik/rejik-3.2.10.ebuild | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/net-proxy/rejik/rejik-3.2.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
index 2c60bc8a830..9a336dac0fd 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.10.ebuild
@@ -1,14 +1,15 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils toolchain-funcs
+inherit 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"
@@ -21,21 +22,21 @@ RDEPEND="${DEPEND}
dev-perl/XML-Parser
net-proxy/squid"
-S=${WORKDIR}/redirector-${PV}
-
src_prepare() {
- sed -i -e "s:INSTALL_PATH=/usr/local/rejik3:INSTALL_PATH=${D}/opt/rejik:g" Makefile
- sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" vars.h
- sed -i -e "s:SQUID_USER=nobody:SQUID_USER=squid:g" Makefile
- sed -i -e "s:SQUID_GROUP=nogroup:SQUID_GROUP=squid:g" Makefile
+ 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
+ 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
+ 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
- sed -i -e "s:change_log /usr/local/rejik3:change_log /var/log/rejik:g" redirector.conf.dist
- sed -i -e "s:/usr/local/rejik3:/opt/rejik:g" redirector.conf.dist
+ 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() {
@@ -51,9 +52,6 @@ src_install() {
insinto /opt/rejik/tools
exeinto /opt/rejik/tools
- fperms +x tools/kill-cache
- fperms +x tools/benchmark
-
doexe tools/kill-cache
doexe tools/benchmark
doins tools/IN.gz
@@ -79,6 +77,6 @@ pkg_postinst() {
einfo "redirect_program /opt/rejik/redirector /opt/rejik/redirector.conf"
einfo "to /etc/squid/squid.conf"
einfo ""
- einfo "Dont forget to edit /opt/rejik/redirector.conf"
+ einfo "Don't forget to edit /opt/rejik/redirector.conf"
einfo "Be sure redirector.conf has right permissions"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/rejik/
@ 2020-09-26 20:42 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-09-26 20:42 UTC (permalink / raw
To: gentoo-commits
commit: a47cec5305ebab864083eb338e0926fc1887eb81
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 20:41:13 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-proxy/rejik/
@ 2020-06-04 9:06 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-06-04 9:06 UTC (permalink / raw
To: gentoo-commits
commit: 1ab1b422811161e72232a0a901d275e11cdf78de
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Thu Jun 4 09:05:54 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jun 4 09:05:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab1b422
net-proxy/rejik: update homepage
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov <sokolov <AT> google.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-proxy/rejik/rejik-3.2.10.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-proxy/rejik/rejik-3.2.10.ebuild b/net-proxy/rejik/rejik-3.2.10.ebuild
index f5fc802fb24..2c60bc8a830 100644
--- a/net-proxy/rejik/rejik-3.2.10.ebuild
+++ b/net-proxy/rejik/rejik-3.2.10.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="4"
@@ -6,8 +6,8 @@ EAPI="4"
inherit eutils toolchain-funcs
DESCRIPTION="A squid redirector used for blocking unwanted content"
-HOMEPAGE="http://rejik.ru/"
-SRC_URI="http://rejik.ru/download/redirector-${PV}.tgz
+HOMEPAGE="https://rejik.ru/"
+SRC_URI="https://rejik.ru/download/redirector-${PV}.tgz
banlists? ( http://rejik.ru/download/banlists-2.x.x.tgz )"
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-15 15:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-26 20:44 [gentoo-commits] repo/gentoo:master commit in: net-proxy/rejik/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-10-15 15:13 Sam James
2020-09-26 20:42 Sam James
2020-09-26 20:42 Sam James
2020-06-04 9:06 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox