[arch-commits] Commit in msmtp/trunk (PKGBUILD msmtp-texinfo.patch)

Mon Apr 22 22:24:09 UTC 2013

Date: Tuesday, April 23, 2013 @ 00:24:08
  Author: eric
Revision: 183543

upgpkg: msmtp 1.4.31-1

Upstream update, Remove old patch

Modified:
  msmtp/trunk/PKGBUILD
Deleted:
  msmtp/trunk/msmtp-texinfo.patch

---------------------+
 PKGBUILD            |    9 --
 msmtp-texinfo.patch |  168 --------------------------------------------------
 2 files changed, 3 insertions(+), 174 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2013-04-22 20:16:28 UTC (rev 183542)
+++ PKGBUILD	2013-04-22 22:24:08 UTC (rev 183543)
@@ -3,20 +3,17 @@
 
 pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
-pkgver=1.4.30
+pkgver=1.4.31
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
 makedepends=('texlive-core' 'gsasl' 'libgnome-keyring')
-source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2
-        msmtp-texinfo.patch)
-sha1sums=('fd469bae0c3394b30b771780e62bbd41c4d5d175'
-          'd2ef0138ecc5eb55ae9e044f542aa52d64c31473')
+source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2)
+sha1sums=('c0edce1e1951968853f15209c8509699ff9e9ab5')
 
 prepare() {
   cd ${pkgbase}-${pkgver}
-  patch -p1 -i "$srcdir/msmtp-texinfo.patch"
   sed -i 's|/usr/bin/python|/usr/bin/python2|' scripts/msmtp-gnome-tool/msmtp-gnome-tool.py
 }
 

Deleted: msmtp-texinfo.patch
===================================================================
--- msmtp-texinfo.patch	2013-04-22 20:16:28 UTC (rev 183542)
+++ msmtp-texinfo.patch	2013-04-22 22:24:08 UTC (rev 183543)
@@ -1,168 +0,0 @@
---- msmtp-1.4.30/doc/msmtp.texi.orig	2013-04-16 19:31:23.047719598 -0400
-+++ msmtp-1.4.30/doc/msmtp.texi	2013-04-16 19:35:22.611522458 -0400
-@@ -495,7 +495,7 @@
- and about the TLS certificate (if TLS is active).
- @xref{Server information mode}.
- @anchor{--rmqs}
-- at itemx --rmqs=(@var{host}|@var{@@domain}|@var{#queue})
-+ at item --rmqs=(@var{host}|@var{@@domain}|@var{#queue})
- @opindex --rmqs
- Send a Remote Message Queue Starting request for the given host, domain, or
- queue to the SMTP server and exit.
-@@ -519,82 +519,82 @@
- Use the given account instead of the account named @samp{default}. This option
- cannot be used together with the @samp{--host} option.
- @xref{Choosing an account}.
-- at itemx --host=@var{hostname}
-+ at item --host=@var{hostname}
- @opindex --host
- Use this SMTP server with settings from the command line; do not use any
- configuration file data. This option cannot be used together with the
- @samp{--account} option. It disables loading of configuration files.
- @xref{Choosing an account}.
-- at itemx --port=@var{number}
-+ at item --port=@var{number}
- @opindex --port
- Set the port number to connect to. @xref{port}.
-- at itemx --timeout=(off|@var{seconds})
-+ at item --timeout=(off|@var{seconds})
- @opindex --timeout
- Set a network timeout. @xref{timeout}. For compatibility with older versions,
- @samp{--connect-timeout} is accepted as an alias for this option.
-- at itemx --protocol=(smtp|lmtp)
-+ at item --protocol=(smtp|lmtp)
- @opindex --protocol
- Set the protocol. @xref{protocol}.
-- at itemx --domain=[@var{argument}]
-+ at item --domain=[@var{argument}]
- @opindex --domain
- Set the argument of the SMTP EHLO (or LMTP LHLO) command. @xref{domain}.
- @anchor{--auth}
-- at itemx --auth[=(on|off|@var{method})]
-+ at item --auth[=(on|off|@var{method})]
- @opindex --auth
- Enable or disable authentication and optionally choose the method. @xref{auth}.
- @anchor{--user}
-- at itemx --user=[@var{username}]
-+ at item --user=[@var{username}]
- @opindex --user
- Set or unset the user name for authentication. @xref{user}.
- @anchor{--passwordeval}
-- at itemx --passwordeval=[@var{eval}]
-+ at item --passwordeval=[@var{eval}]
- @opindex --passwordeval
- Evaluate password for authentication. @xref{passwordeval}.
-- at itemx --tls[=(on|off)]
-+ at item --tls[=(on|off)]
- @opindex --tls
- Enable or disable TLS/SSL. @xref{tls}.
- @anchor{--tls-starttls}
-- at itemx --tls-starttls[=(on|off)]
-+ at item --tls-starttls[=(on|off)]
- @opindex --tls-starttls
- Enable or disable STARTTLS for TLS encryption. @xref{tls_starttls}.
- @anchor{--tls-trust-file}
-- at itemx --tls-trust-file=[@var{file}]
-+ at item --tls-trust-file=[@var{file}]
- @opindex --tls-trust-file
- Set or unset a trust file for TLS encryption. @xref{tls_trust_file}.
- @anchor{--tls-crl-file}
-- at itemx --tls-crl-file=[@var{file}]
-+ at item --tls-crl-file=[@var{file}]
- @opindex --tls-crl-file
- Set or unset a certificate revocation list (CRL) file for TLS. 
- @xref{tls_crl_file}.
- @anchor{--tls-fingerprint}
-- at itemx --tls-fingerprint=[@var{fingerprint}]
-+ at item --tls-fingerprint=[@var{fingerprint}]
- @opindex --tls-fingerprint
- Set ot unset the fingerprint of a trusted TLS certificate.
- @xref{tls_fingerprint}.
- @anchor{--tls-key-file}
-- at itemx --tls-key-file=[@var{file}]
-+ at item --tls-key-file=[@var{file}]
- @opindex --tls-key-file
- Set or unset a key file for TLS encryption. @xref{tls_key_file}.
- @anchor{--tls-cert-file}
-- at itemx --tls-cert-file=[@var{file}]
-+ at item --tls-cert-file=[@var{file}]
- @opindex --tls-cert-file
- Set or unset a cert file for TLS encryption. @xref{tls_cert_file}.
- @anchor{--tls-certcheck}
-- at itemx --tls-certcheck[=(on|off)]
-+ at item --tls-certcheck[=(on|off)]
- @opindex --tls-certcheck
- Enable or disable server certificate checks for TLS encryption.  
- @xref{tls_certcheck}.
- @anchor{--tls-force-sslv3}
-- at itemx --tls-force-sslv3[=(on|off)]
-+ at item --tls-force-sslv3[=(on|off)]
- @opindex --tls-force-sslv3
- Force TLS/SSL version SSLv3. @xref{tls_force_sslv3}.
- @anchor{--tls-min-dh-prime-bits}
-- at itemx --tls-min-dh-prime-bits=[@var{bits}]
-+ at item --tls-min-dh-prime-bits=[@var{bits}]
- @opindex --tls-min-dh-prime-bits
- Set or unset minimum bit size of the Diffie-Hellman (DH) prime.
- @xref{tls_min_dh_prime_bits}.
- @anchor{--tls-priorities}
-- at itemx --tls-priorities=[@var{priorities}]
-+ at item --tls-priorities=[@var{priorities}]
- @opindex --tls-priorities
- Set or unset TLS priorities. @xref{tls_priorities}.
- @end table
-@@ -602,7 +602,7 @@
- @subsection Options specific to sendmail mode
- @table @samp
- @anchor{--auto-from}
-- at itemx --auto-from[=(on|off)]
-+ at item --auto-from[=(on|off)]
- @opindex --auto-from
- Enable or disable automatic envelope-from addresses. The default is off. 
- @xref{auto_from}.
-@@ -618,7 +618,7 @@
- (set with the @samp{from} command). If no such account is found, "default" is 
- used. @xref{Choosing an account}.
- @anchor{--maildomain}
-- at itemx --maildomain=[@var{domain}]
-+ at item --maildomain=[@var{domain}]
- @opindex --maildomain
- Set the domain part for generated envelope-from addresses. It is only used when
- @samp{auto_from} is on. @xref{maildomain}.
-@@ -637,7 +637,7 @@
- Note that @samp{hdrs} is accepted as an alias for @samp{headers} to be 
- compatible with sendmail.
- @anchor{--keepbcc}
-- at itemx --keepbcc[=(on|off)]
-+ at item --keepbcc[=(on|off)]
- @opindex --keepbcc
- Enable or disable the preservation of the Bcc header. @xref{keepbcc}.
- @anchor{--logfile}
-@@ -647,7 +647,7 @@
- @opindex --logfile
- Set or unset the log file. @xref{logfile}.
- @anchor{--syslog}
-- at itemx --syslog[=(on|off|@var{facility})]
-+ at item --syslog[=(on|off|@var{facility})]
- @opindex --syslog
- Enable or disable syslog logging. @xref{syslog}.
- @item -t
-@@ -659,15 +659,15 @@
- If any Resent- headers are present, then the addresses from any Resent-To,
- Resent-Cc, and Resent-Bcc headers in the first block of Resent- headers are
- used instead.
-- at itemx --read-envelope-from
-+ at item --read-envelope-from
- @opindex --read-envelope-from
- Read the envelope from address from the From header of the mail.
- Currently this header must be on a single line for this option to work
- correctly.
-- at itemx --aliases=[@var{file}]
-+ at item --aliases=[@var{file}]
- @opindex --aliases
- Set or unset an aliases file. @xref{aliases}.
-- at itemx --
-+ at item --
- This marks the end of options. All following arguments will be treated as
- recipient addresses, even if they start with a '-'.
- @end table


