/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-05 16:24:33 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080905162433-58fgx91ae9foxlh1
* Makefile (PIDDIR, USER, GROUP): Removed.
  (install-server): Do not create $(PIDDIR).
  (uninstall-server): Do not remove $(PIDDIR).

* init.d-mandos (PIDFILE): Changed to "/var/run/$NAME.pid".

* mandos (IPv6_TCPServer.enabled): New attribute.
  (IPv6_TCPServer.server_activate): Only call method of superclass if
                                    "self.enabled".
  (IPv6_TCPServer.enable): Set "self.enabled" to True.
  (main): Create client Set() early.  Create IPv6_TCPServer object
          early.  Switch to user and group "mandos", "nobody" or
          65534, if possible.  Enable IPv6_TCPServer *after* switching
          user.

* mandos-keygen (KEYDIR): Changed to "/etc/keys/mandos".

* mandos.xml (FILES): Changed PID file.
  (SECURITY): The server does need to be privileged, but switches to a
              non-privileged user.

* plugin-runner.xml (EXAMPLE): Changed long example to something more
                               realistic.

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
43
        --param man.authors.section.enabled     0 \
41
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
 
44
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
45
        $(notdir $<); \
 
46
        $(MANPOST) $(notdir $@)
42
47
# DocBook-to-man post-processing to fix a \n escape bug
43
 
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'
44
49
 
45
50
PLUGINS=plugins.d/password-prompt plugins.d/password-request
46
51
PROGS=plugin-runner $(PLUGINS)
55
60
 
56
61
doc: $(DOCS)
57
62
 
58
 
%.5: %.xml
59
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^) $(MANPOST) $@
60
 
 
61
 
%.8: %.xml
62
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $@
63
 
 
64
 
%.8mandos: %.xml
65
 
        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)
66
88
 
67
89
plugins.d/password-request: plugins.d/password-request.o
68
90
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
78
100
distclean: clean
79
101
mostlyclean: clean
80
102
maintainer-clean: clean
81
 
        -rm --force --recursive keydir
 
103
        -rm --force --recursive keydir confdir
82
104
 
83
105
check:
84
106
        ./mandos --check
85
107
 
86
 
run-client: all
87
 
        -mkdir keydir
88
 
        -./mandos-keygen --dir keydir
 
108
# Run the client with a local config and key
 
109
run-client: all keydir/seckey.txt keydir/pubkey.txt
89
110
        ./plugin-runner --plugin-dir=plugins.d \
90
 
                --options-for=password-request:--keydir=keydir
91
 
 
92
 
run-server:
93
 
        ./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,g=r $< $@
 
130
# Add a client password
 
131
        ./mandos-keygen --dir keydir --password >> $@
94
132
 
95
133
install: install-server install-client
96
134
 
97
135
install-server: doc
98
 
        mkdir --mode=0755 --parents $(CONFDIR) $(MANDIR)/man5 \
 
136
        install --directory $(CONFDIR) $(MANDIR)/man5 \
99
137
                $(MANDIR)/man8
100
 
        install --mode=0755 mandos $(PREFIX)/sbin/mandos
101
 
        install --mode=0644 --target-directory=$(CONFDIR) mandos.conf
102
 
        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,g=r --target-directory=$(CONFDIR) \
103
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
104
146
        gzip --best --to-stdout mandos.8 \
105
147
                > $(MANDIR)/man8/mandos.8.gz
106
148
        gzip --best --to-stdout mandos.conf.5 \
109
151
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
110
152
 
111
153
install-client: all doc /usr/share/initramfs-tools/hooks/.
112
 
        mkdir --mode=0755 --parents $(PREFIX)/lib/mandos $(CONFDIR) \
 
154
        install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
113
155
                $(MANDIR)/man8
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 \
117
 
                plugin-runner
118
 
        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 --directory "$(CONFDIR)/plugins.d"; \
 
162
                fi
 
163
        install --mode=u=rwx,go=rx \
 
164
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
 
165
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
119
166
                mandos-keygen
120
 
        install --mode=0755 \
 
167
        install --mode=u=rwx,go=rx \
121
168
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
122
169
                plugins.d/password-prompt
123
 
        install --mode=4755 \
 
170
        install --mode=u=rwxs,go=rx \
124
171
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
125
172
                plugins.d/password-request
 
173
        install --mode=u=rwx,go=rx \
 
174
                --target-directory=$(PREFIX)/lib/mandos/plugins.d \
 
175
                plugins.d/usplash
126
176
        install initramfs-tools-hook \
127
177
                /usr/share/initramfs-tools/hooks/mandos
128
178
        install initramfs-tools-hook-conf \
129
179
                /usr/share/initramfs-tools/conf-hooks.d/mandos
130
180
        install initramfs-tools-script \
131
181
                /usr/share/initramfs-tools/scripts/local-top/mandos
 
182
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
132
183
        gzip --best --to-stdout mandos-keygen.8 \
133
184
                > $(MANDIR)/man8/mandos-keygen.8.gz
134
185
        gzip --best --to-stdout plugin-runner.8mandos \
137
188
                > $(MANDIR)/man8/password-prompt.8mandos.gz
138
189
        gzip --best --to-stdout plugins.d/password-request.8mandos \
139
190
                > $(MANDIR)/man8/password-request.8mandos.gz
140
 
        -$(PREFIX)/sbin/mandos-keygen
 
191
        -$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
141
192
        update-initramfs -k all -u
 
193
        echo "Now run mandos-keygen --password --dir $(KEYDIR)"
142
194
 
143
195
uninstall: uninstall-server uninstall-client
144
196
 
145
 
uninstall-server: $(PREFIX)/sbin/mandos
 
197
uninstall-server:
146
198
        -rm --force $(PREFIX)/sbin/mandos \
147
199
                $(MANDIR)/man8/mandos.8.gz \
148
200
                $(MANDIR)/man5/mandos.conf.5.gz \
149
201
                $(MANDIR)/man5/mandos-clients.conf.5.gz
 
202
        update-rc.d -f mandos remove
150
203
        -rmdir $(CONFDIR)
151
204
 
152
205
uninstall-client:
171
224
purge: purge-server purge-client
172
225
 
173
226
purge-server: uninstall-server
174
 
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf
 
227
        -rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
 
228
                /etc/default/mandos /etc/init.d/mandos
175
229
        -rmdir $(CONFDIR)
176
230
 
177
231
purge-client: uninstall-client
178
 
        -rm --force $(CONFDIR)/seckey.txt $(CONFDIR)/pubkey.txt
179
 
        -rmdir $(CONFDIR) $(CONFDIR)/plugins.d
 
232
        -shred --remove $(KEYDIR)/seckey.txt
 
233
        -rm --force $(CONFDIR)/plugin-runner.conf \
 
234
                $(KEYDIR)/pubkey.txt $(KEYDIR)/seckey.txt
 
235
        -rmdir $(KEYDIR) $(CONFDIR)/plugins.d $(CONFDIR)