[Pkg-mailman-hackers] Pkg-mailman commit - rev 439 - in trunk/debian: . contrib patches

Tue Oct 10 21:00:53 UTC 2006

Author: hector
Date: 2006-10-10 21:00:53 +0000 (Tue, 10 Oct 2006)
New Revision: 439

Removed:
   trunk/debian/contrib/savannah
   trunk/debian/patches/12_savannah_wrapper.patch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
   trunk/debian/rules
Log:
Removed 12_savannah_wrapper

Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2006-10-10 13:01:10 UTC (rev 438)
+++ trunk/debian/changelog	2006-10-10 21:00:53 UTC (rev 439)
@@ -1,11 +1,16 @@
 mailman (1:2.1.9-2) UNRELEASED; urgency=low
 
+  [ Thijs Kinkhorst ]
   * Drop disabled 73_list-id_strict_rfc patch; integrated upstream.
   * Clarify README.Debian about where to insert SpamAssassin integration
     (Closes: #369171).
 
- -- Thijs Kinkhorst <thijs at debian.org>  Tue, 10 Oct 2006 11:42:39 +0200
+  [ Hector Garcia ]
+  * Removed 12_savannah_wrapper.patch Doesn't work and is not supported
+    upstream any longer (Closes: #287554).
 
+ -- Hector Garcia <hector at debian.org>  Tue, 10 Oct 2006 22:57:38 +0200
+
 mailman (1:2.1.9-1) unstable; urgency=medium
 
   [ Hector Garcia ]

Deleted: trunk/debian/contrib/savannah
===================================================================
--- trunk/debian/contrib/savannah	2006-10-10 13:01:10 UTC (rev 438)
+++ trunk/debian/contrib/savannah	2006-10-10 21:00:53 UTC (rev 439)
@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2001 Guillaume Morin
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-"""Verify that the admin password of a mailing list in a parsable way
-"""
-
-# No lock needed in this script, because we don't change data.
-
-import os
-import string
-import cgi
-
-from Mailman import mm_cfg
-from Mailman import Utils
-from Mailman import MailList
-from Mailman import Errors
-from Mailman.htmlformat import *
-from Mailman.Logging.Syslog import syslog
-
-def main():
-	form = cgi.FieldStorage()
-
-	if form.has_key('password') and form.has_key('list'):
-		
-		password = form['password']
-		if type(password) == type([]): password = password[0]
-		password = password.value
-
-		list = form['list']
-		if type(list) == type([]): list = list[0]
-		list = list.value
-
-		try:
-			mlist = MailList.MailList(list, lock=0)
-			result = mlist.ConfirmAdminPassword(password)
-			result = "%d" % result
-			result = result+' '+mlist.GetAdminEmail()+' '+str(mlist.advertised)+' '+mlist.description
-			result = string.replace(result,"\n"," ")
-		except Errors.MMListError:
-			result = 0
-		except Errors.MMBadPasswordError:
-			result = 2
-	
-	else:
-		result = 0
-	
-	print "Content-type: text/html\n"
-	print "<HTML>"
-	print "<BODY>"
-	print result
-	print "</BODY>"
-	print "</HTML>"
-
-if __name__ == "__main__":
-	main()

Deleted: trunk/debian/patches/12_savannah_wrapper.patch
===================================================================
--- trunk/debian/patches/12_savannah_wrapper.patch	2006-10-10 13:01:10 UTC (rev 438)
+++ trunk/debian/patches/12_savannah_wrapper.patch	2006-10-10 21:00:53 UTC (rev 439)
@@ -1,16 +0,0 @@
-Patch: 12_savannah_wrapper.patch
-Author: Tollef Fog Heen <tfheen at debian.org>
-Compile a wrapper for the savannah contrib plugin
-Index: src/Makefile.in
-===================================================================
---- src/Makefile.in.orig	2006-08-15 15:12:18.000000000 +0800
-+++ src/Makefile.in	2006-08-15 15:14:28.000000000 +0800
-@@ -71,7 +71,7 @@
- # Fixed definitions
- 
- CGI_PROGS= admindb admin confirm create edithtml listinfo options \
--	private rmlist roster subscribe
-+	private rmlist roster subscribe savannah
- 
- COMMONOBJS= common.o vsnprintf.o
- 

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-10-10 13:01:10 UTC (rev 438)
+++ trunk/debian/patches/series	2006-10-10 21:00:53 UTC (rev 439)
@@ -3,7 +3,6 @@
 07_snooze.patch -p0
 10_wrapper_uid.patch -p0
 11_handle_propfind.patch -p0
-12_savannah_wrapper.patch -p0
 15_mailmanctl_daemonize.patch -p0
 16_update_debian.patch -p0
 20_qmail_to_mailman.debian.patch -p0

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-10-10 13:01:10 UTC (rev 438)
+++ trunk/debian/rules	2006-10-10 21:00:53 UTC (rev 439)
@@ -143,9 +143,6 @@
 	# make lintian happy
 	install -m 0644 debian/lintian-overrides debian/mailman/usr/share/lintian/overrides/mailman
 
-# Install savannah plugin
-	install -m 0644 debian/contrib/savannah debian/mailman/usr/lib/$(package)/Mailman/Cgi
-
 # Spamassassin plugin
 	install -m 0644 debian/contrib/SpamAssassin.py debian/mailman/usr/lib/$(package)/Mailman/Handlers
 	install -m 0644 debian/contrib/spamd.py debian/mailman/usr/lib/$(package)/Mailman/Handlers


