[pkg-kolab] r46 - trunk/kolabd/debian/patches

[Steffen Joeris]

Author: white-guest
Date: 2005-12-19 16:04:35 +0000 (Mon, 19 Dec 2005)
New Revision: 46

Removed:
   trunk/kolabd/debian/patches/20-kolab-ca.sh.dpatch
Log:
* we don't need this one (is done by an other patch)


Deleted: trunk/kolabd/debian/patches/20-kolab-ca.sh.dpatch
===================================================================
--- trunk/kolabd/debian/patches/20-kolab-ca.sh.dpatch	2005-12-19 15:54:18 UTC (rev 45)
+++ trunk/kolabd/debian/patches/20-kolab-ca.sh.dpatch	2005-12-19 16:04:35 UTC (rev 46)
@@ -1,62 +0,0 @@
-#!/bin/sh -e
-## 20-kolab-ca.sh.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct some pathes in kolab_ca.sh 
-
-if [ $# -lt 1 ]; then
-echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-      -patch) patch $patch_opts -p1 < $0;;
-      -unpatch) patch $patch_opts -p1 -R < $0;;
-      *)
-      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-      exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- kolabd-1.9.4/kolab_ca.sh.orig	2005-12-16 16:01:35.000000000 +0100
-+++ kolabd-1.9.4/kolab_ca.sh	2005-12-16 16:02:18.000000000 +0100
-@@ -6,7 +6,7 @@
- ## CA management script that is heavily inspired by Tim Hudson's
- ## CA.sh script from the openssl distribution
- 
--PREFIX=/kolab
-+PREFIX=/usr
- 
- DAYS="-days 3650"
- REQ="$PREFIX/bin/openssl req"
-@@ -16,14 +16,14 @@
- RSA="$PREFIX/bin/openssl rsa"
- GENRSA="$PREFIX/bin/openssl genrsa"
- 
--CATOP=$PREFIX/etc/kolab/ca
-+CATOP=/etc/kolab/ca
- CAKEY=cakey.pem
- CACERT=cacert.pem
- 
- # Make sure not to create world readable files
- umask 0077
- 
--cd @l_prefix@/etc/kolab
-+cd /etc/kolab
- 
- # Config
- function createconf() {
-@@ -32,7 +32,7 @@
- #if [ ! -d "$PREFIX/etc/kolab/ca" ]; then
- #    mkdir $PREFIX/etc/kolab/ca
- #fi
--export OPENSSL_CONF=$PREFIX/etc/kolab/kolab-ssl.cnf
-+export OPENSSL_CONF=/etc/kolab/kolab-ssl.cnf
- cat > ${OPENSSL_CONF} <<EOF
- [ req ]
- distinguished_name = req_distinguished_name