Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Jan 2006 04:10:45 GMT
From:      Elisey Savateev <b3k@mail.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/92180: Update port: www/rejik updated squid-like-www-en.tgz, one more master site and little changes in port Makefile
Message-ID:  <200601230410.k0N4AjUv048305@www.freebsd.org>
Resent-Message-ID: <200601230420.k0N4K2aa061144@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         92180
>Category:       ports
>Synopsis:       Update port: www/rejik updated squid-like-www-en.tgz, one more master site and little changes in port Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 23 04:20:01 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Elisey Savateev
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
FreeBSD beastie 6.0-STABLE FreeBSD 6.0-STABLE #7: Thu Jan 19 09:43:24 YEKT 2006     root@beastie:/usr/obj/usr/src/sys/CUSTOM  i386
>Description:
Rejik is a squid redirector used for blocking unwanted content basing
on URLs and Perl Compatible Regular Expressions (http://www.pcre.org/).

WWW: http://www.rejik.ru/
>How-To-Repeat:
              
>Fix:
diff -ruN rejik.bak/Makefile rejik/Makefile
--- rejik.bak/Makefile	Sun Jan 22 16:51:06 2006
+++ rejik/Makefile	Mon Jan 23 08:49:24 2006
@@ -2,13 +2,15 @@
 # Date created:				29 October 2005
 # Whom:					Elisey Savateev <b3k@mail.ru>
 #
-# $FreeBSD: ports/www/rejik/Makefile,v 1.1 2005/11/11 22:00:24 pav Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	rejik
 PORTVERSION=	3.2.0
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	http://www.rejik.ru/download/
+MASTER_SITES=	http://www.rejik.ru/download/ \
+				http://bio3k.softboard.ru/uploads/arch/
 DISTNAME=	redirector-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -89,6 +91,10 @@
 .if defined(WITH_DBL)
 	@${TAR} -xzf ${DISTDIR}/dbl-2.0.tgz -C ${INSTALL_PATH}
 	@${CHOWN} -R ${SQUID_USER}:${SQUID_GROUP} ${INSTALL_PATH}/dbl
+	@${REINPLACE_CMD} -e 's|$WGET="/usr/bin/wget";|$WGET="${LOCALBASE}/wget";| ; \
+		s|$dir="/usr/local/rejik3/dbl";|$dir="${INSTALL_PATH}/dbl";|' \
+		${INSTALL_PATH}/dbl/Update ${INSTALL_PATH}/dbl/Update.Fast ${INSTALL_PATH}/dbl/dbl_expand
+	@${RM} ${INSTALL_PATH}/dbl/*.bak
 .endif
 .if !defined(WITHOUT_WWW)
 	@${TAR} -xzf ${DISTDIR}/squid-like-www-en.tgz -C ${WWW_PATH}
diff -ruN rejik.bak/distinfo rejik/distinfo
--- rejik.bak/distinfo	Sun Jan 22 16:51:06 2006
+++ rejik/distinfo	Sun Jan 22 15:39:31 2006
@@ -4,9 +4,9 @@
 MD5 (banlists-2.x.x.tgz) = a1c7c48f9ae94b2ef35f56a094285c10
 SHA256 (banlists-2.x.x.tgz) = 221a40e8db9d19477d6fdece00c9152526a0d2f0c2298504fc99b4378457b09e
 SIZE (banlists-2.x.x.tgz) = 116100
-MD5 (squid-like-www-en.tgz) = 94ea17b04c7793cc395643909b33c30c
-SHA256 (squid-like-www-en.tgz) = 7212d877218185a709ea59089d73da862aa8551127926566ca58effb453a6fb6
-SIZE (squid-like-www-en.tgz) = 897
+MD5 (squid-like-www-en.tgz) = 846627e27405e22e578072b85a0ccc15
+SHA256 (squid-like-www-en.tgz) = 518d493498e0e3a519527ee60d44374fb696aa7ae36a7195ec5f0714108312a1
+SIZE (squid-like-www-en.tgz) = 1206
 MD5 (dbl-2.0.tgz) = f8d51329458aaac5b7fe1a89ad9bbd4a
 SHA256 (dbl-2.0.tgz) = 45577958a9f9519919e0b61ccfdbda30a467f55721d94a67cb07e8f1c1e55c55
 SIZE (dbl-2.0.tgz) = 3355
diff -ruN rejik.bak/files/pkg-message.in rejik/files/pkg-message.in
--- rejik.bak/files/pkg-message.in	Sun Jan 22 16:51:06 2006
+++ rejik/files/pkg-message.in	Sun Jan 22 15:56:44 2006
@@ -1,3 +1,4 @@
+===============================================================================
 1. Make sure that squid runs under user %%SQUID_USER%% and group %%SQUID_GROUP%%.
 
 2. Copy %%PREFIX%%/%%INSTALL_DIR%%/redirector.conf.dist to
@@ -8,3 +9,4 @@
    to squid.conf.
 
 4. See http://www.rejik.ru/ for detailed instructions.
+===============================================================================
diff -ruN rejik.bak/pkg-message rejik/pkg-message
--- rejik.bak/pkg-message	Sun Jan 22 16:51:06 2006
+++ rejik/pkg-message	Sun Jan 22 17:11:57 2006
@@ -1,3 +1,4 @@
+===============================================================================
 1. Make sure that squid runs under user squid and group squid.
 
 2. Copy /usr/local/rejik/redirector.conf.dist to 
@@ -8,3 +9,4 @@
    to squid.conf.
 
 4. See http://www.rejik.ru/ for detailed instructions.
+===============================================================================
diff -ruN rejik.bak/pkg-plist rejik/pkg-plist
--- rejik.bak/pkg-plist	Sun Jan 22 16:51:06 2006
+++ rejik/pkg-plist	Mon Jan 23 08:51:56 2006
@@ -28,9 +28,9 @@
 @dirrm %%INSTALL_DIR%%/tools
 @dirrm %%INSTALL_DIR%%
 %%WWW%%%%WWW_DIR%%/ban/1x1.gif
+%%WWW%%%%WWW_DIR%%/ban/access_denied.html
 %%WWW%%%%WWW_DIR%%/ban/audio-video.html
 %%WWW%%%%WWW_DIR%%/ban/js.js
-%%WWW%%%%WWW_DIR%%/ban/mp3.html
 %%WWW%%%%WWW_DIR%%/ban/porno.html
-%%WWW%%%%WWW_DIR%%/ban/warez.html
+%%WWW%%%%WWW_DIR%%/ban/spyware.html
 %%WWW%%@dirrm %%WWW_DIR%%/ban
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601230410.k0N4AjUv048305>