/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to Makefile

Fixes for sscanf usage:

* plugin-runner.c (main): Parse numbers correctly and portably using
                          an intermediate "intmax_t".  Cast "pid_t" to
                          "intmax_t" before passing it to "printf()".
* plugins.d/mandos-client.c (main): Parse numbers correctly and
                                    portably using an intermediate
                                    "intmax_t".  Bug fix: cast
                                    "AvahiIfIndex" to "intmax_t" and
                                    use "PRIdMAX" instead of using
                                    "PRIu16", and use "PRIu16" to
                                    format port number.
* plugins.d/splashy.c (main): Parse numbers correctly and portably
                              using an intermediate "intmax_t".
* plugins.d/usplash.c (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
9
 
DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
13
15
#COVERAGE=--coverage
14
16
OPTIMIZE=-Os
15
17
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
 
18
htmldir=man
 
19
version=1.0.3
 
20
SED=sed
 
21
 
 
22
## Use these settings for a traditional /usr/local install
 
23
# PREFIX=$(DESTDIR)/usr/local
 
24
# CONFDIR=$(DESTDIR)/etc/mandos
 
25
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
26
# MANDIR=$(PREFIX)/man
 
27
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
28
##
 
29
 
 
30
## These settings are for a package-type install
17
31
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
32
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
33
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
 
# MANDIR=/usr/local/man
23
 
MANDIR=$(DESTDIR)/usr/share/man
 
34
MANDIR=$(PREFIX)/share/man
 
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
36
##
24
37
 
25
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
31
44
 
32
45
# Do not change these two
33
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
34
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
35
 
LDFLAGS=$(COVERAGE)
 
47
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
48
        -DVERSION='"$(version)"'
 
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
36
50
 
37
 
# Commands to format a DocBook refentry document into a manual page
 
51
# Commands to format a DocBook <refentry> document into a manual page
38
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
39
53
        --param man.charmap.use.subset          0 \
40
54
        --param make.year.ranges                1 \
44
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
45
59
        $(notdir $<); \
46
60
        $(MANPOST) $(notdir $@)
47
 
# DocBook-to-man post-processing to fix a \n escape bug
48
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
49
 
 
50
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
51
 
PROGS=plugin-runner $(PLUGINS)
 
61
# DocBook-to-man post-processing to fix a '\n' escape bug
 
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
63
 
 
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
65
        --param make.year.ranges                1 \
 
66
        --param make.single.year.ranges         1 \
 
67
        --param man.output.quietly              1 \
 
68
        --param man.authors.section.enabled     0 \
 
69
        --param citerefentry.link               1 \
 
70
        --output $@ \
 
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
 
72
        $<; $(HTMLPOST) $@
 
73
# Fix citerefentry links
 
74
HTMLPOST=$(SED) --in-place \
 
75
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
76
 
 
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
79
CPROGS=plugin-runner $(PLUGINS)
 
80
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
52
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
53
82
        plugins.d/mandos-client.8mandos \
54
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
55
 
        mandos-clients.conf.5
56
 
 
57
 
objects=$(addsuffix .o,$(PROGS))
58
 
 
59
 
all: $(PROGS)
 
84
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
85
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
86
 
 
87
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
88
 
 
89
objects=$(addsuffix .o,$(CPROGS))
 
90
 
 
91
all: $(PROGS) mandos.lsm
60
92
 
61
93
doc: $(DOCS)
62
94
 
63
 
%.5: %.xml legalnotice.xml
64
 
        $(DOCBOOKTOMAN)
65
 
 
66
 
%.8: %.xml legalnotice.xml
67
 
        $(DOCBOOKTOMAN)
68
 
 
69
 
%.8mandos: %.xml legalnotice.xml
70
 
        $(DOCBOOKTOMAN)
71
 
 
72
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
73
 
        $(DOCBOOKTOMAN)
74
 
 
75
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
76
 
        $(DOCBOOKTOMAN)
77
 
 
78
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
79
 
        $(DOCBOOKTOMAN)
80
 
 
81
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
 
        $(DOCBOOKTOMAN)
 
95
html: $(htmldocs)
 
96
 
 
97
%.5: %.xml common.ent legalnotice.xml
 
98
        $(DOCBOOKTOMAN)
 
99
%.5.xhtml: %.xml common.ent legalnotice.xml
 
100
        $(DOCBOOKTOHTML)
 
101
 
 
102
%.8: %.xml common.ent legalnotice.xml
 
103
        $(DOCBOOKTOMAN)
 
104
%.8.xhtml: %.xml common.ent legalnotice.xml
 
105
        $(DOCBOOKTOHTML)
 
106
 
 
107
%.8mandos: %.xml common.ent legalnotice.xml
 
108
        $(DOCBOOKTOMAN)
 
109
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
 
110
        $(DOCBOOKTOHTML)
 
111
 
 
112
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
 
113
                legalnotice.xml
 
114
        $(DOCBOOKTOMAN)
 
115
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
 
116
                overview.xml legalnotice.xml
 
117
        $(DOCBOOKTOHTML)
 
118
 
 
119
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
 
120
                legalnotice.xml
 
121
        $(DOCBOOKTOMAN)
 
122
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
 
123
                 legalnotice.xml
 
124
        $(DOCBOOKTOHTML)
 
125
 
 
126
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 
127
                legalnotice.xml
 
128
        $(DOCBOOKTOMAN)
 
129
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
 
130
                legalnotice.xml
 
131
        $(DOCBOOKTOHTML)
 
132
 
 
133
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
 
134
                legalnotice.xml
 
135
        $(DOCBOOKTOMAN)
 
136
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
 
137
                overview.xml legalnotice.xml
 
138
        $(DOCBOOKTOHTML)
83
139
 
84
140
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
141
                                        common.ent \
85
142
                                        mandos-options.xml \
86
143
                                        overview.xml legalnotice.xml
87
144
        $(DOCBOOKTOMAN)
 
145
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
146
                                        common.ent \
 
147
                                        mandos-options.xml \
 
148
                                        overview.xml legalnotice.xml
 
149
        $(DOCBOOKTOHTML)
 
150
 
 
151
# Update all these files with version number $(version)
 
152
common.ent: Makefile
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
 
156
 
 
157
mandos: Makefile
 
158
        $(SED) --in-place \
 
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
160
                $@
 
161
 
 
162
mandos-keygen: Makefile
 
163
        $(SED) --in-place \
 
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
165
                $@
 
166
 
 
167
mandos-list: Makefile
 
168
        $(SED) --in-place \
 
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
170
                $@
 
171
 
 
172
mandos.lsm: Makefile
 
173
        $(SED) --in-place \
 
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
175
                $@
 
176
        $(SED) --in-place \
 
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
178
                $@
 
179
        $(SED) --in-place \
 
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
181
                $@
88
182
 
89
183
plugins.d/mandos-client: plugins.d/mandos-client.o
90
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
91
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
92
186
 
93
 
.PHONY : all doc clean distclean run-client run-server install \
 
187
.PHONY : all doc html clean distclean run-client run-server install \
94
188
        install-server install-client uninstall uninstall-server \
95
189
        uninstall-client purge purge-server purge-client
96
190
 
97
191
clean:
98
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
192
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
99
193
 
100
194
distclean: clean
101
195
mostlyclean: clean
102
196
maintainer-clean: clean
103
197
        -rm --force --recursive keydir confdir
104
198
 
105
 
check:
 
199
check:  all
106
200
        ./mandos --check
107
201
 
108
202
# Run the client with a local config and key
109
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
110
204
        ./plugin-runner --plugin-dir=plugins.d \
111
205
                --config-file=plugin-runner.conf \
112
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
207
                $(CLIENTARGS)
113
208
 
114
209
# Used by run-client
115
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
118
213
 
119
214
# Run the server with a local config
120
215
run-server: confdir/mandos.conf confdir/clients.conf
121
 
        ./mandos --debug --configdir=confdir
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
122
217
 
123
218
# Used by run-server
124
219
confdir/mandos.conf: mandos.conf
130
225
# Add a client password
131
226
        ./mandos-keygen --dir keydir --password >> $@
132
227
 
133
 
install: install-server install-client
 
228
install: install-server install-client-nokey
 
229
 
 
230
install-html: html
 
231
        install --directory $(htmldir)
 
232
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
233
                $(htmldocs)
134
234
 
135
235
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
137
 
                $(MANDIR)/man8
 
236
        install --directory $(CONFDIR)
138
237
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
238
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
239
                mandos.conf
141
240
        install --mode=u=rw --target-directory=$(CONFDIR) \
142
241
                clients.conf
143
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
145
 
        update-rc.d mandos defaults
 
242
        install --mode=u=rwx,go=rx init.d-mandos \
 
243
                $(DESTDIR)/etc/init.d/mandos
 
244
        install --mode=u=rw,go=r default-mandos \
 
245
                $(DESTDIR)/etc/default/mandos
 
246
        if [ -z $(DESTDIR) ]; then \
 
247
                update-rc.d mandos defaults 25 15;\
 
248
        fi
146
249
        gzip --best --to-stdout mandos.8 \
147
250
                > $(MANDIR)/man8/mandos.8.gz
148
251
        gzip --best --to-stdout mandos.conf.5 \
150
253
        gzip --best --to-stdout mandos-clients.conf.5 \
151
254
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
255
 
153
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
 
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
 
256
install-client-nokey: all doc
 
257
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
258
        install --directory --mode=u=rwx $(KEYDIR) \
158
259
                $(PREFIX)/lib/mandos/plugins.d
159
260
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
160
261
                install --mode=u=rwx \
161
262
                        --directory "$(CONFDIR)/plugins.d"; \
162
 
                install --mode=u=rw,go=r etc-plugins.d-README \
163
 
                        $(CONFDIR)/plugins.d/README ; \
164
263
        fi
165
264
        install --mode=u=rwx,go=rx \
166
265
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
172
271
        install --mode=u=rwxs,go=rx \
173
272
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
174
273
                plugins.d/mandos-client
175
 
        install --mode=u=rwx,go=rx \
 
274
        install --mode=u=rwxs,go=rx \
176
275
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
177
276
                plugins.d/usplash
 
277
        install --mode=u=rwxs,go=rx \
 
278
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
279
                plugins.d/splashy
 
280
        install --mode=u=rwxs,go=rx \
 
281
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
282
                plugins.d/askpass-fifo
178
283
        install initramfs-tools-hook \
179
 
                /usr/share/initramfs-tools/hooks/mandos
180
 
        install initramfs-tools-hook-conf \
181
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
284
                $(INITRAMFSTOOLS)/hooks/mandos
 
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
182
287
        install initramfs-tools-script \
183
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
184
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
185
290
        gzip --best --to-stdout mandos-keygen.8 \
186
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
190
295
                > $(MANDIR)/man8/password-prompt.8mandos.gz
191
296
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
192
297
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
298
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
299
                > $(MANDIR)/man8/usplash.8mandos.gz
 
300
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
301
                > $(MANDIR)/man8/splashy.8mandos.gz
 
302
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
303
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
 
304
 
 
305
install-client: install-client-nokey
193
306
# Post-installation stuff
194
307
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
195
308
        update-initramfs -k all -u
209
322
# Refuse to uninstall client if /etc/crypttab is explicitly configured
210
323
# to use it.
211
324
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
212
 
                /etc/crypttab
 
325
                $(DESTDIR)/etc/crypttab
213
326
        -rm --force $(PREFIX)/sbin/mandos-keygen \
214
327
                $(PREFIX)/lib/mandos/plugin-runner \
215
328
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
216
329
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
217
330
                $(PREFIX)/lib/mandos/plugins.d/usplash \
218
 
                /usr/share/initramfs-tools/hooks/mandos \
219
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
220
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
 
331
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
 
333
                $(INITRAMFSTOOLS)/hooks/mandos \
 
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
221
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
222
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
223
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \
 
339
                $(MANDIR)/man8/usplash.8mandos.gz \
 
340
                $(MANDIR)/man8/splashy.8mandos.gz \
 
341
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
224
342
                $(MANDIR)/man8/mandos-client.8mandos.gz
225
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
226
 
                rm --force $(CONFDIR)/plugins.d/README; \
227
 
        fi
228
343
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
229
344
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
230
345
        update-initramfs -k all -u
233
348
 
234
349
purge-server: uninstall-server
235
350
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
236
 
                /etc/default/mandos /etc/init.d/mandos \
237
 
                /var/run/mandos.pid
 
351
                $(DESTDIR)/etc/default/mandos \
 
352
                $(DESTDIR)/etc/init.d/mandos \
 
353
                $(DESTDIR)/var/run/mandos.pid
238
354
        -rmdir $(CONFDIR)
239
355
 
240
356
purge-client: uninstall-client