/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

  • Committer: Teddy Hogeborn
  • Date: 2008-09-24 23:03:31 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080924230331-2qvhppypeo852ksr
* Makefile (PLUGINS): Added "plugins.d/usplash".
  (install-client-nokey): Add setuid bit on "plugins.d/usplash".

* plugins.d/splashy.c (main): Move "sret" to top.

* plugins.d/usplash: Removed.
* plugins.d/usplash.c: New.

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=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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 -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.8
20
 
SED=sed
21
16
 
22
17
## Use these settings for a traditional /usr/local install
23
18
# PREFIX=$(DESTDIR)/usr/local
39
34
GNUTLS_LIBS=$(shell libgnutls-config --libs)
40
35
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
36
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
43
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
44
 
        getconf LFS_LDFLAGS)
 
37
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
38
GPGME_LIBS=$(shell gpgme-config --libs)
45
39
 
46
40
# Do not change these two
47
41
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
48
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
49
 
        -DVERSION='"$(version)"'
50
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
42
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
43
LDFLAGS=$(COVERAGE)
51
44
 
52
45
# Commands to format a DocBook <refentry> document into a manual page
53
46
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
60
53
        $(notdir $<); \
61
54
        $(MANPOST) $(notdir $@)
62
55
# DocBook-to-man post-processing to fix a '\n' escape bug
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'
 
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
77
57
 
78
58
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)
 
59
        plugins.d/usplash plugins.d/splashy
 
60
PROGS=plugin-runner $(PLUGINS)
82
61
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
83
62
        plugins.d/mandos-client.8mandos \
84
63
        plugins.d/password-prompt.8mandos mandos.conf.5 \
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
 
64
        mandos-clients.conf.5
 
65
 
 
66
objects=$(addsuffix .o,$(PROGS))
 
67
 
 
68
all: $(PROGS)
93
69
 
94
70
doc: $(DOCS)
95
71
 
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)
 
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)
140
92
 
141
93
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
142
 
                                        common.ent \
143
94
                                        mandos-options.xml \
144
95
                                        overview.xml legalnotice.xml
145
96
        $(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
 
                $@
183
97
 
184
98
plugins.d/mandos-client: plugins.d/mandos-client.o
185
99
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
186
100
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
187
101
 
188
 
.PHONY : all doc html clean distclean run-client run-server install \
 
102
.PHONY : all doc clean distclean run-client run-server install \
189
103
        install-server install-client uninstall uninstall-server \
190
104
        uninstall-client purge purge-server purge-client
191
105
 
192
106
clean:
193
 
        -rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
 
107
        -rm --force $(PROGS) $(objects) $(DOCS) core
194
108
 
195
109
distclean: clean
196
110
mostlyclean: clean
197
111
maintainer-clean: clean
198
112
        -rm --force --recursive keydir confdir
199
113
 
200
 
check:  all
 
114
check:
201
115
        ./mandos --check
202
116
 
203
117
# Run the client with a local config and key
204
118
run-client: all keydir/seckey.txt keydir/pubkey.txt
205
119
        ./plugin-runner --plugin-dir=plugins.d \
206
120
                --config-file=plugin-runner.conf \
207
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
208
 
                $(CLIENTARGS)
 
121
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
209
122
 
210
123
# Used by run-client
211
124
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
214
127
 
215
128
# Run the server with a local config
216
129
run-server: confdir/mandos.conf confdir/clients.conf
217
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
130
        ./mandos --debug --configdir=confdir
218
131
 
219
132
# Used by run-server
220
133
confdir/mandos.conf: mandos.conf
228
141
 
229
142
install: install-server install-client-nokey
230
143
 
231
 
install-html: html
232
 
        install --directory $(htmldir)
233
 
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
234
 
                $(htmldocs)
235
 
 
236
144
install-server: doc
237
145
        install --directory $(CONFDIR)
238
146
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
278
186
        install --mode=u=rwxs,go=rx \
279
187
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
280
188
                plugins.d/splashy
281
 
        install --mode=u=rwxs,go=rx \
282
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
283
 
                plugins.d/askpass-fifo
284
189
        install initramfs-tools-hook \
285
190
                $(INITRAMFSTOOLS)/hooks/mandos
286
191
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
287
192
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
288
193
        install initramfs-tools-script \
289
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
194
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
290
195
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
291
196
        gzip --best --to-stdout mandos-keygen.8 \
292
197
                > $(MANDIR)/man8/mandos-keygen.8.gz
296
201
                > $(MANDIR)/man8/password-prompt.8mandos.gz
297
202
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
298
203
                > $(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
204
 
306
205
install-client: install-client-nokey
307
206
# Post-installation stuff
330
229
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
331
230
                $(PREFIX)/lib/mandos/plugins.d/usplash \
332
231
                $(PREFIX)/lib/mandos/plugins.d/splashy \
333
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
334
232
                $(INITRAMFSTOOLS)/hooks/mandos \
335
233
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
336
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
234
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
337
235
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
338
236
                $(MANDIR)/man8/mandos-keygen.8.gz \
339
237
                $(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 \
343
238
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
239
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
240
                rm --force $(CONFDIR)/plugins.d/README; \
 
241
        fi
344
242
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
345
243
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
346
244
        update-initramfs -k all -u