/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-09-16 23:28:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090916232839-3o7i8qmcdcz5j1ya
* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added
                 "$syslog", thanks to Petter Reinholdtsen
                 <pere@hungry.com> (Debian bug #546928).

* initramfs-tools-script: Removed erroneous comment.

* plugins.d/askpass-fifo.c: Removed TEMP_FAILURE_RETRY since it is
                            not needed.

* plugins.d/mandos-client.c (main): Bug fix: Initialize
                                    "old_sigterm_action".

* plugins.d/splashy.c (main): Bug fix: really check return value from
                              "sigaddset".  Fix some warnings on
                              64-bit systems.

* plugins.d/usplash.c (termination_handler, main): Save received
                                                   signal and
                                                   re-raise it on
                                                   exit.
  (usplash_write): Do not close FIFO, instead, take an additional file
                   descriptor pointer to it and open only when needed
                   (all callers changed).  Abort immediately on EINTR.
                   Bug fix:  Add NUL byte on single-word commands.
                   Ignore "interrupted_by_signal".
  (makeprompt, find_usplash): New; broken out from "main()".
  (find_usplash): Bug fix: close /proc/<pid>/cmdline FD on error.
  (main): Reorganized to jump to a new "failure" label on any error.
          Bug fix: check return values from sigaddset.
          New variable "usplash_accessed" to flag if usplash(8) needs
          to be killed and restarted.  Removed the "an_error_occured"
          variable.

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