/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

More consistent terminology: Clients are no longer "invalid" - they
are "disabled".  All code and documentation changed to reflect this.

D=Bus API change: The "properties" argument was removed from the
"ClientAdded" signal on interface "se.bsnet.fukt.Mandos".  All code in
both "mandos" and "mandos-monitor" changed to reflect this.

* mandos: Replaced "with closing(F)" with simply "with F" in all
          places where F is a file object.
  (Client.still_valid): Removed.  All callers changed to look at
                        "Client.enabled" instead.
  (dbus_service_property): Check for unsupported signatures with the
                           "byte_arrays" option.
  (DBusObjectWithProperties.Set): - '' -
  (ClientHandler.handle): Use the reverse pipe to receive the
                          "Client.enabled" attribute instead of the
                          now-removed "Client.still_valid()" method.
  (ForkingMixInWithPipe): Renamed to "ForkingMixInWithPipes" (all
                          users changed).  Now also create a reverse
                          pipe for sending data to the child process.
  (ForkingMixInWithPipes.add_pipe): Now takes two pipe fd's as
                                    arguments.  All callers changed.
  (IPv6_TCPServer.handle_ipc): Take an additional "reply_fd" argument
                               (all callers changed).  Close the reply
                               pipe when the child data pipe is
                               closed.  New "GETATTR" IPC method; will
                               pickle client attribute and send it
                               over the reply pipe FD.
  (MandosDBusService.ClientAdded): Removed "properties" argument.  All
                                   emitters changed.
* mandos-clients.conf.xml (DESCRIPTION, OPTIONS): Use
                                                  "enabled/disabled"
                                                  terminology.
* mandos-ctl: Option "--is-valid" renamed to "--is-enabled".
* mandos-monitor: Enable user locale.  Try to log exceptions.
  (MandosClientPropertyCache.__init__): Removed "properties" argument.
                                        All callers changed.
  (UserInterface.add_new_client): Remove "properties" argument.  All
                                  callers changed.  Supply "logger"
                                  argument to MandosClientWidget().
  (UserInterface.add_client): New "logger" argument.  All callers
                              changed.
* mandos.xml (BUGS, SECURITY/CLIENTS): Use "enabled/disabled"
                                       terminology.

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