/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

Overflows are not detected by sscanf(), so stop using it:

* plugin-runner.c (main/parse_opt): Change from using "sscanf()" to
                                    "strtoimax()".
* plugins.d/mandos-client.c (main/parse_opt, main): Change from using
                                                    "sscanf()" to
                                                    "strtoimax()" and
                                                    "strtof()".
* splashy.c (main): Change from using "sscanf()" to "strtoimax()".
* usplash.c (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
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 \
9
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
 
18
htmldir=man
 
19
version=1.0.5
 
20
SED=sed
16
21
 
17
22
## Use these settings for a traditional /usr/local install
18
23
# PREFIX=$(DESTDIR)/usr/local
39
44
 
40
45
# Do not change these two
41
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
42
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
43
 
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))
44
50
 
45
51
# Commands to format a DocBook <refentry> document into a manual page
46
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
53
59
        $(notdir $<); \
54
60
        $(MANPOST) $(notdir $@)
55
61
# DocBook-to-man post-processing to fix a '\n' escape bug
56
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
57
63
 
58
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
59
65
        --param make.year.ranges                1 \
65
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
66
72
        $<; $(HTMLPOST) $@
67
73
# Fix citerefentry links
68
 
HTMLPOST=sed --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
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'
69
76
 
70
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
71
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
72
 
PROGS=plugin-runner $(PLUGINS)
 
79
CPROGS=plugin-runner $(PLUGINS)
 
80
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
73
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
74
82
        plugins.d/mandos-client.8mandos \
75
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
76
 
        mandos-clients.conf.5
 
84
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
85
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
77
86
 
78
87
htmldocs=$(addsuffix .xhtml,$(DOCS))
79
88
 
80
 
objects=$(addsuffix .o,$(PROGS))
 
89
objects=$(addsuffix .o,$(CPROGS))
81
90
 
82
 
all: $(PROGS)
 
91
all: $(PROGS) mandos.lsm
83
92
 
84
93
doc: $(DOCS)
85
94
 
86
95
html: $(htmldocs)
87
96
 
88
 
%.5: %.xml legalnotice.xml
89
 
        $(DOCBOOKTOMAN)
90
 
%.5.xhtml: %.xml legalnotice.xml
91
 
        $(DOCBOOKTOHTML)
92
 
 
93
 
%.8: %.xml legalnotice.xml
94
 
        $(DOCBOOKTOMAN)
95
 
%.8.xhtml: %.xml legalnotice.xml
96
 
        $(DOCBOOKTOHTML)
97
 
 
98
 
%.8mandos: %.xml legalnotice.xml
99
 
        $(DOCBOOKTOMAN)
100
 
%.8mandos.xhtml: %.xml legalnotice.xml
101
 
        $(DOCBOOKTOHTML)
102
 
 
103
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
104
 
        $(DOCBOOKTOMAN)
105
 
mandos.8.xhtml: mandos.xml mandos-options.xml overview.xml \
106
 
                legalnotice.xml
107
 
        $(DOCBOOKTOHTML)
108
 
 
109
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
110
 
        $(DOCBOOKTOMAN)
111
 
mandos-keygen.8.xhtml: mandos-keygen.xml overview.xml legalnotice.xml
112
 
        $(DOCBOOKTOHTML)
113
 
 
114
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
115
 
        $(DOCBOOKTOMAN)
116
 
mandos.conf.5.xhtml: mandos.conf.xml mandos-options.xml legalnotice.xml
117
 
        $(DOCBOOKTOHTML)
118
 
 
119
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
120
 
        $(DOCBOOKTOMAN)
121
 
plugin-runner.8mandos.xhtml: plugin-runner.xml overview.xml \
122
 
                legalnotice.xml
 
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
123
138
        $(DOCBOOKTOHTML)
124
139
 
125
140
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
141
                                        common.ent \
126
142
                                        mandos-options.xml \
127
143
                                        overview.xml legalnotice.xml
128
144
        $(DOCBOOKTOMAN)
129
145
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
146
                                        common.ent \
130
147
                                        mandos-options.xml \
131
148
                                        overview.xml legalnotice.xml
132
149
        $(DOCBOOKTOHTML)
133
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-ctl: 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
                $@
 
182
 
134
183
plugins.d/mandos-client: plugins.d/mandos-client.o
135
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
136
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
140
189
        uninstall-client purge purge-server purge-client
141
190
 
142
191
clean:
143
 
        -rm --force $(PROGS) $(objects) $(htmldocs) $(DOCS) core
 
192
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
144
193
 
145
194
distclean: clean
146
195
mostlyclean: clean
147
196
maintainer-clean: clean
148
197
        -rm --force --recursive keydir confdir
149
198
 
150
 
check:
 
199
check:  all
151
200
        ./mandos --check
152
201
 
153
202
# Run the client with a local config and key
154
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
155
204
        ./plugin-runner --plugin-dir=plugins.d \
156
205
                --config-file=plugin-runner.conf \
157
 
                --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)
158
208
 
159
209
# Used by run-client
160
210
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
163
213
 
164
214
# Run the server with a local config
165
215
run-server: confdir/mandos.conf confdir/clients.conf
166
 
        ./mandos --debug --configdir=confdir
 
216
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
167
217
 
168
218
# Used by run-server
169
219
confdir/mandos.conf: mandos.conf
177
227
 
178
228
install: install-server install-client-nokey
179
229
 
180
 
install-html: $(htmldocs)
181
 
        install --directory man
182
 
        install --mode=u=rw,go=r --target-directory=man $(htmldocs)
 
230
install-html: html
 
231
        install --directory $(htmldir)
 
232
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
233
                $(htmldocs)
183
234
 
184
235
install-server: doc
185
236
        install --directory $(CONFDIR)
234
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
235
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
236
287
        install initramfs-tools-script \
237
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
238
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
239
290
        gzip --best --to-stdout mandos-keygen.8 \
240
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
244
295
                > $(MANDIR)/man8/password-prompt.8mandos.gz
245
296
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
246
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
247
304
 
248
305
install-client: install-client-nokey
249
306
# Post-installation stuff
272
329
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
273
330
                $(PREFIX)/lib/mandos/plugins.d/usplash \
274
331
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
275
333
                $(INITRAMFSTOOLS)/hooks/mandos \
276
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
277
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
278
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
279
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
280
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 \
281
342
                $(MANDIR)/man8/mandos-client.8mandos.gz
282
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
283
 
                rm --force $(CONFDIR)/plugins.d/README; \
284
 
        fi
285
343
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
286
344
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
287
345
        update-initramfs -k all -u