/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-29 05:53:59 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080829055359-wkdasnyxtylmnxus
* mandos.xml (EXAMPLE): Replaced all occurences of command name with
                        "&COMMANDNAME;".

* plugins.d/password-prompt.c (main): Improved some documentation
                                      strings.  Do perror() of
                                      tcgetattr() fails.  Add debug
                                      output if interrupted by signal.
                                      Loop over write() instead of
                                      using fwrite() when outputting
                                      password.  Add debug output if
                                      getline() returns 0, unless it
                                      was caused by a signal.  Add
                                      exit status code to debug
                                      output.

* plugins.d/password-prompt.xml: Changed all single quotes to double
                                 quotes for consistency.  Removed
                                 <?xml-stylesheet>.
  (ENTITY TIMESTAMP): New.  Automatically updated by Emacs time-stamp
                      by using Emacs local variables.
  (/refentry/refentryinfo/title): Changed to "Mandos Manual".
  (/refentry/refentryinfo/productname): Changed to "Mandos".
  (/refentry/refentryinfo/date): New; set to "&TIMESTAMP;".
  (/refentry/refentryinfo/copyright): Split copyright holders.
  (/refentry/refnamediv/refpurpose): Improved wording.
  (SYNOPSIS): Fix to use correct markup.  Add short options.
  (DESCRIPTION, OPTIONS): Improved wording.
  (OPTIONS): Improved wording.  Use more correct markup.  Document
             short options.
  (EXIT STATUS): Add text.
  (ENVIRONMENT): Document use of "cryptsource" and "crypttarget".
  (FILES): REMOVED.
  (BUGS): Add text.
  (EXAMPLE): Added some examples.
  (SECURITY): Added text.
  (SEE ALSO): Remove reference to mandos(8).  Add reference to
              crypttab(5).

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
 
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
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 the server with a local key
 
96
run-client: all keydir/seckey.txt keydir/pubkey.txt \
 
97
        keydir/secring.gpg keydir/pubring.gpg
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
 
99
                --options-for=password-request:--keydir=keydir
113
100
 
114
101
# Used by run-client
 
102
keydir/secring.gpg: keydir/seckey.txt
 
103
        gpg --homedir $(dir $<) --import $^
 
104
keydir/pubring.gpg: keydir/pubkey.txt
 
105
        gpg --homedir $(dir $<) --import $^
115
106
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
116
107
        install --directory keydir
117
108
        ./mandos-keygen --dir keydir --force
123
114
# Used by run-server
124
115
confdir/mandos.conf: mandos.conf
125
116
        install --directory confdir
126
 
        install --mode=u=rw,go=r $^ $@
 
117
        install $^ $@
127
118
confdir/clients.conf: clients.conf keydir/seckey.txt
128
119
        install --directory confdir
129
 
        install --mode=u=rw,g=r $< $@
 
120
        install clients.conf $@
130
121
# Add a client password
131
122
        ./mandos-keygen --dir keydir --password >> $@
132
123
 
133
124
install: install-server install-client
134
125
 
135
126
install-server: doc
136
 
        install --directory $(CONFDIR) $(MANDIR)/man5 \
 
127
        install --directory --parents $(CONFDIR) $(MANDIR)/man5 \
137
128
                $(MANDIR)/man8
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) \
 
129
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
 
130
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
 
131
        install --mode=0640 --target-directory=$(CONFDIR) \
141
132
                clients.conf
142
133
        gzip --best --to-stdout mandos.8 \
143
134
                > $(MANDIR)/man8/mandos.8.gz
147
138
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
148
139
 
149
140
install-client: all doc /usr/share/initramfs-tools/hooks/.
150
 
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
151
 
                $(MANDIR)/man8
152
 
        install --directory --mode=u=rwx $(KEYDIR)
153
 
        install --directory --mode=u=rwx $(PREFIX)/lib/mandos/plugins.d
154
 
        if [ "$(CONFDIR)/plugins.d" \
155
 
                        != "$(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 \
 
141
        install --directory --parents $(PREFIX)/lib/mandos \
 
142
                $(CONFDIR) $(MANDIR)/man8
 
143
        install --directory --mode=0700 $(PREFIX)/lib/mandos/plugins.d
 
144
        chmod u=rwx,g=,o= $(PREFIX)/lib/mandos/plugins.d
 
145
        install --mode=0755 --target-directory=$(PREFIX)/lib/mandos \
159
146
                plugin-runner
160
 
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
 
147
        install --mode=0755 --target-directory=$(PREFIX)/sbin \
161
148
                mandos-keygen
162
 
        install --mode=u=rwx,go=rx \
 
149
        install --mode=0755 \
163
150
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
164
151
                plugins.d/password-prompt
165
 
        install --mode=u=rwxs,go=rx \
 
152
        install --mode=4755 \
166
153
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
167
154
                plugins.d/password-request
168
 
        install --mode=u=rwx,go=rx \
169
 
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
170
 
                plugins.d/usplash
171
155
        install initramfs-tools-hook \
172
156
                /usr/share/initramfs-tools/hooks/mandos
173
157
        install initramfs-tools-hook-conf \
174
158
                /usr/share/initramfs-tools/conf-hooks.d/mandos
175
159
        install initramfs-tools-script \
176
160
                /usr/share/initramfs-tools/scripts/local-top/mandos
177
 
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
178
161
        gzip --best --to-stdout mandos-keygen.8 \
179
162
                > $(MANDIR)/man8/mandos-keygen.8.gz
180
163
        gzip --best --to-stdout plugin-runner.8mandos \
183
166
                > $(MANDIR)/man8/password-prompt.8mandos.gz
184
167
        gzip --best --to-stdout plugins.d/password-request.8mandos \
185
168
                > $(MANDIR)/man8/password-request.8mandos.gz
186
 
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 
169
        -$(PREFIX)/sbin/mandos-keygen
187
170
        update-initramfs -k all -u
188
 
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
189
171
 
190
172
uninstall: uninstall-server uninstall-client
191
173
 
192
 
uninstall-server:
 
174
uninstall-server: $(PREFIX)/sbin/mandos
193
175
        -rm --force $(PREFIX)/sbin/mandos \
194
176
                $(MANDIR)/man8/mandos.8.gz \
195
177
                $(MANDIR)/man5/mandos.conf.5.gz \
222
204
        -rmdir $(CONFDIR)
223
205
 
224
206
purge-client: uninstall-client
225
 
        -shred --remove $(KEYDIR)/seckey.txt
226
 
        -rm --force $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
227
 
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)
 
207
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
 
208
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d