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