* gnu/packages/patches/tidy-CVE-2015-5522+5523.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/web.scm (tidy)[source]: Add patch.

* gnu/packages/web.scm (httpd): Update to 2.4.16.

* gnu/packages/web.scm (rapidjson)[source]: Add 'snippet'.

* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm,
  gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bittorrent.scm,
  gnu/packages/code.scm, gnu/packages/compression.scm,
  gnu/packages/databases.scm, gnu/packages/enchant.scm,
  gnu/packages/firmware.scm, gnu/packages/fonts.scm,
  gnu/packages/freedesktop.scm, gnu/packages/games.scm, gnu/packages/gd.scm,
  gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gsasl.scm,
  gnu/packages/gstreamer.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm,
  gnu/packages/haskell.scm, gnu/packages/language.scm,
  gnu/packages/lesstif.scm, gnu/packages/libreoffice.scm,
  gnu/packages/linux.scm, gnu/packages/llvm.scm, gnu/packages/maths.scm,
  gnu/packages/mcrypt.scm, gnu/packages/mit-krb5.scm, gnu/packages/mp3.scm,
  gnu/packages/ncdu.scm, gnu/packages/networking.scm, gnu/packages/ntp.scm,
  gnu/packages/ocaml.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
  gnu/packages/perl.scm, gnu/packages/pretty-print.scm,
  gnu/packages/pulseaudio.scm, gnu/packages/python.scm,
  gnu/packages/rdesktop.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm,
  gnu/packages/slang.scm, gnu/packages/slim.scm, gnu/packages/telephony.scm,
  gnu/packages/tls.scm, gnu/packages/tmux.scm, gnu/packages/tre.scm,
  gnu/packages/unrtf.scm, gnu/packages/version-control.scm,
  gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wget.scm,
  gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xiph.scm:
  Fix typos.  Trim long lines.  Add missing periods in the end of sentences.
  Use double spaces between sentences.  Remove trailing whitespaces.

* gnu/packages/curl.scm (curl): Reformat description to avoid a line
  beginning with "(" because such lines break font-lock highlighting
  in Emacs.
* gnu/packages/flashing-tools.scm (dfu-programmer): Likewise.
* gnu/packages/games.scm (gnugo): Likewise.
* gnu/packages/gnome.scm (json-glib): Likewise.
* gnu/packages/image.scm (jbig2dec): Likewise.
* gnu/packages/maths.scm (units): Likewise.
* gnu/packages/pdf.scm (mupdf): Likewise.
* gnu/packages/web.scm (perl-encode-locale): Likewise.
* gnu/packages/wordnet.scm (wordnet): Likewise.
* gnu/packages/xml.scm (libxml2):Likewise.

* gnu/packages/web.scm (libpsl)[source]: Fix 'uri'.  Remove now
  unneeded 'file-name'.

Removing the 'snippet' allows us to avoid 'patch-and-repack', which resets all
the mtimes, thereby breaking the expectation tested in
'test-is-public-builtin.c' that the mtime returned by 'psl_builtin_file_time'
is non-zero.

* gnu/packages/web.scm (libpsl): Update to 0.7.1.
  [source]: Remove 'modules' and 'snippet'.
  [native-inputs]: Add PKG-CONFIG.

* gnu/packages/openssl.scm (openssl, perl-net-ssleay): Move to...
* gnu/packages/tls.scm: ...here.
* gnu/packages/openssl.scm: Delete file.
* gnu-system.am (GNU_SYSTEM_MODULES): Unregister deleted file.
* gnu/packages/{admin.scm, bittorrent.scm, certs.scm, ci.scm,
  cyrus-sasl.scm, databases.scm, dns.scm, ebook.scm, enlightenment.scm,
  gnunet.scm, libreoffice.scm, links.scm, mail.scm, messaging.scm,
  networking.scm, ntp.scm, openldap.scm, package-management.scm, pdf.scm,
  python.scm, qt.scm, rdesktop.scm, rdf.scm, ruby.scm, ssh.scm,
  synergy.scm, tor.scm, version-control.scm, video.scm, vpn.scm,
  w3m.scm, web.scm, weechat.scm, xiph.scm}: Adapt module import.

* gnu/packages/web.scm (perl-authen-sasl): New variable.