OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-May-2005 21:32:54
Branch: HEAD Handle: 2005052120325400
Modified files:
openpkg-src/mailman mailman.patch mailman.spec
Log:
modifying package: mailman-2.1.5 20050501 -> 20050521
Summary:
Revision Changes Path
1.2 +12 -16 openpkg-src/mailman/mailman.patch
1.4 +3 -1 openpkg-src/mailman/mailman.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mailman/mailman.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mailman.patch
--- openpkg-src/mailman/mailman.patch 30 Apr 2005 17:18:54 -0000 1.1
+++ openpkg-src/mailman/mailman.patch 21 May 2005 19:32:54 -0000 1.2
@@ -34,22 +34,6 @@
key = article.threadKey, article.msgid
self.database.setThreadKey(arch, key, article.msgid)
-Index: Mailman/Cgi/private.py
---- Mailman/Cgi/private.py.orig 2003-02-08 08:13:50 +0100
-+++ Mailman/Cgi/private.py 2005-04-30 09:07:16 +0200
-@@ -39,10 +39,8 @@
-
- def true_path(path):
- "Ensure that the path is safe by removing .."
-- path = path.replace('../', '')
-- path = path.replace('./', '')
-- return path[1:]
--
-+ parts = [x for x in path.split('/') if x not in ('.', '..')]
-+ return '/'.join(parts)[1:]
-
-
- def guess_type(url, strict):
Index: Mailman/Commands/cmd_subscribe.py
--- Mailman/Commands/cmd_subscribe.py.orig 2002-11-21 06:37:25 +0100
+++ Mailman/Commands/cmd_subscribe.py 2005-04-30 09:07:16 +0200
@@ -1598,3 +1582,15 @@
<FORM METHOD=POST ACTION="%(action)s/">
%(message)s
<TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
+Index: Mailman/HTMLFormatter.py
+--- Mailman/HTMLFormatter.py 2003-09-29 08:01:22.000000000 -0700
++++ Mailman/HTMLFormatter.py 2005-03-14 09:59:23.324177386 -0800
+@@ -43,7 +43,7 @@
+ realname = self.real_name
+ hostname = self.host_name
+ listinfo_link = Link(self.GetScriptURL('listinfo'),
realname).Format()
+- owner_link = Link('mailto:' + self.GetOwnerEmail(),
ownertext).Format()
++ owner_link = Link('mailto:' + self.GetOwnerEmail(), realname +
'-owner').Format()
+ innertext = _('%(listinfo_link)s list run by %(owner_link)s')
+ return Container(
+ '<hr>',
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mailman/mailman.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 mailman.spec
--- openpkg-src/mailman/mailman.spec 1 May 2005 06:31:02 -0000 1.3
+++ openpkg-src/mailman/mailman.spec 21 May 2005 19:32:54 -0000 1.4
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 2.1.5
-Release: 20050501
+Release: 20050521
# list of sources
Source0: ftp://ftp.gnu.org/gnu/mailman/mailman-%{version}.tgz
@@ -42,6 +42,7 @@
Source3: mailman-apache.conf
Source4: rc.mailman
Patch0: mailman.patch
+Patch1: http://www.gnu.org/software/mailman/CAN-2005-0202.txt
# build information
Prefix: %{l_prefix}
@@ -71,6 +72,7 @@
%setup -q
%setup -q -D -T -a 1
%patch -p0
+ %patch -p0 -d Mailman/Cgi -P 1
%build
# configure package
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
