/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
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
 
ifndef BROKEN_PIE
17
 
FORTIFY += -fPIE
18
 
LINK_FORTIFY_LD += -fPIE
19
 
LINK_FORTIFY += -pie
20
 
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
21
15
#COVERAGE=--coverage
22
16
OPTIMIZE=-Os
23
17
LANGUAGE=-std=gnu99
24
18
htmldir=man
25
 
version=1.0.14
 
19
version=1.0.5
26
20
SED=sed
27
21
 
28
22
## Use these settings for a traditional /usr/local install
41
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
42
36
##
43
37
 
44
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
45
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
46
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
47
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
48
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
49
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
50
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
51
44
 
52
45
# Do not change these two
53
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
56
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
57
50
 
58
51
# Commands to format a DocBook <refentry> document into a manual page
59
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
60
53
        --param man.charmap.use.subset          0 \
61
54
        --param make.year.ranges                1 \
62
55
        --param make.single.year.ranges         1 \
64
57
        --param man.authors.section.enabled     0 \
65
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
66
59
        $(notdir $<); \
67
 
        $(MANPOST) $(notdir $@))
 
60
        $(MANPOST) $(notdir $@)
68
61
# DocBook-to-man post-processing to fix a '\n' escape bug
69
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
70
63
 
71
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
72
65
        --param make.year.ranges                1 \
73
66
        --param make.single.year.ranges         1 \
74
67
        --param man.output.quietly              1 \
76
69
        --param citerefentry.link               1 \
77
70
        --output $@ \
78
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
79
 
        $<; $(HTMLPOST) $@)
 
72
        $<; $(HTMLPOST) $@
80
73
# Fix citerefentry links
81
74
HTMLPOST=$(SED) --in-place \
82
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'
157
150
 
158
151
# Update all these files with version number $(version)
159
152
common.ent: Makefile
160
 
        $(strip $(SED) --in-place \
161
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
162
 
                $@)
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
163
156
 
164
157
mandos: Makefile
165
 
        $(strip $(SED) --in-place \
 
158
        $(SED) --in-place \
166
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
167
 
                $@)
 
160
                $@
168
161
 
169
162
mandos-keygen: Makefile
170
 
        $(strip $(SED) --in-place \
 
163
        $(SED) --in-place \
171
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
172
 
                $@)
 
165
                $@
173
166
 
174
167
mandos-ctl: Makefile
175
 
        $(strip $(SED) --in-place \
 
168
        $(SED) --in-place \
176
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
 
                $@)
 
170
                $@
178
171
 
179
172
mandos.lsm: Makefile
180
 
        $(strip $(SED) --in-place \
 
173
        $(SED) --in-place \
181
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
182
 
                $@)
183
 
        $(strip $(SED) --in-place \
 
175
                $@
 
176
        $(SED) --in-place \
184
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
185
 
                $@)
186
 
        $(strip $(SED) --in-place \
 
178
                $@
 
179
        $(SED) --in-place \
187
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
188
 
                $@)
 
181
                $@
189
182
 
190
 
plugins.d/mandos-client: plugins.d/mandos-client.c
191
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
192
 
                ) $(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 $@
193
186
 
194
187
.PHONY : all doc html clean distclean run-client run-server install \
195
188
        install-server install-client uninstall uninstall-server \