/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
8
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
 
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
12
 
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
 
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
 
LINK_FORTIFY_LD=-z relro -z now
15
 
LINK_FORTIFY=
16
 
ifndef BROKEN_PIE
17
 
FORTIFY += -fPIE
18
 
LINK_FORTIFY_LD += -fPIE
19
 
LINK_FORTIFY += -pie
20
 
endif
 
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
21
15
#COVERAGE=--coverage
22
16
OPTIMIZE=-Os
23
17
LANGUAGE=-std=gnu99
24
18
htmldir=man
25
 
version=1.0.14
 
19
version=1.0.11
26
20
SED=sed
27
21
 
28
22
## Use these settings for a traditional /usr/local install
56
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
57
51
 
58
52
# Commands to format a DocBook <refentry> document into a manual page
59
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
60
54
        --param man.charmap.use.subset          0 \
61
55
        --param make.year.ranges                1 \
62
56
        --param make.single.year.ranges         1 \
64
58
        --param man.authors.section.enabled     0 \
65
59
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
66
60
        $(notdir $<); \
67
 
        $(MANPOST) $(notdir $@))
 
61
        $(MANPOST) $(notdir $@)
68
62
# DocBook-to-man post-processing to fix a '\n' escape bug
69
63
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
70
64
 
71
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
65
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
72
66
        --param make.year.ranges                1 \
73
67
        --param make.single.year.ranges         1 \
74
68
        --param man.output.quietly              1 \
76
70
        --param citerefentry.link               1 \
77
71
        --output $@ \
78
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
79
 
        $<; $(HTMLPOST) $@)
 
73
        $<; $(HTMLPOST) $@
80
74
# Fix citerefentry links
81
75
HTMLPOST=$(SED) --in-place \
82
76
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
157
151
 
158
152
# Update all these files with version number $(version)
159
153
common.ent: Makefile
160
 
        $(strip $(SED) --in-place \
 
154
        $(SED) --in-place \
161
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
162
 
                $@)
 
156
                $@
163
157
 
164
158
mandos: Makefile
165
 
        $(strip $(SED) --in-place \
 
159
        $(SED) --in-place \
166
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
167
 
                $@)
 
161
                $@
168
162
 
169
163
mandos-keygen: Makefile
170
 
        $(strip $(SED) --in-place \
 
164
        $(SED) --in-place \
171
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
172
 
                $@)
 
166
                $@
173
167
 
174
168
mandos-ctl: Makefile
175
 
        $(strip $(SED) --in-place \
 
169
        $(SED) --in-place \
176
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
177
 
                $@)
 
171
                $@
178
172
 
179
173
mandos.lsm: Makefile
180
 
        $(strip $(SED) --in-place \
 
174
        $(SED) --in-place \
181
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
182
 
                $@)
183
 
        $(strip $(SED) --in-place \
 
176
                $@
 
177
        $(SED) --in-place \
184
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
185
 
                $@)
186
 
        $(strip $(SED) --in-place \
 
179
                $@
 
180
        $(SED) --in-place \
187
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
188
 
                $@)
 
182
                $@
189
183
 
190
 
plugins.d/mandos-client: plugins.d/mandos-client.c
191
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
192
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
184
plugins.d/mandos-client: plugins.d/mandos-client.o
 
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
186
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
193
187
 
194
188
.PHONY : all doc html clean distclean run-client run-server install \
195
189
        install-server install-client uninstall uninstall-server \