/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
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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 \
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
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>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY_LD += -fPIE
21
 
LINK_FORTIFY += -pie
22
 
endif
 
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
23
15
#COVERAGE=--coverage
24
16
OPTIMIZE=-Os
25
17
LANGUAGE=-std=gnu99
26
18
htmldir=man
27
 
version=1.0.14
 
19
version=1.0.3
28
20
SED=sed
29
21
 
30
22
## Use these settings for a traditional /usr/local install
43
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
44
36
##
45
37
 
46
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
47
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
48
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
49
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
50
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
51
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
52
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
53
44
 
54
45
# Do not change these two
55
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
58
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
59
50
 
60
51
# Commands to format a DocBook <refentry> document into a manual page
61
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
62
53
        --param man.charmap.use.subset          0 \
63
54
        --param make.year.ranges                1 \
64
55
        --param make.single.year.ranges         1 \
66
57
        --param man.authors.section.enabled     0 \
67
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
68
59
        $(notdir $<); \
69
 
        $(MANPOST) $(notdir $@))
 
60
        $(MANPOST) $(notdir $@)
70
61
# DocBook-to-man post-processing to fix a '\n' escape bug
71
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
72
63
 
73
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
74
65
        --param make.year.ranges                1 \
75
66
        --param make.single.year.ranges         1 \
76
67
        --param man.output.quietly              1 \
78
69
        --param citerefentry.link               1 \
79
70
        --output $@ \
80
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
81
 
        $<; $(HTMLPOST) $@)
 
72
        $<; $(HTMLPOST) $@
82
73
# Fix citerefentry links
83
74
HTMLPOST=$(SED) --in-place \
84
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'
86
77
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
87
78
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
79
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
80
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
90
81
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
82
        plugins.d/mandos-client.8mandos \
92
83
        plugins.d/password-prompt.8mandos mandos.conf.5 \
159
150
 
160
151
# Update all these files with version number $(version)
161
152
common.ent: Makefile
162
 
        $(strip $(SED) --in-place \
163
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
164
 
                $@)
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
165
156
 
166
157
mandos: Makefile
167
 
        $(strip $(SED) --in-place \
 
158
        $(SED) --in-place \
168
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
 
                $@)
 
160
                $@
170
161
 
171
162
mandos-keygen: Makefile
172
 
        $(strip $(SED) --in-place \
 
163
        $(SED) --in-place \
173
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
174
 
                $@)
 
165
                $@
175
166
 
176
 
mandos-ctl: Makefile
177
 
        $(strip $(SED) --in-place \
 
167
mandos-list: Makefile
 
168
        $(SED) --in-place \
178
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
 
                $@)
 
170
                $@
180
171
 
181
172
mandos.lsm: Makefile
182
 
        $(strip $(SED) --in-place \
 
173
        $(SED) --in-place \
183
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
184
 
                $@)
185
 
        $(strip $(SED) --in-place \
 
175
                $@
 
176
        $(SED) --in-place \
186
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
187
 
                $@)
188
 
        $(strip $(SED) --in-place \
 
178
                $@
 
179
        $(SED) --in-place \
189
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
190
 
                $@)
 
181
                $@
191
182
 
192
 
plugins.d/mandos-client: plugins.d/mandos-client.c
193
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
194
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
183
plugins.d/mandos-client: plugins.d/mandos-client.o
 
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
195
186
 
196
187
.PHONY : all doc html clean distclean run-client run-server install \
197
188
        install-server install-client uninstall uninstall-server \
222
213
 
223
214
# Run the server with a local config
224
215
run-server: confdir/mandos.conf confdir/clients.conf
225
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
226
217
 
227
218
# Used by run-server
228
219
confdir/mandos.conf: mandos.conf
294
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
295
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
296
287
        install initramfs-tools-script \
297
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
298
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
299
290
        gzip --best --to-stdout mandos-keygen.8 \
300
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
341
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
342
333
                $(INITRAMFSTOOLS)/hooks/mandos \
343
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
344
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
345
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
346
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
347
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \