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