/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 \
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 -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all
15
13
#COVERAGE=--coverage
16
14
OPTIMIZE=-Os
17
15
LANGUAGE=-std=gnu99
18
16
htmldir=man
19
 
version=1.0.7
 
17
version=1.0
20
18
SED=sed
21
19
 
22
20
## Use these settings for a traditional /usr/local install
39
37
GNUTLS_LIBS=$(shell libgnutls-config --libs)
40
38
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
39
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
43
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
44
 
        getconf LFS_LDFLAGS)
 
40
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
41
GPGME_LIBS=$(shell gpgme-config --libs)
45
42
 
46
43
# Do not change these two
47
44
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
48
45
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
49
46
        -DVERSION='"$(version)"'
50
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
47
LDFLAGS=$(COVERAGE)
51
48
 
52
49
# Commands to format a DocBook <refentry> document into a manual page
53
50
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
72
69
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
73
70
        $<; $(HTMLPOST) $@
74
71
# Fix citerefentry links
75
 
HTMLPOST=$(SED) --in-place \
76
 
        --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'
77
73
 
78
74
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
79
75
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
80
76
CPROGS=plugin-runner $(PLUGINS)
81
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
77
PROGS=mandos mandos-keygen $(CPROGS)
82
78
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
83
79
        plugins.d/mandos-client.8mandos \
84
80
        plugins.d/password-prompt.8mandos mandos.conf.5 \
85
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
86
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
81
        mandos-clients.conf.5
87
82
 
88
83
htmldocs=$(addsuffix .xhtml,$(DOCS))
89
84
 
90
85
objects=$(addsuffix .o,$(CPROGS))
91
86
 
92
 
all: $(PROGS) mandos.lsm
 
87
all: $(PROGS)
93
88
 
94
89
doc: $(DOCS)
95
90
 
151
146
 
152
147
# Update all these files with version number $(version)
153
148
common.ent: Makefile
154
 
        $(SED) --in-place \
155
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
156
 
                $@
 
149
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
157
150
 
158
151
mandos: Makefile
159
 
        $(SED) --in-place \
160
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
161
 
                $@
 
152
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
162
153
 
163
154
mandos-keygen: Makefile
164
 
        $(SED) --in-place \
165
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
167
 
 
168
 
mandos-ctl: Makefile
169
 
        $(SED) --in-place \
170
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
172
 
 
173
 
mandos.lsm: Makefile
174
 
        $(SED) --in-place \
175
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
176
 
                $@
177
 
        $(SED) --in-place \
178
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
179
 
                $@
180
 
        $(SED) --in-place \
181
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
182
 
                $@
 
155
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
183
156
 
184
157
plugins.d/mandos-client: plugins.d/mandos-client.o
185
158
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
204
177
run-client: all keydir/seckey.txt keydir/pubkey.txt
205
178
        ./plugin-runner --plugin-dir=plugins.d \
206
179
                --config-file=plugin-runner.conf \
207
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
208
 
                $(CLIENTARGS)
 
180
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
209
181
 
210
182
# Used by run-client
211
183
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
214
186
 
215
187
# Run the server with a local config
216
188
run-server: confdir/mandos.conf confdir/clients.conf
217
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
189
        ./mandos --debug --configdir=confdir
218
190
 
219
191
# Used by run-server
220
192
confdir/mandos.conf: mandos.conf
228
200
 
229
201
install: install-server install-client-nokey
230
202
 
231
 
install-html: html
 
203
install-html: $(htmldocs)
232
204
        install --directory $(htmldir)
233
205
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
234
206
                $(htmldocs)
286
258
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
287
259
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
288
260
        install initramfs-tools-script \
289
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
261
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
290
262
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
291
263
        gzip --best --to-stdout mandos-keygen.8 \
292
264
                > $(MANDIR)/man8/mandos-keygen.8.gz
296
268
                > $(MANDIR)/man8/password-prompt.8mandos.gz
297
269
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
298
270
                > $(MANDIR)/man8/mandos-client.8mandos.gz
299
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
300
 
                > $(MANDIR)/man8/usplash.8mandos.gz
301
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
302
 
                > $(MANDIR)/man8/splashy.8mandos.gz
303
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
304
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
305
271
 
306
272
install-client: install-client-nokey
307
273
# Post-installation stuff
330
296
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
331
297
                $(PREFIX)/lib/mandos/plugins.d/usplash \
332
298
                $(PREFIX)/lib/mandos/plugins.d/splashy \
333
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
334
299
                $(INITRAMFSTOOLS)/hooks/mandos \
335
300
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
336
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
301
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
337
302
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
338
303
                $(MANDIR)/man8/mandos-keygen.8.gz \
339
304
                $(MANDIR)/man8/password-prompt.8mandos.gz \
340
 
                $(MANDIR)/man8/usplash.8mandos.gz \
341
 
                $(MANDIR)/man8/splashy.8mandos.gz \
342
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
343
305
                $(MANDIR)/man8/mandos-client.8mandos.gz
344
306
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
345
307
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)