Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Wed, 12 Dec 2018 21:00:52 +0000 (22:00 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Wed, 12 Dec 2018 21:00:52 +0000 (22:00 +0100)
1  2 
doc/guix.texi
gnu/local.mk
gnu/packages/audio.scm
gnu/packages/emacs.scm
gnu/packages/gnuzilla.scm
gnu/packages/linux.scm
gnu/packages/maths.scm
gnu/packages/pdf.scm
gnu/packages/tls.scm
gnu/packages/video.scm

diff --cc doc/guix.texi
Simple merge
diff --cc gnu/local.mk
@@@ -606,8 -607,9 +607,7 @@@ dist_patch_DATA =                                          
    %D%/packages/patches/blast+-fix-makefile.patch              \
    %D%/packages/patches/blender-newer-ffmpeg.patch             \
    %D%/packages/patches/boost-fix-icu-build.patch              \
-   %D%/packages/patches/borg-respect-storage-quota.patch               \
    %D%/packages/patches/byobu-writable-status.patch            \
 -  %D%/packages/patches/cairo-CVE-2016-9082.patch                      \
 -  %D%/packages/patches/cairo-setjmp-wrapper.patch             \
    %D%/packages/patches/calibre-no-updates-dialog.patch                \
    %D%/packages/patches/calibre-use-packaged-feedparser.patch  \
    %D%/packages/patches/casync-renameat2-declaration.patch     \
    %D%/packages/patches/plink-endian-detection.patch           \
    %D%/packages/patches/plotutils-libpng-jmpbuf.patch          \
    %D%/packages/patches/podofo-cmake-3.12.patch                        \
 -  %D%/packages/patches/poppler-CVE-2018-19149.patch           \
+   %D%/packages/patches/polkit-CVE-2018-19788.patch            \
    %D%/packages/patches/portaudio-audacity-compat.patch                \
    %D%/packages/patches/portmidi-modular-build.patch           \
 +  %D%/packages/patches/postgresql-disable-resolve_symlinks.patch      \
    %D%/packages/patches/potrace-tests.patch                    \
    %D%/packages/patches/procmail-ambiguous-getline-debian.patch  \
    %D%/packages/patches/procmail-CVE-2014-3618.patch           \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge