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