/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-06 15:34:21 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080906153421-605ydhwyo404krh9
* initramfs-tools-hook: Use long options where available.  Use only
                        one "test" invocation instead of several.

* mandos-keygen: Use only one "test" invocation instead of several.
                 Use long options where available.  Strip newline from
                 entered password.

* plugin-runner.c (print_out_password): Do not strip trailing newline.
  (fallback): Strip trailing newline from getpass().

* plugin-runner.xml (PLUGINS): Plugins should not print trailing
                               newlines.

* plugins.d/password-prompt.c (main): Strip trailing newline.

* plugins.d/password-request.c (main): Bug fix: Read "pubkey.txt", not
                                       "pupkey.txt".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
17
17
PREFIX=$(DESTDIR)/usr
18
18
# CONFDIR=/usr/local/lib/mandos
19
19
CONFDIR=$(DESTDIR)/etc/mandos
 
20
# KEYDIR=/usr/local/lib/mandos/keys
 
21
KEYDIR=$(DESTDIR)/etc/keys/mandos
20
22
# MANDIR=/usr/local/man
21
23
MANDIR=$(DESTDIR)/usr/share/man
22
24
 
33
35
LDFLAGS=$(COVERAGE)
34
36
 
35
37
# Commands to format a DocBook refentry document into a manual page
36
 
DOCBOOKTOMAN=cd $(dir $^); xsltproc --nonet --xinclude \
 
38
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
37
39
        --param man.charmap.use.subset          0 \
38
40
        --param make.year.ranges                1 \
39
41
        --param make.single.year.ranges         1 \
58
60
 
59
61
doc: $(DOCS)
60
62
 
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
 
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
74
87
        $(DOCBOOKTOMAN)
75
88
 
76
89
plugins.d/password-request: plugins.d/password-request.o
87
100
distclean: clean
88
101
mostlyclean: clean
89
102
maintainer-clean: clean
90
 
        -rm --force --recursive keydir
 
103
        -rm --force --recursive keydir confdir
91
104
 
92
105
check:
93
106
        ./mandos --check
94
107
 
95
 
run-client: all
96
 
        -mkdir keydir
97
 
        -./mandos-keygen --dir keydir
 
108
# Run the client with a local config and key
 
109
run-client: all keydir/seckey.txt keydir/pubkey.txt
98
110
        ./plugin-runner --plugin-dir=plugins.d \
99
 
                --options-for=password-request:--keydir=keydir
100
 
 
101
 
run-server:
102
 
        ./mandos --debug --configdir=.
 
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 >> $@
103
132
 
104
133
install: install-server install-client
105
134
 
106
135
install-server: doc
107
 
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
 
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
108
137
                $(MANDIR)/man8
109
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
110
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
111
 
        install --mode=0640 --target-directory=$(CONFDIR) \
 
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) \
112
142
                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
113
146
        gzip --best --to-stdout mandos.8 \
114
147
                > $(MANDIR)/man8/mandos.8.gz
115
148
        gzip --best --to-stdout mandos.conf.5 \
118
151
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
119
152
 
120
153
install-client: all doc /usr/share/initramfs-tools/hooks/.
121
 
        install --directory --parents $(PREFIX)/lib/mandos \
122
 
                $(CONFDIR) $(MANDIR)/man8
123
 
        install --directory --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 \
 
154
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
 
155
                $(MANDIR)/man8
 
156
        install --directory --mode=u=rwx $(KEYDIR)
 
157
        install --directory --mode=u=rwx \
 
158
                $(PREFIX)/lib/mandos/plugins.d
 
159
        if [ "$(CONFDIR)/plugins.d" \
 
160
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
 
161
                install --mode=u=rwx \
 
162
                        --directory "$(CONFDIR)/plugins.d"; \
 
163
        fi
 
164
        install --mode=u=rwx,go=rx \
 
165
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
166
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
128
167
                mandos-keygen
129
 
        install --mode=0755 \
 
168
        install --mode=u=rwx,go=rx \
130
169
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
131
170
                plugins.d/password-prompt
132
 
        install --mode=4755 \
 
171
        install --mode=u=rwxs,go=rx \
133
172
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
134
173
                plugins.d/password-request
 
174
        install --mode=u=rwx,go=rx \
 
175
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
176
                plugins.d/usplash
135
177
        install initramfs-tools-hook \
136
178
                /usr/share/initramfs-tools/hooks/mandos
137
179
        install initramfs-tools-hook-conf \
138
180
                /usr/share/initramfs-tools/conf-hooks.d/mandos
139
181
        install initramfs-tools-script \
140
182
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
183
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
141
184
        gzip --best --to-stdout mandos-keygen.8 \
142
185
                > $(MANDIR)/man8/mandos-keygen.8.gz
143
186
        gzip --best --to-stdout plugin-runner.8mandos \
146
189
                > $(MANDIR)/man8/password-prompt.8mandos.gz
147
190
        gzip --best --to-stdout plugins.d/password-request.8mandos \
148
191
                > $(MANDIR)/man8/password-request.8mandos.gz
149
 
        -$(PREFIX)/sbin/mandos-keygen
 
192
# Post-installation stuff
 
193
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
150
194
        update-initramfs -k all -u
 
195
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
151
196
 
152
197
uninstall: uninstall-server uninstall-client
153
198
 
154
 
uninstall-server: $(PREFIX)/sbin/mandos
 
199
uninstall-server:
155
200
        -rm --force $(PREFIX)/sbin/mandos \
156
201
                $(MANDIR)/man8/mandos.8.gz \
157
202
                $(MANDIR)/man5/mandos.conf.5.gz \
158
203
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
204
        update-rc.d -f mandos remove
159
205
        -rmdir $(CONFDIR)
160
206
 
161
207
uninstall-client:
167
213
                $(PREFIX)/lib/mandos/plugin-runner \
168
214
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
169
215
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
216
                $(PREFIX)/lib/mandos/plugins.d/usplash \
170
217
                /usr/share/initramfs-tools/hooks/mandos \
171
218
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
219
                /usr/share/initramfs-tools/scripts/local-top/mandos \
172
220
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
173
221
                $(MANDIR)/man8/mandos-keygen.8.gz \
174
222
                $(MANDIR)/man8/password-prompt.8mandos.gz \
175
223
                $(MANDIR)/man8/password-request.8mandos.gz
176
224
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
177
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
225
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
178
226
        update-initramfs -k all -u
179
227
 
180
228
purge: purge-server purge-client
181
229
 
182
230
purge-server: uninstall-server
183
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
231
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
232
                /etc/default/mandos /etc/init.d/mandos \
 
233
                /var/run/mandos.pid
184
234
        -rmdir $(CONFDIR)
185
235
 
186
236
purge-client: uninstall-client
187
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
188
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
237
        -shred --remove $(KEYDIR)/seckey.txt
 
238
        -rm --force $(CONFDIR)/plugin-runner.conf \
 
239
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
240
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)