/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-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
126
126
        install --mode=u=rw,go=r $^ $@
127
127
confdir/clients.conf: clients.conf keydir/seckey.txt
128
128
        install --directory confdir
129
 
        install --mode=u=rw,g=r $< $@
 
129
        install --mode=u=rw $< $@
130
130
# Add a client password
131
131
        ./mandos-keygen --dir keydir --password >> $@
132
132
 
136
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
137
137
                $(MANDIR)/man8
138
138
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
139
 
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) mandos.conf
140
 
        install --mode=u=rw,g=r --target-directory=$(CONFDIR) \
 
139
        install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
 
140
                mandos.conf
 
141
        install --mode=u=rw --target-directory=$(CONFDIR) \
141
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
142
146
        gzip --best --to-stdout mandos.8 \
143
147
                > $(MANDIR)/man8/mandos.8.gz
144
148
        gzip --best --to-stdout mandos.conf.5 \
150
154
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
151
155
                $(MANDIR)/man8
152
156
        install --directory --mode=u=rwx $(KEYDIR)
153
 
        install --directory --mode=u=rwx $(PREFIX)/lib/mandos/plugins.d
 
157
        install --directory --mode=u=rwx \
 
158
                $(PREFIX)/lib/mandos/plugins.d
154
159
        if [ "$(CONFDIR)/plugins.d" \
155
160
                        != "$(PREFIX)/lib/mandos/plugins.d" ]; then \
156
 
                        install --directory "$(CONFDIR)/plugins.d"; \
157
 
                fi
158
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/lib/mandos \
159
 
                plugin-runner
 
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
160
166
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
161
167
                mandos-keygen
162
168
        install --mode=u=rwx,go=rx \
183
189
                > $(MANDIR)/man8/password-prompt.8mandos.gz
184
190
        gzip --best --to-stdout plugins.d/password-request.8mandos \
185
191
                > $(MANDIR)/man8/password-request.8mandos.gz
 
192
# Post-installation stuff
186
193
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
187
194
        update-initramfs -k all -u
188
195
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
194
201
                $(MANDIR)/man8/mandos.8.gz \
195
202
                $(MANDIR)/man5/mandos.conf.5.gz \
196
203
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
204
        update-rc.d -f mandos remove
197
205
        -rmdir $(CONFDIR)
198
206
 
199
207
uninstall-client:
205
213
                $(PREFIX)/lib/mandos/plugin-runner \
206
214
                $(PREFIX)/lib/mandos/plugins.d/password-prompt \
207
215
                $(PREFIX)/lib/mandos/plugins.d/password-request \
 
216
                $(PREFIX)/lib/mandos/plugins.d/usplash \
208
217
                /usr/share/initramfs-tools/hooks/mandos \
209
218
                /usr/share/initramfs-tools/conf-hooks.d/mandos \
 
219
                /usr/share/initramfs-tools/scripts/local-top/mandos \
210
220
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
211
221
                $(MANDIR)/man8/mandos-keygen.8.gz \
212
222
                $(MANDIR)/man8/password-prompt.8mandos.gz \
213
223
                $(MANDIR)/man8/password-request.8mandos.gz
214
224
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
215
 
                 $(PREFIX)/lib/mandos $(CONFDIR)
 
225
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
216
226
        update-initramfs -k all -u
217
227
 
218
228
purge: purge-server purge-client
219
229
 
220
230
purge-server: uninstall-server
221
 
        -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
222
234
        -rmdir $(CONFDIR)
223
235
 
224
236
purge-client: uninstall-client
225
237
        -shred --remove $(KEYDIR)/seckey.txt
226
 
        -rm --force $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
238
        -rm --force $(CONFDIR)/plugin-runner.conf \
 
239
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
227
240
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)