/mandos/trunk

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2008-10-03 09:32:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081003093230-rshn19e0c19zz12i
* .bzrignore (plugins.d/askpass-fifo): Added.

* Makefile (FORTIFY): Added "-fstack-protector-all".
  (mandos, mandos-keygen): Use more strict regexps when updating the
                           version number.

* mandos (Client.__init__): Use os.path.expandvars() and
                            os.path.expanduser() on the "secfile"
                            config value.

* plugins.d/splashy.c: Update comments and order of #include's.
  (main): Check user and group when looking for running splashy
          process.  Do not ignore ENOENT from execl().  Use _exit()
          instead of "return" when an error happens in child
          processes.  Bug fix: Only wait for splashy_update
          completion if it was started.  Bug fix: detect failing
          waitpid().  Only kill splashy_update if it is running.  Do
          the killing of the old splashy process before the fork().
          Do setsid() and setuid(geteuid()) before starting the new
          splashy.  Report failing execl().

* plugins.d/usplash.c: Update comments and order of #include's.
  (main): Check user and group when looking for running usplash
          process.  Do not report execv() error if interrupted by a
          signal.

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
23
13
#COVERAGE=--coverage
24
14
OPTIMIZE=-Os
25
15
LANGUAGE=-std=gnu99
26
16
htmldir=man
27
 
version=1.0.14
 
17
version=1.0
28
18
SED=sed
29
19
 
30
20
## Use these settings for a traditional /usr/local install
43
33
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
44
34
##
45
35
 
46
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
47
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
36
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
37
GNUTLS_LIBS=$(shell libgnutls-config --libs)
48
38
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
49
39
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)
 
40
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
41
GPGME_LIBS=$(shell gpgme-config --libs)
53
42
 
54
43
# Do not change these two
55
44
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
56
45
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
57
46
        -DVERSION='"$(version)"'
58
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
47
LDFLAGS=$(COVERAGE)
59
48
 
60
49
# Commands to format a DocBook <refentry> document into a manual page
61
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
50
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
62
51
        --param man.charmap.use.subset          0 \
63
52
        --param make.year.ranges                1 \
64
53
        --param make.single.year.ranges         1 \
66
55
        --param man.authors.section.enabled     0 \
67
56
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
68
57
        $(notdir $<); \
69
 
        $(MANPOST) $(notdir $@))
 
58
        $(MANPOST) $(notdir $@)
70
59
# DocBook-to-man post-processing to fix a '\n' escape bug
71
60
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
72
61
 
73
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
62
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
74
63
        --param make.year.ranges                1 \
75
64
        --param make.single.year.ranges         1 \
76
65
        --param man.output.quietly              1 \
78
67
        --param citerefentry.link               1 \
79
68
        --output $@ \
80
69
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
81
 
        $<; $(HTMLPOST) $@)
 
70
        $<; $(HTMLPOST) $@
82
71
# Fix citerefentry links
83
 
HTMLPOST=$(SED) --in-place \
84
 
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
72
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'
85
73
 
86
74
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
87
75
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
88
76
CPROGS=plugin-runner $(PLUGINS)
89
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
77
PROGS=mandos mandos-keygen $(CPROGS)
90
78
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
91
79
        plugins.d/mandos-client.8mandos \
92
80
        plugins.d/password-prompt.8mandos mandos.conf.5 \
93
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
94
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
81
        mandos-clients.conf.5
95
82
 
96
83
htmldocs=$(addsuffix .xhtml,$(DOCS))
97
84
 
98
85
objects=$(addsuffix .o,$(CPROGS))
99
86
 
100
 
all: $(PROGS) mandos.lsm
 
87
all: $(PROGS)
101
88
 
102
89
doc: $(DOCS)
103
90
 
159
146
 
160
147
# Update all these files with version number $(version)
161
148
common.ent: Makefile
162
 
        $(strip $(SED) --in-place \
163
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
164
 
                $@)
 
149
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
165
150
 
166
151
mandos: Makefile
167
 
        $(strip $(SED) --in-place \
168
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
 
                $@)
 
152
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
170
153
 
171
154
mandos-keygen: Makefile
172
 
        $(strip $(SED) --in-place \
173
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
174
 
                $@)
175
 
 
176
 
mandos-ctl: Makefile
177
 
        $(strip $(SED) --in-place \
178
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
179
 
                $@)
180
 
 
181
 
mandos.lsm: Makefile
182
 
        $(strip $(SED) --in-place \
183
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
184
 
                $@)
185
 
        $(strip $(SED) --in-place \
186
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
187
 
                $@)
188
 
        $(strip $(SED) --in-place \
189
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
190
 
                $@)
191
 
 
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 $@
 
155
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
 
156
 
 
157
plugins.d/mandos-client: plugins.d/mandos-client.o
 
158
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
159
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
195
160
 
196
161
.PHONY : all doc html clean distclean run-client run-server install \
197
162
        install-server install-client uninstall uninstall-server \
212
177
run-client: all keydir/seckey.txt keydir/pubkey.txt
213
178
        ./plugin-runner --plugin-dir=plugins.d \
214
179
                --config-file=plugin-runner.conf \
215
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
216
 
                $(CLIENTARGS)
 
180
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
217
181
 
218
182
# Used by run-client
219
183
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
222
186
 
223
187
# Run the server with a local config
224
188
run-server: confdir/mandos.conf confdir/clients.conf
225
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
189
        ./mandos --debug --configdir=confdir
226
190
 
227
191
# Used by run-server
228
192
confdir/mandos.conf: mandos.conf
236
200
 
237
201
install: install-server install-client-nokey
238
202
 
239
 
install-html: html
 
203
install-html: $(htmldocs)
240
204
        install --directory $(htmldir)
241
205
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
242
206
                $(htmldocs)
294
258
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
295
259
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
296
260
        install initramfs-tools-script \
297
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
261
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
298
262
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
299
263
        gzip --best --to-stdout mandos-keygen.8 \
300
264
                > $(MANDIR)/man8/mandos-keygen.8.gz
304
268
                > $(MANDIR)/man8/password-prompt.8mandos.gz
305
269
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
306
270
                > $(MANDIR)/man8/mandos-client.8mandos.gz
307
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
308
 
                > $(MANDIR)/man8/usplash.8mandos.gz
309
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
310
 
                > $(MANDIR)/man8/splashy.8mandos.gz
311
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
312
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
313
271
 
314
272
install-client: install-client-nokey
315
273
# Post-installation stuff
338
296
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
339
297
                $(PREFIX)/lib/mandos/plugins.d/usplash \
340
298
                $(PREFIX)/lib/mandos/plugins.d/splashy \
341
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
342
299
                $(INITRAMFSTOOLS)/hooks/mandos \
343
300
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
344
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
301
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
345
302
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
346
303
                $(MANDIR)/man8/mandos-keygen.8.gz \
347
304
                $(MANDIR)/man8/password-prompt.8mandos.gz \
348
 
                $(MANDIR)/man8/usplash.8mandos.gz \
349
 
                $(MANDIR)/man8/splashy.8mandos.gz \
350
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
351
305
                $(MANDIR)/man8/mandos-client.8mandos.gz
352
306
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
353
307
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)