/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
1
WARN:=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2
	-Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
	-Wunused -Wuninitialized -Wstrict-overflow=5 \
4
	-Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
	-Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
6
	-Wunsafe-loop-optimizations -Wpointer-arith \
7
	-Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
672 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
8
	-Wconversion -Wlogical-op -Waggregate-return \
9
	-Wstrict-prototypes -Wold-style-definition \
10
	-Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
	-Wredundant-decls -Wnested-externs -Winline -Wvla \
12
	-Wvolatile-register-var -Woverlength-strings
1111 by Teddy Hogeborn
Only use sanitizing options when debugging
13
14
#DEBUG:=-ggdb3 -fsanitize=address $(SANITIZE)
15
## Check which sanitizing options can be used
16
#SANITIZE:=$(foreach option,$(ALL_SANITIZE_OPTIONS),$(shell \
17
#	echo 'int main(){}' | $(CC) --language=c $(option) \
18
#	/dev/stdin -o /dev/null >/dev/null 2>&1 && echo $(option)))
800 by Teddy Hogeborn
Use AddressSanitizer and UndefinedBehaviorSanitizer.
19
# <https://developerblog.redhat.com/2014/10/16/gcc-undefined-behavior-sanitizer-ubsan/>
871 by Teddy Hogeborn
Makefile: Replace "-fsanitize=address" with "-fsanitize=leak"
20
ALL_SANITIZE_OPTIONS:=-fsanitize=leak -fsanitize=undefined \
817 by Teddy Hogeborn
Only use -fsanitize=... options if they work.
21
        -fsanitize=shift -fsanitize=integer-divide-by-zero \
22
        -fsanitize=unreachable -fsanitize=vla-bound -fsanitize=null \
23
        -fsanitize=return -fsanitize=signed-integer-overflow \
24
        -fsanitize=bounds -fsanitize=alignment \
25
        -fsanitize=object-size -fsanitize=float-divide-by-zero \
26
        -fsanitize=float-cast-overflow -fsanitize=nonnull-attribute \
27
        -fsanitize=returns-nonnull-attribute -fsanitize=bool \
1117 by Teddy Hogeborn
Add another sanitizer option
28
        -fsanitize=enum -fsanitize-address-use-after-scope
1111 by Teddy Hogeborn
Only use sanitizing options when debugging
29
30
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
31
# and <https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
32
FORTIFY:=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
33
LINK_FORTIFY_LD:=-z relro -z now
34
LINK_FORTIFY:=
399 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
35
36
# 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.
37
ifndef BROKEN_PIE
38
FORTIFY += -fPIE
39
LINK_FORTIFY += -pie
40
endif
24.1.90 by Björn Påhlsson
fixed two bugs:
41
#COVERAGE=--coverage
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
42
OPTIMIZE:=-Os -fno-strict-aliasing
43
LANGUAGE:=-std=gnu11
1146 by Teddy Hogeborn
Client: Always build with LFS enabled
44
FEATURES:=-D_FILE_OFFSET_BITS=64
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
45
htmldir:=man
237.4.124 by Teddy Hogeborn
* Makefile (version): Change to 1.8.9.
46
version:=1.8.9
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
47
SED:=sed
1137 by Teddy Hogeborn
Makefile: "pkg-config" is now overrideable by PKG_CONFIG
48
PKG_CONFIG?=pkg-config
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
49
1112 by Teddy Hogeborn
Makefile: Break long lines
50
USER:=$(firstword $(subst :, ,$(shell getent passwd _mandos \
51
	|| getent passwd nobody || echo 65534)))
52
GROUP:=$(firstword $(subst :, ,$(shell getent group _mandos \
53
	|| getent group nogroup || echo 65534)))
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
54
1136 by Teddy Hogeborn
Break some long lines and refine documentation
55
LINUXVERSION:=$(shell uname --kernel-release)
56
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
57
## Use these settings for a traditional /usr/local install
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
58
# PREFIX:=$(DESTDIR)/usr/local
59
# CONFDIR:=$(DESTDIR)/etc/mandos
60
# KEYDIR:=$(DESTDIR)/etc/mandos/keys
61
# MANDIR:=$(PREFIX)/man
62
# INITRAMFSTOOLS:=$(DESTDIR)/etc/initramfs-tools
1127 by Teddy Hogeborn
Add dracut(8) support
63
# DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
64
# STATEDIR:=$(DESTDIR)/var/lib/mandos
65
# LIBDIR:=$(PREFIX)/lib
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
66
##
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
67
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
68
## These settings are for a package-type install
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
69
PREFIX:=$(DESTDIR)/usr
70
CONFDIR:=$(DESTDIR)/etc/mandos
71
KEYDIR:=$(DESTDIR)/etc/keys/mandos
72
MANDIR:=$(PREFIX)/share/man
73
INITRAMFSTOOLS:=$(DESTDIR)/usr/share/initramfs-tools
1127 by Teddy Hogeborn
Add dracut(8) support
74
DRACUTMODULE:=$(DESTDIR)/usr/lib/dracut/modules.d/90mandos
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
75
STATEDIR:=$(DESTDIR)/var/lib/mandos
76
LIBDIR:=$(shell \
640 by Teddy Hogeborn
Use architecture libdir.
77
	for d in \
1136 by Teddy Hogeborn
Break some long lines and refine documentation
78
	"/usr/lib/`dpkg-architecture \
79
			-qDEB_HOST_MULTIARCH 2>/dev/null`" \
640 by Teddy Hogeborn
Use architecture libdir.
80
	"`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
81
		if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
82
			echo "$(DESTDIR)$$d"; \
83
			break; \
84
		fi; \
85
	done)
177 by Teddy Hogeborn
* Makefile (CONFDIR): Changed to be the same ("/etc/mandos") in both a
86
##
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
87
1137 by Teddy Hogeborn
Makefile: "pkg-config" is now overrideable by PKG_CONFIG
88
SYSTEMD:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
1136 by Teddy Hogeborn
Break some long lines and refine documentation
89
			--variable=systemdsystemunitdir)
1137 by Teddy Hogeborn
Makefile: "pkg-config" is now overrideable by PKG_CONFIG
90
TMPFILES:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
91
			--variable=tmpfilesdir)
1159 by Teddy Hogeborn
Use the systemd sysusers.d mechanism, if present
92
SYSUSERS:=$(DESTDIR)$(shell $(PKG_CONFIG) systemd \
93
			--variable=sysusersdir)
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
94
1137 by Teddy Hogeborn
Makefile: "pkg-config" is now overrideable by PKG_CONFIG
95
GNUTLS_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I gnutls)
96
GNUTLS_LIBS:=$(shell $(PKG_CONFIG) --libs gnutls)
97
AVAHI_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I avahi-core)
98
AVAHI_LIBS:=$(shell $(PKG_CONFIG) --libs avahi-core)
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
99
GPGME_CFLAGS:=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
100
GPGME_LIBS:=$(shell gpgme-config --libs; getconf LFS_LIBS; \
317 by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags.
101
	getconf LFS_LDFLAGS)
1137 by Teddy Hogeborn
Makefile: "pkg-config" is now overrideable by PKG_CONFIG
102
LIBNL3_CFLAGS:=$(shell $(PKG_CONFIG) --cflags-only-I libnl-route-3.0)
103
LIBNL3_LIBS:=$(shell $(PKG_CONFIG) --libs libnl-route-3.0)
104
GLIB_CFLAGS:=$(shell $(PKG_CONFIG) --cflags glib-2.0)
105
GLIB_LIBS:=$(shell $(PKG_CONFIG) --libs glib-2.0)
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
106
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
107
# Do not change these two
1146 by Teddy Hogeborn
Client: Always build with LFS enabled
108
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
109
	$(LANGUAGE) $(FEATURES) -DVERSION='"$(version)"'
1112 by Teddy Hogeborn
Makefile: Break long lines
110
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(strip \
111
	) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
112
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
113
# Commands to format a DocBook <refentry> document into a manual page
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
114
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
62 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Do not generate AUTHORS section.
115
	--param man.charmap.use.subset		0 \
116
	--param make.year.ranges		1 \
117
	--param make.single.year.ranges		1 \
118
	--param man.output.quietly		1 \
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
119
	--param man.authors.section.enabled	0 \
595 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Don't show errors from "locale".
120
	/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
121
	$(notdir $<); \
595 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Don't show errors from "locale".
122
	if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
1122 by Teddy Hogeborn
Fix bashisms: Use "command -v" instead of "type"
123
	&& command -v man >/dev/null; then LANG=en_US.UTF-8 \
124
	MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
125
	$(notdir $@); fi >/dev/null)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
126
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
127
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
128
	--param make.year.ranges		1 \
129
	--param make.single.year.ranges		1 \
130
	--param man.output.quietly		1 \
131
	--param man.authors.section.enabled	0 \
132
	--param citerefentry.link		1 \
133
	--output $@ \
134
	/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
135
	$<; $(HTMLPOST) $@)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
136
# Fix citerefentry links
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
137
HTMLPOST:=$(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
138
	--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.
139
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
140
PLUGINS:=plugins.d/password-prompt plugins.d/mandos-client \
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
141
	plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
142
	plugins.d/plymouth
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
143
PLUGIN_HELPERS:=plugin-helpers/mandos-client-iprouteadddel
1127 by Teddy Hogeborn
Add dracut(8) support
144
CPROGS:=plugin-runner dracut-module/password-agent $(PLUGINS) \
145
	$(PLUGIN_HELPERS)
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
146
PROGS:=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
147
DOCS:=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
148
	mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
1127 by Teddy Hogeborn
Add dracut(8) support
149
	dracut-module/password-agent.8mandos \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
150
	plugins.d/mandos-client.8mandos \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
151
	plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
152
	plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
493 by Teddy Hogeborn
* Makefile (DOCS): Added "intro.8mandos".
153
	plugins.d/plymouth.8mandos intro.8mandos
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
154
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
155
htmldocs:=$(addsuffix .xhtml,$(DOCS))
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
156
918 by Teddy Hogeborn
Use "simply expanded" variables in Makefile
157
objects:=$(addsuffix .o,$(CPROGS))
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
158
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
159
.PHONY: all
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
160
all: $(PROGS) mandos.lsm
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
161
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
162
.PHONY: doc
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
163
doc: $(DOCS)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
164
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
165
.PHONY: html
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
166
html: $(htmldocs)
167
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
168
%.5: %.xml common.ent legalnotice.xml
169
	$(DOCBOOKTOMAN)
170
%.5.xhtml: %.xml common.ent legalnotice.xml
171
	$(DOCBOOKTOHTML)
172
173
%.8: %.xml common.ent legalnotice.xml
174
	$(DOCBOOKTOMAN)
175
%.8.xhtml: %.xml common.ent legalnotice.xml
176
	$(DOCBOOKTOHTML)
177
178
%.8mandos: %.xml common.ent legalnotice.xml
179
	$(DOCBOOKTOMAN)
180
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
181
	$(DOCBOOKTOHTML)
182
493 by Teddy Hogeborn
* Makefile (DOCS): Added "intro.8mandos".
183
intro.8mandos: intro.xml common.ent legalnotice.xml
184
	$(DOCBOOKTOMAN)
185
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
186
	$(DOCBOOKTOHTML)
187
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
188
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
189
		legalnotice.xml
190
	$(DOCBOOKTOMAN)
191
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
192
		overview.xml legalnotice.xml
193
	$(DOCBOOKTOHTML)
194
195
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
196
		legalnotice.xml
197
	$(DOCBOOKTOMAN)
198
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
199
		 legalnotice.xml
200
	$(DOCBOOKTOHTML)
201
430 by teddy at bsnet
* mandos-monitor.xml: New.
202
mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
203
		legalnotice.xml
204
	$(DOCBOOKTOMAN)
205
mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
206
		 legalnotice.xml
207
	$(DOCBOOKTOHTML)
208
434 by teddy at bsnet
* mandos-ctl.xml: New.
209
mandos-ctl.8: mandos-ctl.xml common.ent overview.xml \
210
		legalnotice.xml
211
	$(DOCBOOKTOMAN)
212
mandos-ctl.8.xhtml: mandos-ctl.xml common.ent overview.xml \
213
		 legalnotice.xml
214
	$(DOCBOOKTOHTML)
215
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
216
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
217
		legalnotice.xml
218
	$(DOCBOOKTOMAN)
219
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
220
		legalnotice.xml
221
	$(DOCBOOKTOHTML)
222
223
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
224
		legalnotice.xml
225
	$(DOCBOOKTOMAN)
226
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
227
		overview.xml legalnotice.xml
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
228
	$(DOCBOOKTOHTML)
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
229
1127 by Teddy Hogeborn
Add dracut(8) support
230
dracut-module/password-agent.8mandos: \
231
		dracut-module/password-agent.xml common.ent \
232
		overview.xml legalnotice.xml
233
	$(DOCBOOKTOMAN)
234
dracut-module/password-agent.8mandos.xhtml: \
235
		dracut-module/password-agent.xml common.ent \
236
		overview.xml legalnotice.xml
237
	$(DOCBOOKTOHTML)
238
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
239
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
240
					common.ent \
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
241
					mandos-options.xml \
242
					overview.xml legalnotice.xml
91 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Include all DocBook-to-manpage-related
243
	$(DOCBOOKTOMAN)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
244
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
245
					common.ent \
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
246
					mandos-options.xml \
247
					overview.xml legalnotice.xml
248
	$(DOCBOOKTOHTML)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
249
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
250
# Update all these files with version number $(version)
251
common.ent: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
252
	$(strip $(SED) --in-place \
318 by Teddy Hogeborn
* Makefile (common.ent): Update "version" entity correctly.
253
		--expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
254
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
255
256
mandos: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
257
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
258
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
259
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
260
261
mandos-keygen: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
262
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
263
		--expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
264
		$@)
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
265
24.1.121 by Björn Påhlsson
mandos-ctl: Added support for all client calls
266
mandos-ctl: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
267
	$(strip $(SED) --in-place \
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
268
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
269
		$@)
240 by Teddy Hogeborn
Merge "mandos-list" from belorn.
270
430 by teddy at bsnet
* mandos-monitor.xml: New.
271
mandos-monitor: Makefile
272
	$(strip $(SED) --in-place \
273
		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
274
		$@)
275
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
276
mandos.lsm: Makefile
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
277
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
278
		--expression='s/^\(Version:\).*/\1\t$(version)/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
279
		$@)
280
	$(strip $(SED) --in-place \
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
281
		--expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
282
		$@)
283
	$(strip $(SED) --in-place \
255 by Teddy Hogeborn
* Makefile (mandos.lsm): Also update file name using version number.
284
		--expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
398 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN, DOCBOOKTOHTML, common.ent, mandos,
285
		$@)
233 by Teddy Hogeborn
* Makefile (all): Also depend on "mandos.lsm".
286
1111 by Teddy Hogeborn
Only use sanitizing options when debugging
287
# Need to add the GnuTLS, Avahi and GPGME libraries
1188 by Teddy Hogeborn
Makefile: Use target-specific variables
288
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
289
	) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
290
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
291
	) $(AVAHI_LIBS) $(GPGME_LIBS)
81 by Teddy Hogeborn
* Makefile (GNUTLS_CFLAGS, GNUTLS_LIBS, AVAHI_CFLAGS, AVAHI_LIBS,
292
1118 by Teddy Hogeborn
Client: Document requirement of libnl-route library
293
# Need to add the libnl-route library
1188 by Teddy Hogeborn
Makefile: Use target-specific variables
294
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
295
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
738.1.4 by Teddy Hogeborn
Add plugin for mandos-client to add and delete local routes.
296
1127 by Teddy Hogeborn
Add dracut(8) support
297
# Need to add the GLib and pthread libraries
1188 by Teddy Hogeborn
Makefile: Use target-specific variables
298
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
299
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
1127 by Teddy Hogeborn
Add dracut(8) support
300
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
301
.PHONY: clean
1 by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN
302
clean:
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
303
	-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
304
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
305
.PHONY: distclean
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
306
distclean: clean
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
307
.PHONY: mostlyclean
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
308
mostlyclean: clean
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
309
.PHONY: maintainer-clean
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
310
maintainer-clean: clean
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
311
	-rm --force --recursive keydir confdir statedir
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
312
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
313
.PHONY: check
1116 by Teddy Hogeborn
Debian package change: Add autopkgtest support
314
check: all
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
315
	./mandos --check
608 by Teddy Hogeborn
* Makefile (check): Also check mandos-ctl.
316
	./mandos-ctl --check
1116 by Teddy Hogeborn
Debian package change: Add autopkgtest support
317
	./mandos-keygen --version
318
	./plugin-runner --version
319
	./plugin-helpers/mandos-client-iprouteadddel --version
1127 by Teddy Hogeborn
Add dracut(8) support
320
	./dracut-module/password-agent --test
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
321
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
322
# Run the client with a local config and key
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
323
.PHONY: run-client
1136 by Teddy Hogeborn
Break some long lines and refine documentation
324
run-client: all keydir/seckey.txt keydir/pubkey.txt \
325
			keydir/tls-privkey.pem keydir/tls-pubkey.pem
326
	@echo '######################################################'
327
	@echo '# The following error messages are harmless and can  #'
328
	@echo '#  be safely ignored:                                #'
329
	@echo '## From plugin-runner:                               #'
330
	@echo '# setgid: Operation not permitted                    #'
331
	@echo '# setuid: Operation not permitted                    #'
332
	@echo '## From askpass-fifo:                                #'
333
	@echo '# mkfifo: Permission denied                          #'
334
	@echo '## From mandos-client:                               #'
335
	@echo '# Failed to raise privileges: Operation not permi... #'
336
	@echo '# Warning: network hook "*" exited with status *     #'
337
	@echo '# ioctl SIOCSIFFLAGS +IFF_UP: Operation not permi... #'
338
	@echo '# Failed to bring up interface "*": Operation not... #'
339
	@echo '#                                                    #'
340
	@echo '# (The messages are caused by not running as root,   #'
341
	@echo '# but you should NOT run "make run-client" as root   #'
342
	@echo '# unless you also unpacked and compiled Mandos as    #'
343
	@echo '# root, which is also NOT recommended.)              #'
344
	@echo '######################################################'
706 by Teddy Hogeborn
mandos-client: Better error messages.
345
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
346
	./plugin-runner --plugin-dir=plugins.d \
738.1.1 by Teddy Hogeborn
Add a plugin helper directory, available to all plugins.
347
		--plugin-helper-dir=plugin-helpers \
141 by Teddy Hogeborn
* Makefile (run-client): Add "--config-file=plugin-runner.conf".
348
		--config-file=plugin-runner.conf \
962 by Teddy Hogeborn
Add support for using raw public keys in TLS (RFC 7250)
349
		--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--tls-privkey=keydir/tls-privkey.pem,--tls-pubkey=keydir/tls-pubkey.pem,--network-hook-dir=network-hooks.d \
706 by Teddy Hogeborn
mandos-client: Better error messages.
350
		--env-for=mandos-client:GNOME_KEYRING_CONTROL= \
260 by Teddy Hogeborn
* Makefile (run-client): Pass $(CLIENTARGS) to plugin-runner.
351
		$(CLIENTARGS)
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
352
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
353
# Used by run-client
962 by Teddy Hogeborn
Add support for using raw public keys in TLS (RFC 7250)
354
keydir/seckey.txt keydir/pubkey.txt keydir/tls-privkey.pem keydir/tls-pubkey.pem: mandos-keygen
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
355
	install --directory keydir
356
	./mandos-keygen --dir keydir --force
1207 by teddy at recompile
Makefile: fix targets run-server & run-client with GnuTLS 3.5.9
357
	if ! [ -e keydir/tls-privkey.pem ]; then \
358
		install --mode=u=rw /dev/null keydir/tls-privkey.pem; \
359
	fi
360
	if ! [ -e keydir/tls-pubkey.pem ]; then \
361
		install --mode=u=rw /dev/null keydir/tls-pubkey.pem; \
362
	fi
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
363
364
# Run the server with a local config
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
365
.PHONY: run-server
574 by Teddy Hogeborn
* mandos: White space and other misc. format fixes only.
366
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"
367
	./mandos --debug --no-dbus --configdir=confdir \
368
		--statedir=statedir $(SERVERARGS)
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
369
370
# Used by run-server
371
confdir/mandos.conf: mandos.conf
372
	install --directory confdir
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
373
	install --mode=u=rw,go=r $^ $@
962 by Teddy Hogeborn
Add support for using raw public keys in TLS (RFC 7250)
374
confdir/clients.conf: clients.conf keydir/seckey.txt keydir/tls-pubkey.pem
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
375
	install --directory confdir
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
376
	install --mode=u=rw $< $@
104 by Teddy Hogeborn
* Makefile (maintainer-clean): Also remove "confdir".
377
# Add a client password
708 by Teddy Hogeborn
mandos-keygen: Generate "checker" option to use SSH fingerprints.
378
	./mandos-keygen --dir keydir --password --no-ssh >> $@
518.2.2 by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir"
379
statedir:
380
	install --directory statedir
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
381
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
382
.PHONY: install
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
383
install: install-server install-client-nokey
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
384
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
385
.PHONY: install-html
235 by Teddy Hogeborn
* INSTALL: Fixed typo.
386
install-html: html
217 by Teddy Hogeborn
* .bzrignore: Added "man" directory (created by "make install-html").
387
	install --directory $(htmldir)
388
	install --mode=u=rw,go=r --target-directory=$(htmldir) \
389
		$(htmldocs)
216 by Teddy Hogeborn
* Makefile: Add HTML rules for manual pages.
390
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
391
.PHONY: install-server
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
392
install-server: doc
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
393
	install --directory $(CONFDIR)
643 by Teddy Hogeborn
Don't require /var/lib/mandos to be installed with user & group.
394
	if install --directory --mode=u=rwx --owner=$(USER) \
395
		--group=$(GROUP) $(STATEDIR); then \
396
		:; \
397
	elif install --directory --mode=u=rwx $(STATEDIR); then \
398
		chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
399
	fi
1136 by Teddy Hogeborn
Break some long lines and refine documentation
400
	if [ "$(TMPFILES)" != "$(DESTDIR)" \
401
			-a -d "$(TMPFILES)" ]; then \
842 by Teddy Hogeborn
Server: Do not set execute bit on tmpfiles.d/mandos.conf
402
		install --mode=u=rw,go=r tmpfiles.d-mandos.conf \
838 by Teddy Hogeborn
Server: New tmpfiles.d file for persistent state directory
403
			$(TMPFILES)/mandos.conf; \
404
	fi
1159 by Teddy Hogeborn
Use the systemd sysusers.d mechanism, if present
405
	if [ "$(SYSUSERS)" != "$(DESTDIR)" \
406
			-a -d "$(SYSUSERS)" ]; then \
407
		install --mode=u=rw,go=r sysusers.d-mandos.conf \
408
			$(SYSUSERS)/mandos.conf; \
409
	fi
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
410
	install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
430 by teddy at bsnet
* mandos-monitor.xml: New.
411
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
412
		mandos-ctl
413
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
414
		mandos-monitor
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
415
	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
416
		mandos.conf
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
417
	install --mode=u=rw --target-directory=$(CONFDIR) \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
418
		clients.conf
420.1.1 by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as
419
	install --mode=u=rw,go=r dbus-mandos.conf \
420
		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
421
	install --mode=u=rwx,go=rx init.d-mandos \
422
		$(DESTDIR)/etc/init.d/mandos
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
423
	if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
639 by Teddy Hogeborn
Bug fix: Make sure systemd service file is installed.
424
		install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
425
	fi
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
426
	install --mode=u=rw,go=r default-mandos \
427
		$(DESTDIR)/etc/default/mandos
200 by Teddy Hogeborn
* Makefile: Put the init script before avahi-daemon.
428
	if [ -z $(DESTDIR) ]; then \
429
		update-rc.d mandos defaults 25 15;\
430
	fi
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
431
	gzip --best --to-stdout mandos.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
432
		> $(MANDIR)/man8/mandos.8.gz
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
433
	gzip --best --to-stdout mandos-monitor.8 \
434
		> $(MANDIR)/man8/mandos-monitor.8.gz
435
	gzip --best --to-stdout mandos-ctl.8 \
436
		> $(MANDIR)/man8/mandos-ctl.8.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
437
	gzip --best --to-stdout mandos.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
438
		> $(MANDIR)/man5/mandos.conf.5.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
439
	gzip --best --to-stdout mandos-clients.conf.5 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
440
		> $(MANDIR)/man5/mandos-clients.conf.5.gz
549 by teddy at recompile
* Makefile (install-server): Add intro(8mandos) man page.
441
	gzip --best --to-stdout intro.8mandos \
442
		> $(MANDIR)/man8/intro.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
443
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
444
.PHONY: install-client-nokey
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
445
install-client-nokey: all doc
640 by Teddy Hogeborn
Use architecture libdir.
446
	install --directory $(LIBDIR)/mandos $(CONFDIR)
185 by Teddy Hogeborn
* .bzr-builddeb/default.conf: New.
447
	install --directory --mode=u=rwx $(KEYDIR) \
738.1.6 by Teddy Hogeborn
Fix minor bugs and typos and add some more debug output.
448
		$(LIBDIR)/mandos/plugins.d \
449
		$(LIBDIR)/mandos/plugin-helpers
1160 by Teddy Hogeborn
Client: Use the systemd sysusers.d mechanism, if present
450
	if [ "$(SYSUSERS)" != "$(DESTDIR)" \
451
			-a -d "$(SYSUSERS)" ]; then \
452
		install --mode=u=rw,go=r sysusers.d-mandos.conf \
453
			$(SYSUSERS)/mandos-client.conf; \
454
	fi
640 by Teddy Hogeborn
Use architecture libdir.
455
	if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
456
		install --mode=u=rwx \
839 by Teddy Hogeborn
Client: Make plugin helper override directory mode u=rwx,go=
457
			--directory "$(CONFDIR)/plugins.d" \
458
			"$(CONFDIR)/plugin-helpers"; \
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
459
	fi
505.3.17 by Teddy Hogeborn
* Makefile (install-client-nokey): Create network hook directory.
460
	install --mode=u=rwx,go=rx --directory \
461
		"$(CONFDIR)/network-hooks.d"
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
462
	install --mode=u=rwx,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
463
		--target-directory=$(LIBDIR)/mandos plugin-runner
953 by Teddy Hogeborn
Adapt to changes in cryptsetup; use "cryptroot-unlock" program
464
	install --mode=u=rwx,go=rx \
1136 by Teddy Hogeborn
Break some long lines and refine documentation
465
		--target-directory=$(LIBDIR)/mandos \
466
		mandos-to-cryptroot-unlock
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
467
	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
468
		mandos-keygen
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
469
	install --mode=u=rwx,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
470
		--target-directory=$(LIBDIR)/mandos/plugins.d \
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
471
		plugins.d/password-prompt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
472
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
473
		--target-directory=$(LIBDIR)/mandos/plugins.d \
171 by Teddy Hogeborn
Renamed "password-request" to "mandos-client".
474
		plugins.d/mandos-client
208 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/usplash".
475
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
476
		--target-directory=$(LIBDIR)/mandos/plugins.d \
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
477
		plugins.d/usplash
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
478
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
479
		--target-directory=$(LIBDIR)/mandos/plugins.d \
205 by Teddy Hogeborn
* Makefile (PLUGINS, uninstall-client,
480
		plugins.d/splashy
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
481
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
482
		--target-directory=$(LIBDIR)/mandos/plugins.d \
214 by Teddy Hogeborn
* Makefile (PLUGINS): Added "plugins.d/askpass-fifo".
483
		plugins.d/askpass-fifo
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
484
	install --mode=u=rwxs,go=rx \
640 by Teddy Hogeborn
Use architecture libdir.
485
		--target-directory=$(LIBDIR)/mandos/plugins.d \
425 by Teddy Hogeborn
* Makefile: Compile and install new "plymouth" plugin.
486
		plugins.d/plymouth
836 by Teddy Hogeborn
Client: Fix permissions on plugin helper directory.
487
	install --mode=u=rwx,go=rx \
738.1.6 by Teddy Hogeborn
Fix minor bugs and typos and add some more debug output.
488
		--target-directory=$(LIBDIR)/mandos/plugin-helpers \
489
		plugin-helpers/mandos-client-iprouteadddel
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
490
	install initramfs-tools-hook \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
491
		$(INITRAMFSTOOLS)/hooks/mandos
954 by Teddy Hogeborn
Move UMASK setting to more proper place
492
	install --mode=u=rw,go=r initramfs-tools-conf \
493
		$(INITRAMFSTOOLS)/conf.d/mandos-conf
1099 by Teddy Hogeborn
Installation: Fix UMASK even if set by some other initramfs hook
494
	install --mode=u=rw,go=r initramfs-tools-conf-hook \
495
		$(INITRAMFSTOOLS)/conf-hooks.d/zz-mandos
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
496
	install initramfs-tools-script \
302 by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
497
		$(INITRAMFSTOOLS)/scripts/init-premount/mandos
953 by Teddy Hogeborn
Adapt to changes in cryptsetup; use "cryptroot-unlock" program
498
	install initramfs-tools-script-stop \
499
		$(INITRAMFSTOOLS)/scripts/local-premount/mandos
1127 by Teddy Hogeborn
Add dracut(8) support
500
	install --directory $(DRACUTMODULE)
501
	install --mode=u=rw,go=r --target-directory=$(DRACUTMODULE) \
502
		dracut-module/ask-password-mandos.path \
503
		dracut-module/ask-password-mandos.service
504
	install --mode=u=rwxs,go=rx \
505
		--target-directory=$(DRACUTMODULE) \
506
		dracut-module/module-setup.sh \
507
		dracut-module/cmdline-mandos.sh \
508
		dracut-module/password-agent
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
509
	install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
510
	gzip --best --to-stdout mandos-keygen.8 \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
511
		> $(MANDIR)/man8/mandos-keygen.8.gz
512
	gzip --best --to-stdout plugin-runner.8mandos \
513
		> $(MANDIR)/man8/plugin-runner.8mandos.gz
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
514
	gzip --best --to-stdout plugins.d/mandos-client.8mandos \
515
		> $(MANDIR)/man8/mandos-client.8mandos.gz
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
516
	gzip --best --to-stdout plugins.d/password-prompt.8mandos \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
517
		> $(MANDIR)/man8/password-prompt.8mandos.gz
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
518
	gzip --best --to-stdout plugins.d/usplash.8mandos \
519
		> $(MANDIR)/man8/usplash.8mandos.gz
520
	gzip --best --to-stdout plugins.d/splashy.8mandos \
521
		> $(MANDIR)/man8/splashy.8mandos.gz
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
522
	gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
523
		> $(MANDIR)/man8/askpass-fifo.8mandos.gz
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
524
	gzip --best --to-stdout plugins.d/plymouth.8mandos \
525
		> $(MANDIR)/man8/plymouth.8mandos.gz
1127 by Teddy Hogeborn
Add dracut(8) support
526
	gzip --best --to-stdout dracut-module/password-agent.8mandos \
527
		> $(MANDIR)/man8/password-agent.8mandos.gz
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
528
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
529
.PHONY: install-client
182 by Teddy Hogeborn
* Makefile (install): Use "install-client-nokey".
530
install-client: install-client-nokey
166 by Teddy Hogeborn
* Makefile (confdir/clients.conf): Tighten permissions to "u=rw".
531
# Post-installation stuff
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
532
	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
1127 by Teddy Hogeborn
Add dracut(8) support
533
	if command -v update-initramfs >/dev/null; then \
534
	    update-initramfs -k all -u; \
535
	elif command -v dracut >/dev/null; then \
1136 by Teddy Hogeborn
Break some long lines and refine documentation
536
	    for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
1127 by Teddy Hogeborn
Add dracut(8) support
537
		if [ -w "$$initrd" ]; then \
538
		    chmod go-r "$$initrd"; \
539
		    dracut --force "$$initrd"; \
540
		fi; \
541
	    done; \
542
	fi
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
543
	echo "Now run mandos-keygen --password --dir $(KEYDIR)"
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
544
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
545
.PHONY: uninstall
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
546
uninstall: uninstall-server uninstall-client
547
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
548
.PHONY: uninstall-server
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
549
uninstall-server:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
550
	-rm --force $(PREFIX)/sbin/mandos \
430 by teddy at bsnet
* mandos-monitor.xml: New.
551
		$(PREFIX)/sbin/mandos-ctl \
552
		$(PREFIX)/sbin/mandos-monitor \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
553
		$(MANDIR)/man8/mandos.8.gz \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
554
		$(MANDIR)/man8/mandos-monitor.8.gz \
555
		$(MANDIR)/man8/mandos-ctl.8.gz \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
556
		$(MANDIR)/man5/mandos.conf.5.gz \
557
		$(MANDIR)/man5/mandos-clients.conf.5.gz
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
558
	update-rc.d -f mandos remove
163 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed.
559
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
560
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
561
.PHONY: uninstall-client
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
562
uninstall-client:
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
563
# Refuse to uninstall client if /etc/crypttab is explicitly configured
564
# to use it.
565
	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
566
		$(DESTDIR)/etc/crypttab
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
567
	-rm --force $(PREFIX)/sbin/mandos-keygen \
640 by Teddy Hogeborn
Use architecture libdir.
568
		$(LIBDIR)/mandos/plugin-runner \
569
		$(LIBDIR)/mandos/plugins.d/password-prompt \
570
		$(LIBDIR)/mandos/plugins.d/mandos-client \
571
		$(LIBDIR)/mandos/plugins.d/usplash \
572
		$(LIBDIR)/mandos/plugins.d/splashy \
573
		$(LIBDIR)/mandos/plugins.d/askpass-fifo \
574
		$(LIBDIR)/mandos/plugins.d/plymouth \
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
575
		$(INITRAMFSTOOLS)/hooks/mandos \
576
		$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
302 by Teddy Hogeborn
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
577
		$(INITRAMFSTOOLS)/scripts/init-premount/mandos \
1127 by Teddy Hogeborn
Add dracut(8) support
578
		$(INITRAMFSTOOLS)/scripts/local-premount/mandos \
579
		$(DRACUTMODULE)/ask-password-mandos.path \
580
		$(DRACUTMODULE)/ask-password-mandos.service \
581
		$(DRACUTMODULE)/module-setup.sh \
582
		$(DRACUTMODULE)/cmdline-mandos.sh \
583
		$(DRACUTMODULE)/password-agent \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
584
		$(MANDIR)/man8/mandos-keygen.8.gz \
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
585
		$(MANDIR)/man8/plugin-runner.8mandos.gz \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
586
		$(MANDIR)/man8/mandos-client.8mandos.gz
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
587
		$(MANDIR)/man8/password-prompt.8mandos.gz \
225 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/usplash.8mandos" and
588
		$(MANDIR)/man8/usplash.8mandos.gz \
589
		$(MANDIR)/man8/splashy.8mandos.gz \
226 by Teddy Hogeborn
* Makefile (DOCS): Added "plugins.d/askpass-fifo.8mandos".
590
		$(MANDIR)/man8/askpass-fifo.8mandos.gz \
435 by teddy at bsnet
* Makefile (DOCS): Added "plymouth.8mandos".
591
		$(MANDIR)/man8/plymouth.8mandos.gz \
1127 by Teddy Hogeborn
Add dracut(8) support
592
		$(MANDIR)/man8/password-agent.8mandos.gz \
640 by Teddy Hogeborn
Use architecture libdir.
593
	-rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
1127 by Teddy Hogeborn
Add dracut(8) support
594
		 $(LIBDIR)/mandos $(CONFDIR) $(KEYDIR) $(DRACUTMODULE)
595
	if command -v update-initramfs >/dev/null; then \
596
	    update-initramfs -k all -u; \
597
	elif command -v dracut >/dev/null; then \
1136 by Teddy Hogeborn
Break some long lines and refine documentation
598
	    for initrd in $(DESTDIR)/boot/initr*-$(LINUXVERSION); do \
1127 by Teddy Hogeborn
Add dracut(8) support
599
		test -w "$$initrd" && dracut --force "$$initrd"; \
600
	    done; \
601
	fi
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
602
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
603
.PHONY: purge
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
604
purge: purge-server purge-client
605
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
606
.PHONY: purge-server
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
607
purge-server: uninstall-server
162 by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): New variables.
608
	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
420.1.1 by teddy at bsnet
* Makefile (install-server): Install dbus-mandos.conf as
609
		$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
175 by Teddy Hogeborn
* Makefile: Clearly separate "local" install variable settings from
610
		$(DESTDIR)/etc/default/mandos \
611
		$(DESTDIR)/etc/init.d/mandos \
638 by Teddy Hogeborn
Add systemd service support for Mandos server.
612
		$(SYSTEMD)/mandos.service \
637 by Teddy Hogeborn
Fix fallback to /var/run if /run does not exist for Makefile.
613
		$(DESTDIR)/run/mandos.pid \
614
		$(DESTDIR)/var/run/mandos.pid
74 by Teddy Hogeborn
* Makefile (PREFIX, CONFDIR): New.
615
	-rmdir $(CONFDIR)
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
616
1189 by Teddy Hogeborn
Makefile: Declare phoniness of targets at each target
617
.PHONY: purge-client
67 by Teddy Hogeborn
* mandos-keygen: New program to generate new client keys on
618
purge-client: uninstall-client
962 by Teddy Hogeborn
Add support for using raw public keys in TLS (RFC 7250)
619
	-shred --remove $(KEYDIR)/seckey.txt $(KEYDIR)/tls-privkey.pem
161 by Teddy Hogeborn
* Makefile (purge-client): Also remove "plugin-runner.conf".
620
	-rm --force $(CONFDIR)/plugin-runner.conf \
962 by Teddy Hogeborn
Add support for using raw public keys in TLS (RFC 7250)
621
		$(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt \
622
		$(KEYDIR)/tls-pubkey.txt $(KEYDIR)/tls-privkey.txt
160 by Teddy Hogeborn
* Makefile: Changed to use symbolic instead of octal modes throughout.
623
	-rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)