Changeset 2208

Timestamp:

04/24/08 23:09:06 (5 years ago)

Author:

anarcat

Message:

first attempt at integrating the VirtualMailman patches

Location:

alternc-mailman/trunk

Files:

• bureau/class/m_mailman.php (modified) (1 diff)
• debian/config (added)
• debian/dirs (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• debian/rules (modified) (1 diff)
• debian/templates (added)
• patches (added)
• patches/mailman-true-virtual-2.1.1.patch (added)
• patches/mailman-true-virtual-2.1.4.patch (added)
• patches/mailman-true-virtual-2.1.5.patch (added)
• patches/mailman-true-virtual-2.1.9.patch (added)

alternc-mailman/trunk/bureau/class/m_mailman.php

@@ -113 +113 @@
     $err->log("mailman","add_lst",$login."@".$domain." - ".$owner);
     /* the list' internal name */
-    // $name = $login . '-' . $domain; # works only with the
-    // VirtualMailman patch
-    $name = $login = strtolower($login);
+    $login = strtolower($login);
+    if (file_exists("/usr/share/alternc-mailman/patches/mailman-true-virtual.applied")) {
+      $name = $login . '-' . $domain;
+    } else {
+      $name = $login;
+    }
 
     if ($login=="") {

alternc-mailman/trunk/debian/dirs

@@ -5 +5 @@
 usr/share/alternc/install
 usr/share/doc/alternc-mailman
+usr/share/alternc-mailman
+usr/share/alternc-mailman/patches
 usr/share/lintian/overrides
 var/alternc/bureau/admin

alternc-mailman/trunk/debian/postinst

@@ -64 +64 @@
         mv -f $MENUFILE.alternc_mailman $MENUFILE
     fi
+    # "
+    MAILMAN_VERSION=`dpkg -l mailman | grep ^ii | awk '{print $3}' | sed -e s/-.*//`
+    echo "detected mailman version $MAILMAN_VERSOIN"
+    PATCHFILE="/usr/share/alternc-mailman/patches/mailman-true-virtual-$MAILMAN_VERSION"
+    PATCH_MARKER="/usr/share/alternc-mailman/patches/mailman-true-virtual.applied"
+    if [ -h $PATCH_MARKER ]; then
+        PATCH_VERSION=`readlink $PATCH_MARKER | sed -e s/^.*-//`
+        echo "mailman patch detected, version $PATCH_VERSION"
+        if [ "$PATCH_VERSION" = "$MAILMAN_VERSION" ]; then
+            echo "mailman already patched, will not patch again"
+        else
+            echo "wrong version of the patch, we assume that mailman was upgraded"
+            rm -f $PATCH_MARKER
+        fi
+    fi
+    if [ -r $PATCHFILE -a ! -h $PATCH_MARKER ]; then
+        db_get alternc-mailman/patch-mailman || true
+        if [ "$RET" = "true" ]; then
+            {
+                cd /var/lib
+                echo "testing the patch"
+                if patch --dry-run -p0 < $PATCHFILE; then
+                    echo "applying patch"
+                    if patch -p0 < $PATCHFILE; then
+                        echo "patch applied sucessfully"
+                        # this will tell alternc-mailman the patch was applied successfully
+                        ln -fs $PATCHFILE $PATCH_MARKER
+                    else
+                        echo "cannot apply patch, your mailman is probably broken now, aborting"
+                        false
+                    fi
+                else
+                    echo "patch will not apply cleanly, aborting"
+                fi
+            }
+        else
+            echo "not applying virtual mailman patch"
+        fi
+    else
+        echo "no patchfile for mailman $MAILMAN_VERSION"
+    fi
     ;;
 

alternc-mailman/trunk/debian/rules

@@ -48 +48 @@
         # remove CVS / SVN entries : 
         find debian/alternc-mailman/ -depth \( -name CVS -o -name .svn \) -type d -exec rm -rf {} \;
+        cp -r patches debian/alternc-mailman/usr/share/alternc-mailman/patches
+
 binary-common: build install
         dh_testdir