/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: 2009-12-25 23:13:47 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091225231347-gg9u9ru0wj0f24hh
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
 
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
13
22
#COVERAGE=--coverage
14
23
OPTIMIZE=-Os
15
24
LANGUAGE=-std=gnu99
 
25
htmldir=man
 
26
version=1.0.14
 
27
SED=sed
16
28
 
17
29
## Use these settings for a traditional /usr/local install
18
30
# PREFIX=$(DESTDIR)/usr/local
30
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
31
43
##
32
44
 
33
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
34
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
46
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
35
47
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
36
48
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
37
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
38
 
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)
39
52
 
40
53
# Do not change these two
41
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
42
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
43
 
LDFLAGS=$(COVERAGE)
 
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
 
56
        -DVERSION='"$(version)"'
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
44
58
 
45
59
# Commands to format a DocBook <refentry> document into a manual page
46
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
47
61
        --param man.charmap.use.subset          0 \
48
62
        --param make.year.ranges                1 \
49
63
        --param make.single.year.ranges         1 \
51
65
        --param man.authors.section.enabled     0 \
52
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
53
67
        $(notdir $<); \
54
 
        $(MANPOST) $(notdir $@)
 
68
        $(MANPOST) $(notdir $@))
55
69
# DocBook-to-man post-processing to fix a '\n' escape bug
56
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
57
 
 
58
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
59
 
PROGS=plugin-runner $(PLUGINS)
 
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
71
 
 
72
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
73
        --param make.year.ranges                1 \
 
74
        --param make.single.year.ranges         1 \
 
75
        --param man.output.quietly              1 \
 
76
        --param man.authors.section.enabled     0 \
 
77
        --param citerefentry.link               1 \
 
78
        --output $@ \
 
79
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
 
80
        $<; $(HTMLPOST) $@)
 
81
# Fix citerefentry links
 
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'
 
84
 
 
85
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
86
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
 
87
CPROGS=plugin-runner $(PLUGINS)
 
88
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
60
89
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
61
90
        plugins.d/mandos-client.8mandos \
62
91
        plugins.d/password-prompt.8mandos mandos.conf.5 \
63
 
        mandos-clients.conf.5
64
 
 
65
 
objects=$(addsuffix .o,$(PROGS))
66
 
 
67
 
all: $(PROGS)
 
92
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
 
93
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
94
 
 
95
htmldocs=$(addsuffix .xhtml,$(DOCS))
 
96
 
 
97
objects=$(addsuffix .o,$(CPROGS))
 
98
 
 
99
all: $(PROGS) mandos.lsm
68
100
 
69
101
doc: $(DOCS)
70
102
 
71
 
%.5: %.xml legalnotice.xml
72
 
        $(DOCBOOKTOMAN)
73
 
 
74
 
%.8: %.xml legalnotice.xml
75
 
        $(DOCBOOKTOMAN)
76
 
 
77
 
%.8mandos: %.xml legalnotice.xml
78
 
        $(DOCBOOKTOMAN)
79
 
 
80
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
81
 
        $(DOCBOOKTOMAN)
82
 
 
83
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
84
 
        $(DOCBOOKTOMAN)
85
 
 
86
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
87
 
        $(DOCBOOKTOMAN)
88
 
 
89
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
90
 
        $(DOCBOOKTOMAN)
 
103
html: $(htmldocs)
 
104
 
 
105
%.5: %.xml common.ent legalnotice.xml
 
106
        $(DOCBOOKTOMAN)
 
107
%.5.xhtml: %.xml common.ent legalnotice.xml
 
108
        $(DOCBOOKTOHTML)
 
109
 
 
110
%.8: %.xml common.ent legalnotice.xml
 
111
        $(DOCBOOKTOMAN)
 
112
%.8.xhtml: %.xml common.ent legalnotice.xml
 
113
        $(DOCBOOKTOHTML)
 
114
 
 
115
%.8mandos: %.xml common.ent legalnotice.xml
 
116
        $(DOCBOOKTOMAN)
 
117
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
 
118
        $(DOCBOOKTOHTML)
 
119
 
 
120
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
 
121
                legalnotice.xml
 
122
        $(DOCBOOKTOMAN)
 
123
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
 
124
                overview.xml legalnotice.xml
 
125
        $(DOCBOOKTOHTML)
 
126
 
 
127
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
 
128
                legalnotice.xml
 
129
        $(DOCBOOKTOMAN)
 
130
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
 
131
                 legalnotice.xml
 
132
        $(DOCBOOKTOHTML)
 
133
 
 
134
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 
135
                legalnotice.xml
 
136
        $(DOCBOOKTOMAN)
 
137
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
 
138
                legalnotice.xml
 
139
        $(DOCBOOKTOHTML)
 
140
 
 
141
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
 
142
                legalnotice.xml
 
143
        $(DOCBOOKTOMAN)
 
144
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
 
145
                overview.xml legalnotice.xml
 
146
        $(DOCBOOKTOHTML)
91
147
 
92
148
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
149
                                        common.ent \
93
150
                                        mandos-options.xml \
94
151
                                        overview.xml legalnotice.xml
95
152
        $(DOCBOOKTOMAN)
96
 
 
97
 
plugins.d/mandos-client: plugins.d/mandos-client.o
98
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
99
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
100
 
 
101
 
.PHONY : all doc clean distclean run-client run-server install \
 
153
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
 
154
                                        common.ent \
 
155
                                        mandos-options.xml \
 
156
                                        overview.xml legalnotice.xml
 
157
        $(DOCBOOKTOHTML)
 
158
 
 
159
# Update all these files with version number $(version)
 
160
common.ent: Makefile
 
161
        $(strip $(SED) --in-place \
 
162
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
163
                $@)
 
164
 
 
165
mandos: Makefile
 
166
        $(strip $(SED) --in-place \
 
167
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
168
                $@)
 
169
 
 
170
mandos-keygen: Makefile
 
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 $@
 
194
 
 
195
.PHONY : all doc html clean distclean run-client run-server install \
102
196
        install-server install-client uninstall uninstall-server \
103
197
        uninstall-client purge purge-server purge-client
104
198
 
105
199
clean:
106
 
        -rm --force $(PROGS) $(objects) $(DOCS) core
 
200
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
107
201
 
108
202
distclean: clean
109
203
mostlyclean: clean
110
204
maintainer-clean: clean
111
205
        -rm --force --recursive keydir confdir
112
206
 
113
 
check:
 
207
check:  all
114
208
        ./mandos --check
115
209
 
116
210
# Run the client with a local config and key
117
211
run-client: all keydir/seckey.txt keydir/pubkey.txt
118
212
        ./plugin-runner --plugin-dir=plugins.d \
119
213
                --config-file=plugin-runner.conf \
120
 
                --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)
121
216
 
122
217
# Used by run-client
123
218
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
126
221
 
127
222
# Run the server with a local config
128
223
run-server: confdir/mandos.conf confdir/clients.conf
129
 
        ./mandos --debug --configdir=confdir
 
224
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
130
225
 
131
226
# Used by run-server
132
227
confdir/mandos.conf: mandos.conf
140
235
 
141
236
install: install-server install-client-nokey
142
237
 
 
238
install-html: html
 
239
        install --directory $(htmldir)
 
240
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
 
241
                $(htmldocs)
 
242
 
143
243
install-server: doc
144
244
        install --directory $(CONFDIR)
145
245
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
151
251
                $(DESTDIR)/etc/init.d/mandos
152
252
        install --mode=u=rw,go=r default-mandos \
153
253
                $(DESTDIR)/etc/default/mandos
154
 
        update-rc.d mandos defaults
 
254
        if [ -z $(DESTDIR) ]; then \
 
255
                update-rc.d mandos defaults 25 15;\
 
256
        fi
155
257
        gzip --best --to-stdout mandos.8 \
156
258
                > $(MANDIR)/man8/mandos.8.gz
157
259
        gzip --best --to-stdout mandos.conf.5 \
165
267
                $(PREFIX)/lib/mandos/plugins.d
166
268
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
167
269
                install --mode=u=rwx \
168
 
                        --directory "$(CONFDIR)/plugins.d" && \
169
 
                install --mode=u=rw,go=r etc-plugins.d-README \
170
 
                        $(CONFDIR)/plugins.d/README ; \
 
270
                        --directory "$(CONFDIR)/plugins.d"; \
171
271
        fi
172
272
        install --mode=u=rwx,go=rx \
173
273
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
179
279
        install --mode=u=rwxs,go=rx \
180
280
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
181
281
                plugins.d/mandos-client
182
 
        install --mode=u=rwx,go=rx \
 
282
        install --mode=u=rwxs,go=rx \
183
283
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
184
284
                plugins.d/usplash
 
285
        install --mode=u=rwxs,go=rx \
 
286
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
287
                plugins.d/splashy
 
288
        install --mode=u=rwxs,go=rx \
 
289
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
290
                plugins.d/askpass-fifo
185
291
        install initramfs-tools-hook \
186
292
                $(INITRAMFSTOOLS)/hooks/mandos
187
293
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
188
294
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
189
295
        install initramfs-tools-script \
190
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
296
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
191
297
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
192
298
        gzip --best --to-stdout mandos-keygen.8 \
193
299
                > $(MANDIR)/man8/mandos-keygen.8.gz
197
303
                > $(MANDIR)/man8/password-prompt.8mandos.gz
198
304
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
199
305
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
306
        gzip --best --to-stdout plugins.d/usplash.8mandos \
 
307
                > $(MANDIR)/man8/usplash.8mandos.gz
 
308
        gzip --best --to-stdout plugins.d/splashy.8mandos \
 
309
                > $(MANDIR)/man8/splashy.8mandos.gz
 
310
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
 
311
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
200
312
 
201
313
install-client: install-client-nokey
202
314
# Post-installation stuff
224
336
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
225
337
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
226
338
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
339
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
340
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
227
341
                $(INITRAMFSTOOLS)/hooks/mandos \
228
342
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
229
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
343
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
230
344
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
231
345
                $(MANDIR)/man8/mandos-keygen.8.gz \
232
346
                $(MANDIR)/man8/password-prompt.8mandos.gz \
 
347
                $(MANDIR)/man8/usplash.8mandos.gz \
 
348
                $(MANDIR)/man8/splashy.8mandos.gz \
 
349
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
233
350
                $(MANDIR)/man8/mandos-client.8mandos.gz
234
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
235
 
                rm --force $(CONFDIR)/plugins.d/README; \
236
 
        fi
237
351
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
238
352
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
239
353
        update-initramfs -k all -u