/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-08-18 05:24:20 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080818052420-ab5eurrioz8n2qy6
* Makefile: Bug fix: fixed creation of man pages in "plugins.d".

* mandos-keygen Bug fix: make the --expire option modify
                KEYEXPIRE, not KEYCOMMENT.  Use the "--no-options"
                option to gpg when exporting keys from the temporary
                key ring files.

* mandos-keygen.xml (EXIT STATUS): Filled in.
  (ENVIRONMENT): New section, documenting use of TMPDIR.
  (FILES): Document use of key files and /tmp.
  (BUGS): Filled in.
  (EXAMPLE): Added two examples.
  (SECURITY): Added some text.

* plugins.d/password-prompt.xml (NOTES): Removed, since this is
                                         created automatically for
                                         footnotes.
  (ENVIRONMENT, FILES): Added empty sections.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

* plugins.d/password-request.xml: Reordered sections.
  (ENVIRONMENT): New empty section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

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