upstream/535096-pop-port.patch: allow a user to specify a port for a pop connection...

diff --git a/debian/changelog b/debian/changelog
index 72d548e907f5db355ad255951d25a3e9cddb442a..2256af12f6fe024a1a69562e4ab677f449fb9f2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mutt (1.5.20-3) UNRELEASED; urgency=low
       parsed (Closes: 538128)
     + upstream/537818-emptycharset.patch: handling empty charsets without
       segfaulting (Closes: 537818)
       parsed (Closes: 538128)
     + upstream/537818-emptycharset.patch: handling empty charsets without
       segfaulting (Closes: 537818)

+    + upstream/535096-pop-port.patch: allow a user to specify a port for a pop
+      connection, as it was before 1.5.20 (Closes: 535096)

   * debian/control:
     + Standards-Version bumped to 3.8.3
 
   * debian/control:
     + Standards-Version bumped to 3.8.3
 

diff --git a/debian/patches/series b/debian/patches/series
index 9d5b9dfe3eab7f04c32700c6ac7b17fe0948d3d7..f2607e809296eac66709f1448dd18adbb007dfb3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,6 +38,7 @@ upstream/534543-imap-port.patch
 # plese drop them if there is a new release
 upstream/538128-mh-folder-access.patch
 upstream/537818-emptycharset.patch
 # plese drop them if there is a new release
 upstream/538128-mh-folder-access.patch
 upstream/537818-emptycharset.patch

+upstream/535096-pop-port.patch

 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/535096-pop-port.patch b/debian/patches/upstream/535096-pop-port.patch
new file mode 100644 (file)
index 0000000..3931d09
--- /dev/null
+++ b/debian/patches/upstream/535096-pop-port.patch
@@ -0,0 +1,30 @@
+This patch will allow the user to specify a port, as it was before 1.5.20, see
+upstream bug http://bugs.mutt.org/3322
+
+--- a/pop_lib.c
++++ b/pop_lib.c
+@@ -43,6 +43,7 @@
+   /* Defaults */
+   acct->flags = 0;
+   acct->type = M_ACCT_TYPE_POP;
++  acct->port = 0;
+ 
+   c = safe_strdup (path);
+   url_parse_ciss (&url, c);
+@@ -60,10 +61,12 @@
+     acct->flags |= M_ACCT_SSL;
+ 
+   service = getservbyname (url.scheme == U_POP ? "pop3" : "pop3s", "tcp");
+-  if (service)
+-    acct->port = ntohs (service->s_port);
+-  else
+-    acct->port = url.scheme == U_POP ? POP_PORT : POP_SSL_PORT;;
++  if (!acct->port) {
++    if (service)
++      acct->port = ntohs (service->s_port);
++    else
++      acct->port = url.scheme == U_POP ? POP_PORT : POP_SSL_PORT;;
++  }
+ 
+   FREE (&c);
+   return 0;