/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2009-04-16 01:00:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090416010035-y7ta6ra2da4gf6mp
Minor code cleanup; one minor bug fix.

* initramfs-tools-hook: Bug fix: Use the primary group of the first
                        suitable user found, do not look for a
                        group separately.
* mandos: Unconditionally import "struct" and "fcntl".  Use unicode
          strings everywhere possible.
  (Client._datetime_to_milliseconds): New static method.
  (Client.timeout_milliseconds, Client.interval_milliseconds): Use
                                                               above
                                                               method.
  (ClientDBus.CheckedOK,
  ClientDBus.Enable, ClientDBus.StopChecker): Define normally.
  (if_nametoindex): Document non-acceptance of unicode strings.  All
                    callers adjusted.  Do not import "struct" or
                    "fcntl".  Log warning message if if_nametoindex
                    cannot be found using ctypes modules.
  (main): Bug fix: Do not look for user named "nogroup".

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 \
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 -fPIC -fPIE
 
13
LINK_FORTIFY_LD=-z relro -fPIE
 
14
LINK_FORTIFY=-pie
14
15
#COVERAGE=--coverage
15
16
OPTIMIZE=-Os
16
17
LANGUAGE=-std=gnu99
17
18
htmldir=man
18
 
version=1.0.2
 
19
version=1.0.8
19
20
SED=sed
20
21
 
21
22
## Use these settings for a traditional /usr/local install
38
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
39
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
40
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
41
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
42
 
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)
43
45
 
44
46
# Do not change these two
45
47
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
48
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
49
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
50
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
49
51
 
50
52
# Commands to format a DocBook <refentry> document into a manual page
51
53
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
70
72
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
73
        $<; $(HTMLPOST) $@
72
74
# Fix citerefentry links
73
 
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
75
HTMLPOST=$(SED) --in-place \
 
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'
74
77
 
75
78
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
76
79
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
77
80
CPROGS=plugin-runner $(PLUGINS)
78
 
PROGS=mandos mandos-keygen $(CPROGS)
 
81
PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
79
82
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
80
83
        plugins.d/mandos-client.8mandos \
81
84
        plugins.d/password-prompt.8mandos mandos.conf.5 \
148
151
 
149
152
# Update all these files with version number $(version)
150
153
common.ent: Makefile
151
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
154
        $(SED) --in-place \
 
155
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
156
                $@
152
157
 
153
158
mandos: Makefile
154
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
 
159
        $(SED) --in-place \
 
160
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
161
                $@
155
162
 
156
163
mandos-keygen: Makefile
157
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
 
164
        $(SED) --in-place \
 
165
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
166
                $@
 
167
 
 
168
mandos-ctl: Makefile
 
169
        $(SED) --in-place \
 
170
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
171
                $@
158
172
 
159
173
mandos.lsm: Makefile
160
 
        $(SED) --in-place --expression='s/^\(Version:\).*/\1\t$(version)/' $@
161
 
        $(SED) --in-place --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' $@
 
174
        $(SED) --in-place \
 
175
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
176
                $@
 
177
        $(SED) --in-place \
 
178
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
179
                $@
 
180
        $(SED) --in-place \
 
181
                --expression='s/\(mandos_\)[0-9.]\+\(\.orig\.tar\.gz\)/\1$(version)\2/' \
 
182
                $@
162
183
 
163
184
plugins.d/mandos-client: plugins.d/mandos-client.o
164
185
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
183
204
run-client: all keydir/seckey.txt keydir/pubkey.txt
184
205
        ./plugin-runner --plugin-dir=plugins.d \
185
206
                --config-file=plugin-runner.conf \
186
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
207
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
208
                $(CLIENTARGS)
187
209
 
188
210
# Used by run-client
189
211
keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
192
214
 
193
215
# Run the server with a local config
194
216
run-server: confdir/mandos.conf confdir/clients.conf
195
 
        ./mandos --debug --configdir=confdir
 
217
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
196
218
 
197
219
# Used by run-server
198
220
confdir/mandos.conf: mandos.conf
206
228
 
207
229
install: install-server install-client-nokey
208
230
 
209
 
install-html: $(htmldocs)
 
231
install-html: html
210
232
        install --directory $(htmldir)
211
233
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
212
234
                $(htmldocs)
264
286
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
265
287
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
266
288
        install initramfs-tools-script \
267
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
 
289
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
268
290
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
269
291
        gzip --best --to-stdout mandos-keygen.8 \
270
292
                > $(MANDIR)/man8/mandos-keygen.8.gz
311
333
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
312
334
                $(INITRAMFSTOOLS)/hooks/mandos \
313
335
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
314
 
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
 
336
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
315
337
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
316
338
                $(MANDIR)/man8/mandos-keygen.8.gz \
317
339
                $(MANDIR)/man8/password-prompt.8mandos.gz \