/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
	-Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
	-Wunused -Wuninitialized -Wstrict-overflow=5 \
4
	-Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
	-Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
6
	-Wunsafe-loop-optimizations -Wpointer-arith \
7
	-Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
8
	-Wconversion -Wlogical-op -Waggregate-return \
9
	-Wstrict-prototypes -Wold-style-definition \
10
	-Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
	-Wredundant-decls -Wnested-externs -Winline -Wvla \
12
	-Wvolatile-register-var -Woverlength-strings
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
13
#DEBUG=-ggdb3
665 by Teddy Hogeborn
* Makefile (WARN): Re-add "-Wunreachable-code".
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
389 by Teddy Hogeborn
* plugins.d/splashy.c: Use exit codes from <sysexits.h>.
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
237.2.31 by Teddy Hogeborn
* Makefile: Don't use PIE if BROKEN_PIE is set.
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
17
LINK_FORTIFY_LD=-z relro -z now
18
LINK_FORTIFY=
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
19
20
# If BROKEN_PIE is set, do not build with -pie
237.2.31 by Teddy Hogeborn
* Makefile: Don't use PIE if BROKEN_PIE is set.
21
ifndef BROKEN_PIE
22
FORTIFY += -fPIE
23
LINK_FORTIFY += -pie
24
endif
24.1.90 by Björn Påhlsson
fixed two bugs:
25
#COVERAGE=--coverage
669 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
26
OPTIMIZE=-Os -fno-strict-aliasing
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
27
LANGUAGE=-std=gnu99
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
28
htmldir=man
237.4.43 by Teddy Hogeborn
* Makefile (version): Changed to "1.6.5".
29
version=1.6.5
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
30
SED=sed
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
31
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
33
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
34
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
35
## Use these settings for a traditional /usr/local install
36
# PREFIX=$(DESTDIR)/usr/local
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
37
# CONFDIR=$(DESTDIR)/etc/mandos
38
# KEYDIR=$(DESTDIR)/etc/mandos/keys
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
39
# MANDIR=$(PREFIX)/man
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
640 by Teddy Hogeborn
Use architecture libdir.
42
# LIBDIR=$(PREFIX)/lib
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
43
##
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
44
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
45
## These settings are for a package-type install
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
46
PREFIX=$(DESTDIR)/usr
47
CONFDIR=$(DESTDIR)/etc/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
48
KEYDIR=$(DESTDIR)/etc/keys/mandos
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
49
MANDIR=$(PREFIX)/share/man
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
51
STATEDIR=$(DESTDIR)/var/lib/mandos
640 by Teddy Hogeborn
Use architecture libdir.
52
LIBDIR=$(shell \
53
	for d in \
54
	"/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
55
	"`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
56
		if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
57
			echo "$(DESTDIR)$$d"; \
58
			break; \
59
		fi; \
60
	done)
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
61
##
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
62
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
64
345 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS): Use "pkg-config" instead of
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
68
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
317 by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags.
69
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
70
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
71
	getconf LFS_LDFLAGS)
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
72
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
73
# Do not change these two
626 by Teddy Hogeborn
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
74
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
75
	$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
76
	-DVERSION='"$(version)"'
626 by Teddy Hogeborn
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
77
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
78
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
79
# Commands to format a DocBook <refentry> document into a manual page
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
80
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
62 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Do not generate AUTHORS section.
81
	--param man.charmap.use.subset		0 \
82
	--param make.year.ranges		1 \
83
	--param make.single.year.ranges		1 \
84
	--param man.output.quietly		1 \
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
85
	--param man.authors.section.enabled	0 \
595 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Don't show errors from "locale".
86
	/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
87
	$(notdir $<); \
595 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Don't show errors from "locale".
88
	if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
89
	&& type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
90
	man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
91
	fi >/dev/null)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
92
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
94
	--param make.year.ranges		1 \
95
	--param make.single.year.ranges		1 \
96
	--param man.output.quietly		1 \
97
	--param man.authors.section.enabled	0 \
98
	--param citerefentry.link		1 \
99
	--output $@ \
100
	/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
101
	$<; $(HTMLPOST) $@)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
102
# Fix citerefentry links
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
103
HTMLPOST=$(SED) --in-place \
104
	--expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
105
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
107
	plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
	plugins.d/plymouth
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
109
CPROGS=plugin-runner $(PLUGINS)
430 by teddy at bsnet
* mandos-monitor.xml: New.
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
112
	mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
113
	plugins.d/mandos-client.8mandos \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
114
	plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
115
	plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
493 by Teddy Hogeborn
* Makefile (DOCS): Added "intro.8mandos".
116
	plugins.d/plymouth.8mandos intro.8mandos
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
117
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
118
htmldocs=$(addsuffix .xhtml,$(DOCS))
119
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
120
objects=$(addsuffix .o,$(CPROGS))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
121
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
122
all: $(PROGS) mandos.lsm
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
123
124
doc: $(DOCS)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
125
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
126
html: $(htmldocs)
127
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
128
%.5: %.xml common.ent legalnotice.xml
129
	$(DOCBOOKTOMAN)
130
%.5.xhtml: %.xml common.ent legalnotice.xml
131
	$(DOCBOOKTOHTML)
132
133
%.8: %.xml common.ent legalnotice.xml
134
	$(DOCBOOKTOMAN)
135
%.8.xhtml: %.xml common.ent legalnotice.xml
136
	$(DOCBOOKTOHTML)
137
138
%.8mandos: %.xml common.ent legalnotice.xml
139
	$(DOCBOOKTOMAN)
140
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
141
	$(DOCBOOKTOHTML)
142
493 by Teddy Hogeborn
* Makefile (DOCS): Added "intro.8mandos".
143
intro.8mandos: intro.xml common.ent legalnotice.xml
144
	$(DOCBOOKTOMAN)
145
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
146
	$(DOCBOOKTOHTML)
147
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
148
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
149
		legalnotice.xml
150
	$(DOCBOOKTOMAN)
151
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
152
		overview.xml legalnotice.xml
153
	$(DOCBOOKTOHTML)
154
155
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
156
		legalnotice.xml
157
	$(DOCBOOKTOMAN)
158
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
159
		 legalnotice.xml
160
	$(DOCBOOKTOHTML)
161
430 by teddy at bsnet
* mandos-monitor.xml: New.
162
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
163
		legalnotice.xml
164
	$(DOCBOOKTOMAN)
165
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
166
		 legalnotice.xml
167
	$(DOCBOOKTOHTML)
168
434 by teddy at bsnet
* mandos-ctl.xml: New.
169
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
170
		legalnotice.xml
171
	$(DOCBOOKTOMAN)
172
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
173
		 legalnotice.xml
174
	$(DOCBOOKTOHTML)
175
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
176
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
177
		legalnotice.xml
178
	$(DOCBOOKTOMAN)
179
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
180
		legalnotice.xml
181
	$(DOCBOOKTOHTML)
182
183
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
184
		legalnotice.xml
185
	$(DOCBOOKTOMAN)
186
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
187
		overview.xml legalnotice.xml
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
188
	$(DOCBOOKTOHTML)
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
189
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
190
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
191
					common.ent \
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
192
					mandos-options.xml \
193
					overview.xml legalnotice.xml
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
194
	$(DOCBOOKTOMAN)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
195
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
196
					common.ent \
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
197
					mandos-options.xml \
198
					overview.xml legalnotice.xml
199
	$(DOCBOOKTOHTML)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
200
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
201
# Update all these files with version number $(version)
202
common.ent: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
203
	$(strip $(SED) --in-place \
318 by Teddy Hogeborn
* Makefile (common.ent): Update "version" entity correctly.
204
		--expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
205
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
206
207
mandos: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
208
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
209
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
210
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
211
212
mandos-keygen: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
213
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
214
		--expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
215
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
216
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
217
mandos-ctl: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
218
	$(strip $(SED) --in-place \
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
219
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
220
		$@)
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
221
430 by teddy at bsnet
* mandos-monitor.xml: New.
222
mandos-monitor: Makefile
223
	$(strip $(SED) --in-place \
224
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
225
		$@)
226
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
227
mandos.lsm: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
228
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
229
		--expression='s/^\(Version:\).*/\1\t$(version)/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
230
		$@)
231
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
232
		--expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
233
		$@)
234
	$(strip $(SED) --in-place \
255 by Teddy Hogeborn
* Makefile (mandos.lsm): Also update file name using version number.
235
		--expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
236
		$@)
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
237
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
238
plugins.d/mandos-client: plugins.d/mandos-client.c
485 by Teddy Hogeborn
Merge from Björn.
239
	$(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
484 by Teddy Hogeborn
* Makefile (plugins.d/mandos-client): Bug fix: Put $^ before all
240
		) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
241
665 by Teddy Hogeborn
* Makefile (WARN): Re-add "-Wunreachable-code".
242
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
243
	check run-client run-server install install-html \
244
	install-server install-client-nokey install-client uninstall \
245
	uninstall-server uninstall-client purge purge-server \
246
	purge-client
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
247
1 by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN
248
clean:
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
249
	-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
250
251
distclean: clean
252
mostlyclean: clean
253
maintainer-clean: clean
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
254
	-rm --force --recursive keydir confdir statedir
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
255
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
256
check:	all
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
257
	./mandos --check
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
258
	./mandos-ctl --check
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
259
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
260
# Run the client with a local config and key
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
261
run-client: all keydir/seckey.txt keydir/pubkey.txt
237.3.1 by teddy at bsnet
* Makefile (run-server, run-client): Add notices about harmless error
262
	@echo "###################################################################"
263
	@echo "# The following error messages are harmless and can be safely     #"
264
	@echo "# ignored.  The messages are caused by not running as root, but   #"
265
	@echo "# you should NOT run \"make run-client\" as root unless you also    #"
266
	@echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
267
	@echo "# From plugin-runner: setuid: Operation not permitted             #"
268
	@echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
269
	@echo "# From mandos-client: setuid: Operation not permitted             #"
270
	@echo "#                     seteuid: Operation not permitted            #"
271
	@echo "#                     klogctl: Operation not permitted            #"
272
	@echo "###################################################################"
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
273
	./plugin-runner --plugin-dir=plugins.d \
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
274
		--config-file=plugin-runner.conf \
505.3.11 by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option.
275
		--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
260 by Teddy Hogeborn
* Makefile (run-client): Pass $(CLIENTARGS) to plugin-runner.
276
		$(CLIENTARGS)
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
277
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
278
# Used by run-client
279
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
280
	install --directory keydir
281
	./mandos-keygen --dir keydir --force
282
283
# Run the server with a local config
574 by Teddy Hogeborn
* mandos: White space and other misc. format fixes only.
284
run-server: confdir/mandos.conf confdir/clients.conf statedir
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
285
	./mandos --debug --no-dbus --configdir=confdir \
286
		--statedir=statedir $(SERVERARGS)
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
287
288
# Used by run-server
289
confdir/mandos.conf: mandos.conf
290
	install --directory confdir
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
291
	install --mode=u=rw,go=r $^ $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
292
confdir/clients.conf: clients.conf keydir/seckey.txt
293
	install --directory confdir
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
294
	install --mode=u=rw $< $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
295
# Add a client password
296
	./mandos-keygen --dir keydir --password >> $@
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
297
statedir:
298
	install --directory statedir
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
299
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
300
install: install-server install-client-nokey
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
301
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
302
install-html: html
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
303
	install --directory $(htmldir)
304
	install --mode=u=rw,go=r --target-directory=$(htmldir) \
305
		$(htmldocs)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
306
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
307
install-server: doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
308
	install --directory $(CONFDIR)
643 by Teddy Hogeborn
Don't require /var/lib/mandos to be installed with user & group.
309
	if install --directory --mode=u=rwx --owner=$(USER) \
310
		--group=$(GROUP) $(STATEDIR); then \
311
		:; \
312
	elif install --directory --mode=u=rwx $(STATEDIR); then \
313
		chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
314
	fi
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
315
	install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
430 by teddy at bsnet
* mandos-monitor.xml: New.
316
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
317
		mandos-ctl
318
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
319
		mandos-monitor
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
320
	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
321
		mandos.conf
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
322
	install --mode=u=rw --target-directory=$(CONFDIR) \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
323
		clients.conf
420.1.1 by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as
324
	install --mode=u=rw,go=r dbus-mandos.conf \
325
		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
326
	install --mode=u=rwx,go=rx init.d-mandos \
327
		$(DESTDIR)/etc/init.d/mandos
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
328
	if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
639 by Teddy Hogeborn
Bug fix: Make sure systemd service file is installed.
329
		install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
330
	fi
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
331
	install --mode=u=rw,go=r default-mandos \
332
		$(DESTDIR)/etc/default/mandos
200 by Teddy Hogeborn
* Makefile: Put the init script before avahi-daemon.
333
	if [ -z $(DESTDIR) ]; then \
334
		update-rc.d mandos defaults 25 15;\
335
	fi
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
336
	gzip --best --to-stdout mandos.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
337
		> $(MANDIR)/man8/mandos.8.gz
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
338
	gzip --best --to-stdout mandos-monitor.8 \
339
		> $(MANDIR)/man8/mandos-monitor.8.gz
340
	gzip --best --to-stdout mandos-ctl.8 \
341
		> $(MANDIR)/man8/mandos-ctl.8.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
342
	gzip --best --to-stdout mandos.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
343
		> $(MANDIR)/man5/mandos.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
344
	gzip --best --to-stdout mandos-clients.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
345
		> $(MANDIR)/man5/mandos-clients.conf.5.gz
549 by teddy at recompile
* Makefile (install-server): Add intro(8mandos) man page.
346
	gzip --best --to-stdout intro.8mandos \
347
		> $(MANDIR)/man8/intro.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
348
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
349
install-client-nokey: all doc
640 by Teddy Hogeborn
Use architecture libdir.
350
	install --directory $(LIBDIR)/mandos $(CONFDIR)
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
351
	install --directory --mode=u=rwx $(KEYDIR) \
640 by Teddy Hogeborn
Use architecture libdir.
352
		$(LIBDIR)/mandos/plugins.d
353
	if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
354
		install --mode=u=rwx \
199 by Teddy Hogeborn
* Makefile: Bug fix: fix syntax error.
355
			--directory "$(CONFDIR)/plugins.d"; \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
356
	fi
505.3.17 by Teddy Hogeborn
* Makefile (install-client-nokey): Create network hook directory.
357
	install --mode=u=rwx,go=rx --directory \
358
		"$(CONFDIR)/network-hooks.d"
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
359
	install --mode=u=rwx,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
360
		--target-directory=$(LIBDIR)/mandos plugin-runner
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
361
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
362
		mandos-keygen
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
363
	install --mode=u=rwx,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
364
		--target-directory=$(LIBDIR)/mandos/plugins.d \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
365
		plugins.d/password-prompt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
366
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
367
		--target-directory=$(LIBDIR)/mandos/plugins.d \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
368
		plugins.d/mandos-client
208 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/usplash".
369
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
370
		--target-directory=$(LIBDIR)/mandos/plugins.d \
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
371
		plugins.d/usplash
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
372
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
373
		--target-directory=$(LIBDIR)/mandos/plugins.d \
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
374
		plugins.d/splashy
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
375
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
376
		--target-directory=$(LIBDIR)/mandos/plugins.d \
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
377
		plugins.d/askpass-fifo
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
378
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
379
		--target-directory=$(LIBDIR)/mandos/plugins.d \
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
380
		plugins.d/plymouth
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
381
	install initramfs-tools-hook \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
382
		$(INITRAMFSTOOLS)/hooks/mandos
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
383
	install --mode=u=rw,go=r initramfs-tools-hook-conf \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
384
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
385
	install initramfs-tools-script \
302 by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
386
		$(INITRAMFSTOOLS)/scripts/init-premount/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
387
	install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
388
	gzip --best --to-stdout mandos-keygen.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
389
		> $(MANDIR)/man8/mandos-keygen.8.gz
390
	gzip --best --to-stdout plugin-runner.8mandos \
391
		> $(MANDIR)/man8/plugin-runner.8mandos.gz
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
392
	gzip --best --to-stdout plugins.d/mandos-client.8mandos \
393
		> $(MANDIR)/man8/mandos-client.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
394
	gzip --best --to-stdout plugins.d/password-prompt.8mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
395
		> $(MANDIR)/man8/password-prompt.8mandos.gz
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
396
	gzip --best --to-stdout plugins.d/usplash.8mandos \
397
		> $(MANDIR)/man8/usplash.8mandos.gz
398
	gzip --best --to-stdout plugins.d/splashy.8mandos \
399
		> $(MANDIR)/man8/splashy.8mandos.gz
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
400
	gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
401
		> $(MANDIR)/man8/askpass-fifo.8mandos.gz
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
402
	gzip --best --to-stdout plugins.d/plymouth.8mandos \
403
		> $(MANDIR)/man8/plymouth.8mandos.gz
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
404
405
install-client: install-client-nokey
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
406
# Post-installation stuff
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
407
	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
408
	update-initramfs -k all -u
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
409
	echo "Now run mandos-keygen --password --dir $(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
410
411
uninstall: uninstall-server uninstall-client
412
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
413
uninstall-server:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
414
	-rm --force $(PREFIX)/sbin/mandos \
430 by teddy at bsnet
* mandos-monitor.xml: New.
415
		$(PREFIX)/sbin/mandos-ctl \
416
		$(PREFIX)/sbin/mandos-monitor \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
417
		$(MANDIR)/man8/mandos.8.gz \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
418
		$(MANDIR)/man8/mandos-monitor.8.gz \
419
		$(MANDIR)/man8/mandos-ctl.8.gz \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
420
		$(MANDIR)/man5/mandos.conf.5.gz \
421
		$(MANDIR)/man5/mandos-clients.conf.5.gz
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
422
	update-rc.d -f mandos remove
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
423
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
424
425
uninstall-client:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
426
# Refuse to uninstall client if /etc/crypttab is explicitly configured
427
# to use it.
428
	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
429
		$(DESTDIR)/etc/crypttab
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
430
	-rm --force $(PREFIX)/sbin/mandos-keygen \
640 by Teddy Hogeborn
Use architecture libdir.
431
		$(LIBDIR)/mandos/plugin-runner \
432
		$(LIBDIR)/mandos/plugins.d/password-prompt \
433
		$(LIBDIR)/mandos/plugins.d/mandos-client \
434
		$(LIBDIR)/mandos/plugins.d/usplash \
435
		$(LIBDIR)/mandos/plugins.d/splashy \
436
		$(LIBDIR)/mandos/plugins.d/askpass-fifo \
437
		$(LIBDIR)/mandos/plugins.d/plymouth \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
438
		$(INITRAMFSTOOLS)/hooks/mandos \
439
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
302 by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
440
		$(INITRAMFSTOOLS)/scripts/init-premount/mandos \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
441
		$(MANDIR)/man8/mandos-keygen.8.gz \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
442
		$(MANDIR)/man8/plugin-runner.8mandos.gz \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
443
		$(MANDIR)/man8/mandos-client.8mandos.gz
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
444
		$(MANDIR)/man8/password-prompt.8mandos.gz \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
445
		$(MANDIR)/man8/usplash.8mandos.gz \
446
		$(MANDIR)/man8/splashy.8mandos.gz \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
447
		$(MANDIR)/man8/askpass-fifo.8mandos.gz \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
448
		$(MANDIR)/man8/plymouth.8mandos.gz \
640 by Teddy Hogeborn
Use architecture libdir.
449
	-rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
450
		 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
451
	update-initramfs -k all -u
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
452
453
purge: purge-server purge-client
454
455
purge-server: uninstall-server
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
456
	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
420.1.1 by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as
457
		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
458
		$(DESTDIR)/etc/default/mandos \
459
		$(DESTDIR)/etc/init.d/mandos \
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
460
		$(SYSTEMD)/mandos.service \
637 by Teddy Hogeborn
Fix fallback to /var/run if /run does not exist for Makefile.
461
		$(DESTDIR)/run/mandos.pid \
462
		$(DESTDIR)/var/run/mandos.pid
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
463
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
464
465
purge-client: uninstall-client
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
466
	-shred --remove $(KEYDIR)/seckey.txt
161 by Teddy Hogeborn
* Makefile (purge-client): Also remove "plugin-runner.conf".
467
	-rm --force $(CONFDIR)/plugin-runner.conf \
468
		$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
469
	-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)