/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 \
3
	-Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
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
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
227 by Teddy Hogeborn
* Makefile (FORTIFY): Added "-fPIE -pie".
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIE -pie
13
LINK_FORTIFY=-z relro -pie
24.1.90 by Björn Påhlsson
fixed two bugs:
14
#COVERAGE=--coverage
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
15
OPTIMIZE=-Os
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
16
LANGUAGE=-std=gnu99
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
17
htmldir=man
229 by Teddy Hogeborn
* Makefile (version): Changed to "1.0.1".
18
version=1.0.1
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
19
SED=sed
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
20
21
## Use these settings for a traditional /usr/local install
22
# PREFIX=$(DESTDIR)/usr/local
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
23
# CONFDIR=$(DESTDIR)/etc/mandos
24
# KEYDIR=$(DESTDIR)/etc/mandos/keys
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
25
# MANDIR=$(PREFIX)/man
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
26
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
27
##
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
28
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
29
## These settings are for a package-type install
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
30
PREFIX=$(DESTDIR)/usr
31
CONFDIR=$(DESTDIR)/etc/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
32
KEYDIR=$(DESTDIR)/etc/keys/mandos
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
33
MANDIR=$(PREFIX)/share/man
34
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
35
##
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
36
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
37
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
38
GNUTLS_LIBS=$(shell libgnutls-config --libs)
39
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
GPGME_LIBS=$(shell gpgme-config --libs)
43
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
44
# Do not change these two
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
46
	$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
	-DVERSION='"$(version)"'
227 by Teddy Hogeborn
* Makefile (FORTIFY): Added "-fPIE -pie".
48
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
49
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
50
# Commands to format a DocBook <refentry> document into a manual page
105 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Only cd to one directory.
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
62 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Do not generate AUTHORS section.
52
	--param man.charmap.use.subset		0 \
53
	--param make.year.ranges		1 \
54
	--param make.single.year.ranges		1 \
55
	--param man.output.quietly		1 \
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
56
	--param man.authors.section.enabled	0 \
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
57
	 /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
58
	$(notdir $<); \
59
	$(MANPOST) $(notdir $@)
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
60
# DocBook-to-man post-processing to fix a '\n' escape bug
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
61
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".
62
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
63
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
64
	--param make.year.ranges		1 \
65
	--param make.single.year.ranges		1 \
66
	--param man.output.quietly		1 \
67
	--param man.authors.section.enabled	0 \
68
	--param citerefentry.link		1 \
69
	--output $@ \
70
	/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
	$<; $(HTMLPOST) $@
72
# Fix citerefentry links
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
73
HTMLPOST=$(SED) --in-place --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.
74
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
75
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
76
	plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
77
CPROGS=plugin-runner $(PLUGINS)
78
PROGS=mandos mandos-keygen $(CPROGS)
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
79
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
80
	plugins.d/mandos-client.8mandos \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
81
	plugins.d/password-prompt.8mandos mandos.conf.5 \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
82
	plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
83
	plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
84
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
85
htmldocs=$(addsuffix .xhtml,$(DOCS))
86
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
87
objects=$(addsuffix .o,$(CPROGS))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
88
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
89
all: $(PROGS)
90
91
doc: $(DOCS)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
92
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
93
html: $(htmldocs)
94
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
95
%.5: %.xml common.ent legalnotice.xml
96
	$(DOCBOOKTOMAN)
97
%.5.xhtml: %.xml common.ent legalnotice.xml
98
	$(DOCBOOKTOHTML)
99
100
%.8: %.xml common.ent legalnotice.xml
101
	$(DOCBOOKTOMAN)
102
%.8.xhtml: %.xml common.ent legalnotice.xml
103
	$(DOCBOOKTOHTML)
104
105
%.8mandos: %.xml common.ent legalnotice.xml
106
	$(DOCBOOKTOMAN)
107
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
108
	$(DOCBOOKTOHTML)
109
110
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
111
		legalnotice.xml
112
	$(DOCBOOKTOMAN)
113
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
114
		overview.xml legalnotice.xml
115
	$(DOCBOOKTOHTML)
116
117
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
118
		legalnotice.xml
119
	$(DOCBOOKTOMAN)
120
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
121
		 legalnotice.xml
122
	$(DOCBOOKTOHTML)
123
124
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
125
		legalnotice.xml
126
	$(DOCBOOKTOMAN)
127
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
128
		legalnotice.xml
129
	$(DOCBOOKTOHTML)
130
131
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
132
		legalnotice.xml
133
	$(DOCBOOKTOMAN)
134
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
135
		overview.xml legalnotice.xml
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
136
	$(DOCBOOKTOHTML)
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
137
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
138
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
139
					common.ent \
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
140
					mandos-options.xml \
141
					overview.xml legalnotice.xml
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
142
	$(DOCBOOKTOMAN)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
143
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
144
					common.ent \
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
145
					mandos-options.xml \
146
					overview.xml legalnotice.xml
147
	$(DOCBOOKTOHTML)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
148
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
149
# Update all these files with version number $(version)
150
common.ent: Makefile
151
	$(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
152
153
mandos: Makefile
223 by Teddy Hogeborn
* .bzrignore (plugins.d/askpass-fifo): Added.
154
	$(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
155
156
mandos-keygen: Makefile
223 by Teddy Hogeborn
* .bzrignore (plugins.d/askpass-fifo): Added.
157
	$(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
158
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
159
plugins.d/mandos-client: plugins.d/mandos-client.o
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
160
	$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
161
		$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
162
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
163
.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
164
	install-server install-client uninstall uninstall-server \
165
	uninstall-client purge purge-server purge-client
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
166
1 by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN
167
clean:
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
168
	-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
169
170
distclean: clean
171
mostlyclean: clean
172
maintainer-clean: clean
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
173
	-rm --force --recursive keydir confdir
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
174
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
175
check:	all
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
176
	./mandos --check
177
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
178
# Run the client with a local config and key
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
179
run-client: all keydir/seckey.txt keydir/pubkey.txt
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
180
	./plugin-runner --plugin-dir=plugins.d \
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
181
		--config-file=plugin-runner.conf \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
182
		--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
183
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
184
# Used by run-client
185
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
186
	install --directory keydir
187
	./mandos-keygen --dir keydir --force
188
189
# Run the server with a local config
190
run-server: confdir/mandos.conf confdir/clients.conf
191
	./mandos --debug --configdir=confdir
192
193
# Used by run-server
194
confdir/mandos.conf: mandos.conf
195
	install --directory confdir
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
196
	install --mode=u=rw,go=r $^ $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
197
confdir/clients.conf: clients.conf keydir/seckey.txt
198
	install --directory confdir
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
199
	install --mode=u=rw $< $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
200
# Add a client password
201
	./mandos-keygen --dir keydir --password >> $@
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
202
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
203
install: install-server install-client-nokey
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
204
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
205
install-html: $(htmldocs)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
206
	install --directory $(htmldir)
207
	install --mode=u=rw,go=r --target-directory=$(htmldir) \
208
		$(htmldocs)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
209
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
210
install-server: doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
211
	install --directory $(CONFDIR)
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
212
	install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
213
	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
214
		mandos.conf
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
215
	install --mode=u=rw --target-directory=$(CONFDIR) \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
216
		clients.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
217
	install --mode=u=rwx,go=rx init.d-mandos \
218
		$(DESTDIR)/etc/init.d/mandos
219
	install --mode=u=rw,go=r default-mandos \
220
		$(DESTDIR)/etc/default/mandos
200 by Teddy Hogeborn
* Makefile: Put the init script before avahi-daemon.
221
	if [ -z $(DESTDIR) ]; then \
222
		update-rc.d mandos defaults 25 15;\
223
	fi
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
224
	gzip --best --to-stdout mandos.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
225
		> $(MANDIR)/man8/mandos.8.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
226
	gzip --best --to-stdout mandos.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
227
		> $(MANDIR)/man5/mandos.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
228
	gzip --best --to-stdout mandos-clients.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
229
		> $(MANDIR)/man5/mandos-clients.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
230
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
231
install-client-nokey: all doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
232
	install --directory $(PREFIX)/lib/mandos $(CONFDIR)
233
	install --directory --mode=u=rwx $(KEYDIR) \
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
234
		$(PREFIX)/lib/mandos/plugins.d
170 by Teddy Hogeborn
* Makefile (install-client): Add "/etc/plugins.d/README".
235
	if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
236
		install --mode=u=rwx \
199 by Teddy Hogeborn
* Makefile: Bug fix: fix syntax error.
237
			--directory "$(CONFDIR)/plugins.d"; \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
238
	fi
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
239
	install --mode=u=rwx,go=rx \
240
		--target-directory=$(PREFIX)/lib/mandos plugin-runner
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
241
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
242
		mandos-keygen
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
243
	install --mode=u=rwx,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
244
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
245
		plugins.d/password-prompt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
246
	install --mode=u=rwxs,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
247
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
248
		plugins.d/mandos-client
208 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/usplash".
249
	install --mode=u=rwxs,go=rx \
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
250
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
251
		plugins.d/usplash
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
252
	install --mode=u=rwxs,go=rx \
253
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
254
		plugins.d/splashy
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
255
	install --mode=u=rwxs,go=rx \
256
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
257
		plugins.d/askpass-fifo
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
258
	install initramfs-tools-hook \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
259
		$(INITRAMFSTOOLS)/hooks/mandos
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
260
	install --mode=u=rw,go=r initramfs-tools-hook-conf \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
261
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
262
	install initramfs-tools-script \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
263
		$(INITRAMFSTOOLS)/scripts/local-top/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
264
	install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
265
	gzip --best --to-stdout mandos-keygen.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
266
		> $(MANDIR)/man8/mandos-keygen.8.gz
267
	gzip --best --to-stdout plugin-runner.8mandos \
268
		> $(MANDIR)/man8/plugin-runner.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
269
	gzip --best --to-stdout plugins.d/password-prompt.8mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
270
		> $(MANDIR)/man8/password-prompt.8mandos.gz
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
271
	gzip --best --to-stdout plugins.d/mandos-client.8mandos \
272
		> $(MANDIR)/man8/mandos-client.8mandos.gz
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
273
	gzip --best --to-stdout plugins.d/usplash.8mandos \
274
		> $(MANDIR)/man8/usplash.8mandos.gz
275
	gzip --best --to-stdout plugins.d/splashy.8mandos \
276
		> $(MANDIR)/man8/splashy.8mandos.gz
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
277
	gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
278
		> $(MANDIR)/man8/askpass-fifo.8mandos.gz
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
279
280
install-client: install-client-nokey
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
281
# Post-installation stuff
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
282
	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
283
	update-initramfs -k all -u
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
284
	echo "Now run mandos-keygen --password --dir $(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
285
286
uninstall: uninstall-server uninstall-client
287
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
288
uninstall-server:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
289
	-rm --force $(PREFIX)/sbin/mandos \
290
		$(MANDIR)/man8/mandos.8.gz \
291
		$(MANDIR)/man5/mandos.conf.5.gz \
292
		$(MANDIR)/man5/mandos-clients.conf.5.gz
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
293
	update-rc.d -f mandos remove
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
294
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
295
296
uninstall-client:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
297
# Refuse to uninstall client if /etc/crypttab is explicitly configured
298
# to use it.
299
	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
300
		$(DESTDIR)/etc/crypttab
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
301
	-rm --force $(PREFIX)/sbin/mandos-keygen \
302
		$(PREFIX)/lib/mandos/plugin-runner \
303
		$(PREFIX)/lib/mandos/plugins.d/password-prompt \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
304
		$(PREFIX)/lib/mandos/plugins.d/mandos-client \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
305
		$(PREFIX)/lib/mandos/plugins.d/usplash \
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
306
		$(PREFIX)/lib/mandos/plugins.d/splashy \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
307
		$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
308
		$(INITRAMFSTOOLS)/hooks/mandos \
309
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
310
		$(INITRAMFSTOOLS)/scripts/local-top/mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
311
		$(MANDIR)/man8/plugin-runner.8mandos.gz \
312
		$(MANDIR)/man8/mandos-keygen.8.gz \
313
		$(MANDIR)/man8/password-prompt.8mandos.gz \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
314
		$(MANDIR)/man8/usplash.8mandos.gz \
315
		$(MANDIR)/man8/splashy.8mandos.gz \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
316
		$(MANDIR)/man8/askpass-fifo.8mandos.gz \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
317
		$(MANDIR)/man8/mandos-client.8mandos.gz
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
318
	-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
319
		 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
320
	update-initramfs -k all -u
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
321
322
purge: purge-server purge-client
323
324
purge-server: uninstall-server
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
325
	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
326
		$(DESTDIR)/etc/default/mandos \
327
		$(DESTDIR)/etc/init.d/mandos \
328
		$(DESTDIR)/var/run/mandos.pid
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
329
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
330
331
purge-client: uninstall-client
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
332
	-shred --remove $(KEYDIR)/seckey.txt
161 by Teddy Hogeborn
* Makefile (purge-client): Also remove "plugin-runner.conf".
333
	-rm --force $(CONFDIR)/plugin-runner.conf \
334
		$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
335
	-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)