/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

* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added
                 "$syslog", thanks to Petter Reinholdtsen
                 <pere@hungry.com> (Debian bug #546928).

* initramfs-tools-script: Removed erroneous comment.

* plugins.d/askpass-fifo.c: Removed TEMP_FAILURE_RETRY since it is
                            not needed.

* plugins.d/mandos-client.c (main): Bug fix: Initialize
                                    "old_sigterm_action".

* plugins.d/splashy.c (main): Bug fix: really check return value from
                              "sigaddset".  Fix some warnings on
                              64-bit systems.

* plugins.d/usplash.c (termination_handler, main): Save received
                                                   signal and
                                                   re-raise it on
                                                   exit.
  (usplash_write): Do not close FIFO, instead, take an additional file
                   descriptor pointer to it and open only when needed
                   (all callers changed).  Abort immediately on EINTR.
                   Bug fix:  Add NUL byte on single-word commands.
                   Ignore "interrupted_by_signal".
  (makeprompt, find_usplash): New; broken out from "main()".
  (find_usplash): Bug fix: close /proc/<pid>/cmdline FD on error.
  (main): Reorganized to jump to a new "failure" label on any error.
          Bug fix: check return values from sigaddset.
          New variable "usplash_accessed" to flag if usplash(8) needs
          to be killed and restarted.  Removed the "an_error_occured"
          variable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
16
16
OPTIMIZE=-Os
17
17
LANGUAGE=-std=gnu99
18
18
htmldir=man
19
 
version=1.0.3
 
19
version=1.0.11
20
20
SED=sed
21
21
 
22
22
## Use these settings for a traditional /usr/local install
35
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
36
##
37
37
 
38
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
39
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
 
38
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
 
39
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
40
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
43
 
GPGME_LIBS=$(shell gpgme-config --libs)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
 
43
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
 
44
        getconf LFS_LDFLAGS)
44
45
 
45
46
# Do not change these two
46
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
77
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
78
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
79
80
CPROGS=plugin-runner $(PLUGINS)
80
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
81
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
82
83
        plugins.d/mandos-client.8mandos \
83
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
151
152
# Update all these files with version number $(version)
152
153
common.ent: Makefile
153
154
        $(SED) --in-place \
154
 
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
155
156
                $@
156
157
 
157
158
mandos: Makefile
164
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
165
166
                $@
166
167
 
167
 
mandos-list: Makefile
 
168
mandos-ctl: Makefile
168
169
        $(SED) --in-place \
169
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
170
171
                $@
213
214
 
214
215
# Run the server with a local config
215
216
run-server: confdir/mandos.conf confdir/clients.conf
216
 
        ./mandos --debug --configdir=confdir $(SERVERARGS)
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
217
218
 
218
219
# Used by run-server
219
220
confdir/mandos.conf: mandos.conf
285
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
286
287
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
287
288
        install initramfs-tools-script \
288
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
289
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
289
290
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
290
291
        gzip --best --to-stdout mandos-keygen.8 \
291
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
332
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
333
334
                $(INITRAMFSTOOLS)/hooks/mandos \
334
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
335
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
336
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
337
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
338
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \