From cbbd45a9700a660bcc4e2f762f5004c2aa2b1078 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Tue, 17 Jul 2012 14:33:26 -0700
Subject: implement "-addr" option in mail-scan

---
 tools/makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 7f5dcef..e092702 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -14,6 +14,9 @@ progs = pido hi-q skrewt hi-test mail-scan
 
 all: $(progs)
 
+mail-scan: mail-scan.o
+	$(CC) $< -lboost_regex -o $@
+
 install:
 	install $(progs) /var/qmail/bin/
 	cp filters.conf aufilters.conf /var/qmail/control/
-- 
cgit v1.2.3


From 8fe5ccdb4ee79b4d287b82e80004e1acc9ee4b94 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Thu, 19 Jul 2012 14:10:35 -0700
Subject: teach hi-q to have a "mode" word at the front of each line

---
 tools/makefile | 2 --
 1 file changed, 2 deletions(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index e092702..bb91f37 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -28,8 +28,6 @@ install:
 	chmod u+s  /var/qmail/rbin/checkpassword
 	cp smtp.conf /etc/stunnel/
 	cp pop3.conf /etc/stunnel/
-	chmod 640    /var/qmail/control/*.crtkey
-	chown qmaild /var/qmail/control/*.crtkey
 	install qmail-tls-check_certs /var/qmail/bin/
 	install spamassassin /etc/init.d/
 	install qmail /etc/init.d/
-- 
cgit v1.2.3


From a356f2e89ba2bc25207f2d9605a1d6bcca15d6d7 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Thu, 19 Jul 2012 14:56:22 -0700
Subject: log some interesting variables

---
 tools/makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index bb91f37..04b9d21 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -6,7 +6,7 @@ CC= /usr/bin/g++ -Wall -g -I $(HOME)/lib/include
 
 
 .PHONY : shipit clean list-src ALWAYS foo dirs setup imgs	\
-	zip wc html all hacha hevea tcprules
+	zip wc html all hacha hevea tcprules logmark
 
 .SECONDARY : # do not remove any intermediate files
 
@@ -37,6 +37,9 @@ install:
 /etc/tcpserver/smtp.rules :
 	./mk_smtp_rules $@
 
+logmark:
+	logger -t jsd -p mail.info =========================
+
 ALWAYS:
 	@echo ...
 
-- 
cgit v1.2.3


From 379794ea0d610165e75fca2c71e7161d66e0c10d Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Thu, 19 Jul 2012 15:20:43 -0700
Subject: add greylist

---
 tools/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 04b9d21..8837952 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -10,7 +10,7 @@ CC= /usr/bin/g++ -Wall -g -I $(HOME)/lib/include
 
 .SECONDARY : # do not remove any intermediate files
 
-progs = pido hi-q skrewt hi-test mail-scan
+progs = pido hi-q skrewt hi-test mail-scan greylist
 
 all: $(progs)
 
-- 
cgit v1.2.3


From 945767f12154698fab3e7e370486a5e9b09276e9 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Thu, 19 Jul 2012 20:58:24 -0700
Subject: add "Scan" function to greylist

---
 tools/makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 8837952..97c345c 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -14,6 +14,9 @@ progs = pido hi-q skrewt hi-test mail-scan greylist
 
 all: $(progs)
 
+greylist: greylist.c
+	$(CC) $< -lboost_filesystem-mt -o $@
+
 mail-scan: mail-scan.o
 	$(CC) $< -lboost_regex -o $@
 
-- 
cgit v1.2.3


From 9280a33c63250b841e8a51d4ef3aac2148b4bc12 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Fri, 20 Jul 2012 05:43:54 -0700
Subject: 5 minutes is not enough

---
 tools/makefile | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 97c345c..3e599b8 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -43,6 +43,11 @@ install:
 logmark:
 	logger -t jsd -p mail.info =========================
 
+todo: 
+	echo zap -- kill program group \
+	extended error codes from skrewt, greylist       \
+	extended error codes [-x] from spamc
+
 ALWAYS:
 	@echo ...
 
-- 
cgit v1.2.3


From abcd53ddce872e3f331d8a6d7c1ff44c070b91b0 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Fri, 20 Jul 2012 09:20:36 -0700
Subject: greylist will now zap its program-group

---
 tools/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 3e599b8..cf62473 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -44,7 +44,7 @@ logmark:
 	logger -t jsd -p mail.info =========================
 
 todo: 
-	echo zap -- kill program group \
+	echo zap penalize greylist status of spam       \
 	extended error codes from skrewt, greylist       \
 	extended error codes [-x] from spamc
 
-- 
cgit v1.2.3


From bcce618000e74f0d36780b48c3c49f4a9b5914e5 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sat, 21 Jul 2012 11:16:12 -0700
Subject: check DNS consistency

---
 tools/makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index cf62473..1f878f0 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -44,9 +44,11 @@ logmark:
 	logger -t jsd -p mail.info =========================
 
 todo: 
-	echo zap penalize greylist status of spam       \
-	extended error codes from skrewt, greylist       \
-	extended error codes [-x] from spamc
+	echo \
+	pass message-ID to greylist program \
+	... also provide a way for certain recipients to bypass some checks \
+	... both will require major restructuring, "cat" process \
+	.....
 
 ALWAYS:
 	@echo ...
-- 
cgit v1.2.3


From 46cb697732ea2c2c4a68358109a58232ef2666e7 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sat, 21 Jul 2012 11:43:00 -0700
Subject: dns inconsistency is just a warning for the moment

---
 tools/makefile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 1f878f0..6fa9636 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -48,6 +48,7 @@ todo:
 	pass message-ID to greylist program \
 	... also provide a way for certain recipients to bypass some checks \
 	... both will require major restructuring, "cat" process \
+	... IPv6 reverse-DNS recors     \
 	.....
 
 ALWAYS:
-- 
cgit v1.2.3


From 8ce08aca2410c795dfc46f37dc27402ff6de5dd1 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sat, 21 Jul 2012 15:53:08 -0700
Subject: ignore penalty features for the moment

---
 tools/makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 6fa9636..9059a2f 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -49,7 +49,8 @@ todo:
 	... also provide a way for certain recipients to bypass some checks \
 	... both will require major restructuring, "cat" process \
 	... IPv6 reverse-DNS recors     \
-	.....
+	... "clean up bad DNS reports nnnn --> () ==> ()"     \
+	..... 
 
 ALWAYS:
 	@echo ...
-- 
cgit v1.2.3


From abb71cf6b1145588827d04de4da3bb48ecb06965 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sun, 22 Jul 2012 14:43:07 -0700
Subject: set program gid (not just egid) the way mailman likes it

---
 tools/makefile | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 9059a2f..43418ce 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -10,18 +10,24 @@ CC= /usr/bin/g++ -Wall -g -I $(HOME)/lib/include
 
 .SECONDARY : # do not remove any intermediate files
 
-progs = pido hi-q skrewt hi-test mail-scan greylist
+qprogs = pido hi-q skrewt hi-test mail-scan greylist wripper
 
-all: $(progs)
+all: $(qprogs) wripper
 
-greylist: greylist.c
+greylist: greylist.o
 	$(CC) $< -lboost_filesystem-mt -o $@
 
+wripper: wripper.o
+	$(CC) $< -o $@
+	chgrp daemon $@
+	chmod g+s $@
+
 mail-scan: mail-scan.o
 	$(CC) $< -lboost_regex -o $@
 
 install:
-	install $(progs) /var/qmail/bin/
+	install $(qprogs) /var/qmail/bin/
+	install -gdaemon -m2755 wripper /usr/lib/mailman/mail/
 	cp filters.conf aufilters.conf /var/qmail/control/
 	install -m700 -d /var/qmail/rbin
 	chown qmaild /var/qmail/rbin
@@ -43,14 +49,18 @@ install:
 logmark:
 	logger -t jsd -p mail.info =========================
 
-todo: 
+# Command to let everybody out of the penalty box:
+parole:
+	greylist -scan  |grep penalty | while read addr rest ; do TCPREMOTEIP=$addr greylist -p 1 -v ; done
+
+todo:
 	echo \
 	pass message-ID to greylist program \
 	... also provide a way for certain recipients to bypass some checks \
 	... both will require major restructuring, "cat" process \
 	... IPv6 reverse-DNS recors     \
 	... "clean up bad DNS reports nnnn --> () ==> ()"     \
-	..... 
+	.....
 
 ALWAYS:
 	@echo ...
-- 
cgit v1.2.3


From 8f18b37fd5a46d28544a4f31465c47428a43398b Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sun, 22 Jul 2012 19:13:11 -0700
Subject: create the "bash-c" program, so as to make it easy to write
 self-executing scripts

---
 tools/makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 43418ce..5dc7952 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -12,7 +12,9 @@ CC= /usr/bin/g++ -Wall -g -I $(HOME)/lib/include
 
 qprogs = pido hi-q skrewt hi-test mail-scan greylist wripper
 
-all: $(qprogs) wripper
+moreprogs = wripper bash-c
+
+all: $(qprogs) $(moreprogs)
 
 greylist: greylist.o
 	$(CC) $< -lboost_filesystem-mt -o $@
@@ -28,6 +30,7 @@ mail-scan: mail-scan.o
 install:
 	install $(qprogs) /var/qmail/bin/
 	install -gdaemon -m2755 wripper /usr/lib/mailman/mail/
+	install bash-c /usr/local/bin/
 	cp filters.conf aufilters.conf /var/qmail/control/
 	install -m700 -d /var/qmail/rbin
 	chown qmaild /var/qmail/rbin
-- 
cgit v1.2.3


From 5543dfa42516a12403aaea93816bbd98fdf45318 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Mon, 23 Jul 2012 08:43:49 -0700
Subject: the usual automatic dependency-finder

---
 tools/makefile | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 5dc7952..08bf17c 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -10,12 +10,33 @@ CC= /usr/bin/g++ -Wall -g -I $(HOME)/lib/include
 
 .SECONDARY : # do not remove any intermediate files
 
-qprogs = pido hi-q skrewt hi-test mail-scan greylist wripper
+# sources for main programs that go in /var/qmail/bin
+qmain = pido.c hi-q.c skrewt.c hi-test.c mail-scan.c greylist.c wripper.c
+qprogs = $(qmain:%.c=%)
 
-moreprogs = wripper bash-c
+# sources for other main programs:
+moremain = wripper.c bash-c.c 
+moreprogs = $(moremain:%.c=%)
+
+nonmain = 
+
+sources = $(qmain) $(moremain) $(nonmain)
+
+beware_other = checkpassword.c spamc.c
+
+## dependency-finding scheme (with local mods) based on:
+## http://www.gnu.org/manual/make-3.77/html_mono/make.html#SEC42
+## (see also include statement at end of this makefile)
+%.d : %.c
+	@$(SHELL) -ec '$(CXX) -MM $(CXXFLAGS) $< \
+                | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \
+                [ -s $@ ] || rm -f $@'
 
 all: $(qprogs) $(moreprogs)
 
+show:
+	: --- $(qprogs) +++ $(moreprogs)
+
 greylist: greylist.o
 	$(CC) $< -lboost_filesystem-mt -o $@
 
@@ -70,3 +91,5 @@ ALWAYS:
 
 ##?? include $(chapters:.htm=.d)
 ##?? include $(fancy:%.htm=aux/%.fig)
+
+include $(sources:.c=.d)
-- 
cgit v1.2.3


From 02bfae1f87c4693eb00bf943fb24886a5ac47a09 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Tue, 24 Jul 2012 11:29:56 -0700
Subject: improve compatibility across boost versions; allow use by
 non-superuser

---
 tools/makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 08bf17c..76df23b 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -38,12 +38,13 @@ show:
 	: --- $(qprogs) +++ $(moreprogs)
 
 greylist: greylist.o
-	$(CC) $< -lboost_filesystem-mt -o $@
+	$(CC) $< -lboost_filesystem-mt -lboost_system -o $@
+
+#	$(CC) $< -lboost_filesystem -o $@
 
 wripper: wripper.o
 	$(CC) $< -o $@
-	chgrp daemon $@
-	chmod g+s $@
+	chgrp daemon $@ && chmod g+s $@ || true
 
 mail-scan: mail-scan.o
 	$(CC) $< -lboost_regex -o $@
-- 
cgit v1.2.3


From d2564d25e802d1ee3230cf045c4940e836b5c6a2 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sun, 29 Jul 2012 16:50:11 -0700
Subject: split ltgrey (and libltgrey) off from greylist; put some utility
 functions into their own file.

---
 tools/makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index 76df23b..f0a3f70 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -15,10 +15,10 @@ qmain = pido.c hi-q.c skrewt.c hi-test.c mail-scan.c greylist.c wripper.c
 qprogs = $(qmain:%.c=%)
 
 # sources for other main programs:
-moremain = wripper.c bash-c.c 
+moremain = wripper.c bash-c.c ltgrey.c
 moreprogs = $(moremain:%.c=%)
 
-nonmain = 
+nonmain = libltgrey.c
 
 sources = $(qmain) $(moremain) $(nonmain)
 
@@ -37,10 +37,14 @@ all: $(qprogs) $(moreprogs)
 show:
 	: --- $(qprogs) +++ $(moreprogs)
 
-greylist: greylist.o
+skrewt: skrewt.o
 	$(CC) $< -lboost_filesystem-mt -lboost_system -o $@
 
-#	$(CC) $< -lboost_filesystem -o $@
+greylist: greylist.o utils.o
+	$(CC) $^ -lboost_filesystem-mt -lboost_system -o $@
+
+ltgrey: ltgrey.o utils.o libltgrey.o
+	$(CC) $^ -lboost_filesystem-mt -lboost_system -o $@
 
 wripper: wripper.o
 	$(CC) $< -o $@
-- 
cgit v1.2.3


From 63be414b62f3234ad80607b95e8e71e33bfd8025 Mon Sep 17 00:00:00 2001
From: John Denker <jsd@av8n.com>
Date: Sun, 29 Jul 2012 17:00:15 -0700
Subject: move more stuff to utils.c ... I hate duplication of code

---
 tools/makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'tools/makefile')

diff --git a/tools/makefile b/tools/makefile
index f0a3f70..6594ca8 100644
--- a/tools/makefile
+++ b/tools/makefile
@@ -37,8 +37,8 @@ all: $(qprogs) $(moreprogs)
 show:
 	: --- $(qprogs) +++ $(moreprogs)
 
-skrewt: skrewt.o
-	$(CC) $< -lboost_filesystem-mt -lboost_system -o $@
+skrewt: skrewt.o utils.o
+	$(CC) $^ -lboost_filesystem-mt -lboost_system -o $@
 
 greylist: greylist.o utils.o
 	$(CC) $^ -lboost_filesystem-mt -lboost_system -o $@
@@ -47,11 +47,14 @@ ltgrey: ltgrey.o utils.o libltgrey.o
 	$(CC) $^ -lboost_filesystem-mt -lboost_system -o $@
 
 wripper: wripper.o
-	$(CC) $< -o $@
+	$(CC) $^ -o $@
 	chgrp daemon $@ && chmod g+s $@ || true
 
-mail-scan: mail-scan.o
-	$(CC) $< -lboost_regex -o $@
+mail-scan: mail-scan.o utils.o
+	$(CC) $^ -lboost_regex -o $@
+
+hi-test: hi-test.o utils.o
+	$(CC) $^ -lboost_regex -o $@
 
 install:
 	install $(qprogs) /var/qmail/bin/
-- 
cgit v1.2.3