/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-09-26 04:54:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080926045435-0thnnqops1kzclag
* debian/mandos-client.postinst: Change home directory to
                                 "/nonexistent".
* debian/mandos.postinst: - '' -

* plugin-runner.c (main): Bug fix: Block signals while modifying
                          "plugin_list".

* plugins.d/usplash.c (usplash_write): New function.
  (main): Use "usplash_write" to write "INPUTQUIET" command.  Also
          write "TIMEOUT 0" before it, and write "TIMEOUT 15" and
          "PULSATE" if starting a new usplash process.  Kill old
          usplash before forking.  Bug fix: do setuid(geteuid()) to
          preserve genuine rootness.  Better interrupted/error logic
          overall.

* debian/mandos-client.lintian-overrides: Ignore setuid
                                          "plugins.d/usplash".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
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
 
htmldir=man
19
 
version=1.0.3
20
 
SED=sed
21
16
 
22
17
## Use these settings for a traditional /usr/local install
23
18
# PREFIX=$(DESTDIR)/usr/local
44
39
 
45
40
# Do not change these two
46
41
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
 
        -DVERSION='"$(version)"'
49
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
42
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
43
LDFLAGS=$(COVERAGE)
50
44
 
51
45
# Commands to format a DocBook <refentry> document into a manual page
52
46
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
59
53
        $(notdir $<); \
60
54
        $(MANPOST) $(notdir $@)
61
55
# DocBook-to-man post-processing to fix a '\n' escape bug
62
 
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
63
 
 
64
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
65
 
        --param make.year.ranges                1 \
66
 
        --param make.single.year.ranges         1 \
67
 
        --param man.output.quietly              1 \
68
 
        --param man.authors.section.enabled     0 \
69
 
        --param citerefentry.link               1 \
70
 
        --output $@ \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
 
        $<; $(HTMLPOST) $@
73
 
# Fix citerefentry links
74
 
HTMLPOST=$(SED) --in-place \
75
 
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
76
57
 
77
58
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
 
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
 
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
59
        plugins.d/usplash plugins.d/splashy
 
60
PROGS=plugin-runner $(PLUGINS)
81
61
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
62
        plugins.d/mandos-client.8mandos \
83
63
        plugins.d/password-prompt.8mandos mandos.conf.5 \
84
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
85
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
86
 
 
87
 
htmldocs=$(addsuffix .xhtml,$(DOCS))
88
 
 
89
 
objects=$(addsuffix .o,$(CPROGS))
90
 
 
91
 
all: $(PROGS) mandos.lsm
 
64
        mandos-clients.conf.5
 
65
 
 
66
objects=$(addsuffix .o,$(PROGS))
 
67
 
 
68
all: $(PROGS)
92
69
 
93
70
doc: $(DOCS)
94
71
 
95
 
html: $(htmldocs)
96
 
 
97
 
%.5: %.xml common.ent legalnotice.xml
98
 
        $(DOCBOOKTOMAN)
99
 
%.5.xhtml: %.xml common.ent legalnotice.xml
100
 
        $(DOCBOOKTOHTML)
101
 
 
102
 
%.8: %.xml common.ent legalnotice.xml
103
 
        $(DOCBOOKTOMAN)
104
 
%.8.xhtml: %.xml common.ent legalnotice.xml
105
 
        $(DOCBOOKTOHTML)
106
 
 
107
 
%.8mandos: %.xml common.ent legalnotice.xml
108
 
        $(DOCBOOKTOMAN)
109
 
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
110
 
        $(DOCBOOKTOHTML)
111
 
 
112
 
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
113
 
                legalnotice.xml
114
 
        $(DOCBOOKTOMAN)
115
 
mandos.8.xhtml: mandos.xml common.ent mandos-options.xml \
116
 
                overview.xml legalnotice.xml
117
 
        $(DOCBOOKTOHTML)
118
 
 
119
 
mandos-keygen.8: mandos-keygen.xml common.ent overview.xml \
120
 
                legalnotice.xml
121
 
        $(DOCBOOKTOMAN)
122
 
mandos-keygen.8.xhtml: mandos-keygen.xml common.ent overview.xml \
123
 
                 legalnotice.xml
124
 
        $(DOCBOOKTOHTML)
125
 
 
126
 
mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
127
 
                legalnotice.xml
128
 
        $(DOCBOOKTOMAN)
129
 
mandos.conf.5.xhtml: mandos.conf.xml common.ent mandos-options.xml \
130
 
                legalnotice.xml
131
 
        $(DOCBOOKTOHTML)
132
 
 
133
 
plugin-runner.8mandos: plugin-runner.xml common.ent overview.xml \
134
 
                legalnotice.xml
135
 
        $(DOCBOOKTOMAN)
136
 
plugin-runner.8mandos.xhtml: plugin-runner.xml common.ent \
137
 
                overview.xml legalnotice.xml
138
 
        $(DOCBOOKTOHTML)
 
72
%.5: %.xml legalnotice.xml
 
73
        $(DOCBOOKTOMAN)
 
74
 
 
75
%.8: %.xml legalnotice.xml
 
76
        $(DOCBOOKTOMAN)
 
77
 
 
78
%.8mandos: %.xml legalnotice.xml
 
79
        $(DOCBOOKTOMAN)
 
80
 
 
81
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
 
82
        $(DOCBOOKTOMAN)
 
83
 
 
84
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
 
85
        $(DOCBOOKTOMAN)
 
86
 
 
87
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
 
88
        $(DOCBOOKTOMAN)
 
89
 
 
90
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
 
91
        $(DOCBOOKTOMAN)
139
92
 
140
93
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
141
 
                                        common.ent \
142
94
                                        mandos-options.xml \
143
95
                                        overview.xml legalnotice.xml
144
96
        $(DOCBOOKTOMAN)
145
 
plugins.d/mandos-client.8mandos.xhtml: plugins.d/mandos-client.xml \
146
 
                                        common.ent \
147
 
                                        mandos-options.xml \
148
 
                                        overview.xml legalnotice.xml
149
 
        $(DOCBOOKTOHTML)
150
 
 
151
 
# Update all these files with version number $(version)
152
 
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
156
 
 
157
 
mandos: Makefile
158
 
        $(SED) --in-place \
159
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
161
 
 
162
 
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
164
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
166
 
 
167
 
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
171
 
 
172
 
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
174
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
177
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
180
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
182
97
 
183
98
plugins.d/mandos-client: plugins.d/mandos-client.o
184
99
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
185
100
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
186
101
 
187
 
.PHONY : all doc html clean distclean run-client run-server install \
 
102
.PHONY : all doc clean distclean run-client run-server install \
188
103
        install-server install-client uninstall uninstall-server \
189
104
        uninstall-client purge purge-server purge-client
190
105
 
191
106
clean:
192
 
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
 
107
        -rm --force $(PROGS) $(objects) $(DOCS) core
193
108
 
194
109
distclean: clean
195
110
mostlyclean: clean
196
111
maintainer-clean: clean
197
112
        -rm --force --recursive keydir confdir
198
113
 
199
 
check:  all
 
114
check:
200
115
        ./mandos --check
201
116
 
202
117
# Run the client with a local config and key
203
118
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
119
        ./plugin-runner --plugin-dir=plugins.d \
205
120
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
 
121
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
208
122
 
209
123
# Used by run-client
210
124
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
213
127
 
214
128
# Run the server with a local config
215
129
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
130
        ./mandos --debug --configdir=confdir
217
131
 
218
132
# Used by run-server
219
133
confdir/mandos.conf: mandos.conf
227
141
 
228
142
install: install-server install-client-nokey
229
143
 
230
 
install-html: html
231
 
        install --directory $(htmldir)
232
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
233
 
                $(htmldocs)
234
 
 
235
144
install-server: doc
236
145
        install --directory $(CONFDIR)
237
146
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
277
186
        install --mode=u=rwxs,go=rx \
278
187
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
279
188
                plugins.d/splashy
280
 
        install --mode=u=rwxs,go=rx \
281
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
282
 
                plugins.d/askpass-fifo
283
189
        install initramfs-tools-hook \
284
190
                $(INITRAMFSTOOLS)/hooks/mandos
285
191
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
295
201
                > $(MANDIR)/man8/password-prompt.8mandos.gz
296
202
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
297
203
                > $(MANDIR)/man8/mandos-client.8mandos.gz
298
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
299
 
                > $(MANDIR)/man8/usplash.8mandos.gz
300
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
301
 
                > $(MANDIR)/man8/splashy.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
303
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
304
204
 
305
205
install-client: install-client-nokey
306
206
# Post-installation stuff
329
229
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
330
230
                $(PREFIX)/lib/mandos/plugins.d/usplash \
331
231
                $(PREFIX)/lib/mandos/plugins.d/splashy \
332
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
232
                $(INITRAMFSTOOLS)/hooks/mandos \
334
233
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
234
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
336
235
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
236
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
237
                $(MANDIR)/man8/password-prompt.8mandos.gz \
339
 
                $(MANDIR)/man8/usplash.8mandos.gz \
340
 
                $(MANDIR)/man8/splashy.8mandos.gz \
341
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
342
238
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
239
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
240
                rm --force $(CONFDIR)/plugins.d/README; \
 
241
        fi
343
242
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
344
243
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
345
244
        update-initramfs -k all -u