/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
237.2.2 by Teddy Hogeborn
* Makefile (version): Changed to "1.0.3".
18
version=1.0.3
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)"'
241 by Teddy Hogeborn
* Makefile: Bug fix for Debian bug #509398; make sure "-z relro" is
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
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
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
73
HTMLPOST=$(SED) --in-place \
74
	--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.
75
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
77
	plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
78
CPROGS=plugin-runner $(PLUGINS)
237.2.1 by Teddy Hogeborn
Merge from trunk, but disable the unfinished D-Bus feature:
79
PROGS=mandos mandos-keygen $(CPROGS)
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
81
	plugins.d/mandos-client.8mandos \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
82
	plugins.d/password-prompt.8mandos mandos.conf.5 \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
83
	plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
84
	plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
85
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
86
htmldocs=$(addsuffix .xhtml,$(DOCS))
87
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
88
objects=$(addsuffix .o,$(CPROGS))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
89
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
90
all: $(PROGS) mandos.lsm
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
91
92
doc: $(DOCS)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
93
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
94
html: $(htmldocs)
95
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
96
%.5: %.xml common.ent legalnotice.xml
97
	$(DOCBOOKTOMAN)
98
%.5.xhtml: %.xml common.ent legalnotice.xml
99
	$(DOCBOOKTOHTML)
100
101
%.8: %.xml common.ent legalnotice.xml
102
	$(DOCBOOKTOMAN)
103
%.8.xhtml: %.xml common.ent legalnotice.xml
104
	$(DOCBOOKTOHTML)
105
106
%.8mandos: %.xml common.ent legalnotice.xml
107
	$(DOCBOOKTOMAN)
108
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
109
	$(DOCBOOKTOHTML)
110
111
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
112
		legalnotice.xml
113
	$(DOCBOOKTOMAN)
114
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
115
		overview.xml legalnotice.xml
116
	$(DOCBOOKTOHTML)
117
118
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
119
		legalnotice.xml
120
	$(DOCBOOKTOMAN)
121
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
122
		 legalnotice.xml
123
	$(DOCBOOKTOHTML)
124
125
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
126
		legalnotice.xml
127
	$(DOCBOOKTOMAN)
128
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
129
		legalnotice.xml
130
	$(DOCBOOKTOHTML)
131
132
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
133
		legalnotice.xml
134
	$(DOCBOOKTOMAN)
135
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
136
		overview.xml legalnotice.xml
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
137
	$(DOCBOOKTOHTML)
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
138
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
139
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
140
					common.ent \
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
141
					mandos-options.xml \
142
					overview.xml legalnotice.xml
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
143
	$(DOCBOOKTOMAN)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
144
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
145
					common.ent \
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
146
					mandos-options.xml \
147
					overview.xml legalnotice.xml
148
	$(DOCBOOKTOHTML)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
149
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
150
# Update all these files with version number $(version)
151
common.ent: Makefile
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
152
	$(SED) --in-place \
153
		--expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
154
		$@
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
155
156
mandos: Makefile
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
157
	$(SED) --in-place \
158
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
159
		$@
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
160
161
mandos-keygen: Makefile
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
162
	$(SED) --in-place \
163
		--expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
		$@
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
165
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
166
mandos.lsm: Makefile
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
167
	$(SED) --in-place \
168
		--expression='s/^\(Version:\).*/\1\t$(version)/' \
169
		$@
170
	$(SED) --in-place \
171
		--expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
172
		$@
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
173
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
174
plugins.d/mandos-client: plugins.d/mandos-client.o
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
175
	$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
176
		$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
177
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
178
.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
179
	install-server install-client uninstall uninstall-server \
180
	uninstall-client purge purge-server purge-client
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
181
1 by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN
182
clean:
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
183
	-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
184
185
distclean: clean
186
mostlyclean: clean
187
maintainer-clean: clean
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
188
	-rm --force --recursive keydir confdir
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
189
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
190
check:	all
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
191
	./mandos --check
192
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
193
# Run the client with a local config and key
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
194
run-client: all keydir/seckey.txt keydir/pubkey.txt
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
195
	./plugin-runner --plugin-dir=plugins.d \
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
196
		--config-file=plugin-runner.conf \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
197
		--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.
198
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
199
# Used by run-client
200
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
201
	install --directory keydir
202
	./mandos-keygen --dir keydir --force
203
204
# Run the server with a local config
205
run-server: confdir/mandos.conf confdir/clients.conf
206
	./mandos --debug --configdir=confdir
207
208
# Used by run-server
209
confdir/mandos.conf: mandos.conf
210
	install --directory confdir
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
211
	install --mode=u=rw,go=r $^ $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
212
confdir/clients.conf: clients.conf keydir/seckey.txt
213
	install --directory confdir
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
214
	install --mode=u=rw $< $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
215
# Add a client password
216
	./mandos-keygen --dir keydir --password >> $@
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
217
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
218
install: install-server install-client-nokey
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
219
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
220
install-html: html
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
221
	install --directory $(htmldir)
222
	install --mode=u=rw,go=r --target-directory=$(htmldir) \
223
		$(htmldocs)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
224
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
225
install-server: doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
226
	install --directory $(CONFDIR)
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
227
	install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
228
	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
229
		mandos.conf
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
230
	install --mode=u=rw --target-directory=$(CONFDIR) \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
231
		clients.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
232
	install --mode=u=rwx,go=rx init.d-mandos \
233
		$(DESTDIR)/etc/init.d/mandos
234
	install --mode=u=rw,go=r default-mandos \
235
		$(DESTDIR)/etc/default/mandos
200 by Teddy Hogeborn
* Makefile: Put the init script before avahi-daemon.
236
	if [ -z $(DESTDIR) ]; then \
237
		update-rc.d mandos defaults 25 15;\
238
	fi
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
239
	gzip --best --to-stdout mandos.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
240
		> $(MANDIR)/man8/mandos.8.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
241
	gzip --best --to-stdout mandos.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
242
		> $(MANDIR)/man5/mandos.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
243
	gzip --best --to-stdout mandos-clients.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
244
		> $(MANDIR)/man5/mandos-clients.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
245
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
246
install-client-nokey: all doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
247
	install --directory $(PREFIX)/lib/mandos $(CONFDIR)
248
	install --directory --mode=u=rwx $(KEYDIR) \
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
249
		$(PREFIX)/lib/mandos/plugins.d
170 by Teddy Hogeborn
* Makefile (install-client): Add "/etc/plugins.d/README".
250
	if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
251
		install --mode=u=rwx \
199 by Teddy Hogeborn
* Makefile: Bug fix: fix syntax error.
252
			--directory "$(CONFDIR)/plugins.d"; \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
253
	fi
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
254
	install --mode=u=rwx,go=rx \
255
		--target-directory=$(PREFIX)/lib/mandos plugin-runner
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
256
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
257
		mandos-keygen
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
258
	install --mode=u=rwx,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
259
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
260
		plugins.d/password-prompt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
261
	install --mode=u=rwxs,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
262
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
263
		plugins.d/mandos-client
208 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/usplash".
264
	install --mode=u=rwxs,go=rx \
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
265
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
266
		plugins.d/usplash
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
267
	install --mode=u=rwxs,go=rx \
268
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
269
		plugins.d/splashy
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
270
	install --mode=u=rwxs,go=rx \
271
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
272
		plugins.d/askpass-fifo
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
273
	install initramfs-tools-hook \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
274
		$(INITRAMFSTOOLS)/hooks/mandos
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
275
	install --mode=u=rw,go=r initramfs-tools-hook-conf \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
276
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
277
	install initramfs-tools-script \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
278
		$(INITRAMFSTOOLS)/scripts/local-top/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
279
	install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
280
	gzip --best --to-stdout mandos-keygen.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
281
		> $(MANDIR)/man8/mandos-keygen.8.gz
282
	gzip --best --to-stdout plugin-runner.8mandos \
283
		> $(MANDIR)/man8/plugin-runner.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
284
	gzip --best --to-stdout plugins.d/password-prompt.8mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
285
		> $(MANDIR)/man8/password-prompt.8mandos.gz
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
286
	gzip --best --to-stdout plugins.d/mandos-client.8mandos \
287
		> $(MANDIR)/man8/mandos-client.8mandos.gz
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
288
	gzip --best --to-stdout plugins.d/usplash.8mandos \
289
		> $(MANDIR)/man8/usplash.8mandos.gz
290
	gzip --best --to-stdout plugins.d/splashy.8mandos \
291
		> $(MANDIR)/man8/splashy.8mandos.gz
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
292
	gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
293
		> $(MANDIR)/man8/askpass-fifo.8mandos.gz
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
294
295
install-client: install-client-nokey
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
296
# Post-installation stuff
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
297
	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
298
	update-initramfs -k all -u
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
299
	echo "Now run mandos-keygen --password --dir $(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
300
301
uninstall: uninstall-server uninstall-client
302
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
303
uninstall-server:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
304
	-rm --force $(PREFIX)/sbin/mandos \
305
		$(MANDIR)/man8/mandos.8.gz \
306
		$(MANDIR)/man5/mandos.conf.5.gz \
307
		$(MANDIR)/man5/mandos-clients.conf.5.gz
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
308
	update-rc.d -f mandos remove
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
309
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
310
311
uninstall-client:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
312
# Refuse to uninstall client if /etc/crypttab is explicitly configured
313
# to use it.
314
	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
315
		$(DESTDIR)/etc/crypttab
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
316
	-rm --force $(PREFIX)/sbin/mandos-keygen \
317
		$(PREFIX)/lib/mandos/plugin-runner \
318
		$(PREFIX)/lib/mandos/plugins.d/password-prompt \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
319
		$(PREFIX)/lib/mandos/plugins.d/mandos-client \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
320
		$(PREFIX)/lib/mandos/plugins.d/usplash \
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
321
		$(PREFIX)/lib/mandos/plugins.d/splashy \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
322
		$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
323
		$(INITRAMFSTOOLS)/hooks/mandos \
324
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
325
		$(INITRAMFSTOOLS)/scripts/local-top/mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
326
		$(MANDIR)/man8/plugin-runner.8mandos.gz \
327
		$(MANDIR)/man8/mandos-keygen.8.gz \
328
		$(MANDIR)/man8/password-prompt.8mandos.gz \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
329
		$(MANDIR)/man8/usplash.8mandos.gz \
330
		$(MANDIR)/man8/splashy.8mandos.gz \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
331
		$(MANDIR)/man8/askpass-fifo.8mandos.gz \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
332
		$(MANDIR)/man8/mandos-client.8mandos.gz
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
333
	-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
334
		 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
335
	update-initramfs -k all -u
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
336
337
purge: purge-server purge-client
338
339
purge-server: uninstall-server
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
340
	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
341
		$(DESTDIR)/etc/default/mandos \
342
		$(DESTDIR)/etc/init.d/mandos \
343
		$(DESTDIR)/var/run/mandos.pid
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
344
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
345
346
purge-client: uninstall-client
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
347
	-shred --remove $(KEYDIR)/seckey.txt
161 by Teddy Hogeborn
* Makefile (purge-client): Also remove "plugin-runner.conf".
348
	-rm --force $(CONFDIR)/plugin-runner.conf \
349
		$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
350
	-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)