/mandos/trunk

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