Attachment 151920 Details for Bug 217271 – Add support for ssmtp, esmtp

[patch] Add support for ssmtp, esmtp

s-s-m-ssmtp.patch (text/plain), 6.45 KB, created by Ville Skyttä on 2007-04-07 18:14:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2007-04-07 18:14:54 UTC

Size: 6.45 KB

patch

obsolete

>diff -ru system-switch-mail-0.5.25-10.orig/functions.py.in system-switch-mail-0.5.25-10/functions.py.in
>--- system-switch-mail-0.5.25-10.orig/functions.py.in	2004-02-15 18:05:05.000000000 +0200
>+++ system-switch-mail-0.5.25-10/functions.py.in	2007-04-07 20:55:26.000000000 +0300
>@@ -36,8 +36,10 @@
> 
> SENDMAIL =  0 
> POSTFIX = 1
>-EXIM =  2
>-MTA = ['Sendmail', 'Postfix', 'Exim']
>+EXIM = 2
>+SSMTP = 3
>+ESMTP = 4
>+MTA = ['Sendmail', 'Postfix', 'Exim', 'sSMTP', 'ESMTP']
> MTA_PATH = '/etc/alternatives/mta'
> 
> ##
>@@ -73,6 +75,16 @@
>         os.system('/sbin/service postfix stop 2>/dev/null >/dev/null')
>         os.system('/sbin/service sendmail stop 2>/dev/null >/dev/null')
>         os.system('/sbin/service exim start 2>/dev/null >/dev/null')
>+    elif i == SSMTP:
>+        os.system('/usr/sbin/alternatives --set mta /usr/sbin/sendmail.ssmtp')
>+        os.system('/sbin/service sendmail stop 2>/dev/null >/dev/null')
>+        os.system('/sbin/service postfix stop 2>/dev/null >/dev/null')
>+        os.system('/sbin/service exim stop 2>/dev/null >/dev/null')
>+    elif i == ESMTP:
>+        os.system('/usr/sbin/alternatives --set mta /usr/bin/esmtp')
>+        os.system('/sbin/service sendmail stop 2>/dev/null >/dev/null')
>+        os.system('/sbin/service postfix stop 2>/dev/null >/dev/null')
>+        os.system('/sbin/service exim stop 2>/dev/null >/dev/null')
> 
> def get_mta():
>     mta_list = []
>@@ -91,5 +103,9 @@
>             return MTA[POSTFIX]
>         elif default_mta == '/usr/sbin/sendmail.exim':
>             return MTA[EXIM]
>+        elif default_mta == '/usr/sbin/sendmail.ssmtp':
>+            return MTA[SSMTP]
>+        elif default_mta == '/usr/bin/esmtp':
>+            return MTA[ESMTP]
> 
>     return mta_list[SENDMAIL]
>diff -ru system-switch-mail-0.5.25-10.orig/switchmail.glade system-switch-mail-0.5.25-10/switchmail.glade
>--- system-switch-mail-0.5.25-10.orig/switchmail.glade	2004-01-15 13:05:29.000000000 +0200
>+++ system-switch-mail-0.5.25-10/switchmail.glade	2007-04-07 20:57:09.000000000 +0300
>@@ -140,6 +140,44 @@
> 		  <property name="fill">False</property>
> 		</packing>
> 	      </child>
>+
>+	      <child>
>+		<widget class="GtkRadioButton" id="ssmtpRB">
>+		  <property name="tooltip" translatable="yes">click to enable or disable sSMTP as default Mail transport agent</property>
>+		  <property name="can_focus">True</property>
>+		  <property name="label" translatable="yes">sS_MTP</property>
>+		  <property name="use_underline">True</property>
>+		  <property name="relief">GTK_RELIEF_NORMAL</property>
>+		  <property name="active">False</property>
>+		  <property name="inconsistent">False</property>
>+		  <property name="draw_indicator">True</property>
>+		  <property name="group">sendmailRB</property>
>+		</widget>
>+		<packing>
>+		  <property name="padding">0</property>
>+		  <property name="expand">False</property>
>+		  <property name="fill">False</property>
>+		</packing>
>+	      </child>
>+
>+	      <child>
>+		<widget class="GtkRadioButton" id="esmtpRB">
>+		  <property name="tooltip" translatable="yes">click to enable or disable ESMTP as default Mail transport agent</property>
>+		  <property name="can_focus">True</property>
>+		  <property name="label" translatable="yes">ESM_TP</property>
>+		  <property name="use_underline">True</property>
>+		  <property name="relief">GTK_RELIEF_NORMAL</property>
>+		  <property name="active">False</property>
>+		  <property name="inconsistent">False</property>
>+		  <property name="draw_indicator">True</property>
>+		  <property name="group">sendmailRB</property>
>+		</widget>
>+		<packing>
>+		  <property name="padding">0</property>
>+		  <property name="expand">False</property>
>+		  <property name="fill">False</property>
>+		</packing>
>+	      </child>
> 	    </widget>
> 	  </child>
> 
>diff -ru system-switch-mail-0.5.25-10.orig/switchmail_gui.py system-switch-mail-0.5.25-10/switchmail_gui.py
>--- system-switch-mail-0.5.25-10.orig/switchmail_gui.py	2006-03-07 17:00:03.000000000 +0200
>+++ system-switch-mail-0.5.25-10/switchmail_gui.py	2007-04-07 20:58:28.000000000 +0300
>@@ -73,6 +73,8 @@
>         self.sendmail_widget = self.xml.get_widget('sendmailRB')
>         self.postfix_widget = self.xml.get_widget('postfixRB')
>         self.exim_widget = self.xml.get_widget('eximRB')
>+        self.ssmtp_widget = self.xml.get_widget('ssmtpRB')
>+        self.esmtp_widget = self.xml.get_widget('esmtpRB')
>         
>         self.dialog.connect('delete-event', self.on_Dialog_delete_event)
>         self.dialog.connect('hide', gtk.main_quit)
>@@ -95,6 +97,10 @@
>             switch(POSTFIX)
>         elif self.exim_widget.get_active():
>             switch(EXIM)
>+        elif self.ssmtp_widget.get_active():
>+            switch(SSMTP)
>+        elif self.esmtp_widget.get_active():
>+            switch(ESMTP)
> 
>         self.dialog.hide()
>         self.infoDialog()
>@@ -117,6 +123,10 @@
>                 self.postfix_widget.show()
>             if mta == 'Exim':
>                 self.exim_widget.show()
>+            if mta == 'sSMTP':
>+                self.ssmtp_widget.show()
>+            if mta == 'ESMTP':
>+                self.esmtp_widget.show()
> 
>         # activate default mta
>         mta = get_default_mta(mta_list)
>@@ -126,6 +136,10 @@
>                 self.postfix_widget.set_active(TRUE)
>         elif mta == 'Exim':
>             self.exim_widget.set_active(TRUE)
>+        elif mta == 'sSMTP':
>+            self.ssmtp_widget.set_active(TRUE)
>+        elif mta == 'ESMTP':
>+            self.esmtp_widget.set_active(TRUE)
> 
>     def infoDialog(self):
>         dlg = gtk.MessageDialog(self.dialog,
>diff -ru system-switch-mail-0.5.25-10.orig/switchmail_tui.py system-switch-mail-0.5.25-10/switchmail_tui.py
>--- system-switch-mail-0.5.25-10.orig/switchmail_tui.py	2004-01-15 13:05:29.000000000 +0200
>+++ system-switch-mail-0.5.25-10/switchmail_tui.py	2007-04-07 20:56:00.000000000 +0300
>@@ -69,6 +69,10 @@
>                 li.append(MTA[POSTFIX], POSTFIX)
>             if mta == MTA[EXIM]:
>                 li.append(MTA[EXIM], EXIM)
>+            if mta == MTA[SSMTP]:
>+                li.append(MTA[SSMTP], SSMTP)
>+            if mta == MTA[ESMTP]:
>+                li.append(MTA[ESMTP], ESMTP)
> 
>         # activate default mta
>         mta = get_default_mta(mta_list)
>@@ -78,6 +82,10 @@
>             li.setCurrent(POSTFIX)
>         elif mta == MTA[EXIM]:
>             li.setCurrent(EXIM)
>+        elif mta == MTA[SSMTP]:
>+            li.setCurrent(SSMTP)
>+        elif mta == MTA[ESMTP]:
>+            li.setCurrent(ESMTP)
> 
>         # create button bar    
>         bb = ButtonBar(screen, ((_('Ok'), 'ok'), (_('Cancel'), 'cancel')))

Actions: View | Diff

Attachments on bug 217271: 142129 | 151920