Sorry, another mega-patch:

- clarified windows service documentation (patch [SF#1597713])
- HTMLClass fixed to work with new item permissions check [SF#1602983]
- support POP over SSL (patch [SF#1597703])

Author: Richard Jones

CHANGES.txt

@@ -11,6 +11,9 @@ Fixed:
 - handling of required for boolean False and numeric 0 (sf bug 1608200)
 - removed bogus args attr of ConfigurationError (sf bug 1608056)
 - implemented start_response in roundup.cgi (sf bug 1604304)
+- clarified windows service documentation (sf patch 1597713)
+- HTMLClass fixed to work with new item permissions check (sf bug 1602983)
+- support POP over SSL (sf patch 1597703)
 
 
 2006-11-11 1.3.1

doc/admin_guide.txt

@@ -2,7 +2,7 @@
 Administration Guide
 ====================
 
-:Version: $Revision: 1.20 $
+:Version: $Revision: 1.21 $
 
 .. contents::
 
@@ -322,7 +322,7 @@ therefore may be controlled through the Services control panel. The
 roundup-server program may also control the service directly:
 
 **install the service**
-  ``roundup-server -c install``
+  ``roundup-server -C /path/to/my/roundup-server.ini -c install``
 **start the service**
   ``roundup-server -c start``
 **stop the service**
@@ -335,6 +335,10 @@ Windows 2000 and later
 Windows NT4
   Start/Control Panel/Services
 
+You will need a server configuration file (as described in `Configuring roundup-server`_)
+for specifying tracker homes and other roundup-server configuration. Specify the name of this
+file using the ``-C`` switch when installing the service.
+
 Running the Mail Gateway Script
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

roundup/cgi/templating.py

@@ -534,7 +534,7 @@ def __getitem__(self, item):
                     value = []
                 else:
                     value = None
-            return htmlklass(self._client, self._classname, '', prop, item,
+            return htmlklass(self._client, self._classname, None, prop, item,
                 value, self._anonymous)
 
         # no good

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.178 2006-10-05 23:08:20 richard Exp $
+$Id: mailgw.py,v 1.179 2006-12-13 23:32:38 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -428,12 +428,17 @@ def do_imap(self, server, user='', password='', mailbox='', ssl=0):
         return 0
 
 
-    def do_apop(self, server, user='', password=''):
+    def do_apop(self, server, user='', password='', ssl=False):
         ''' Do authentication POP
         '''
-        self.do_pop(server, user, password, apop=1)
+        self._do_pop(server, user, password, True, ssl)
 
-    def do_pop(self, server, user='', password='', apop=0):
+    def do_pop(self, server, user='', password='', ssl=False):
+        ''' Do plain POP
+        '''
+        self._do_pop(server, user, password, False, ssl)
+
+    def _do_pop(self, server, user, password, apop, ssl):
         '''Read a series of messages from the specified POP server.
         '''
         import getpass, poplib, socket
@@ -449,7 +454,11 @@ def do_pop(self, server, user='', password='', apop=0):
 
         # open a connection to the server and retrieve all messages
         try:
-            server = poplib.POP3(server)
+            if ssl:
+                klass = poplib.POP3_SSL
+            else:
+                klass = poplib.POP3
+            server = klass(server)
         except socket.error:
             self.logger.exception('POP server error')
             return 1

roundup/scripts/roundup_mailgw.py

@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: roundup_mailgw.py,v 1.22 2006-07-15 10:08:01 schlatterbeck Exp $
+# $Id: roundup_mailgw.py,v 1.23 2006-12-13 23:32:39 richard Exp $
 
 """Command-line script stub that calls the roundup.mailgw.
 """
@@ -78,6 +78,10 @@ def usage(args, message=None):
  are both valid. The username and/or password will be prompted for if
  not supplied on the command-line.
 
+POPS:
+ Connect to a POP server over ssl. This requires python 2.4 or later.
+ This supports the same notation as POP.
+
 APOP:
  Same as POP, but using Authenticated POP:
     apop username:password@server
@@ -154,12 +158,15 @@ def main(argv):
 
         if source == 'mailbox':
             return handler.do_mailbox(specification)
-        elif source == 'pop':
+        elif source == 'pop' or source == 'pops':
             m = re.match(r'((?P<user>[^:]+)(:(?P<pass>.+))?@)?(?P<server>.+)',
                 specification)
             if m:
+                ssl = source.endswith('s')
+                if ssl and sys.version_info<(2,4):
+                    return usage(argv, _('Error: a later version of python is required'))
                 return handler.do_pop(m.group('server'), m.group('user'),
-                    m.group('pass'))
+                    m.group('pass'),ssl)
             return usage(argv, _('Error: pop specification not valid'))
         elif source == 'apop':
             m = re.match(r'((?P<user>[^:]+)(:(?P<pass>.+))?@)?(?P<server>.+)',
@@ -172,9 +179,7 @@ def main(argv):
             m = re.match(r'((?P<user>[^:]+)(:(?P<pass>.+))?@)?(?P<server>.+)',
                 specification)
             if m:
-                ssl = 0
-                if source == 'imaps':
-                    ssl = 1
+                ssl = source.endswith('s')
                 mailbox = ''
                 if len(args) > 3:
                     mailbox = args[3]