/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

* debian/rules: Only set BROKEN_PIE if binutils is a specific range of
                versions.
* mandos-monitor (MandosClientWidget.keypress): Also accept "Ctrl-K"
                                                for removing client.
  (UserInterface.__init__): Use non-bold line drawing charater.
  (UserInterface.log_message): Scroll to bottom.
  (UserInterface.process_input): Also show help on "ESC" key.

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://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
 
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>.
12
13
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
13
14
LINK_FORTIFY_LD=-z relro -z now
14
15
LINK_FORTIFY=
 
16
 
 
17
# If BROKEN_PIE is set, do not build with -pie
15
18
ifndef BROKEN_PIE
16
19
FORTIFY += -fPIE
17
20
LINK_FORTIFY_LD += -fPIE
55
58
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
56
59
 
57
60
# Commands to format a DocBook <refentry> document into a manual page
58
 
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 
61
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
59
62
        --param man.charmap.use.subset          0 \
60
63
        --param make.year.ranges                1 \
61
64
        --param make.single.year.ranges         1 \
63
66
        --param man.authors.section.enabled     0 \
64
67
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
65
68
        $(notdir $<); \
66
 
        $(MANPOST) $(notdir $@)
 
69
        $(MANPOST) $(notdir $@))
67
70
# DocBook-to-man post-processing to fix a '\n' escape bug
68
71
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
69
72
 
70
 
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
 
73
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
71
74
        --param make.year.ranges                1 \
72
75
        --param make.single.year.ranges         1 \
73
76
        --param man.output.quietly              1 \
75
78
        --param citerefentry.link               1 \
76
79
        --output $@ \
77
80
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
78
 
        $<; $(HTMLPOST) $@
 
81
        $<; $(HTMLPOST) $@)
79
82
# Fix citerefentry links
80
83
HTMLPOST=$(SED) --in-place \
81
84
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
156
159
 
157
160
# Update all these files with version number $(version)
158
161
common.ent: Makefile
159
 
        $(SED) --in-place \
 
162
        $(strip $(SED) --in-place \
160
163
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
161
 
                $@
 
164
                $@)
162
165
 
163
166
mandos: Makefile
164
 
        $(SED) --in-place \
 
167
        $(strip $(SED) --in-place \
165
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
166
 
                $@
 
169
                $@)
167
170
 
168
171
mandos-keygen: Makefile
169
 
        $(SED) --in-place \
 
172
        $(strip $(SED) --in-place \
170
173
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
171
 
                $@
 
174
                $@)
172
175
 
173
176
mandos-ctl: Makefile
174
 
        $(SED) --in-place \
 
177
        $(strip $(SED) --in-place \
175
178
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
176
 
                $@
 
179
                $@)
177
180
 
178
181
mandos.lsm: Makefile
179
 
        $(SED) --in-place \
 
182
        $(strip $(SED) --in-place \
180
183
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
181
 
                $@
182
 
        $(SED) --in-place \
 
184
                $@)
 
185
        $(strip $(SED) --in-place \
183
186
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
184
 
                $@
185
 
        $(SED) --in-place \
 
187
                $@)
 
188
        $(strip $(SED) --in-place \
186
189
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
187
 
                $@
 
190
                $@)
188
191
 
189
 
plugins.d/mandos-client: plugins.d/mandos-client.o
190
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
191
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
192
plugins.d/mandos-client: plugins.d/mandos-client.c
 
193
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
194
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
192
195
 
193
196
.PHONY : all doc html clean distclean run-client run-server install \
194
197
        install-server install-client uninstall uninstall-server \
207
210
 
208
211
# Run the client with a local config and key
209
212
run-client: all keydir/seckey.txt keydir/pubkey.txt
210
 
        @echo "###################################################################"
211
 
        @echo "# The following error messages are harmless and can be safely     #"
212
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
213
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
214
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
215
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
216
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
217
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
218
 
        @echo "#                     seteuid: Operation not permitted            #"
219
 
        @echo "#                     klogctl: Operation not permitted            #"
220
 
        @echo "###################################################################"
221
213
        ./plugin-runner --plugin-dir=plugins.d \
222
214
                --config-file=plugin-runner.conf \
223
215
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
230
222
 
231
223
# Run the server with a local config
232
224
run-server: confdir/mandos.conf confdir/clients.conf
233
 
        @echo "#################################################################"
234
 
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
235
 
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
236
 
        @echo "# they are harmless and are caused by the server not running as #"
237
 
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
238
 
        @echo "# not also unpack and compile it as root.                       #"
239
 
        @echo "#################################################################"
240
225
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
241
226
 
242
227
# Used by run-server