/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.2.32 by Teddy Hogeborn
* Makefile (version): Changed to "1.0.14".
26
version=1.0.14
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)
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
90
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
430 by teddy at bsnet
* mandos-monitor.xml: New.
91
	mandos-monitor.8 \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
92
	plugins.d/mandos-client.8mandos \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
93
	plugins.d/password-prompt.8mandos mandos.conf.5 \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
94
	plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
95
	plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
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
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
		legalnotice.xml
124
	$(DOCBOOKTOMAN)
125
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
126
		overview.xml legalnotice.xml
127
	$(DOCBOOKTOHTML)
128
129
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
130
		legalnotice.xml
131
	$(DOCBOOKTOMAN)
132
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
133
		 legalnotice.xml
134
	$(DOCBOOKTOHTML)
135
430 by teddy at bsnet
* mandos-monitor.xml: New.
136
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
137
		legalnotice.xml
138
	$(DOCBOOKTOMAN)
139
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
140
		 legalnotice.xml
141
	$(DOCBOOKTOHTML)
142
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
143
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
144
		legalnotice.xml
145
	$(DOCBOOKTOMAN)
146
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
147
		legalnotice.xml
148
	$(DOCBOOKTOHTML)
149
150
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
151
		legalnotice.xml
152
	$(DOCBOOKTOMAN)
153
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
154
		overview.xml legalnotice.xml
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
155
	$(DOCBOOKTOHTML)
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
156
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
157
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
158
					common.ent \
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
159
					mandos-options.xml \
160
					overview.xml legalnotice.xml
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
161
	$(DOCBOOKTOMAN)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
162
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
163
					common.ent \
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
164
					mandos-options.xml \
165
					overview.xml legalnotice.xml
166
	$(DOCBOOKTOHTML)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
167
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
168
# Update all these files with version number $(version)
169
common.ent: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
170
	$(strip $(SED) --in-place \
318 by Teddy Hogeborn
* Makefile (common.ent): Update "version" entity correctly.
171
		--expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
172
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
173
174
mandos: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
175
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
176
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
177
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
178
179
mandos-keygen: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
180
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
181
		--expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
182
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
183
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
184
mandos-ctl: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
185
	$(strip $(SED) --in-place \
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
186
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
187
		$@)
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
188
430 by teddy at bsnet
* mandos-monitor.xml: New.
189
mandos-monitor: Makefile
190
	$(strip $(SED) --in-place \
191
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
192
		$@)
193
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
194
mandos.lsm: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
195
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
196
		--expression='s/^\(Version:\).*/\1\t$(version)/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
197
		$@)
198
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
199
		--expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
200
		$@)
201
	$(strip $(SED) --in-place \
255 by Teddy Hogeborn
* Makefile (mandos.lsm): Also update file name using version number.
202
		--expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
203
		$@)
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
204
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
205
plugins.d/mandos-client: plugins.d/mandos-client.c
206
	$(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
207
		) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
208
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
209
.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
210
	install-server install-client uninstall uninstall-server \
211
	uninstall-client purge purge-server purge-client
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
212
1 by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN
213
clean:
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
214
	-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
215
216
distclean: clean
217
mostlyclean: clean
218
maintainer-clean: clean
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
219
	-rm --force --recursive keydir confdir
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
220
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
221
check:	all
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
222
	./mandos --check
223
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
224
# Run the client with a local config and key
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
225
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
226
	@echo "###################################################################"
227
	@echo "# The following error messages are harmless and can be safely     #"
228
	@echo "# ignored.  The messages are caused by not running as root, but   #"
229
	@echo "# you should NOT run \"make run-client\" as root unless you also    #"
230
	@echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
231
	@echo "# From plugin-runner: setuid: Operation not permitted             #"
232
	@echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
233
	@echo "# From mandos-client: setuid: Operation not permitted             #"
234
	@echo "#                     seteuid: Operation not permitted            #"
235
	@echo "#                     klogctl: Operation not permitted            #"
236
	@echo "###################################################################"
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
237
	./plugin-runner --plugin-dir=plugins.d \
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
238
		--config-file=plugin-runner.conf \
260 by Teddy Hogeborn
* Makefile (run-client): Pass $(CLIENTARGS) to plugin-runner.
239
		--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
240
		$(CLIENTARGS)
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
241
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
242
# Used by run-client
243
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
244
	install --directory keydir
245
	./mandos-keygen --dir keydir --force
246
247
# Run the server with a local config
248
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
249
	@echo "#################################################################"
426 by Teddy Hogeborn
* Makefile (run-server): Remove warning about now-eliminated error.
250
	@echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
251
	@echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
252
	@echo "# the server not running as root.  Do NOT run \"make run-server\" #"
253
	@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
254
	@echo "#################################################################"
292 by Teddy Hogeborn
* Makefile (run-server): Use "--no-dbus" unconditionally.
255
	./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
256
257
# Used by run-server
258
confdir/mandos.conf: mandos.conf
259
	install --directory confdir
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
260
	install --mode=u=rw,go=r $^ $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
261
confdir/clients.conf: clients.conf keydir/seckey.txt
262
	install --directory confdir
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
263
	install --mode=u=rw $< $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
264
# Add a client password
265
	./mandos-keygen --dir keydir --password >> $@
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
266
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
267
install: install-server install-client-nokey
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
268
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
269
install-html: html
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
270
	install --directory $(htmldir)
271
	install --mode=u=rw,go=r --target-directory=$(htmldir) \
272
		$(htmldocs)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
273
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
274
install-server: doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
275
	install --directory $(CONFDIR)
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
276
	install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
430 by teddy at bsnet
* mandos-monitor.xml: New.
277
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
278
		mandos-ctl
279
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
280
		mandos-monitor
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
281
	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
282
		mandos.conf
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
283
	install --mode=u=rw --target-directory=$(CONFDIR) \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
284
		clients.conf
420.1.1 by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as
285
	install --mode=u=rw,go=r dbus-mandos.conf \
286
		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
287
	install --mode=u=rwx,go=rx init.d-mandos \
288
		$(DESTDIR)/etc/init.d/mandos
289
	install --mode=u=rw,go=r default-mandos \
290
		$(DESTDIR)/etc/default/mandos
200 by Teddy Hogeborn
* Makefile: Put the init script before avahi-daemon.
291
	if [ -z $(DESTDIR) ]; then \
292
		update-rc.d mandos defaults 25 15;\
293
	fi
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
294
	gzip --best --to-stdout mandos.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
295
		> $(MANDIR)/man8/mandos.8.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
296
	gzip --best --to-stdout mandos.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
297
		> $(MANDIR)/man5/mandos.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
298
	gzip --best --to-stdout mandos-clients.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
299
		> $(MANDIR)/man5/mandos-clients.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
300
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
301
install-client-nokey: all doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
302
	install --directory $(PREFIX)/lib/mandos $(CONFDIR)
303
	install --directory --mode=u=rwx $(KEYDIR) \
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
304
		$(PREFIX)/lib/mandos/plugins.d
170 by Teddy Hogeborn
* Makefile (install-client): Add "/etc/plugins.d/README".
305
	if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
306
		install --mode=u=rwx \
199 by Teddy Hogeborn
* Makefile: Bug fix: fix syntax error.
307
			--directory "$(CONFDIR)/plugins.d"; \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
308
	fi
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
309
	install --mode=u=rwx,go=rx \
310
		--target-directory=$(PREFIX)/lib/mandos plugin-runner
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
311
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
312
		mandos-keygen
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
313
	install --mode=u=rwx,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
314
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
315
		plugins.d/password-prompt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
316
	install --mode=u=rwxs,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
317
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
318
		plugins.d/mandos-client
208 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/usplash".
319
	install --mode=u=rwxs,go=rx \
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
320
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
321
		plugins.d/usplash
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
322
	install --mode=u=rwxs,go=rx \
323
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
324
		plugins.d/splashy
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
325
	install --mode=u=rwxs,go=rx \
326
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
327
		plugins.d/askpass-fifo
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
328
	install --mode=u=rwxs,go=rx \
329
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
330
		plugins.d/plymouth
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
331
	install initramfs-tools-hook \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
332
		$(INITRAMFSTOOLS)/hooks/mandos
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
333
	install --mode=u=rw,go=r initramfs-tools-hook-conf \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
334
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
335
	install initramfs-tools-script \
302 by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
336
		$(INITRAMFSTOOLS)/scripts/init-premount/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
337
	install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
338
	gzip --best --to-stdout mandos-keygen.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
339
		> $(MANDIR)/man8/mandos-keygen.8.gz
340
	gzip --best --to-stdout plugin-runner.8mandos \
341
		> $(MANDIR)/man8/plugin-runner.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
342
	gzip --best --to-stdout plugins.d/password-prompt.8mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
343
		> $(MANDIR)/man8/password-prompt.8mandos.gz
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
344
	gzip --best --to-stdout plugins.d/mandos-client.8mandos \
345
		> $(MANDIR)/man8/mandos-client.8mandos.gz
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
346
	gzip --best --to-stdout plugins.d/usplash.8mandos \
347
		> $(MANDIR)/man8/usplash.8mandos.gz
348
	gzip --best --to-stdout plugins.d/splashy.8mandos \
349
		> $(MANDIR)/man8/splashy.8mandos.gz
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
350
	gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
351
		> $(MANDIR)/man8/askpass-fifo.8mandos.gz
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
352
353
install-client: install-client-nokey
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
354
# Post-installation stuff
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
355
	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
356
	update-initramfs -k all -u
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
357
	echo "Now run mandos-keygen --password --dir $(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
358
359
uninstall: uninstall-server uninstall-client
360
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
361
uninstall-server:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
362
	-rm --force $(PREFIX)/sbin/mandos \
430 by teddy at bsnet
* mandos-monitor.xml: New.
363
		$(PREFIX)/sbin/mandos-ctl \
364
		$(PREFIX)/sbin/mandos-monitor \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
365
		$(MANDIR)/man8/mandos.8.gz \
366
		$(MANDIR)/man5/mandos.conf.5.gz \
367
		$(MANDIR)/man5/mandos-clients.conf.5.gz
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
368
	update-rc.d -f mandos remove
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
369
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
370
371
uninstall-client:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
372
# Refuse to uninstall client if /etc/crypttab is explicitly configured
373
# to use it.
374
	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
375
		$(DESTDIR)/etc/crypttab
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
376
	-rm --force $(PREFIX)/sbin/mandos-keygen \
377
		$(PREFIX)/lib/mandos/plugin-runner \
378
		$(PREFIX)/lib/mandos/plugins.d/password-prompt \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
379
		$(PREFIX)/lib/mandos/plugins.d/mandos-client \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
380
		$(PREFIX)/lib/mandos/plugins.d/usplash \
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
381
		$(PREFIX)/lib/mandos/plugins.d/splashy \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
382
		$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
383
		$(PREFIX)/lib/mandos/plugins.d/plymouth \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
384
		$(INITRAMFSTOOLS)/hooks/mandos \
385
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
302 by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
386
		$(INITRAMFSTOOLS)/scripts/init-premount/mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
387
		$(MANDIR)/man8/plugin-runner.8mandos.gz \
388
		$(MANDIR)/man8/mandos-keygen.8.gz \
389
		$(MANDIR)/man8/password-prompt.8mandos.gz \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
390
		$(MANDIR)/man8/usplash.8mandos.gz \
391
		$(MANDIR)/man8/splashy.8mandos.gz \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
392
		$(MANDIR)/man8/askpass-fifo.8mandos.gz \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
393
		$(MANDIR)/man8/mandos-client.8mandos.gz
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
394
	-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
395
		 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
396
	update-initramfs -k all -u
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
397
398
purge: purge-server purge-client
399
400
purge-server: uninstall-server
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
401
	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
420.1.1 by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as
402
		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
403
		$(DESTDIR)/etc/default/mandos \
404
		$(DESTDIR)/etc/init.d/mandos \
405
		$(DESTDIR)/var/run/mandos.pid
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
406
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
407
408
purge-client: uninstall-client
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
409
	-shred --remove $(KEYDIR)/seckey.txt
161 by Teddy Hogeborn
* Makefile (purge-client): Also remove "plugin-runner.conf".
410
	-rm --force $(CONFDIR)/plugin-runner.conf \
411
		$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
412
	-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)