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