ports/85215: Updated port of www/squirm to fix critical errors
Chris Larsen
darth at vader.dk
Tue Aug 30 20:10:17 UTC 2005
The following reply was made to PR ports/85215; it has been noted by GNATS.
From: Chris Larsen <darth at vader.dk>
To: bug-followup at FreeBSD.org, philk at rotfl.com.au
Cc:
Subject: Re: ports/85215: Updated port of www/squirm to fix critical errors
Date: Tue, 30 Aug 2005 22:06:42 +0200
--ZInfyf7laFu/Kiw7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
- Update www/squirm from 1.23 to 1.26
- Fix patch files to match new source
- Change logic in Makefile to use the SQUID_UID and SQUID_GID defaults
that the squid port uses, remove the need to specify the uid/gid,
but inform the user that the defaults are used. (remove the
NO_PACKAGE block)
portlint -C : ok
make package, pkg_add, pkg_delete: ok
Tested on : 5.4-RELEASE-p6 i386
Re.
--
Chris Larsen
"Make something idiot proof,
and someone will invent a better idiot."
--ZInfyf7laFu/Kiw7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="squirm.patch"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/squirm/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 6 Jan 2004 21:55:47 -0000 1.17
+++ Makefile 30 Aug 2005 19:44:45 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= squirm
-PORTVERSION= 1.23
-PORTREVISION= 2
+PORTVERSION= 1.26
CATEGORIES= www
MASTER_SITES= http://squirm.foote.com.au/
EXTRACT_SUFX= .tgz
@@ -17,30 +16,31 @@
RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid
-NO_PACKAGE= must set SQUID_UID and SQUID_GID before building
+SQUID_UID?= squid
+SQUID_GID?= squid
MAKE_ENV+= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
PLIST_SUB= SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
pre-install:
-.if defined(SQUID_UID) && defined(SQUID_GID)
.if (${SQUID_UID} == "nobody") || (${SQUID_GID} == "nogroup")
@${ECHO_MSG}
@${ECHO_MSG} 'WARNING! You are going to install squirm files with either nobody owner or'
@${ECHO_MSG} 'nogroup group, which may be insecure.'
@${ECHO_MSG}
.endif
-.else
+post-install:
@${ECHO_MSG}
- @${ECHO_MSG} 'You should set SQUID_UID and SQUID_GID variables to your squid effective'
- @${ECHO_MSG} 'user/group. For example: SQUID_UID=squid SQUID_GID=squid.'
+.if (${SQUID_UID} == "squid") && (${SQUID_GID} == "squid")
@${ECHO_MSG}
- @${FALSE}
-.endif
-
-post-install:
+ @${ECHO_MSG} 'INFO: Your SQUID_UID and SQUID_GID variables are set to the default'
+ @${ECHO_MSG} ' squid user/group: SQUID_UID = ${SQUID_UID} SQUID_GID = ${SQUID_GID}'
+ @${ECHO_MSG} ' These values are used by the www/squid port. They must match what you have chosen'
+ @${ECHO_MSG} ' for the www/squid port. If you are using different UID/GID they must match,'
+ @${ECHO_MSG} ' or else you are asking for problems !'
@${ECHO_MSG}
+.endif
@${ECHO_MSG} ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++'
@${ECHO_MSG} ' You have to manually add "redirect_program ${PREFIX}/bin/squirm"'
@${ECHO_MSG} ' into your squid.conf file.'
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/squirm/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 29 Jan 2004 16:12:31 -0000 1.3
+++ distinfo 30 Aug 2005 19:07:23 -0000
@@ -1,2 +1,2 @@
-MD5 (squirm-1.23.tgz) = aedcaab22ca3ae0c8440bd0ef9d6e75e
-SIZE (squirm-1.23.tgz) = 43151
+MD5 (squirm-1.26.tgz) = 54ac1d208620ec1e4419f97315d38848
+SIZE (squirm-1.26.tgz) = 24151
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/www/squirm/files/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- files/patch-ab 7 Jun 2000 08:00:47 -0000 1.2
+++ files/patch-ab 30 Aug 2005 19:27:15 -0000
@@ -1,6 +1,6 @@
---- ../squirm-1.23.orig/paths.h Fri Mar 31 08:08:43 2000
-+++ paths.h Wed Jun 7 10:26:23 2000
-@@ -17,14 +17,14 @@
+--- paths.h.org Tue Aug 30 21:14:48 2005
++++ paths.h Tue Aug 30 21:15:40 2005
+@@ -37,14 +37,14 @@
/************* Log File Locations (must be writable by **********/
/************* the user given in the squid.conf file **********/
@@ -9,13 +9,13 @@
-#define LOG_ERROR PREFIX"/logs/squirm.error"
-#define LOG_WHERE PREFIX"/logs/squirm.where"
-#define LOG_DEBUG PREFIX"/logs/squirm.debug"
--#define LOG_INFO PREFIX"/logs/squirm.info"
+-#define LOG_INFO PREFIX"/logs/squirm.info"
+#define LOG_MATCH PREFIX"/squirm/logs/squirm.match"
+#define LOG_FAIL PREFIX"/squirm/logs/squirm.fail"
+#define LOG_ERROR PREFIX"/squirm/logs/squirm.error"
+#define LOG_WHERE PREFIX"/squirm/logs/squirm.where"
+#define LOG_DEBUG PREFIX"/squirm/logs/squirm.debug"
-+#define LOG_INFO PREFIX"/squirm/logs/squirm.info"
++#define LOG_INFO PREFIX"/squirm/logs/squirm.info"
/************* Configuration file locations ***********/
-#define SQUIRM_CONF PREFIX"/etc/squirm.conf"
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/ports/www/squirm/files/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- files/patch-ac 7 Nov 2001 20:26:37 -0000 1.2
+++ files/patch-ac 30 Aug 2005 19:49:10 -0000
@@ -1,29 +1,11 @@
-
-$FreeBSD: ports/www/squirm/files/patch-ac,v 1.2 2001/11/07 20:26:37 sobomax Exp $
-
---- config.c.orig Fri Mar 31 08:08:04 2000
-+++ config.c Wed Nov 7 22:23:27 2001
-@@ -277,7 +277,7 @@
+--- config.c.org Tue Aug 30 21:19:29 2005
++++ config.c Tue Aug 30 21:21:10 2005
+@@ -273,7 +273,7 @@
return 0;
}
- fq_pattern_filename = gen_fq_name(pattern_filename, "etc/");
+ fq_pattern_filename = gen_fq_name(pattern_filename, "etc/squirm/");
if (fq_pattern_filename == NULL) {
- log(LOG_ERROR, "couldn't allocate memory in parse_squirm_conf()\n");
+ logprint(LOG_ERROR, "couldn't allocate memory in parse_squirm_conf()\n");
dodo_mode = 1;
-@@ -304,11 +304,11 @@
- }
- else if (strncasecmp(tmp1,"post", min(strlen("post"), strlen(tmp1))) == 0) {
- methods |= POST;
-- tmp1 += strlen("get");
-+ tmp1 += strlen("post");
- }
- else if (strncasecmp(tmp1, "head", min(strlen("head"), strlen(tmp1))) == 0) {
-- methods |= GET;
-- tmp1 += strlen("get");
-+ methods |= HEAD;
-+ tmp1 += strlen("head");
- }
- else if (strncasecmp(tmp1, "all", min(strlen("all"), strlen(tmp1))) == 0) {
- methods |= ALL;
--ZInfyf7laFu/Kiw7--
More information about the freebsd-ports-bugs
mailing list