Your message dated Thu, 01 May 2008 19:32:02 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#464600: fixed in dput 0.9.2.31
has caused the Debian Bug report #464600,
regarding dput: Please add "ftp_port" config option
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
464600: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=464600
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: dput
Version: 0.9.2.30
Severity: wishlist
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch

Please add a "ftp_port" option to dput.cf to override the default FTP
port (21).

LKRaider has submitted the patch for this at
https://launchpad.net/bugs/140612, which I have slightly changed.

Thank you.
diff -Nru /tmp/ayERPk5A0i/dput-0.9.2.30/dput 
/tmp/vgfTl4pos1/dput-0.9.2.30ubuntu1/dput
--- dput-0.9.2.30/dput  2008-01-28 21:10:03.000000000 +0100
+++ dput-0.9.2.30ubuntu1/dput   2008-02-07 23:11:22.000000000 +0100
@@ -109,6 +109,7 @@
     config.set('DEFAULT', 'passive_ftp', '1')
     config.set('DEFAULT', 'progress_indicator', '0')
     config.set('DEFAULT', 'delayed', '')
+    config.set('DEFAULT', 'ftp_port', '21')
 
     if extra_config:
        config_files = (extra_config,)
@@ -856,16 +857,18 @@
             if not os.isatty(1):
              progress = 0
             if method == 'ftp':
+                port = config.getint(host,'ftp_port')
                 ftp_mode = config.getboolean(host, 'passive_ftp')
                 if ftp_passive_mode == 1: ftp_mode = 1
                 if debug:
+                    print "D: FTP port: %s" % port
                     if ftp_mode == 1:
                         print "D: Using passive ftp"
                     else:
                         print "D: Using active ftp"
                 upload_methods[method](
                   fqdn, login, incoming,
-                  files_to_upload, debug, ftp_mode, progress=progress)
+                  files_to_upload, debug, ftp_mode, progress=progress, 
port=port)
             elif method == 'scp':
                 if debug and config.getboolean(host, 'scp_compress'):
                     print "D: Setting compression for scp"
diff -Nru /tmp/ayERPk5A0i/dput-0.9.2.30/dput.cf.5 
/tmp/vgfTl4pos1/dput-0.9.2.30ubuntu1/dput.cf.5
--- dput-0.9.2.30/dput.cf.5     2008-01-28 20:54:36.000000000 +0100
+++ dput-0.9.2.30ubuntu1/dput.cf.5      2008-02-07 22:56:58.000000000 +0100
@@ -115,6 +115,9 @@
 connections. If you need to use active ftp connections, set
 passive_ftp to 0.
 .TP
+.B ftp_port
+This option defines the ftp port to use. The default is 21.
+.TP
 .B progress_indicator
 This integer option defines if dput should display a progress indicator for
 the upload. (Currently implemented in ftp only.)
diff -Nru /tmp/ayERPk5A0i/dput-0.9.2.30/ftp.py 
/tmp/vgfTl4pos1/dput-0.9.2.30ubuntu1/ftp.py
--- dput-0.9.2.30/ftp.py        2006-10-21 21:34:09.000000000 +0200
+++ dput-0.9.2.30ubuntu1/ftp.py 2008-02-07 22:43:28.000000000 +0100
@@ -1,9 +1,10 @@
 import os, sys, ftplib, getpass, dputhelper
 
 # Upload the files via ftp. (Could need a bit more error-checking.)
-def upload(fqdn, login, incoming, files_to_upload, debug, ftp_mode, 
progress=0):
+def upload(fqdn, login, incoming, files_to_upload, debug, ftp_mode, 
progress=0, port=21):
     try:
-        ftp_connection = ftplib.FTP(fqdn)
+        ftp_connection = ftplib.FTP()
+        ftp_connection.connect(fqdn, port)
         if debug:
             print "D: FTP-Connection to host: %s" % fqdn
     except ftplib.all_errors, e:

--- End Message ---
--- Begin Message ---
Source: dput
Source-Version: 0.9.2.31

We believe that the bug you reported is fixed in the latest version of
dput, which is due to be installed in the Debian FTP archive:

dput_0.9.2.31.dsc
  to pool/main/d/dput/dput_0.9.2.31.dsc
dput_0.9.2.31.tar.gz
  to pool/main/d/dput/dput_0.9.2.31.tar.gz
dput_0.9.2.31_all.deb
  to pool/main/d/dput/dput_0.9.2.31_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Thomas Viehmann <[EMAIL PROTECTED]> (supplier of updated dput package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Thu, 01 May 2008 20:56:59 +0200
Source: dput
Binary: dput
Architecture: source all
Version: 0.9.2.31
Distribution: unstable
Urgency: low
Maintainer: Thomas Viehmann <[EMAIL PROTECTED]>
Changed-By: Thomas Viehmann <[EMAIL PROTECTED]>
Description: 
 dput       - Debian package upload tool
Closes: 405269 464592 464596 464600 473558
Changes: 
 dput (0.9.2.31) unstable; urgency=low
 .
   Welcome the new co-maintainer!
 .
   [ Y Giridhar Appaji Nag ]
   * Maintain dput in collab-maint on alioth in git.  Add Vcs-Browser and
     Vcs-Git headers in debian/control
   * Catch EOFError.  In default Pure-FTPd configuration, server closes the
     connection for anonymous FTP logins (Closes: #473558)
   * Fix lintian I: hyphen-used-as-minus-sign in dput.cf and lintian W:
     manpage-has-errors-from-man in dput.1 (.P.SH changed to .SH)
   * Add Y Giridhar Appaji Nag <[EMAIL PROTECTED]> to Uploaders and add a
     DM-Upload-Allowed: yes header.
   * Allow port in FTP fqdn (defaults to 21), based on a patch submitted
     from Ubuntu by Daniel Hahler <[EMAIL PROTECTED]> (Closes: #464600)
   * Add a mentors.debian.net stanza (called mentors) to dput.cf
   * dput Suggests mini-dinstall because it is used for the local method.
     Thanks Daniel Hahler for the patch (Closes: #464596)
   * Add "-o plusdirs" to "complete" in bash_completion, so that directories
     are also used in filename completion.  Thanks Daniel Hahler for the patch
     (Closes: #464592)
 .
   [ Thomas Viehmann ]
   * Allow -u to override running the gpg signature check implied by
     --check-only. Closes: #405269
   * Switch getopt function to allow optional arguments.
Files: 
 191c78bbe372b4c79e5d739502f09a10 689 devel optional dput_0.9.2.31.dsc
 6c2512a0d20c0df340c3fb019d2f6e01 45594 devel optional dput_0.9.2.31.tar.gz
 2ddd7af70936f98f48830bec42bd9066 42550 devel optional dput_0.9.2.31_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFIGhaTriZpaaIa1PkRAtgbAKDngUDPURZk9Paq37nbegjl1+EumwCfQ/iG
G33mM3XKV6UicxmQO4cT8tA=
=HKO9
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to