/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-08-22 00:16:20 UTC
  • mfrom: (24.1.57 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.

* mandos (Client.start_checker): Bug fix: OSError, not
                                 subprocess.OSError.
  (main): Use "fping -q -- %(host)s" instead of "fping -q --
          %%(host)s" as default value for "checker".  Always redirect
          stdin to be from /dev/null, even if in debug mode.

* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
                                         the EXPANSION section.
  (OPTIONS): Added synopsis and improved wording for "checker",
             "fingerprint", and "secret".  Refer to the RUNTIME
             EXPANSION section for the "checker" option.
  (EXAMPLE): Update to new default value for "checker".

* mandos-keygen (trap): Split lines and add "set +e".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
14
14
OPTIMIZE=-Os
15
15
LANGUAGE=-std=gnu99
16
16
# PREFIX=/usr/local
17
 
PREFIX=$(DESTDIR)/usr
 
17
PREFIX=/usr
18
18
# CONFDIR=/usr/local/lib/mandos
19
 
CONFDIR=$(DESTDIR)/etc/mandos
20
 
# KEYDIR=/usr/local/lib/mandos/keys
21
 
KEYDIR=$(DESTDIR)/etc/keys/mandos
 
19
CONFDIR=/etc/mandos
22
20
# MANDIR=/usr/local/man
23
 
MANDIR=$(DESTDIR)/usr/share/man
 
21
MANDIR=/usr/share/man
24
22
 
25
23
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
26
24
GNUTLS_LIBS=$(shell libgnutls-config --libs)
35
33
LDFLAGS=$(COVERAGE)
36
34
 
37
35
# Commands to format a DocBook refentry document into a manual page
38
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
36
DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
39
37
        --param man.charmap.use.subset          0 \
40
38
        --param make.year.ranges                1 \
41
39
        --param make.single.year.ranges         1 \
45
43
        $(notdir $<); \
46
44
        $(MANPOST) $(notdir $@)
47
45
# DocBook-to-man post-processing to fix a \n escape bug
48
 
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
46
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
49
47
 
50
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
51
49
PROGS=plugin-runner $(PLUGINS)
60
58
 
61
59
doc: $(DOCS)
62
60
 
63
 
%.5: %.xml legalnotice.xml
64
 
        $(DOCBOOKTOMAN)
65
 
 
66
 
%.8: %.xml legalnotice.xml
67
 
        $(DOCBOOKTOMAN)
68
 
 
69
 
%.8mandos: %.xml legalnotice.xml
70
 
        $(DOCBOOKTOMAN)
71
 
 
72
 
mandos.8: mandos.xml mandos-options.xml overview.xml legalnotice.xml
73
 
        $(DOCBOOKTOMAN)
74
 
 
75
 
mandos-keygen.8: mandos-keygen.xml overview.xml legalnotice.xml
76
 
        $(DOCBOOKTOMAN)
77
 
 
78
 
mandos.conf.5: mandos.conf.xml mandos-options.xml legalnotice.xml
79
 
        $(DOCBOOKTOMAN)
80
 
 
81
 
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
 
        $(DOCBOOKTOMAN)
83
 
 
84
 
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
85
 
                                        mandos-options.xml \
86
 
                                        overview.xml legalnotice.xml
 
61
%.5: %.xml
 
62
        $(DOCBOOKTOMAN)
 
63
 
 
64
%.8: %.xml
 
65
        $(DOCBOOKTOMAN)
 
66
 
 
67
%.8mandos: %.xml
 
68
        $(DOCBOOKTOMAN)
 
69
 
 
70
mandos.8: mandos.xml mandos-options.xml
 
71
        $(DOCBOOKTOMAN)
 
72
 
 
73
mandos.conf.5: mandos.conf.xml mandos-options.xml
87
74
        $(DOCBOOKTOMAN)
88
75
 
89
76
plugins.d/password-request: plugins.d/password-request.o
100
87
distclean: clean
101
88
mostlyclean: clean
102
89
maintainer-clean: clean
103
 
        -rm --force --recursive keydir confdir
 
90
        -rm --force --recursive keydir
104
91
 
105
92
check:
106
93
        ./mandos --check
107
94
 
108
 
# Run the client with a local config and key
109
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
95
run-client: all
 
96
        -mkdir keydir
 
97
        -./mandos-keygen --dir keydir
110
98
        ./plugin-runner --plugin-dir=plugins.d \
111
 
                --config-file=plugin-runner.conf \
112
 
                --options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
113
 
 
114
 
# Used by run-client
115
 
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
116
 
        install --directory keydir
117
 
        ./mandos-keygen --dir keydir --force
118
 
 
119
 
# Run the server with a local config
120
 
run-server: confdir/mandos.conf confdir/clients.conf
121
 
        ./mandos --debug --configdir=confdir
122
 
 
123
 
# Used by run-server
124
 
confdir/mandos.conf: mandos.conf
125
 
        install --directory confdir
126
 
        install --mode=u=rw,go=r $^ $@
127
 
confdir/clients.conf: clients.conf keydir/seckey.txt
128
 
        install --directory confdir
129
 
        install --mode=u=rw $< $@
130
 
# Add a client password
131
 
        ./mandos-keygen --dir keydir --password >> $@
 
99
                --options-for=password-request:--keydir=keydir
 
100
 
 
101
run-server:
 
102
        ./mandos --debug --configdir=.
132
103
 
133
104
install: install-server install-client
134
105
 
135
106
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
107
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
137
108
                $(MANDIR)/man8
138
 
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
140
 
                mandos.conf
141
 
        install --mode=u=rw --target-directory=$(CONFDIR) \
 
109
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
110
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
111
        install --mode=0640 --target-directory=$(CONFDIR) \
142
112
                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
146
113
        gzip --best --to-stdout mandos.8 \
147
114
                > $(MANDIR)/man8/mandos.8.gz
148
115
        gzip --best --to-stdout mandos.conf.5 \
151
118
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
119
 
153
120
install-client: all doc /usr/share/initramfs-tools/hooks/.
154
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
 
121
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
155
122
                $(MANDIR)/man8
156
 
        install --directory --mode=u=rwx $(KEYDIR)
157
 
        install --directory --mode=u=rwx \
158
 
                $(PREFIX)/lib/mandos/plugins.d
159
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
160
 
                install --mode=u=rwx \
161
 
                        --directory "$(CONFDIR)/plugins.d"; \
162
 
                install --mode=u=rw,go=r etc-plugins.d-README \
163
 
                        $(CONFDIR)/plugins.d/README ; \
164
 
        fi
165
 
        install --mode=u=rwx,go=rx \
166
 
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
167
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
123
        -mkdir --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
124
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
125
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
 
126
                plugin-runner
 
127
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
168
128
                mandos-keygen
169
 
        install --mode=u=rwx,go=rx \
 
129
        install --mode=0755 \
170
130
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
171
131
                plugins.d/password-prompt
172
 
        install --mode=u=rwxs,go=rx \
 
132
        install --mode=4755 \
173
133
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
174
134
                plugins.d/password-request
175
 
        install --mode=u=rwx,go=rx \
176
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
177
 
                plugins.d/usplash
178
135
        install initramfs-tools-hook \
179
136
                /usr/share/initramfs-tools/hooks/mandos
180
137
        install initramfs-tools-hook-conf \
181
138
                /usr/share/initramfs-tools/conf-hooks.d/mandos
182
139
        install initramfs-tools-script \
183
140
                /usr/share/initramfs-tools/scripts/local-top/mandos
184
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
185
141
        gzip --best --to-stdout mandos-keygen.8 \
186
142
                > $(MANDIR)/man8/mandos-keygen.8.gz
187
143
        gzip --best --to-stdout plugin-runner.8mandos \
190
146
                > $(MANDIR)/man8/password-prompt.8mandos.gz
191
147
        gzip --best --to-stdout plugins.d/password-request.8mandos \
192
148
                > $(MANDIR)/man8/password-request.8mandos.gz
193
 
# Post-installation stuff
194
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
149
        -$(PREFIX)/sbin/mandos-keygen
195
150
        update-initramfs -k all -u
196
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
197
151
 
198
152
uninstall: uninstall-server uninstall-client
199
153
 
200
 
uninstall-server:
 
154
uninstall-server: $(PREFIX)/sbin/mandos
201
155
        -rm --force $(PREFIX)/sbin/mandos \
202
156
                $(MANDIR)/man8/mandos.8.gz \
203
157
                $(MANDIR)/man5/mandos.conf.5.gz \
204
158
                $(MANDIR)/man5/mandos-clients.conf.5.gz
205
 
        update-rc.d -f mandos remove
206
159
        -rmdir $(CONFDIR)
207
160
 
208
161
uninstall-client:
214
167
                $(PREFIX)/lib/mandos/plugin-runner \
215
168
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
216
169
                $(PREFIX)/lib/mandos/plugins.d/password-request \
217
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
218
170
                /usr/share/initramfs-tools/hooks/mandos \
219
171
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
220
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
221
172
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
222
173
                $(MANDIR)/man8/mandos-keygen.8.gz \
223
174
                $(MANDIR)/man8/password-prompt.8mandos.gz \
224
175
                $(MANDIR)/man8/password-request.8mandos.gz
225
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
226
 
                rm --force $(CONFDIR)/plugins.d/README; \
227
 
        fi
228
176
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
229
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
177
                 $(PREFIX)/lib/mandos $(CONFDIR)
230
178
        update-initramfs -k all -u
231
179
 
232
180
purge: purge-server purge-client
233
181
 
234
182
purge-server: uninstall-server
235
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
236
 
                /etc/default/mandos /etc/init.d/mandos \
237
 
                /var/run/mandos.pid
 
183
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
238
184
        -rmdir $(CONFDIR)
239
185
 
240
186
purge-client: uninstall-client
241
 
        -shred --remove $(KEYDIR)/seckey.txt
242
 
        -rm --force $(CONFDIR)/plugin-runner.conf \
243
 
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
244
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
187
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
188
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d