/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-26 04:54:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080926045435-0thnnqops1kzclag
* debian/mandos-client.postinst: Change home directory to
                                 "/nonexistent".
* debian/mandos.postinst: - '' -

* plugin-runner.c (main): Bug fix: Block signals while modifying
                          "plugin_list".

* plugins.d/usplash.c (usplash_write): New function.
  (main): Use "usplash_write" to write "INPUTQUIET" command.  Also
          write "TIMEOUT 0" before it, and write "TIMEOUT 15" and
          "PULSATE" if starting a new usplash process.  Kill old
          usplash before forking.  Bug fix: do setuid(geteuid()) to
          preserve genuine rootness.  Better interrupted/error logic
          overall.

* debian/mandos-client.lintian-overrides: Ignore setuid
                                          "plugins.d/usplash".

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
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
17
26
PREFIX=$(DESTDIR)/usr
18
 
# CONFDIR=/usr/local/lib/mandos
19
27
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
28
KEYDIR=$(DESTDIR)/etc/keys/mandos
22
 
# MANDIR=/usr/local/man
23
 
MANDIR=$(DESTDIR)/usr/share/man
 
29
MANDIR=$(PREFIX)/share/man
 
30
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
31
##
24
32
 
25
33
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
34
GNUTLS_LIBS=$(shell libgnutls-config --libs)
34
42
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
35
43
LDFLAGS=$(COVERAGE)
36
44
 
37
 
# Commands to format a DocBook refentry document into a manual page
 
45
# Commands to format a DocBook <refentry> document into a manual page
38
46
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
39
47
        --param man.charmap.use.subset          0 \
40
48
        --param make.year.ranges                1 \
44
52
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
45
53
        $(notdir $<); \
46
54
        $(MANPOST) $(notdir $@)
47
 
# DocBook-to-man post-processing to fix a \n escape bug
 
55
# DocBook-to-man post-processing to fix a '\n' escape bug
48
56
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
49
57
 
50
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
 
58
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
 
59
        plugins.d/usplash plugins.d/splashy
51
60
PROGS=plugin-runner $(PLUGINS)
52
61
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
53
62
        plugins.d/mandos-client.8mandos \
130
139
# Add a client password
131
140
        ./mandos-keygen --dir keydir --password >> $@
132
141
 
133
 
install: install-server install-client
 
142
install: install-server install-client-nokey
134
143
 
135
144
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
137
 
                $(MANDIR)/man8
 
145
        install --directory $(CONFDIR)
138
146
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
147
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
148
                mandos.conf
141
149
        install --mode=u=rw --target-directory=$(CONFDIR) \
142
150
                clients.conf
143
 
        install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
144
 
        install --mode=u=rw,go=r default-mandos /etc/default/mandos
145
 
        update-rc.d mandos defaults
 
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
146
158
        gzip --best --to-stdout mandos.8 \
147
159
                > $(MANDIR)/man8/mandos.8.gz
148
160
        gzip --best --to-stdout mandos.conf.5 \
150
162
        gzip --best --to-stdout mandos-clients.conf.5 \
151
163
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
164
 
153
 
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
155
 
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
 
165
install-client-nokey: all doc
 
166
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
 
167
        install --directory --mode=u=rwx $(KEYDIR) \
158
168
                $(PREFIX)/lib/mandos/plugins.d
159
169
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
160
170
                install --mode=u=rwx \
161
171
                        --directory "$(CONFDIR)/plugins.d"; \
162
 
                install --mode=u=rw,go=r etc-plugins.d-README \
163
 
                        $(CONFDIR)/plugins.d/README ; \
164
172
        fi
165
173
        install --mode=u=rwx,go=rx \
166
174
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
172
180
        install --mode=u=rwxs,go=rx \
173
181
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
174
182
                plugins.d/mandos-client
175
 
        install --mode=u=rwx,go=rx \
 
183
        install --mode=u=rwxs,go=rx \
176
184
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
177
185
                plugins.d/usplash
 
186
        install --mode=u=rwxs,go=rx \
 
187
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
188
                plugins.d/splashy
178
189
        install initramfs-tools-hook \
179
 
                /usr/share/initramfs-tools/hooks/mandos
180
 
        install initramfs-tools-hook-conf \
181
 
                /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
182
193
        install initramfs-tools-script \
183
 
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
194
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
184
195
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
185
196
        gzip --best --to-stdout mandos-keygen.8 \
186
197
                > $(MANDIR)/man8/mandos-keygen.8.gz
190
201
                > $(MANDIR)/man8/password-prompt.8mandos.gz
191
202
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
192
203
                > $(MANDIR)/man8/mandos-client.8mandos.gz
 
204
 
 
205
install-client: install-client-nokey
193
206
# Post-installation stuff
194
207
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
195
208
        update-initramfs -k all -u
209
222
# Refuse to uninstall client if /etc/crypttab is explicitly configured
210
223
# to use it.
211
224
        ! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
212
 
                /etc/crypttab
 
225
                $(DESTDIR)/etc/crypttab
213
226
        -rm --force $(PREFIX)/sbin/mandos-keygen \
214
227
                $(PREFIX)/lib/mandos/plugin-runner \
215
228
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
216
229
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
217
230
                $(PREFIX)/lib/mandos/plugins.d/usplash \
218
 
                /usr/share/initramfs-tools/hooks/mandos \
219
 
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
220
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
 
231
                $(PREFIX)/lib/mandos/plugins.d/splashy \
 
232
                $(INITRAMFSTOOLS)/hooks/mandos \
 
233
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
 
234
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
221
235
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
222
236
                $(MANDIR)/man8/mandos-keygen.8.gz \
223
237
                $(MANDIR)/man8/password-prompt.8mandos.gz \
233
247
 
234
248
purge-server: uninstall-server
235
249
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
236
 
                /etc/default/mandos /etc/init.d/mandos \
237
 
                /var/run/mandos.pid
 
250
                $(DESTDIR)/etc/default/mandos \
 
251
                $(DESTDIR)/etc/init.d/mandos \
 
252
                $(DESTDIR)/var/run/mandos.pid
238
253
        -rmdir $(CONFDIR)
239
254
 
240
255
purge-client: uninstall-client