/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

* mandos (Client.__init__): Disable D-Bus during init to avoid
                            emitting any D-Bus signals before the
                            object is initialized.  Do the
                            dbus.service.Object initialization last.
  (Client): Changed D-Bus interface name to
            "se.bsnet.fukt.Mandos.Client".
  (main): Changed D-Bus bus name to "se.bsnet.fukt.Mandos".
  (main/MandosServer): Changed D-Bus object path to "/", and changed
                       interface name to "se.bsnet.fukt.Mandos".
                       Removed methods "RemoveClientByName" and
                       "Quit".

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=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -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 \
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
 
 
17
 
# If BROKEN_PIE is set, do not build with -pie
18
 
ifndef BROKEN_PIE
19
 
FORTIFY += -fPIE
20
 
LINK_FORTIFY += -pie
21
 
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
22
15
#COVERAGE=--coverage
23
16
OPTIMIZE=-Os
24
17
LANGUAGE=-std=gnu99
25
18
htmldir=man
26
 
version=1.0.14
 
19
version=1.0.5
27
20
SED=sed
28
21
 
29
22
## Use these settings for a traditional /usr/local install
42
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
43
36
##
44
37
 
45
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
46
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
47
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
48
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
49
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
50
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
51
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
52
44
 
53
45
# Do not change these two
54
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
57
49
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
58
50
 
59
51
# Commands to format a DocBook <refentry> document into a manual page
60
 
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
 
52
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
61
53
        --param man.charmap.use.subset          0 \
62
54
        --param make.year.ranges                1 \
63
55
        --param make.single.year.ranges         1 \
65
57
        --param man.authors.section.enabled     0 \
66
58
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
59
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@))
 
60
        $(MANPOST) $(notdir $@)
69
61
# DocBook-to-man post-processing to fix a '\n' escape bug
70
62
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
71
63
 
72
 
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 
64
DOCBOOKTOHTML=xsltproc --nonet --xinclude \
73
65
        --param make.year.ranges                1 \
74
66
        --param make.single.year.ranges         1 \
75
67
        --param man.output.quietly              1 \
77
69
        --param citerefentry.link               1 \
78
70
        --output $@ \
79
71
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
80
 
        $<; $(HTMLPOST) $@)
 
72
        $<; $(HTMLPOST) $@
81
73
# Fix citerefentry links
82
74
HTMLPOST=$(SED) --in-place \
83
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'
158
150
 
159
151
# Update all these files with version number $(version)
160
152
common.ent: Makefile
161
 
        $(strip $(SED) --in-place \
162
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
163
 
                $@)
 
153
        $(SED) --in-place \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
155
                $@
164
156
 
165
157
mandos: Makefile
166
 
        $(strip $(SED) --in-place \
 
158
        $(SED) --in-place \
167
159
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
168
 
                $@)
 
160
                $@
169
161
 
170
162
mandos-keygen: Makefile
171
 
        $(strip $(SED) --in-place \
 
163
        $(SED) --in-place \
172
164
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
173
 
                $@)
 
165
                $@
174
166
 
175
167
mandos-ctl: Makefile
176
 
        $(strip $(SED) --in-place \
 
168
        $(SED) --in-place \
177
169
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
178
 
                $@)
 
170
                $@
179
171
 
180
172
mandos.lsm: Makefile
181
 
        $(strip $(SED) --in-place \
 
173
        $(SED) --in-place \
182
174
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
183
 
                $@)
184
 
        $(strip $(SED) --in-place \
 
175
                $@
 
176
        $(SED) --in-place \
185
177
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
186
 
                $@)
187
 
        $(strip $(SED) --in-place \
 
178
                $@
 
179
        $(SED) --in-place \
188
180
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
189
 
                $@)
 
181
                $@
190
182
 
191
 
plugins.d/mandos-client: plugins.d/mandos-client.c
192
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
193
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
183
plugins.d/mandos-client: plugins.d/mandos-client.o
 
184
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 
185
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
194
186
 
195
187
.PHONY : all doc html clean distclean run-client run-server install \
196
188
        install-server install-client uninstall uninstall-server \
209
201
 
210
202
# Run the client with a local config and key
211
203
run-client: all keydir/seckey.txt keydir/pubkey.txt
212
 
        @echo "###################################################################"
213
 
        @echo "# The following error messages are harmless and can be safely     #"
214
 
        @echo "# ignored.  The messages are caused by not running as root, but   #"
215
 
        @echo "# you should NOT run \"make run-client\" as root unless you also    #"
216
 
        @echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
217
 
        @echo "# From plugin-runner: setuid: Operation not permitted             #"
218
 
        @echo "# From askpass-fifo:  mkfifo: Permission denied                   #"
219
 
        @echo "# From mandos-client: setuid: Operation not permitted             #"
220
 
        @echo "#                     seteuid: Operation not permitted            #"
221
 
        @echo "#                     klogctl: Operation not permitted            #"
222
 
        @echo "###################################################################"
223
204
        ./plugin-runner --plugin-dir=plugins.d \
224
205
                --config-file=plugin-runner.conf \
225
206
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
232
213
 
233
214
# Run the server with a local config
234
215
run-server: confdir/mandos.conf confdir/clients.conf
235
 
        @echo "#################################################################"
236
 
        @echo "# NOTE: Please IGNORE errors about \"No permission to bind to    #"
237
 
        @echo "# interface\" or \"Could not open file u'/var/run/mandos.pid'\" -  #"
238
 
        @echo "# they are harmless and are caused by the server not running as #"
239
 
        @echo "# root.  Do NOT run \"make run-server\" server as root if you did #"
240
 
        @echo "# not also unpack and compile it as root.                       #"
241
 
        @echo "#################################################################"
242
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
243
217
 
244
218
# Used by run-server
245
219
confdir/mandos.conf: mandos.conf
311
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
312
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
313
287
        install initramfs-tools-script \
314
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
315
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
316
290
        gzip --best --to-stdout mandos-keygen.8 \
317
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
358
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
359
333
                $(INITRAMFSTOOLS)/hooks/mandos \
360
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
361
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
362
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
363
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
364
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \