[pkg-kolab] r910 - in libkolab-perl/trunk/debian: . patches
petere at alioth.debian.org
petere at alioth.debian.org
Mon Jul 14 14:12:27 UTC 2008
Author: petere
Date: 2008-07-14 14:12:26 +0000 (Mon, 14 Jul 2008)
New Revision: 910
Added:
libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch
libkolab-perl/trunk/debian/uupdate-wrapper
Removed:
libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch
libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch
libkolab-perl/trunk/debian/patches/common/
Modified:
libkolab-perl/trunk/debian/changelog
libkolab-perl/trunk/debian/control
libkolab-perl/trunk/debian/copyright
libkolab-perl/trunk/debian/patches/00list
libkolab-perl/trunk/debian/rules
libkolab-perl/trunk/debian/watch
Log:
Merged from 2.2 branch r896
Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/changelog 2008-07-14 14:12:26 UTC (rev 910)
@@ -1,3 +1,23 @@
+libkolab-perl (1:2.2.0-1) experimental; urgency=low
+
+ [ Mathieu Parent ]
+ * New upstream version: 2.2.0
+ * FDS LDAP Backend, for persistent searches (OpenLDAP 2.4 doesn't have
+ slurpd anymore)
+ * Use the new Makefile.PL, and drop ./configure way
+ * Add libnet-ldap-perl in Build-Depends-Indep as Kolab.pm needs it
+ * Disable patch 10-Kolab.pm, gone in kolabconf (30-invoke-rc)
+ * Disable patch 20-buildCyrusConfig, function is missing
+ * Disable patch 40-dist_conf, dist_conf has gone
+ * New patch 50-sync-ldap-backend for experimental rfc4533 LDAP backend (not
+ enabled by default: use "directory_mode: sync" in kolab.globals to enable)
+ * Bump Standards-Version to 3.8.0 (no change needed)
+
+ [ Peter Eisentraut ]
+ * Adjusted Vcs-* control fields
+
+ -- Mathieu Parent <math.parent at gmail.com> Sat, 12 Jul 2008 09:11:56 +0200
+
libkolab-perl (5.8.7-20070420-3) unstable; urgency=low
* Internal Subversion repository reorganization to keep common patches in
Modified: libkolab-perl/trunk/debian/control
===================================================================
--- libkolab-perl/trunk/debian/control 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/control 2008-07-14 14:12:26 UTC (rev 910)
@@ -2,12 +2,13 @@
Section: perl
Priority: extra
Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
-Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>
+Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <white at debian.org>, Peter Eisentraut <petere at debian.org>, Mathieu Parent <math.parent at gmail.com>
Build-Depends: debhelper (>= 4), dpatch
-Standards-Version: 3.7.3
+Build-Depends-Indep: libnet-ldap-perl
+Standards-Version: 3.8.0
Homepage: http://www.kolab.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/libkolab-perl/trunk/
-Vcs-Svn: svn://svn.debian.org/pkg-kolab/libkolab-perl/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kolab/libkolab-perl/branches/2.2/
+Vcs-Svn: svn://svn.debian.org/pkg-kolab/libkolab-perl/branches/2.2/
Package: libkolab-perl
Architecture: all
Modified: libkolab-perl/trunk/debian/copyright
===================================================================
--- libkolab-perl/trunk/debian/copyright 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/copyright 2008-07-14 14:12:26 UTC (rev 910)
@@ -1,42 +1,33 @@
This package was debianized by
Noèl Köthe <noel at debian.org> on Fri, 16 Dec 2005 15:34:20 +0100.
-It was downloaded from http://max.kde.org:8080/mirrors/ftp.kolab.org/server/release/
+It was downloaded from <http://kolab.org/>
-Copyright Holder:
+Copyright holder (taken from AUTHORS):
-Kolab-Conf/Conf.pm
-Kolab-LDAP-Backend-slurpd/slurpd.pm
-## Copyright (c) 2004 Klaraelvdalens Datakonsult AB
-## Copyright (c) 2003 Code Fusion cc
-##
-## Writen by Stuart Bingë <s.binge at codefusion.co.za>
-## Portions based on work by the following people:
-##
-## (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-## (c) 2003-2006 Martin Konold <martin.konold at erfrakon.de>
-## (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+Originally written by Stuart Bingë <s.binge at codefusion.co.za>
+ Copyright (c) 2003 - 2004 Stuart Bingë
+ Copyright (c) 2003 - 2004 Code Fusion cc
-Kolab-Cyrus/Cyrus.pm
-Kolab-DirServ/DirServ.pm
-Kolab/Kolab.pm
-Kolab-LDAP-Backend/Backend.pm
-Kolab-LDAP-Backend-dirservd/dirservd.pm
-Kolab-Mailer/Mailer.pm
-Kolab-Util/Util.pm
-## Copyright (c) 2003 Code Fusion cc
-##
-## Writen by Stuart Bingë <s.binge at codefusion.co.za>
+Portions based on work by the following people:
+ (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ (c) 2003 Achim Frank <achim.frank at erfrakon.de>
+ (c) 2004 Stephan Buys <s.buys at codefusion.co.za>
+ (c) 2005 - 2006 Richard Bos <richard at radoeka.nl>
+ (c) 2005 - 2006 Marcus Hüwe <suse-tux at gmx.de>
+ (c) 2004 - 2006 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ (c) 2007 Thomas Arendsen Hein <thomas at intevation.de>
+ (c) 2006 - 2007 Gunnar Wrobel <wrobel at pardus.de>
+ (c) 2003 - 2007 Martin Konold <martin.konold at erfrakon.de>
-Kolab-LDAP/LDAP.pm
-## Copyright (c) 2005 Klaraelvdalens Datakonsult AB
-## Copyright (c) 2003 Code Fusion cc
-##
-## Writen by Stuart Bingë <s.binge at codefusion.co.za>
-## Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+Portions based on work by the following companies:
+ (c) 2004 - 2006 Klaraelvdalens Datakonsult AB
+ (c) 2007 Intevation GmbH
+ (c) 2006 - 2007 p at rdus
+ (c) 2003 - 2007 erfrakon Partnerschaftsgesellschaft
License:
@@ -50,10 +41,5 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
+On Debian systems, the complete text of the GNU General Public License can be
+found in '/usr/share/common-licenses/GPL'.
Modified: libkolab-perl/trunk/debian/patches/00list
===================================================================
--- libkolab-perl/trunk/debian/patches/00list 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/patches/00list 2008-07-14 14:12:26 UTC (rev 910)
@@ -1,3 +1,2 @@
-common/dist_conf
-10-Kolab.pm
-20-buildCyrusConfig
+50-sync-ldap-backend
+
Deleted: libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/patches/10-Kolab.pm.dpatch 2008-07-14 14:12:26 UTC (rev 910)
@@ -1,62 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-diff -urNad libkolab-perl-5.8.7-20070420~/Kolab/Kolab.pm.in libkolab-perl-5.8.7-20070420/Kolab/Kolab.pm.in
---- libkolab-perl-5.8.7-20070420~/Kolab/Kolab.pm.in 2007-07-27 19:17:42.000000000 +0200
-+++ libkolab-perl-5.8.7-20070420/Kolab/Kolab.pm.in 2007-07-27 19:17:44.000000000 +0200
-@@ -399,50 +399,28 @@
- {
- if ($haschanged{'slapd'}) {
- &log('K', 'Restarting OpenLDAP...');
-- system("@KOLABRC@ rc openldap restart &");
-+ system("invoke-rc.d slapd restart &");
- }
-
- if ($haschanged{'saslauthd'}) {
- &log('K', 'Restarting SASLAuthd...');
-- system("@KOLABRC@ rc sasl stop; sleep 1; @sbindir@/saslauthd -a ldap -n 5");
-+ system("invoke-rc.d saslauthd restart");
- }
-
- if ($haschanged{'apache'}) {
- &log('K', 'Reloading Apache...');
-- system("@sbindir@/apachectl graceful");
-+ system("invoke-rc.d apache2 graceful");
- }
-
- if ($haschanged{'postfix'}) {
- &log('K', 'Reloading Postfix...');
-- system("@sbindir@/postfix reload");
-+ system("invoke-rc.d postfix reload");
- }
-
- if ($haschanged{'imapd'}) {
- &log('K', 'Restarting imapd...');
- # Would it be enough with a reload here? /steffen
-- system("@KOLABRC@ rc imapd restart");
-- }
--
-- if ($haschanged{'amavisd'}) {
-- &log('K', 'Restarting amavisd...');
-- system("@KOLABRC@ rc amavisd restart");
-- }
--
-- if ($haschanged{'clamav'}) {
-- &log('K', 'Restarting clamav...');
-- system("@KOLABRC@ rc clamav restart");
-- }
--
-- if ($config{'proftpd-ftp'} =~ /true/i) {
-- Kolab::log('K', 'Starting ProFTPd if not running');
-- system("@KOLABRC@ rc proftpd start");
-- if ($haschanged{'proftpd'}) {
-- &log('K', 'Reloading ProFTPd...');
-- kill('SIGHUP', `cat @ftpserver_pidfile@`);
-- }
-- } else {
-- &log('K', 'Stopping ProFTPd, if running...');
-- system("@KOLABRC@ rc proftpd stop");
-+ system("invoke-rc.d kolab-cyrus restart");
- }
-
- %Kolab::Conf::haschanged = ();
Deleted: libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch
===================================================================
--- libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/patches/20-buildCyrusConfig.dpatch 2008-07-14 14:12:26 UTC (rev 910)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20-cyrusBuildConfig.dpatch by Peter Eisentraut <petere at debian.org>
-##
-## DP: Disables buildCyrusConfig function, because we don't want to provide the
-## DP: necessary template files. This unbreaks kolabconf.
-
- at DPATCH@
-diff -urNad libkolab-perl-5.8.7-20070420~/Kolab-Conf/Conf.pm.in libkolab-perl-5.8.7-20070420/Kolab-Conf/Conf.pm.in
---- libkolab-perl-5.8.7-20070420~/Kolab-Conf/Conf.pm.in 2007-01-06 22:36:20.000000000 +0100
-+++ libkolab-perl-5.8.7-20070420/Kolab-Conf/Conf.pm.in 2007-07-27 19:29:00.000000000 +0200
-@@ -434,6 +434,7 @@
-
- sub buildCyrusConfig
- {
-+ return; # not used on Debian
- Kolab::log('T', 'Building Cyrus config', KOLAB_DEBUG);
-
- my $keytemplate = "$templatedir/cyrus.conf.template";
Copied: libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch (from rev 909, libkolab-perl/branches/2.2/debian/patches/50-sync-ldap-backend.dpatch)
===================================================================
--- libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch (rev 0)
+++ libkolab-perl/trunk/debian/patches/50-sync-ldap-backend.dpatch 2008-07-14 14:12:26 UTC (rev 910)
@@ -0,0 +1,314 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-sync-ldap-backend.dpatch by Mathieu Parent <math.parent at gmail.com>
+##
+## DP: LDAP backend using content synchronization (RFC4533)
+## DP: which is not activated by default
+
+ at DPATCH@
+diff -urNad libkolab-perl-2.2~rc3-20080521~/lib/Kolab/LDAP/Backend/sync.pm libkolab-perl-2.2~rc3-20080521/lib/Kolab/LDAP/Backend/sync.pm
+--- libkolab-perl-2.2~rc3-20080521~/lib/Kolab/LDAP/Backend/sync.pm 1970-01-01 01:00:00.000000000 +0100
++++ libkolab-perl-2.2~rc3-20080521/lib/Kolab/LDAP/Backend/sync.pm 2008-06-18 21:31:37.000000000 +0200
+@@ -0,0 +1,303 @@
++package Kolab::LDAP::Backend::sync;
++
++##
++## Copyright (c) 2008 Mathieu Parent <math.parent at gmail.com>
++##
++## 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 version 2, or
++## (at your option) any later version.
++##
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++## General Public License for more details.
++##
++## You can view the GNU General Public License, online, at the GNU
++## Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
++##
++use 5.008;
++use strict;
++use warnings;
++use Kolab;
++use Kolab::LDAP;
++use Net::LDAP;
++use Net::LDAP::Control;
++use Net::LDAP::Entry;
++use vars qw($ldap $cookie $disconnected);
++my $cookie = '';
++my $disconnected = 1;
++
++require Exporter;
++
++our @ISA = qw(Exporter);
++
++our %EXPORT_TAGS = (
++ 'all' => [ qw(
++ &startup
++ &run
++ ) ]
++);
++
++our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
++
++our @EXPORT = qw(
++
++);
++
++our $VERSION = '0.1';
++
++# LDAP Content Synchronization Operation -- RFC 4533
++use constant LDAP_SYNC_OID => "1.3.6.1.4.1.4203.1.9.1";
++use constant {
++ LDAP_CONTROL_SYNC => LDAP_SYNC_OID.".1",
++ LDAP_CONTROL_SYNC_STATE => LDAP_SYNC_OID.".2",
++ LDAP_CONTROL_SYNC_DONE => LDAP_SYNC_OID.".3",
++ LDAP_SYNC_INFO => LDAP_SYNC_OID.".4",
++
++ LDAP_SYNC_NONE => 0x00,
++ LDAP_SYNC_REFRESH_ONLY => 0x01,
++ LDAP_SYNC_RESERVED => 0x02,
++ LDAP_SYNC_REFRESH_AND_PERSIST => 0x03,
++
++ LDAP_SYNC_REFRESH_PRESENTS => 0,
++ LDAP_SYNC_REFRESH_DELETES => 1,
++
++ LDAP_TAG_SYNC_NEW_COOKIE => 0x80,
++ LDAP_TAG_SYNC_REFRESH_DELETE => 0xa1,
++ LDAP_TAG_SYNC_REFRESH_PRESENT => 0xa2,
++ LDAP_TAG_SYNC_ID_SET => 0xa3,
++
++ LDAP_TAG_SYNC_COOKIE => 0x04,
++ LDAP_TAG_REFRESHDELETES => 0x01,
++ LDAP_TAG_REFRESHDONE => 0x01,
++ LDAP_TAG_RELOAD_HINT => 0x01,
++
++ LDAP_SYNC_PRESENT => 0,
++ LDAP_SYNC_ADD => 1,
++ LDAP_SYNC_MODIFY => 2,
++ LDAP_SYNC_DELETE => 3,
++};
++
++use Convert::ASN1;
++use Data::Dumper;
++
++my $asn = Convert::ASN1->new;
++
++$asn->prepare(<<'LDAP_ASN') or die $asn->error;
++syncUUID ::= OCTET STRING -- (SIZE(16))
++
++syncCookie ::= OCTET STRING
++
++syncRequestValue ::= SEQUENCE {
++ mode ENUMERATED {
++ -- 0 unused
++ refreshOnly (1),
++ -- 2 reserved
++ refreshAndPersist (3)
++ }
++ cookie syncCookie OPTIONAL,
++ reloadHint BOOLEAN -- DEFAULT FALSE
++}
++
++syncStateValue ::= SEQUENCE {
++ state ENUMERATED {
++ present (0),
++ add (1),
++ modify (2),
++ delete (3)
++ }
++ entryUUID syncUUID,
++ cookie syncCookie OPTIONAL
++}
++
++syncDoneValue ::= SEQUENCE {
++ cookie syncCookie OPTIONAL,
++ refreshDeletes BOOLEAN -- DEFAULT FALSE
++}
++
++syncInfoValue ::= CHOICE {
++ newcookie [0] syncCookie,
++ refreshDelete [1] SEQUENCE {
++ refreshDeleteCookie syncCookie OPTIONAL,
++ refreshDeleteDone BOOLEAN -- DEFAULT TRUE
++ }
++ refreshPresent [2] SEQUENCE {
++ refreshDeletecookie syncCookie OPTIONAL,
++ refreshDeleteDone BOOLEAN -- DEFAULT TRUE
++ }
++ syncIdSet [3] SEQUENCE {
++ cookie syncCookie OPTIONAL,
++ refreshDeletes BOOLEAN, -- DEFAULT FALSE
++ syncUUIDs SET OF syncUUID
++ }
++}
++
++LDAP_ASN
++
++
++sub startup { 1; }
++
++sub shutdown
++{
++ Kolab::log('SYNC', 'Shutting down');
++ exit(0);
++}
++
++sub abort
++{
++ Kolab::log('SYNC', 'Aborting');
++ exit(1);
++}
++
++sub run {
++ # This should be called from a separate thread, as we set our
++ # own interrupt handlers here
++
++ $SIG{'INT'} = \&shutdown;
++ $SIG{'TERM'} = \&shutdown;
++
++ END {
++ alarm 0;
++ Kolab::LDAP::destroy($ldap);
++ }
++ my $mesg;
++
++ while (1) {
++ Kolab::log('SYNC', 'Creating LDAP connection to LDAP server', KOLAB_DEBUG);
++
++ $ldap = Kolab::LDAP::create($Kolab::config{'user_ldap_ip'},
++ $Kolab::config{'user_ldap_port'},
++ $Kolab::config{'user_bind_dn'},
++ $Kolab::config{'user_bind_pw'},
++ 1
++ );
++ if (!$ldap) {
++ Kolab::log('SYNC', 'Sleeping 5 seconds...');
++ sleep 5;
++ next;
++ }
++ $disconnected = 0;
++
++ Kolab::log('SYNC', 'LDAP connection established', KOLAB_DEBUG);
++
++ Kolab::LDAP::ensureAsync($ldap);
++ Kolab::log('SYNC', 'Async checked', KOLAB_DEBUG);
++
++ Kolab::log('SYNC', "Cookie: $cookie", KOLAB_DEBUG);
++
++ while($ldap and not $disconnected) {
++ #sync control
++ my $asn_syncRequestValue = $asn->find('syncRequestValue');
++ my $ctrl = Net::LDAP::Control->new(
++ type => LDAP_CONTROL_SYNC,
++ value => $asn_syncRequestValue->encode(mode => LDAP_SYNC_REFRESH_ONLY,
++ cookie => $cookie,
++ reloadHint => 0),
++ critical => 0
++ );
++ Kolab::log('SYNC', 'Control created', KOLAB_DEBUG);
++
++ #search
++ my $mesg = $ldap->search(base => $Kolab::config{'base_dn'},
++ scope => 'sub',
++ control => [ $ctrl ],
++ callback => \&searchCallback, # call for each entry
++ filter => "(objectClass=*)",
++ attrs => [ '*',
++ $Kolab::config{'user_field_guid'},
++ $Kolab::config{'user_field_modified'},
++ $Kolab::config{'user_field_quota'},
++ $Kolab::config{'user_field_deleted'},
++ ],
++ );
++ Kolab::log('SYNC', 'Search created', KOLAB_DEBUG);
++ $mesg->sync;
++ Kolab::log('SYNC', "Finished Net::LDAP::Search::sync sleeping 30s", KOLAB_DEBUG);
++ sleep 30;
++ }
++ }
++ 1;
++}
++
++#search callback
++sub searchCallback {
++ my $mesg = shift;
++ my $entry = shift;
++ my $issearch = $mesg->isa("Net::LDAP::Search");
++ my @controls = $mesg->control;
++ if(not $issearch) {
++ Kolab::log('SYNC', 'mesg is not a search object, testing code...', KOLAB_DEBUG);
++ if ($mesg->code == 88) {
++ Kolab::log('SYNC', 'searchCallback() -> Exit code received, returning', KOLAB_DEBUG);
++ return;
++ } elsif ($mesg->code) {
++ Kolab::log('SYNC', "Not a search: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
++ &abort;
++ }
++ } elsif(@controls == 0) {
++ if ($mesg->code == 1) {
++ Kolab::log('SYNC', 'No control: Communications Error: disconnecting', KOLAB_DEBUG);
++ $disconnected = 1;
++ return;
++ } elsif ($mesg->code) {
++ Kolab::log('SYNC', "No control: mesg->code = `" . $mesg->code . "', mesg->msg = `" . $mesg->error . "'", KOLAB_DEBUG);
++ &abort;
++ }
++ } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_STATE) {
++ Kolab::log('SYNC', 'Received Sync State Control', KOLAB_DEBUG);
++ Kolab::log('SYNC', "Entry (".$entry->changetype."): ".$entry->dn(), KOLAB_DEBUG);
++ } elsif($controls[0]->type eq LDAP_CONTROL_SYNC_DONE) {
++ Kolab::log('SYNC', 'Received Sync Done Control', KOLAB_DEBUG);
++ my $asn_syncDoneValue = $asn->find('syncDoneValue');
++ my $out = $asn_syncDoneValue->decode($controls[0]->value);
++ #we have a new cookie
++ if(defined($out->{cookie}) and not $out->{cookie} eq '' and not $out->{cookie} eq $cookie) {
++ $cookie = $out->{cookie};
++ Kolab::log('SYNC', "New cookie: $cookie", KOLAB_DEBUG);
++ Kolab::log('SYNC', "Calling Kolab::LDAP::sync", KOLAB_DEBUG);
++ Kolab::LDAP::sync;
++ system($Kolab::config{'kolabconf_script'}) == 0 || Kolab::log('SD', "Failed to run kolabconf: $?", KOLAB_ERROR);
++ Kolab::log('SYNC', "Finished Kolab::LDAP::sync sleeping 1s", KOLAB_DEBUG);
++ sleep 1; # we get too many bogus change notifications!
++ }
++ } else {
++ Kolab::log('SYNC', 'Received unknown control: '.$controls[0]->type, KOLAB_DEBUG);
++ }
++ return 0;
++}
++
++1;
++__END__
++
++=head1 NAME
++
++Kolab::LDAP::Backend::sync - Perl extension for RFC 4533 compliant LDAP server backend
++
++=head1 ABSTRACT
++
++ Kolab::LDAP::Backend::sync handles OpenLDAP backend to the kolab daemon.
++
++=head1 AUTHOR
++
++Mathieu Parent <math.parent at gmail.com>
++
++=head1 COPYRIGHT AND LICENSE
++
++Copyright (c) 2008 Mathieu Parent <math.parent at gmail.com>
++
++
++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 version 2, or
++(at your option) any later version.
++
++This program is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++General Public License for more details.
++
++You can view the GNU General Public License, online, at the GNU
++Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
++
++=cut
Modified: libkolab-perl/trunk/debian/rules
===================================================================
--- libkolab-perl/trunk/debian/rules 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/rules 2008-07-14 14:12:26 UTC (rev 910)
@@ -2,10 +2,10 @@
include /usr/share/dpatch/dpatch.make
-config.status: configure patch-stamp
+config.status: patch-stamp
dh_testdir
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --with-dist=debian
-
+ perl Makefile.PL
+
build: build-stamp
build-stamp: config.status
dh_testdir
@@ -26,7 +26,6 @@
dh_clean -k
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/libkolab-perl
- rm -rf $(CURDIR)/debian/libkolab-perl/usr/share/doc/kolab/
binary-indep: build install
dh_testdir
Copied: libkolab-perl/trunk/debian/uupdate-wrapper (from rev 909, libkolab-perl/branches/2.2/debian/uupdate-wrapper)
===================================================================
--- libkolab-perl/trunk/debian/uupdate-wrapper (rev 0)
+++ libkolab-perl/trunk/debian/uupdate-wrapper 2008-07-14 14:12:26 UTC (rev 910)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+version=$2
+file=$3
+
+rpm2cpio $file | cpio -i --quiet 'perl-kolab-*.tar.gz'
Modified: libkolab-perl/trunk/debian/watch
===================================================================
--- libkolab-perl/trunk/debian/watch 2008-07-14 13:45:01 UTC (rev 909)
+++ libkolab-perl/trunk/debian/watch 2008-07-14 14:12:26 UTC (rev 910)
@@ -1,2 +1,6 @@
version=3
-ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/perl-kolab-([\d.-]+).src.rpm
+opts=dversionmangle=s/~rc/.rc/ \
+# original URL for stable releases:
+ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/perl-kolab-([\d.-]+).src.rpm debian debian/uupdate-wrapper
+# URL for development releases:
+#ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/perl-kolab-([\d\w.-]+).src.rpm debian debian/uupdate-wrapper
More information about the pkg-kolab-devel
mailing list