/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 -fPIE -pie
13
 
LINK_FORTIFY=-z relro -pie
 
12
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all
14
13
#COVERAGE=--coverage
15
14
OPTIMIZE=-Os
16
15
LANGUAGE=-std=gnu99
17
16
htmldir=man
18
 
version=1.0.2
 
17
version=1.0
19
18
SED=sed
20
19
 
21
20
## Use these settings for a traditional /usr/local install
45
44
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
45
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
46
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
47
LDFLAGS=$(COVERAGE)
49
48
 
50
49
# Commands to format a DocBook <refentry> document into a manual page
51
50
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
79
78
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
80
79
        plugins.d/mandos-client.8mandos \
81
80
        plugins.d/password-prompt.8mandos mandos.conf.5 \
82
 
        plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
83
 
        plugins.d/askpass-fifo.8mandos mandos-clients.conf.5
 
81
        mandos-clients.conf.5
84
82
 
85
83
htmldocs=$(addsuffix .xhtml,$(DOCS))
86
84
 
270
268
                > $(MANDIR)/man8/password-prompt.8mandos.gz
271
269
        gzip --best --to-stdout plugins.d/mandos-client.8mandos \
272
270
                > $(MANDIR)/man8/mandos-client.8mandos.gz
273
 
        gzip --best --to-stdout plugins.d/usplash.8mandos \
274
 
                > $(MANDIR)/man8/usplash.8mandos.gz
275
 
        gzip --best --to-stdout plugins.d/splashy.8mandos \
276
 
                > $(MANDIR)/man8/splashy.8mandos.gz
277
 
        gzip --best --to-stdout plugins.d/askpass-fifo.8mandos \
278
 
                > $(MANDIR)/man8/askpass-fifo.8mandos.gz
279
271
 
280
272
install-client: install-client-nokey
281
273
# Post-installation stuff
304
296
                $(PREFIX)/lib/mandos/plugins.d/mandos-client \
305
297
                $(PREFIX)/lib/mandos/plugins.d/usplash \
306
298
                $(PREFIX)/lib/mandos/plugins.d/splashy \
307
 
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
308
299
                $(INITRAMFSTOOLS)/hooks/mandos \
309
300
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
310
301
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
311
302
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
312
303
                $(MANDIR)/man8/mandos-keygen.8.gz \
313
304
                $(MANDIR)/man8/password-prompt.8mandos.gz \
314
 
                $(MANDIR)/man8/usplash.8mandos.gz \
315
 
                $(MANDIR)/man8/splashy.8mandos.gz \
316
 
                $(MANDIR)/man8/askpass-fifo.8mandos.gz \
317
305
                $(MANDIR)/man8/mandos-client.8mandos.gz
318
306
        -rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
319
307
                 $(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)