Browse Source

merging 3.48 changes

suites/jessie-proposed-backports
Sandro Tosi 14 years ago
parent
commit
d647a65b6f
  1. 9
      bin/reportbug
  2. 20
      debian/NEWS
  3. 13
      debian/changelog
  4. 10
      reportbug/submit.py

9
bin/reportbug

@ -571,13 +571,13 @@ def offer_configuration(options):
print >> fp, '# Disable fallback mode by commenting out the following:'
print >> fp, 'no-cc'
print >> fp, 'header "X-Debbugs-CC: %s"' % email_addy
print >> fp, 'smtphost bugs.debian.org'
print >> fp, 'smtphost reportbug.debian.org'
else:
print >> fp, '# If nothing else works, remove the # at the beginning'
print >> fp, '# of the following three lines:'
print >> fp, '#no-cc'
print >> fp, '#header "X-Debbugs-CC: %s"' % email_addy
print >> fp, '#smtphost bugs.debian.org'
print >> fp, '#smtphost reportbug.debian.org'
print >> fp, '# You can add other settings after this line. See'
print >> fp, '# /etc/reportbug.conf for a full listing of options.'
@ -939,7 +939,10 @@ class UI(object):
if smtphost and smtphost.lower() == 'master.debian.org':
ui.long_message('*** Warning: master.debian.org is no longer an appropriate smtphost setting for reportbug; please update your .reportbugrc file.\n')
smtphost = 'bugs.debian.org'
smtphost = 'reportbug.debian.org'
if smtphost and smtphost.lower() == 'bugs.debian.org':
ui.long_message('*** Warning: bugs.debian.org is no longer an appropriate smtphost setting for reportbug; please update your .reportbugrc file.\n')
smtphost = 'reportbug.debian.org'
if attachments and mua:
ewrite('Attachments are incompatible with using an MUA. They will be ignored.\n')

20
debian/NEWS

@ -1,3 +1,23 @@
reportbug (3.48) unstable; urgency=low
* There were some infrastructure changes, in order to provide a better BTS
service, that made the previous SMTP server 'bugs.debian.org' no more
working as expected, so we now provide another host for SMTP for reportbug:
'reportbug.debian.org'.
If you are using any other debian.org host to act as SMTP host for reportbug,
we encourage you to update your configuration accordingly.
At the same time, if you use 'reportbug.debian.org' we set automatically the
port to '587' (but even '25' port can be used) in order to work around the
filter some ISPes apply to outcoming connections to port '25'.
As a side effect, using 'reportbug.debian.org' the '--debug' option stops
working, since relay is not allowed by that host, but since it's mainly an
interal-use-only option, we're sure it won't impact you a lot.
-- Sandro Tosi <morph@debian.org> Sun, 14 Dec 2008 15:15:23 +0100
reportbug (3.18) unstable; urgency=high
* The proper SMTP setting for reporting bugs to Debian without a working

13
debian/changelog

@ -68,6 +68,19 @@ reportbug (3.99.0) experimental; urgency=low
-- Sandro Tosi <morph@debian.org> Thu, 23 Oct 2008 16:04:28 +0200
reportbug (3.48) unstable; urgency=low
[ Don Armstrong ]
* Patch to use reportbug.debian.org MX instead of bugs.debian.org; in the same
change, we set port to 587 for reportbug.d.o to avoid ISP filtering 25 port;
Closes: #508659
[ Sandro Tosi ]
* debian/NEWS
- added an entry to explain the changes in this version
-- Sandro Tosi <morph@debian.org> Sun, 14 Dec 2008 15:39:20 +0100
reportbug (3.47) unstable; urgency=low
* reportbuglib/reportbug_ui_text.py

10
reportbug/submit.py

@ -238,7 +238,7 @@ def send_report(body, attachments, mua, fromaddr, sendto, ccaddr, bccaddr,
# No, I'm not going to do a full MX lookup on every address... get a
# real MTA!
if kudos and smtphost == 'bugs.debian.org':
if kudos and smtphost == 'reportbug.debian.org':
smtphost = 'packages.debian.org'
body_charset = charset
@ -359,7 +359,13 @@ def send_report(body, attachments, mua, fromaddr, sendto, ccaddr, bccaddr,
tryagain = False
ewrite("Connecting to %s via SMTP...\n", smtphost)
try:
conn = smtplib.SMTP(smtphost)
conn = None
# if we're using reportbug.debian.org, send mail to
# submit
if smtphost.lower() == 'reportbug.debian.org':
conn = smtplib.SMTP(smtphost,587)
else:
conn = smtplib.SMTP(smtphost)
response = conn.ehlo()
if not (200 <= response[0] <= 299):
conn.helo()

Loading…
Cancel
Save