├── .dir-locals.el ├── .gitignore ├── .mailmap ├── AUTHORS ├── CODE-OF-CONDUCT ├── COPYING ├── ChangeLog ├── HACKING ├── Makefile.am ├── NEWS ├── README ├── ROADMAP ├── THANKS ├── TODO ├── bootstrap ├── build-aux ├── build-self.scm ├── check-available-binaries.scm ├── check-final-inputs-self-contained.scm ├── download.scm ├── generate-authors.scm ├── gitlog-to-changelog ├── hydra │ ├── demo-os.scm │ ├── gnu-system.scm │ └── guix.scm └── make-binary-tarball.scm ├── config-daemon.ac ├── configure.ac ├── daemon.am ├── doc.am ├── doc ├── contributing.texi ├── emacs.texi ├── environment-gdb.scm ├── fdl-1.3.texi ├── guix.texi ├── images │ ├── bootstrap-graph.dot │ ├── coreutils-bag-graph.dot │ ├── coreutils-graph.dot │ ├── coreutils-size-map.png │ ├── dmd-graph.dot │ └── service-graph.dot └── package-hello.scm ├── emacs.am ├── emacs ├── guix-backend.el ├── guix-base.el ├── guix-build-log.el ├── guix-command.el ├── guix-config.el.in ├── guix-devel.el ├── guix-emacs.el ├── guix-external.el ├── guix-geiser.el ├── guix-guile.el ├── guix-help-vars.el ├── guix-helper.scm.in ├── guix-history.el ├── guix-info.el ├── guix-init.el ├── guix-list.el ├── guix-main.scm ├── guix-messages.el ├── guix-pcomplete.el ├── guix-popup.el ├── guix-prettify.el ├── guix-profiles.el ├── guix-read.el ├── guix-utils.el └── guix.el ├── etc ├── completion │ └── bash │ │ └── guix ├── guix-daemon.conf.in └── guix-daemon.service.in ├── gnu-system.am ├── gnu.scm ├── gnu ├── artwork.scm ├── build │ ├── activation.scm │ ├── file-systems.scm │ ├── install.scm │ ├── linux-boot.scm │ ├── linux-container.scm │ ├── linux-initrd.scm │ ├── linux-modules.scm │ └── vm.scm ├── packages.scm ├── packages │ ├── abduco.scm │ ├── abiword.scm │ ├── acct.scm │ ├── acl.scm │ ├── admin.scm │ ├── adns.scm │ ├── aidc.scm │ ├── algebra.scm │ ├── animation.scm │ ├── apl.scm │ ├── apr.scm │ ├── aria2.scm │ ├── asciidoc.scm │ ├── aspell.scm │ ├── attr.scm │ ├── audacity.scm │ ├── audio.scm │ ├── autogen.scm │ ├── autotools.scm │ ├── avahi.scm │ ├── avr.scm │ ├── backup.scm │ ├── base.scm │ ├── bash.scm │ ├── bdw-gc.scm │ ├── bioinformatics.scm │ ├── bison.scm │ ├── bittorrent.scm │ ├── boost.scm │ ├── bootstrap.scm │ ├── bootstrap │ │ ├── armhf-linux │ │ │ ├── bash │ │ │ ├── mkdir │ │ │ ├── tar │ │ │ └── xz │ │ ├── i686-linux │ │ │ ├── bash │ │ │ ├── mkdir │ │ │ ├── tar │ │ │ └── xz │ │ ├── mips64el-linux │ │ │ ├── bash │ │ │ ├── mkdir │ │ │ ├── tar │ │ │ └── xz │ │ └── x86_64-linux │ │ │ ├── bash │ │ │ ├── mkdir │ │ │ ├── tar │ │ │ └── xz │ ├── busybox.scm │ ├── calcurse.scm │ ├── calendar.scm │ ├── ccache.scm │ ├── cdrom.scm │ ├── certs.scm │ ├── check.scm │ ├── ci.scm │ ├── cmake.scm │ ├── code.scm │ ├── commencement.scm │ ├── compression.scm │ ├── conkeror.scm │ ├── conky.scm │ ├── cook.scm │ ├── cpio.scm │ ├── cppi.scm │ ├── cross-base.scm │ ├── crypto.scm │ ├── cryptsetup.scm │ ├── cups.scm │ ├── curl.scm │ ├── cursynth.scm │ ├── cyrus-sasl.scm │ ├── databases.scm │ ├── datamash.scm │ ├── datastructures.scm │ ├── dc.scm │ ├── debug.scm │ ├── dejagnu.scm │ ├── dico.scm │ ├── dictionaries.scm │ ├── disk.scm │ ├── djvu.scm │ ├── dns.scm │ ├── docbook.scm │ ├── doxygen.scm │ ├── dunst.scm │ ├── dvtm.scm │ ├── ebook.scm │ ├── ed.scm │ ├── elf.scm │ ├── emacs.scm │ ├── enchant.scm │ ├── engineering.scm │ ├── enlightenment.scm │ ├── fcitx.scm │ ├── feh.scm │ ├── figlet.scm │ ├── file.scm │ ├── finance.scm │ ├── firmware.scm │ ├── fish.scm │ ├── flashing-tools.scm │ ├── flex.scm │ ├── fltk.scm │ ├── fonts.scm │ ├── fontutils.scm │ ├── freedesktop.scm │ ├── freeipmi.scm │ ├── fribidi.scm │ ├── ftp.scm │ ├── fvwm.scm │ ├── game-development.scm │ ├── games.scm │ ├── gawk.scm │ ├── gcal.scm │ ├── gcc.scm │ ├── gd.scm │ ├── gdb.scm │ ├── geeqie.scm │ ├── gettext.scm │ ├── ghostscript.scm │ ├── gimp.scm │ ├── gkrellm.scm │ ├── gl.scm │ ├── glib.scm │ ├── gnome.scm │ ├── gnu-pw-mgr.scm │ ├── gnucash.scm │ ├── gnunet.scm │ ├── gnupg.scm │ ├── gnustep.scm │ ├── gnuzilla.scm │ ├── gperf.scm │ ├── gprolog.scm │ ├── gps.scm │ ├── graphics.scm │ ├── graphviz.scm │ ├── groff.scm │ ├── grub.scm │ ├── grue-hunter.scm │ ├── gsasl.scm │ ├── gstreamer.scm │ ├── gtk.scm │ ├── guile-wm.scm │ ├── guile.scm │ ├── gv.scm │ ├── gxmessage.scm │ ├── haskell.scm │ ├── hugs.scm │ ├── hurd.scm │ ├── ibus.scm │ ├── icu4c.scm │ ├── idutils.scm │ ├── image.scm │ ├── imagemagick.scm │ ├── indent.scm │ ├── inklingreader.scm │ ├── inkscape.scm │ ├── irssi.scm │ ├── iso-codes.scm │ ├── java.scm │ ├── jemalloc.scm │ ├── jrnl.scm │ ├── julia.scm │ ├── kde-frameworks.scm │ ├── kde.scm │ ├── key-mon.scm │ ├── kodi.scm │ ├── language.scm │ ├── ld-wrapper.in │ ├── less.scm │ ├── lesstif.scm │ ├── libcanberra.scm │ ├── libdaemon.scm │ ├── libedit.scm │ ├── libevent.scm │ ├── libffcall.scm │ ├── libffi.scm │ ├── libftdi.scm │ ├── libidn.scm │ ├── libphidget.scm │ ├── libreoffice.scm │ ├── libsigsegv.scm │ ├── libunistring.scm │ ├── libunwind.scm │ ├── libupnp.scm │ ├── libusb.scm │ ├── lightning.scm │ ├── links.scm │ ├── linux-libre-i686.conf │ ├── linux-libre-x86_64.conf │ ├── linux.scm │ ├── lirc.scm │ ├── lisp.scm │ ├── llvm.scm │ ├── lout.scm │ ├── lsh.scm │ ├── lsof.scm │ ├── lua.scm │ ├── lxde.scm │ ├── lxqt.scm │ ├── lynx.scm │ ├── m4.scm │ ├── machine-learning.scm │ ├── mail.scm │ ├── make-bootstrap.scm │ ├── man.scm │ ├── markdown.scm │ ├── maths.scm │ ├── mc.scm │ ├── mcrypt.scm │ ├── messaging.scm │ ├── mg.scm │ ├── miscfiles.scm │ ├── mit-krb5.scm │ ├── moe.scm │ ├── moreutils.scm │ ├── mp3.scm │ ├── mpd.scm │ ├── mpi.scm │ ├── mtools.scm │ ├── multiprecision.scm │ ├── music.scm │ ├── nano.scm │ ├── ncdu.scm │ ├── ncurses.scm │ ├── netpbm.scm │ ├── nettle.scm │ ├── networking.scm │ ├── ninja.scm │ ├── node.scm │ ├── noweb.scm │ ├── ntp.scm │ ├── nutrition.scm │ ├── nvi.scm │ ├── ocaml.scm │ ├── ocr.scm │ ├── onc-rpc.scm │ ├── openbox.scm │ ├── openldap.scm │ ├── openstack.scm │ ├── orpheus.scm │ ├── ots.scm │ ├── owncloud.scm │ ├── package-management.scm │ ├── parallel.scm │ ├── password-utils.scm │ ├── patches │ │ ├── abiword-explictly-cast-bools.patch │ │ ├── abiword-link-plugins-against-backend.patch │ │ ├── abiword-no-include-glib-internal-headers.patch │ │ ├── abiword-pass-no-undefined-to-linker.patch │ │ ├── abiword-use-proper-png-api.patch │ │ ├── abiword-wmf-version-lookup-fix.patch │ │ ├── acl-hurd-path-max.patch │ │ ├── aegis-constness-error.patch │ │ ├── aegis-perl-tempdir1.patch │ │ ├── aegis-perl-tempdir2.patch │ │ ├── aegis-test-fixup-1.patch │ │ ├── aegis-test-fixup-2.patch │ │ ├── agg-am_c_prototype.patch │ │ ├── alsa-lib-mips-atomic-fix.patch │ │ ├── apr-skip-getservbyname-test.patch │ │ ├── ath9k-htc-firmware-binutils.patch │ │ ├── ath9k-htc-firmware-gcc.patch │ │ ├── ath9k-htc-firmware-objcopy.patch │ │ ├── audacity-fix-ffmpeg-binding.patch │ │ ├── automake-skip-amhello-tests.patch │ │ ├── avahi-localstatedir.patch │ │ ├── avidemux-install-to-lib.patch │ │ ├── avrdude-fix-libusb.patch │ │ ├── bash-completion-directories.patch │ │ ├── bedtools-32bit-compilation.patch │ │ ├── bigloo-gc-shebangs.patch │ │ ├── binutils-ld-new-dtags.patch │ │ ├── binutils-loongson-workaround.patch │ │ ├── bitlbee-configure-doc-fix.patch │ │ ├── boost-mips-avoid-m32.patch │ │ ├── bowtie-fix-makefile.patch │ │ ├── byobu-writable-status.patch │ │ ├── calibre-drop-unrar.patch │ │ ├── calibre-no-updates-dialog.patch │ │ ├── cdparanoia-fpic.patch │ │ ├── chmlib-inttypes.patch │ │ ├── clang-libc-search-path.patch │ │ ├── clucene-contribs-lib.patch │ │ ├── clucene-pkgconfig.patch │ │ ├── cmake-fix-tests.patch │ │ ├── cpio-gets-undeclared.patch │ │ ├── cpufrequtils-fix-aclocal.patch │ │ ├── crda-optional-gcrypt.patch │ │ ├── crossmap-allow-system-pysam.patch │ │ ├── cssc-gets-undeclared.patch │ │ ├── cssc-missing-include.patch │ │ ├── cursynth-wave-rand.patch │ │ ├── dbus-helper-search-path.patch │ │ ├── dealii-p4est-interface.patch │ │ ├── devil-fix-libpng.patch │ │ ├── dfu-programmer-fix-libusb.patch │ │ ├── dico-libtool-deterministic.patch │ │ ├── diffutils-gets-undeclared.patch │ │ ├── doxygen-test.patch │ │ ├── doxygen-tmake.patch │ │ ├── duplicity-piped-password.patch │ │ ├── duplicity-test_selection-tmp.patch │ │ ├── elfutils-tests-ptrace.patch │ │ ├── emacs-exec-path.patch │ │ ├── eudev-rules-directory.patch │ │ ├── evilwm-lost-focus-bug.patch │ │ ├── expat-CVE-2015-1283.patch │ │ ├── fastcap-mulGlobal.patch │ │ ├── fastcap-mulSetup.patch │ │ ├── fasthenry-spAllocate.patch │ │ ├── fasthenry-spBuild.patch │ │ ├── fasthenry-spFactor.patch │ │ ├── fasthenry-spSolve.patch │ │ ├── fasthenry-spUtils.patch │ │ ├── findutils-absolute-paths.patch │ │ ├── findutils-localstatedir.patch │ │ ├── flashrom-use-libftdi1.patch │ │ ├── flex-bison-tests.patch │ │ ├── flint-ldconfig.patch │ │ ├── fltk-shared-lib-defines.patch │ │ ├── freeimage-CVE-2015-0852.patch │ │ ├── fuse-CVE-2015-3202.patch │ │ ├── gawk-shell.patch │ │ ├── gcc-5.0-libvtv-runpath.patch │ │ ├── gcc-arm-link-spec-fix.patch │ │ ├── gcc-cross-environment-variables.patch │ │ ├── gcc-libvtv-runpath.patch │ │ ├── geoclue-config.patch │ │ ├── ghostscript-CVE-2015-3228.patch │ │ ├── ghostscript-runpath.patch │ │ ├── gitolite-openssh-6.8-compat.patch │ │ ├── glib-networking-ssl-cert-file.patch │ │ ├── glib-tests-desktop.patch │ │ ├── glib-tests-gapplication.patch │ │ ├── glib-tests-homedir.patch │ │ ├── glib-tests-prlimit.patch │ │ ├── glib-tests-timer.patch │ │ ├── glibc-bootstrap-system.patch │ │ ├── glibc-hurd-extern-inline.patch │ │ ├── glibc-ldd-x86_64.patch │ │ ├── glibc-locale-incompatibility.patch │ │ ├── glibc-locales.patch │ │ ├── glibc-o-largefile.patch │ │ ├── glibc-versioned-locpath.patch │ │ ├── gmp-arm-asm-nothumb.patch │ │ ├── gmp-faulty-test.patch │ │ ├── gnucash-price-quotes-perl.patch │ │ ├── gnutls-doc-fix.patch │ │ ├── gobject-introspection-absolute-shlib-path.patch │ │ ├── gobject-introspection-cc.patch │ │ ├── gobject-introspection-girepository.patch │ │ ├── grep-CVE-2015-1345.patch │ │ ├── grub-CVE-2015-8370.patch │ │ ├── grub-freetype.patch │ │ ├── grub-gets-undeclared.patch │ │ ├── gtkglext-disable-disable-deprecated.patch │ │ ├── guile-1.8-cpp-4.5.patch │ │ ├── guile-arm-fixes.patch │ │ ├── guile-default-utf8.patch │ │ ├── guile-linux-syscalls.patch │ │ ├── guile-present-coding.patch │ │ ├── guile-relocatable.patch │ │ ├── guile-rsvg-pkgconfig.patch │ │ ├── hop-bigloo-4.0b.patch │ │ ├── hop-linker-flags.patch │ │ ├── hydra-automake-1.15.patch │ │ ├── hydra-disable-darcs-test.patch │ │ ├── icecat-avoid-bundled-includes.patch │ │ ├── icu4c-CVE-2014-6585.patch │ │ ├── icu4c-CVE-2015-1270.patch │ │ ├── icu4c-CVE-2015-4760.patch │ │ ├── imagemagick-test-segv.patch │ │ ├── irrlicht-mesa-10.patch │ │ ├── jasper-CVE-2008-3522.patch │ │ ├── jbig2dec-ignore-testtest.patch │ │ ├── julia-0.3.10-fix-empty-array.patch │ │ ├── kmod-module-directory.patch │ │ ├── lftp-dont-save-unknown-host-fingerprint.patch │ │ ├── liba52-enable-pic.patch │ │ ├── liba52-link-with-libm.patch │ │ ├── liba52-set-soname.patch │ │ ├── liba52-use-mtune-not-mcpu.patch │ │ ├── libarchive-CVE-2013-0211.patch │ │ ├── libarchive-fix-lzo-test-case.patch │ │ ├── libarchive-mtree-filename-length-fix.patch │ │ ├── libbonobo-activation-test-race.patch │ │ ├── libcanberra-sound-theme-freedesktop.patch │ │ ├── libdrm-symbol-check.patch │ │ ├── libevent-dns-tests.patch │ │ ├── liblxqt-include.patch │ │ ├── libmad-armv7-thumb-pt1.patch │ │ ├── libmad-armv7-thumb-pt2.patch │ │ ├── libmad-frame-length.patch │ │ ├── libmad-mips-newgcc.patch │ │ ├── libmtp-devices.patch │ │ ├── liboop-mips64-deplibs-fix.patch │ │ ├── libpthread-glibc-preparation.patch │ │ ├── librsvg-tests.patch │ │ ├── libsndfile-CVE-2014-9496.patch │ │ ├── libsndfile-CVE-2015-7805.patch │ │ ├── libssh-CVE-2014-0017.patch │ │ ├── libtheora-config-guess.patch │ │ ├── libtool-skip-tests2.patch │ │ ├── libunwind-CVE-2015-3239.patch │ │ ├── libwmf-CAN-2004-0941.patch │ │ ├── libwmf-CVE-2006-3376.patch │ │ ├── libwmf-CVE-2007-0455.patch │ │ ├── libwmf-CVE-2007-2756.patch │ │ ├── libwmf-CVE-2007-3472.patch │ │ ├── libwmf-CVE-2007-3473.patch │ │ ├── libwmf-CVE-2007-3477.patch │ │ ├── libwmf-CVE-2009-1364.patch │ │ ├── libwmf-CVE-2009-3546.patch │ │ ├── libwmf-CVE-2015-0848+CVE-2015-4588.patch │ │ ├── libwmf-CVE-2015-4695.patch │ │ ├── libwmf-CVE-2015-4696.patch │ │ ├── libxslt-CVE-2015-7995.patch │ │ ├── lirc-localstatedir.patch │ │ ├── lm-sensors-hwmon-attrs.patch │ │ ├── lua-pkgconfig.patch │ │ ├── lua51-liblua-so.patch │ │ ├── lua52-liblua-so.patch │ │ ├── luajit-no_ldconfig.patch │ │ ├── luajit-symlinks.patch │ │ ├── luit-posix.patch │ │ ├── m4-gets-undeclared.patch │ │ ├── make-impure-dirs.patch │ │ ├── mars-install.patch │ │ ├── mars-sfml-2.3.patch │ │ ├── matplotlib-setupext-tk.patch │ │ ├── maxima-defsystem-mkdir.patch │ │ ├── mc-fix-ncurses-build.patch │ │ ├── mcron-install.patch │ │ ├── mdadm-gcc-4.9-fix.patch │ │ ├── mhash-keygen-test-segfault.patch │ │ ├── mit-krb5-CVE-2015-2695-pt1.patch │ │ ├── mit-krb5-CVE-2015-2695-pt2.patch │ │ ├── mit-krb5-CVE-2015-2696.patch │ │ ├── mit-krb5-CVE-2015-2697.patch │ │ ├── mit-krb5-CVE-2015-2698-pt1.patch │ │ ├── mit-krb5-CVE-2015-2698-pt2.patch │ │ ├── module-init-tools-moduledir.patch │ │ ├── mpc123-initialize-ao.patch │ │ ├── mplayer2-theora-fix.patch │ │ ├── mumps-build-parallelism.patch │ │ ├── mupdf-buildsystem-fix.patch │ │ ├── mupen64plus-ui-console-notice.patch │ │ ├── mutt-store-references.patch │ │ ├── net-tools-bitrot.patch │ │ ├── ngircd-handle-zombies.patch │ │ ├── ngircd-no-dns-in-tests.patch │ │ ├── ninja-tests.patch │ │ ├── ninja-zero-mtime.patch │ │ ├── nss-pkgconfig.patch │ │ ├── nvi-assume-preserve-path.patch │ │ ├── nvi-db4.patch │ │ ├── nvi-dbpagesize-binpower.patch │ │ ├── openexr-missing-samples.patch │ │ ├── openjpeg-CVE-2015-6581.patch │ │ ├── openjpeg-use-after-free-fix.patch │ │ ├── openssl-c-rehash.patch │ │ ├── openssl-runpath.patch │ │ ├── orpheus-cast-errors-and-includes.patch │ │ ├── ots-no-include-missing-file.patch │ │ ├── patch-hurd-path-max.patch │ │ ├── patchelf-page-size.patch │ │ ├── patchelf-rework-for-arm.patch │ │ ├── patchutils-xfail-gendiff-tests.patch │ │ ├── perl-autosplit-default-time.patch │ │ ├── perl-finance-quote-unuse-mozilla-ca.patch │ │ ├── perl-gd-options-passthrough-and-fontconfig.patch │ │ ├── perl-module-pluggable-search.patch │ │ ├── perl-net-amazon-s3-moose-warning.patch │ │ ├── perl-net-ssleay-disable-ede-test.patch │ │ ├── perl-no-sys-dirs.patch │ │ ├── perl-tk-x11-discover.patch │ │ ├── pidgin-add-search-path.patch │ │ ├── pingus-sdl-libs-config.patch │ │ ├── plink-1.07-unclobber-i.patch │ │ ├── plotutils-libpng-jmpbuf.patch │ │ ├── polkit-drop-test.patch │ │ ├── portaudio-audacity-compat.patch │ │ ├── procps-make-3.82.patch │ │ ├── pt-scotch-build-parallelism.patch │ │ ├── pulseaudio-fix-mult-test.patch │ │ ├── pulseaudio-longer-test-timeout.patch │ │ ├── pybugz-encode-error.patch │ │ ├── pybugz-stty.patch │ │ ├── pycairo-wscript.patch │ │ ├── pyqt-configure.patch │ │ ├── python-2-deterministic-build-info.patch │ │ ├── python-2.7-search-paths.patch │ │ ├── python-2.7-source-date-epoch.patch │ │ ├── python-3-deterministic-build-info.patch │ │ ├── python-3-search-paths.patch │ │ ├── python-configobj-setuptools.patch │ │ ├── python-disable-ssl-test.patch │ │ ├── python-fix-tests.patch │ │ ├── python-ipython-inputhook-ctype.patch │ │ ├── python2-pygobject-2-gi-info-type-error-domain.patch │ │ ├── python2-rdflib-drop-sparqlwrapper.patch │ │ ├── qemu-CVE-2015-6855.patch │ │ ├── qt4-ldflags.patch │ │ ├── ratpoison-shell.patch │ │ ├── readline-link-ncurses.patch │ │ ├── ripperx-missing-file.patch │ │ ├── rsem-makefile.patch │ │ ├── scheme48-tests.patch │ │ ├── scotch-test-threading.patch │ │ ├── scribus-qobject.patch │ │ ├── sdl-libx11-1.6.patch │ │ ├── sed-hurd-path-max.patch │ │ ├── serf-comment-style-fix.patch │ │ ├── serf-deflate-buckets-test-fix.patch │ │ ├── slim-config.patch │ │ ├── slim-session.patch │ │ ├── slim-sigusr1.patch │ │ ├── soprano-find-clucene.patch │ │ ├── superlu-dist-scotchmetis.patch │ │ ├── synfig-build-fix.patch │ │ ├── tar-d_ino_in_dirent-fix.patch │ │ ├── tar-skip-unreliable-tests.patch │ │ ├── tcl-mkindex-deterministic.patch │ │ ├── tcsh-fix-autotest.patch │ │ ├── texi2html-document-encoding.patch │ │ ├── texi2html-i18n.patch │ │ ├── tidy-CVE-2015-5522+5523.patch │ │ ├── tinyxml-use-stl.patch │ │ ├── tk-find-library.patch │ │ ├── torsocks-dns-test.patch │ │ ├── tvtime-gcc41.patch │ │ ├── tvtime-pngoutput.patch │ │ ├── tvtime-videodev2.patch │ │ ├── tvtime-xmltv.patch │ │ ├── unzip-CVE-2014-8139.patch │ │ ├── unzip-CVE-2014-8140.patch │ │ ├── unzip-CVE-2014-8141.patch │ │ ├── unzip-CVE-2014-9636.patch │ │ ├── unzip-CVE-2015-7696.patch │ │ ├── unzip-CVE-2015-7697.patch │ │ ├── unzip-allow-greater-hostver-values.patch │ │ ├── unzip-attribs-overflow.patch │ │ ├── unzip-format-secure.patch │ │ ├── unzip-initialize-symlink-flag.patch │ │ ├── unzip-overflow-long-fsize.patch │ │ ├── unzip-overflow-on-invalid-input.patch │ │ ├── unzip-remove-build-date.patch │ │ ├── upower-builddir.patch │ │ ├── util-linux-tests.patch │ │ ├── valgrind-enable-arm.patch │ │ ├── vpnc-script.patch │ │ ├── vtk-mesa-10.patch │ │ ├── w3m-fix-compile.patch │ │ ├── webkitgtk-2.4-sql-init-string.patch │ │ ├── weechat-python.patch │ │ ├── weex-vacopy.patch │ │ ├── wicd-bitrate-none-fix.patch │ │ ├── wicd-get-selected-profile-fix.patch │ │ ├── wicd-template-instantiation.patch │ │ ├── wicd-urwid-1.3.patch │ │ ├── wmctrl-64-fix.patch │ │ ├── wpa-supplicant-CVE-2015-5310.patch │ │ ├── wpa-supplicant-CVE-2015-5314.patch │ │ ├── wpa-supplicant-CVE-2015-5315.patch │ │ ├── wpa-supplicant-CVE-2015-5316.patch │ │ ├── xf86-video-ark-remove-mibstore.patch │ │ ├── xf86-video-ast-remove-mibstore.patch │ │ ├── xf86-video-geode-glibc-2.20.patch │ │ ├── xf86-video-glint-remove-mibstore.patch │ │ ├── xf86-video-i128-remove-mibstore.patch │ │ ├── xf86-video-intel-compat-api.patch │ │ ├── xf86-video-intel-glibc-2.20.patch │ │ ├── xf86-video-mach64-glibc-2.20.patch │ │ ├── xf86-video-mga-glibc-2.20.patch │ │ ├── xf86-video-nv-remove-mibstore.patch │ │ ├── xf86-video-openchrome-glibc-2.20.patch │ │ ├── xf86-video-r128-glibc-2.20.patch │ │ ├── xf86-video-siliconmotion-remove-mibstore.patch │ │ ├── xf86-video-sis-fix-exa-crash.patch │ │ ├── xf86-video-sis-update-api.patch │ │ ├── xf86-video-tdfx-remove-mibstore.patch │ │ ├── xf86-video-tga-remove-mibstore.patch │ │ ├── xf86-video-trident-remove-mibstore.patch │ │ ├── xf86-video-vmware-glibc-2.20.patch │ │ ├── xfce4-panel-plugins.patch │ │ ├── xfce4-session-fix-xflock4.patch │ │ ├── xfce4-settings-defaults.patch │ │ ├── xmodmap-asprintf.patch │ │ └── zathura-plugindir-environment-variable.patch │ ├── patchutils.scm │ ├── pciutils.scm │ ├── pcre.scm │ ├── pdf.scm │ ├── pem.scm │ ├── perl.scm │ ├── photo.scm │ ├── pkg-config.scm │ ├── plotutils.scm │ ├── polkit.scm │ ├── popt.scm │ ├── pretty-print.scm │ ├── protobuf.scm │ ├── pth.scm │ ├── pulseaudio.scm │ ├── pumpio.scm │ ├── pv.scm │ ├── python.scm │ ├── qemu.scm │ ├── qt.scm │ ├── ragel.scm │ ├── ratpoison.scm │ ├── rc.scm │ ├── rdesktop.scm │ ├── rdf.scm │ ├── readline.scm │ ├── rrdtool.scm │ ├── rsync.scm │ ├── ruby.scm │ ├── rush.scm │ ├── samba.scm │ ├── sawfish.scm │ ├── scanner.scm │ ├── scheme.scm │ ├── screen.scm │ ├── scribus.scm │ ├── sdl.scm │ ├── search.scm │ ├── serialization.scm │ ├── serveez.scm │ ├── shishi.scm │ ├── skarnet.scm │ ├── skribilo.scm │ ├── slang.scm │ ├── slim.scm │ ├── smalltalk.scm │ ├── ssh.scm │ ├── stalonetray.scm │ ├── statistics.scm │ ├── suckless.scm │ ├── swig.scm │ ├── sxiv.scm │ ├── synergy.scm │ ├── task-management.scm │ ├── tbb.scm │ ├── tcl.scm │ ├── tcsh.scm │ ├── telephony.scm │ ├── terminals.scm │ ├── texinfo.scm │ ├── texlive.scm │ ├── textutils.scm │ ├── time.scm │ ├── tls.scm │ ├── tmux.scm │ ├── tor.scm │ ├── tre.scm │ ├── tv.scm │ ├── unrtf.scm │ ├── upnp.scm │ ├── uucp.scm │ ├── valgrind.scm │ ├── version-control.scm │ ├── video.scm │ ├── vim.scm │ ├── vpn.scm │ ├── vtk.scm │ ├── w3m.scm │ ├── wdiff.scm │ ├── web.scm │ ├── webkit.scm │ ├── weechat.scm │ ├── wget.scm │ ├── wicd.scm │ ├── wine.scm │ ├── wm.scm │ ├── wordnet.scm │ ├── wv.scm │ ├── wxwidgets.scm │ ├── xdisorg.scm │ ├── xfce.scm │ ├── xfig.scm │ ├── xiph.scm │ ├── xml.scm │ ├── xnee.scm │ ├── xorg.scm │ ├── yasm.scm │ ├── yubico.scm │ ├── zile.scm │ ├── zip.scm │ └── zsh.scm ├── services.scm ├── services │ ├── avahi.scm │ ├── base.scm │ ├── databases.scm │ ├── dbus.scm │ ├── desktop.scm │ ├── dmd.scm │ ├── lirc.scm │ ├── mail.scm │ ├── networking.scm │ ├── ssh.scm │ ├── web.scm │ └── xorg.scm ├── system.scm └── system │ ├── examples │ ├── bare-bones.tmpl │ └── desktop.tmpl │ ├── file-systems.scm │ ├── grub.scm │ ├── install.scm │ ├── linux-container.scm │ ├── linux-initrd.scm │ ├── locale.scm │ ├── nss.scm │ ├── pam.scm │ ├── shadow.scm │ └── vm.scm ├── guix.scm ├── guix ├── base32.scm ├── base64.scm ├── build-system.scm ├── build-system │ ├── cmake.scm │ ├── emacs.scm │ ├── glib-or-gtk.scm │ ├── gnu.scm │ ├── haskell.scm │ ├── perl.scm │ ├── python.scm │ ├── r.scm │ ├── ruby.scm │ ├── trivial.scm │ └── waf.scm ├── build │ ├── cmake-build-system.scm │ ├── cvs.scm │ ├── download.scm │ ├── emacs-build-system.scm │ ├── emacs-utils.scm │ ├── git.scm │ ├── glib-or-gtk-build-system.scm │ ├── gnu-build-system.scm │ ├── gnu-dist.scm │ ├── graft.scm │ ├── gremlin.scm │ ├── haskell-build-system.scm │ ├── perl-build-system.scm │ ├── profiles.scm │ ├── pull.scm │ ├── python-build-system.scm │ ├── r-build-system.scm │ ├── rpath.scm │ ├── ruby-build-system.scm │ ├── store-copy.scm │ ├── svn.scm │ ├── syscalls.scm │ ├── union.scm │ ├── utils.scm │ └── waf-build-system.scm ├── config.scm.in ├── cpio.scm ├── cve.scm ├── cvs-download.scm ├── derivations.scm ├── download.scm ├── elf.scm ├── ftp-client.scm ├── gcrypt.scm ├── gexp.scm ├── git-download.scm ├── gnu-maintenance.scm ├── gnupg.scm ├── graph.scm ├── hash.scm ├── http-client.scm ├── import │ ├── cabal.scm │ ├── cpan.scm │ ├── cran.scm │ ├── elpa.scm │ ├── gem.scm │ ├── gnu.scm │ ├── hackage.scm │ ├── json.scm │ ├── pypi.scm │ ├── snix.scm │ └── utils.scm ├── licenses.scm ├── monad-repl.scm ├── monads.scm ├── nar.scm ├── packages.scm ├── pk-crypto.scm ├── pki.scm ├── profiles.scm ├── records.scm ├── scripts.scm ├── scripts │ ├── archive.scm │ ├── authenticate.scm │ ├── build.scm │ ├── challenge.scm │ ├── container.scm │ ├── container │ │ └── exec.scm │ ├── download.scm │ ├── edit.scm │ ├── environment.scm │ ├── gc.scm │ ├── graph.scm │ ├── hash.scm │ ├── import.scm │ ├── import │ │ ├── cpan.scm │ │ ├── cran.scm │ │ ├── elpa.scm │ │ ├── gem.scm │ │ ├── gnu.scm │ │ ├── hackage.scm │ │ ├── nix.scm │ │ └── pypi.scm │ ├── lint.scm │ ├── offload.scm │ ├── package.scm │ ├── publish.scm │ ├── pull.scm │ ├── refresh.scm │ ├── size.scm │ ├── substitute.scm │ └── system.scm ├── search-paths.scm ├── serialization.scm ├── sets.scm ├── store.scm ├── svn-download.scm ├── tests.scm ├── ui.scm ├── upstream.scm └── utils.scm ├── hydra.gnu.org.pub ├── m4 └── guix.m4 ├── nix ├── .gitignore ├── AUTHORS ├── COPYING ├── boost │ ├── .gitignore │ ├── assert.hpp │ ├── format.hpp │ ├── format │ │ ├── exceptions.hpp │ │ ├── feed_args.hpp │ │ ├── format_class.hpp │ │ ├── format_fwd.hpp │ │ ├── format_implementation.cc │ │ ├── free_funcs.cc │ │ ├── group.hpp │ │ ├── internals.hpp │ │ ├── internals_fwd.hpp │ │ ├── macros_default.hpp │ │ └── parsing.cc │ └── throw_exception.hpp ├── guix-register │ └── guix-register.cc ├── libstore │ ├── .gitignore │ ├── build.cc │ ├── derivations.cc │ ├── derivations.hh │ ├── gc.cc │ ├── globals.cc │ ├── globals.hh │ ├── local-store.cc │ ├── local-store.hh │ ├── misc.cc │ ├── misc.hh │ ├── optimise-store.cc │ ├── pathlocks.cc │ ├── pathlocks.hh │ ├── references.cc │ ├── references.hh │ ├── remote-store.cc │ ├── remote-store.hh │ ├── schema.sql │ ├── store-api.cc │ ├── store-api.hh │ └── worker-protocol.hh ├── libutil │ ├── .gitignore │ ├── affinity.cc │ ├── affinity.hh │ ├── archive.cc │ ├── archive.hh │ ├── gcrypt-hash.cc │ ├── gcrypt-hash.hh │ ├── hash.cc │ ├── hash.hh │ ├── md5.h │ ├── serialise.cc │ ├── serialise.hh │ ├── sha1.h │ ├── sha256.h │ ├── sha512.h │ ├── types.hh │ ├── util.cc │ ├── util.hh │ ├── xml-writer.cc │ └── xml-writer.hh ├── nix-daemon │ ├── guix-daemon.cc │ ├── nix-daemon.cc │ └── shared.hh └── scripts │ ├── guix-authenticate.in │ ├── list-runtime-roots.in │ ├── offload.in │ └── substitute.in ├── po ├── guix │ ├── LINGUAS │ ├── Makevars │ ├── POTFILES.in │ ├── cs.po │ ├── da.po │ ├── de.po │ ├── eo.po │ ├── fr.po │ ├── hu.po │ ├── pl.po │ ├── pt_BR.po │ ├── sr.po │ └── vi.po └── packages │ ├── LINGUAS │ ├── Makevars │ ├── POTFILES.in │ ├── da.po │ ├── de.po │ ├── eo.po │ ├── fr.po │ ├── hu.po │ ├── pl.po │ ├── pt_BR.po │ ├── sr.po │ └── vi.po ├── pre-inst-env.in ├── release.nix ├── scripts └── guix.in ├── srfi ├── srfi-37.scm.in ├── srfi-64.scm └── srfi-64.upstream.scm ├── test-env.in └── tests ├── base32.scm ├── base64.scm ├── build-utils.scm ├── builders.scm ├── challenge.scm ├── containers.scm ├── cpan.scm ├── cpio.scm ├── cran.scm ├── cve-sample.xml ├── cve.scm ├── derivations.scm ├── elpa.scm ├── file-systems.scm ├── gem.scm ├── gexp.scm ├── gnu-maintenance.scm ├── graph.scm ├── gremlin.scm ├── guix-archive.sh ├── guix-authenticate.sh ├── guix-build.sh ├── guix-daemon.sh ├── guix-download.sh ├── guix-environment-container.sh ├── guix-environment.sh ├── guix-gc.sh ├── guix-graph.sh ├── guix-hash.sh ├── guix-lint.sh ├── guix-package-net.sh ├── guix-package.sh ├── guix-register.sh ├── guix-system.sh ├── hackage.scm ├── hash.scm ├── lint.scm ├── monads.scm ├── nar.scm ├── packages.scm ├── pk-crypto.scm ├── pki.scm ├── profiles.scm ├── publish.scm ├── pypi.scm ├── records.scm ├── scripts.scm ├── services.scm ├── sets.scm ├── signing-key.pub ├── signing-key.sec ├── size.scm ├── snix.scm ├── store.scm ├── substitute.scm ├── syscalls.scm ├── test.drv ├── ui.scm ├── union.scm └── utils.scm /AUTHORS: -------------------------------------------------------------------------------- 1 | GNU Guix consists of Scheme code that implements the deployment model 2 | of the Nix package management tool. In fact, it currently talks to a 3 | build daemon whose code comes from Nix (see the manual for details.) 4 | 5 | Nix was initially written by Eelco Dolstra; other people have been 6 | contributing to it. See `nix/AUTHORS' for details. 7 | 8 | The list of GNU Guix contributors is now generated from the output of 9 | 'git log' and written to this file, as can be seen in release tarballs. 10 | -------------------------------------------------------------------------------- /ChangeLog: -------------------------------------------------------------------------------- 1 | Normally a ChangeLog is generated at "make dist" time and available in 2 | source tarballs. 3 | 4 | If not, see the Git commit log at . 5 | -------------------------------------------------------------------------------- /bootstrap: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | # Create the build system. 3 | 4 | set -e -x 5 | exec autoreconf -vfi 6 | -------------------------------------------------------------------------------- /doc/environment-gdb.scm: -------------------------------------------------------------------------------- 1 | (use-modules (guix) 2 | (gnu packages gdb) 3 | (gnu packages autotools) 4 | (gnu packages texinfo)) 5 | 6 | ;; Augment the package definition of GDB with the build tools 7 | ;; needed when developing GDB (and which are not needed when 8 | ;; simply installing it.) 9 | (package (inherit gdb) 10 | (native-inputs `(("autoconf" ,autoconf-2.64) 11 | ("automake" ,automake) 12 | ("texinfo" ,texinfo) 13 | ,@(package-native-inputs gdb)))) 14 | -------------------------------------------------------------------------------- /doc/images/coreutils-size-map.png: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/doc/images/coreutils-size-map.png -------------------------------------------------------------------------------- /doc/images/service-graph.dot: -------------------------------------------------------------------------------- 1 | digraph "Service Type Dependencies" { 2 | dmd [shape = box, fontname = Helvetica]; 3 | pam [shape = box, fontname = Helvetica]; 4 | etc [shape = box, fontname = Helvetica]; 5 | profile [shape = box, fontname = Helvetica]; 6 | accounts [shape = box, fontname = Helvetica]; 7 | activation [shape = box, fontname = Helvetica]; 8 | boot [shape = box, fontname = Helvetica]; 9 | system [shape = house, fontname = Helvetica]; 10 | lshd -> dmd; 11 | lshd -> pam; 12 | udev -> dmd; 13 | nscd -> dmd [label = "extends"]; 14 | "nss-mdns" -> nscd; 15 | "kvm-rules" -> udev; 16 | colord -> udev; 17 | dbus -> dmd; 18 | colord -> dbus; 19 | upower -> udev; 20 | upower -> dbus; 21 | polkit -> dbus; 22 | polkit -> pam; 23 | elogind -> dbus; 24 | elogind -> udev; 25 | elogind -> polkit [label = "extends"]; 26 | dmd -> boot; 27 | colord -> accounts; 28 | accounts -> activation; 29 | accounts -> etc; 30 | etc -> activation; 31 | activation -> boot; 32 | pam -> etc; 33 | elogind -> pam; 34 | guix -> dmd; 35 | guix -> activation; 36 | guix -> accounts; 37 | boot -> system; 38 | etc -> system; 39 | profile -> system; 40 | } 41 | -------------------------------------------------------------------------------- /doc/package-hello.scm: -------------------------------------------------------------------------------- 1 | (use-modules (guix) 2 | (guix build-system gnu) 3 | (guix licenses)) 4 | 5 | (package 6 | (name "hello") 7 | (version "2.10") 8 | (source (origin 9 | (method url-fetch) 10 | (uri (string-append "mirror://gnu/hello/hello-" version 11 | ".tar.gz")) 12 | (sha256 13 | (base32 14 | "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) 15 | (build-system gnu-build-system) 16 | (synopsis "Hello, GNU world: An example GNU package") 17 | (description "Guess what GNU Hello prints!") 18 | (home-page "http://www.gnu.org/software/hello/") 19 | (license gpl3+)) 20 | -------------------------------------------------------------------------------- /emacs/guix-init.el: -------------------------------------------------------------------------------- 1 | (require 'guix-autoloads) 2 | (require 'guix-emacs) 3 | 4 | (defcustom guix-package-enable-at-startup t 5 | "If non-nil, activate Emacs packages installed in a user profile. 6 | Set this variable to nil before requiring `guix-init' file to 7 | avoid loading autoloads of Emacs packages installed in 8 | `guix-user-profile'." 9 | :type 'boolean 10 | :group 'guix) 11 | 12 | (add-to-list 'load-path (guix-emacs-directory)) 13 | 14 | (when guix-package-enable-at-startup 15 | (guix-emacs-load-autoloads)) 16 | 17 | (add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe) 18 | (add-hook 'shell-mode-hook 'guix-build-log-minor-mode-activate-maybe) 19 | 20 | (provide 'guix-init) 21 | -------------------------------------------------------------------------------- /etc/guix-daemon.conf.in: -------------------------------------------------------------------------------- 1 | # This is a "job" for the Upstart init system to launch 'guix-daemon'. 2 | # Drop it in /etc/init to have 'guix-daemon' automatically started. 3 | 4 | description "Build daemon for GNU Guix" 5 | 6 | start on runlevel [2345] 7 | 8 | stop on runlevel [016] 9 | 10 | task 11 | 12 | exec @bindir@/guix-daemon --build-users-group=guixbuild 13 | -------------------------------------------------------------------------------- /etc/guix-daemon.service.in: -------------------------------------------------------------------------------- 1 | # This is a "service unit file" for the systemd init system to launch 2 | # 'guix-daemon'. Drop it in /etc/systemd/system or similar to have 3 | # 'guix-daemon' automatically started. 4 | 5 | [Unit] 6 | Description=Build daemon for GNU Guix 7 | 8 | [Service] 9 | ExecStart=@bindir@/guix-daemon --build-users-group=guixbuild 10 | RemainAfterExit=yes 11 | StandardOutput=syslog 12 | StandardError=syslog 13 | 14 | [Install] 15 | WantedBy=multi-user.target 16 | -------------------------------------------------------------------------------- /gnu/packages/bootstrap/armhf-linux/bash: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/armhf-linux/bash -------------------------------------------------------------------------------- /gnu/packages/bootstrap/armhf-linux/mkdir: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/armhf-linux/mkdir -------------------------------------------------------------------------------- /gnu/packages/bootstrap/armhf-linux/tar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/armhf-linux/tar -------------------------------------------------------------------------------- /gnu/packages/bootstrap/armhf-linux/xz: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/armhf-linux/xz -------------------------------------------------------------------------------- /gnu/packages/bootstrap/i686-linux/bash: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/i686-linux/bash -------------------------------------------------------------------------------- /gnu/packages/bootstrap/i686-linux/mkdir: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/i686-linux/mkdir -------------------------------------------------------------------------------- /gnu/packages/bootstrap/i686-linux/tar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/i686-linux/tar -------------------------------------------------------------------------------- /gnu/packages/bootstrap/i686-linux/xz: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/i686-linux/xz -------------------------------------------------------------------------------- /gnu/packages/bootstrap/mips64el-linux/bash: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/mips64el-linux/bash -------------------------------------------------------------------------------- /gnu/packages/bootstrap/mips64el-linux/mkdir: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/mips64el-linux/mkdir -------------------------------------------------------------------------------- /gnu/packages/bootstrap/mips64el-linux/tar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/mips64el-linux/tar -------------------------------------------------------------------------------- /gnu/packages/bootstrap/mips64el-linux/xz: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/mips64el-linux/xz -------------------------------------------------------------------------------- /gnu/packages/bootstrap/x86_64-linux/bash: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/x86_64-linux/bash -------------------------------------------------------------------------------- /gnu/packages/bootstrap/x86_64-linux/mkdir: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/x86_64-linux/mkdir -------------------------------------------------------------------------------- /gnu/packages/bootstrap/x86_64-linux/tar: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/x86_64-linux/tar -------------------------------------------------------------------------------- /gnu/packages/bootstrap/x86_64-linux/xz: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/gnu/packages/bootstrap/x86_64-linux/xz -------------------------------------------------------------------------------- /gnu/packages/patches/abiword-no-include-glib-internal-headers.patch: -------------------------------------------------------------------------------- 1 | Include glib.h instead of an internal header. 2 | 3 | --- a/goffice-bits/goffice/app/goffice-app.h 2007-01-17 00:17:27.000000000 +0100 4 | +++ b/goffice-bits/goffice/app/goffice-app.h 2014-09-05 19:02:59.402064713 +0200 5 | @@ -22,7 +22,7 @@ 6 | #ifndef GOFFICE_APP_H 7 | #define GOFFICE_APP_H 8 | 9 | -#include 10 | +#include 11 | 12 | G_BEGIN_DECLS 13 | 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/abiword-wmf-version-lookup-fix.patch: -------------------------------------------------------------------------------- 1 | The way the configure script determines the version of libwmf is by temporarily 2 | making dots separator characters, but since the file name of the program which 3 | returns the version contains dots in Guix (the version in the store entry name), 4 | doing it this way will always fail. 5 | 6 | This is a simple guix-specific fix for the problem. 7 | 8 | --- a/configure 2010-06-13 23:17:37.000000000 +0200 9 | +++ b/configure 2014-09-08 17:31:52.102371800 +0200 10 | @@ -21140,13 +21140,11 @@ 11 | $as_echo "$as_me: WARNING: wmf plugin: program libwmf-config not found in path" >&2;} 12 | fi 13 | else 14 | - IFS_old="$IFS" 15 | - IFS='.' 16 | - set -- `$libwmfconfig --version` 17 | - libwmf_major_found="${1}" 18 | - libwmf_minor_found="${2}" 19 | - libwmf_micro_found="${3}" 20 | - IFS="$IFS_old" 21 | + libwmf_fullver_found=`$libwmfconfig --version` 22 | + libwmf_major_found=$(echo $libwmf_fullver_found | cut -d . -f 1) 23 | + libwmf_minor_found=$(echo $libwmf_fullver_found | cut -d . -f 2) 24 | + libwmf_micro_found=$(echo $libwmf_fullver_found | cut -d . -f 3) 25 | + 26 | if test "$libwmf_major_found" -gt "$libwmf_major_req"; then 27 | wmf_deps="yes" 28 | elif test "$libwmf_major_found" -eq "$libwmf_major_req" && 29 | -------------------------------------------------------------------------------- /gnu/packages/patches/aegis-constness-error.patch: -------------------------------------------------------------------------------- 1 | Fixes a fatal constness error with g++ 4.8.2. 2 | --- aegis-4.24/common/ac/string/memmem.cc 2008-03-14 07:19:27.000000000 +0100 3 | +++ aegis-4.24/common/ac/string/memmem.cc 2014-01-26 11:17:58.000000000 +0100 4 | @@ -182,7 +182,7 @@ 5 | 6 | // Use optimizations in memchr when possible. 7 | if (needle_len == 1) 8 | - return memchr(haystack, *needle, haystack_len); 9 | + return (void *) memchr(haystack, *needle, haystack_len); 10 | 11 | // Minimizing the worst-case complexity: 12 | // Let n = haystack_len, m = needle_len. 13 | -------------------------------------------------------------------------------- /gnu/packages/patches/aegis-perl-tempdir1.patch: -------------------------------------------------------------------------------- 1 | This patch removes the hard coded temporary directory (which might not exist on the system) 2 | and replaces it using the Perl preferred method. 3 | --- aegis-4.24/script/aebisect.in 2008-03-14 07:19:27.000000000 +0100 4 | +++ aegis-4.24/script/aebisect.in 2014-01-26 11:03:31.000000000 +0100 5 | @@ -34,7 +34,8 @@ 6 | # @configure_input@ 7 | # 8 | # Configure additions? 9 | -my $TmpDir = "/var/tmp"; 10 | +use File::Temp qw/ tempdir /; 11 | +my $TmpDir = tempdir(); 12 | my $ProgramName = "aebisect"; 13 | 14 | require 5.004; 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/aegis-perl-tempdir2.patch: -------------------------------------------------------------------------------- 1 | --- aegis-4.24/script/aeintegratq.in 2008-03-14 07:19:27.000000000 +0100 2 | +++ aegis-4.24/script/aeintegratq.in 2014-01-26 16:08:22.000000000 +0100 3 | @@ -49,13 +49,14 @@ 4 | # 5 | # @configure_input@ 6 | # 7 | +use File::Temp qw/ tempdir /; 8 | # Grab useful locations from configure 9 | $BinDir = "@bindir@"; 10 | # configure does not expand @comdir@ directly so use sharedstatedir 11 | $ComDir = "@sharedstatedir@"; 12 | 13 | # Configure additions? 14 | -$TmpDir = "/var/tmp"; 15 | +$TmpDir = tempdir(); 16 | # base mail program that takes all info (to: subj: etc) on stdin 17 | $SendMail = "/usr/lib/sendmail"; 18 | # Define the preferred integration host 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/aegis-test-fixup-1.patch: -------------------------------------------------------------------------------- 1 | This test fails because it expects a MIME type "Content-Type: image/gif" 2 | whereas that provided by libmagic is "Content-Type: image/gif; charset=binary" 3 | Presumably the test was written against a different version. 4 | --- aegis-4.24/test/02/t0228a-matt.sh 2008-03-14 07:19:27.000000000 +0100 5 | +++ aegis-4.24/test/02/t0228a-matt.sh 2014-01-27 09:43:44.000000000 +0100 6 | @@ -147,7 +147,8 @@ 7 | SCRIPT_NAME=/cgi-bin/aeget \ 8 | PATH_INFO=icon/rss.gif \ 9 | QUERY_STRING= \ 10 | -$bin/aeget > rss.served.gif 2>&1 11 | +$bin/aeget \ 12 | +| sed -e 's%^Content-Type: image/gif; charset=binary%Content-Type: image/gif%' > rss.served.gif 2>&1 13 | if test $? -ne 0 ; then fail; fi 14 | 15 | # Compare the expected and the actual received file. 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/aegis-test-fixup-2.patch: -------------------------------------------------------------------------------- 1 | This test was failing with subversion 1.7.8 because the svn repository structure 2 | was not as the test expected. Presumably the test relies on different version. 3 | --- aegis-4.24/test/02/t0222a-pmil.sh 2008-03-14 07:19:27.000000000 +0100 4 | +++ aegis-4.24/test/02/t0222a-pmil.sh 2014-01-27 19:48:30.000000000 +0100 5 | @@ -268,7 +268,8 @@ 6 | -c 10 > log 2>&1 7 | if test $? -ne 0 ; then cat log; fail; fi 8 | 9 | -test -f $work/svnroot/db/revs/2 || fail 10 | +activity="check svn db 271" 11 | +test -f $work/svnroot/db/revs/0/2 || test -f $work/svnroot/db/revs/2 || fail 12 | 13 | # -------------------------------------------------------------------------- 14 | 15 | @@ -364,7 +365,8 @@ 16 | -c 3 > log 2>&1 17 | if test $? -ne 0 ; then cat log; fail; fi 18 | 19 | -test -f $work/svnroot/db/revs/3 || fail 20 | +activity="check svn db 368" 21 | +test -f $work/svnroot/db/revs/0/3 || test -f $work/svnroot/db/revs/3 || fail 22 | 23 | # 24 | # Only definite negatives are possible. 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/agg-am_c_prototype.patch: -------------------------------------------------------------------------------- 1 | AM_C_PROTOTYPES is no longer supported. 2 | 3 | https://lists.gnu.org/archive/html/automake-patches/2011-06/msg00082.html 4 | 5 | Failure without patch: 6 | 7 | starting phase `autoreconf' 8 | aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' 9 | configure.in:11: error: automatic de-ANSI-fication support has been removed 10 | /gnu/store/…-automake-1.15/share/aclocal-1.15/obsolete.m4:26: AM_C_PROTOTYPES is expanded from... 11 | configure.in:11: the top level 12 | 13 | 14 | Upstream is dead. 15 | --- a/configure.in 2015-03-15 18:59:12.557417149 +0100 16 | +++ b/configure.in 2015-03-15 18:59:29.273416518 +0100 17 | @@ -8,7 +8,6 @@ 18 | AC_PROG_CC 19 | AC_PROG_CXX 20 | AC_ISC_POSIX 21 | -AM_C_PROTOTYPES 22 | if test "x$U" != "x"; then 23 | AC_MSG_ERROR(Compiler not ANSI compliant) 24 | fi 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/apr-skip-getservbyname-test.patch: -------------------------------------------------------------------------------- 1 | --- test/testsock.c 2013-01-24 06:57:21.000000000 +0100 2 | +++ test/testsock.c 2013-01-24 17:24:54.000000000 +0100 3 | @@ -90,16 +90,22 @@ 4 | rv = apr_sockaddr_info_get(&sa, NULL, APR_UNSPEC, 0, 0, p); 5 | APR_ASSERT_SUCCESS(tc, "Problem generating sockaddr", rv); 6 | 7 | + /* /etc/services is not available while compiling, so apr_getservbyname 8 | + * will always return APR_ENOENT. */ 9 | +#if 0 10 | rv = apr_getservbyname(sa, "ftp"); 11 | APR_ASSERT_SUCCESS(tc, "Problem getting ftp service", rv); 12 | ABTS_INT_EQUAL(tc, 21, sa->port); 13 | +#endif 14 | 15 | rv = apr_getservbyname(sa, "complete_and_utter_rubbish"); 16 | APR_ASSERT_SUCCESS(tc, "Problem getting non-existent service", !rv); 17 | 18 | +#if 0 19 | rv = apr_getservbyname(sa, "telnet"); 20 | APR_ASSERT_SUCCESS(tc, "Problem getting telnet service", rv); 21 | ABTS_INT_EQUAL(tc, 23, sa->port); 22 | +#endif 23 | } 24 | 25 | static apr_socket_t *setup_socket(abts_case *tc) 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/ath9k-htc-firmware-objcopy.patch: -------------------------------------------------------------------------------- 1 | The firmware is cross-compiled, but the build system ends up using 2 | 'objcopy' instead of 'xtensa-elf-objcopy' by default. Force it to 3 | use the right one. 4 | 5 | --- source/target_firmware/configure 2014-10-28 20:57:26.834436561 +0100 6 | +++ source/target_firmware/configure 2014-10-28 20:57:29.666436530 +0100 7 | @@ -11,6 +11,7 @@ mkdir -p build 8 | cat > "$TOOLCHAIN_FILE" < sd-daemon.c 13 | -------------------------------------------------------------------------------- /gnu/packages/patches/bigloo-gc-shebangs.patch: -------------------------------------------------------------------------------- 1 | Patch shebangs in source that gets unpacked by `configure'. 2 | 3 | --- bigloo4.1a/gc/install-gc-7.4.0 2014-02-04 14:55:03.000000000 +0100 4 | +++ bigloo4.1a/gc/install-gc-7.4.0 2014-02-04 14:55:36.000000000 +0100 5 | @@ -29,10 +29,12 @@ fi 6 | 7 | # untar the two versions of the GC 8 | $tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1) 9 | -/bin/rm -rf "../gc/$gc"_fth 10 | +rm -rf "../gc/$gc"_fth 11 | +find ../gc/$gc -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P sh`|g" 12 | mv ../gc/$gc "../gc/$gc"_fth || (echo "mv $gc failed"; exit 1) 13 | 14 | $tar xfz $src -C ../gc || (echo "$tar xfz $src failed"; exit 1) 15 | +find ../gc/$gc -perm /111 -type f | xargs sed -i -e"s|/bin/sh|`type -P sh`|g" 16 | 17 | # general Bigloo patch 18 | (cd "../gc/$gc"_fth && $patch -p1 < ../$gc.patch > /dev/null) 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/binutils-ld-new-dtags.patch: -------------------------------------------------------------------------------- 1 | Turn on --enable-new-dtags by default to make the linker set RUNPATH 2 | instead of RPATH on binaries. This is important because RUNPATH can 3 | be overriden using LD_LIBRARY_PATH at runtime. 4 | 5 | Patch from Nixpkgs by Eelco Dolstra . 6 | 7 | --- binutils/ld/ldmain.c 8 | +++ binutils/ld/ldmain.c 9 | @@ -296,6 +296,7 @@ main (int argc, char **argv) 10 | 11 | link_info.allow_undefined_version = TRUE; 12 | link_info.keep_memory = TRUE; 13 | + link_info.new_dtags = TRUE; 14 | link_info.combreloc = TRUE; 15 | link_info.strip_discarded = TRUE; 16 | link_info.callbacks = &link_callbacks; 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/bitlbee-configure-doc-fix.patch: -------------------------------------------------------------------------------- 1 | Fix the check for the prebuilt helpfile when xsltproc is not available. 2 | 3 | --- bitlbee-3.4/configure.orig 2015-03-25 18:09:10.000000000 -0400 4 | +++ bitlbee-3.4/configure 2015-05-20 14:51:33.627975970 -0400 5 | @@ -650,8 +650,8 @@ 6 | 7 | if [ "$doc" = "1" ]; then 8 | if [ ! -e doc/user-guide/help.txt ] && \ 9 | - ! type xmlto > /dev/null 2> /dev/null || \ 10 | - ! type xsltproc > /dev/null 2> /dev/null 11 | + (! type xmlto > /dev/null 2> /dev/null || \ 12 | + ! type xsltproc > /dev/null 2> /dev/null) 13 | then 14 | echo 15 | echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.' 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/boost-mips-avoid-m32.patch: -------------------------------------------------------------------------------- 1 | The following patch prevents the use of the -m32 flag on mips, where it 2 | is not understood by gcc, as well as other non-x86 architectures. 3 | 4 | diff -u -r boost_1_58_0.orig/tools/build/src/tools/gcc.jam boost_1_58_0/tools/build/src/tools/gcc.jam 5 | --- boost_1_58_0.orig/tools/build/src/tools/gcc.jam 2015-04-04 19:25:07.000000000 +0200 6 | +++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-07-10 01:08:19.822733823 +0200 7 | @@ -451,7 +451,7 @@ 8 | else 9 | { 10 | local arch = [ feature.get-values architecture : $(properties) ] ; 11 | - if $(arch) != arm 12 | + if $(arch) = x86 13 | { 14 | if $(model) = 32 15 | { 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/bowtie-fix-makefile.patch: -------------------------------------------------------------------------------- 1 | From 4a99b0023bdfbbe486b9649489a32ea184c18c9a Mon Sep 17 00:00:00 2001 2 | From: Valentin Antonescu 3 | Date: Tue, 2 Dec 2014 11:19:13 -0500 4 | Subject: [PATCH] Make sure the Mavericks test happens only under Darwin. 5 | 6 | --- 7 | Makefile | 11 +++++------ 8 | 1 file changed, 5 insertions(+), 6 deletions(-) 9 | 10 | diff --git a/Makefile b/Makefile 11 | index d74f7c8..a4cdfa7 100644 12 | --- a/Makefile 13 | +++ b/Makefile 14 | @@ -54,12 +54,11 @@ endif 15 | MACOS = 0 16 | ifneq (,$(findstring Darwin,$(shell uname))) 17 | MACOS = 1 18 | -endif 19 | - 20 | -ifneq (,$(findstring 13,$(shell uname -r))) 21 | - CPP = clang++ 22 | - CC = clang 23 | - EXTRA_FLAGS += -stdlib=libstdc++ 24 | + ifneq (,$(findstring 13,$(shell uname -r))) 25 | + CPP = clang++ 26 | + CC = clang 27 | + EXTRA_FLAGS += -stdlib=libstdc++ 28 | + endif 29 | endif 30 | 31 | POPCNT_CAPABILITY ?= 1 32 | -------------------------------------------------------------------------------- /gnu/packages/patches/byobu-writable-status.patch: -------------------------------------------------------------------------------- 1 | Skeleton status files are installed read-only. When copying to the config dir 2 | upon initialization, make sure they end up writable. 3 | 4 | --- byobu-5.98/usr/bin/byobu-janitor.in 5 | +++ byobu-5.98/usr/bin/byobu-janitor.in 6 | @@ -82,6 +82,7 @@ 7 | if [ ! -r "$BYOBU_CONFIG_DIR/$f" ]; then 8 | # Copy from skeleton, if possible 9 | cp -f "$BYOBU_PREFIX/share/$PKG/status/$f" "$BYOBU_CONFIG_DIR/$f" 10 | + chmod +w "$BYOBU_CONFIG_DIR/$f" 11 | # Enable ec2_cost, if we're in ec2 and seeding a new setup 12 | if metadata_available; then 13 | $BYOBU_SED_INLINE -e "s/#ec2_cost/ec2_cost/g" "$($BYOBU_READLINK -f $BYOBU_CONFIG_DIR/$f)" 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/calibre-no-updates-dialog.patch: -------------------------------------------------------------------------------- 1 | Taken from debian. 2 | 3 | # Description: Disable update check by default. 4 | Index: calibre/src/calibre/gui2/main.py 5 | =================================================================== 6 | --- calibre.orig/src/calibre/gui2/main.py 2014-02-02 10:41:28.470954623 +0100 7 | +++ calibre/src/calibre/gui2/main.py 2014-02-02 10:41:56.546954247 +0100 8 | @@ -37,8 +37,8 @@ 9 | help=_('Start minimized to system tray.')) 10 | parser.add_option('-v', '--verbose', default=0, action='count', 11 | help=_('Ignored, do not use. Present only for legacy reasons')) 12 | - parser.add_option('--no-update-check', default=False, action='store_true', 13 | - help=_('Do not check for updates')) 14 | + parser.add_option('--update-check', dest='no_update_check', default=True, action='store_false', 15 | + help=_('Check for updates')) 16 | parser.add_option('--ignore-plugins', default=False, action='store_true', 17 | help=_('Ignore custom plugins, useful if you installed a plugin' 18 | ' that is preventing calibre from starting')) 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/clucene-pkgconfig.patch: -------------------------------------------------------------------------------- 1 | Taken from the Debian package. 2 | 3 | From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001 4 | From: Valentin Rusu 5 | Date: Sat, 17 Dec 2011 13:47:58 +0100 6 | Subject: [PATCH] Fix .pc file by adding clucene-shared library 7 | 8 | --- 9 | src/core/libclucene-core.pc.cmake | 2 +- 10 | 1 file changed, 1 insertion(+), 1 deletion(-) 11 | 12 | --- a/src/core/libclucene-core.pc.cmake 13 | +++ b/src/core/libclucene-core.pc.cmake 14 | @@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i 15 | Name: libclucene 16 | Description: CLucene - a C++ search engine, ported from the popular Apache Lucene 17 | Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ 18 | -Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core 19 | +Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared 20 | Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext 21 | ~ 22 | -------------------------------------------------------------------------------- /gnu/packages/patches/crda-optional-gcrypt.patch: -------------------------------------------------------------------------------- 1 | This patch allows us to make the libgcrypt dependency optional (which it 2 | is, if you look at the code), which in turns allows us to build CRDA 3 | without the signature-checking capability on 'regulatory.bin'. 4 | 5 | --- crda/Makefile 2015-07-17 11:33:33.546712893 +0200 6 | +++ crda/Makefile 2015-07-17 11:34:05.210994373 +0200 7 | @@ -45,12 +45,14 @@ LDLIBS += `pkg-config --libs openssl` 8 | $(LIBREG): keys-ssl.c 9 | 10 | else 11 | +ifeq ($(USE_GCRYPT),1) 12 | CFLAGS += -DUSE_GCRYPT 13 | LDLIBS += -lgcrypt 14 | 15 | $(LIBREG): keys-gcrypt.c 16 | 17 | endif 18 | +endif 19 | MKDIR ?= mkdir -p 20 | INSTALL ?= install 21 | -------------------------------------------------------------------------------- /gnu/packages/patches/cssc-gets-undeclared.patch: -------------------------------------------------------------------------------- 1 | CSSC uses a gets in a couple of places. For security reasons, modern gnulib 2 | does not allow this. This patch allows it again. 3 | --- CSSC-1.3.0/gl/lib/stdio.in.h 2010-05-15 00:15:35.000000000 +0200 4 | +++ CSSC-1.3.0/gl/lib/stdio.in.h 2014-02-03 21:27:10.000000000 +0100 5 | @@ -135,12 +135,6 @@ 6 | "use gnulib module fflush for portable POSIX compliance"); 7 | #endif 8 | 9 | -/* It is very rare that the developer ever has full control of stdin, 10 | - so any use of gets warrants an unconditional warning. Assume it is 11 | - always declared, since it is required by C89. */ 12 | -#undef gets 13 | -_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); 14 | - 15 | #if @GNULIB_FOPEN@ 16 | # if @REPLACE_FOPEN@ 17 | # if !(defined __cplusplus && defined GNULIB_NAMESPACE) 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/cssc-missing-include.patch: -------------------------------------------------------------------------------- 1 | Added a missing include file (necessary for gid_t and others). 2 | So far as I am aware, this has not been added upstream yet. 3 | --- CSSC-1.3.0/src/file.h 2010-05-16 19:31:33.000000000 +0200 4 | +++ CSSC-1.3.0/src/file.h 2014-02-03 21:48:30.000000000 +0100 5 | @@ -30,6 +30,7 @@ 6 | #ifndef CSSC__FILE_H__ 7 | #define CSSC__FILE_H__ 8 | 9 | +#include 10 | #include "filelock.h" 11 | 12 | enum create_mode { 13 | -------------------------------------------------------------------------------- /gnu/packages/patches/cursynth-wave-rand.patch: -------------------------------------------------------------------------------- 1 | Related to https://github.com/mtytel/cursynth/issues/9 2 | 3 | --- a/mopo/src/wave.h 2014-06-25 14:10:57.827369578 -0500 4 | +++ b/mopo/src/wave.h 2014-06-25 14:08:15.795376354 -0500 5 | @@ -19,6 +19,7 @@ 6 | #define WAVE_H 7 | 8 | #include "mopo.h" 9 | +#include 10 | #include 11 | 12 | #define LOOKUP_SIZE 2048 13 | -------------------------------------------------------------------------------- /gnu/packages/patches/dbus-helper-search-path.patch: -------------------------------------------------------------------------------- 1 | The setuid helper of D-Bus is responsible for "service activation". 2 | It looks for '.service' files in fixed locations, but the default locations 3 | make no sense (see below), so replace them with /etc/dbus-1/system-services. 4 | 5 | --- dbus-1.10.0/dbus/dbus-sysdeps-util-unix.c 2015-10-22 00:07:03.829251854 +0200 6 | +++ dbus-1.10.0/dbus/dbus-sysdeps-util-unix.c 2015-10-22 00:07:14.893445175 +0200 7 | @@ -1410,10 +1410,7 @@ _dbus_get_standard_system_servicedirs (D 8 | * be available. 9 | */ 10 | static const char standard_search_path[] = 11 | - "/usr/local/share:" 12 | - "/usr/share:" 13 | - DBUS_DATADIR ":" 14 | - "/lib"; 15 | + "/etc"; 16 | DBusString servicedir_path; 17 | 18 | _dbus_string_init_const (&servicedir_path, standard_search_path); 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/dico-libtool-deterministic.patch: -------------------------------------------------------------------------------- 1 | Dico 2.2 uses an old Libtool (2.2.7a) that did not sort the output 2 | of 'find', thereby leading to non-deterministic file name ordering 3 | in the arguments passed to 'ar rcu' for libdico.a & co. 4 | 5 | --- dico-2.2/build-aux/ltmain.sh 1970-01-01 01:00:00.000000000 +0100 6 | +++ dico-2.2/build-aux/ltmain.sh 2015-11-25 09:39:30.826169050 +0100 7 | @@ -2926,7 +2926,7 @@ func_extract_archives () 8 | func_extract_an_archive "$my_xdir" "$my_xabs" 9 | ;; 10 | esac 11 | - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` 12 | + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` 13 | done 14 | 15 | func_extract_archives_result="$my_oldobjs" 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/doxygen-tmake.patch: -------------------------------------------------------------------------------- 1 | Fix the `check_unix' function, which looks for `/bin/uname' to determine 2 | whether we're on a Unix-like system. 3 | Taken from nixpkgs. 4 | 5 | --- doxygen-1.5.8/tmake/bin/tmake 2008-12-06 14:16:20.000000000 +0100 6 | +++ doxygen-1.5.8/tmake/bin/tmake 2009-03-05 11:29:55.000000000 +0100 7 | @@ -234,17 +234,7 @@ sub tmake_verb { 8 | # 9 | 10 | sub check_unix { 11 | - my($r); 12 | - $r = 0; 13 | - if ( -f "/bin/uname" ) { 14 | - $r = 1; 15 | - (-f "\\bin\\uname") && ($r = 0); 16 | - } 17 | - if ( -f "/usr/bin/uname" ) { 18 | - $r = 1; 19 | - (-f "\\usr\\bin\\uname") && ($r = 0); 20 | - } 21 | - return $r; 22 | + return 1; 23 | } 24 | 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/duplicity-piped-password.patch: -------------------------------------------------------------------------------- 1 | This test, on three occasions, is failing with the error: 2 | 3 | EOF: End Of File (EOF) in read_nonblocking(). Braindead platform. 4 | 5 | --- duplicity-0.6.24/testing/functional/test_final.py 2014-09-28 13:14:52.146001614 -0500 6 | +++ duplicity-0.6.24/testing/functional/test_final.py 2014-09-28 13:13:20.333546342 -0500 7 | @@ -156,13 +156,6 @@ 8 | self.run_duplicity(options=["remove-older-than", "50000", "--force", self.backend_url]) 9 | self.assertEqual(self.get_backend_files(), second_chain) 10 | 11 | - def test_piped_password(self): 12 | - """Make sure that prompting for a password works""" 13 | - self.set_environ("PASSPHRASE", None) 14 | - self.backup("full", "testfiles/empty_dir", 15 | - passphrase_input=[self.sign_passphrase, self.sign_passphrase]) 16 | - self.restore(passphrase_input=[self.sign_passphrase]) 17 | - 18 | 19 | class OldFilenamesFinalTest(FinalTest): 20 | 21 | -------------------------------------------------------------------------------- /gnu/packages/patches/duplicity-test_selection-tmp.patch: -------------------------------------------------------------------------------- 1 | Reported upstream at https://bugs.launchpad.net/duplicity/+bug/1375019 2 | 3 | --- duplicity-0.6.24/testing/unit/test_selection.py 2014-05-09 08:27:40.000000000 -0500 4 | +++ duplicity-0.6.24/testing/unit/test_selection.py 2014-09-28 12:28:53.932324380 -0500 5 | @@ -431,10 +431,10 @@ 6 | [(), ('1',), ('1', '1'), ('1', '2'), ('1', '3')]) 7 | 8 | self.root = Path("/") 9 | - self.ParseTest([("--exclude", "/home/*"), 10 | - ("--include", "/home"), 11 | + self.ParseTest([("--exclude", "/tmp/*"), 12 | + ("--include", "/tmp"), 13 | ("--exclude", "/")], 14 | - [(), ("home",)]) 15 | + [(), ("tmp",)]) 16 | 17 | if __name__ == "__main__": 18 | unittest.main() 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/emacs-exec-path.patch: -------------------------------------------------------------------------------- 1 | Do not capture the build-time value of $PATH in the 'emacs' executable 2 | since this can noticeably increase the size of the closure of Emacs 3 | with things like GCC being referenced. 4 | 5 | --- a/lisp/loadup.el 6 | +++ b/lisp/loadup.el 7 | @@ -64,6 +64,11 @@ 8 | (expand-file-name "textmodes" dir) 9 | (expand-file-name "vc" dir))))) 10 | 11 | +;; Reset 'exec-path' so we don't capture the build-time $PATH in the 12 | +;; 'emacs' executable. 13 | +(setq-default exec-path nil) 14 | +(setq exec-path nil) 15 | + 16 | (if (eq t purify-flag) 17 | ;; Hash consing saved around 11% of pure space in my tests. 18 | (setq purify-flag (make-hash-table :test 'equal :size 70000))) 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/evilwm-lost-focus-bug.patch: -------------------------------------------------------------------------------- 1 | evilwm may sometimes lose focus after closing a window. This means that 2 | evilwm stops responding to keyboard shortcuts, and if no other window is open 3 | which the mouse can be moved over to regain focus evilwm becomes unusable and 4 | has to be restarted. 5 | 6 | Patch derived from discussion at 7 | https://wiki.archlinux.org/index.php/Evilwm#Lost_focus_bug_fix 8 | 9 | --- evilwm-1.1.1/client.c 10 | +++ evilwm-1.1.1/client.c 11 | @@ -172,6 +172,7 @@ 12 | * _NET_WM_STATE) */ 13 | if (c->remove) { 14 | LOG_DEBUG("setting WithdrawnState\n"); 15 | + XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); 16 | set_wm_state(c, WithdrawnState); 17 | ewmh_withdraw_client(c); 18 | } else { 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/fastcap-mulGlobal.patch: -------------------------------------------------------------------------------- 1 | Don't use timing as there is a type conflict. 2 | 3 | --- nix-build-fastcap-2.0-18Sep92.drv-1/src/mulGlobal.h.orig 2015-07-21 15:58:49.199101566 +0200 4 | +++ nix-build-fastcap-2.0-18Sep92.drv-1/src/mulGlobal.h 2015-07-21 16:18:39.456751313 +0200 5 | @@ -57,7 +57,7 @@ 6 | /* time variables/structs */ 7 | #ifndef _TIME_ /* if not on a Sun4 */ 8 | #ifndef NEWS /* if not on a NWS-38XX */ 9 | -#include 10 | +//#include 11 | #endif 12 | #endif 13 | 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/fastcap-mulSetup.patch: -------------------------------------------------------------------------------- 1 | Add forward declarations. 2 | 3 | --- fastcap/src/mulSetup.c.orig 2015-07-22 13:55:21.592119775 +0200 4 | +++ fastcap/src/mulSetup.c 2015-07-22 14:08:50.157688209 +0200 5 | @@ -35,6 +35,14 @@ 6 | 7 | #include "mulGlobal.h" 8 | 9 | +static getnbrs(ssystem*); 10 | +static linkcubes(ssystem*); 11 | +static setMaxq(ssystem*); 12 | +static getAllInter(ssystem*); 13 | +static set_vector_masks(ssystem*); 14 | +static indexkid(ssystem*, cube*, int*, int*); 15 | +static int placeq(int, ssystem*, charge*); 16 | + 17 | cube *cstack[1024]; /* Stack used in several routines. */ 18 | 19 | /* 20 | -------------------------------------------------------------------------------- /gnu/packages/patches/fasthenry-spAllocate.patch: -------------------------------------------------------------------------------- 1 | Add forward declarations. 2 | 3 | --- fasthenry-3.0/src/fasthenry/sparse/spAllocate.c.orig 2015-07-22 09:45:28.864758891 +0200 4 | +++ fasthenry-3.0/src/fasthenry/sparse/spAllocate.c 2015-07-22 13:04:17.579742206 +0200 5 | @@ -107,7 +107,9 @@ 6 | #include "spDefs.h" 7 | 8 | 9 | - 10 | +static InitializeElementBlocks( MatrixPtr, int, int ); 11 | +static RecordAllocation( MatrixPtr, char* ); 12 | +static AllocateBlockOfAllocationList( MatrixPtr ); 13 | 14 | 15 | 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/fasthenry-spBuild.patch: -------------------------------------------------------------------------------- 1 | Add forward declarations. 2 | 3 | --- fasthenry-3.0/src/fasthenry/sparse/spBuild.c.orig 2015-07-22 10:13:30.884638176 +0200 4 | +++ fasthenry-3.0/src/fasthenry/sparse/spBuild.c 2015-07-22 13:08:48.862973419 +0200 5 | @@ -106,6 +106,8 @@ 6 | #include "spDefs.h" 7 | 8 | 9 | +static void Translate( MatrixPtr, int*, int* ); 10 | +static ExpandTranslationArrays( MatrixPtr, register int ); 11 | 12 | 13 | 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/fasthenry-spSolve.patch: -------------------------------------------------------------------------------- 1 | Add forward declarations. 2 | 3 | --- fasthenry-3.0/src/fasthenry/sparse/spSolve.c.orig 2015-07-22 12:06:20.502771958 +0200 4 | +++ fasthenry-3.0/src/fasthenry/sparse/spSolve.c 2015-07-22 12:12:03.822798513 +0200 5 | @@ -95,6 +95,7 @@ 6 | #include "spDefs.h" 7 | 8 | 9 | +static void SolveComplexMatrix( MatrixPtr, RealVector, RealVector ); 10 | 11 | 12 | 13 | -------------------------------------------------------------------------------- /gnu/packages/patches/fasthenry-spUtils.patch: -------------------------------------------------------------------------------- 1 | Add forward declarations. 2 | 3 | --- fasthenry-3.0/src/fasthenry/sparse/spUtils.c.orig 2015-07-22 12:12:52.579370846 +0200 4 | +++ fasthenry-3.0/src/fasthenry/sparse/spUtils.c 2015-07-22 12:14:09.636275633 +0200 5 | @@ -107,6 +107,7 @@ 6 | #include "spDefs.h" 7 | 8 | 9 | +static RealNumber ComplexCondition( MatrixPtr, RealNumber, int* ); 10 | 11 | 12 | 13 | -------------------------------------------------------------------------------- /gnu/packages/patches/findutils-localstatedir.patch: -------------------------------------------------------------------------------- 1 | Do not try to create $localstatedir (aka. /var) since we don't have 2 | write access. 3 | 4 | --- findutils-4.4.2/locate/Makefile.in 2015-06-04 12:40:52.690935795 +0200 5 | +++ findutils-4.4.2/locate/Makefile.in 2015-06-04 12:41:32.087286685 +0200 6 | @@ -1212,7 +1212,7 @@ updatedb: updatedb.sh Makefile 7 | chmod +x $@ 8 | 9 | install-data-hook: 10 | - $(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(localstatedir) 11 | + true 12 | 13 | dblocation.texi: Makefile 14 | echo '@set LOCATE_DB $(LOCATE_DB)' > $@ 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/flex-bison-tests.patch: -------------------------------------------------------------------------------- 1 | The `test-bison-yyl{loc,val}' tests fail with "conflicting types for 2 | 'testparse'" because `YYPARSE_PARAM' is undefined; work around that. 3 | 4 | --- flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:01.000000000 +0100 5 | +++ flex-2.5.37/tests/test-bison-yylloc/main.c 2012-11-22 18:17:07.000000000 +0100 6 | @@ -21,6 +21,7 @@ 7 | * PURPOSE. 8 | */ 9 | 10 | +#define YYPARSE_PARAM scanner 11 | #include "parser.h" 12 | #include "scanner.h" 13 | 14 | 15 | --- flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:42.000000000 +0100 16 | +++ flex-2.5.37/tests/test-bison-yylval/main.c 2012-11-22 18:17:49.000000000 +0100 17 | @@ -21,6 +21,7 @@ 18 | * PURPOSE. 19 | */ 20 | 21 | +#define YYPARSE_PARAM scanner 22 | #include "parser.h" 23 | #include "scanner.h" 24 | 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/gcc-5.0-libvtv-runpath.patch: -------------------------------------------------------------------------------- 1 | GCC 4.9 and later have libvtv and, just like libstdc++ (see 2 | https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354), it doesn't 3 | have $libdir in its RUNPATH, but it NEEDs libgcc_s. This patch 4 | fixes that. 5 | 6 | --- gcc-5.1.0/libvtv/Makefile.in 2014-10-30 09:28:58.000000000 +0100 7 | +++ gcc-5.1.0/libvtv/Makefile.in 2015-04-30 09:51:04.161129705 +0200 8 | @@ -15,6 +15,7 @@ 9 | 10 | @SET_MAKE@ 11 | 12 | +libvtv_la_LDFLAGS = -Wl,-rpath=$(libdir) 13 | 14 | VPATH = @srcdir@ 15 | pkgdatadir = $(datadir)/@PACKAGE@ 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/gcc-arm-link-spec-fix.patch: -------------------------------------------------------------------------------- 1 | Do not pass -dynamic-linker to linker when !shared. 2 | Fixes . 3 | 4 | ARM 'link' spec issue reported at 5 | https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65711 and 6 | https://gcc.gnu.org/ml/gcc-patches/2015-04/msg01387.html. 7 | 8 | Patch by Ludovic Courtès . 9 | 10 | --- gcc-4.8.4/gcc/config/arm/linux-elf.h.orig 2015-04-08 20:31:20.376900478 +0200 11 | +++ gcc-4.8.4/gcc/config/arm/linux-elf.h 2015-04-08 20:31:36.437014437 +0200 12 | @@ -65,7 +65,7 @@ 13 | %{symbolic:-Bsymbolic} \ 14 | %{!static: \ 15 | %{rdynamic:-export-dynamic} \ 16 | - -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \ 17 | + %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \ 18 | -X \ 19 | %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ 20 | SUBTARGET_EXTRA_LINK_SPEC 21 | -------------------------------------------------------------------------------- /gnu/packages/patches/gcc-libvtv-runpath.patch: -------------------------------------------------------------------------------- 1 | GCC 4.9 and later have libvtv and, just like libstdc++ (see 2 | https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32354), it doesn't 3 | have $libdir in its RUNPATH, but it NEEDs libgcc_s. This patch 4 | fixes that. 5 | 6 | --- gcc-4.9.2/libvtv/Makefile.in 2014-10-30 09:28:58.000000000 +0100 7 | +++ gcc-4.9.2/libvtv/Makefile.in 2015-04-30 09:51:04.161129705 +0200 8 | @@ -15,6 +15,7 @@ 9 | 10 | @SET_MAKE@ 11 | 12 | +AM_LDFLAGS = -Wl,-rpath=$(libdir) 13 | 14 | VPATH = @srcdir@ 15 | pkgdatadir = $(datadir)/@PACKAGE@ 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/geoclue-config.patch: -------------------------------------------------------------------------------- 1 | Allow the configuration file to be specified via an environment variable. 2 | 3 | --- geoclue-2.1.10/src/gclue-config.c 2015-04-07 09:50:07.721074380 +0200 4 | +++ geoclue-2.1.10/src/gclue-config.c 2015-04-07 10:27:26.613171960 +0200 5 | @@ -235,6 +235,11 @@ 6 | gclue_config_init (GClueConfig *config) 7 | { 8 | GError *error = NULL; 9 | + const char *config_file_path; 10 | + 11 | + config_file_path = g_getenv ("GEOCLUE_CONFIG_FILE"); 12 | + if (config_file_path == NULL) 13 | + config_file_path = CONFIG_FILE_PATH; 14 | 15 | config->priv = 16 | G_TYPE_INSTANCE_GET_PRIVATE (config, 17 | @@ -242,7 +247,7 @@ 18 | GClueConfigPrivate); 19 | config->priv->key_file = g_key_file_new (); 20 | g_key_file_load_from_file (config->priv->key_file, 21 | - CONFIG_FILE_PATH, 22 | + config_file_path, 23 | 0, 24 | &error); 25 | if (error != NULL) { 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/ghostscript-CVE-2015-3228.patch: -------------------------------------------------------------------------------- 1 | The file names in the upstream patch below were modified to apply to GNU 2 | ghostscript. 3 | 4 | From 0c0b0859ae1aba64861599f0e7f74f143f305932 Mon Sep 17 00:00:00 2001 5 | From: Chris Liddell 6 | Date: Tue, 7 Jul 2015 16:57:41 +0100 7 | Subject: [PATCH] Bug 696041: sanity check for memory allocation. 8 | 9 | In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the 10 | variable holding the actual number of bytes we allocate. 11 | 12 | No cluster differences 13 | --- 14 | gs/base/gsmalloc.c | 2 +- 15 | 1 file changed, 1 insertion(+), 1 deletion(-) 16 | 17 | diff --git a/base/gsmalloc.c b/base/gsmalloc.c 18 | index 624552d..cad79c2 100644 19 | --- a/base/gsmalloc.c 20 | +++ b/base/gsmalloc.c 21 | @@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, uint size, client_name_t cname) 22 | } else { 23 | uint added = size + sizeof(gs_malloc_block_t); 24 | 25 | - if (mmem->limit - added < mmem->used) 26 | + if (added <= size || mmem->limit - added < mmem->used) 27 | set_msg("exceeded limit"); 28 | else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0) 29 | set_msg("failed"); 30 | -- 31 | 2.4.6 32 | 33 | -------------------------------------------------------------------------------- /gnu/packages/patches/ghostscript-runpath.patch: -------------------------------------------------------------------------------- 1 | This patch adds $(libdir) to the RUNPATH of 'gsc' and 'gsx'. 2 | 3 | --- gnu-ghostscript-9.14.0/base/unix-dll.mak 2015-04-05 15:12:45.386957927 +0200 4 | +++ gnu-ghostscript-9.14.0/base/unix-dll.mak 2015-04-05 15:12:49.222982359 +0200 5 | @@ -91,11 +91,11 @@ $(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) 6 | # Build the small Ghostscript loaders, with Gtk+ and without 7 | $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) 8 | $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ 9 | - -L$(BINDIR) -l$(GS_SO_BASE) 10 | + -L$(BINDIR) -l$(GS_SO_BASE) -Wl,-rpath=$(libdir) 11 | 12 | $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) 13 | $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ 14 | - -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS) 15 | + -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS) -Wl,-rpath=$(libdir) 16 | 17 | # ------------------------- Recursive make targets ------------------------- # 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/gitolite-openssh-6.8-compat.patch: -------------------------------------------------------------------------------- 1 | From ed807a40c6683960e357bc995b3acf721ec088b4 Mon Sep 17 00:00:00 2001 2 | From: Sitaram Chamarty 3 | Date: Thu, 19 Mar 2015 05:17:59 +0530 4 | Subject: [PATCH] openssh 6.8 compat 5 | 6 | --- 7 | src/triggers/post-compile/ssh-authkeys | 2 +- 8 | 1 file changed, 1 insertion(+), 1 deletion(-) 9 | 10 | diff --git a/src/triggers/post-compile/ssh-authkeys b/src/triggers/post-compile/ssh-authkeys 11 | index 84dda73..d5f5d8b 100755 12 | --- a/src/triggers/post-compile/ssh-authkeys 13 | +++ b/src/triggers/post-compile/ssh-authkeys 14 | @@ -115,7 +115,7 @@ sub fp_file { 15 | my $f = shift; 16 | my $fp = `ssh-keygen -l -f '$f'`; 17 | chomp($fp); 18 | - _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/; 19 | + _die "fingerprinting failed for '$f'" unless $fp =~ /([0-9a-f][0-9a-f](:[0-9a-f][0-9a-f])+)/ or $fp =~ m(SHA256:([A-ZA-z0-9+/]+)); 20 | $fp = $1; 21 | return $fp; 22 | } 23 | -- 24 | 2.2.1 25 | 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/glib-networking-ssl-cert-file.patch: -------------------------------------------------------------------------------- 1 | From b010e41346d418220582c20ab8d7f3971e4fb78a Mon Sep 17 00:00:00 2001 2 | From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 3 | Date: Fri, 14 Aug 2015 17:28:36 +0800 4 | Subject: [PATCH] gnutls: Allow overriding the anchor file location by 5 | 'SSL_CERT_FILE' 6 | 7 | --- 8 | tls/gnutls/gtlsbackend-gnutls.c | 4 +++- 9 | 1 file changed, 3 insertions(+), 1 deletion(-) 10 | 11 | diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c 12 | index 55ec1a5..217d3c8 100644 13 | --- a/tls/gnutls/gtlsbackend-gnutls.c 14 | +++ b/tls/gnutls/gtlsbackend-gnutls.c 15 | @@ -101,8 +101,10 @@ g_tls_backend_gnutls_real_create_database (GTlsBackendGnutls *self, 16 | GError **error) 17 | { 18 | const gchar *anchor_file = NULL; 19 | + anchor_file = g_getenv ("SSL_CERT_FILE"); 20 | #ifdef GTLS_SYSTEM_CA_FILE 21 | - anchor_file = GTLS_SYSTEM_CA_FILE; 22 | + if (!anchor_file) 23 | + anchor_file = GTLS_SYSTEM_CA_FILE; 24 | #endif 25 | return g_tls_file_database_new (anchor_file, error); 26 | } 27 | -- 28 | 2.4.3 29 | 30 | -------------------------------------------------------------------------------- /gnu/packages/patches/glib-tests-prlimit.patch: -------------------------------------------------------------------------------- 1 | prlimit(2) returns ENOSYS on Linux 2.6.32-5-xen-amd64 as found on 2 | hydra.gnu.org, and strace(1) doesn't recognize it. 3 | 4 | --- glib-2.34.3/glib/tests/thread.c 2012-11-20 15:27:12.000000000 +0100 5 | +++ glib-2.34.3/glib/tests/thread.c 2013-03-27 14:48:31.000000000 +0100 6 | @@ -130,7 +130,7 @@ test_thread3 (void) 7 | static void 8 | test_thread4 (void) 9 | { 10 | -#ifdef HAVE_PRLIMIT 11 | +#if 0 12 | struct rlimit ol, nl; 13 | GThread *thread; 14 | GError *error; 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/glib-tests-timer.patch: -------------------------------------------------------------------------------- 1 | * On i686 floating-point roundoff errors could sometimes cause this check to 2 | fail depending on the elapsed microseconds. Improve rounding by adding a 3 | fractional bit. 4 | 5 | * The /timer/stop test fails if compiler optimizations are enabled, which they 6 | are by default. Disable that test. 7 | 8 | --- glib-2.40.0/glib/tests/timer.c 2014-03-05 08:05:42.000000000 -0600 9 | +++ glib-2.40.0/glib/tests/timer.c 2014-07-10 16:33:12.746862822 -0500 10 | @@ -35,7 +35,7 @@ 11 | elapsed = g_timer_elapsed (timer, µs); 12 | 13 | g_assert_cmpfloat (elapsed, <, 1.0); 14 | - g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6)) % 1000000); 15 | + g_assert_cmpuint (micros, ==, ((guint64)(elapsed * 1e6 + 0.5)) % 1000000); 16 | 17 | g_timer_destroy (timer); 18 | } 19 | @@ -204,7 +204,6 @@ 20 | g_test_init (&argc, &argv, NULL); 21 | 22 | g_test_add_func ("/timer/basic", test_timer_basic); 23 | - g_test_add_func ("/timer/stop", test_timer_stop); 24 | g_test_add_func ("/timer/continue", test_timer_continue); 25 | g_test_add_func ("/timer/reset", test_timer_reset); 26 | g_test_add_func ("/timeval/add", test_timeval_add); 27 | -------------------------------------------------------------------------------- /gnu/packages/patches/glibc-bootstrap-system.patch: -------------------------------------------------------------------------------- 1 | We want to allow builds in chroots that lack /bin/sh. Thus, system(3) 2 | and popen(3) need to be tweaked to use the right shell. For the bootstrap 3 | glibc, we just use whatever `sh' can be found in $PATH. The final glibc 4 | instead uses the hard-coded absolute file name of `bash'. 5 | 6 | --- a/sysdeps/posix/system.c 7 | +++ b/sysdeps/posix/system.c 8 | @@ -134,7 +134,7 @@ do_system (const char *line) 9 | INIT_LOCK (); 10 | 11 | /* Exec the shell. */ 12 | - (void) __execve (SHELL_PATH, (char *const *) new_argv, __environ); 13 | + (void) __execvpe (SHELL_NAME, (char *const *) new_argv, __environ); 14 | _exit (127); 15 | } 16 | else if (pid < (pid_t) 0) 17 | 18 | --- b/libio/iopopen.c 2012-06-30 21:12:34.000000000 +0200 19 | +++ b/libio/iopopen.c 2012-12-19 12:52:29.000000000 +0100 20 | @@ -226,7 +226,7 @@ _IO_new_proc_open (fp, command, mode) 21 | _IO_close (fd); 22 | } 23 | 24 | - _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0); 25 | + execlp ("sh", "sh", "-c", command, (char *) 0); 26 | _IO__exit (127); 27 | } 28 | _IO_close (child_end); 29 | -------------------------------------------------------------------------------- /gnu/packages/patches/glibc-hurd-extern-inline.patch: -------------------------------------------------------------------------------- 1 | This changes the way _EXTERN_INLINE is defined so we can 2 | avoid external definition errors. 3 | https://lists.gnu.org/archive/html/bug-hurd/2014-04/msg00002.html 4 | 5 | diff --git a/signal/sigsetops.c b/signal/sigsetops.c 6 | index 0317662..b92c296 100644 7 | --- a/signal/sigsetops.c 8 | +++ b/signal/sigsetops.c 9 | @@ -3,7 +3,9 @@ 10 | 11 | #include 12 | 13 | -#define _EXTERN_INLINE 14 | +#ifndef _EXTERN_INLINE 15 | +#define _EXTERN_INLINE __extern_inline 16 | +#endif 17 | #ifndef __USE_EXTERN_INLINES 18 | # define __USE_EXTERN_INLINES 1 19 | #endif 20 | 21 | Link libmachuser and libhurduser automatically with libc, since they are 22 | considered a standard part of the API in GNU-land. 23 | 24 | --- a/Makerules 25 | +++ b/Makerules 26 | @@ -978,6 +978,9 @@ 27 | '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ 28 | ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \ 29 | ) > $@.new 30 | +ifeq ($(patsubst gnu%,,$(config-os)),) 31 | + echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> $@.new 32 | +endif 33 | mv -f $@.new $@ 34 | 35 | endif -------------------------------------------------------------------------------- /gnu/packages/patches/glibc-ldd-x86_64.patch: -------------------------------------------------------------------------------- 1 | By default, 'RTDLLIST' in 'ldd' refers to 'lib64/ld-linux-x86-64.so', whereas 2 | it's in 'lib/' for us. This patch fixes that. 3 | 4 | --- glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2012-12-25 04:02:13.000000000 +0100 5 | +++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed 2013-09-15 23:08:03.000000000 +0200 6 | @@ -1,3 +1,3 @@ 7 | /LD_TRACE_LOADED_OBJECTS=1/a\ 8 | add_env="$add_env LD_LIBRARY_VERSION=\\$verify_out" 9 | -s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \264\4-x86-64\6 \2x32\4-x32\6"_ 10 | +s_^\(RTLDLIST=\)\(.*lib\)\(\|64\|x32\)\(/[^/]*\)\(-x86-64\|-x32\)\(\.so\.[0-9.]*\)[ ]*$_\1"\2\4\6 \2\4-x86-64\6 \2x32\4-x32\6"_ 11 | -------------------------------------------------------------------------------- /gnu/packages/patches/glibc-locale-incompatibility.patch: -------------------------------------------------------------------------------- 1 | This patch avoids an assertion failure when incompatible locale data 2 | is encountered: 3 | 4 | https://sourceware.org/ml/libc-alpha/2015-09/msg00575.html 5 | 6 | --- glibc-2.22/locale/loadlocale.c 2015-09-22 17:16:02.321981548 +0200 7 | +++ glibc-2.22/locale/loadlocale.c 2015-09-22 17:17:34.814659064 +0200 8 | @@ -120,10 +120,11 @@ 9 | _nl_value_type_LC_XYZ array. There are all pointers. */ 10 | switch (category) 11 | { 12 | -#define CATTEST(cat) \ 13 | - case LC_##cat: \ 14 | - assert (cnt < (sizeof (_nl_value_type_LC_##cat) \ 15 | - / sizeof (_nl_value_type_LC_##cat[0]))); \ 16 | +#define CATTEST(cat) \ 17 | + case LC_##cat: \ 18 | + if (cnt >= (sizeof (_nl_value_type_LC_##cat) \ 19 | + / sizeof (_nl_value_type_LC_##cat[0]))) \ 20 | + goto puntdata; \ 21 | break 22 | CATTEST (NUMERIC); 23 | CATTEST (TIME); 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/glibc-o-largefile.patch: -------------------------------------------------------------------------------- 1 | This fixes 2 | whereby, on 32-bit platforms, libc 2.22 would fail to pass O_LARGEFILE 3 | to 'openat'. This was caught by 'tests/sparse03.at' in the tar 4 | test suite. 5 | 6 | commit eb32b0d40308166c4d8f6330cc2958cb1e545075 7 | Author: Andreas Schwab 8 | Date: Mon Aug 10 14:12:47 2015 +0200 9 | 10 | Readd O_LARGEFILE flag for openat64 (bug 18781) 11 | 12 | --- a/sysdeps/unix/sysv/linux/openat.c 13 | +++ b/sysdeps/unix/sysv/linux/openat.c 14 | @@ -68,6 +68,11 @@ __OPENAT (int fd, const char *file, int oflag, ...) 15 | va_end (arg); 16 | } 17 | 18 | + /* We have to add the O_LARGEFILE flag for openat64. */ 19 | +#ifdef MORE_OFLAGS 20 | + oflag |= MORE_OFLAGS; 21 | +#endif 22 | + 23 | return SYSCALL_CANCEL (openat, fd, file, oflag, mode); 24 | } 25 | libc_hidden_def (__OPENAT) 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/gmp-arm-asm-nothumb.patch: -------------------------------------------------------------------------------- 1 | 2 | # HG changeset patch 3 | # User Torbjorn Granlund 4 | # Date 1396602422 -7200 5 | # Node ID 676e2d0f0e4dd301a7066079d2c9326c25c34a40 6 | # Parent 0194a75b56b21a9196626430af86c5bd9110c42d 7 | Conditionalise ARM asm on !__thumb__. 8 | 9 | diff -r 0194a75b56b2 -r 676e2d0f0e4d mpn/generic/div_qr_1n_pi1.c 10 | --- a/mpn/generic/div_qr_1n_pi1.c Thu Apr 03 23:58:51 2014 +0200 11 | +++ b/mpn/generic/div_qr_1n_pi1.c Fri Apr 04 11:07:02 2014 +0200 12 | @@ -130,7 +130,7 @@ 13 | "%2" ((UDItype)(a0)), "r" ((UDItype)(b0)) __CLOBBER_CC) 14 | #endif 15 | 16 | -#if defined (__arm__) && W_TYPE_SIZE == 32 17 | +#if defined (__arm__) && !defined (__thumb__) && W_TYPE_SIZE == 32 18 | #define add_mssaaaa(m, sh, sl, ah, al, bh, bl) \ 19 | __asm__ ( "adds %2, %5, %6\n\t" \ 20 | "adcs %1, %3, %4\n\t" \ 21 | 22 | -------------------------------------------------------------------------------- /gnu/packages/patches/gmp-faulty-test.patch: -------------------------------------------------------------------------------- 1 | Skip a test that randomly fails on ARMv7: . 2 | 3 | --- a/tests/mpz/reuse.c 4 | +++ b/tests/mpz/reuse.c 5 | @@ -213,6 +213,7 @@ main (int argc, char **argv) 6 | mpz_t bs; 7 | unsigned long bsi, size_range; 8 | 9 | + exit (77); /* skip */ 10 | tests_start (); 11 | TESTS_REPS (reps, argv, argc); 12 | -------------------------------------------------------------------------------- /gnu/packages/patches/gnucash-price-quotes-perl.patch: -------------------------------------------------------------------------------- 1 | After wrapping gnc-fq-check and gnc-fq-helper we can no longer execute them 2 | with perl, so execute them directly instead. 3 | 4 | --- gnucash-2.6.6/src/scm/price-quotes.scm.orig 2014-04-27 17:42:28.000000000 -0500 5 | +++ gnucash-2.6.6/src/scm/price-quotes.scm 2015-07-09 16:12:11.196218472 -0500 6 | @@ -74,7 +74,7 @@ 7 | (define (start-program) 8 | (if (not (string-null? gnc:*finance-quote-check*)) 9 | (set! program (gnc-spawn-process-async 10 | - (list "perl" "-w" gnc:*finance-quote-check*) #t)))) 11 | + (list gnc:*finance-quote-check*) #t)))) 12 | 13 | (define (get-sources) 14 | (if (not (null? program)) 15 | @@ -158,7 +158,7 @@ 16 | (define (start-quoter) 17 | (if (not (string-null? gnc:*finance-quote-helper*)) 18 | (set! quoter (gnc-spawn-process-async 19 | - (list "perl" "-w" gnc:*finance-quote-helper*) #t)))) 20 | + (list gnc:*finance-quote-helper*) #t)))) 21 | 22 | (define (get-quotes) 23 | (if (not (null? quoter)) 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: -------------------------------------------------------------------------------- 1 | # Names of libraries included in typelib files are opened by dlopen. Here we 2 | # add the full path. 3 | # 4 | # This patch was provided by Luca Bruno for 5 | # 'gobject-introspection' 1.40.0 in Nix. 6 | --- ./giscanner/utils.py.orig 2014-08-14 22:05:05.055334080 +0200 7 | +++ ./giscanner/utils.py 2014-08-14 22:05:24.687497334 +0200 8 | @@ -110,17 +110,11 @@ 9 | if dlname is None: 10 | return None 11 | 12 | - # Darwin uses absolute paths where possible; since the libtool files never 13 | - # contain absolute paths, use the libdir field 14 | - if platform.system() == 'Darwin': 15 | - dlbasename = os.path.basename(dlname) 16 | - libdir = _extract_libdir_field(la_file) 17 | - if libdir is None: 18 | - return dlbasename 19 | - return libdir + '/' + dlbasename 20 | - # From the comments in extract_libtool(), older libtools had 21 | - # a path rather than the raw dlname 22 | - return os.path.basename(dlname) 23 | + dlbasename = os.path.basename(dlname) 24 | + libdir = _extract_libdir_field(la_file) 25 | + if libdir is None: 26 | + return dlbasename 27 | + return libdir + '/' + dlbasename 28 | 29 | 30 | def extract_libtool(la_file): 31 | -------------------------------------------------------------------------------- /gnu/packages/patches/gobject-introspection-cc.patch: -------------------------------------------------------------------------------- 1 | Use gcc as the default C compiler if CC is not set. 2 | 3 | 4 | --- gobject-introspection-1.44.0.orig/giscanner/__init__.py 2014-08-04 22:37:07.000000000 +0800 5 | +++ gobject-introspection-1.44.0/giscanner/__init__.py 2015-04-20 17:30:26.507697234 +0800 6 | @@ -22,3 +22,5 @@ 7 | builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') 8 | if builddir is not None: 9 | __path__.append(os.path.join(builddir, 'giscanner')) 10 | +if not 'CC' in os.environ: 11 | + os.environ['CC'] = 'gcc' 12 | -------------------------------------------------------------------------------- /gnu/packages/patches/gobject-introspection-girepository.patch: -------------------------------------------------------------------------------- 1 | --- a/girepository/gitypelib.c.orig 2 | +++ b/girepository/gitypelib.c 3 | @@ -2296,7 +2296,22 @@ _g_typelib_do_dlopen (GITypelib *typelib) 4 | { 5 | GModule *module; 6 | 7 | + /* 'gobject-introspection' doesn't store the path of shared 8 | + libraries into '.typelib' and '.gir' files. Shared 9 | + libraries are searched for in the dynamic linker search 10 | + path. In Guix we patch 'gobject-introspection' such that 11 | + it stores the absolute path of shared libraries in 12 | + '.typelib' and '.gir' files. Here, in order to minimize 13 | + side effects, we make sure that if the library is not 14 | + found at the indicated path location, we try with just 15 | + the basename and the system dynamic library 16 | + infrastructure, as per default behaviour of the 17 | + library. */ 18 | module = load_one_shared_library (shlibs[i]); 19 | + if (module == NULL && g_path_is_absolute (shlibs[i])) 20 | + { 21 | + module = load_one_shared_library (g_basename(shlibs[i])); 22 | + } 23 | 24 | if (module == NULL) 25 | { 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/grep-CVE-2015-1345.patch: -------------------------------------------------------------------------------- 1 | Fix CVE-2015-1345. From upstream commit 2 | 83a95bd8c8561875b948cadd417c653dbe7ef2e2 3 | by Yuliy Pisetsky . 4 | 5 | diff --git a/src/kwset.c b/src/kwset.c 6 | index 4003c8d..376f7c3 100644 7 | --- a/src/kwset.c 8 | +++ b/src/kwset.c 9 | @@ -643,6 +643,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size) 10 | if (! tp) 11 | return -1; 12 | tp++; 13 | + if (ep <= tp) 14 | + break; 15 | } 16 | } 17 | } 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/grub-freetype.patch: -------------------------------------------------------------------------------- 1 | commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb 2 | Author: Colin Watson 3 | Date: Fri Nov 29 12:19:36 2013 +0000 4 | 5 | Fix build with FreeType 2.5.1 6 | 7 | * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than 8 | , fixing build with FreeType 2.5.1. 9 | * util/grub-gen-widthspec.c: Likewise. 10 | * util/grub-mkfont.c: Likewise. 11 | 12 | diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c 13 | index 0d8eb78..242dd01 100644 14 | --- a/util/grub-mkfont.c 15 | +++ b/util/grub-mkfont.c 16 | @@ -43,7 +43,7 @@ 17 | #include FT_FREETYPE_H 18 | #include FT_TRUETYPE_TAGS_H 19 | #include FT_TRUETYPE_TABLES_H 20 | -#include 21 | +#include FT_SYNTHESIS_H 22 | 23 | #undef __FTERRORS_H__ 24 | #define FT_ERROR_START_LIST const char *ft_errmsgs[] = { 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/guile-1.8-cpp-4.5.patch: -------------------------------------------------------------------------------- 1 | Fix doc snarfing with GCC 4.5+. 2 | From . 3 | 4 | diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi 5 | index ea33e17..8cd42e8 100755 6 | --- a/scripts/snarf-check-and-output-texi 7 | +++ b/scripts/snarf-check-and-output-texi 8 | @@ -267,6 +267,17 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" 9 | (set! *file* file) 10 | (set! *line* line)) 11 | 12 | + ;; newer gccs like to throw around more location markers into the 13 | + ;; preprocessed source; these (hash . hash) bits are what they translate to 14 | + ;; in snarfy terms. 15 | + (('location ('string . file) ('int . line) ('hash . 'hash)) 16 | + (set! *file* file) 17 | + (set! *line* line)) 18 | + 19 | + (('location ('hash . 'hash) ('string . file) ('int . line) ('hash . 'hash)) 20 | + (set! *file* file) 21 | + (set! *line* line)) 22 | + 23 | (('arglist rest ...) 24 | (set! *args* (do-arglist rest))) 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/guile-present-coding.patch: -------------------------------------------------------------------------------- 1 | The tests/org-mode.scm tests expects 'jpl-outline-es' to be read as UTF-8. 2 | 3 | --- guile-present-0.3.0/tests/org-mode.scm 2014-09-23 22:29:51.426705753 +0200 4 | +++ guile-present-0.3.0/tests/org-mode.scm 2014-09-23 22:30:09.634705548 +0200 5 | @@ -194,9 +194,10 @@ 6 | "(Just another hacker)" 7 | "wingo@fluendo.com") 8 | (p "Julien Moutte, CEO" "julien@fluendo.com"))) 9 | + (with-fluids ((%default-port-encoding "UTF-8")) 10 | (call-with-input-file 11 | (in-vicinity *top-srcdir* "tests/jpl-outline-es") 12 | - org->presentation))) 13 | + org->presentation)))) 14 | 15 | (setlocale LC_ALL "") 16 | (exit-with-summary (run-all-defined-test-cases)) 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/guile-rsvg-pkgconfig.patch: -------------------------------------------------------------------------------- 1 | This patch fixes a bug in guile-rsvg's build system, whereby the CFLAGS 2 | and LDFLAGS for Guile would not be captured. 3 | 4 | --- guile-rsvg-2.18.1/configure.ac 2015-08-31 22:30:30.578909480 +0200 5 | +++ guile-rsvg-2.18.1/configure.ac 2015-08-31 22:32:15.071516084 +0200 6 | @@ -39,6 +39,10 @@ AC_SUBST(WARN_CFLAGS) 7 | 8 | GUILE_PKG([2.2 2.0 1.8]) 9 | 10 | +dnl The above macro fails to set the 'GUILE_CFLAGS' and 'GUILE_LIBS' 11 | +dnl substitution variables, hence this line. 12 | +PKG_CHECK_MODULES(GUILE, guile-2.0) 13 | + 14 | PKG_CHECK_MODULES(GUILE_CAIRO, guile-cairo >= 1.4.0) 15 | AC_SUBST(GUILE_CAIRO_LIBS) 16 | AC_SUBST(GUILE_CAIRO_CFLAGS) 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/hydra-disable-darcs-test.patch: -------------------------------------------------------------------------------- 1 | --- hydra-20150407.4c0e3e4/tests/evaluation-tests.pl 2015-04-15 12:00:19.000000000 -0500 2 | +++ hydra-20150407.4c0e3e4/tests/evaluation-tests.pl 2015-04-17 08:53:04.940301471 -0500 3 | @@ -7,7 +7,7 @@ 4 | 5 | my $db = Hydra::Model::DB->new; 6 | 7 | -use Test::Simple tests => 72; 8 | +use Test::Simple tests => 68; 9 | 10 | hydra_setup($db); 11 | 12 | @@ -103,13 +103,6 @@ 13 | uri => "$jobsBaseUri/hg-repo", 14 | update => getcwd . "/jobs/hg-update.sh" 15 | }, 16 | - { 17 | - name => "darcs", 18 | - nixexpr => "darcs-input.nix", 19 | - type => "darcs", 20 | - uri => "$jobsBaseUri/darcs-repo", 21 | - update => getcwd . "/jobs/darcs-update.sh" 22 | - } 23 | ); 24 | 25 | foreach my $scm ( @scminputs ) { 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/icecat-avoid-bundled-includes.patch: -------------------------------------------------------------------------------- 1 | Do not use headers from bundled libraries. 2 | 3 | --- icecat-38.3.0/xpcom/build/moz.build.orig 2015-10-12 19:33:43.000000000 -0400 4 | +++ icecat-38.3.0/xpcom/build/moz.build 2015-10-13 16:37:28.693224858 -0400 5 | @@ -92,10 +92,5 @@ 6 | '/docshell/base', 7 | ] 8 | 9 | -if CONFIG['MOZ_VPX']: 10 | - LOCAL_INCLUDES += [ 11 | - '/media/libvpx', 12 | - ] 13 | - 14 | if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': 15 | CXXFLAGS += CONFIG['TK_CFLAGS'] 16 | --- icecat-38.3.0/storage/src/moz.build.orig 2015-10-12 19:34:45.000000000 -0400 17 | +++ icecat-38.3.0/storage/src/moz.build 2015-10-13 18:48:26.584724518 -0400 18 | @@ -66,7 +66,6 @@ 19 | DEFINES['SQLITE_MAX_LIKE_PATTERN_LENGTH'] = 50000 20 | 21 | LOCAL_INCLUDES += [ 22 | - '/db/sqlite3/src', 23 | '/dom/base', 24 | ] 25 | 26 | --- icecat-38.3.0/dom/indexedDB/moz.build.orig 2015-10-12 19:35:00.000000000 -0400 27 | +++ icecat-38.3.0/dom/indexedDB/moz.build 2015-10-13 19:10:10.528756487 -0400 28 | @@ -91,7 +91,6 @@ 29 | FAIL_ON_WARNINGS = True 30 | 31 | LOCAL_INCLUDES += [ 32 | - '/db/sqlite3/src', 33 | '/dom/base', 34 | '/dom/storage', 35 | '/dom/workers', 36 | -------------------------------------------------------------------------------- /gnu/packages/patches/icu4c-CVE-2014-6585.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | description: out-of-bounds read 4 | origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2014-6585 5 | 6 | --- a/source/layout/LETableReference.h 7 | +++ b/source/layout/LETableReference.h 8 | @@ -322,7 +322,12 @@ LE_TRACE_TR("INFO: new RTAO") 9 | } 10 | 11 | const T& operator()(le_uint32 i, LEErrorCode &success) const { 12 | - return *getAlias(i,success); 13 | + const T *ret = getAlias(i,success); 14 | + if (LE_FAILURE(success) || ret==NULL) { 15 | + return *(new T()); 16 | + } else { 17 | + return *ret; 18 | + } 19 | } 20 | 21 | size_t getOffsetFor(le_uint32 i, LEErrorCode &success) const { 22 | -------------------------------------------------------------------------------- /gnu/packages/patches/icu4c-CVE-2015-1270.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | diff --git a/source/common/ucnv_io.cpp b/source/common/ucnv_io.cpp 4 | index 5dd35d8..4424664 100644 5 | --- a/source/common/ucnv_io.cpp 6 | +++ b/source/common/ucnv_io.cpp 7 | @@ -744,7 +744,7 @@ ucnv_io_getConverterName(const char *alias, UBool *containsOption, UErrorCode *p 8 | * the name begins with 'x-'. If it does, strip it off and try 9 | * again. This behaviour is similar to how ICU4J does it. 10 | */ 11 | - if (aliasTmp[0] == 'x' || aliasTmp[1] == '-') { 12 | + if (aliasTmp[0] == 'x' && aliasTmp[1] == '-') { 13 | aliasTmp = aliasTmp+2; 14 | } else { 15 | break; 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/imagemagick-test-segv.patch: -------------------------------------------------------------------------------- 1 | This patch works around a segmentation fault in 'Magick++/tests/color' when 2 | running 'Magick++/tests/tests.tap'. Here we get an exception early on, which 3 | is supposedly harmless: 4 | 5 | Caught exception: color: UnableToOpenConfigureFile `colors.xml' @ warning/configure.c/GetConfigureOptions/706 6 | 7 | However, when the stack unwinders run, 'UnregisterDOTImage' gets called even 8 | though 'RegisterDOTImage' hadn't been called yet; thus, 'graphic_context' in 9 | coders/dot.c is NULL, leading to the segfault. 10 | 11 | --- ImageMagick-6.9.2-1/coders/dot.c 2015-09-16 17:32:42.900323334 +0200 12 | +++ ImageMagick-6.9.2-1/coders/dot.c 2015-09-16 17:32:48.312367636 +0200 13 | @@ -240,6 +240,7 @@ ModuleExport void UnregisterDOTImage(voi 14 | (void) UnregisterMagickInfo("GV"); 15 | (void) UnregisterMagickInfo("DOT"); 16 | #if defined(MAGICKCORE_GVC_DELEGATE) 17 | + if (graphic_context != NULL) 18 | gvFreeContext(graphic_context); 19 | #endif 20 | } 21 | -------------------------------------------------------------------------------- /gnu/packages/patches/jasper-CVE-2008-3522.patch: -------------------------------------------------------------------------------- 1 | Fix CVE-2008-3522 (buffer overflow in 'jas_stream_printf'). 2 | Patch from . 3 | 4 | --- jasper-1.900.1/src/libjasper/base/jas_stream.c 2008-09-08 14:56:01.000000000 +0200 5 | +++ jasper-1.900.1/src/libjasper/base/jas_stream.c 2008-09-08 14:58:16.000000000 +0200 6 | @@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre 7 | int ret; 8 | 9 | va_start(ap, fmt); 10 | - ret = vsprintf(buf, fmt, ap); 11 | + ret = vsnprintf(buf, sizeof buf, fmt, ap); 12 | jas_stream_puts(stream, buf); 13 | va_end(ap); 14 | return ret; 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/jbig2dec-ignore-testtest.patch: -------------------------------------------------------------------------------- 1 | Do not run the "testtest script", it doesn't seem to do anything and reports 2 | failiute. TODO: Actually fix the test instead of ignoring it. 3 | 4 | --- a/Makefile.in 2010-02-02 20:13:56.000000000 +0100 5 | +++ b/Makefile.in 2014-09-13 17:50:10.957816767 +0200 6 | @@ -181,7 +181,7 @@ 7 | 8 | MAINTAINERCLEANFILES = config_types.h.in 9 | 10 | -TESTS = test_sha1 test_jbig2dec.py test_huffman test_arith 11 | +TESTS = test_sha1 test_huffman test_arith 12 | 13 | test_sha1_SOURCES = sha1.c sha1.h 14 | test_sha1_CFLAGS = -DTEST 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/julia-0.3.10-fix-empty-array.patch: -------------------------------------------------------------------------------- 1 | See https://github.com/JuliaLang/julia/issues/11817 2 | 3 | --- a/src/codegen.cpp 2015-06-24 12:44:31.218674066 +0200 4 | +++ b/src/codegen.cpp 2015-04-23 11:19:50.000000000 +0200 5 | @@ -4551,7 +4551,7 @@ 6 | #ifdef V128_BUG 7 | "-avx", 8 | #endif 9 | - }; 10 | + ""}; 11 | SmallVector MAttrs(mattr, mattr+sizeof(mattr)/sizeof(mattr[0])); 12 | EngineBuilder eb = EngineBuilder(engine_module) 13 | .setEngineKind(EngineKind::JIT) 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/liba52-enable-pic.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | Description: Disabling -prefer-non-pic which enables -fPIC 4 | Bug-Debian: http://bugs.debian.org/401590 5 | Author: Daniel Baumann , Dmitrijs Ledkovs 6 | 7 | 8 | --- 9 | liba52/configure.incl | 3 --- 10 | 1 files changed, 0 insertions(+), 3 deletions(-) 11 | 12 | Index: a52dec-deb/liba52/configure.incl 13 | =================================================================== 14 | --- a52dec-deb.orig/liba52/configure.incl 2009-12-05 02:52:12.000000000 +0000 15 | +++ a52dec-deb/liba52/configure.incl 2009-12-05 03:23:45.000000000 +0000 16 | @@ -1,9 +1,6 @@ 17 | AC_SUBST([LIBA52_CFLAGS]) 18 | AC_SUBST([LIBA52_LIBS]) 19 | 20 | -dnl avoid -fPIC when possible 21 | -LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic" 22 | - 23 | AC_ARG_ENABLE([double], 24 | [ --enable-double use double-precision samples]) 25 | if test x"$enable_double" = x"yes"; then 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/liba52-link-with-libm.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | Description: Explicitely link against -lm 4 | Bug-Debian: http://bugs.debian.org/553595 5 | Author: Fabian Greffrath , Dmitrijs Ledkovs 6 | 7 | --- 8 | libao/Makefile.am | 1 + 9 | src/Makefile.am | 2 +- 10 | 2 files changed, 2 insertions(+), 1 deletions(-) 11 | 12 | --- a/src/Makefile.am 13 | +++ b/src/Makefile.am 14 | @@ -1,9 +1,9 @@ 15 | -CFLAGS = @A52DEC_CFLAGS@ 16 | +AM_CFLAGS = @A52DEC_CFLAGS@ 17 | 18 | bin_PROGRAMS = a52dec extract_a52 19 | a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c 20 | a52dec_LDADD = $(top_builddir)/liba52/liba52.la \ 21 | - $(top_builddir)/libao/libao.a @LIBAO_LIBS@ 22 | + $(top_builddir)/libao/libao.a @LIBAO_LIBS@ -lm 23 | extract_a52_SOURCES = extract_a52.c getopt.c 24 | 25 | man_MANS = a52dec.1 extract_a52.1 26 | --- a/liba52/Makefile.am 27 | +++ b/liba52/Makefile.am 28 | @@ -1,4 +1,4 @@ 29 | -CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@ 30 | +AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@ 31 | 32 | lib_LTLIBRARIES = liba52.la 33 | 34 | -------------------------------------------------------------------------------- /gnu/packages/patches/liba52-set-soname.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | Description: Sets the soname to liba52-$(VERSION).so 4 | Bug-Debian: http://bugs.debian.org/401636 5 | Author: Daniel Baumann , Dmitrijs Ledkovs 6 | 7 | 8 | --- 9 | liba52/Makefile.am | 2 +- 10 | 1 files changed, 1 insertions(+), 1 deletions(-) 11 | 12 | Index: a52dec-deb/liba52/Makefile.am 13 | =================================================================== 14 | --- a52dec-deb.orig/liba52/Makefile.am 2009-12-05 02:52:12.000000000 +0000 15 | +++ a52dec-deb/liba52/Makefile.am 2009-12-05 03:23:47.000000000 +0000 16 | @@ -4,6 +4,6 @@ 17 | 18 | liba52_la_SOURCES = bitstream.c imdct.c bit_allocate.c parse.c downmix.c 19 | liba52_la_LIBADD = @LIBA52_LIBS@ -lm 20 | -liba52_la_LDFLAGS = -no-undefined 21 | +liba52_la_LDFLAGS = -no-undefined -release @VERSION@ 22 | 23 | EXTRA_DIST = configure.incl a52_internal.h bitstream.h tables.h 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/liba52-use-mtune-not-mcpu.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Rodeo 4 | Origin: https://github.com/HandBrake/HandBrake/blob/master/contrib/a52dec/A04-modern-gcc-cflags.patch 5 | 6 | --- a52dec-0.7.4/configure.in.orig 7 | +++ a52dec-0.7.4/configure.in 8 | @@ -34,11 +34,11 @@ 9 | case "$host" in 10 | i?86-* | k?-*) 11 | case "$host" in 12 | - i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; 13 | - i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; 14 | - i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; 15 | - i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; 16 | - k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; 17 | + i386-*) OPT_CFLAGS="$CFLAGS -mtune=i386";; 18 | + i486-*) OPT_CFLAGS="$CFLAGS -mtune=i486";; 19 | + i586-*) OPT_CFLAGS="$CFLAGS -mtune=pentium";; 20 | + i686-*) OPT_CFLAGS="$CFLAGS -mtune=pentiumpro";; 21 | + k6-*) OPT_CFLAGS="$CFLAGS -mtune=k6";; 22 | esac 23 | AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; 24 | sparc-* | sparc64-*) 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/libarchive-CVE-2013-0211.patch: -------------------------------------------------------------------------------- 1 | Description: Fix CVE-2013-0211: read buffer overflow on 64-bit systems 2 | Origin: upstream 3 | Bug-Debian: http://bugs.debian.org/703957 4 | Forwarded: not-needed 5 | 6 | --- libarchive-3.0.4.orig/libarchive/archive_write.c 7 | +++ libarchive-3.0.4/libarchive/archive_write.c 8 | @@ -665,8 +665,13 @@ static ssize_t 9 | _archive_write_data(struct archive *_a, const void *buff, size_t s) 10 | { 11 | struct archive_write *a = (struct archive_write *)_a; 12 | + const size_t max_write = INT_MAX; 13 | + 14 | archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, 15 | ARCHIVE_STATE_DATA, "archive_write_data"); 16 | + /* In particular, this catches attempts to pass negative values. */ 17 | + if (s > max_write) 18 | + s = max_write; 19 | archive_clear_error(&a->archive); 20 | return ((a->format_write_data)(a, buff, s)); 21 | } 22 | -------------------------------------------------------------------------------- /gnu/packages/patches/libarchive-mtree-filename-length-fix.patch: -------------------------------------------------------------------------------- 1 | Description: Patch to fix filename length calculation when writing mtree archives. 2 | Author: Dave Reisner 3 | Origin: upstream 4 | 5 | --- a/libarchive/archive_write_set_format_mtree.c 6 | +++ b/libarchive/archive_write_set_format_mtree.c 7 | @@ -1855,9 +1855,9 @@ 8 | return (ret); 9 | } 10 | 11 | - /* Make a basename from dirname and slash */ 12 | + /* Make a basename from file->parentdir.s and slash */ 13 | *slash = '\0'; 14 | - file->parentdir.length = slash - dirname; 15 | + file->parentdir.length = slash - file->parentdir.s; 16 | archive_strcpy(&(file->basename), slash + 1); 17 | return (ret); 18 | } 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/libbonobo-activation-test-race.patch: -------------------------------------------------------------------------------- 1 | The tests in race_empty non-deterministically fail with the error message: 2 | 3 | ** (process:10183): WARNING **: Async activation error activating 'IDL:Empty:1.0' : 'System exception: IDL:Bonobo/GeneralError:1.0 : Child process did not give an error message, unknown failure occurred' 4 | FAILED 3 of 17: async activation 5 | 6 | --- a/tests/test-activation/bonobo-activation-test.c 2014-07-01 23:45:10.830466301 -0500 7 | +++ b/tests/test-activation/bonobo-activation-test.c 2014-07-01 23:57:53.122485584 -0500 8 | @@ -299,7 +299,7 @@ 9 | g_assert (ORBit_small_get_connection_status (ac) == 10 | ORBIT_CONNECTION_CONNECTED); 11 | 12 | - race_empty (&ev); 13 | + passed+=2; 14 | 15 | 16 | 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch: -------------------------------------------------------------------------------- 1 | # We insert a hook called "@SOUND_THEME_DIRECTORY@" where, at build time, we 2 | # insert the directory of the package "sound-theme-freedesktop" in the store. 3 | 4 | --- src/sound-theme-spec.c.orig 2015-01-11 13:13:29.520527358 +0100 5 | +++ src/sound-theme-spec.c 2015-01-11 14:27:23.035046849 +0100 6 | @@ -321,9 +321,13 @@ 7 | const char *g; 8 | 9 | if (!(g = getenv("XDG_DATA_DIRS")) || *g == 0) 10 | - return "/usr/local/share:/usr/share"; 11 | - 12 | - return g; 13 | + return "@SOUND_THEME_DIRECTORY@"; 14 | + else { 15 | + const char *stp = ":@SOUND_THEME_DIRECTORY@"; 16 | + size_t len = strlen(stp) + strlen(g) + 1; 17 | + char *g2 = (char*) malloc(len); 18 | + return strcat(strcpy(g2, g), stp); 19 | + } 20 | } 21 | 22 | static int load_theme_dir(ca_theme_data *t, const char *name) { 23 | -------------------------------------------------------------------------------- /gnu/packages/patches/libevent-dns-tests.patch: -------------------------------------------------------------------------------- 1 | Disable tests that rely on usable DNS lookups, which aren't available 2 | in build chroots. 3 | 4 | --- libevent-2.0.21-stable/test/regress_dns.c 2013-01-20 22:32:09.000000000 +0100 5 | +++ libevent-2.0.21-stable/test/regress_dns.c 2013-01-20 22:32:30.000000000 +0100 6 | @@ -1827,10 +1827,6 @@ end: 7 | 8 | struct testcase_t dns_testcases[] = { 9 | DNS_LEGACY(server, TT_FORK|TT_NEED_BASE), 10 | - DNS_LEGACY(gethostbyname, TT_FORK|TT_NEED_BASE|TT_NEED_DNS), 11 | - DNS_LEGACY(gethostbyname6, TT_FORK|TT_NEED_BASE|TT_NEED_DNS), 12 | - DNS_LEGACY(gethostbyaddr, TT_FORK|TT_NEED_BASE|TT_NEED_DNS), 13 | - { "resolve_reverse", dns_resolve_reverse, TT_FORK, NULL, NULL }, 14 | { "search", dns_search_test, TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, 15 | { "search_cancel", dns_search_cancel_test, 16 | TT_FORK|TT_NEED_BASE, &basic_setup, NULL }, 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/liblxqt-include.patch: -------------------------------------------------------------------------------- 1 | Patch to fix build with Qt 5.5, taken from upstream: 2 | https://github.com/lxde/liblxqt/commit/7303ea207de0771d6f450a31ec4a1ce69202869b 3 | 4 | diff -u -r liblxqt-0.9.0.orig/lxqtnotification.h liblxqt-0.9.0/lxqtnotification.h 5 | --- liblxqt-0.9.0.orig/lxqtnotification.h 2015-07-27 22:49:05.365166482 +0200 6 | +++ liblxqt-0.9.0/lxqtnotification.h 2015-07-27 22:49:36.897606619 +0200 7 | @@ -25,6 +25,7 @@ 8 | #ifndef LXQTNOTIFICATION_H 9 | #define LXQTNOTIFICATION_H 10 | 11 | +#include 12 | #include 13 | #include "lxqtglobals.h" 14 | 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/libmad-armv7-thumb-pt1.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Konstantinos Margaritis 4 | Subject: use "adr" instead of "add" to make code ready for thumb2 5 | 6 | --- ./imdct_l_arm.S.orig 2010-02-25 13:25:23.000000000 +0100 7 | +++ ./imdct_l_arm.S 2010-02-25 13:27:26.000000000 +0100 8 | @@ -468,7 +468,7 @@ 9 | 10 | @---- 11 | 12 | - add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?) 13 | + adr r2, imdct36_long_karray 14 | 15 | 16 | loop: 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/libmad-armv7-thumb-pt2.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Dave Martin 4 | Subject: "rsc" doesnt exist anymore in thumb2 5 | 6 | diff --git a/fixed.h b/fixed.h 7 | index 4b58abf..ba4bc26 100644 8 | --- a/fixed.h 9 | +++ b/fixed.h 10 | @@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y) 11 | : "+r" (lo), "+r" (hi) \ 12 | : "%r" (x), "r" (y)) 13 | 14 | +#ifdef __thumb__ 15 | +/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero 16 | + operand. If needed this code can also support Thumb-1 17 | + (simply append "s" to the end of the second two instructions). */ 18 | +# define MAD_F_MLN(hi, lo) \ 19 | + asm ("rsbs %0, %0, #0\n\t" \ 20 | + "sbc %1, %1, %1\n\t" \ 21 | + "sub %1, %1, %2" \ 22 | + : "+&r" (lo), "=&r" (hi) \ 23 | + : "r" (hi) \ 24 | + : "cc") 25 | +#else /* ! __thumb__ */ 26 | # define MAD_F_MLN(hi, lo) \ 27 | asm ("rsbs %0, %2, #0\n\t" \ 28 | "rsc %1, %3, #0" \ 29 | - : "=r" (lo), "=r" (hi) \ 30 | + : "=&r" (lo), "=r" (hi) \ 31 | : "0" (lo), "1" (hi) \ 32 | : "cc") 33 | +#endif /* __thumb__ */ 34 | 35 | # define mad_f_scale64(hi, lo) \ 36 | ({ mad_fixed_t __result; \ 37 | -------------------------------------------------------------------------------- /gnu/packages/patches/libmad-mips-newgcc.patch: -------------------------------------------------------------------------------- 1 | Fix MIPS assembly code to work with newer GCC, where the "=h" 2 | constraint is no longer supported. 3 | 4 | --- libmad/fixed.h.orig 2004-02-16 21:02:03.000000000 -0500 5 | +++ libmad/fixed.h 2011-10-29 18:47:21.000000000 -0400 6 | @@ -304,8 +304,8 @@ 7 | * significant bit depends on OPT_ACCURACY via mad_f_scale64(). 8 | */ 9 | # define MAD_F_MLX(hi, lo, x, y) \ 10 | - asm ("mult %2,%3" \ 11 | - : "=l" (lo), "=h" (hi) \ 12 | + asm ("mult %2,%3\n\tmfhi %1" \ 13 | + : "=l" (lo), "=r" (hi) \ 14 | : "%r" (x), "r" (y)) 15 | 16 | # if defined(HAVE_MADD_ASM) 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/liboop-mips64-deplibs-fix.patch: -------------------------------------------------------------------------------- 1 | Patch configure script to choose pass_all deplibs check method for 2 | linux-gnu* systems on mips64. This is a temporary hack until liboop 3 | bootstraps their build system with a newer libtool. 4 | 5 | Patch by Mark H Weaver . 6 | 7 | --- liboop/configure.orig 2003-10-26 11:41:19.000000000 -0500 8 | +++ liboop/configure 2013-11-02 18:09:11.079995796 -0400 9 | @@ -3395,7 +3395,7 @@ 10 | # This must be Linux ELF. 11 | linux*) 12 | case $host_cpu in 13 | - alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*) 14 | + alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | mips64 | mips64el | powerpc* | sparc* | s390* | sh*) 15 | lt_cv_deplibs_check_method=pass_all ;; 16 | *) 17 | # glibc up to 2.1.1 does not perform some relocations on ARM 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/libtool-skip-tests2.patch: -------------------------------------------------------------------------------- 1 | Skip the nopic test on ARM and MIPS systems. 2 | 3 | --- libtool-2.4.6/tests/demo.at.orig 2015-01-16 13:52:04.000000000 -0500 4 | +++ libtool-2.4.6/tests/demo.at 2015-02-16 10:48:51.435851966 -0500 5 | @@ -510,7 +510,7 @@ 6 | AT_SETUP([force non-PIC objects]) 7 | 8 | AT_CHECK([case $host in 9 | -hppa*|x86_64*|s390*) 10 | +hppa*|x86_64*|s390*|arm*|mips*) 11 | # These hosts cannot use non-PIC shared libs 12 | exit 77 ;; 13 | *-solaris*|*-sunos*) 14 | --- libtool-2.4.6/tests/testsuite.orig 2015-02-15 11:15:25.000000000 -0500 15 | +++ libtool-2.4.6/tests/testsuite 2015-02-16 10:50:58.736483216 -0500 16 | @@ -8741,7 +8741,7 @@ 17 | 18 | { set +x 19 | $as_echo "$at_srcdir/demo.at:535: case \$host in 20 | -hppa*|x86_64*|s390*) 21 | +hppa*|x86_64*|s390*|arm*|mips*) 22 | # These hosts cannot use non-PIC shared libs 23 | exit 77 ;; 24 | *-solaris*|*-sunos*) 25 | @@ -8766,7 +8766,7 @@ 26 | " 27 | at_fn_check_prepare_notrace 'a `...` command substitution' "demo.at:535" 28 | ( $at_check_trace; case $host in 29 | -hppa*|x86_64*|s390*) 30 | +hppa*|x86_64*|s390*|arm*|mips*) 31 | # These hosts cannot use non-PIC shared libs 32 | exit 77 ;; 33 | *-solaris*|*-sunos*) 34 | -------------------------------------------------------------------------------- /gnu/packages/patches/libunwind-CVE-2015-3239.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | https://bugzilla.redhat.com/show_bug.cgi?id=1232265 4 | http://pkgs.fedoraproject.org/cgit/libunwind.git/tree/libunwind-1.1-fix-CVE-2015-3239.patch 5 | 6 | diff -up libunwind-1.1/include/dwarf_i.h.CVE20153239 libunwind-1.1/include/dwarf_i.h 7 | --- libunwind-1.1/include/dwarf_i.h.CVE20153239 2015-07-10 13:38:36.404996748 -0400 8 | +++ libunwind-1.1/include/dwarf_i.h 2015-07-10 13:39:25.050707613 -0400 9 | @@ -20,7 +20,7 @@ 10 | extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH]; 11 | /* REG is evaluated multiple times; it better be side-effects free! */ 12 | # define dwarf_to_unw_regnum(reg) \ 13 | - (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) 14 | + (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) 15 | #endif 16 | 17 | #ifdef UNW_LOCAL_ONLY 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CAN-2004-0941.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/libwmf.git/tree/libwmf-0.2.8.4-CAN-2004-0941.patch 4 | 5 | --- libwmf-0.2.8.4/src/extra/gd/gd_png.c 2004-11-11 14:02:37.407589824 -0500 6 | +++ libwmf-0.2.8.4/src/extra/gd/gd_png.c 2004-11-11 14:04:29.672522960 -0500 7 | @@ -188,6 +188,14 @@ 8 | 9 | png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 10 | &interlace_type, NULL, NULL); 11 | + if (overflow2(sizeof (int), width)) 12 | + { 13 | + return NULL; 14 | + } 15 | + if (overflow2(sizeof (int) * width, height)) 16 | + { 17 | + return NULL; 18 | + } 19 | if ((color_type == PNG_COLOR_TYPE_RGB) || 20 | (color_type == PNG_COLOR_TYPE_RGB_ALPHA)) 21 | { 22 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2006-3376.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | --- libwmf-0.2.8.4.orig/src/player.c 4 | +++ libwmf-0.2.8.4/src/player.c 5 | @@ -23,6 +23,7 @@ 6 | 7 | #include 8 | #include 9 | +#include 10 | #include 11 | #include 12 | 13 | @@ -132,8 +133,14 @@ 14 | } 15 | } 16 | 17 | -/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); 18 | - */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); 19 | + if (MAX_REC_SIZE(API) > UINT32_MAX / 2) 20 | + { 21 | + API->err = wmf_E_InsMem; 22 | + WMF_DEBUG (API,"bailing..."); 23 | + return (API->err); 24 | + } 25 | + 26 | + P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); 27 | 28 | if (ERR (API)) 29 | { WMF_DEBUG (API,"bailing..."); 30 | 31 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2007-0455.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/libwmf.git/tree/libwmf-0.2.8.4-CVE-2007-0455.patch 4 | 5 | --- libwmf-0.2.8.4/src/extra/gd/gdft.c 2010-12-06 11:18:26.000000000 +0000 6 | +++ libwmf-0.2.8.4/src/extra/gd/gdft.c 2010-12-06 11:21:09.000000000 +0000 7 | @@ -811,7 +811,7 @@ 8 | { 9 | ch = c & 0xFF; /* don't extend sign */ 10 | } 11 | - next++; 12 | + if (*next) next++; 13 | } 14 | else 15 | { 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2007-2756.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/libwmf.git/tree/libwmf-0.2.8.4-CVE-2007-2756.patch 4 | 5 | --- libwmf-0.2.8.4/src/extra/gd/gd_png.c 1 Apr 2007 20:41:01 -0000 1.21.2.1 6 | +++ libwmf-0.2.8.4/src/extra/gd/gd_png.c 16 May 2007 19:06:11 -0000 7 | @@ -78,8 +78,11 @@ 8 | gdPngReadData (png_structp png_ptr, 9 | png_bytep data, png_size_t length) 10 | { 11 | - gdGetBuf (data, length, (gdIOCtx *) 12 | - png_get_io_ptr (png_ptr)); 13 | + int check; 14 | + check = gdGetBuf (data, length, (gdIOCtx *) png_get_io_ptr (png_ptr)); 15 | + if (check != length) { 16 | + png_error(png_ptr, "Read Error: truncated data"); 17 | + } 18 | } 19 | 20 | static void 21 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2007-3473.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/libwmf.git/tree/libwmf-0.2.8.4-CVE-2007-3473.patch 4 | 5 | --- libwmf-0.2.8.4/src/extra/gd/gd.c 6 | +++ libwmf-0.2.8.4/src/extra/gd/gd.c 7 | @@ -2483,6 +2483,10 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromXbm (FILE * fd) 8 | } 9 | bytes = (w * h / 8) + 1; 10 | im = gdImageCreate (w, h); 11 | + if (!im) { 12 | + return 0; 13 | + } 14 | + 15 | gdImageColorAllocate (im, 255, 255, 255); 16 | gdImageColorAllocate (im, 0, 0, 0); 17 | x = 0; 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2007-3477.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/libwmf.git/tree/libwmf-0.2.8.4-CVE-2007-3477.patch 4 | 5 | --- libwmf-0.2.8.4/src/extra/gd/gd.c 6 | +++ libwmf-0.2.8.4/src/extra/gd/gd.c 7 | @@ -1335,10 +1335,31 @@ 8 | int w2, h2; 9 | w2 = w / 2; 10 | h2 = h / 2; 11 | - while (e < s) 12 | - { 13 | - e += 360; 14 | - } 15 | + 16 | + if ((s % 360) == (e % 360)) { 17 | + s = 0; e = 360; 18 | + } else { 19 | + if (s > 360) { 20 | + s = s % 360; 21 | + } 22 | + 23 | + if (e > 360) { 24 | + e = e % 360; 25 | + } 26 | + 27 | + while (s < 0) { 28 | + s += 360; 29 | + } 30 | + 31 | + while (e < s) { 32 | + e += 360; 33 | + } 34 | + 35 | + if (s == e) { 36 | + s = 0; e = 360; 37 | + } 38 | + } 39 | + 40 | for (i = s; (i <= e); i++) 41 | { 42 | int x, y; 43 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2009-1364.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | --- libwmf-0.2.8.4.orig/src/extra/gd/gd_clip.c 4 | +++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c 5 | @@ -70,6 +70,7 @@ 6 | { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); 7 | if (more == 0) return; 8 | im->clip->max += 8; 9 | + im->clip->list = more; 10 | } 11 | im->clip->list[im->clip->count] = (*rect); 12 | im->clip->count++; 13 | 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2009-3546.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/libwmf.git/tree/libwmf-0.2.8.4-CVE-2009-3546.patch 4 | 5 | --- libwmf-0.2.8.4/src/extra/gd/gd_gd.c 2010-12-06 14:56:06.000000000 +0000 6 | +++ libwmf-0.2.8.4/src/extra/gd/gd_gd.c 2010-12-06 14:57:04.000000000 +0000 7 | @@ -42,6 +42,10 @@ 8 | { 9 | goto fail1; 10 | } 11 | + if (&im->colorsTotal > gdMaxColors) 12 | + { 13 | + goto fail1; 14 | + } 15 | } 16 | /* Int to accommodate truecolor single-color transparency */ 17 | if (!gdGetInt (&im->transparent, in)) 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/libwmf-CVE-2015-4696.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/libwmf.git/tree/libwmf-0.2.8.4-CVE-2015-4696.patch 4 | 5 | --- libwmf-0.2.8.4/src/player/meta.h 6 | +++ libwmf-0.2.8.4/src/player/meta.h 7 | @@ -2585,6 +2585,8 @@ 8 | polyrect.BR[i] = clip->rects[i].BR; 9 | } 10 | 11 | + if (FR->region_clip) FR->region_clip (API,&polyrect); 12 | + 13 | wmf_free (API,polyrect.TL); 14 | wmf_free (API,polyrect.BR); 15 | } 16 | @@ -2593,9 +2595,10 @@ 17 | polyrect.BR = 0; 18 | 19 | polyrect.count = 0; 20 | + 21 | + if (FR->region_clip) FR->region_clip (API,&polyrect); 22 | } 23 | 24 | - if (FR->region_clip) FR->region_clip (API,&polyrect); 25 | 26 | return (changed); 27 | } 28 | -------------------------------------------------------------------------------- /gnu/packages/patches/libxslt-CVE-2015-7995.patch: -------------------------------------------------------------------------------- 1 | From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 2 | From: Daniel Veillard 3 | Date: Thu, 29 Oct 2015 19:33:23 +0800 4 | Subject: [PATCH] Fix for type confusion in preprocessing attributes 5 | 6 | CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10 7 | We need to check that the parent node is an element before dereferencing 8 | its namespace 9 | --- 10 | libxslt/preproc.c | 3 ++- 11 | 1 file changed, 2 insertions(+), 1 deletion(-) 12 | 13 | diff --git a/libxslt/preproc.c b/libxslt/preproc.c 14 | index 0eb80a0..7f69325 100644 15 | --- a/libxslt/preproc.c 16 | +++ b/libxslt/preproc.c 17 | @@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) { 18 | } else if (IS_XSLT_NAME(inst, "attribute")) { 19 | xmlNodePtr parent = inst->parent; 20 | 21 | - if ((parent == NULL) || (parent->ns == NULL) || 22 | + if ((parent == NULL) || 23 | + (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || 24 | ((parent->ns != inst->ns) && 25 | (!xmlStrEqual(parent->ns->href, inst->ns->href))) || 26 | (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { 27 | -- 28 | 2.6.3 29 | 30 | -------------------------------------------------------------------------------- /gnu/packages/patches/lirc-localstatedir.patch: -------------------------------------------------------------------------------- 1 | Do not try to create $localstatedir as we cannot do this when it is /var. 2 | 3 | --- lirc-0.9.2a/daemons/Makefile.in 4 | +++ lirc-0.9.2a/daemons/Makefile.in 5 | @@ -790,9 +790,6 @@ 6 | uninstall-local uninstall-sbinPROGRAMS 7 | 8 | 9 | -install-exec-local: 10 | - test -d $(DESTDIR)$(varrundir)/$(PACKAGE) \ 11 | - || mkdir -p $(DESTDIR)$(varrundir)/$(PACKAGE) 12 | uninstall-local: 13 | -$(RM) $(DESTDIR)$(varrundir)/$(PACKAGE)/lircd 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/luajit-no_ldconfig.patch: -------------------------------------------------------------------------------- 1 | From 629200f48e18dc1a3a5229739748bad0e2a6a0a2 Mon Sep 17 00:00:00 2001 2 | From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= 3 | Date: Wed, 4 Feb 2015 11:37:16 +0100 4 | Subject: [PATCH] Do not silently and prematurely end install when ldconfig is 5 | missing 6 | 7 | --- 8 | Makefile | 7 ++++--- 9 | 1 file changed, 4 insertions(+), 3 deletions(-) 10 | 11 | diff --git a/Makefile b/Makefile 12 | index 343ecb5..4667146 100644 13 | --- a/Makefile 14 | +++ b/Makefile 15 | @@ -112,9 +112,10 @@ install: $(INSTALL_DEP) 16 | $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) 17 | cd src && test -f $(FILE_SO) && \ 18 | $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ 19 | - $(LDCONFIG) $(INSTALL_LIB) && \ 20 | - $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ 21 | - $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : 22 | + ( $(LDCONFIG) $(INSTALL_LIB) ; \ 23 | + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ 24 | + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : \ 25 | + ) 26 | cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) 27 | cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ 28 | $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ 29 | -- 30 | 2.2.2 31 | 32 | -------------------------------------------------------------------------------- /gnu/packages/patches/luajit-symlinks.patch: -------------------------------------------------------------------------------- 1 | From 0a54a8f125d7ab508c7c88d5ad4ed1b0c63cb5b6 Mon Sep 17 00:00:00 2001 2 | From: =?utf8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= 3 | Date: Wed, 4 Feb 2015 11:32:55 +0100 4 | Subject: [PATCH 1/2] Provide two symlinks for dynamic library during install 5 | 6 | --- 7 | Makefile | 2 +- 8 | 1 file changed, 1 insertion(+), 1 deletion(-) 9 | 10 | diff --git a/Makefile b/Makefile 11 | index 0891b71..343ecb5 100644 12 | --- a/Makefile 13 | +++ b/Makefile 14 | @@ -56,7 +56,7 @@ INSTALL_PCNAME= luajit.pc 15 | INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) 16 | INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) 17 | INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) 18 | -INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) 19 | +INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT).$(MAJVER) 20 | INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) 21 | INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) 22 | INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) 23 | -- 24 | 2.2.2 25 | 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/luit-posix.patch: -------------------------------------------------------------------------------- 1 | See https://bugs.freedesktop.org/show_bug.cgi?id=47792; 2 | should become obsolete with the next release. 3 | 4 | diff -u luit-1.1.1.orig/sys.c luit-1.1.1/sys.c 5 | --- luit-1.1.1.orig/sys.c 2012-03-23 05:23:07.000000000 +0100 6 | +++ luit-1.1.1/sys.c 2013-11-27 22:45:53.000000000 +0100 7 | @@ -20,6 +20,8 @@ 8 | THE SOFTWARE. 9 | */ 10 | 11 | +#define _XOPEN_SOURCE 600 12 | + 13 | #ifdef HAVE_CONFIG_H 14 | # include "config.h" 15 | #endif 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/make-impure-dirs.patch: -------------------------------------------------------------------------------- 1 | Purity: don't look for library dependencies (of the form `-lfoo') in 2 | /lib and /usr/lib. Likewise, when searching for included Makefiles, 3 | don't look in /usr/include and friends. 4 | 5 | Patch from Nixpkgs, by Eelco Dolstra. 6 | 7 | diff -rc make-3.81-orig/read.c make-3.81/read.c 8 | *** make-3.81-orig/read.c 2006-03-17 15:24:20.000000000 +0100 9 | --- make-3.81/read.c 2007-05-24 17:16:31.000000000 +0200 10 | *************** 11 | *** 99,107 **** 12 | --- 99,109 ---- 13 | #endif 14 | INCLUDEDIR, 15 | #ifndef _AMIGA 16 | + #if 0 17 | "/usr/gnu/include", 18 | "/usr/local/include", 19 | "/usr/include", 20 | + #endif 21 | #endif 22 | 0 23 | }; 24 | diff -rc make-3.81-orig/remake.c make-3.81/remake.c 25 | *** make-3.81-orig/remake.c 2006-03-20 03:36:37.000000000 +0100 26 | --- make-3.81/remake.c 2007-05-24 17:06:54.000000000 +0200 27 | *************** 28 | *** 1452,1460 **** 29 | --- 1452,1462 ---- 30 | static char *dirs[] = 31 | { 32 | #ifndef _AMIGA 33 | + #if 0 34 | "/lib", 35 | "/usr/lib", 36 | #endif 37 | + #endif 38 | #if defined(WINDOWS32) && !defined(LIBDIR) 39 | /* 40 | * This is completely up to the user at product install time. Just define 41 | -------------------------------------------------------------------------------- /gnu/packages/patches/mars-install.patch: -------------------------------------------------------------------------------- 1 | Remove install target for non-existant directory. 2 | 3 | --- a/src/CMakeLists.txt 2015-09-13 20:52:28.517344327 +0200 4 | +++ b/src/CMakeLists.txt 2015-09-13 20:53:04.842453987 +0200 5 | @@ -122,12 +122,6 @@ 6 | DESTINATION 7 | ${CMAKE_INSTALL_PREFIX}/share/applications 8 | ) 9 | - install( 10 | - FILES 11 | - ${MARS_SOURCE_DIR}/resources/mars 12 | - DESTINATION 13 | - ${CMAKE_INSTALL_PREFIX}/share/menu 14 | - ) 15 | 16 | else(UNIX) 17 | # executable 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/maxima-defsystem-mkdir.patch: -------------------------------------------------------------------------------- 1 | Change 'ensure-directories-exist' to look for 'mkdir' in $PATH, not in /bin. 2 | 3 | --- maxima-5.36.1/lisp-utils/defsystem.lisp.orig 2014-11-22 16:21:30.000000000 -0500 4 | +++ maxima-5.36.1/lisp-utils/defsystem.lisp 2015-05-25 21:53:31.223648483 -0400 5 | @@ -4627,7 +4627,7 @@ 6 | (cmd (if (member :win32 *features*) 7 | (format nil "mkdir \"~a\"" 8 | (coerce (subst #\\ #\/ (coerce (namestring dir) 'list)) 'string)) 9 | - (format nil "/bin/mkdir -p ~S" (namestring dir))))) 10 | + (format nil "mkdir -p ~S" (namestring dir))))) 11 | (unless (directory dir) 12 | (lisp:system cmd)) 13 | ;; The second return value is supposed to be T if directories were 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/mc-fix-ncurses-build.patch: -------------------------------------------------------------------------------- 1 | Patch cherry-picked from resolution of 2 | http://www.midnight-commander.org/ticket/3114 3 | 4 | --- a/lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f) 5 | +++ b/lib/tty/key.c (revision d870aedad1907773f8586fe818a89e6b5178b849) 6 | @@ -1947,4 +1947,5 @@ 7 | { 8 | int c; 9 | + int flag = 0; /* Return value from select */ 10 | #ifdef HAVE_LIBGPM 11 | static struct Gpm_Event ev; /* Mouse event */ 12 | @@ -1979,5 +1980,4 @@ 13 | { 14 | int nfd; 15 | - static int flag = 0; /* Return value from select */ 16 | fd_set select_set; 17 | 18 | --- a/lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c) 19 | +++ b/lib/tty/tty-ncurses.c (revision d870aedad1907773f8586fe818a89e6b5178b849) 20 | @@ -50,4 +50,5 @@ 21 | #include "tty.h" 22 | #include "color-internal.h" 23 | +#include "key.h" 24 | #include "mouse.h" 25 | #include "win.h" 26 | @@ -531,4 +532,5 @@ 27 | { 28 | int res; 29 | + unsigned char str[UTF8_CHAR_LEN + 1]; 30 | 31 | res = g_unichar_to_utf8 (c, (char *) str); 32 | @@ -541,5 +543,4 @@ 33 | else 34 | { 35 | - unsigned char str[UTF8_CHAR_LEN + 1]; 36 | const char *s; 37 | 38 | -------------------------------------------------------------------------------- /gnu/packages/patches/mcron-install.patch: -------------------------------------------------------------------------------- 1 | This patch allows us to install the Vixie-compatible binaries as 2 | non-root without creating /var/run, etc. 3 | 4 | --- mcron-1.0.6/makefile.in 2010-06-19 20:44:17.000000000 +0200 5 | +++ mcron-1.0.6/makefile.in 2010-07-04 16:16:25.000000000 +0200 6 | @@ -1004,15 +1004,11 @@ mcron.c : main.scm crontab.scm makefile. 7 | @rm -f mcron.escaped.scm > /dev/null 2>&1 8 | 9 | install-exec-hook: 10 | - @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" -a "`id -u`" -eq "0" ]; then \ 11 | + @if [ "x@NO_VIXIE_CLOBBER@" != "xyes" ]; then \ 12 | rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \ 13 | $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \ 14 | rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \ 15 | $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \ 16 | - $(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \ 17 | - $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \ 18 | - $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \ 19 | - $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \ 20 | elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \ 21 | echo "Not installing Vixie-style programs"; \ 22 | else \ 23 | -------------------------------------------------------------------------------- /gnu/packages/patches/mhash-keygen-test-segfault.patch: -------------------------------------------------------------------------------- 1 | This patch from resolution of https://sourceforge.net/p/mhash/bugs/37/ 2 | 3 | --- a/src/keygen_test.c 4 | +++ b/src/keygen_test.c 5 | @@ -121,8 +121,6 @@ 6 | 7 | mhash_keygen_ext(KEYGEN_S2K_SALTED, data, key, keysize, password, passlen); 8 | 9 | - mutils_memset(tmp, 0, keysize * 2); 10 | - 11 | tmp = mutils_asciify(key, keysize); 12 | 13 | result = mutils_strcmp((mutils_word8 *) KEY2, tmp); 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/mpc123-initialize-ao.patch: -------------------------------------------------------------------------------- 1 | Description: Zero ao_sample_format structure to cope with libao 1.0.0 2 | Author: Colin Watson 3 | Bug-Debian: http://bugs.debian.org/591396 4 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/710268 5 | Forwarded: no 6 | Last-Update: 2013-05-07 7 | 8 | Index: b/ao.c 9 | =================================================================== 10 | --- a/ao.c 11 | +++ b/ao.c 12 | @@ -123,6 +123,7 @@ 13 | 14 | /* initialize ao_format struct */ 15 | /* XXX VERY WRONG */ 16 | + memset(&ao_fmt, 0, sizeof(ao_fmt)); 17 | ao_fmt.bits=16; /*tmp_stream_info.average_bitrate;*/ 18 | ao_fmt.rate=streaminfo->sample_freq; 19 | ao_fmt.channels=streaminfo->channels; 20 | -------------------------------------------------------------------------------- /gnu/packages/patches/mumps-build-parallelism.patch: -------------------------------------------------------------------------------- 1 | Building sublibraries in parallel can lead to race conditions on the libseq 2 | and lipord targets. 3 | 4 | --- MUMPS_5.0.0/Makefile.orig 2015-06-15 10:08:54.523146562 -0500 5 | +++ MUMPS_5.0.0/Makefile 2015-06-15 10:19:44.074367512 -0500 6 | @@ -11,6 +11,7 @@ 7 | sexamples dexamples cexamples zexamples \ 8 | mumps_lib requiredobj libseqneeded clean 9 | 10 | +.NOTPARALLEL: 11 | alllib: c z s d 12 | all: cexamples zexamples sexamples dexamples 13 | 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/mutt-store-references.patch: -------------------------------------------------------------------------------- 1 | By default 'mutt' embeds configure flags and the output of 'gcc -v', 2 | which contains the store file name of Bash and GCC. This patch makes 3 | sure we don't embed a reference to these in 'mutt'. 4 | 5 | --- mutt-1.5.23/txt2c.sh 2015-06-26 22:56:56.500731643 +0200 6 | +++ mutt-1.5.23/txt2c.sh 2015-06-26 22:57:26.664583900 +0200 7 | @@ -21,6 +21,8 @@ txt2c_fallback () { 8 | echo ";" 9 | } 10 | 11 | +echo "unsigned char $1[] = \"value of '$1' not kept\";" 12 | +exit 0 13 | ./txt2c test /dev/null 2>&1 && 14 | ./txt2c "$1" || 15 | txt2c_fallback "$1" 16 | 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/ngircd-handle-zombies.patch: -------------------------------------------------------------------------------- 1 | The Guile process taking the role of PID 1 during Guix builds does not reap 2 | zombie processes, which makes them continue responding to "kill -0". 3 | 4 | --- a/src/testsuite/stop-server.sh 2015-02-05 11:24:00.535908842 +0100 5 | +++ b/src/testsuite/stop-server.sh 2015-02-05 11:25:00.264351349 +0100 6 | @@ -1,6 +1,21 @@ 7 | #!/bin/sh 8 | # ngIRCd Test Suite 9 | 10 | +process_is_alive(){ 11 | + ! process_is_dead "$1" && ! process_is_undead "$1" 12 | +} 13 | + 14 | +process_is_dead(){ 15 | + ! kill -0 "$1" 16 | +} 17 | + 18 | +process_is_undead(){ 19 | + case $(ps -p "$1" -o state=) in 20 | + (Z*) true ;; 21 | + (*) false ;; 22 | + esac 23 | +} 24 | + 25 | [ -z "$srcdir" ] && srcdir=`dirname $0` 26 | 27 | # read in functions 28 | @@ -24,7 +40,7 @@ 29 | 30 | # waiting ... 31 | for i in 1 2 3 4 5; do 32 | - kill -0 $pid > /dev/null 2>&1; r=$? 33 | + process_is_alive $pid > /dev/null 2>&1; r=$? 34 | if [ $r -ne 0 ]; then 35 | echo " ok". 36 | exit 0 37 | -------------------------------------------------------------------------------- /gnu/packages/patches/ninja-zero-mtime.patch: -------------------------------------------------------------------------------- 1 | Work around a design defect in Ninja whereby a zero mtime is used to 2 | denote missing files (we happen to produce files that have a zero mtime 3 | and yet really do exist.) 4 | 5 | --- ninja-1.5.3/src/disk_interface.cc 2014-11-24 18:37:47.000000000 +0100 6 | +++ ninja-1.5.3/src/disk_interface.cc 2015-07-18 23:20:38.572290139 +0200 7 | @@ -194,6 +194,12 @@ TimeStamp RealDiskInterface::Stat(const 8 | } 9 | return -1; 10 | } 11 | + 12 | + if (st.st_mtime == 0) 13 | + // All the code assumes that mtime == 0 means "file missing". Here we 14 | + // know the file is not missing, so tweak the mtime. 15 | + st.st_mtime = 1; 16 | + 17 | return st.st_mtime; 18 | #endif 19 | } 20 | -------------------------------------------------------------------------------- /gnu/packages/patches/nvi-assume-preserve-path.patch: -------------------------------------------------------------------------------- 1 | Make configure assume nvi can store backups in /var/tmp. 2 | 3 | --- a/dist/configure 2014-09-01 14:46:01.075778095 +0200 4 | +++ b/dist/configure 2014-09-01 14:52:08.411790122 +0200 5 | @@ -21319,23 +21319,8 @@ 6 | if test "${vi_cv_path_preserve+set}" = set; then 7 | echo $ECHO_N "(cached) $ECHO_C" >&6 8 | else 9 | - dirlist="/var/preserve /var/tmp /usr/tmp" 10 | - vi_cv_path_preserve=no 11 | - for i in $dirlist; do 12 | - if test -d $i/vi.recover; then 13 | - vi_cv_path_preserve=$i/vi.recover 14 | - break; 15 | - fi 16 | - done 17 | - if test "$vi_cv_path_preserve" = no; then 18 | - for i in $dirlist; do 19 | - if test -d $i -a -w $i; then 20 | - vi_cv_path_preserve=$i/vi.recover 21 | - break; 22 | - fi 23 | - done 24 | - 25 | - fi 26 | +# Assume /var/tmp 27 | + vi_cv_path_preserve=/var/tmp/vi.recover 28 | fi 29 | 30 | if test "$vi_cv_path_preserve" = no; then 31 | -------------------------------------------------------------------------------- /gnu/packages/patches/nvi-db4.patch: -------------------------------------------------------------------------------- 1 | This patch originates from the Debian project, see https://www.debian.org/ 2 | 3 | 03db4.dpatch by 4 | 5 | 6 | libdb4 compatibility adjustments. 7 | 8 | In particular, this patch adds extra file permission checking and passes the 9 | DB_CREATE flag to the first invocation of db_open on the file's database 10 | structure, which rids us of the following message: 11 | 12 | BDB0635 DB_CREATE must be specified to create databases. 13 | 14 | --- nvi-1.81.6.orig/common/msg.c 2009-02-26 14:26:58.350336128 +0100 15 | +++ nvi-1.81.6/common/msg.c 2009-02-26 14:29:05.235335829 +0100 16 | @@ -724,9 +724,18 @@ 17 | p = buf; 18 | } else 19 | p = file; 20 | + if (access(p, F_OK) != 0) { 21 | + if (first) { 22 | + first = 0; 23 | + return (1); 24 | + } 25 | + sp->db_error = ENOENT; 26 | + msgq_str(sp, M_DBERR, p, "%s"); 27 | + return (1); 28 | + } 29 | if ((sp->db_error = db_create(&db, 0, 0)) != 0 || 30 | (sp->db_error = db->set_re_source(db, p)) != 0 || 31 | - (sp->db_error = db_open(db, NULL, DB_RECNO, 0, 0)) != 0) { 32 | + (sp->db_error = db_open(db, NULL, DB_RECNO, DB_CREATE, 0)) != 0) { 33 | if (first) { 34 | first = 0; 35 | return (1); 36 | -------------------------------------------------------------------------------- /gnu/packages/patches/openexr-missing-samples.patch: -------------------------------------------------------------------------------- 1 | This patch comments out tests that rely on files that are missing 2 | from the source tarball. 3 | 4 | --- openexr-2.2.0/IlmImfTest/testSampleImages.cpp 2015-02-25 16:19:21.565105625 +0100 5 | +++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp 2015-02-25 16:21:46.394128206 +0100 6 | @@ -162,16 +162,6 @@ testSampleImages (const std::string&) 7 | compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr", 8 | ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr"); 9 | 10 | - compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr", 11 | - ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); 12 | - compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr", 13 | - ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr"); 14 | - 15 | - compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr", 16 | - ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); 17 | - compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr", 18 | - ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr"); 19 | - 20 | 21 | cout << "ok\n" << endl; 22 | } 23 | 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/openssl-c-rehash.patch: -------------------------------------------------------------------------------- 1 | This patch removes the explicit reference to the 'perl' binary, 2 | such that OpenSSL does not retain a reference to Perl. 3 | 4 | The 'c_rehash' program is seldom used, but it is used nonetheless 5 | to create symbolic links to certificates, for instance in the 'nss-certs' 6 | package. 7 | 8 | --- openssl-1.0.2d/tools/c_rehash 2015-09-09 18:36:07.313316482 +0200 9 | +++ openssl-1.0.2d/tools/c_rehash 2015-09-09 18:36:28.965458458 +0200 10 | @@ -1,4 +1,6 @@ 11 | -#!/usr/bin/perl 12 | +eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' 13 | + & eval 'exec perl -wS "$0" $argv:q' 14 | + if 0; 15 | 16 | # Perl c_rehash script, scan all files in a directory 17 | # and add symbolic links to their hash values. 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/openssl-runpath.patch: -------------------------------------------------------------------------------- 1 | This patch makes the build system pass -Wl,-rpath=$out/lib even for 2 | libraries (it already does so for executables, thanks to 'DO_GNU_APP' 3 | in 'Makefile.shared'.) 4 | 5 | --- openssl-1.0.2a/Makefile.shared 2015-04-05 01:07:35.357602454 +0200 6 | +++ openssl-1.0.2a/Makefile.shared 2015-04-05 01:09:50.474513303 +0200 7 | @@ -106,7 +106,7 @@ LINK_SO= \ 8 | LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ 9 | LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ 10 | LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ 11 | - $${SHAREDCMD} $${SHAREDFLAGS} \ 12 | + $${SHAREDCMD} $${SHAREDFLAGS} -Wl,-rpath,$(LIBRPATH) \ 13 | -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ 14 | $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ 15 | ) && $(SYMLINK_SO) 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/ots-no-include-missing-file.patch: -------------------------------------------------------------------------------- 1 | The file $(top_srcdir)/gtk-doc.make doesn't exist, so don't include it. 2 | 3 | --- a/doc/Makefile.in 2007-04-08 20:17:25.000000000 +0200 4 | +++ b/doc/Makefile.in 2014-09-06 23:19:41.413397662 +0200 5 | @@ -240,9 +240,6 @@ 6 | distclean-generic clean-generic maintainer-clean-generic clean \ 7 | mostlyclean distclean maintainer-clean 8 | 9 | - 10 | -include $(top_srcdir)/gtk-doc.make 11 | - 12 | # Tell versions [3.59,3.63) of GNU make to not export all variables. 13 | # Otherwise a system limit (for SysV at least) may be exceeded. 14 | .NOEXPORT: 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/patchutils-xfail-gendiff-tests.patch: -------------------------------------------------------------------------------- 1 | The gendiff1 and gendiff2 tests need the gendiff script that's distributed 2 | with the rpm package management tool. Without that script, these tests are 3 | expected to fail. 4 | 5 | Need to mark one of the tests as PHONY to get permissions set correctly on 6 | built scripts. 7 | 8 | --- a/Makefile.in 2011-02-10 09:44:43.000000000 -0600 9 | +++ b/Makefile.in 2014-03-06 17:27:55.610048953 -0600 10 | @@ -378,6 +378,8 @@ 11 | # These ones don't work yet. 12 | # Feel free to send me patches. :-) 13 | XFAIL_TESTS = \ 14 | + tests/gendiff1/run-test \ 15 | + tests/gendiff2/run-test \ 16 | tests/delhunk5/run-test \ 17 | tests/delhunk6/run-test 18 | 19 | @@ -1106,6 +1108,7 @@ 20 | rm -f $(DESTDIR)$(bindir)/"`echo lsdiff|sed '$(transform)'`" 21 | rm -f $(DESTDIR)$(bindir)/"`echo grepdiff|sed '$(transform)'`" 22 | 23 | +.PHONY: tests/combine1/run-test 24 | tests/combine1/run-test: src/combinediff$(EXEEXT) src/flipdiff$(EXEEXT) \ 25 | src/lsdiff$(EXEEXT) src/grepdiff$(EXEEXT) 26 | for script in $(bin_SCRIPTS); do \ 27 | -------------------------------------------------------------------------------- /gnu/packages/patches/perl-autosplit-default-time.patch: -------------------------------------------------------------------------------- 1 | AutoSplit will fail to create an index for files whose modification time is 0 2 | because its default time for a non-existent index is 1. Set this default time 3 | to -1 instead. 4 | 5 | --- perl-5.16.1/cpan/AutoLoader/lib/AutoSplit.pm.orig 2012-02-14 22:44:36.000000000 -0600 6 | +++ perl-5.16.1/cpan/AutoLoader/lib/AutoSplit.pm 2015-09-09 19:59:22.208708921 -0500 7 | @@ -361,7 +361,7 @@ 8 | my($al_idx_file) = catfile($autodir, $modpname, $IndexFile); 9 | 10 | if ($check_mod_time){ 11 | - my($al_ts_time) = (stat("$al_idx_file"))[9] || 1; 12 | + my($al_ts_time) = (stat("$al_idx_file"))[9] || -1; 13 | if ($al_ts_time >= $pm_mod_time and 14 | $al_ts_time >= $self_mod_time){ 15 | print "AutoSplit skipped ($al_idx_file newer than $filename)\n" 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch: -------------------------------------------------------------------------------- 1 | Rather than unconditionally using Mozilla's CA certificates, let the user tell 2 | LWP's UserAgent where to find certificates with the PERL_LWP_SSL_CA_FILE, 3 | HTTPS_CA_FILE, PERL_LWP_SSL_CA_PATH, or HTTPS_CA_DIR environment variables 4 | instead. 5 | 6 | --- Finance-Quote-1.37/lib/Finance/Quote/Tiaacref.pm.orig 2015-02-01 13:24:41.000000000 -0600 7 | +++ Finance-Quote-1.37/lib/Finance/Quote/Tiaacref.pm 2015-07-07 20:09:47.278885944 -0500 8 | @@ -30,7 +30,6 @@ 9 | package Finance::Quote::Tiaacref; 10 | require 5.005; 11 | require LWP::Protocol::https; 12 | -require Mozilla::CA; 13 | 14 | use strict; 15 | 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/perl-module-pluggable-search.patch: -------------------------------------------------------------------------------- 1 | Fix core Perl module Module::Pluggable such that it can find plugins that live 2 | in symlinked directories. 3 | 4 | Patch borrowed/adapted from Nixpkgs. 5 | 6 | --- perl-5.16.1/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm 2015-04-08 23:28:48.120164135 -0500 7 | +++ perl-5.16.1/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm 2015-04-08 23:30:27.032166704 -0500 8 | @@ -164,7 +164,7 @@ 9 | my $sp = catdir($dir, (split /::/, $searchpath)); 10 | 11 | # if it doesn't exist or it's not a dir then skip it 12 | - next unless ( -e $sp && -d _ ); # Use the cached stat the second time 13 | + next unless ( -e $sp ); 14 | 15 | my @files = $self->find_files($sp); 16 | 17 | @@ -279,7 +279,7 @@ 18 | (my $path = $File::Find::name) =~ s#^\\./##; 19 | push @files, $path; 20 | } 21 | - }, $search_path ); 22 | + }, "$search_path/." ); 23 | } 24 | #chdir $cwd; 25 | return @files; 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch: -------------------------------------------------------------------------------- 1 | Patch borrowed from nixpkgs. Works around warning message produced by the 2 | current version of Moose: 3 | 4 | "Passing a list of values to enum is deprecated. Enum values should be wrapped 5 | in an arrayref." 6 | 7 | --- Net-Amazon-S3-0.60/lib/Net/Amazon/S3/Client/Object.pm 2015-04-15 16:18:47.226410022 -0500 8 | +++ Net-Amazon-S3-0.60/lib/Net/Amazon/S3/Client/Object.pm 2015-04-15 16:19:25.410408425 -0500 9 | @@ -19,7 +19,7 @@ 10 | [ qw(private public-read public-read-write authenticated-read) ]; 11 | 12 | enum 'StorageClass' => 13 | - qw(standard reduced_redundancy); 14 | + [ qw(standard reduced_redundancy) ]; 15 | 16 | has 'client' => 17 | ( is => 'ro', isa => 'Net::Amazon::S3::Client', required => 1 ); 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/perl-tk-x11-discover.patch: -------------------------------------------------------------------------------- 1 | On non-x86_64 systems, this conditional can cause a specified X11 build value 2 | to be overwritten to null, causing x11 discovery to fail. 3 | 4 | --- a/myConfig 2014-05-12 11:16:48.152719722 -0500 5 | +++ b/myConfig 2014-05-12 11:16:24.704719113 -0500 6 | @@ -350,7 +350,7 @@ 7 | # 8 | # Prefer 64bit libraries on certain architectures 9 | # 10 | - unless (defined $xlib and $Config{'archname'} =~ m/x86_64/) 11 | + unless (defined $xlib or not $Config{'archname'} =~ m/x86_64/) 12 | { 13 | $xlib64 = &lX11(0, chooseX11()); 14 | } 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/pidgin-add-search-path.patch: -------------------------------------------------------------------------------- 1 | Support the PURPLE_PLUGIN_PATH environment variable. This patch is based on 2 | one from Nixpkgs, but properly handles the case where that variable is unset. 3 | 4 | --- pidgin-2.10.11/libpurple/plugin.c.orig 2014-11-23 11:41:25.000000000 -0500 5 | +++ pidgin-2.10.11/libpurple/plugin.c 2015-08-04 14:31:02.257366144 -0400 6 | @@ -1178,8 +1178,19 @@ 7 | void 8 | purple_plugins_init(void) { 9 | void *handle = purple_plugins_get_handle(); 10 | + const gchar *purple_plugin_path; 11 | 12 | purple_plugins_add_search_path(LIBDIR); 13 | + purple_plugin_path = g_getenv("PURPLE_PLUGIN_PATH"); 14 | + if (purple_plugin_path && *purple_plugin_path) { 15 | + gchar **paths = g_strsplit(purple_plugin_path, ":", -1); 16 | + if (paths) { 17 | + gchar **p; 18 | + for (p = paths; *p; ++p) 19 | + if (**p) purple_plugins_add_search_path(*p); 20 | + } 21 | + g_strfreev(paths); 22 | + } 23 | 24 | purple_signal_register(handle, "plugin-load", 25 | purple_marshal_VOID__POINTER, 26 | -------------------------------------------------------------------------------- /gnu/packages/patches/pingus-sdl-libs-config.patch: -------------------------------------------------------------------------------- 1 | Do not assume the SDL_image and SLD_mixer libraries are installed at the same 2 | prefix reported by sdl-config, but instead get flags from the pkg-config files 3 | installed with these libraries. 4 | 5 | --- a/SConscript 2011-12-24 15:46:47.000000000 -0600 6 | +++ b/SConscript 2014-06-12 21:20:45.702668330 -0500 7 | @@ -199,7 +199,13 @@ 8 | self.fatal_error += " * library 'png' not found\n" 9 | 10 | def configure_sdl(self): 11 | - if self.conf.CheckMyProgram('sdl-config'): 12 | + if self.conf.CheckMyProgram('pkg-config'): 13 | + self.conf.env.ParseConfig("pkg-config --cflags --libs sdl") 14 | + for sdllib in ['image', 'mixer']: 15 | + self.conf.env.ParseConfig("pkg-config --cflags --libs SDL_%s" % sdllib) 16 | + if not self.conf.CheckSDLLib(sdllib): 17 | + self.fatal_error += " * SDL library '%s' not found\n" % sdllib 18 | + elif self.conf.CheckMyProgram('sdl-config'): 19 | self.conf.env.ParseConfig("sdl-config --cflags --libs | sed 's/-I/-isystem/g'") 20 | for sdllib in ['image', 'mixer']: 21 | if not self.conf.CheckSDLLib(sdllib): 22 | -------------------------------------------------------------------------------- /gnu/packages/patches/plotutils-libpng-jmpbuf.patch: -------------------------------------------------------------------------------- 1 | Use the `png_jmpbuf' accessor, as recommended since libpng 1.4.0: 2 | http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt . 3 | 4 | --- plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:12.000000000 +0200 5 | +++ plotutils-2.6/libplot/z_write.c 2013-07-12 17:19:07.000000000 +0200 6 | @@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter * 7 | } 8 | 9 | /* cleanup after libpng errors (error handler does a longjmp) */ 10 | - if (setjmp (png_ptr->jmpbuf)) 11 | + if (setjmp (png_jmpbuf (png_ptr))) 12 | { 13 | png_destroy_write_struct (&png_ptr, (png_info **)NULL); 14 | return -1; 15 | @@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr 16 | #endif 17 | } 18 | 19 | - longjmp (png_ptr->jmpbuf, 1); 20 | + longjmp (png_jmpbuf (png_ptr), 1); 21 | } 22 | 23 | static void 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/polkit-drop-test.patch: -------------------------------------------------------------------------------- 1 | Drop test failing with the following message: 2 | FAIL: polkitbackendjsauthoritytest 3 | ================================== 4 | /PolkitBackendJsAuthority/get_admin_identities: Error getting system bus: Could not connect: No such file or directoryError loading /var/run/ConsoleKit/database: Error statting file /var/run/ConsoleKit/database: No such file or directory 5 | 6 | 7 | diff -ru polkit-0.112.old/test/Makefile.in polkit-0.112/test/Makefile.in 8 | --- polkit-0.112.old/test/Makefile.in 2013-07-08 22:52:13.000000000 +0200 9 | +++ polkit-0.112/test/Makefile.in 2014-11-09 18:43:47.000000000 +0100 10 | @@ -388,7 +388,7 @@ 11 | top_build_prefix = @top_build_prefix@ 12 | top_builddir = @top_builddir@ 13 | top_srcdir = @top_srcdir@ 14 | -SUBDIRS = mocklibc . polkit polkitbackend 15 | +SUBDIRS = mocklibc . polkit 16 | AM_CFLAGS = $(GLIB_CFLAGS) 17 | noinst_LTLIBRARIES = libpolkit-test-helper.la 18 | libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/procps-make-3.82.patch: -------------------------------------------------------------------------------- 1 | Fix compilation with GNU Make 3.82 (patch from Nixpkgs). 2 | 3 | diff --git a/Makefile b/Makefile 4 | index 09fb3ed..59eba16 100644 5 | --- a/Makefile 6 | +++ b/Makefile 7 | @@ -174,7 +174,7 @@ INSTALL := $(BINFILES) $(MANFILES) 8 | # want this rule first, use := on ALL, and ALL not filled in yet 9 | all: do_all 10 | 11 | --include */module.mk 12 | +-include proc/module.mk ps/module.mk 13 | 14 | do_all: $(ALL) 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/pt-scotch-build-parallelism.patch: -------------------------------------------------------------------------------- 1 | Building with -j may cause the esmumps_main target to fail with a "no rule for 2 | dependency libptesmumps.a" error. Fix the dependency name. 3 | 4 | --- scotch_6.0.4/src/esmumps/Makefile 2012-12-01 08:29:29.000000000 -0600 5 | +++ scotch_6.0.4/src/esmumps/Makefile 2015-06-15 17:29:23.279605734 -0500 6 | @@ -160,6 +160,6 @@ 7 | order.h \ 8 | symbol.h \ 9 | esmumps.h \ 10 | - lib$(ESMUMPSLIB)$(LIB) \ 11 | + libesmumps$(LIB) \ 12 | $(libdir)/lib$(SCOTCHLIB)$(LIB) \ 13 | $(libdir)/lib$(SCOTCHLIB)errexit$(LIB) 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/pulseaudio-fix-mult-test.patch: -------------------------------------------------------------------------------- 1 | Avoid signed overflow during mult-s16-test which intermittently 2 | failed. 3 | 4 | Patch by Mark H Weaver . 5 | 6 | --- pulseaudio-5.0/src/tests/mult-s16-test.c.orig 2014-01-23 13:57:55.000000000 -0500 7 | +++ pulseaudio-5.0/src/tests/mult-s16-test.c 2014-10-24 03:13:46.464661815 -0400 8 | @@ -55,7 +55,7 @@ 9 | START_TEST (mult_s16_test) { 10 | int16_t samples[SAMPLES]; 11 | int32_t volumes[SAMPLES]; 12 | - int32_t sum1 = 0, sum2 = 0; 13 | + uint32_t sum1 = 0, sum2 = 0; 14 | int i; 15 | 16 | pa_random(samples, sizeof(samples)); 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/pulseaudio-longer-test-timeout.patch: -------------------------------------------------------------------------------- 1 | Increase the timeout on 'cpu-mix-test' to accommodate slower machines. 2 | 3 | --- pulseaudio-6.0/src/tests/cpu-mix-test.c.ORIG 2015-02-12 09:10:35.000000000 -0500 4 | +++ pulseaudio-6.0/src/tests/cpu-mix-test.c 2015-03-31 13:45:05.316878322 -0400 5 | @@ -212,7 +212,7 @@ 6 | #if defined (__arm__) && defined (__linux__) && defined (HAVE_NEON) 7 | tcase_add_test(tc, mix_neon_test); 8 | #endif 9 | - tcase_set_timeout(tc, 120); 10 | + tcase_set_timeout(tc, 240); 11 | suite_add_tcase(s, tc); 12 | 13 | sr = srunner_create(s); 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/pybugz-encode-error.patch: -------------------------------------------------------------------------------- 1 | In case of 'AttributeError', 'value' is None, so do not try to 2 | access it. 3 | Submitted upstream. 4 | 5 | --- pybugz-0.6.11/bugz.py 2006-09-02 14:35:37.000000000 +0200 6 | +++ pybugz-0.6.11/bugz.py 2014-05-05 16:02:20.000000000 +0200 7 | @@ -1249,9 +1254,9 @@ class PrettyBugz(Bugz): 8 | for field, name in FIELDS + MORE_FIELDS: 9 | try: 10 | value = result.find('//%s' % field).text 11 | + print '%-12s: %s' % (name, value.encode(self.enc)) 12 | except AttributeError: 13 | continue 14 | - print '%-12s: %s' % (name, value.encode(self.enc)) 15 | 16 | # Print out the cc'ed people 17 | cced = result.findall('.//cc') 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/pybugz-stty.patch: -------------------------------------------------------------------------------- 1 | Gracefully deal with 'stty size' failures. 2 | Submitted upstream. 3 | 4 | --- pybugz-0.6.11/bugz.py 2006-09-02 14:35:37.000000000 +0200 5 | +++ pybugz-0.6.11/bugz.py 2014-05-05 15:17:03.000000000 +0200 6 | @@ -288,7 +288,12 @@ def get_cols(): 7 | stty = which('stty') 8 | if stty: 9 | row_cols = commands.getoutput("%s size" % stty) 10 | - rows, cols = map(int, row_cols.split()) 11 | + try: 12 | + rows, cols = map(int, row_cols.split()) 13 | + except: 14 | + # In some cases 'stty size' will just fail with 15 | + # "Inappropriate ioctl for device". 16 | + cols = DEFAULT_NUM_COLS 17 | return cols 18 | else: 19 | return DEFAULT_NUM_COLS 20 | -------------------------------------------------------------------------------- /gnu/packages/patches/pycairo-wscript.patch: -------------------------------------------------------------------------------- 1 | Update the wscript to work with waf-1.8.8. Based on: 2 | http://cgit.freedesktop.org/pycairo/commit/?id=c57cd129407c904f8c2f752a59d0183df7b01a5e 3 | 4 | 5 | --- pycairo-1.10.0.orig/wscript 2011-04-18 15:42:29.000000000 +0800 6 | +++ pycairo-1.10.0/wscript 2015-04-20 13:01:45.383756898 +0800 7 | @@ -13,18 +13,18 @@ 8 | 9 | def options(ctx): 10 | print(' %s/options()' %d) 11 | - ctx.tool_options('gnu_dirs') 12 | - ctx.tool_options('compiler_cc') 13 | - ctx.tool_options('python') # options for disabling pyc or pyo compilation 14 | + ctx.load('gnu_dirs') 15 | + ctx.load('compiler_c') 16 | + ctx.load('python') # options for disabling pyc or pyo compilation 17 | 18 | 19 | def configure(ctx): 20 | print(' %s/configure()' %d) 21 | 22 | env = ctx.env 23 | - ctx.check_tool('gnu_dirs') 24 | - ctx.check_tool('compiler_cc') 25 | - ctx.check_tool('python') 26 | + ctx.load('gnu_dirs') 27 | + ctx.load('compiler_c') 28 | + ctx.load('python') 29 | ctx.check_python_version((3,1,0)) 30 | ctx.check_python_headers() 31 | ctx.check_cfg(package='cairo', atleast_version=cairo_version_required, 32 | -------------------------------------------------------------------------------- /gnu/packages/patches/pyqt-configure.patch: -------------------------------------------------------------------------------- 1 | Have configure.py modify internal variables depending on the --qml-plugindir 2 | configure option. 3 | diff -u PyQt-gpl-5.4.alt/configure.py PyQt-gpl-5.4/configure.py 4 | --- PyQt-gpl-5.4.alt/configure.py 2015-01-25 17:27:50.000000000 +0100 5 | +++ PyQt-gpl-5.4/configure.py 2015-01-25 17:56:41.000000000 +0100 6 | @@ -904,6 +904,9 @@ 7 | if opts.pyuicinterpreter is not None: 8 | self.pyuic_interpreter = opts.pyuicinterpreter 9 | 10 | + if opts.qmlplugindir is not None: 11 | + self.qml_plugin_dir = opts.qmlplugindir 12 | + 13 | if opts.qsciapidir is not None: 14 | self.qsci_api_dir = opts.qsciapidir 15 | 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/python-2-deterministic-build-info.patch: -------------------------------------------------------------------------------- 1 | Always provide the same date and time in 'Py_GetBuildInfo'. 2 | This is the information shown at the REPL and in 'sys.version'. 3 | We cannot pass it in CPPFLAGS due to whitespace in the DATE string. 4 | 5 | --- a/Modules/getbuildinfo.c 6 | +++ b/Modules/getbuildinfo.c 7 | @@ -4,6 +4,10 @@ 8 | #include 9 | #endif 10 | 11 | +/* Deterministic date and time. */ 12 | +#define DATE "Jan 1 1970" 13 | +#define TIME "00:00:01" 14 | + 15 | #ifndef DATE 16 | #ifdef __DATE__ 17 | #define DATE __DATE__ 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/python-2.7-search-paths.patch: -------------------------------------------------------------------------------- 1 | Make sure the build system honors CPATH and LIBRARY_PATH when looking for 2 | headers and libraries. 3 | 4 | --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 5 | +++ Python-2.7.10/setup.py 2015-10-07 18:33:47.497347552 +0200 6 | @@ -526,6 +526,10 @@ class PyBuildExt(build_ext): 7 | inc_dirs += ['/system/include', '/atheos/autolnk/include'] 8 | inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) 9 | 10 | + # Always honor these variables. 11 | + lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) 12 | + inc_dirs += os.getenv('CPATH', '').split(os.pathsep) 13 | + 14 | # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) 15 | if host_platform in ['osf1', 'unixware7', 'openunix8']: 16 | lib_dirs += ['/usr/ccs/lib'] 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/python-3-deterministic-build-info.patch: -------------------------------------------------------------------------------- 1 | Always provide the same date and time in 'Py_GetBuildInfo'. 2 | This is the information shown at the REPL and in 'sys.version'. 3 | We cannot pass it in CPPFLAGS due to whitespace in the DATE string. 4 | 5 | --- Modules/getbuildinfo.c 6 | +++ Modules/getbuildinfo.c 7 | @@ -4,6 +4,10 @@ 8 | #include 9 | #endif 10 | 11 | +/* Deterministic date and time. */ 12 | +#define DATE "Jan 1 1970" 13 | +#define TIME "00:00:01" 14 | + 15 | #ifndef DATE 16 | #ifdef __DATE__ 17 | #define DATE __DATE__ 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/python-3-search-paths.patch: -------------------------------------------------------------------------------- 1 | Make sure the build system honors CPATH and LIBRARY_PATH when looking for 2 | headers and libraries. 3 | 4 | --- setup.py 2015-10-07 23:32:58.891329173 +0200 5 | +++ setup.py 2015-10-07 23:46:29.653349924 +0200 6 | @@ -507,11 +507,8 @@ class PyBuildExt(build_ext): 7 | # if a file is found in one of those directories, it can 8 | # be assumed that no additional -I,-L directives are needed. 9 | if not cross_compiling: 10 | - lib_dirs = self.compiler.library_dirs + [ 11 | - '/lib64', '/usr/lib64', 12 | - '/lib', '/usr/lib', 13 | - ] 14 | - inc_dirs = self.compiler.include_dirs + ['/usr/include'] 15 | + lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) 16 | + inc_dirs = os.getenv('CPATH', '').split(os.pathsep) 17 | else: 18 | lib_dirs = self.compiler.library_dirs[:] 19 | inc_dirs = self.compiler.include_dirs[:] 20 | -------------------------------------------------------------------------------- /gnu/packages/patches/python-configobj-setuptools.patch: -------------------------------------------------------------------------------- 1 | From 16fbc38f13e435b4e3e1a37d706e64e05bad4691 Mon Sep 17 00:00:00 2001 2 | From: Leo Famulari 3 | Date: Tue, 10 Nov 2015 23:09:24 -0500 4 | Subject: [PATCH] patch build to use setuptools 5 | 6 | --- 7 | setup.py | 8 +++++++- 8 | 1 file changed, 7 insertions(+), 1 deletion(-) 9 | 10 | diff --git a/setup.py b/setup.py 11 | index c6d57a6..27bf260 100644 12 | --- a/setup.py 13 | +++ b/setup.py 14 | @@ -12,7 +12,12 @@ 15 | # http://opensource.org/licenses/BSD-3-Clause 16 | import os 17 | import sys 18 | -from distutils.core import setup 19 | + 20 | +try: 21 | + from setuptools import setup 22 | +except ImportError: 23 | + from distutils.core import setup 24 | + 25 | # a simple import wouldn't work if we moved towards a package with __init__ 26 | from _version import __version__ 27 | 28 | -- 29 | 2.6.2 30 | 31 | -------------------------------------------------------------------------------- /gnu/packages/patches/python-disable-ssl-test.patch: -------------------------------------------------------------------------------- 1 | Disable a test that fails with openssl-1.0.2b. 2 | 3 | --- Lib/test/test_ssl.py.orig 2015-02-25 06:27:45.000000000 -0500 4 | +++ Lib/test/test_ssl.py 2015-06-12 03:14:09.395212502 -0400 5 | @@ -2718,6 +2718,7 @@ 6 | chatty=True, connectionchatty=True) 7 | self.assertIs(stats['compression'], None) 8 | 9 | + @unittest.skipIf(True, "openssl 1.0.2b complains: dh key too small") 10 | def test_dh_params(self): 11 | # Check we can get a connection with ephemeral Diffie-Hellman 12 | context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) 13 | -------------------------------------------------------------------------------- /gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch: -------------------------------------------------------------------------------- 1 | Drop SPARQLWrapper from the required install inputs under Python 2, as it 2 | creates a circular dependency. 3 | 4 | diff -u rdflib-4.1.2.alt/setup.py rdflib-4.1.2/setup.py 5 | --- rdflib-4.1.2.alt/setup.py 2014-03-04 12:40:26.000000000 +0100 6 | +++ rdflib-4.1.2/setup.py 2015-01-23 21:52:59.000000000 +0100 7 | @@ -52,7 +52,7 @@ 8 | kwargs['test_suite'] = "nose.collector" 9 | kwargs['install_requires'] = [ 10 | 'isodate', 11 | - 'pyparsing', 'SPARQLWrapper'] 12 | + 'pyparsing'] 13 | 14 | if sys.version_info[1]<7: # Python 2.6 15 | kwargs['install_requires'].append('ordereddict') 16 | 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/qt4-ldflags.patch: -------------------------------------------------------------------------------- 1 | Explicitly link against libicui18n so that libQtCore.so always finds it. 2 | 3 | --- qt-everywhere-opensource-src-4.8.6/src/corelib/corelib.pro 2015-04-15 12:01:41.661862663 +0200 4 | +++ qt-everywhere-opensource-src-4.8.6/src/corelib/corelib.pro 2015-04-15 12:03:57.954586336 +0200 5 | @@ -19,6 +19,13 @@ include(codecs/codecs.pri) 6 | include(statemachine/statemachine.pri) 7 | include(xml/xml.pri) 8 | 9 | +# Explicitly link with icui18n, which is dlopened by libQtCore.so. 10 | +# We cannot do this by setting LDFLAGS because that then overrides 11 | +# other LDFLAGS: . 12 | +# XXX: According to the Nixpkgs recipe, this may be necessary for 13 | +# further libraries (cups, gtk-x11-2.0, libgdk-x11-2.0). 14 | +LIBS_PRIVATE += -licui18n 15 | + 16 | !qpa:mac|darwin:LIBS_PRIVATE += -framework ApplicationServices 17 | qpa:mac { 18 | !ios { 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/readline-link-ncurses.patch: -------------------------------------------------------------------------------- 1 | This patch is to make sure that `libncurses' is among the `NEEDED' 2 | dependencies of `libreadline.so' and `libhistory.so'. 3 | 4 | Failing to do that, applications linking against Readline are 5 | forced to explicitly link against libncurses as well; in addition, 6 | this trick doesn't work when using GNU ld's `--as-needed'. 7 | 8 | --- shlib/Makefile.in 2009-01-06 18:03:22.000000000 +0100 9 | +++ shlib/Makefile.in 2009-07-27 14:43:25.000000000 +0200 10 | @@ -84,7 +84,7 @@ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@ 11 | SHOBJ_XLDFLAGS = @SHOBJ_XLDFLAGS@ 12 | SHOBJ_LIBS = @SHOBJ_LIBS@ 13 | 14 | -SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ 15 | +SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ -lncurses 16 | SHLIB_LIBS = @SHLIB_LIBS@ 17 | 18 | SHLIB_DOT = @SHLIB_DOT@ 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/scotch-test-threading.patch: -------------------------------------------------------------------------------- 1 | Fix this test so that it succeeds when the library is not compiled with 2 | SCOTCH_PTHREAD. 3 | 4 | --- scotch_6.0.4/src/check/test_common_thread.c 2014-09-28 11:39:59.000000000 -0500 5 | +++ scotch_6.0.4/src/check/test_common_thread.c 2015-01-10 00:52:00.076229542 -0600 6 | @@ -175,14 +175,14 @@ 7 | char * argv[]) 8 | { 9 | TestThreadGroup groudat; 10 | -#if ((defined COMMON_PTHREAD) || (defined SCOTCH_PTHREAD)) 11 | +#if ((defined COMMON_PTHREAD) && (defined SCOTCH_PTHREAD)) 12 | TestThread * restrict thrdtab; 13 | int thrdnbr; 14 | #endif /* ((defined COMMON_PTHREAD) || (defined SCOTCH_PTHREAD)) */ 15 | 16 | SCOTCH_errorProg (argv[0]); 17 | 18 | -#if ((defined COMMON_PTHREAD) || (defined SCOTCH_PTHREAD)) 19 | +#if ((defined COMMON_PTHREAD) && (defined SCOTCH_PTHREAD)) 20 | thrdnbr = SCOTCH_PTHREAD_NUMBER; 21 | 22 | groudat.redusum = COMPVAL (thrdnbr); 23 | -------------------------------------------------------------------------------- /gnu/packages/patches/scribus-qobject.patch: -------------------------------------------------------------------------------- 1 | See upstream bug report: http://bugs.scribus.net/view.php?id=13102 2 | 3 | scribus/sclayer.cpp | 1 + 4 | 1 file changed, 1 insertion(+) 5 | 6 | diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp 7 | index 502112b..4da7bd5 100644 8 | --- a/scribus/sclayer.cpp 9 | +++ b/scribus/sclayer.cpp 10 | @@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place. 11 | 12 | #include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates 13 | #include //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates 14 | +#include 15 | #include 16 | 17 | ScLayer::ScLayer(void) 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/sdl-libx11-1.6.patch: -------------------------------------------------------------------------------- 1 | Update _XData32 declaration in SDL_x11sym.h to match that of libx11 1.6. 2 | 3 | --- SDL-1.2.15/src/video/x11/SDL_x11sym.h.~1~ 2012-01-19 01:30:06.000000000 -0500 4 | +++ SDL-1.2.15/src/video/x11/SDL_x11sym.h 2014-12-26 00:22:36.445067694 -0500 5 | @@ -165,7 +165,7 @@ 6 | */ 7 | #ifdef LONG64 8 | SDL_X11_MODULE(IO_32BIT) 9 | -SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) 10 | +SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) 11 | SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) 12 | #endif 13 | 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/sed-hurd-path-max.patch: -------------------------------------------------------------------------------- 1 | 7bb8d35d0330161a5af5341471d0c183a067e8c2 2 | Author: Jose E. Marchesi 3 | Date: Sun Oct 6 14:43:38 2013 +0200 4 | 5 | Set PATH_MAX to some constant in case it is not defined in system 6 | headers. 7 | 8 | 2013-10-06 Jose E. Marchesi 9 | 10 | * basicdefs.h (PATH_MAX): Defined to some constant in case it is 11 | not defined by system headers. 12 | * sed/utils.c: Do not include pathmax.h anymore. 13 | * bootstrap.conf (gnulib_modules): Do not use the gnulib module 14 | pathmax. 15 | 16 | diff --git a/basicdefs.h b/basicdefs.h 17 | index 0d28a97..09f5beb 100644 18 | --- a/basicdefs.h 19 | +++ b/basicdefs.h 20 | @@ -40,6 +41,13 @@ typedef unsigned long countT; 21 | #define obstack_chunk_alloc ck_malloc 22 | #define obstack_chunk_free free 23 | 24 | +/* MAX_PATH is not defined in some platforms, most notably GNU/Hurd. 25 | + In that case we define it here to some constant. Note however that 26 | + this relies in the fact that sed does reallocation if a buffer 27 | + needs to be larger than PATH_MAX. */ 28 | +#ifndef PATH_MAX 29 | +# define PATH_MAX 200 30 | +#endif 31 | 32 | /* handle misdesigned macros (snarfed from lib/regex.c) */ 33 | /* Jim Meyering writes: 34 | 35 | -------------------------------------------------------------------------------- /gnu/packages/patches/serf-comment-style-fix.patch: -------------------------------------------------------------------------------- 1 | r2443 | andreas.stieger@gmx.de | 2014-10-21 17:42:56 -0400 (Tue, 21 Oct 2014) | 7 lines 2 | 3 | Follow-up to r2419: Correct comment style 4 | 5 | * test/test_buckets.c 6 | (deflate_compress): Correct comment style not supported by strict 7 | compilers, fails on /branches/1.3.x 8 | 9 | Index: test/test_buckets.c 10 | =================================================================== 11 | --- test/test_buckets.c (revision 2442) 12 | +++ test/test_buckets.c (revision 2443) 13 | @@ -1323,9 +1323,9 @@ 14 | 15 | /* The largest buffer we should need is 0.1% larger than the 16 | uncompressed data, + 12 bytes. This info comes from zlib.h. 17 | + buf_size = orig_len + (orig_len / 1000) + 12; 18 | Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed 19 | data. Use a buffer bigger than what we need. */ 20 | -// buf_size = orig_len + (orig_len / 1000) + 12; 21 | buf_size = 100000; 22 | 23 | write_buf = apr_palloc(pool, buf_size); 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/slim-config.patch: -------------------------------------------------------------------------------- 1 | Allow the configuration file and theme directory to be specified at run time. 2 | Patch by Eelco Dolstra, from Nixpkgs. 3 | 4 | --- slim-1.3.6/app.cpp 2013-10-02 00:38:05.000000000 +0200 5 | +++ slim-1.3.6/app.cpp 2013-10-15 11:02:55.629263422 +0200 6 | @@ -200,7 +200,9 @@ 7 | 8 | /* Read configuration and theme */ 9 | cfg = new Cfg; 10 | - cfg->readConf(CFGFILE); 11 | + char *cfgfile = getenv("SLIM_CFGFILE"); 12 | + if (!cfgfile) cfgfile = CFGFILE; 13 | + cfg->readConf(cfgfile); 14 | string themebase = ""; 15 | string themefile = ""; 16 | string themedir = ""; 17 | @@ -208,7 +210,9 @@ 18 | if (testing) { 19 | themeName = testtheme; 20 | } else { 21 | - themebase = string(THEMESDIR) + "/"; 22 | + char *themesdir = getenv("SLIM_THEMESDIR"); 23 | + if (!themesdir) themesdir = THEMESDIR; 24 | + themebase = string(themesdir) + "/"; 25 | themeName = cfg->getOption("current_theme"); 26 | string::size_type pos; 27 | if ((pos = themeName.find(",")) != string::npos) { 28 | -------------------------------------------------------------------------------- /gnu/packages/patches/slim-session.patch: -------------------------------------------------------------------------------- 1 | Exit after the user's session has finished. This works around slim's broken 2 | PAM session handling (see 3 | http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663). 4 | 5 | Patch by Eelco Dolstra, from Nixpkgs. 6 | 7 | --- slim-1.3.6/app.cpp 2013-10-15 11:02:55.629263422 +0200 8 | +++ slim-1.3.6/app.cpp 2013-10-15 13:00:10.141210784 +0200 9 | @@ -816,7 +822,7 @@ 10 | StopServer(); 11 | RemoveLock(); 12 | while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */ 13 | - Run(); 14 | + exit(OK_EXIT); 15 | } 16 | 17 | void App::KillAllClients(Bool top) { 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/slim-sigusr1.patch: -------------------------------------------------------------------------------- 1 | This patch fixes SLiM so it really waits for the X server to be ready 2 | before attempting to connect to it. Indeed, the X server notices that 3 | its parent process has a handler for SIGUSR1, and consequently sends it 4 | SIGUSR1 when it's ready to accept connections. 5 | 6 | The problem was that SLiM doesn't pay attention to SIGUSR1. So in practice, 7 | if X starts slowly, then SLiM gets ECONNREFUSED a couple of time on 8 | /tmp/.X11-unix/X0, then goes on trying to connect to localhost:6000, 9 | where nobody answers; eventually, it times out and tries again on 10 | /tmp/.X11-unix/X0, and finally it shows up on the screen. 11 | 12 | Patch by L. Courtès. 13 | 14 | --- slim-1.3.6/app.cpp 2014-02-05 15:27:20.000000000 +0100 15 | +++ slim-1.3.6/app.cpp 2014-02-09 22:42:04.000000000 +0100 16 | @@ -119,7 +119,9 @@ void CatchSignal(int sig) { 17 | exit(ERR_EXIT); 18 | } 19 | 20 | +static volatile int got_sigusr1 = 0; 21 | void User1Signal(int sig) { 22 | + got_sigusr1 = 1; 23 | signal(sig, User1Signal); 24 | } 25 | 26 | @@ -884,6 +886,7 @@ int App::WaitForServer() { 27 | int ncycles = 120; 28 | int cycles; 29 | 30 | + while (!got_sigusr1); 31 | for(cycles = 0; cycles < ncycles; cycles++) { 32 | if((Dpy = XOpenDisplay(DisplayName))) { 33 | XSetIOErrorHandler(xioerror); 34 | -------------------------------------------------------------------------------- /gnu/packages/patches/soprano-find-clucene.patch: -------------------------------------------------------------------------------- 1 | Search for clucene include file in the clucene include directory. 2 | 3 | diff -u -r soprano-2.9.4.orig/cmake/modules/FindCLucene.cmake soprano-2.9.4/cmake/modules/FindCLucene.cmake 4 | --- soprano-2.9.4.orig/cmake/modules/FindCLucene.cmake 2013-10-09 19:22:28.000000000 +0200 5 | +++ soprano-2.9.4/cmake/modules/FindCLucene.cmake 2014-04-28 20:08:11.000000000 +0200 6 | @@ -77,7 +77,8 @@ 7 | 8 | get_filename_component(TRIAL_LIBRARY_DIR ${CLUCENE_LIBRARY} PATH) 9 | find_path(CLUCENE_LIBRARY_DIR 10 | - NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_DIR} ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH) 11 | + NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_DIR} ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} ${CLUCENE_INCLUDE_DIR} NO_DEFAULT_PATH) 12 | +message (STATUS "XXX ${CLUCENE_LIBRARY_DIR}") 13 | if(CLUCENE_LIBRARY_DIR) 14 | message(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}") 15 | file(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT) 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/superlu-dist-scotchmetis.patch: -------------------------------------------------------------------------------- 1 | The METIS interface from Scotch may segfault if passed NULL to indicate a 2 | default parameter, so use the older calling style. 3 | 4 | --- a/SRC/get_perm_c.c 2014-05-16 23:38:30.070835316 -0500 5 | +++ b/SRC/get_perm_c.c 2014-05-16 23:39:04.582836211 -0500 6 | @@ -70,11 +70,13 @@ 7 | #else 8 | 9 | /* Earlier version 3.x.x */ 10 | - /* METIS_NodeND(&nm, b_colptr, b_rowind, &numflag, metis_options, 11 | - perm, iperm);*/ 12 | + METIS_NodeND(&nm, b_colptr, b_rowind, &numflag, metis_options, 13 | + perm, iperm); 14 | 15 | /* Latest version 4.x.x */ 16 | +#if 0 17 | METIS_NodeND(&nm, b_colptr, b_rowind, NULL, NULL, perm, iperm); 18 | +#endif 19 | 20 | /*check_perm_dist("metis perm", n, perm);*/ 21 | #endif 22 | -------------------------------------------------------------------------------- /gnu/packages/patches/tar-d_ino_in_dirent-fix.patch: -------------------------------------------------------------------------------- 1 | commit e9ddc08da0982f36581ae5a8c7763453ff41cfe8 2 | Author: Sergey Poznyakoff 3 | Date: Thu Sep 25 00:22:16 2014 +0300 4 | 5 | Bugfixes. 6 | 7 | * doc/tar.1: Fix typo in font spec. 8 | * src/tar.c (sort_mode_arg, sort_mode_flag): Protect "inode" 9 | (SAVEDIR_SORT_INODE) with D_INO_IN_DIRENT 10 | 11 | diff --git a/src/tar.c b/src/tar.c 12 | index 225c624..f8102e0 100644 13 | --- a/src/tar.c 14 | +++ b/src/tar.c 15 | @@ -1341,14 +1341,18 @@ static char filename_terminator; 16 | static char const *const sort_mode_arg[] = { 17 | "none", 18 | "name", 19 | +#if D_INO_IN_DIRENT 20 | "inode", 21 | +#endif 22 | NULL 23 | }; 24 | 25 | static int sort_mode_flag[] = { 26 | SAVEDIR_SORT_NONE, 27 | SAVEDIR_SORT_NAME, 28 | +#if D_INO_IN_DIRENT 29 | SAVEDIR_SORT_INODE 30 | +#endif 31 | }; 32 | 33 | ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag); -------------------------------------------------------------------------------- /gnu/packages/patches/tar-skip-unreliable-tests.patch: -------------------------------------------------------------------------------- 1 | Skip tests that rely on unlinkat(2) behavior that varies between 2 | kernel versions and is unspecified. 3 | 4 | See 5 | and . 6 | 7 | --- tar-1.28/tests/testsuite 2014-07-27 22:35:27.000000000 +0200 8 | +++ tar-1.28/tests/testsuite 2015-06-16 00:21:16.906380739 +0200 9 | @@ -34680,6 +34680,7 @@ find . 10 | )" 11 | at_fn_check_prepare_notrace 'an embedded newline' "remfiles08a.at:31" 12 | ( $at_check_trace; 13 | +exit 77 14 | mkdir gnu 15 | (cd gnu 16 | TEST_TAR_FORMAT=gnu 17 | @@ -34762,6 +34763,7 @@ find . 18 | )" 19 | at_fn_check_prepare_notrace 'an embedded newline' "remfiles08b.at:36" 20 | ( $at_check_trace; 21 | +exit 77 22 | mkdir gnu 23 | (cd gnu 24 | TEST_TAR_FORMAT=gnu 25 | @@ -34850,6 +34852,7 @@ find . 26 | )" 27 | at_fn_check_prepare_notrace 'a `...` command substitution' "remfiles08c.at:31" 28 | ( $at_check_trace; 29 | +exit 77 30 | mkdir gnu 31 | (cd gnu 32 | TEST_TAR_FORMAT=gnu 33 | -------------------------------------------------------------------------------- /gnu/packages/patches/tcl-mkindex-deterministic.patch: -------------------------------------------------------------------------------- 1 | This patch ensures that the 'tclIndex' files generated by 'auto_mkindex' 2 | are sorted in a deterministic fashion. 3 | 4 | Fixes a non-determinism issue reported 5 | at . 6 | 7 | --- tcl8.6.4/library/auto.tcl 2015-02-26 17:57:28.000000000 +0100 8 | +++ tcl8.6.4/library/auto.tcl 2015-11-13 23:18:34.964831717 +0100 9 | @@ -207,6 +207,9 @@ proc auto_mkindex {dir args} { 10 | set args *.tcl 11 | } 12 | 13 | + # Keep file names sorted in a determistic order. 14 | + set args [lsort -ascii $args] 15 | + 16 | auto_mkindex_parser::init 17 | foreach file [glob -- {*}$args] { 18 | try { 19 | @@ -241,6 +244,10 @@ proc auto_mkindex_old {dir args} { 20 | if {![llength $args]} { 21 | set args *.tcl 22 | } 23 | + 24 | + # Keep file names sorted in a determistic order. 25 | + set args [lsort -ascii $args] 26 | + 27 | foreach file [glob -- {*}$args] { 28 | set f "" 29 | set error [catch { 30 | -------------------------------------------------------------------------------- /gnu/packages/patches/texi2html-document-encoding.patch: -------------------------------------------------------------------------------- 1 | Patch derived from discussion at https://savannah.nongnu.org/bugs/?37503 2 | 3 | --- texi2html-5.0/texi2html.pl 2010-06-30 17:01:27.000000000 -0500 4 | +++ texi2html-5.0/texi2html.pl 2014-07-09 01:17:57.062990582 -0500 5 | @@ -2589,7 +2589,12 @@ 6 | my $state = shift; 7 | 8 | # FIXME this should be done only once, for @documentencoding 9 | - my $encoding = lc(Texi2HTML::Config::get_conf('DOCUMENT_ENCODING')); 10 | + my $encoding; 11 | + my $input_encoding = Texi2HTML::Config::get_conf('documentencoding'); 12 | + if (defined($input_encoding)) 13 | + { 14 | + $encoding = lc($input_encoding); 15 | + } 16 | if (defined($encoding) and $encoding ne '' and exists($Texi2HTML::Config::t2h_encoding_aliases{$encoding})) 17 | { 18 | $encoding = $Texi2HTML::Config::t2h_encoding_aliases{$encoding}; 19 | 20 | Fix failures in test/encodings. 21 | 22 | --- texi2html-5.0/texi2html.pl 2014-07-09 01:22:06.000000000 -0500 23 | +++ texi2html-5.0/texi2html.pl 2014-07-10 23:23:47.182097602 -0500 24 | @@ -53,6 +53,7 @@ 25 | # for translations 26 | #use encoding 'utf8'; 27 | #use utf8; 28 | +binmode STDERR, ':encoding(utf8)'; 29 | 30 | # 31 | # According to 32 | -------------------------------------------------------------------------------- /gnu/packages/patches/tinyxml-use-stl.patch: -------------------------------------------------------------------------------- 1 | From a53b6ee4519a7657164610ac14a82c57b1273bf6 Mon Sep 17 00:00:00 2001 2 | From: David Thompson 3 | Date: Mon, 23 Nov 2015 06:54:36 -0500 4 | Subject: [PATCH] Use STL. 5 | 6 | Software that uses the shared library, such as Kodi, assume that TinyXML was 7 | compiled with STL activated. 8 | 9 | --- 10 | tinyxml.h | 2 ++ 11 | xmltest.cpp | 1 + 12 | 2 files changed, 3 insertions(+) 13 | 14 | diff --git a/tinyxml.h b/tinyxml.h 15 | index a3589e5..6cbfc7d 100644 16 | --- a/tinyxml.h 17 | +++ b/tinyxml.h 18 | @@ -43,6 +43,8 @@ distribution. 19 | #define DEBUG 20 | #endif 21 | 22 | +#define TIXML_USE_STL 1 23 | + 24 | #ifdef TIXML_USE_STL 25 | #include 26 | #include 27 | diff --git a/xmltest.cpp b/xmltest.cpp 28 | index 663c157..057dbfe 100644 29 | --- a/xmltest.cpp 30 | +++ b/xmltest.cpp 31 | @@ -2,6 +2,7 @@ 32 | Test program for TinyXML. 33 | */ 34 | 35 | +#define TIXML_USE_STL 1 36 | 37 | #ifdef TIXML_USE_STL 38 | #include 39 | -- 40 | 2.5.0 41 | 42 | -------------------------------------------------------------------------------- /gnu/packages/patches/tk-find-library.patch: -------------------------------------------------------------------------------- 1 | This patch hard-codes the Tk library directory during package initialization. 2 | 3 | See . 4 | 5 | diff --git a/generic/tkWindow.c b/generic/tkWindow.c 6 | index b5cbbab..96b5501 100644 7 | --- a/generic/tkWindow.c 8 | +++ b/generic/tkWindow.c 9 | @@ -988,6 +988,7 @@ TkCreateMainWindow( 10 | 11 | Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY); 12 | Tcl_SetVar2(interp, "tk_version", NULL, TK_VERSION, TCL_GLOBAL_ONLY); 13 | + Tcl_SetVar2(interp, "tk_library", NULL, TK_LIBRARY, TCL_GLOBAL_ONLY); 14 | 15 | tsdPtr->numMainWindows++; 16 | return tkwin; 17 | diff --git a/unix/Makefile.in b/unix/Makefile.in 18 | index f21fdbb..c61b0df 100644 19 | --- a/unix/Makefile.in 20 | +++ b/unix/Makefile.in 21 | @@ -1029,7 +1029,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c 22 | $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c 23 | 24 | tkWindow.o: $(GENERIC_DIR)/tkWindow.c 25 | - $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c 26 | + $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" $(GENERIC_DIR)/tkWindow.c 27 | 28 | tkButton.o: $(GENERIC_DIR)/tkButton.c 29 | $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c 30 | -------------------------------------------------------------------------------- /gnu/packages/patches/torsocks-dns-test.patch: -------------------------------------------------------------------------------- 1 | Skip DNS tests that rely on the ability to look up arbitary 2 | host names. 3 | 4 | --- torsocks/tests/test_dns.c 2015-11-10 18:30:53.955941984 +0100 5 | +++ torsocks/tests/test_dns.c 2015-11-10 18:31:02.199941892 +0100 6 | @@ -134,11 +134,8 @@ static void test_getaddrinfo(const struc 7 | int main(int argc, char **argv) 8 | { 9 | /* Libtap call for the number of tests planned. */ 10 | - plan_tests(NUM_TESTS); 11 | + plan_tests(1); 12 | 13 | - test_getaddrinfo(&tor_check); 14 | - test_gethostbyname(&tor_dir_auth1); 15 | - test_gethostbyaddr(&tor_dir_auth2); 16 | test_getaddrinfo(&tor_localhost); 17 | 18 | return 0; 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/tvtime-pngoutput.patch: -------------------------------------------------------------------------------- 1 | Source: https://sources.debian.net/src/tvtime/1.0.2-14/debian/patches/libpng.diff 2 | 3 | From: Nobuhiro Iwamatsu 4 | Date: Mon, 14 May 2012 19:01:31 +0900 5 | Prepares the package for libpng 1.5. Closes: #650582. 6 | 7 | --- tvtime-1.0.2.orig/src/pngoutput.c 8 | +++ tvtime-1.0.2/src/pngoutput.c 9 | @@ -18,5 +18,6 @@ 10 | 11 | #include 12 | #include 13 | +#include 14 | #include 15 | #include "pngoutput.h" 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/tvtime-videodev2.patch: -------------------------------------------------------------------------------- 1 | Fix compilation error: non-existing header file. 2 | 3 | This is an excerpt from the debian patch: 4 | http://http.debian.net/debian/pool/main/t/tvtime/tvtime_1.0.2-14.diff.gz 5 | 6 | --- tvtime-1.0.2.orig/src/videodev2.h 7 | +++ tvtime-1.0.2/src/videodev2.h 8 | @@ -16,7 +16,6 @@ 9 | #ifdef __KERNEL__ 10 | #include /* need struct timeval */ 11 | #endif 12 | -#include /* need __user */ 13 | 14 | /* for kernel versions 2.4.26 and below: */ 15 | #ifndef __user 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/tvtime-xmltv.patch: -------------------------------------------------------------------------------- 1 | Fix compilation error: conflicting types for 'locale_t'. 2 | 3 | This is an excerpt from the debian patch ... 4 | http://http.debian.net/debian/pool/main/t/tvtime/tvtime_1.0.2-14.diff.gz 5 | 6 | --- tvtime-1.0.2.orig/src/xmltv.c 7 | +++ tvtime-1.0.2/src/xmltv.c 8 | @@ -118,9 +118,9 @@ 9 | typedef struct { 10 | const char *code; 11 | const char *name; 12 | -} locale_t; 13 | +} tvtime_locale_t; 14 | 15 | -static locale_t locale_table[] = { 16 | +static tvtime_locale_t locale_table[] = { 17 | {"AA", "Afar"}, {"AB", "Abkhazian"}, {"AF", "Afrikaans"}, 18 | {"AM", "Amharic"}, {"AR", "Arabic"}, {"AS", "Assamese"}, 19 | {"AY", "Aymara"}, {"AZ", "Azerbaijani"}, {"BA", "Bashkir"}, 20 | @@ -168,7 +168,7 @@ 21 | {"XH", "Xhosa"}, {"YO", "Yoruba"}, {"ZH", "Chinese"}, 22 | {"ZU", "Zulu"} }; 23 | 24 | -const int num_locales = sizeof( locale_table ) / sizeof( locale_t ); 25 | +const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t ); 26 | 27 | /** 28 | * Timezone parsing code based loosely on the algorithm in 29 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-CVE-2014-8140.patch: -------------------------------------------------------------------------------- 1 | From: sms 2 | Subject: Fix CVE-2014-8140: out-of-bounds write issue in test_compr_eb() 3 | Bug-Debian: http://bugs.debian.org/773722 4 | 5 | --- a/extract.c 6 | +++ b/extract.c 7 | @@ -2234,10 +2234,17 @@ 8 | if (compr_offset < 4) /* field is not compressed: */ 9 | return PK_OK; /* do nothing and signal OK */ 10 | 11 | + /* Return no/bad-data error status if any problem is found: 12 | + * 1. eb_size is too small to hold the uncompressed size 13 | + * (eb_ucsize). (Else extract eb_ucsize.) 14 | + * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS. 15 | + * 3. eb_ucsize is positive, but eb_size is too small to hold 16 | + * the compressed data header. 17 | + */ 18 | if ((eb_size < (EB_UCSIZE_P + 4)) || 19 | - ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L && 20 | - eb_size <= (compr_offset + EB_CMPRHEADLEN))) 21 | - return IZ_EF_TRUNC; /* no compressed data! */ 22 | + ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) || 23 | + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) 24 | + return IZ_EF_TRUNC; /* no/bad compressed data! */ 25 | 26 | if ( 27 | #ifdef INT_16BIT 28 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-CVE-2014-9636.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/unzip.git/plain/unzip-6.0-overflow.patch?id=d18f821e 4 | 5 | diff --git a/extract.c b/extract.c 6 | index a0a4929..9ef80b3 100644 7 | --- a/extract.c 8 | +++ b/extract.c 9 | @@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) 10 | ulg eb_ucsize; 11 | uch *eb_ucptr; 12 | int r; 13 | + ush method; 14 | 15 | if (compr_offset < 4) /* field is not compressed: */ 16 | return PK_OK; /* do nothing and signal OK */ 17 | @@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) 18 | eb_size <= (compr_offset + EB_CMPRHEADLEN))) 19 | return IZ_EF_TRUNC; /* no compressed data! */ 20 | 21 | + method = makeword(eb + (EB_HEADSIZE + compr_offset)); 22 | + if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize)) 23 | + return PK_ERR; /* compressed & uncompressed 24 | + * should match in STORED 25 | + * method */ 26 | + 27 | if ( 28 | #ifdef INT_16BIT 29 | (((ulg)(extent)eb_ucsize) != eb_ucsize) || 30 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-CVE-2015-7696.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Petr Stodulka 4 | Date: Mon, 14 Sep 2015 18:23:17 +0200 5 | Subject: Upstream fix for heap overflow 6 | Bug-Debian: https://bugs.debian.org/802162 7 | Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944 8 | Origin: https://bugzilla.redhat.com/attachment.cgi?id=1073002 9 | Forwarded: yes 10 | 11 | --- 12 | crypt.c | 12 +++++++++++- 13 | 1 file changed, 11 insertions(+), 1 deletion(-) 14 | 15 | --- a/crypt.c 16 | +++ b/crypt.c 17 | @@ -465,7 +465,17 @@ 18 | GLOBAL(pInfo->encrypted) = FALSE; 19 | defer_leftover_input(__G); 20 | for (n = 0; n < RAND_HEAD_LEN; n++) { 21 | - b = NEXTBYTE; 22 | + /* 2012-11-23 SMS. (OUSPG report.) 23 | + * Quit early if compressed size < HEAD_LEN. The resulting 24 | + * error message ("unable to get password") could be improved, 25 | + * but it's better than trying to read nonexistent data, and 26 | + * then continuing with a negative G.csize. (See 27 | + * fileio.c:readbyte()). 28 | + */ 29 | + if ((b = NEXTBYTE) == (ush)EOF) 30 | + { 31 | + return PK_ERR; 32 | + } 33 | h[n] = (uch)b; 34 | Trace((stdout, " (%02x)", h[n])); 35 | } 36 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-CVE-2015-7697.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Kamil Dudka 4 | Date: Mon, 14 Sep 2015 18:24:56 +0200 5 | Subject: fix infinite loop when extracting empty bzip2 data 6 | Bug-Debian: https://bugs.debian.org/802160 7 | Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1260944 8 | Origin: other, https://bugzilla.redhat.com/attachment.cgi?id=1073339 9 | 10 | --- 11 | extract.c | 6 ++++++ 12 | 1 file changed, 6 insertions(+) 13 | 14 | --- a/extract.c 15 | +++ b/extract.c 16 | @@ -2728,6 +2728,12 @@ 17 | int repeated_buf_err; 18 | bz_stream bstrm; 19 | 20 | + if (G.incnt <= 0 && G.csize <= 0L) { 21 | + /* avoid an infinite loop */ 22 | + Trace((stderr, "UZbunzip2() got empty input\n")); 23 | + return 2; 24 | + } 25 | + 26 | #if (defined(DLL) && !defined(NO_SLIDE_REDIR)) 27 | if (G.redirect_slide) 28 | wsize = G.redirect_size, redirSlide = G.redirect_buffer; 29 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-allow-greater-hostver-values.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Santiago Vila 4 | Subject: zipinfo.c: Do not crash when hostver byte is >= 100 5 | 6 | --- a/zipinfo.c 7 | +++ b/zipinfo.c 8 | @@ -2114,7 +2114,7 @@ 9 | else 10 | attribs[9] = (xattr & UNX_ISVTX)? 'T' : '-'; /* T==undefined */ 11 | 12 | - sprintf(&attribs[12], "%u.%u", hostver/10, hostver%10); 13 | + sprintf(&attribs[11], "%2u.%u", hostver/10, hostver%10); 14 | break; 15 | 16 | } /* end switch (hostnum: external attributes format) */ 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-attribs-overflow.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | http://pkgs.fedoraproject.org/cgit/unzip.git/plain/unzip-6.0-attribs-overflow.patch?id=d18f821e 4 | 5 | diff -up unzip60/zipinfo.c.attribs-overflow unzip60/zipinfo.c 6 | --- unzip60/zipinfo.c.attribs-overflow 2009-11-30 09:55:39.000000000 +0100 7 | +++ unzip60/zipinfo.c 2009-11-30 09:56:42.844263244 +0100 8 | @@ -1881,7 +1881,7 @@ static int zi_short(__G) /* return PK- 9 | #endif 10 | int k, error, error_in_archive=PK_COOL; 11 | unsigned hostnum, hostver, methid, methnum, xattr; 12 | - char *p, workspace[12], attribs[16]; 13 | + char *p, workspace[12], attribs[17]; 14 | char methbuf[5]; 15 | static ZCONST char dtype[5]="NXFS"; /* normal, maximum, fast, superfast */ 16 | static ZCONST char Far os[NUM_HOSTS+1][4] = { 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-initialize-symlink-flag.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Andreas Schwab 4 | Subject: Initialize the symlink flag 5 | Bug-Debian: http://bugs.debian.org/717029 6 | X-Debian-version: 6.0-10 7 | 8 | --- a/process.c 9 | +++ b/process.c 10 | @@ -1758,6 +1758,12 @@ 11 | = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); 12 | #endif 13 | 14 | +#ifdef SYMLINKS 15 | + /* Initialize the symlink flag, may be set by the platform-specific 16 | + mapattr function. */ 17 | + G.pInfo->symlink = 0; 18 | +#endif 19 | + 20 | return PK_COOL; 21 | 22 | } /* end function process_cdir_file_hdr() */ 23 | -------------------------------------------------------------------------------- /gnu/packages/patches/unzip-remove-build-date.patch: -------------------------------------------------------------------------------- 1 | Copied from Debian. 2 | 3 | From: Jérémy Bobbio 4 | Subject: Remove build date 5 | Bug-Debian: http://bugs.debian.org/782851 6 | In order to make unzip build reproducibly, we remove the 7 | (already optional) build date from the binary. 8 | 9 | --- a/unix/unix.c 10 | +++ b/unix/unix.c 11 | @@ -1705,7 +1705,7 @@ 12 | #endif /* Sun */ 13 | #endif /* SGI */ 14 | 15 | -#ifdef __DATE__ 16 | +#if 0 17 | " on ", __DATE__ 18 | #else 19 | "", "" 20 | -------------------------------------------------------------------------------- /gnu/packages/patches/util-linux-tests.patch: -------------------------------------------------------------------------------- 1 | This test checks whether 'root' is successfully translated to UID/GID 0, 2 | using 'getpwnam' in libmount. This doesn't work in the chroot because 3 | /etc/passwd doesn't contain an entry for 'root' so skip it. 4 | 5 | 6 | --- util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:41.181151194 +0100 7 | +++ util-linux-2.25.2/tests/ts/libmount/optstr 2015-01-23 13:58:42.829161716 +0100 8 | @@ -84,10 +84,6 @@ ts_init_subtest "apply-user" # add user, 9 | ts_valgrind $TESTPROG --apply --user "noexec,nosuid,loop=/dev/looop0" 0x408 &> $TS_OUTPUT 10 | ts_finalize_subtest 11 | 12 | -ts_init_subtest "fix" 13 | -ts_valgrind $TESTPROG --fix "uid=root,gid=root" &> $TS_OUTPUT 14 | -ts_finalize_subtest 15 | - 16 | ts_init_subtest "deduplicate" 17 | ts_valgrind $TESTPROG --dedup bbb,ccc,AAA,xxx,AAA=a,AAA=bbb,ddd,AAA=ccc,fff=eee AAA &> $TS_OUTPUT 18 | ts_finalize_subtest 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/valgrind-enable-arm.patch: -------------------------------------------------------------------------------- 1 | Accept "arm" instead of "armv7" in configure, see 2 | http://valgrind.10908.n7.nabble.com/building-for-arm-td39382.html . 3 | 4 | diff -u -r valgrind-3.11.0.orig/configure valgrind-3.11.0/configure 5 | --- valgrind-3.11.0.orig/configure 2015-10-02 20:37:41.915721386 +0200 6 | +++ valgrind-3.11.0/configure 2015-10-02 20:37:54.886746395 +0200 7 | @@ -5607,7 +5607,7 @@ 8 | ARCH_MAX="s390x" 9 | ;; 10 | 11 | - armv7*) 12 | + arm*) 13 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${host_cpu})" >&5 14 | $as_echo "ok (${host_cpu})" >&6; } 15 | ARCH_MAX="arm" 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/vpnc-script.patch: -------------------------------------------------------------------------------- 1 | This patch adapts the vpnc script to newer kernel versions, see 2 | https://lkml.org/lkml/2011/3/24/645 3 | 4 | diff -u a/vpnc-script.in b/vpnc-script.in 5 | --- a/vpnc-script.in 2013-03-03 13:55:16.000000000 +0100 6 | +++ b/vpnc-script.in 2013-03-03 13:56:11.000000000 +0100 7 | @@ -116,7 +116,7 @@ 8 | 9 | if [ -n "$IPROUTE" ]; then 10 | fix_ip_get_output () { 11 | - sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' 12 | + sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' 13 | } 14 | 15 | set_vpngateway_route() { 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/w3m-fix-compile.patch: -------------------------------------------------------------------------------- 1 | https://bugs.archlinux.org/task/33397 2 | 3 | diff -aur old/main.c new/main.c 4 | --- main.c 2013-01-14 18:16:14.216210053 -0600 5 | +++ main.c 2013-01-14 18:17:28.816220559 -0600 6 | @@ -833,7 +833,8 @@ 7 | mySignal(SIGPIPE, SigPipe); 8 | #endif 9 | 10 | - orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); 11 | + orig_GC_warn_proc = GC_get_warn_proc(); 12 | + GC_set_warn_proc(wrap_GC_warn_proc); 13 | err_msg = Strnew(); 14 | if (load_argc == 0) { 15 | /* no URL specified */ 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch: -------------------------------------------------------------------------------- 1 | Copied from Fedora. 2 | 3 | https://bugzilla.redhat.com/show_bug.cgi?id=1189303 4 | http://pkgs.fedoraproject.org/cgit/webkitgtk.git/commit/?id=e689e45d0cc2c50484e69d20371ba607af7326f3 5 | 6 | diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp 7 | --- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string 2015-09-14 09:25:43.004200172 +0200 8 | +++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp 2015-09-14 09:25:57.852082368 +0200 9 | @@ -71,7 +71,7 @@ int SQLiteStatement::prepare() 10 | // this lets SQLite avoid an extra string copy. 11 | size_t lengthIncludingNullCharacter = query.length() + 1; 12 | 13 | - const char* tail; 14 | + const char* tail = nullptr; 15 | int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail); 16 | 17 | if (error != SQLITE_OK) 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/weex-vacopy.patch: -------------------------------------------------------------------------------- 1 | Taken from the Debian 2.8.0 package. 2 | 3 | --- weex-2.6.1.5/src/strlib.c 2003-08-18 11:52:38.000000000 +0200 4 | +++ weex-2.8.0/src/strlib.c 2007-12-04 14:22:02.000000000 +0100 5 | @@ -42,6 +42,8 @@ 6 | # define G_VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) 7 | # elif defined (G_VA_COPY_AS_ARRAY) 8 | # define G_VA_COPY(ap1, ap2) g_memmove ((ap1), (ap2), sizeof (va_list)) 9 | +# elif defined (__x86_64__) 10 | +# define G_VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list)) 11 | # else /* va_list is a pointer */ 12 | # define G_VA_COPY(ap1, ap2) ((ap1) = (ap2)) 13 | # endif /* va_list is a pointer */ 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/wicd-bitrate-none-fix.patch: -------------------------------------------------------------------------------- 1 | Fix copied from https://bugs.launchpad.net/wicd/+bug/1432423/comments/1 2 | 3 | --- wicd-1.7.3/curses/netentry_curses.py 1969-12-31 19:00:00.000000000 -0500 4 | +++ wicd-1.7.3/curses/netentry_curses.py 2015-08-11 23:26:19.999999649 -0400 5 | @@ -538,11 +538,16 @@ 6 | self.bitrates = wireless.GetAvailableBitrates() 7 | self.bitrates.append('auto') 8 | self.bitrate_combo.set_list(self.bitrates) 9 | + 10 | + # bitrate property is sometimes None 11 | + chosen_bitrate = wireless.GetWirelessProperty(networkID, 'bitrate') 12 | + if chosen_bitrate not in self.bitrates: 13 | + chosen_bitrate = 'auto' 14 | + 15 | self.bitrate_combo.set_focus( 16 | - self.bitrates.index( 17 | - wireless.GetWirelessProperty(networkID, 'bitrate') 18 | - ) 19 | + self.bitrates.index(chosen_bitrate) 20 | ) 21 | + 22 | self.allow_lower_bitrates_chkbox.set_state( 23 | to_bool(self.format_entry(networkID, 'allow_lower_bitrates')) 24 | ) 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/wicd-get-selected-profile-fix.patch: -------------------------------------------------------------------------------- 1 | Fix copied from https://bugs.launchpad.net/wicd/+bug/1421918/comments/2 2 | 3 | --- wicd-1.7.3/curses/wicd-curses.py 2014-12-21 16:57:33 +0000 4 | +++ wicd-1.7.3/curses/wicd-curses.py 2015-02-24 23:41:01 +0000 5 | @@ -532,7 +532,10 @@ 6 | def get_selected_profile(self): 7 | """Get the selected wired profile""" 8 | loc = self.get_focus()[1] 9 | - return self.theList[loc] 10 | + if len(self.theList) > loc: 11 | + return self.theList[loc] 12 | + else: 13 | + return self.theList[-1] 14 | 15 | 16 | class AdHocDialog(Dialog2): 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/wicd-template-instantiation.patch: -------------------------------------------------------------------------------- 1 | Wicd 1.7.3 fails to instantiate template lines that have several 2 | variable references. For instance, the line: 3 | 4 | wep_key$_KEY_INDEX=$_KEY 5 | 6 | which is found in in the 'wep-hex' template, expands to these two 7 | lines: 8 | 9 | wep_key0=$_KEY 10 | wep_key0=123456789ab 11 | 12 | This patch fixes that by only emitting the fully substituted line. 13 | 14 | Patch by Ludovic Courtès . 15 | 16 | --- a/wicd/misc.py 2012-11-17 00:07:08 +0000 17 | +++ b/wicd/misc.py 2015-05-09 11:22:37 +0000 18 | @@ -321,11 +321,11 @@ def ParseEncryption(network): 19 | rep_val = '0' 20 | if rep_val: 21 | line = line.replace("$_%s" % cur_val, str(rep_val)) 22 | - config_file = ''.join([config_file, line]) 23 | else: 24 | print "Ignoring template line: '%s'" % line 25 | else: 26 | print "Weird parsing error occurred" 27 | + config_file = ''.join([config_file, line]) 28 | else: # Just a regular entry. 29 | config_file = ''.join([config_file, line]) 30 | -------------------------------------------------------------------------------- /gnu/packages/patches/wicd-urwid-1.3.patch: -------------------------------------------------------------------------------- 1 | Update the wicd-curses client to work with urwid-1.3. Based on a patch from: 2 | http://technik.blogbasis.net/wicd-curses-fix-fuer-attributeerror-screen-object-no-attribute-get_input_nonblocking-04-12-2014 3 | 4 | --- wicd-1.7.3/curses/wicd-curses.py.orig 2014-12-21 14:40:46.000000000 -0500 5 | +++ wicd-1.7.3/curses/wicd-curses.py 2015-02-05 23:41:17.530901204 -0500 6 | @@ -1153,9 +1153,10 @@ 7 | if not ui._started: 8 | return False 9 | 10 | - input_data = ui.get_input_nonblocking() 11 | + ui.set_input_timeouts(max_wait=0) 12 | + input_data = ui.get_input() 13 | # Resolve any "alarms" in the waiting 14 | - self.handle_keys(input_data[1]) 15 | + self.handle_keys(input_data) 16 | 17 | # Update the screen 18 | canvas = self.frame.render((self.size), True) 19 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-ark-remove-mibstore.patch: -------------------------------------------------------------------------------- 1 | Removes references to mibstore.h and miInitializeBackingStore, which 2 | have been removed from xorg-server. Zack Rusin 3 | wrote: "It was a noop for at least 5 years and it has been removed." 4 | See: http://patches.openembedded.org/patch/46133/ 5 | 6 | --- xf86-video-ark-0.7.5/src/ark_driver.c.~1~ 2012-07-17 00:51:36.000000000 -0400 7 | +++ xf86-video-ark-0.7.5/src/ark_driver.c 2014-12-19 00:23:13.028931734 -0500 8 | @@ -39,7 +39,6 @@ 9 | #include "compiler.h" 10 | #include "mipointer.h" 11 | #include "micmap.h" 12 | -#include "mibstore.h" 13 | #include "fb.h" 14 | #include "ark.h" 15 | 16 | @@ -538,7 +537,6 @@ 17 | 18 | fbPictureInit (pScreen, 0, 0); 19 | 20 | - miInitializeBackingStore(pScreen); 21 | xf86SetBackingStore(pScreen); 22 | 23 | if (!pARK->NoAccel) { 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-geode-glibc-2.20.patch: -------------------------------------------------------------------------------- 1 | Allow builds with glibc 2.20. 2 | Based on a patch by Peter Hutterer . 3 | See . 4 | 5 | --- xf86-video-geode-2.11.16/src/lx_memory.c.~1~ 2014-07-16 16:59:37.000000000 -0400 6 | +++ xf86-video-geode-2.11.16/src/lx_memory.c 2014-12-19 00:38:11.753388268 -0500 7 | @@ -23,6 +23,8 @@ 8 | * software without specific prior written permission. 9 | */ 10 | 11 | +#include 12 | + 13 | #include "xf86.h" 14 | #include "geode.h" 15 | #include "cim/cim_regs.h" 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-glint-remove-mibstore.patch: -------------------------------------------------------------------------------- 1 | Removes references to mibstore.h and miInitializeBackingStore, which 2 | have been removed from xorg-server. Zack Rusin 3 | wrote: "It was a noop for at least 5 years and it has been removed." 4 | See: http://patches.openembedded.org/patch/46133/ 5 | 6 | --- xf86-video-glint-1.2.8/src/glint_driver.c.~1~ 2012-07-15 22:50:47.000000000 -0400 7 | +++ xf86-video-glint-1.2.8/src/glint_driver.c 2014-12-19 00:42:39.162714279 -0500 8 | @@ -52,8 +52,6 @@ 9 | #include "compiler.h" 10 | #include "mipointer.h" 11 | 12 | -#include "mibstore.h" 13 | - 14 | #include "pm3_regs.h" 15 | #include "glint_regs.h" 16 | #include "IBM.h" 17 | @@ -2904,7 +2902,6 @@ 18 | } 19 | } 20 | 21 | - miInitializeBackingStore(pScreen); 22 | xf86SetBackingStore(pScreen); 23 | xf86SetSilkenMouse(pScreen); 24 | 25 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-i128-remove-mibstore.patch: -------------------------------------------------------------------------------- 1 | Removes references to mibstore.h and miInitializeBackingStore, which 2 | have been removed from xorg-server. Zack Rusin 3 | wrote: "It was a noop for at least 5 years and it has been removed." 4 | See: http://patches.openembedded.org/patch/46133/ 5 | 6 | --- xf86-video-i128-1.3.6/src/i128_driver.c.~1~ 2012-07-17 01:21:15.000000000 -0400 7 | +++ xf86-video-i128-1.3.6/src/i128_driver.c 2014-12-19 00:47:16.140087736 -0500 8 | @@ -51,7 +51,6 @@ 9 | #include "mipointer.h" 10 | 11 | /* All drivers implementing backing store need this */ 12 | -#include "mibstore.h" 13 | #include "micmap.h" 14 | 15 | #include "xf86DDC.h" 16 | @@ -1557,7 +1556,6 @@ 17 | return FALSE; 18 | } 19 | 20 | - miInitializeBackingStore(pScreen); 21 | xf86SetBackingStore(pScreen); 22 | xf86SetSilkenMouse(pScreen); 23 | 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-intel-compat-api.patch: -------------------------------------------------------------------------------- 1 | This patch was copied from Debian. 2 | 3 | --- xserver-xorg-video-intel-2.21.15.orig/src/compat-api.h 4 | +++ xserver-xorg-video-intel-2.21.15/src/compat-api.h 5 | @@ -158,4 +158,8 @@ 6 | if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) 7 | #endif 8 | 9 | +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) 10 | +#define DamageUnregister(d, dd) DamageUnregister(dd) 11 | +#endif 12 | + 13 | #endif 14 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-intel-glibc-2.20.patch: -------------------------------------------------------------------------------- 1 | Allow builds with glibc 2.20. 2 | Based on a patch by Peter Hutterer . 3 | See . 4 | 5 | --- xf86-video-intel-2.21.15/src/intel_device.c.~1~ 2013-08-09 16:58:48.000000000 -0400 6 | +++ xf86-video-intel-2.21.15/src/intel_device.c 2014-12-18 00:03:54.700759577 -0500 7 | @@ -33,6 +33,8 @@ 8 | 9 | #include 10 | 11 | +#include 12 | + 13 | #include 14 | #include 15 | #include 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch: -------------------------------------------------------------------------------- 1 | Fix test compilation with exa.h in configure when using glibc 2.20. 2 | Inspired by a patch by Peter Hutterer . 3 | See . 4 | 5 | --- xf86-video-mach64-6.9.4/configure.~1~ 2012-12-20 01:16:10.000000000 -0500 6 | +++ xf86-video-mach64-6.9.4/configure 2014-12-19 02:48:18.040097554 -0500 7 | @@ -18370,7 +18370,9 @@ 8 | 9 | SAVE_CPPFLAGS="$CPPFLAGS" 10 | CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" 11 | - ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default" 12 | + ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default 13 | +#include 14 | +" 15 | if test "x$ac_cv_header_exa_h" = xyes; then : 16 | have_exa_h="yes" 17 | else 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-mga-glibc-2.20.patch: -------------------------------------------------------------------------------- 1 | Fix test compilation with exa.h in configure when using glibc 2.20. 2 | Inspired by a patch by Peter Hutterer . 3 | See . 4 | 5 | --- xf86-video-mga-1.6.3/configure.~1~ 2013-12-04 21:10:25.000000000 -0500 6 | +++ xf86-video-mga-1.6.3/configure 2014-12-19 01:06:23.005774736 -0500 7 | @@ -18464,7 +18464,9 @@ 8 | 9 | SAVE_CPPFLAGS="$CPPFLAGS" 10 | CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" 11 | - ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default" 12 | + ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default 13 | +#include 14 | +" 15 | if test "x$ac_cv_header_exa_h" = xyes; then : 16 | have_exa_h="yes" 17 | else 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch: -------------------------------------------------------------------------------- 1 | Allow builds with glibc 2.20. 2 | Based on a patch by Peter Hutterer . 3 | See . 4 | 5 | --- xf86-video-openchrome-0.3.3/src/via_3d.h.~1~ 2013-05-23 11:11:28.000000000 -0400 6 | +++ xf86-video-openchrome-0.3.3/src/via_3d.h 2014-12-19 01:17:04.000953259 -0500 7 | @@ -24,6 +24,8 @@ 8 | #ifndef VIA_3D_H 9 | #define VIA_3D_H 10 | 11 | +#include 12 | + 13 | #include "xf86.h" 14 | #include "via_dmabuffer.h" 15 | 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-r128-glibc-2.20.patch: -------------------------------------------------------------------------------- 1 | Fix test compilation with exa.h in configure when using glibc 2.20. 2 | Inspired by a patch by Peter Hutterer . 3 | See . 4 | 5 | --- xf86-video-r128-6.9.2/configure.~1~ 2013-10-02 14:38:15.000000000 -0400 6 | +++ xf86-video-r128-6.9.2/configure 2014-12-19 01:23:03.346735159 -0500 7 | @@ -18400,7 +18400,9 @@ 8 | 9 | SAVE_CPPFLAGS="$CPPFLAGS" 10 | CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" 11 | - ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default" 12 | + ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default 13 | +#include 14 | +" 15 | if test "x$ac_cv_header_exa_h" = xyes; then : 16 | have_exa_h="yes" 17 | else 18 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch: -------------------------------------------------------------------------------- 1 | Removes references to mibstore.h and miInitializeBackingStore, which 2 | have been removed from xorg-server. Zack Rusin 3 | wrote: "It was a noop for at least 5 years and it has been removed." 4 | See: http://patches.openembedded.org/patch/46133/ 5 | 6 | --- xf86-video-siliconmotion-1.7.7/src/smi_driver.c.~1~ 2012-07-17 00:53:21.000000000 -0400 7 | +++ xf86-video-siliconmotion-1.7.7/src/smi_driver.c 2014-12-19 01:30:16.708884086 -0500 8 | @@ -1750,8 +1750,6 @@ 9 | "Done writing mode. Register dump:\n"); 10 | SMI_PrintRegs(pScrn); 11 | 12 | - miInitializeBackingStore(pScreen); 13 | - 14 | #ifdef HAVE_XMODES 15 | xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset)); 16 | #endif 17 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch: -------------------------------------------------------------------------------- 1 | Removes references to mibstore.h and miInitializeBackingStore, which 2 | have been removed from xorg-server. Zack Rusin 3 | wrote: "It was a noop for at least 5 years and it has been removed." 4 | See: http://patches.openembedded.org/patch/46133/ 5 | 6 | --- xf86-video-tdfx-1.4.5/src/tdfx_driver.c.~1~ 2012-07-17 01:21:16.000000000 -0400 7 | +++ xf86-video-tdfx-1.4.5/src/tdfx_driver.c 2014-12-19 01:36:42.762798424 -0500 8 | @@ -62,10 +62,6 @@ 9 | 10 | #include "compiler.h" 11 | 12 | -/* Drivers using the mi implementation of backing store need: */ 13 | - 14 | -#include "mibstore.h" 15 | - 16 | /* All drivers using the vgahw module need this */ 17 | /* This driver needs to be modified to not use vgaHW for multihead operation */ 18 | #include "vgaHW.h" 19 | @@ -2373,7 +2369,6 @@ 20 | } 21 | } 22 | 23 | - miInitializeBackingStore(pScreen); 24 | xf86SetBackingStore(pScreen); 25 | xf86SetSilkenMouse(pScreen); 26 | 27 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-tga-remove-mibstore.patch: -------------------------------------------------------------------------------- 1 | Removes references to mibstore.h and miInitializeBackingStore, which 2 | have been removed from xorg-server. Zack Rusin 3 | wrote: "It was a noop for at least 5 years and it has been removed." 4 | See: http://patches.openembedded.org/patch/46133/ 5 | 6 | --- xf86-video-tga-1.2.2/src/tga_accel.c.~1~ 2012-07-15 23:54:04.000000000 -0400 7 | +++ xf86-video-tga-1.2.2/src/tga_accel.c 2014-12-19 01:40:27.535913013 -0500 8 | @@ -37,7 +37,6 @@ 9 | #include "xf86cmap.h" 10 | #include "mipointer.h" 11 | 12 | -#include "mibstore.h" 13 | #include "miline.h" 14 | 15 | #include "tga_regs.h" 16 | --- xf86-video-tga-1.2.2/src/tga_driver.c.~1~ 2012-07-15 23:54:28.000000000 -0400 17 | +++ xf86-video-tga-1.2.2/src/tga_driver.c 2014-12-19 01:40:48.756018238 -0500 18 | @@ -46,8 +46,6 @@ 19 | 20 | /* software cursor */ 21 | #include "mipointer.h" 22 | -/* backing store */ 23 | -#include "mibstore.h" 24 | 25 | /* #include "mibank.h" */ 26 | /* colormap manipulation */ 27 | @@ -1451,7 +1449,6 @@ 28 | 29 | fbPictureInit (pScreen, 0, 0); 30 | 31 | - miInitializeBackingStore(pScreen); 32 | xf86SetBackingStore(pScreen); 33 | xf86SetSilkenMouse(pScreen); 34 | 35 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-trident-remove-mibstore.patch: -------------------------------------------------------------------------------- 1 | Removes references to mibstore.h and miInitializeBackingStore, which 2 | have been removed from xorg-server. Zack Rusin 3 | wrote: "It was a noop for at least 5 years and it has been removed." 4 | See: http://patches.openembedded.org/patch/46133/ 5 | 6 | --- xf86-video-trident-1.3.6/src/trident_driver.c.~1~ 2012-07-15 22:16:00.000000000 -0400 7 | +++ xf86-video-trident-1.3.6/src/trident_driver.c 2014-12-19 01:45:29.529410518 -0500 8 | @@ -56,7 +56,6 @@ 9 | 10 | #include "mipointer.h" 11 | 12 | -#include "mibstore.h" 13 | #include "shadow.h" 14 | #include "trident.h" 15 | #include "trident_regs.h" 16 | @@ -3037,7 +3036,6 @@ 17 | TridentAccelInit(pScreen); 18 | } 19 | 20 | - miInitializeBackingStore(pScreen); 21 | xf86SetBackingStore(pScreen); 22 | 23 | /* Initialise cursor functions */ 24 | -------------------------------------------------------------------------------- /gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch: -------------------------------------------------------------------------------- 1 | Allow builds with glibc 2.20. 2 | Based on a patch by Peter Hutterer . 3 | See . 4 | 5 | --- xf86-video-vmware-13.0.2/vmwgfx/vmwgfx_overlay.c.~1~ 2014-03-20 09:15:03.000000000 -0400 6 | +++ xf86-video-vmware-13.0.2/vmwgfx/vmwgfx_overlay.c 2014-12-19 02:31:34.759122552 -0500 7 | @@ -35,6 +35,8 @@ 8 | */ 9 | 10 | 11 | +#include 12 | + 13 | #include "xf86xv.h" 14 | #include "fourcc.h" 15 | #define debug_printf(...) 16 | -------------------------------------------------------------------------------- /gnu/packages/patches/xfce4-session-fix-xflock4.patch: -------------------------------------------------------------------------------- 1 | From cbb9c769316b4d32956a2c78aa01a38b473f0cfc Mon Sep 17 00:00:00 2001 2 | From: David Thompson 3 | Date: Fri, 30 Oct 2015 08:30:43 -0400 4 | Subject: [PATCH] xflock4: Do not override PATH with hardcoded value. 5 | 6 | The PATH "/bin:/usr/bin" may not be a valid search path on the user's 7 | machine. The screen locking program may be in /usr/local/bin or 8 | elsewhere. Distros that do not conform to the FHS, such as GuixSD and 9 | NixOS, will not have their executables in either location. Thus, we 10 | simply leave PATH alone. 11 | --- 12 | scripts/xflock4 | 3 --- 13 | 1 file changed, 3 deletions(-) 14 | 15 | diff --git a/scripts/xflock4 b/scripts/xflock4 16 | index ec4d05d..e7981ac 100644 17 | --- a/scripts/xflock4 18 | +++ b/scripts/xflock4 19 | @@ -21,9 +21,6 @@ 20 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 21 | # 22 | 23 | -PATH=/bin:/usr/bin 24 | -export PATH 25 | - 26 | # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running 27 | for lock_cmd in \ 28 | "xscreensaver-command -lock" \ 29 | -- 30 | 2.5.0 31 | 32 | -------------------------------------------------------------------------------- /gnu/packages/patches/xmodmap-asprintf.patch: -------------------------------------------------------------------------------- 1 | This patch allows the 'asprintf' declaration to be visible, by 2 | including , which defines _GNU_SOURCE. 3 | 4 | 5 | --- xmodmap-1.0.7/xmodmap.c 2013-11-25 23:25:25.000000000 +0100 6 | +++ xmodmap-1.0.7/xmodmap.c 2013-11-25 23:25:27.000000000 +0100 7 | @@ -26,6 +26,7 @@ from The Open Group. 8 | 9 | */ 10 | 11 | +#include 12 | #include 13 | #include 14 | #include 15 | -------------------------------------------------------------------------------- /gnu/packages/patches/zathura-plugindir-environment-variable.patch: -------------------------------------------------------------------------------- 1 | From ae8e4cc9ab57ff25d2ba6c4b369e8531ce43a6d2 Mon Sep 17 00:00:00 2001 2 | From: Paul van der Walt 3 | Date: Mon, 2 Mar 2015 22:15:39 +0100 4 | Subject: [PATCH] Search path environment variable for Zathura. 5 | 6 | Adds a search path environment variable for zathura plugins (for reading 7 | different file formats) called ZATHURA_PLUGIN_PATH. Command line option 8 | -p still takes precedence. 9 | 10 | Patch by Paul van der Walt 11 | --- 12 | zathura/zathura.c | 7 +++++++ 13 | 1 file changed, 7 insertions(+) 14 | 15 | diff --git a/zathura/zathura.c b/zathura/zathura.c 16 | index 589dd28..375ec54 100644 17 | --- a/zathura/zathura.c 18 | +++ b/zathura/zathura.c 19 | @@ -413,6 +413,13 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir) 20 | g_return_if_fail(zathura != NULL); 21 | g_return_if_fail(zathura->plugins.manager != NULL); 22 | 23 | + /* Added for Guix: check if environment variable 24 | + * is set to specify location of zathura plugins. 25 | + */ 26 | + 27 | + if (dir == NULL) 28 | + dir = g_getenv("ZATHURA_PLUGIN_PATH"); 29 | + 30 | if (dir != NULL) { 31 | girara_list_t* paths = girara_split_path_array(dir); 32 | GIRARA_LIST_FOREACH(paths, char*, iter, path) 33 | -- 34 | 2.3.1 35 | 36 | -------------------------------------------------------------------------------- /hydra.gnu.org.pub: -------------------------------------------------------------------------------- 1 | (public-key 2 | (rsa 3 | (n #00DB1634E3D9DFAC97AE4734DAE968CCB15EE4815C82BDC254883DBB49FE1EF32268E82D4BBE0E35298C481C9DA1551642FAFF05AEC1A60712F1BB4BE7D25D7EFF7A4F89704A5A9AC232870CB9F2476C3B538A0E990A8825DEB73081D317001FB8A188600F2FEF5F5F570E857F3EE4355077A3C3918ED72723A56BA55C466D400658974D7DAD1F6B7B63C192B9C2704D98BBFF1C3BD5B8EF11A8ADC83ACB8FD8E9F1E792FDAD262415D13F2DEE55F330908CFDA9C3C8C32B64F7DD088457D34F445E2E2C83C6D680549DC9B6E6573B89496567204ED285E67A279F2F667080BA941D80D015CE87B0FB6A91A99CECC7D91D2D210B00E4B6E611DA51DB008F1DFE3FCAC6B27393FA781D45F9A15FC7B8785A3E86BA6592B2916CA22CF1E40FC85F85CACA590461154F58F3580B16398908EF32076F411299C28727C94D88B6A618F84DD73AEBED8270BCB6690928CB1BF250C35E1F6BF3B1B30D05BA246ECE8F69D9065DE26F4B3E0D814D70A9C27CB5B7B050C9090590D3A9EF83374F2643E5446FBD39DDB124DBF6DFDAA6D18E2560AD0CBFA11C959C9B7316BF19963A191967054E9FD97DC14D71082B30B1C90A46E8996682474C3BCB51BA0882958897B6DD35E41B5174D0A6BCDE97B89043E95BD1B70DE61DA666893B417196A180005466BC3A742FDF04E89B04460E3E6BC72E7F1B5FEA5B3092FEE551A3C447C12E104E65#) 4 | (e #010001#) 5 | ) 6 | ) 7 | -------------------------------------------------------------------------------- /nix/.gitignore: -------------------------------------------------------------------------------- 1 | *.a 2 | *.o 3 | .deps 4 | .dirstamp 5 | -------------------------------------------------------------------------------- /nix/AUTHORS: -------------------------------------------------------------------------------- 1 | Most of the code is this directory was written by several people for 2 | the Nix project (http://nixos.org/nix). Thanks! 3 | -------------------------------------------------------------------------------- /nix/boost/.gitignore: -------------------------------------------------------------------------------- 1 | *.hpp 2 | *.cpp 3 | *.cc 4 | -------------------------------------------------------------------------------- /nix/boost/assert.hpp: -------------------------------------------------------------------------------- 1 | // 2 | // boost/assert.hpp - BOOST_ASSERT(expr) 3 | // 4 | // Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd. 5 | // 6 | // Permission to copy, use, modify, sell and distribute this software 7 | // is granted provided this copyright notice appears in all copies. 8 | // This software is provided "as is" without express or implied 9 | // warranty, and with no claim as to its suitability for any purpose. 10 | // 11 | // Note: There are no include guards. This is intentional. 12 | // 13 | // See http://www.boost.org/libs/utility/assert.html for documentation. 14 | // 15 | 16 | #undef BOOST_ASSERT 17 | 18 | #if defined(BOOST_DISABLE_ASSERTS) 19 | 20 | # define BOOST_ASSERT(expr) ((void)0) 21 | 22 | #elif defined(BOOST_ENABLE_ASSERT_HANDLER) 23 | 24 | #include 25 | 26 | namespace boost 27 | { 28 | 29 | void assertion_failed(char const * expr, char const * function, char const * file, long line); // user defined 30 | 31 | } // namespace boost 32 | 33 | #define BOOST_ASSERT(expr) ((expr)? ((void)0): ::boost::assertion_failed(#expr, BOOST_CURRENT_FUNCTION, __FILE__, __LINE__)) 34 | 35 | #else 36 | # include 37 | # define BOOST_ASSERT(expr) assert(expr) 38 | #endif 39 | -------------------------------------------------------------------------------- /nix/boost/format.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format.hpp -------------------------------------------------------------------------------- /nix/boost/format/exceptions.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/exceptions.hpp -------------------------------------------------------------------------------- /nix/boost/format/feed_args.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/feed_args.hpp -------------------------------------------------------------------------------- /nix/boost/format/format_class.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/format_class.hpp -------------------------------------------------------------------------------- /nix/boost/format/format_fwd.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/format_fwd.hpp -------------------------------------------------------------------------------- /nix/boost/format/format_implementation.cc: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/format_implementation.cc -------------------------------------------------------------------------------- /nix/boost/format/free_funcs.cc: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/free_funcs.cc -------------------------------------------------------------------------------- /nix/boost/format/group.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/group.hpp -------------------------------------------------------------------------------- /nix/boost/format/internals.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/internals.hpp -------------------------------------------------------------------------------- /nix/boost/format/internals_fwd.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/internals_fwd.hpp -------------------------------------------------------------------------------- /nix/boost/format/macros_default.hpp: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/pjotrp/guix/96250294012c2f1520b67f12ea80bfd6b98075a2/nix/boost/format/macros_default.hpp -------------------------------------------------------------------------------- /nix/boost/throw_exception.hpp: -------------------------------------------------------------------------------- 1 | #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED 2 | #define BOOST_THROW_EXCEPTION_HPP_INCLUDED 3 | 4 | // MS compatible compilers support #pragma once 5 | 6 | #if defined(_MSC_VER) && (_MSC_VER >= 1020) 7 | # pragma once 8 | #endif 9 | 10 | // 11 | // boost/throw_exception.hpp 12 | // 13 | // Copyright (c) 2002 Peter Dimov and Multi Media Ltd. 14 | // 15 | // Permission to copy, use, modify, sell and distribute this software 16 | // is granted provided this copyright notice appears in all copies. 17 | // This software is provided "as is" without express or implied 18 | // warranty, and with no claim as to its suitability for any purpose. 19 | // 20 | // http://www.boost.org/libs/utility/throw_exception.html 21 | // 22 | 23 | //#include 24 | 25 | #ifdef BOOST_NO_EXCEPTIONS 26 | # include 27 | #endif 28 | 29 | namespace boost 30 | { 31 | 32 | #ifdef BOOST_NO_EXCEPTIONS 33 | 34 | void throw_exception(std::exception const & e); // user defined 35 | 36 | #else 37 | 38 | template void throw_exception(E const & e) 39 | { 40 | throw e; 41 | } 42 | 43 | #endif 44 | 45 | } // namespace boost 46 | 47 | #endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED 48 | -------------------------------------------------------------------------------- /nix/libstore/.gitignore: -------------------------------------------------------------------------------- 1 | *.cc 2 | *.hh 3 | /schema.sql 4 | -------------------------------------------------------------------------------- /nix/libstore/pathlocks.hh: -------------------------------------------------------------------------------- 1 | #pragma once 2 | 3 | #include "types.hh" 4 | 5 | 6 | namespace nix { 7 | 8 | 9 | /* Open (possibly create) a lock file and return the file descriptor. 10 | -1 is returned if create is false and the lock could not be opened 11 | because it doesn't exist. Any other error throws an exception. */ 12 | int openLockFile(const Path & path, bool create); 13 | 14 | /* Delete an open lock file. */ 15 | void deleteLockFile(const Path & path, int fd); 16 | 17 | enum LockType { ltRead, ltWrite, ltNone }; 18 | 19 | bool lockFile(int fd, LockType lockType, bool wait); 20 | 21 | 22 | class PathLocks 23 | { 24 | private: 25 | typedef std::pair FDPair; 26 | list fds; 27 | bool deletePaths; 28 | 29 | public: 30 | PathLocks(); 31 | PathLocks(const PathSet & paths, 32 | const string & waitMsg = ""); 33 | bool lockPaths(const PathSet & _paths, 34 | const string & waitMsg = "", 35 | bool wait = true); 36 | ~PathLocks(); 37 | void unlock(); 38 | void setDeletion(bool deletePaths); 39 | }; 40 | 41 | 42 | bool pathIsLockedByMe(const Path & path); 43 | 44 | 45 | } 46 | -------------------------------------------------------------------------------- /nix/libstore/references.hh: -------------------------------------------------------------------------------- 1 | #pragma once 2 | 3 | #include "types.hh" 4 | #include "hash.hh" 5 | 6 | namespace nix { 7 | 8 | PathSet scanForReferences(const Path & path, const PathSet & refs, 9 | HashResult & hash); 10 | 11 | } 12 | -------------------------------------------------------------------------------- /nix/libutil/.gitignore: -------------------------------------------------------------------------------- 1 | *.cc 2 | *.hh 3 | -------------------------------------------------------------------------------- /nix/libutil/affinity.hh: -------------------------------------------------------------------------------- 1 | #pragma once 2 | 3 | namespace nix { 4 | 5 | void setAffinityTo(int cpu); 6 | int lockToCurrentCPU(); 7 | void restoreAffinity(); 8 | 9 | } 10 | -------------------------------------------------------------------------------- /nix/libutil/md5.h: -------------------------------------------------------------------------------- 1 | /* GNU Guix --- Functional package management for GNU 2 | Copyright (C) 2012 Ludovic Courtès 3 | 4 | This file is part of GNU Guix. 5 | 6 | GNU Guix is free software; you can redistribute it and/or modify it 7 | under the terms of the GNU General Public License as published by 8 | the Free Software Foundation; either version 3 of the License, or (at 9 | your option) any later version. 10 | 11 | GNU Guix is distributed in the hope that it will be useful, but 12 | WITHOUT ANY WARRANTY; without even the implied warranty of 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 | GNU General Public License for more details. 15 | 16 | You should have received a copy of the GNU General Public License 17 | along with GNU Guix. If not, see . */ 18 | 19 | #include 20 | 21 | #define MD5_CTX guix_hash_context 22 | 23 | static inline void 24 | MD5_Init (struct MD5_CTX *ctx) 25 | { 26 | guix_hash_init (ctx, GCRY_MD_MD5); 27 | } 28 | 29 | #define MD5_Update guix_hash_update 30 | 31 | static inline void 32 | MD5_Final (void *resbuf, struct MD5_CTX *ctx) 33 | { 34 | guix_hash_final (resbuf, ctx, GCRY_MD_MD5); 35 | } 36 | -------------------------------------------------------------------------------- /nix/libutil/sha1.h: -------------------------------------------------------------------------------- 1 | /* GNU Guix --- Functional package management for GNU 2 | Copyright (C) 2012 Ludovic Courtès 3 | 4 | This file is part of GNU Guix. 5 | 6 | GNU Guix is free software; you can redistribute it and/or modify it 7 | under the terms of the GNU General Public License as published by 8 | the Free Software Foundation; either version 3 of the License, or (at 9 | your option) any later version. 10 | 11 | GNU Guix is distributed in the hope that it will be useful, but 12 | WITHOUT ANY WARRANTY; without even the implied warranty of 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 | GNU General Public License for more details. 15 | 16 | You should have received a copy of the GNU General Public License 17 | along with GNU Guix. If not, see . */ 18 | 19 | #include 20 | 21 | #define SHA_CTX guix_hash_context 22 | 23 | static inline void 24 | SHA1_Init (struct SHA_CTX *ctx) 25 | { 26 | guix_hash_init (ctx, GCRY_MD_SHA1); 27 | } 28 | 29 | #define SHA1_Update guix_hash_update 30 | 31 | static inline void 32 | SHA1_Final (void *resbuf, struct SHA_CTX *ctx) 33 | { 34 | guix_hash_final (resbuf, ctx, GCRY_MD_SHA1); 35 | } 36 | -------------------------------------------------------------------------------- /nix/libutil/sha256.h: -------------------------------------------------------------------------------- 1 | /* GNU Guix --- Functional package management for GNU 2 | Copyright (C) 2012 Ludovic Courtès 3 | 4 | This file is part of GNU Guix. 5 | 6 | GNU Guix is free software; you can redistribute it and/or modify it 7 | under the terms of the GNU General Public License as published by 8 | the Free Software Foundation; either version 3 of the License, or (at 9 | your option) any later version. 10 | 11 | GNU Guix is distributed in the hope that it will be useful, but 12 | WITHOUT ANY WARRANTY; without even the implied warranty of 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 | GNU General Public License for more details. 15 | 16 | You should have received a copy of the GNU General Public License 17 | along with GNU Guix. If not, see . */ 18 | 19 | #include 20 | 21 | #define SHA256_CTX guix_hash_context 22 | 23 | static inline void 24 | SHA256_Init (struct SHA256_CTX *ctx) 25 | { 26 | guix_hash_init (ctx, GCRY_MD_SHA256); 27 | } 28 | 29 | #define SHA256_Update guix_hash_update 30 | 31 | static inline void 32 | SHA256_Final (void *resbuf, struct SHA256_CTX *ctx) 33 | { 34 | guix_hash_final (resbuf, ctx, GCRY_MD_SHA256); 35 | } 36 | -------------------------------------------------------------------------------- /nix/libutil/sha512.h: -------------------------------------------------------------------------------- 1 | /* GNU Guix --- Functional package management for GNU 2 | Copyright (C) 2012, 2015 Ludovic Courtès 3 | 4 | This file is part of GNU Guix. 5 | 6 | GNU Guix is free software; you can redistribute it and/or modify it 7 | under the terms of the GNU General Public License as published by 8 | the Free Software Foundation; either version 3 of the License, or (at 9 | your option) any later version. 10 | 11 | GNU Guix is distributed in the hope that it will be useful, but 12 | WITHOUT ANY WARRANTY; without even the implied warranty of 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 | GNU General Public License for more details. 15 | 16 | You should have received a copy of the GNU General Public License 17 | along with GNU Guix. If not, see . */ 18 | 19 | #include 20 | 21 | #define SHA512_CTX guix_hash_context 22 | 23 | static inline void 24 | SHA512_Init (struct SHA512_CTX *ctx) 25 | { 26 | guix_hash_init (ctx, GCRY_MD_SHA512); 27 | } 28 | 29 | #define SHA512_Update guix_hash_update 30 | 31 | static inline void 32 | SHA512_Final (void *resbuf, struct SHA512_CTX *ctx) 33 | { 34 | guix_hash_final (resbuf, ctx, GCRY_MD_SHA512); 35 | } 36 | -------------------------------------------------------------------------------- /nix/nix-daemon/shared.hh: -------------------------------------------------------------------------------- 1 | /* GNU Guix --- Functional package management for GNU 2 | Copyright (C) 2012 Ludovic Courtès 3 | 4 | This file is part of GNU Guix. 5 | 6 | GNU Guix is free software; you can redistribute it and/or modify it 7 | under the terms of the GNU General Public License as published by 8 | the Free Software Foundation; either version 3 of the License, or (at 9 | your option) any later version. 10 | 11 | GNU Guix is distributed in the hope that it will be useful, but 12 | WITHOUT ANY WARRANTY; without even the implied warranty of 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 | GNU General Public License for more details. 15 | 16 | You should have received a copy of the GNU General Public License 17 | along with GNU Guix. If not, see . */ 18 | 19 | /* Replacement for Nix's libmain/shared.hh. */ 20 | 21 | #pragma once 22 | 23 | #include 24 | 25 | #include 26 | #include 27 | 28 | static inline void 29 | showManPage (const char *name) 30 | { 31 | /* This idea is evil. Abort. */ 32 | abort (); 33 | } 34 | 35 | extern volatile ::sig_atomic_t blockInt; 36 | 37 | extern char **argvSaved; 38 | -------------------------------------------------------------------------------- /nix/scripts/guix-authenticate.in: -------------------------------------------------------------------------------- 1 | #!@SHELL@ 2 | # A shorthand for "guix authenticate", for use by the daemon. 3 | 4 | if test "x$GUIX_UNINSTALLED" = "x" 5 | then 6 | prefix="@prefix@" 7 | exec_prefix="@exec_prefix@" 8 | exec "@bindir@/guix" authenticate "$@" 9 | else 10 | exec guix authenticate "$@" 11 | fi 12 | -------------------------------------------------------------------------------- /nix/scripts/offload.in: -------------------------------------------------------------------------------- 1 | #!@SHELL@ 2 | # A shorthand for "guix offload", for use by the daemon. 3 | 4 | if test "x$GUIX_UNINSTALLED" = "x" 5 | then 6 | prefix="@prefix@" 7 | exec_prefix="@exec_prefix@" 8 | exec "@bindir@/guix" offload "$@" 9 | else 10 | exec guix offload "$@" 11 | fi 12 | -------------------------------------------------------------------------------- /nix/scripts/substitute.in: -------------------------------------------------------------------------------- 1 | #!@SHELL@ 2 | # A shorthand for "guix substitute", for use by the daemon. 3 | 4 | if test "x$GUIX_UNINSTALLED" = "x" 5 | then 6 | prefix="@prefix@" 7 | exec_prefix="@exec_prefix@" 8 | exec "@bindir@/guix" substitute "$@" 9 | else 10 | exec guix substitute "$@" 11 | fi 12 | -------------------------------------------------------------------------------- /po/guix/LINGUAS: -------------------------------------------------------------------------------- 1 | # Set of available languages. 2 | 3 | cs 4 | da 5 | de 6 | en@boldquot 7 | en@quot 8 | eo 9 | fr 10 | hu 11 | pl 12 | pt_BR 13 | sr 14 | vi 15 | -------------------------------------------------------------------------------- /po/guix/Makevars: -------------------------------------------------------------------------------- 1 | # Makefile variables for PO directory in any package using GNU gettext. 2 | 3 | DOMAIN = guix 4 | 5 | subdir = po/guix 6 | top_builddir = ../.. 7 | 8 | # These options get passed to xgettext. We want to catch standard 9 | # gettext uses, and SRFI-35 error condition messages. In C++ code 10 | # we use 'n_' instead of the more usual 'N_' for no-ops. 11 | XGETTEXT_OPTIONS = \ 12 | --from-code=UTF-8 \ 13 | --keyword=_ --keyword=N_:1,2 \ 14 | --keyword=message \ 15 | --keyword=description \ 16 | --keyword=n_ 17 | 18 | COPYRIGHT_HOLDER = Ludovic Courtès 19 | 20 | MSGID_BUGS_ADDRESS = ludo@gnu.org 21 | 22 | EXTRA_LOCALE_CATEGORIES = 23 | -------------------------------------------------------------------------------- /po/guix/POTFILES.in: -------------------------------------------------------------------------------- 1 | # List of source files which contain translatable strings. 2 | # This should be source files of the various tools, and not package modules. 3 | gnu/packages.scm 4 | gnu/services.scm 5 | gnu/system.scm 6 | gnu/services/dmd.scm 7 | gnu/system/shadow.scm 8 | guix/scripts.scm 9 | guix/scripts/build.scm 10 | guix/scripts/download.scm 11 | guix/scripts/package.scm 12 | guix/scripts/gc.scm 13 | guix/scripts/hash.scm 14 | guix/scripts/import.scm 15 | guix/scripts/import/cran.scm 16 | guix/scripts/import/elpa.scm 17 | guix/scripts/pull.scm 18 | guix/scripts/substitute.scm 19 | guix/scripts/authenticate.scm 20 | guix/scripts/system.scm 21 | guix/scripts/lint.scm 22 | guix/scripts/publish.scm 23 | guix/scripts/edit.scm 24 | guix/scripts/size.scm 25 | guix/scripts/graph.scm 26 | guix/scripts/challenge.scm 27 | guix/gnu-maintenance.scm 28 | guix/scripts/container.scm 29 | guix/scripts/container/exec.scm 30 | guix/upstream.scm 31 | guix/ui.scm 32 | guix/http-client.scm 33 | guix/nar.scm 34 | nix/nix-daemon/guix-daemon.cc 35 | -------------------------------------------------------------------------------- /po/packages/LINGUAS: -------------------------------------------------------------------------------- 1 | # Set of available languages. 2 | 3 | da 4 | de 5 | en@boldquot 6 | en@quot 7 | eo 8 | fr 9 | hu 10 | pl 11 | pt_BR 12 | sr 13 | vi 14 | -------------------------------------------------------------------------------- /po/packages/Makevars: -------------------------------------------------------------------------------- 1 | # Makefile variables for PO directory in any package using GNU gettext. 2 | 3 | # This domain contains only translations of package synopses and descriptions. 4 | DOMAIN = guix-packages 5 | 6 | subdir = po/packages 7 | top_builddir = ../.. 8 | 9 | # These options get passed to xgettext. We want to catch exclusively package 10 | # synopses and descriptions. 11 | XGETTEXT_OPTIONS = \ 12 | --language=Scheme --from-code=UTF-8 \ 13 | --keyword=synopsis --keyword=description 14 | 15 | COPYRIGHT_HOLDER = Ludovic Courtès 16 | 17 | MSGID_BUGS_ADDRESS = ludo@gnu.org 18 | 19 | EXTRA_LOCALE_CATEGORIES = 20 | -------------------------------------------------------------------------------- /tests/signing-key.pub: -------------------------------------------------------------------------------- 1 | (public-key 2 | (rsa 3 | (n #00C1F764069F54FFE93A126B02328903E984E4AE3AF6DF402B5B6B3907911B88C385F1BA76A002EC9DEA109A5228EF0E62EE31A06D1A5861CAB474F6C857AC66EB65A1905F25BBA1869579E73A3B7FED13AF5A1667326F88CDFC2FF24B03C14FD1384AA7E73CA89572880B606E3A974E15347963FC7B6378574936A47580DBCB45#) 4 | (e #010001#))) 5 | -------------------------------------------------------------------------------- /tests/signing-key.sec: -------------------------------------------------------------------------------- 1 | (private-key 2 | (rsa 3 | (n #00C1F764069F54FFE93A126B02328903E984E4AE3AF6DF402B5B6B3907911B88C385F1BA76A002EC9DEA109A5228EF0E62EE31A06D1A5861CAB474F6C857AC66EB65A1905F25BBA1869579E73A3B7FED13AF5A1667326F88CDFC2FF24B03C14FD1384AA7E73CA89572880B606E3A974E15347963FC7B6378574936A47580DBCB45#) 4 | (e #010001#) 5 | (d #58CAD84653D0046A8EC3F9AA82D9C829B145422109FC3F12DA01A694B92FA296E70D366FB166454D30E632CEE3A033B4C41781BA10325F69FCDC0250CA19C8EEB352FA085992494098DB133E682ED38A931701F0DED1A1E508F4341A4FB446A04F019427C7CB3C44F251EEA9D386100DA80F125E0FD5CE1B0DFEC6D21516EACD#) 6 | (p #00D47F185147EC39393CCDA4E7323FFC20FC8B8073E2A54DD63BA392A66975E4204CA48572496A9DFD7522436B852C07472A5AB25B7706F7C14E6F33FBC420FF3B#) 7 | (q #00E9AD22F158060BC9AE3601DA623AFC60FFF3058795802CA92371C00097335CF9A23D7782DE353C9DBA93D7BB99E6A24A411107605E722481C5C191F80D7EB77F#) 8 | (u #59B45B95AE01A7A7370FAFDB08FE73A4793CE37F228961B09B1B1E7DDAD9F8D3E28F5C5E8B4B067E6B8E0BBF3F690B42991A79E46108DDCDA2514323A66964DE#))) 9 | --------------------------------------------------------------------------------