/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 \
7
	-Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
	-Wvolatile-register-var
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
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>
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
13
#COVERAGE=--coverage
24.1.51 by Björn Påhlsson
Added configuration files support for mandos-client
14
OPTIMIZE=-Os
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
15
LANGUAGE=-std=gnu99
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
16
# PREFIX=/usr/local
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
17
PREFIX=$(DESTDIR)/usr
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
18
# CONFDIR=/usr/local/lib/mandos
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
19
CONFDIR=$(DESTDIR)/etc/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
20
# KEYDIR=/usr/local/lib/mandos/keys
21
KEYDIR=$(DESTDIR)/etc/keys/mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
22
# MANDIR=/usr/local/man
96 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR, MANDIR): Use $(DESTDIR).
23
MANDIR=$(DESTDIR)/usr/share/man
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
24
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
25
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
GNUTLS_LIBS=$(shell libgnutls-config --libs)
27
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
28
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
29
GPGME_CFLAGS=$(shell gpgme-config --cflags)
30
GPGME_LIBS=$(shell gpgme-config --libs)
31
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
32
# Do not change these two
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
33
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
34
	$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
35
LDFLAGS=$(COVERAGE)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
36
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
37
# Commands to format a DocBook refentry document into a manual page
105 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Only cd to one directory.
38
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
62 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Do not generate AUTHORS section.
39
	--param man.charmap.use.subset		0 \
40
	--param make.year.ranges		1 \
41
	--param make.single.year.ranges		1 \
42
	--param man.output.quietly		1 \
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
43
	--param man.authors.section.enabled	0 \
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
44
	 /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
45
	$(notdir $<); \
46
	$(MANPOST) $(notdir $@)
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
47
# DocBook-to-man post-processing to fix a \n escape bug
95 by Teddy Hogeborn
* Makefile (MANPOST): Bug fix: corrected patterns.
48
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".
49
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
50
PLUGINS=plugins.d/password-prompt plugins.d/password-request
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
51
PROGS=plugin-runner $(PLUGINS)
52
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
53
	plugins.d/password-request.8mandos \
54
	plugins.d/password-prompt.8mandos mandos.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
55
	mandos-clients.conf.5
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
56
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
57
objects=$(addsuffix .o,$(PROGS))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
58
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
59
all: $(PROGS)
60
61
doc: $(DOCS)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
62
131 by Teddy Hogeborn
* Makefile: Make all DocBook rules include legalnotice.xml as a
63
%.5: %.xml legalnotice.xml
64
	$(DOCBOOKTOMAN)
65
66
%.8: %.xml legalnotice.xml
67
	$(DOCBOOKTOMAN)
68
69
%.8mandos: %.xml legalnotice.xml
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
70
	$(DOCBOOKTOMAN)
71
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
72
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
73
	$(DOCBOOKTOMAN)
74
75
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
76
	$(DOCBOOKTOMAN)
77
78
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
79
	$(DOCBOOKTOMAN)
80
81
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
	$(DOCBOOKTOMAN)
83
84
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
85
					mandos-options.xml \
86
					overview.xml legalnotice.xml
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
87
	$(DOCBOOKTOMAN)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
88
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
89
plugins.d/password-request: plugins.d/password-request.o
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
90
	$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
91
		$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
92
93
.PHONY : all doc clean distclean run-client run-server install \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
94
	install-server install-client uninstall uninstall-server \
95
	uninstall-client purge purge-server purge-client
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
96
1 by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN
97
clean:
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
98
	-rm --force $(PROGS) $(objects) $(DOCS) core
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
99
100
distclean: clean
101
mostlyclean: clean
102
maintainer-clean: clean
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
103
	-rm --force --recursive keydir confdir
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
104
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
105
check:
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
106
	./mandos --check
107
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
108
# Run the client with a local config and key
159 by Teddy Hogeborn
* Makefile (run-client): Do not depend on the key ring files.
109
run-client: all keydir/seckey.txt keydir/pubkey.txt
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
110
	./plugin-runner --plugin-dir=plugins.d \
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
111
		--config-file=plugin-runner.conf \
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
112
		--options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
113
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
114
# Used by run-client
115
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
116
	install --directory keydir
117
	./mandos-keygen --dir keydir --force
118
119
# Run the server with a local config
120
run-server: confdir/mandos.conf confdir/clients.conf
121
	./mandos --debug --configdir=confdir
122
123
# Used by run-server
124
confdir/mandos.conf: mandos.conf
125
	install --directory confdir
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
126
	install --mode=u=rw,go=r $^ $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
127
confdir/clients.conf: clients.conf keydir/seckey.txt
128
	install --directory confdir
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
129
	install --mode=u=rw,g=r $< $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
130
# Add a client password
131
	./mandos-keygen --dir keydir --password >> $@
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
132
133
install: install-server install-client
134
135
install-server: doc
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
136
	install --directory $(CONFDIR) $(MANDIR)/man5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
137
		$(MANDIR)/man8
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
138
	install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
139
	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
		mandos.conf
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
141
	install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
142
		clients.conf
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
143
	install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
	install --mode=u=rw,go=r default-mandos /etc/default/mandos
145
	update-rc.d mandos defaults
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
146
	gzip --best --to-stdout mandos.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
147
		> $(MANDIR)/man8/mandos.8.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
148
	gzip --best --to-stdout mandos.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
149
		> $(MANDIR)/man5/mandos.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
150
	gzip --best --to-stdout mandos-clients.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
151
		> $(MANDIR)/man5/mandos-clients.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
152
153
install-client: all doc /usr/share/initramfs-tools/hooks/.
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
154
	install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
		$(MANDIR)/man8
156
	install --directory --mode=u=rwx $(KEYDIR)
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
157
	install --directory --mode=u=rwx \
158
		$(PREFIX)/lib/mandos/plugins.d
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
159
	if [ "$(CONFDIR)/plugins.d" \
160
			!= "$(PREFIX)/lib/mandos/plugins.d" ]; then \
161
			install --directory "$(CONFDIR)/plugins.d"; \
162
		fi
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
163
	install --mode=u=rwx,go=rx \
164
		--target-directory=$(PREFIX)/lib/mandos plugin-runner
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
165
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
166
		mandos-keygen
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
167
	install --mode=u=rwx,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
168
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
169
		plugins.d/password-prompt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
170
	install --mode=u=rwxs,go=rx \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
171
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
172
		plugins.d/password-request
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
173
	install --mode=u=rwx,go=rx \
174
		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
175
		plugins.d/usplash
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
176
	install initramfs-tools-hook \
177
		/usr/share/initramfs-tools/hooks/mandos
178
	install initramfs-tools-hook-conf \
179
		/usr/share/initramfs-tools/conf-hooks.d/mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
180
	install initramfs-tools-script \
181
		/usr/share/initramfs-tools/scripts/local-top/mandos
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
182
	install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
183
	gzip --best --to-stdout mandos-keygen.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
184
		> $(MANDIR)/man8/mandos-keygen.8.gz
185
	gzip --best --to-stdout plugin-runner.8mandos \
186
		> $(MANDIR)/man8/plugin-runner.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
187
	gzip --best --to-stdout plugins.d/password-prompt.8mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
188
		> $(MANDIR)/man8/password-prompt.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
189
	gzip --best --to-stdout plugins.d/password-request.8mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
190
		> $(MANDIR)/man8/password-request.8mandos.gz
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
191
	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
192
	update-initramfs -k all -u
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
193
	echo "Now run mandos-keygen --password --dir $(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
194
195
uninstall: uninstall-server uninstall-client
196
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
197
uninstall-server:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
198
	-rm --force $(PREFIX)/sbin/mandos \
199
		$(MANDIR)/man8/mandos.8.gz \
200
		$(MANDIR)/man5/mandos.conf.5.gz \
201
		$(MANDIR)/man5/mandos-clients.conf.5.gz
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
202
	update-rc.d -f mandos remove
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
203
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
204
205
uninstall-client:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
206
# Refuse to uninstall client if /etc/crypttab is explicitly configured
207
# to use it.
208
	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
72 by Teddy Hogeborn
* Makefile (uninstall-client): Refuse to uninstall if it is in use.
209
		/etc/crypttab
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
210
	-rm --force $(PREFIX)/sbin/mandos-keygen \
211
		$(PREFIX)/lib/mandos/plugin-runner \
212
		$(PREFIX)/lib/mandos/plugins.d/password-prompt \
213
		$(PREFIX)/lib/mandos/plugins.d/password-request \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
214
		/usr/share/initramfs-tools/hooks/mandos \
215
		/usr/share/initramfs-tools/conf-hooks.d/mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
216
		$(MANDIR)/man8/plugin-runner.8mandos.gz \
217
		$(MANDIR)/man8/mandos-keygen.8.gz \
218
		$(MANDIR)/man8/password-prompt.8mandos.gz \
219
		$(MANDIR)/man8/password-request.8mandos.gz
220
	-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
221
		 $(PREFIX)/lib/mandos $(CONFDIR)
222
	update-initramfs -k all -u
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
223
224
purge: purge-server purge-client
225
226
purge-server: uninstall-server
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
227
	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
228
		/etc/default/mandos /etc/init.d/mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
229
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
230
231
purge-client: uninstall-client
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
232
	-shred --remove $(KEYDIR)/seckey.txt
161 by Teddy Hogeborn
* Makefile (purge-client): Also remove "plugin-runner.conf".
233
	-rm --force $(CONFDIR)/plugin-runner.conf \
234
		$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
235
	-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)