[pkg-kolab] r380 - in trunk/kolab-webadmin/debian: . patches
Peter Eisentraut
petere at costa.debian.org
Fri Apr 7 18:34:31 UTC 2006
Author: petere
Date: 2006-04-07 18:34:20 +0000 (Fri, 07 Apr 2006)
New Revision: 380
Added:
trunk/kolab-webadmin/debian/patches/40-kolab_prefix.dpatch
Modified:
trunk/kolab-webadmin/debian/changelog
trunk/kolab-webadmin/debian/control
trunk/kolab-webadmin/debian/patches/00list
trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch
trunk/kolab-webadmin/debian/patches/20-service_index.dpatch
trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch
trunk/kolab-webadmin/debian/rules
Log:
* Look for res_pub.pem in correct directory (closes: #361000)
* Use /usr/share/dpatch/dpatch-run in dpatches
Modified: trunk/kolab-webadmin/debian/changelog
===================================================================
--- trunk/kolab-webadmin/debian/changelog 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/changelog 2006-04-07 18:34:20 UTC (rev 380)
@@ -1,3 +1,10 @@
+kolab-webadmin (0.4.0-5) unstable; urgency=low
+
+ * Look for res_pub.pem in correct directory (closes: #361000)
+ * Use /usr/share/dpatch/dpatch-run in dpatches
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 7 Apr 2006 18:51:22 +0200
+
kolab-webadmin (0.4.0-4) unstable; urgency=low
[ Steffen Joeris ]
Modified: trunk/kolab-webadmin/debian/control
===================================================================
--- trunk/kolab-webadmin/debian/control 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/control 2006-04-07 18:34:20 UTC (rev 380)
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
-Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>
+Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>, Peter Eisentraut <petere at debian.org>
Build-Depends-Indep: debhelper (>= 4.0.0), autotools-dev, dpatch
Standards-Version: 3.6.2
Modified: trunk/kolab-webadmin/debian/patches/00list
===================================================================
--- trunk/kolab-webadmin/debian/patches/00list 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/patches/00list 2006-04-07 18:34:20 UTC (rev 380)
@@ -1,3 +1,4 @@
10-fix-require
20-service_index
30-admin_distributionlist_list
+40-kolab_prefix
Modified: trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch
===================================================================
--- trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch 2006-04-07 18:34:20 UTC (rev 380)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 10-fix-requrires.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: Correction of the require pathes
-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
-
@DPATCH@
--- index.php.orig 2006-02-01 22:53:18.000000000 +0100
+++ kolab-webadmin-0.4.0/www/admin/index.php 2006-02-01 22:54:10.000000000 +0100
Modified: trunk/kolab-webadmin/debian/patches/20-service_index.dpatch
===================================================================
--- trunk/kolab-webadmin/debian/patches/20-service_index.dpatch 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/patches/20-service_index.dpatch 2006-04-07 18:34:20 UTC (rev 380)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 10-service_index.dpatch by Tobias König <tokoe at kde.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: opportunity to delete freebusy value
-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
-
@DPATCH@
--- index.php.orig 2006-02-02 09:08:17.000000000 +0100
+++ kolab-webadmin-0.4.0/www/admin/service/index.php 2006-02-02 08:56:14.000000000 +0100
Modified: trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch
===================================================================
--- trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch 2006-04-07 18:34:20 UTC (rev 380)
@@ -1,27 +1,8 @@
-#!/bin/sh -e
+#!/bin/sh /usr/share/dpatch/dpatch-run
## 30-admin_distributionlist_list.patch by Tobias König <tobias.koenig at credativ.de>
##
-## All lines beginning with `## DP:' are a description of the patch.
## DP: admin_distributionlist_list
-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
-
@DPATCH@
--- list.php.orig 2006-02-02 14:10:08.000000000 +0100
+++ kolab-webadmin-0.4.0/www/admin/distributionlist/list.php 2006-02-02 14:10:23.000000000 +0100
Added: trunk/kolab-webadmin/debian/patches/40-kolab_prefix.dpatch
===================================================================
--- trunk/kolab-webadmin/debian/patches/40-kolab_prefix.dpatch 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/patches/40-kolab_prefix.dpatch 2006-04-07 18:34:20 UTC (rev 380)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-kolab_prefix.dpatch by Peter Eisentraut <petere at debian.org>
+##
+## DP: correct path of res_pub.pem (bug #361000)
+
+ at DPATCH@
+diff -urNad kolab-webadmin-0.4.0~/www/admin/user/user.php kolab-webadmin-0.4.0/www/admin/user/user.php
+--- kolab-webadmin-0.4.0~/www/admin/user/user.php 2006-04-07 18:39:49.000000000 +0200
++++ kolab-webadmin-0.4.0/www/admin/user/user.php 2006-04-07 18:41:08.000000000 +0200
+@@ -463,10 +463,10 @@
+ }
+ if( isset( $_POST['accttype'] ) && $_POST['accttype'] > 1 ) {
+ // We have a group or resource, create encrypted pw
+- $pubkeydata=file_get_contents("$kolab_prefix/etc/kolab/res_pub.pem" );
++ $pubkeydata=file_get_contents("/etc/kolab/res_pub.pem" );
+ $pkey = openssl_pkey_get_public( $pubkeydata );
+ if( $pkey === false ) {
+- $sslerr = _("Could not read resource encryption public key file://$kolab_prefix/etc/kolab/res_pub.pem: ");
++ $sslerr = _("Could not read resource encryption public key file:///etc/kolab/res_pub.pem: ");
+ while( $msg = openssl_error_string() )
+ $sslerr .= $msg.' ';
+ $errors[] = $sslerr;
Property changes on: trunk/kolab-webadmin/debian/patches/40-kolab_prefix.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/kolab-webadmin/debian/rules
===================================================================
--- trunk/kolab-webadmin/debian/rules 2006-04-07 14:12:18 UTC (rev 379)
+++ trunk/kolab-webadmin/debian/rules 2006-04-07 18:34:20 UTC (rev 380)
@@ -1,12 +1,9 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
-config.status: configure
+config.status: configure patch
dh_testdir
- dpatch apply-all
- touch patch-stamp
./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -17,20 +14,16 @@
--enable-pkgdocdir=/usr/share/doc/kolab-webadmin
build: build-stamp
-
build-stamp: config.status
dh_testdir
-
$(MAKE)
touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
- dpatch deapply-all
- rm -rf debian/patched
- rm -f patch-stamp
-$(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
More information about the pkg-kolab-devel
mailing list