head	1.6;
access;
symbols
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.5
	RELEASE_4_11_0:1.5
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.5
	RELEASE_5_1_0:1.5
	RELEASE_4_8_0:1.5
	RELEASE_5_0_0:1.5
	RELEASE_4_7_0:1.5
	RELEASE_4_6_2:1.5
	RELEASE_4_6_1:1.5
	RELEASE_4_6_0:1.5
	RELEASE_5_0_DP1:1.5
	RELEASE_4_5_0:1.5
	RELEASE_4_4_0:1.5
	RELEASE_4_3_0:1.5
	RELEASE_4_2_0:1.5
	RELEASE_4_1_1:1.5
	RELEASE_4_1_0:1.5
	RELEASE_3_5_0:1.5
	RELEASE_4_0_0:1.4
	RELEASE_3_4_0:1.4
	RELEASE_3_3_0:1.4
	v1_0b:1.1.1.1
	SOBOMAX:1.1.1;
locks; strict;
comment	@# @;


1.6
date	2005.09.01.15.16.20;	author garga;	state dead;
branches;
next	1.5;

1.5
date	2000.06.07.08.00.47;	author sobomax;	state Exp;
branches;
next	1.4;

1.4
date	99.06.30.19.27.31;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	99.06.22.17.24.35;	author steve;	state Exp;
branches;
next	1.2;

1.2
date	99.06.09.08.34.04;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	99.06.09.01.39.21;	author steve;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	99.06.09.01.39.21;	author steve;	state Exp;
branches;
next	;


desc
@@


1.6
log
@- Update to 1.2.6 [1]
- Fix patch files to match new source [1]
- 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) [1]
- Rename patches to reflect which files are patched

PR:		ports/85215
Submitted by:	Phil Kernick <philk@@rotfl.com.au>
Reviewed by:	Chris Larsen <darth@@vader.dk> [1]
@
text
@--- Makefile.orig	Fri Mar 31 08:07:54 2000
+++ Makefile	Wed Jun  7 10:57:22 2000
@@@@ -5,16 +5,16 @@@@
 
 
 # The path to install squirm under
-PREFIX=/usr/local/squirm
+#PREFIX=/usr/local/squirm
 
 # The username that squid runs as (see cache_effective_user in squid.conf)
-USER=squid    
+USER=$(SQUID_UID)
 
 # The group that squid runs as (see cache_effective_group in squid.conf)
-GROUP=squid
+GROUP=$(SQUID_GID)
 
 # The group that the root user belongs to
-ROOT_GROUP = bin
+ROOT_GROUP = wheel
 
 # The regex library (-lgnuregex is common on FreeBSD, none for some Linux'es)
 EXTRALIBS=-lgnuregex
@@@@ -29,26 +29,25 @@@@
 OFILES = squirm.o main.o config.o log.o lists.o ip.o util.o
 HFILES = squirm.h paths.h lists.h log.h ip.h util.h
 
-CC=gcc
+CC?=gcc
 
 
-OPTIMISATION=-O3
+OPTIMISATION=
 BINARIES = squirm
 
-CFLAGS = -O3 -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\"
+CFLAGS += -g -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\"
 #CFLAGS = -Wall -g -DPREFIX=\"$(PREFIX)\"
 #CFLAGS = -Wall -g -DDEBUG
 
 all:	$(BINARIES)
 
 install:	all
-			install -m 755 -o root -g $(ROOT_GROUP) -d $(PREFIX) \
-			$(PREFIX)/bin
-			install -m 770 -o root -g $(GROUP) -d $(PREFIX)/etc
-			install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/logs
-			install -m 660 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \
-			$(PREFIX)/etc
-			install -m 755 -o root -g $(ROOT_GROUP) --strip squirm $(PREFIX)/bin
+			install -m 755 -o root -g $(ROOT_GROUP) -d $(PREFIX)/squirm
+			install -m 750 -o root -g $(GROUP) -d $(PREFIX)/etc/squirm
+			install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/squirm/logs
+			install -m 640 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \
+			$(PREFIX)/etc/squirm
+			$(BSD_INSTALL_PROGRAM) squirm $(PREFIX)/bin
 
 squirm.o:	squirm.c $(HFILES)
 			$(CC) -c squirm.c 	$(CFLAGS)
@


1.5
log
@Update to 1.23.
@
text
@@


1.4
log
@In an attempt to avoid possible security implications with having files
owned by nobody:nogroup, install them owned by SQUIG_UID:SQUID_GID instead.
Also mark this as NO_PACKAGE since you have to set these values in your
environment before installing this port.

Submitted by:	maintainer
Reviewed by:	Rodney W. Grimes <rgrimes@@gndrsh.aac.dev.com>
@
text
@d1 26
a26 5
--- Makefile.real.orig	Wed Mar 11 10:23:51 1998
+++ Makefile.real	Tue Jun 29 15:21:37 1999
@@@@ -1,31 +1,31 @@@@
 # Makefile for Squirm
 #
d28 2
a29 5
-OFILES = squirm.o main.o config.o log.o lists.o regex.o
+OFILES = squirm.o main.o config.o log.o lists.o #regex.o
 
-HFILES = squirm.h paths.h lists.h log.h regex.h
+HFILES = squirm.h paths.h lists.h log.h #regex.h
a30 8
-CC=gcc
+PREFIX?=	/usr/local
+CC?=		cc
 #CC=checkergcc
 
 #EXTRALIBS=-lregex
-#EXTRALIBS=
+EXTRALIBS=	-lgnuregex
d32 2
d36 4
a39 3
-CFLAGS = -O3 -Wall -funroll-loops
+CFLAGS?=	-O3 -Wall -funroll-loops
 #CFLAGS = -Wall -g
d44 14
a57 14
-			install -m 755 -o root -g root -d /usr/local/squirm \
-			/usr/local/squirm/bin
-			install -m 770 -o root -g squid -d /usr/local/squirm/etc
-			install -m 750 -o squid -g squid -d /usr/local/squirm/logs
-			install -m 660 -o root -g squid squirm.local.dist squirm.patterns.dist \
-			/usr/local/squirm/etc
-			install -m 755 -o root -g root --strip squirm /usr/local/squirm/bin
+	install -c -m 755 -o root -g wheel -d $(PREFIX)/squirm
+	install -c -m 750 -o root -g $(SQUID_GID) -d $(PREFIX)/etc/squirm
+	install -c -m 750 -o $(SQUID_UID) -g $(SQUID_GID) -d $(PREFIX)/squirm/logs
+	install -c -m 640 -o root -g $(SQUID_GID) squirm.local.dist squirm.patterns.dist \
+		$(PREFIX)/etc/squirm
+	install -c -m 755 -o root -g wheel --strip squirm $(PREFIX)/bin
 			
d59 1
a59 1
 			$(CC) -c squirm.c 		$(CFLAGS)
@


1.3
log
@Fixup patch botch from previous commit.
@
text
@d1 2
a2 2
--- Makefile.real.orig	Wed Mar 11 02:23:51 1998
+++ Makefile.real	Thu Jun 17 18:13:00 1999
d39 3
a41 3
+	install -c -m 770 -o root -g wheel -d $(PREFIX)/etc/squirm
+	install -c -m 750 -o nobody -g nogroup -d $(PREFIX)/squirm/logs
+	install -c -m 660 -o root -g nogroup squirm.local.dist squirm.patterns.dist \
@


1.2
log
@Fixup permissions on the squirm/etc directory.

Submitted by:	maintainer
@
text
@d1 3
a3 4
diff -ruN ../squirm-1.0betaB.orig/Makefile.real ./Makefile.real
--- Makefile.real.orig	Wed Mar 11 10:23:51 1998
+++ Makefile.real	Tue May 25 17:15:36 1999
@@@@ -1,31 +1,30 @@@@
d14 2
a15 1
+CC?=cc
d18 3
a20 3
-#EXTRALIBS=-lregex
+EXTRALIBS=-lgnuregex
 #EXTRALIBS=
d25 1
a25 1
+CFLAGS? = -O3 -Wall -funroll-loops
d33 1
a33 1
-			install -m 750 -o root -g squid -d /usr/local/squirm/etc
d38 3
a40 3
+	install -c -m 755 -o root -g wheel -d ${PREFIX}/squirm
+	install -c -m 770 -o root -g wheel -d ${PREFIX}/etc/squirm
+	install -c -m 750 -o nobody -g nogroup -d ${PREFIX}/squirm/logs
d42 2
a43 2
+	${PREFIX}/etc/squirm
+	install -c -m 755 -o root -g wheel --strip squirm ${PREFIX}/bin
@


1.1
log
@Initial revision
@
text
@d33 1
a33 1
-			install -m 770 -o root -g squid -d /usr/local/squirm/etc
@


1.1.1.1
log
@Initial import of squirm version 1.0b.
A fast & configurable redirector for the Squid.

PR:		11885
Submitted by:	Maxim Sobolev <sobomax@@altavista.net>
@
text
@@
