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