/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-03 05:04:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080903050440-7cwzxestx6pvdy1i
* Makefile (mandos.8): Add dependency on "overview.xml" and
                       "legalnotice.xml".
  (mandos-keygen.8): New target.
  (mandos-conf.5): Added dependency on "legalnotice.xml".
  (plugin-runner.8mandos): New target
  (plugins.d/password-request.8mandos): - '' -

* mandos-options.xml (priority): Make wording server/client neutral.

* plugins.d/password-request.c (main): Changed .arg fields of the argp
                                       options struct to be more
                                       consistent with the manual.

* plugins.d/password-request.xml (OVERVIEW): Moved to after "OPTIONS".
  (OPTIONS): Improved wording and names of replaceables.

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
22
20
# MANDIR=/usr/local/man
23
21
MANDIR=$(DESTDIR)/usr/share/man
24
22
 
47
45
# DocBook-to-man post-processing to fix a \n escape bug
48
46
MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
49
47
 
50
 
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
 
48
PLUGINS=plugins.d/password-prompt plugins.d/password-request
51
49
PROGS=plugin-runner $(PLUGINS)
52
50
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
53
 
        plugins.d/mandos-client.8mandos \
 
51
        plugins.d/password-request.8mandos \
54
52
        plugins.d/password-prompt.8mandos mandos.conf.5 \
55
53
        mandos-clients.conf.5
56
54
 
81
79
plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
82
80
        $(DOCBOOKTOMAN)
83
81
 
84
 
plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 
82
plugins.d/password-request.8mandos: plugins.d/password-request.xml \
85
83
                                        mandos-options.xml \
86
84
                                        overview.xml legalnotice.xml
87
85
        $(DOCBOOKTOMAN)
88
86
 
89
 
plugins.d/mandos-client: plugins.d/mandos-client.o
 
87
plugins.d/password-request: plugins.d/password-request.o
90
88
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
91
89
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
92
90
 
106
104
        ./mandos --check
107
105
 
108
106
# Run the client with a local config and key
109
 
run-client: all keydir/seckey.txt keydir/pubkey.txt
 
107
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
108
        keydir/secring.gpg keydir/pubring.gpg
110
109
        ./plugin-runner --plugin-dir=plugins.d \
111
110
                --config-file=plugin-runner.conf \
112
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
111
                --options-for=password-request:--keydir=keydir
113
112
 
114
113
# Used by run-client
 
114
keydir/secring.gpg: keydir/seckey.txt
 
115
        gpg --homedir $(dir $<) --import $^
 
116
keydir/pubring.gpg: keydir/pubkey.txt
 
117
        gpg --homedir $(dir $<) --import $^
115
118
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
116
119
        install --directory keydir
117
120
        ./mandos-keygen --dir keydir --force
123
126
# Used by run-server
124
127
confdir/mandos.conf: mandos.conf
125
128
        install --directory confdir
126
 
        install --mode=u=rw,go=r $^ $@
 
129
        install $^ $@
127
130
confdir/clients.conf: clients.conf keydir/seckey.txt
128
131
        install --directory confdir
129
 
        install --mode=u=rw $< $@
 
132
        install clients.conf $@
130
133
# Add a client password
131
134
        ./mandos-keygen --dir keydir --password >> $@
132
135
 
133
136
install: install-server install-client
134
137
 
135
138
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
139
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
137
140
                $(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) \
 
141
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
142
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
143
        install --mode=0640 --target-directory=$(CONFDIR) \
142
144
                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
145
        gzip --best --to-stdout mandos.8 \
147
146
                > $(MANDIR)/man8/mandos.8.gz
148
147
        gzip --best --to-stdout mandos.conf.5 \
151
150
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
152
151
 
153
152
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 \
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 \
 
153
        install --directory --parents $(PREFIX)/lib/mandos \
 
154
                $(CONFDIR) $(MANDIR)/man8
 
155
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
156
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
157
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
 
158
                plugin-runner
 
159
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
168
160
                mandos-keygen
169
 
        install --mode=u=rwx,go=rx \
 
161
        install --mode=0755 \
170
162
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
171
163
                plugins.d/password-prompt
172
 
        install --mode=u=rwxs,go=rx \
173
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
174
 
                plugins.d/mandos-client
175
 
        install --mode=u=rwx,go=rx \
176
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
177
 
                plugins.d/usplash
 
164
        install --mode=4755 \
 
165
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
166
                plugins.d/password-request
178
167
        install initramfs-tools-hook \
179
168
                /usr/share/initramfs-tools/hooks/mandos
180
169
        install initramfs-tools-hook-conf \
181
170
                /usr/share/initramfs-tools/conf-hooks.d/mandos
182
171
        install initramfs-tools-script \
183
172
                /usr/share/initramfs-tools/scripts/local-top/mandos
184
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
185
173
        gzip --best --to-stdout mandos-keygen.8 \
186
174
                > $(MANDIR)/man8/mandos-keygen.8.gz
187
175
        gzip --best --to-stdout plugin-runner.8mandos \
188
176
                > $(MANDIR)/man8/plugin-runner.8mandos.gz
189
177
        gzip --best --to-stdout plugins.d/password-prompt.8mandos \
190
178
                > $(MANDIR)/man8/password-prompt.8mandos.gz
191
 
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
192
 
                > $(MANDIR)/man8/mandos-client.8mandos.gz
193
 
# Post-installation stuff
194
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
179
        gzip --best --to-stdout plugins.d/password-request.8mandos \
 
180
                > $(MANDIR)/man8/password-request.8mandos.gz
 
181
        -$(PREFIX)/sbin/mandos-keygen
195
182
        update-initramfs -k all -u
196
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
197
183
 
198
184
uninstall: uninstall-server uninstall-client
199
185
 
200
 
uninstall-server:
 
186
uninstall-server: $(PREFIX)/sbin/mandos
201
187
        -rm --force $(PREFIX)/sbin/mandos \
202
188
                $(MANDIR)/man8/mandos.8.gz \
203
189
                $(MANDIR)/man5/mandos.conf.5.gz \
204
190
                $(MANDIR)/man5/mandos-clients.conf.5.gz
205
 
        update-rc.d -f mandos remove
206
191
        -rmdir $(CONFDIR)
207
192
 
208
193
uninstall-client:
213
198
        -rm --force $(PREFIX)/sbin/mandos-keygen \
214
199
                $(PREFIX)/lib/mandos/plugin-runner \
215
200
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
216
 
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
217
 
                $(PREFIX)/lib/mandos/plugins.d/usplash \
 
201
                $(PREFIX)/lib/mandos/plugins.d/password-request \
218
202
                /usr/share/initramfs-tools/hooks/mandos \
219
203
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
220
 
                /usr/share/initramfs-tools/scripts/local-top/mandos \
221
204
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
222
205
                $(MANDIR)/man8/mandos-keygen.8.gz \
223
206
                $(MANDIR)/man8/password-prompt.8mandos.gz \
224
 
                $(MANDIR)/man8/mandos-client.8mandos.gz
225
 
        if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
226
 
                rm --force $(CONFDIR)/plugins.d/README; \
227
 
        fi
 
207
                $(MANDIR)/man8/password-request.8mandos.gz
228
208
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
229
 
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
 
209
                 $(PREFIX)/lib/mandos $(CONFDIR)
230
210
        update-initramfs -k all -u
231
211
 
232
212
purge: purge-server purge-client
233
213
 
234
214
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
 
215
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
238
216
        -rmdir $(CONFDIR)
239
217
 
240
218
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)
 
219
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
220
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d