Merge from origin/emacs-25

6de0715 Properly reject malformed or empty package sigs
edae7d9 Remove buggy non-native image scrolling

diff --combined lisp/emacs-lisp/package.el
index fea184d624248d562fe43a09e93261e5f6cf8329,58973dfa920809e4896d1ebdd2534b1f32de699a..8afe18f8d9424d7a07e16939838b4bfd8f8b3354
--- 1/lisp/emacs-lisp/package.el
--- 2/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@@ -150,7 -150,6 +150,7 @@@
  
  (require 'tabulated-list)
  (require 'macroexp)
 +(require 'url-handlers)
  
  (defgroup package nil
    "Manager for Emacs Lisp packages."
@@@ -906,15 -905,12 +906,15 @@@ untar into a directory named DIR; other
    file)
  
  (defvar generated-autoload-file)
 +(defvar autoload-timestamps)
  (defvar version-control)
  
  (defun package-generate-autoloads (name pkg-dir)
    (let* ((auto-name (format "%s-autoloads.el" name))
           ;;(ignore-name (concat name "-pkg.el"))
           (generated-autoload-file (expand-file-name auto-name pkg-dir))
 +         ;; We don't need 'em, and this makes the output reproducible.
 +         (autoload-timestamps nil)
           ;; Silence `autoload-generate-file-autoloads'.
           (noninteractive inhibit-message)
           (backup-inhibited t)
@@@ -1218,7 -1214,7 +1218,7 @@@ errors.
            (unless (and (eq package-check-signature 'allow-unsigned)
                         (eq (epg-signature-status sig) 'no-pubkey))
              (setq had-fatal-error t))))
-       (when (and (null good-signatures) had-fatal-error)
+       (when (or (null good-signatures) had-fatal-error)
          (package--display-verify-error context sig-file)
          (signal 'bad-signature (list sig-file)))
        good-signatures)))
@@@ -2301,7 -2297,7 +2301,7 @@@ Otherwise no newline is inserted.
      (insert "\n")
      (unless (and pkg-dir (not archive)) ; Installed pkgs don't have archive.
        (package--print-help-section "Archive"
 -        (or archive "n/a") "\n"))
 +        (or archive "n/a")))
      (and version
           (package--print-help-section "Version"
             (package-version-join version)))