[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/milter-dkim/ milter-dkim-genkey.sh milter-d...
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2006-12-30 22:16:51
Message-ID: 20061230221652.135971B5047 () master ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   30-Dec-2006 23:16:51
  Branch: HEAD                             Handle: 2006123022165100

  Added files:
    openpkg-src/milter-dkim milter-dkim-genkey.sh milter-dkim.patch

  Log:
    ops, add missing files to CVS, too

  Summary:
    Revision    Changes     Path
    1.1         +56 -0      openpkg-src/milter-dkim/milter-dkim-genkey.sh
    1.1         +17 -0      openpkg-src/milter-dkim/milter-dkim.patch
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/milter-dkim/milter-dkim-genkey.sh
  ============================================================================
  $ cvs diff -u -r0 -r1.1 milter-dkim-genkey.sh
  --- /dev/null	2006-12-30 23:16:40 +0100
  +++ milter-dkim-genkey.sh	2006-12-30 23:16:51 +0100
  @@ -0,0 +1,56 @@
  +#!/bin/sh
  +##
  +##  milter-dkim-genkey.sh -- DKIM key generation
  +##
  +
  +#   command line parsing
  +if [ $# -eq 0 ]; then
  +    echo "USAGE: milter-dkim-genkey <selector> [<domain> [<keyfile> [<keysize>]]]" 1>&2
  +    exit 1
  +fi
  +selector="$1"
  +domain="$2"
  +keyfile="$3"
  +keysize="$4"
  +case "$selector" in
  +    *.* )
  +        domain=`echo "$selector" | sed -e 's;^[^.]*\.;;'`
  +        selector=`echo "$selector" | sed -e 's;^\([^.]*\)\..*$;\1;'`
  +        ;;
  +esac
  +if [ ".$domain" = . ]; then
  +    domain="`@l_prefix@/lib/openpkg/shtool echo -e '%d' | sed -e 's;^\.;;'`"
  +fi
  +if [ ".$keyfile" = . ]; then
  +    keyfile="@l_prefix@/etc/milter-dkim/$selector.$domain.pem"
  +fi
  +if [ ".$keysize" = . ]; then
  +    keysize="1024"
  +fi
  +
  +#   key generation   
  +echo "++ generating $keysize bit RSA key $keyfile"
  +if [ ! -f $keyfile ]; then
  +    @l_prefix@/bin/openssl genrsa -out $keyfile $keysize
  +else
  +    echo "** FILE ALREADY EXISTS, NOT OVERRIDDEN, KEPT AS IS"
  +fi
  +echo ""
  +
  +#   DNS zone record generation   
  +echo "++ corresponding DNS record (public key part)"
  +echo "-- [manually place into your DNS zonefile]"
  +txt=`@l_prefix@/bin/openssl rsa -in $keyfile -pubout -outform PEM |\
  +     perl -e '$_ = join("", <STDIN>); s/^-----.+?$//mg; s/\n+//sg; printf("t=y; k=rsa; p=%s\n", $_);'`
  +echo "$selector._domainkey.$domain IN TXT \"$txt\""
  +echo "_policy._domainkey.$domain IN TXT \"t=y; o=~\""
  +echo ""
  +
  +#   OpenPKG run-command configuration generation   
  +echo "++ corresponding OpenPKG milter-dkim configuration"
  +echo "-- [manually place into @l_prefix@/etc/rc.conf]"
  +echo "milter_dkim_selector=\"$selector\""
  +echo "milter_dkim_domain=\"$domain\""
  +echo "milter_dkim_keyfile=\"$keyfile\""
  +echo ""
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/milter-dkim/milter-dkim.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 milter-dkim.patch
  --- /dev/null	2006-12-30 23:16:40 +0100
  +++ milter-dkim.patch	2006-12-30 23:16:51 +0100
  @@ -0,0 +1,17 @@
  +Index: dkim-filter/dkim-filter.c
  +--- dkim-filter/dkim-filter.c.orig	2006-09-12 23:46:30 +0200
  ++++ dkim-filter/dkim-filter.c	2006-12-30 22:15:17 +0100
  +@@ -2308,6 +2308,13 @@
  + 		}
  + 	}
  + 
  ++	/* Determine the job ID for logging. */
  ++	if (dfc->mctx_jobid == 0 || strcmp(dfc->mctx_jobid, JOBIDUNKNOWN) == 0) {
  ++		char *jobid = smfi_getsymval(ctx, "i");
  ++		if (jobid != 0)
  ++			dfc->mctx_jobid = jobid;
  ++	}
  ++
  + 	/* get hostname; used in the X header and in new MIME boundaries */
  + 	hostname = smfi_getsymval(ctx, "j");
  + 	if (hostname == NULL)
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

[prev in list] [next in list] [prev in thread] [next in thread]