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