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