/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

  • Committer: Teddy Hogeborn
  • Date: 2014-07-25 23:16:04 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • 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): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
OPTIMIZE=-Os -fno-strict-aliasing
27
27
LANGUAGE=-std=gnu99
28
28
htmldir=man
29
 
version=1.6.9
 
29
version=1.6.7
30
30
SED=sed
31
31
 
32
32
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
106
106
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
107
107
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
108
108
        plugins.d/plymouth
109
 
PLUGIN_HELPERS=
110
 
CPROGS=plugin-runner $(PLUGINS) $(PLUGIN_HELPERS)
 
109
CPROGS=plugin-runner $(PLUGINS)
111
110
PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
112
111
DOCS=mandos.8 mandos-keygen.8 mandos-monitor.8 mandos-ctl.8 \
113
112
        mandos.conf.5 mandos-clients.conf.5 plugin-runner.8mandos \
274
273
        @echo "###################################################################"
275
274
# We set GNOME_KEYRING_CONTROL to block pam_gnome_keyring
276
275
        ./plugin-runner --plugin-dir=plugins.d \
277
 
                --plugin-helper-dir=plugin-helpers \
278
276
                --config-file=plugin-runner.conf \
279
277
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
280
278
                --env-for=mandos-client:GNOME_KEYRING_CONTROL= \
358
356
        if [ "$(CONFDIR)" != "$(LIBDIR)/mandos" ]; then \
359
357
                install --mode=u=rwx \
360
358
                        --directory "$(CONFDIR)/plugins.d"; \
361
 
                install --directory "$(CONFDIR)/plugin-helpers"; \
362
359
        fi
363
360
        install --mode=u=rwx,go=rx --directory \
364
361
                "$(CONFDIR)/network-hooks.d"