/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-10-03 09:32:30 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081003093230-rshn19e0c19zz12i
* .bzrignore (plugins.d/askpass-fifo): Added.

* Makefile (FORTIFY): Added "-fstack-protector-all".
  (mandos, mandos-keygen): Use more strict regexps when updating the
                           version number.

* mandos (Client.__init__): Use os.path.expandvars() and
                            os.path.expanduser() on the "secfile"
                            config value.

* plugins.d/splashy.c: Update comments and order of #include's.
  (main): Check user and group when looking for running splashy
          process.  Do not ignore ENOENT from execl().  Use _exit()
          instead of "return" when an error happens in child
          processes.  Bug fix: Only wait for splashy_update
          completion if it was started.  Bug fix: detect failing
          waitpid().  Only kill splashy_update if it is running.  Do
          the killing of the old splashy process before the fork().
          Do setsid() and setuid(geteuid()) before starting the new
          splashy.  Report failing execl().

* plugins.d/usplash.c: Update comments and order of #include's.
  (main): Check user and group when looking for running usplash
          process.  Do not report execv() error if interrupted by a
          signal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
12
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC -fPIE
13
 
LINK_FORTIFY_LD=-z relro -fPIE
14
 
LINK_FORTIFY=-pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all
15
13
#COVERAGE=--coverage
16
14
OPTIMIZE=-Os
17
15
LANGUAGE=-std=gnu99
18
16
htmldir=man
19
 
version=1.0.5
 
17
version=1.0
20
18
SED=sed
21
19
 
22
20
## Use these settings for a traditional /usr/local install
46
44
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
47
45
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
48
46
        -DVERSION='"$(version)"'
49
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
47
LDFLAGS=$(COVERAGE)
50
48
 
51
49
# Commands to format a DocBook <refentry> document into a manual page
52
50
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
71
69
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
72
70
        $<; $(HTMLPOST) $@
73
71
# Fix citerefentry links
74
 
HTMLPOST=$(SED) --in-place \
75
 
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
72
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
76
73
 
77
74
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
75
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
76
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
 
77
PROGS=mandos mandos-keygen $(CPROGS)
81
78
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
79
        plugins.d/mandos-client.8mandos \
83
80
        plugins.d/password-prompt.8mandos mandos.conf.5 \
84
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
85
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
81
        mandos-clients.conf.5
86
82
 
87
83
htmldocs=$(addsuffix .xhtml,$(DOCS))
88
84
 
89
85
objects=$(addsuffix .o,$(CPROGS))
90
86
 
91
 
all: $(PROGS) mandos.lsm
 
87
all: $(PROGS)
92
88
 
93
89
doc: $(DOCS)
94
90
 
150
146
 
151
147
# Update all these files with version number $(version)
152
148
common.ent: Makefile
153
 
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
155
 
                $@
 
149
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
156
150
 
157
151
mandos: Makefile
158
 
        $(SED) --in-place \
159
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
160
 
                $@
 
152
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
161
153
 
162
154
mandos-keygen: Makefile
163
 
        $(SED) --in-place \
164
 
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
 
                $@
166
 
 
167
 
mandos-ctl: Makefile
168
 
        $(SED) --in-place \
169
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
 
                $@
171
 
 
172
 
mandos.lsm: Makefile
173
 
        $(SED) --in-place \
174
 
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
175
 
                $@
176
 
        $(SED) --in-place \
177
 
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
178
 
                $@
179
 
        $(SED) --in-place \
180
 
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
181
 
                $@
 
155
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
182
156
 
183
157
plugins.d/mandos-client: plugins.d/mandos-client.o
184
158
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
203
177
run-client: all keydir/seckey.txt keydir/pubkey.txt
204
178
        ./plugin-runner --plugin-dir=plugins.d \
205
179
                --config-file=plugin-runner.conf \
206
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
207
 
                $(CLIENTARGS)
 
180
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
208
181
 
209
182
# Used by run-client
210
183
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
213
186
 
214
187
# Run the server with a local config
215
188
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
189
        ./mandos --debug --configdir=confdir
217
190
 
218
191
# Used by run-server
219
192
confdir/mandos.conf: mandos.conf
227
200
 
228
201
install: install-server install-client-nokey
229
202
 
230
 
install-html: html
 
203
install-html: $(htmldocs)
231
204
        install --directory $(htmldir)
232
205
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
233
206
                $(htmldocs)
285
258
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
259
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
260
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
261
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
289
262
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
263
        gzip --best --to-stdout mandos-keygen.8 \
291
264
                > $(MANDIR)/man8/mandos-keygen.8.gz
295
268
                > $(MANDIR)/man8/password-prompt.8mandos.gz
296
269
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
297
270
                > $(MANDIR)/man8/mandos-client.8mandos.gz
298
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
299
 
                > $(MANDIR)/man8/usplash.8mandos.gz
300
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
301
 
                > $(MANDIR)/man8/splashy.8mandos.gz
302
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
303
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
304
271
 
305
272
install-client: install-client-nokey
306
273
# Post-installation stuff
329
296
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
330
297
                $(PREFIX)/lib/mandos/plugins.d/usplash \
331
298
                $(PREFIX)/lib/mandos/plugins.d/splashy \
332
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
299
                $(INITRAMFSTOOLS)/hooks/mandos \
334
300
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
301
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
336
302
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
303
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
304
                $(MANDIR)/man8/password-prompt.8mandos.gz \
339
 
                $(MANDIR)/man8/usplash.8mandos.gz \
340
 
                $(MANDIR)/man8/splashy.8mandos.gz \
341
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
342
305
                $(MANDIR)/man8/mandos-client.8mandos.gz
343
306
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
344
307
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)