/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
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 \
7
 
        -Wpacked -Wnested-externs -Wunreachable-code -Winline \
8
 
        -Wvolatile-register-var
9
 
DEBUG=-ggdb3
 
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
 
8
#       -Wunreachable-code 
 
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
12
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
13
13
#COVERAGE=--coverage
14
14
OPTIMIZE=-Os
15
15
LANGUAGE=-std=gnu99
16
 
# PREFIX=/usr/local
17
 
PREFIX=/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=/etc/mandos
20
 
# MANDIR=/usr/local/man
21
 
MANDIR=/usr/share/man
 
16
 
 
17
## Use these settings for a traditional /usr/local install
 
18
# PREFIX=$(DESTDIR)/usr/local
 
19
# CONFDIR=$(DESTDIR)/etc/mandos
 
20
# KEYDIR=$(DESTDIR)/etc/mandos/keys
 
21
# MANDIR=$(PREFIX)/man
 
22
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
 
23
##
 
24
 
 
25
## These settings are for a package-type install
 
26
PREFIX=$(DESTDIR)/usr
 
27
CONFDIR=$(DESTDIR)/etc/mandos
 
28
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
29
MANDIR=$(PREFIX)/share/man
 
30
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
31
##
22
32
 
23
33
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
34
GNUTLS_LIBS=$(shell libgnutls-config --libs)
32
42
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
33
43
LDFLAGS=$(COVERAGE)
34
44
 
35
 
DOCBOOKTOMAN=xsltproc --nonet \
 
45
# Commands to format a DocBook <refentry> document into a manual page
 
46
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
36
47
        --param man.charmap.use.subset          0 \
37
48
        --param make.year.ranges                1 \
38
49
        --param make.single.year.ranges         1 \
39
50
        --param man.output.quietly              1 \
40
51
        --param man.authors.section.enabled     0 \
41
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
42
 
# DocBook-to-man post-processing to fix a \n escape bug
43
 
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
 
52
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
53
        $(notdir $<); \
 
54
        $(MANPOST) $(notdir $@)
 
55
# DocBook-to-man post-processing to fix a '\n' escape bug
 
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
44
57
 
45
 
PLUGINS=plugins.d/password-prompt plugins.d/password-request
 
58
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
59
        plugins.d/usplash plugins.d/splashy
46
60
PROGS=plugin-runner $(PLUGINS)
47
61
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
48
 
        plugins.d/password-request.8mandos \
 
62
        plugins.d/mandos-client.8mandos \
49
63
        plugins.d/password-prompt.8mandos mandos.conf.5 \
50
64
        mandos-clients.conf.5
51
65
 
55
69
 
56
70
doc: $(DOCS)
57
71
 
58
 
%.5: %.xml
59
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^) $(MANPOST) $@
60
 
 
61
 
%.8: %.xml
62
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $@
63
 
 
64
 
%.8mandos: %.xml
65
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^) $(MANPOST) $@
66
 
 
67
 
plugins.d/password-request: plugins.d/password-request.o
 
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)
 
92
 
 
93
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
94
                                        mandos-options.xml \
 
95
                                        overview.xml legalnotice.xml
 
96
        $(DOCBOOKTOMAN)
 
97
 
 
98
plugins.d/mandos-client: plugins.d/mandos-client.o
68
99
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
69
100
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
70
101
 
78
109
distclean: clean
79
110
mostlyclean: clean
80
111
maintainer-clean: clean
81
 
        -rm --force --recursive keydir
 
112
        -rm --force --recursive keydir confdir
82
113
 
83
114
check:
84
115
        ./mandos --check
85
116
 
86
 
run-client: all
87
 
        -mkdir keydir
88
 
        -./mandos-keygen --dir keydir
 
117
# Run the client with a local config and key
 
118
run-client: all keydir/seckey.txt keydir/pubkey.txt
89
119
        ./plugin-runner --plugin-dir=plugins.d \
90
 
                --options-for=password-request:--keydir=keydir
91
 
 
92
 
run-server:
93
 
        ./mandos --debug --configdir=.
94
 
 
95
 
install: install-server install-client
 
120
                --config-file=plugin-runner.conf \
 
121
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
122
 
 
123
# Used by run-client
 
124
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
 
125
        install --directory keydir
 
126
        ./mandos-keygen --dir keydir --force
 
127
 
 
128
# Run the server with a local config
 
129
run-server: confdir/mandos.conf confdir/clients.conf
 
130
        ./mandos --debug --configdir=confdir
 
131
 
 
132
# Used by run-server
 
133
confdir/mandos.conf: mandos.conf
 
134
        install --directory confdir
 
135
        install --mode=u=rw,go=r $^ $@
 
136
confdir/clients.conf: clients.conf keydir/seckey.txt
 
137
        install --directory confdir
 
138
        install --mode=u=rw $< $@
 
139
# Add a client password
 
140
        ./mandos-keygen --dir keydir --password >> $@
 
141
 
 
142
install: install-server install-client-nokey
96
143
 
97
144
install-server: doc
98
 
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
99
 
                $(MANDIR)/man8
100
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
101
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
102
 
        install --mode=0640 --target-directory=$(CONFDIR) \
 
145
        install --directory $(CONFDIR)
 
146
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
 
147
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
 
148
                mandos.conf
 
149
        install --mode=u=rw --target-directory=$(CONFDIR) \
103
150
                clients.conf
 
151
        install --mode=u=rwx,go=rx init.d-mandos \
 
152
                $(DESTDIR)/etc/init.d/mandos
 
153
        install --mode=u=rw,go=r default-mandos \
 
154
                $(DESTDIR)/etc/default/mandos
 
155
        if [ -z $(DESTDIR) ]; then \
 
156
                update-rc.d mandos defaults 25 15;\
 
157
        fi
104
158
        gzip --best --to-stdout mandos.8 \
105
159
                > $(MANDIR)/man8/mandos.8.gz
106
160
        gzip --best --to-stdout mandos.conf.5 \
108
162
        gzip --best --to-stdout mandos-clients.conf.5 \
109
163
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
110
164
 
111
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
112
 
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
113
 
                $(MANDIR)/man8
114
 
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
115
 
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
116
 
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
117
 
                plugin-runner
118
 
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
 
165
install-client-nokey: all doc
 
166
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
167
        install --directory --mode=u=rwx $(KEYDIR) \
 
168
                $(PREFIX)/lib/mandos/plugins.d
 
169
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
170
                install --mode=u=rwx \
 
171
                        --directory "$(CONFDIR)/plugins.d"; \
 
172
        fi
 
173
        install --mode=u=rwx,go=rx \
 
174
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
175
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
119
176
                mandos-keygen
120
 
        install --mode=0755 \
 
177
        install --mode=u=rwx,go=rx \
121
178
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
122
179
                plugins.d/password-prompt
123
 
        install --mode=4755 \
124
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
125
 
                plugins.d/password-request
 
180
        install --mode=u=rwxs,go=rx \
 
181
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
182
                plugins.d/mandos-client
 
183
        install --mode=u=rwxs,go=rx \
 
184
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
185
                plugins.d/usplash
 
186
        install --mode=u=rwxs,go=rx \
 
187
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
188
                plugins.d/splashy
126
189
        install initramfs-tools-hook \
127
 
                /usr/share/initramfs-tools/hooks/mandos
128
 
        install initramfs-tools-hook-conf \
129
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos
 
190
                $(INITRAMFSTOOLS)/hooks/mandos
 
191
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
 
192
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
130
193
        install initramfs-tools-script \
131
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
194
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
195
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
132
196
        gzip --best --to-stdout mandos-keygen.8 \
133
197
                > $(MANDIR)/man8/mandos-keygen.8.gz
134
198
        gzip --best --to-stdout plugin-runner.8mandos \
135
199
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
136
200
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
137
201
                > $(MANDIR)/man8/password-prompt.8mandos.gz
138
 
        gzip --best --to-stdout plugins.d/password-request.8mandos \
139
 
                > $(MANDIR)/man8/password-request.8mandos.gz
140
 
        -$(PREFIX)/sbin/mandos-keygen
 
202
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
 
203
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
204
 
 
205
install-client: install-client-nokey
 
206
# Post-installation stuff
 
207
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
141
208
        update-initramfs -k all -u
 
209
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
142
210
 
143
211
uninstall: uninstall-server uninstall-client
144
212
 
145
 
uninstall-server: $(PREFIX)/sbin/mandos
 
213
uninstall-server:
146
214
        -rm --force $(PREFIX)/sbin/mandos \
147
215
                $(MANDIR)/man8/mandos.8.gz \
148
216
                $(MANDIR)/man5/mandos.conf.5.gz \
149
217
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
218
        update-rc.d -f mandos remove
150
219
        -rmdir $(CONFDIR)
151
220
 
152
221
uninstall-client:
153
222
# Refuse to uninstall client if /etc/crypttab is explicitly configured
154
223
# to use it.
155
224
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
156
 
                /etc/crypttab
 
225
                $(DESTDIR)/etc/crypttab
157
226
        -rm --force $(PREFIX)/sbin/mandos-keygen \
158
227
                $(PREFIX)/lib/mandos/plugin-runner \
159
228
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
160
 
                $(PREFIX)/lib/mandos/plugins.d/password-request \
161
 
                /usr/share/initramfs-tools/hooks/mandos \
162
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
229
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
 
230
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
231
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
232
                $(INITRAMFSTOOLS)/hooks/mandos \
 
233
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
 
234
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
163
235
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
164
236
                $(MANDIR)/man8/mandos-keygen.8.gz \
165
237
                $(MANDIR)/man8/password-prompt.8mandos.gz \
166
 
                $(MANDIR)/man8/password-request.8mandos.gz
 
238
                $(MANDIR)/man8/mandos-client.8mandos.gz
 
239
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 
240
                rm --force $(CONFDIR)/plugins.d/README; \
 
241
        fi
167
242
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
168
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
243
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
169
244
        update-initramfs -k all -u
170
245
 
171
246
purge: purge-server purge-client
172
247
 
173
248
purge-server: uninstall-server
174
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
249
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
250
                $(DESTDIR)/etc/default/mandos \
 
251
                $(DESTDIR)/etc/init.d/mandos \
 
252
                $(DESTDIR)/var/run/mandos.pid
175
253
        -rmdir $(CONFDIR)
176
254
 
177
255
purge-client: uninstall-client
178
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
179
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
256
        -shred --remove $(KEYDIR)/seckey.txt
 
257
        -rm --force $(CONFDIR)/plugin-runner.conf \
 
258
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
259
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)