SOURCES: squidwall-Makefile.patch - updated for 0.4e

[paszczus]

Author: paszczus                     Date: Wed Apr  2 07:19:37 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.4e

---- Files affected:
SOURCES:
   squidwall-Makefile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/squidwall-Makefile.patch
diff -u SOURCES/squidwall-Makefile.patch:1.1 SOURCES/squidwall-Makefile.patch:1.2
--- SOURCES/squidwall-Makefile.patch:1.1	Tue Jul 12 10:04:15 2005
+++ SOURCES/squidwall-Makefile.patch	Wed Apr  2 09:19:32 2008
@@ -1,37 +1,15 @@
-diff -ur squidwall-0.1/Makefile squidwall-0.1.new/Makefile
---- squidwall-0.1/Makefile	2005-07-11 10:31:43.000000000 +0000
-+++ squidwall-0.1.new/Makefile	2005-07-12 07:52:17.308183232 +0000
-@@ -3,15 +3,15 @@
- # - change it to fit your needs
- # - see also params.h
+diff -ur squidwall-0.4e/Makefile squidwall-0.4e.new/Makefile
+--- squidwall-0.4e/Makefile	2006-09-02 23:37:23.000000000 +0200
++++ squidwall-0.4e.new/Makefile	2008-04-02 08:59:37.781992367 +0200
+@@ -13,8 +13,8 @@
  
--BINDIR		= /usr/bin
--LOGDIR		= /var/log/squid
--SQUID_USER	= proxy
--SQUID_GROUP	= proxy
-+BINDIR		= ${DESTDIR}/usr/bin
-+LOGDIR		= ${DESTDIR}/var/log/squid
-+SQUID_USER	= squid
-+SQUID_GROUP	= squid
- 
- DIET	= $(shell basename `which diet 2>/dev/null` 2>/dev/null)
+ DIET	= $(shell test -x /opt/diet/bin/diet && echo /opt/diet/bin/diet)
  CC	= $(DIET) gcc
- CFLAGS	= -Os -Wall -pipe -I../libowfat
+-CFLAGS	= -Os -Wall -pipe -I../libowfat
 -LDFLAGS	= ../libowfat/libowfat.a
++CFLAGS	= -Os -Wall -pipe -I/usr/include/libowfat/
 +LDFLAGS	= /usr/lib/libowfat.a
  
  # extraflags
- #CFLAGS += -W
-@@ -47,8 +47,8 @@
- install:
- 	rm -f $(BINDIR)/squidwall
- 	cp -f squidwall $(BINDIR)/squidwall
--	chown $(SQUID_USER).$(SQUID_GROUP) $(BINDIR)/squidwall
--	chmod 711 $(BINDIR)/squidwall
-+#	chown $(SQUID_USER).$(SQUID_GROUP) $(BINDIR)/squidwall
-+#	chmod 711 $(BINDIR)/squidwall
- 	touch $(LOGDIR)/squidwall.log
--	chown $(SQUID_USER).$(SQUID_GROUP) $(LOGDIR)/squidwall.log
--	chmod 600 $(LOGDIR)/squidwall.log
-+#	chown $(SQUID_USER).$(SQUID_GROUP) $(LOGDIR)/squidwall.log
-+#	chmod 600 $(LOGDIR)/squidwall.log
+ CFLAGS += -W
+Tylko w squidwall-0.4e.new/: Makefile~
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/squidwall-Makefile.patch?r1=1.1&r2=1.2&f=u