summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--debian/patches/0100-config.diff (renamed from debian/patches/001-config.diff)0
-rw-r--r--debian/patches/0105-try_mail.diff (renamed from debian/patches/002-try_mail.diff)10
-rw-r--r--debian/patches/0110-syslog.diff (renamed from debian/patches/003-syslog.diff)8
-rw-r--r--debian/patches/0115-Add_header.patch34
-rw-r--r--debian/patches/series7
6 files changed, 57 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index 3716b91..a7e508c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mwc (1.7.2-4) UNRELEASED; urgency=medium
+
+ * Renumbering patches.
+ * debian/patches/0105-try_mail.diff:
+ - Replace undefined printf with print (Closes: #860494).
+ * New debian/patches/0115-Add_header.patch:
+ - Add header to fix missing User-agent und Access.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 18 Apr 2017 11:06:04 +0200
+
mwc (1.7.2-3) unstable; urgency=medium
* Work for the python3.5 transition (Closes: #799232):
diff --git a/debian/patches/001-config.diff b/debian/patches/0100-config.diff
index 7ccca33..7ccca33 100644
--- a/debian/patches/001-config.diff
+++ b/debian/patches/0100-config.diff
diff --git a/debian/patches/002-try_mail.diff b/debian/patches/0105-try_mail.diff
index 2372d76..6e11916 100644
--- a/debian/patches/002-try_mail.diff
+++ b/debian/patches/0105-try_mail.diff
@@ -10,9 +10,9 @@ Last-Update: 2014-05-22
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/mwc.py
===================================================================
---- trunk.orig/mwc.py 2014-05-22 08:43:11.758523862 +0200
-+++ trunk/mwc.py 2014-05-22 08:50:09.336051435 +0200
-@@ -212,15 +212,27 @@
+--- trunk.orig/mwc.py
++++ trunk/mwc.py
+@@ -212,15 +212,27 @@ def sendmail(receiver, subject, content,
mail['Subject'] = Header(subject, defaultEncoding)
# initialize session once, not each time this method gets called
@@ -39,12 +39,12 @@ Index: trunk/mwc.py
+ # add try / except to send mail
+ #
+ except:
-+ printf('Error: Open smtp-session')
++ print('Error: Open smtp-session')
+ exit(4)
+ try:
+ mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
+ except:
-+ printf('Error: sendmail')
++ print('Error: sendmail')
+ exit(5)
# returns a list of all content that is stored locally for a specific site
diff --git a/debian/patches/003-syslog.diff b/debian/patches/0110-syslog.diff
index 4cab507..cffffb4 100644
--- a/debian/patches/003-syslog.diff
+++ b/debian/patches/0110-syslog.diff
@@ -38,7 +38,7 @@ Index: trunk/mwc.py
+ mailsession.starttls()
+ mailsession.login(config.smtpusername, config.smtppwd)
+ except:
-+ printf('Error: Open smtp-session')
++ print('Error: Open smtp-session')
+ syslog.syslog(syslog.LOG_ERR, 'can not open smtp session')
+ exit(4)
+ #
@@ -47,14 +47,14 @@ Index: trunk/mwc.py
+ try:
+ mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
except:
-- printf('Error: Open smtp-session')
+- print('Error: Open smtp-session')
- exit(4)
- try:
- mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())
- except:
-- printf('Error: sendmail')
+- print('Error: sendmail')
- exit(5)
-+ printf('Error: sendmail')
++ print('Error: sendmail')
+ syslog.syslog(syslog.LOG_ERR, 'error on sendmail')
+ exit(5)
diff --git a/debian/patches/0115-Add_header.patch b/debian/patches/0115-Add_header.patch
new file mode 100644
index 0000000..b9fc54e
--- /dev/null
+++ b/debian/patches/0115-Add_header.patch
@@ -0,0 +1,34 @@
+Description: Add Header User-agent and Accept
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=862004
+Forwarded: https://github.com/Debianguru/MailWebsiteChanges/issues/11
+Last-Update: 2017-05-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/mwc.py
+===================================================================
+--- trunk.orig/mwc.py
++++ trunk/mwc.py
+@@ -68,6 +68,8 @@ def parseSite(site):
+ contenttype = site.get('type', 'html')
+ contentregex = site.get('contentregex', '')
+ titleregex = site.get('titleregex', '')
++ UserAgent = site.get('User-agent', '')
++ Accept = site.get('Accept', '')
+ enc = site.get('encoding', defaultEncoding)
+
+ contentxpath = site.get('contentxpath', '')
+@@ -86,7 +88,12 @@ def parseSite(site):
+ file = process.stdout
+ else:
+ # open website
+- file = urllib.request.urlopen(uri)
++ req = urllib.request.Request(uri)
++ if UserAgent != '':
++ req.add_header('User-agent', UserAgent)
++ if Accept != '':
++ req.add_header('Accept', Accept)
++ file = urllib.request.urlopen(req)
+
+
+ if contenttype == 'text' or (contentxpath == '' and titlexpath == ''):
diff --git a/debian/patches/series b/debian/patches/series
index 75c3c95..f44e7e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-001-config.diff
-002-try_mail.diff
-003-syslog.diff
+0100-config.diff
+0105-try_mail.diff
+0110-syslog.diff
+0115-Add_header.patch