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