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
- browse files at revision 723.1.4
- compare with another revision
- download diff
- download tarball
- view history from revision 723.1.4
- Committer: Teddy Hogeborn
- Date: 2014-07-25 23:16:04 UTC
- mto: This revision was merged to the branch mainline in revision 724.
- Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().
This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3. The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.
* mandos (Client.__init__): Use .items() instead of .iteritems().
(DBusObjectWithProperties.Introspect): - '' -
(alternate_dbus_interfaces/wrapper): - '' -
(main): - '' -
* mandos-ctl (main): - '' -
This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3. The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.
* mandos (Client.__init__): Use .items() instead of .iteritems().
(DBusObjectWithProperties.Introspect): - '' -
(alternate_dbus_interfaces/wrapper): - '' -
(main): - '' -
* mandos-ctl (main): - '' -
- files added:
- debian/upstream
- files removed:
- mandos-change-keytype
- files modified:
- INSTALL
added
removed
Makefile
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
-Wswitch-default -Wswitch-enum -Wunused-parameter \
3
-Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
1
WARN=-O -Wall -Wextra -Wdouble-promotion -Wformat=2 -Winit-self \
2
-Wmissing-include-dirs -Wswitch-default -Wswitch-enum \
3
-Wunused -Wuninitialized -Wstrict-overflow=5 \
4
-Wsuggest-attribute=pure -Wsuggest-attribute=const \
5
-Wsuggest-attribute=noreturn -Wfloat-equal -Wundef -Wshadow \
4
6
-Wunsafe-loop-optimizations -Wpointer-arith \
5
7
-Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
-Wconversion -Wstrict-prototypes -Wold-style-definition \
7
-Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
# -Wunreachable-code
8
-Wconversion -Wlogical-op -Waggregate-return \
9
-Wstrict-prototypes -Wold-style-definition \
10
-Wmissing-format-attribute -Wnormalized=nfc -Wpacked \
11
-Wredundant-decls -Wnested-externs -Winline -Wvla \
12
-Wvolatile-register-var -Woverlength-strings
9
13
#DEBUG=-ggdb3
10
# For info about _FORTIFY_SOURCE, see
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
14
# For info about _FORTIFY_SOURCE, see feature_test_macros(7)
12
15
# and <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>.
13
16
FORTIFY=-D_FORTIFY_SOURCE=2 -fstack-protector-all -fPIC
14
17
LINK_FORTIFY_LD=-z relro -z now
20
23
LINK_FORTIFY += -pie
21
24
endif
22
25
#COVERAGE=--coverage
23
OPTIMIZE=-Os
26
OPTIMIZE=-Os -fno-strict-aliasing
24
27
LANGUAGE=-std=gnu99
25
28
htmldir=man
26
version=1.6.1
29
version=1.6.7
27
30
SED=sed
28
31
29
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
36
39
# MANDIR=$(PREFIX)/man
37
40
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
41
# STATEDIR=$(DESTDIR)/var/lib/mandos
42
# LIBDIR=$(PREFIX)/lib
39
43
##
40
44
41
45
## These settings are for a package-type install
45
49
MANDIR=$(PREFIX)/share/man
46
50
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
51
STATEDIR=$(DESTDIR)/var/lib/mandos
52
LIBDIR=$(shell \
53
for d in \
54
"/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`" \
55
"`rpm --eval='%{_libdir}' 2>/dev/null`" /usr/lib; do \
56
if [ -d "$$d" -a "$$d" = "$${d%/}" ]; then \
57
echo "$(DESTDIR)$$d"; \
58
break; \
59
fi; \
60
done)
48
61
##
49
62
63
SYSTEMD=$(DESTDIR)$(shell pkg-config systemd --variable=systemdsystemunitdir)
64
50
65
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
51
66
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
52
67
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
70
85
--param man.authors.section.enabled 0 \
71
86
/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
87
$(notdir $<); \
73
$(MANPOST) $(notdir $@);\
74
88
if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
89
&& type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
90
man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
91
fi >/dev/null)
78
# DocBook-to-man post-processing to fix a '\n' escape bug
79
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
92
81
93
DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
82
94
--param make.year.ranges 1 \
227
239
$(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
228
240
) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
229
241
230
.PHONY : all doc html clean distclean run-client run-server install \
231
install-server install-client uninstall uninstall-server \
232
uninstall-client purge purge-server purge-client
242
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
243
check run-client run-server install install-html \
244
install-server install-client-nokey install-client uninstall \
245
uninstall-server uninstall-client purge purge-server \
246
purge-client
233
247
234
248
clean:
235
249
-rm --force $(CPROGS) $(objects) $(htmldocs) $(DOCS) core
250
264
@echo "# ignored. The messages are caused by not running as root, but #"
251
265
@echo "# you should NOT run \"make run-client\" as root unless you also #"
252
266
@echo "# unpacked and compiled Mandos as root, which is NOT recommended. #"
253
@echo "# From plugin-runner: setuid: Operation not permitted #"
267
@echo "# From plugin-runner: setgid: Operation not permitted #"
268
@echo "# setuid: Operation not permitted #"
254
269
@echo "# From askpass-fifo: mkfifo: Permission denied #"
255
@echo "# From mandos-client: setuid: Operation not permitted #"
256
@echo "# seteuid: Operation not permitted #"
257
@echo "# klogctl: Operation not permitted #"
270
@echo "# From mandos-client: #"
271
@echo "# Failed to raise privileges: Operation not permitted #"
272
@echo "# Warning: network hook \"*\" exited with status * #"
258
273
@echo "###################################################################"
274
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
259
275
./plugin-runner --plugin-dir=plugins.d \
260
276
--config-file=plugin-runner.conf \
261
277
--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
278
--env-for=mandos-client:GNOME_KEYRING_CONTROL= \
262
279
$(CLIENTARGS)
263
280
264
281
# Used by run-client
279
296
install --directory confdir
280
297
install --mode=u=rw $< $@
281
298
# Add a client password
282
./mandos-keygen --dir keydir --password >> $@
299
./mandos-keygen --dir keydir --password --no-ssh >> $@
283
300
statedir:
284
301
install --directory statedir
285
302
292
309
293
310
install-server: doc
294
311
install --directory $(CONFDIR)
295
install --directory --mode=u=rwx --owner=$(USER) \
296
--group=$(GROUP) $(STATEDIR)
312
if install --directory --mode=u=rwx --owner=$(USER) \
313
--group=$(GROUP) $(STATEDIR); then \
314
:; \
315
elif install --directory --mode=u=rwx $(STATEDIR); then \
316
chown -- $(USER):$(GROUP) $(STATEDIR) || :; \
317
fi
297
318
install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
319
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
320
mandos-ctl
307
328
$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
308
329
install --mode=u=rwx,go=rx init.d-mandos \
309
330
$(DESTDIR)/etc/init.d/mandos
331
if [ "$(SYSTEMD)" != "$(DESTDIR)" -a -d "$(SYSTEMD)" ]; then \
332
install --mode=u=rw,go=r mandos.service $(SYSTEMD); \
333
fi
310
334
install --mode=u=rw,go=r default-mandos \
311
335
$(DESTDIR)/etc/default/mandos
312
336
if [ -z $(DESTDIR) ]; then \
326
350
> $(MANDIR)/man8/intro.8mandos.gz
327
351
328
352
install-client-nokey: all doc
329
install --directory $(PREFIX)/lib/mandos $(CONFDIR)
353
install --directory $(LIBDIR)/mandos $(CONFDIR)
330
354
install --directory --mode=u=rwx $(KEYDIR) \
331
$(PREFIX)/lib/mandos/plugins.d
332
if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
355
$(LIBDIR)/mandos/plugins.d
356
if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
333
357
install --mode=u=rwx \
334
358
--directory "$(CONFDIR)/plugins.d"; \
335
359
fi
336
360
install --mode=u=rwx,go=rx --directory \
337
361
"$(CONFDIR)/network-hooks.d"
338
362
install --mode=u=rwx,go=rx \
339
--target-directory=$(PREFIX)/lib/mandos plugin-runner
363
--target-directory=$(LIBDIR)/mandos plugin-runner
340
364
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
341
365
mandos-keygen
342
install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
343
mandos-change-keytype
344
366
install --mode=u=rwx,go=rx \
345
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
367
--target-directory=$(LIBDIR)/mandos/plugins.d \
346
368
plugins.d/password-prompt
347
369
install --mode=u=rwxs,go=rx \
348
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
370
--target-directory=$(LIBDIR)/mandos/plugins.d \
349
371
plugins.d/mandos-client
350
372
install --mode=u=rwxs,go=rx \
351
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
373
--target-directory=$(LIBDIR)/mandos/plugins.d \
352
374
plugins.d/usplash
353
375
install --mode=u=rwxs,go=rx \
354
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
376
--target-directory=$(LIBDIR)/mandos/plugins.d \
355
377
plugins.d/splashy
356
378
install --mode=u=rwxs,go=rx \
357
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
379
--target-directory=$(LIBDIR)/mandos/plugins.d \
358
380
plugins.d/askpass-fifo
359
381
install --mode=u=rwxs,go=rx \
360
--target-directory=$(PREFIX)/lib/mandos/plugins.d \
382
--target-directory=$(LIBDIR)/mandos/plugins.d \
361
383
plugins.d/plymouth
362
384
install initramfs-tools-hook \
363
385
$(INITRAMFSTOOLS)/hooks/mandos
409
431
! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
410
432
$(DESTDIR)/etc/crypttab
411
433
-rm --force $(PREFIX)/sbin/mandos-keygen \
412
$(PREFIX)/sbin/mandos-change-keytype \
413
$(PREFIX)/lib/mandos/plugin-runner \
414
$(PREFIX)/lib/mandos/plugins.d/password-prompt \
415
$(PREFIX)/lib/mandos/plugins.d/mandos-client \
416
$(PREFIX)/lib/mandos/plugins.d/usplash \
417
$(PREFIX)/lib/mandos/plugins.d/splashy \
418
$(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
419
$(PREFIX)/lib/mandos/plugins.d/plymouth \
434
$(LIBDIR)/mandos/plugin-runner \
435
$(LIBDIR)/mandos/plugins.d/password-prompt \
436
$(LIBDIR)/mandos/plugins.d/mandos-client \
437
$(LIBDIR)/mandos/plugins.d/usplash \
438
$(LIBDIR)/mandos/plugins.d/splashy \
439
$(LIBDIR)/mandos/plugins.d/askpass-fifo \
440
$(LIBDIR)/mandos/plugins.d/plymouth \
420
441
$(INITRAMFSTOOLS)/hooks/mandos \
421
442
$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
422
443
$(INITRAMFSTOOLS)/scripts/init-premount/mandos \
428
449
$(MANDIR)/man8/splashy.8mandos.gz \
429
450
$(MANDIR)/man8/askpass-fifo.8mandos.gz \
430
451
$(MANDIR)/man8/plymouth.8mandos.gz \
431
-rmdir $(PREFIX)/lib/mandos/plugins.d $(CONFDIR)/plugins.d \
432
$(PREFIX)/lib/mandos $(CONFDIR) $(KEYDIR)
452
-rmdir $(LIBDIR)/mandos/plugins.d $(CONFDIR)/plugins.d \
453
$(LIBDIR)/mandos $(CONFDIR) $(KEYDIR)
433
454
update-initramfs -k all -u
434
455
435
456
purge: purge-server purge-client
439
460
$(DESTDIR)/etc/dbus-1/system.d/mandos.conf
440
461
$(DESTDIR)/etc/default/mandos \
441
462
$(DESTDIR)/etc/init.d/mandos \
442
$(DESTDIR)/run/mandos.pid
463
$(SYSTEMD)/mandos.service \
464
$(DESTDIR)/run/mandos.pid \
465
$(DESTDIR)/var/run/mandos.pid
443
466
-rmdir $(CONFDIR)
444
467
445
468
purge-client: uninstall-client
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0