← Back to branch summary

~ubuntu-branches/ubuntu/saucy/wl/saucy

« back to all changes in this revision

Viewing changes to debian/emacsen-startup.in

  • Committer: Bazaar Package Importer
  • Author(s): Tatsuya Kinoshita
  • Date: 2010-06-20 21:35:01 UTC
  • Revision ID: james.westby@ubuntu.com-20100620213501-obb1ksb87poo8yrj
Tags: 2.14.0-12
http://bugs.debian.org/294658
* debian/emacsen-startup.in: Set ssl-program-name and ssl-program-arguments
  to use gnutls-cli instead of openssl s_client. (closes: #294658)
* debian/README.Debian.in: Add information to customize gnutls-cli options.
* debian/control: Add gnutls-bin to Suggests.
* debian/patches/20_ssl-cert-info.patch: Use "opsnssl" instead of
  ssl-program-name for ssl-certificate-information.
* debian/patches/10_elmo-intern-soft.patch: Define elmo-intern-soft to fix
  unknown archiver type.  Patch from [wl:14407] on 2010-03-02 by Katsuyoshi
  Ohara.
* debian/patches/0*.patch: Generated from applied patches.
* Switch to dpkg-source 3.0 (quilt) format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/emacsen-startup.in
29
29
    (autoload 'wl-draft "wl" "Write draft with Wanderlust." t)
30
30
    (setq wl-icon-directory "/usr/share/pixmaps/wl/")
31
31
    (setq ssl-certificate-directory "/etc/ssl/certs")
32
 
    (setq ssl-certificate-verification-policy 3)
 
32
    (setq ssl-program-name "gnutls-cli")
 
33
    (setq ssl-program-arguments
 
34
          '("--port" service
 
35
            "--x509cafile" "/etc/ssl/certs/ca-certificates.crt"
 
36
            host))
 
37
;;;    (setq ssl-program-name "openssl")
 
38
;;;    (setq ssl-program-arguments
 
39
;;;       '("s_client" "-quiet" "-host" host "-port" service
 
40
;;;         "-verify" (int-to-string ssl-certificate-verification-policy)
 
41
;;;         "-CApath" ssl-certificate-directory))
33
42
    (setq wl-auto-save-drafts-interval nil)
34
43
    (setq elmo-archive-tar-method-alist
35
44
          '((ls    . ("tar" "-tf"))