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