Leo Famulari
1a957c21c6
gnu: libressl: Update to 2.3.4 [security fixes].
...
Fixes CVE-2016-{2105, 2106, 2107, 2108, 2109}.
* gnu/packages/tls.scm (libressl): Update to 2.3.4.
2016-05-05 02:16:17 -04:00
Mark H Weaver
3c1d2981ff
gnu: openssl: Replace with 1.0.2h [security fixes].
...
Fixes CVE-2016-{2105,2106,2107,2109,2176}.
* gnu/packages/tls.scm (openssl)[replacement]: New field.
(openssl/fixed): New variable.
2016-05-03 13:31:50 -04:00
Ludovic Courtès
f28cb89e48
gnu: libtasn1: Replace 4.7 with 4.8 [fixes CVE-2016-4008].
...
* gnu/packages/tls.scm (libtasn1)[replacement]: New field.
(libtasn1/fixed): New variable.
2016-04-28 18:03:01 +02:00
Ludovic Courtès
63e8bb12a4
gnu-maintenance: Move FTP directory info to 'properties' fields.
...
* guix/gnu-maintenance.scm (ftp-server/directory): Rewrite to honor
PACKAGE's properties. Remove list of quirks.
(releases): Add #:server and #:directory parameters. Remove call
to 'ftp-server/directory'.
(latest-release): Likewise.
(latest-release*): Add call to 'ftp-server/directory'. Honor
'upstream-name' property of PACKAGE.
* gnu/packages/fonts.scm (font-gnu-freefont-ttf): Add 'properties'
field.
* gnu/packages/gnupg.scm (libgpg-error, libgcrypt, libassuan):
(libksba, gnupg): Likewise.
* gnu/packages/gnuzilla.scm (icecat): Likewise.
* gnu/packages/package-management.scm (guix-0.10.0): Likewise.
* gnu/packages/pretty-print.scm (source-highlight): Likewise.
* gnu/packages/scheme.scm (mit-scheme): Likewise.
* gnu/packages/telephony.scm (ucommon): Likewise.
* gnu/packages/tls.scm (gnutls): Likewise.
2016-04-15 00:32:18 +02:00
Alex Kost
fc1adab148
gnu: packages: Use 'search-patches' everywhere.
...
* gnu/packages/abiword.scm: Use 'search-patches' for 'patches' field.
* gnu/packages/acl.scm: Likewise.
* gnu/packages/admin.scm: Likewise.
* gnu/packages/algebra.scm: Likewise.
* gnu/packages/animation.scm: Likewise.
* gnu/packages/apr.scm: Likewise.
* gnu/packages/audacity.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/autotools.scm: Likewise.
* gnu/packages/avahi.scm: Likewise.
* gnu/packages/backup.scm: Likewise.
* gnu/packages/base.scm: Likewise.
* gnu/packages/bash.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/ci.scm: Likewise.
* gnu/packages/cmake.scm: Likewise.
* gnu/packages/cpio.scm: Likewise.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/dico.scm: Likewise.
* gnu/packages/doxygen.scm: Likewise.
* gnu/packages/ebook.scm: Likewise.
* gnu/packages/elf.scm: Likewise.
* gnu/packages/emacs.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/firmware.scm: Likewise.
* gnu/packages/flashing-tools.scm: Likewise.
* gnu/packages/fltk.scm: Likewise.
* gnu/packages/ftp.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gawk.scm: Likewise.
* gnu/packages/gcc.scm: Likewise.
* gnu/packages/gd.scm: Likewise.
* gnu/packages/ghostscript.scm: Likewise.
* gnu/packages/glib.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/gnucash.scm: Likewise.
* gnu/packages/gnunet.scm: Likewise.
* gnu/packages/gnupg.scm: Likewise.
* gnu/packages/gnuzilla.scm: Likewise.
* gnu/packages/graphics.scm: Likewise.
* gnu/packages/grub.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/guile.scm: Likewise.
* gnu/packages/icu4c.scm: Likewise.
* gnu/packages/idutils.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/imagemagick.scm: Likewise.
* gnu/packages/irc.scm: Likewise.
* gnu/packages/ldc.scm: Likewise.
* gnu/packages/libcanberra.scm: Likewise.
* gnu/packages/libevent.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/libunwind.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/llvm.scm: Likewise.
* gnu/packages/lsh.scm: Likewise.
* gnu/packages/lua.scm: Likewise.
* gnu/packages/lxqt.scm: Likewise.
* gnu/packages/mail.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mcrypt.scm: Likewise.
* gnu/packages/messaging.scm: Likewise.
* gnu/packages/mit-krb5.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/multiprecision.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/ninja.scm: Likewise.
* gnu/packages/nvi.scm: Likewise.
* gnu/packages/ocaml.scm: Likewise.
* gnu/packages/orpheus.scm: Likewise.
* gnu/packages/ots.scm: Likewise.
* gnu/packages/parallel.scm: Likewise.
* gnu/packages/patchutils.scm: Likewise.
* gnu/packages/pcre.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/plotutils.scm: Likewise.
* gnu/packages/polkit.scm: Likewise.
* gnu/packages/pulseaudio.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/qemu.scm: Likewise.
* gnu/packages/qt.scm: Likewise.
* gnu/packages/ratpoison.scm: Likewise.
* gnu/packages/rdf.scm: Likewise.
* gnu/packages/readline.scm: Likewise.
* gnu/packages/rush.scm: Likewise.
* gnu/packages/scheme.scm: Likewise.
* gnu/packages/screen.scm: Likewise.
* gnu/packages/sdl.scm: Likewise.
* gnu/packages/slim.scm: Likewise.
* gnu/packages/ssh.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/tcsh.scm: Likewise.
* gnu/packages/texinfo.scm: Likewise.
* gnu/packages/tls.scm: Likewise.
* gnu/packages/tor.scm: Likewise.
* gnu/packages/tv.scm: Likewise.
* gnu/packages/valgrind.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/vpn.scm: Likewise.
* gnu/packages/vtk.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/wicd.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xfce.scm: Likewise.
* gnu/packages/xiph.scm: Likewise.
* gnu/packages/xml.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
* gnu/packages/zip.scm: Likewise.
2016-04-14 10:38:21 +03:00
Leo Famulari
a94d455f58
gnu: letsencrypt, python-acme: Update to 0.5.0
...
These packages should be updated together.
* gnu/packages/tls.scm (letsencrypt): Update to 0.5.0.
(python-acme, python2-acme): Update to 0.5.0.
2016-04-11 18:39:55 -04:00
Nils Gillmann
7b150a24fe
gnu: libressl: Update to 2.3.3.
...
* gnu/packages/tls.scm (libressl): Update to 2.3.3.
Signed-off-by: Leo Famulari <leo@famulari.name>
2016-03-23 13:39:17 -04:00
Ludovic Courtès
4cff124bbf
gnu: openssl: Update to 1.0.2g.
...
* gnu/packages/tls.scm (openssl)[replacement]: Remove.
[version, source]: Bump to 1.0.2g. Use "openssl-c-rehash-in.patch"
instead of "openssl-c-rehash.patch".
(openssl-1.0.2g): Remove.
* gnu-system.am (dist_patch_DATA): Remove "openssl-c-rehash.patch".
2016-03-09 15:20:34 +01:00
Leo Famulari
eda0522aab
gnu: letsencrypt, python-acme: Update to 0.4.2.
...
These packages should be updated together.
* gnu/packages/tls.scm (letsencrypt): Update to 0.4.2.
(python-acme, python2-acme): Update to 0.4.2.
2016-03-04 18:10:00 -05:00
Mark H Weaver
ed742bc4b4
gnu: openssl: Enable ssl2 at build time to ensure ABI compatible graft.
...
Fixes <https://debbugs.gnu.org/22876 >
Reported by Christopher Allan Webber <cwebber@dustycloud.org>.
* gnu/packages/tls.scm (openssl-1.0.2g)[arguments]: Override the inherited
'configure' phase to add "enable-ssl2" as an argument to ./config.
2016-03-02 01:58:42 -05:00
Leo Famulari
599860d2b9
gnu: libressl: Update to 2.2.6.
...
* gnu/packages/tls.scm (libressl): Update to 2.2.6.
2016-03-01 16:30:13 -05:00
Ludovic Courtès
caeadfddb0
gnu: openssl: Replace with 1.0.2g [fixes CVE-2016-{0800,0705,0798,0797,0799,0702,0703,0704}].
...
See <http://openssl.org/news/secadv/20160301.txt >.
Also fixes <http://bugs.gnu.org/22831 >.
* gnu/packages/patches/openssl-c-rehash-in.patch: New file.
* gnu/packages/tls.scm (openssl)[replacement]: New field.
(openssl-1.0.2g): New variable.
2016-03-01 16:00:46 +01:00
Leo Famulari
50a7963aeb
gnu: python-acme: Generate and install documentation.
...
* gnu/packages/tls.scm (acme)[arguments]: Add 'docs' phase.
[native-inputs]: Add python-sphinx, python-sphinxcontrib-programoutput,
python-sphinx-rtd-theme, python-setuptools, texinfo.
2016-02-22 00:40:25 -05:00
Leo Famulari
f9263d9a90
gnu: letsencrypt: Generate and install documentation.
...
* gnu/packages/tls.scm (letsencrypt)[arguments]: Add 'docs' phase.
[native-inputs]: Add python2-sphinx, python2-sphinx-rtd-theme,
python2-sphinx-repoze-autointerface,
python2-sphinxcontrib-programoutput, texinfo.
2016-02-22 00:40:25 -05:00
Andy Wingo
5cc3096c73
Update all sources from freedesktop.org to use https
...
* gnu/packages/xorg.scm:
* gnu/packages/xdisorg.scm:
* gnu/packages/video.scm:
* gnu/packages/tls.scm:
* gnu/packages/python.scm:
* gnu/packages/pulseaudio.scm:
* gnu/packages/polkit.scm:
* gnu/packages/pdf.scm:
* gnu/packages/libcanberra.scm:
* gnu/packages/gtk.scm:
* gnu/packages/gstreamer.scm:
* gnu/packages/gnome.scm:
* gnu/packages/glib.scm:
* gnu/packages/ghostscript.scm:
* gnu/packages/freedesktop.scm:
* gnu/packages/fontutils.scm: Update all sources hosted on freedesktop
to fetch tarballs via https. freedesktop.org appears to have updated
recently to redirect all http to https. As an exception, we leave
pkg-config like it is, because pkg-config is needed to build gnutls,
and without gnutls we can't download https URLs.
2016-02-21 21:11:49 +01:00
Leo Famulari
42e92e069a
gnu: letsencrypt and python-acme: Update to 0.4.0.
...
These packages should be updated together.
* gnu/packages/tls.scm (letsencrypt): Update to 0.4.0.
(python-acme, python2-acme): Update to 0.4.0.
2016-02-17 22:43:08 -05:00
Leo Famulari
6cefd53d3e
gnu: Split acme into python-acme and python2-acme.
...
* gnu/packages/tls.scm (acme): Split variable into...
(python-acme, python2-acme): ...both Python variants.
(letsencrypt)[propagated-inputs]: Update user of renamed variable.
2016-02-12 18:50:32 -05:00
Leo Famulari
9bee9d87dc
gnu: acme: Disable egg compression.
...
* gnu/packages/python.scm (acme)[arguments]: Add
'disable-egg-compression' phase.
2016-02-08 23:45:06 -05:00
Leo Famulari
0c7320dc89
gnu: letsencrypt and acme: Update to 0.3.0.
...
These packages should be updated together.
* gnu/packages/tls.scm (letsencrypt): Update to 0.3.0.
(acme): Update to 0.3.0.
2016-02-08 23:04:07 -05:00
Mark H Weaver
19f339526f
gnu: openssl: Update to 1.0.2f [fixes CVE-2015-3197 and CVE-2016-0701].
...
* gnu/packages/tls.scm (openssl): Update to 1.0.2f.
[arguments]: Remove the 'fix-broken-symlinks' phase.
2016-02-04 00:15:21 -05:00
Mark H Weaver
80cc3a0a4a
gnu: openssl: When computing URI, use 'string-trim-right' not 'string-take'.
...
* gnu/packages/tls.scm (openssl)[source]: When computing URI, use
'string-trim-right' instead of 'string-take'.
2016-02-02 21:16:44 -05:00
Efraim Flashner
e81e5fa507
gnu: openssl: Add alternate url.
...
* gnu/packages/tls.scm (openssl)[source]: Add alternate url.
2016-02-02 23:23:24 +02:00
Mark H Weaver
593c366bde
Merge branch 'core-updates'
2016-01-28 07:29:13 -05:00
Andreas Enge
bb2120cd1d
gnu: libressl: Update to 2.2.5.
...
* gnu/packages/tls.scm (libressl): Update to 2.2.5.
2016-01-26 21:40:35 +01:00
Mark H Weaver
412bee5e29
Merge branch 'master' into core-updates
2016-01-24 21:04:54 -05:00
Leo Famulari
fe17fb4a2c
gnu: letsencrypt and acme: Update to 0.2.0.
...
These packages should be updated together.
* gnu/packages/tls.scm (letsencrypt): Update to 0.2.0.
(acme): Update to 0.2.0.
2016-01-23 17:39:08 -05:00
Efraim Flashner
5a75865f9d
gnu: gnutls: Update to 3.4.7.
...
* gnu/packages/tls.scm (gnutls): Update to 3.4.7.
[source]: Remove gnutls-doc-fix.patch.
[arguments]: Remove delete-prebuilt-unfixed-info-file phase.
[native-inputs]: Remove texinfo.
* gnu-system.am (dist_patch_DATA): Remove gnutls-doc-fix.patch
2016-01-05 21:06:59 +02:00
Efraim Flashner
3ea110b704
gnu: libtasn1: Update to 4.7.
...
* gnu/packages/tls.scm (libtan1): Update to 4.7.
[native-inputs]: Remove texinfo.
2016-01-05 21:06:59 +02:00
Leo Famulari
ef9006451f
gnu: letsencrypt and acme: Update to 0.1.1.
...
These packages should be updated together.
* gnu/packages/tls.scm (letsencrypt): Update to 0.1.1.
[source]: Use pypi-uri.
* gnu/packages/tls.scm (acme): Update to 0.1.1.
[source]: Use pypi-uri.
2015-12-21 14:35:58 -05:00
Mark H Weaver
86c8f1daf8
gnu: openssl: Update to 1.0.2e [fixes CVE-2015-{3193,3194,3195}].
...
* gnu/packages/tls.scm (openssl): Update to 1.0.2e.
[arguments]: Rename 'fix-man-dir' phase to 'patch-Makefile.org',
and patch SHELL in Makefile.org. Add 'fix-broken-symlinks' phase.
Return #t from 'patch-tests' phase.
2015-12-07 09:54:01 -05:00
David Thompson
9fd0838b28
gnu: Add letsencrypt.
...
* gnu/packages/tls.scm (letsencrypt): New variable.
2015-12-05 09:44:38 -05:00
Leo Famulari
7890e3baf3
gnu: Add acme.
...
* gnu/packages/tls.scm (acme): New variable.
2015-12-05 09:44:38 -05:00
宋文武
62bffcaa3b
Revert "gnu: libtasn1: Update to 4.6."
...
Causes a test of GnuTLS to fail:
<http://lists.gnu.org/archive/html/help-libtasn1/2015-09/msg00003.html >.
This reverts commit 866ee34f7e
.
2015-09-14 19:21:23 +08:00
宋文武
ab20c2cc33
gnu: gnutls: Update to 3.4.5.
...
* gnu/packages/tls.scm (gnutls): Update to 3.4.5.
2015-09-13 18:39:39 +08:00
宋文武
866ee34f7e
gnu: libtasn1: Update to 4.6.
...
* gnu/packages/tls.scm (libtasn1): Update to 4.6.
2015-09-12 15:02:22 +08:00
Ludovic Courtès
784d6e9115
gnu: openssl: Remove run-time dependency on Perl.
...
This shrinks the closure of OpenSSL from 154 MiB to 73 MiB.
* gnu/packages/patches/openssl-c-rehash.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/tls.scm (openssl)[source]: Use it.
[arguments]: Add 'remove-miscellany' phase.
* gnu/packages/certs.scm (nss-certs)[native-inputs]: Add PERL.
2015-09-09 19:01:48 +02:00
Ludovic Courtès
fe8199a80c
gnu: openssl: Allow shared objects to be stripped.
...
* gnu/packages/tls.scm (openssl)[arguments]: Add
'make-libraries-writable' phase.
2015-09-09 18:31:05 +02:00
Ludovic Courtès
4fb254a339
gnu: openssl: Install data and documentation to PREFIX/share.
...
* gnu/packages/tls.scm (openssl)[arguments]: Add 'fix-man-dir' phase.
Pass --openssldir=PREFIX/share/openssl-VERSION to ./config.
2015-09-09 18:17:38 +02:00
Ludovic Courtès
b6cb13583b
gnu: openssl: Use 'modify-phases'.
...
* gnu/packages/tls.scm (openssl)[arguments]: Use 'modify-phases'.
2015-09-09 15:31:23 +02:00
Mark H Weaver
9cdce047d0
gnu: gnutls: Update to 3.4.4.1.
...
* gnu/packages/patches/gnutls-doc-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/tls.scm (gnutls): Update to 3.4.4.1. Add patch.
[arguments]: Add 'delete-prebuilt-unfixed-info-file' phase.
In 'move-doc' phase, copy man pages to the correct directory.
[native-inputs]: Add 'texinfo'.
2015-08-21 12:02:20 -04:00
Mark H Weaver
eb26970a21
gnu: openssl: Add reference to upstream GCC bug in comment.
...
This is a followup to commit e12027179f
.
* gnu/packages/tls.scm (openssl)[arguments]: Add reference to upstream
GCC bug in comment.
2015-07-25 23:55:29 -04:00
Mark H Weaver
1b4e48d498
Merge branch 'master' into core-updates
2015-07-19 18:12:34 -04:00
Alex Kost
e881752c39
gnu packages: Clean up synopses and descriptions.
...
* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bittorrent.scm,
gnu/packages/code.scm, gnu/packages/compression.scm,
gnu/packages/databases.scm, gnu/packages/enchant.scm,
gnu/packages/firmware.scm, gnu/packages/fonts.scm,
gnu/packages/freedesktop.scm, gnu/packages/games.scm, gnu/packages/gd.scm,
gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gsasl.scm,
gnu/packages/gstreamer.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm,
gnu/packages/haskell.scm, gnu/packages/language.scm,
gnu/packages/lesstif.scm, gnu/packages/libreoffice.scm,
gnu/packages/linux.scm, gnu/packages/llvm.scm, gnu/packages/maths.scm,
gnu/packages/mcrypt.scm, gnu/packages/mit-krb5.scm, gnu/packages/mp3.scm,
gnu/packages/ncdu.scm, gnu/packages/networking.scm, gnu/packages/ntp.scm,
gnu/packages/ocaml.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl.scm, gnu/packages/pretty-print.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python.scm,
gnu/packages/rdesktop.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm,
gnu/packages/slang.scm, gnu/packages/slim.scm, gnu/packages/telephony.scm,
gnu/packages/tls.scm, gnu/packages/tmux.scm, gnu/packages/tre.scm,
gnu/packages/unrtf.scm, gnu/packages/version-control.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wget.scm,
gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xiph.scm:
Fix typos. Trim long lines. Add missing periods in the end of sentences.
Use double spaces between sentences. Remove trailing whitespaces.
2015-07-18 13:05:01 +03:00
Mark H Weaver
e12027179f
gnu: openssl: Work around GCC code generation bug on ARM with NEON.
...
* gnu/packages/tls.scm (openssl)[arguments]: When compiling natively for
armhf, pass -mfpu=vfpv3 to ./config.
2015-07-17 03:31:28 -04:00
Mark H Weaver
1084ec08c2
gnu: perl-net-ssleay: Avoid patching source in 'origin'.
...
* gnu/packages/tls.scm (perl-net-ssleay)[source]: Move patch to ...
[native-inputs]: ... here, and also add the 'patch' program.
[arguments]: Use 'modify-phases'. Add 'apply-patch' phase. Return
boolean result from 'set-ssl-prefix' phase.
2015-07-15 23:43:33 -04:00
Mark H Weaver
e52ecc74c9
gnu: openssl: Update to 1.0.2d.
...
* gnu/packages/tls.scm (openssl): Update to 1.0.2d.
2015-07-11 15:50:13 -04:00
Mark H Weaver
1f4335ae78
gnu: openssl: Update to 1.0.2d.
...
* gnu/packages/tls.scm (openssl): Update to 1.0.2d.
2015-07-10 12:36:52 -04:00
Andreas Enge
cb6a802c01
gnu: Add LibreSSL.
...
* gnu/packages/tls.scm (libressl): New variable.
2015-07-05 19:03:34 +02:00
Andreas Enge
e9aa8d0ccb
gnu: Fix ambiguity between openssl package and license in tls module.
...
* gnu/packages/tls.scm: Prefix imported licenses.
2015-07-05 19:03:34 +02:00
Andreas Enge
cc2b77dfc7
gnu: Move content of openssl module into tls module.
...
* gnu/packages/openssl.scm (openssl, perl-net-ssleay): Move to...
* gnu/packages/tls.scm: ...here.
* gnu/packages/openssl.scm: Delete file.
* gnu-system.am (GNU_SYSTEM_MODULES): Unregister deleted file.
* gnu/packages/{admin.scm, bittorrent.scm, certs.scm, ci.scm,
cyrus-sasl.scm, databases.scm, dns.scm, ebook.scm, enlightenment.scm,
gnunet.scm, libreoffice.scm, links.scm, mail.scm, messaging.scm,
networking.scm, ntp.scm, openldap.scm, package-management.scm, pdf.scm,
python.scm, qt.scm, rdesktop.scm, rdf.scm, ruby.scm, ssh.scm,
synergy.scm, tor.scm, version-control.scm, video.scm, vpn.scm,
w3m.scm, web.scm, weechat.scm, xiph.scm}: Adapt module import.
2015-07-05 18:27:24 +02:00