/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

Code cleanup and one bug fix.

* mandos (Client.enable): Bug fix: Do not enable if already enabled.
  (MandosServer.__init__): Create empty set of clients if none passed.
  (main): Do not create clients set; do not pass a clients set to
          MandosServer.  Use tcp_server.clients throughout.

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 -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
14
15
#COVERAGE=--coverage
15
16
OPTIMIZE=-Os
16
17
LANGUAGE=-std=gnu99
17
18
htmldir=man
18
 
version=1.0.2
 
19
version=1.0.8
19
20
SED=sed
20
21
 
21
22
## Use these settings for a traditional /usr/local install
38
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
39
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
44
        getconf LFS_LDFLAGS)
43
45
 
44
46
# Do not change these two
45
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
49
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
51
 
50
52
# Commands to format a DocBook <refentry> document into a manual page
51
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
76
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
80
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen $(CPROGS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
80
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
83
        plugins.d/mandos-client.8mandos \
82
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
150
152
# Update all these files with version number $(version)
151
153
common.ent: Makefile
152
154
        $(SED) --in-place \
153
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
154
156
                $@
155
157
 
156
158
mandos: Makefile
163
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
166
                $@
165
167
 
 
168
mandos-ctl: Makefile
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
 
172
 
166
173
mandos.lsm: Makefile
167
174
        $(SED) --in-place \
168
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
170
177
        $(SED) --in-place \
171
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
172
179
                $@
 
180
        $(SED) --in-place \
 
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
182
                $@
173
183
 
174
184
plugins.d/mandos-client: plugins.d/mandos-client.o
175
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
194
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
195
205
        ./plugin-runner --plugin-dir=plugins.d \
196
206
                --config-file=plugin-runner.conf \
197
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
208
                $(CLIENTARGS)
198
209
 
199
210
# Used by run-client
200
211
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
203
214
 
204
215
# Run the server with a local config
205
216
run-server: confdir/mandos.conf confdir/clients.conf
206
 
        ./mandos --debug --configdir=confdir
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
207
218
 
208
219
# Used by run-server
209
220
confdir/mandos.conf: mandos.conf
275
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
276
287
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
277
288
        install initramfs-tools-script \
278
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
289
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
279
290
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
280
291
        gzip --best --to-stdout mandos-keygen.8 \
281
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
322
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
323
334
                $(INITRAMFSTOOLS)/hooks/mandos \
324
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
325
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
326
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
327
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
328
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \