File qmail-dkim.patch of Package netqmail

Overview Repositories Revisions Requests Users Attributes Meta

File qmail-dkim.patch of Package netqmail (Revision b83f30f802dad06a977d4a9fc3295f2e)

Currently displaying revision b83f30f802dad06a977d4a9fc3295f2e , Show latest

--- dkim/qmail-remote	2009-07-03 15:57:33.000000000 +0200
+++ dkim.new/qmail-remote	2011-05-26 09:32:25.000000000 +0200
@@ -2,6 +2,9 @@
 #
 # Copyright (C) 2007 Manuel Mausz (manuel@mausz.at)
 #
+# Modified by Peter Conrad <conrad@quisquis.de> to support VERH
+# and openSUSE install
+#
 # 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
@@ -35,7 +38,7 @@
 
 <dkimsign>
   
-  <global algorithm="rsa-sha256" domain="/var/qmail/control/me" keyfile="/var/qmail/control/dkim/global.key" method="simple" selector="beta">
+  <global algorithm="rsa-sha256" domain="@QMAIL_CONFDIR@/control/me" keyfile="@QMAIL_CONFDIR@/dkim/global.key" method="simple" selector="default">
     <types id="dkim" />
   </global>
 
@@ -51,20 +54,20 @@
 =cut
 
 my $configfile = undef;
-$configfile    = '/var/qmail/control/dkim/signconf.xml';
+$configfile    = '@QMAIL_CONFDIR@/dkim/signconf.xml';
 my $debugfile  = undef;
 #$debugfile    = '/tmp/dkim.debug';
-my $qremote    = '/var/qmail/bin/qmail-remote.orig';
+my $qremote    = '@QMAIL_EXECDIR@/qmail-remote.real';
 my $binary     = 0;
 our $config;
 $config->{'global'} = {
-  types     => { dkim => {} },
-  keyfile   => '/var/qmail/control/dkim/global.key',
+  types     => {},
+  keyfile   => '@QMAIL_CONFDIR@/dkim/global.key',
   algorithm => 'rsa-sha256',
   method    => 'simple',
-  selector  => 'beta',
+  selector  => 'default',
   # either string or file (first line of file will be used)
-  domain    => '/var/qmail/control/me'
+  domain    => '@QMAIL_CONFDIR@/control/me'
 };
 
 #-------------------------------------------------------------------------------
@@ -107,8 +110,35 @@
     binmode STDIN;
   }
 
+  my $inHeader = 0;
+  my $verhInBody = 0;
+  my $doVerh = ($#ARGV == 2);
+  my $verhLocal = "";
+  my $verhHost = "";
+  if ($doVerh && $ARGV[2] =~ /\@([^\@]*)$/s) {
+    $verhLocal = $`;
+    $verhHost = $1;
+    if ($verhLocal =~ /[^-a-zA-Z0-9\.]/s) {
+      $verhLocal =~ s/[\r\n\"\\]/\\$&/sg;
+      $verhLocal = "\"$verhLocal\"";
+    }
+  } else {
+    $doVerh = 0;
+  }
   while (<STDIN>)
   {
+    if ($inHeader) {
+      if (/^[\r\n]+$/) {
+	$inHeader = 0;
+      } elsif (/^#/) {
+	$verhInBody = 1;
+	$_ = $';
+      }
+    }
+    if ($doVerh && ($inHeader || $verhInBody)) {
+      s/##L/$verhLocal/g;
+      s/##H/$verhHost/g;
+    }
     $mailbuf .= $_;
     unless ($binary)
     {
@@ -208,7 +237,7 @@
   my ($self, $signer) = @_;
   my $domain = undef;
   $domain = lc($signer->message_sender->host)
-    if (defined($signer->message_sender));
+    if (defined($signer->message_sender) && defined($signer->message_sender->host));
 
   # merge configs
   while($domain)

Places

File qmail-dkim.patch of Package netqmail (Revision b83f30f802dad06a977d4a9fc3295f2e)

Places