[Python-modules-commits] r6702 - in packages/python-ad/trunk (14 files)
mbaldessari-guest at users.alioth.debian.org
mbaldessari-guest at users.alioth.debian.org
Thu Oct 16 18:59:46 UTC 2008
Date: Thursday, October 16, 2008 @ 18:59:45
Author: mbaldessari-guest
Revision: 6702
[svn-inject] Applying Debian modifications to trunk
Added:
packages/python-ad/trunk/debian/
packages/python-ad/trunk/debian/README.source
packages/python-ad/trunk/debian/changelog
packages/python-ad/trunk/debian/compat
packages/python-ad/trunk/debian/control
packages/python-ad/trunk/debian/copyright
packages/python-ad/trunk/debian/docs
packages/python-ad/trunk/debian/examples
packages/python-ad/trunk/debian/patches/
packages/python-ad/trunk/debian/patches/00list
packages/python-ad/trunk/debian/patches/01_two_dc_one_site.dpatch
packages/python-ad/trunk/debian/pycompat
packages/python-ad/trunk/debian/rules
packages/python-ad/trunk/debian/watch
Property changes on: packages/python-ad/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/python-ad/trunk/debian/README.source
===================================================================
--- packages/python-ad/trunk/debian/README.source (rev 0)
+++ packages/python-ad/trunk/debian/README.source 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,9 @@
+This package is using dpatch patch system.
+
+To patch the source:
+ * debian/rules patch
+To add a new patch:
+ * put it under debian/patches
+ * add it to debian/patches/00list
+
+See /usr/share/doc/dpatch/README.source.gz for more information.
Added: packages/python-ad/trunk/debian/changelog
===================================================================
--- packages/python-ad/trunk/debian/changelog (rev 0)
+++ packages/python-ad/trunk/debian/changelog 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,22 @@
+python-ad (0.8-3) unstable; urgency=low
+
+ * Move tutorial .py files under doc/examples/
+ * Fix watch file
+ * Remove pyversions
+ * Added Vcs-Browser and Vcs-Hg control fields
+
+ -- Michele Baldessari <michele at pupazzo.org> Tue, 14 Oct 2008 22:30:52 +0200
+
+python-ad (0.8-2) UNRELEASED; urgency=low
+
+ * Added missing libkrb5-dev to the build-deps
+ * Added missing xsltproc to the build-deps
+
+ -- Michele Baldessari <michele at pupazzo.org> Tue, 14 Oct 2008 22:14:15 +0200
+
+python-ad (0.8-1) UNRELEASED; urgency=low
+
+ * Initial release (Closes: #498081)
+
+ -- Michele Baldessari <michele at pupazzo.org> Sun, 06 Jul 2008 11:13:45 +0200
+
Added: packages/python-ad/trunk/debian/compat
===================================================================
--- packages/python-ad/trunk/debian/compat (rev 0)
+++ packages/python-ad/trunk/debian/compat 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1 @@
+7
Added: packages/python-ad/trunk/debian/control
===================================================================
--- packages/python-ad/trunk/debian/control (rev 0)
+++ packages/python-ad/trunk/debian/control 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,23 @@
+Source: python-ad
+Section: python
+Priority: extra
+Maintainer: Michele Baldessari <michele at pupazzo.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7), python-support (>= 0.5.3), python-all-dev (>= 2.3.5-11), libldap2-dev, libsasl2-dev, cdbs, docbook-xsl, dpatch, libkrb5-dev, xsltproc
+Standards-Version: 3.8.0
+Homepage: http://www.boskant.nl/trac/python-ad
+Vcs-Browser: http://www.boskant.nl/trac/python-ad/browser
+Vcs-Hg: http://www.boskant.nl/hg/python-ad
+
+Package: python-ad
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-ldap, python-dnspython, python-ply, libsasl2-modules-gssapi-mit
+Description: Active Directory interface module for python
+ This Python module allows the manipulation of objects in Microsoft's
+ Active Directory.
+ .
+ It supports: auto-discovery of domain controllers, simple handling of
+ Kerberos credentials, transparent multi-domain functionality,
+ paged results according to RFC2696, incremental retrieval of
+ multi-valued attributes, serverless binding, server specific binding
+ and querying the global catalog.
Added: packages/python-ad/trunk/debian/copyright
===================================================================
--- packages/python-ad/trunk/debian/copyright (rev 0)
+++ packages/python-ad/trunk/debian/copyright 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,35 @@
+This package was debianized by Michele Baldessari <Michele Baldessari <michele at pupazzo.org>> on
+Sun, 06 Jul 2008 11:13:45 +0200.
+
+It was downloaded from http://www.boskant.nl/trac/python-ad
+
+Upstream Author:
+
+ Geert Jansen <geert at boskant.nl>
+
+Copyright:
+
+ Copyright (c) 2007 the Python-AD authors.
+
+License:
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+The Debian packaging is (C) 2008, Michele Baldessari <michele at pupazzo.org> and
+is licensed under this same MIT license.
Added: packages/python-ad/trunk/debian/docs
===================================================================
--- packages/python-ad/trunk/debian/docs (rev 0)
+++ packages/python-ad/trunk/debian/docs 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,2 @@
+README
+doc/out/*
Added: packages/python-ad/trunk/debian/examples
===================================================================
--- packages/python-ad/trunk/debian/examples (rev 0)
+++ packages/python-ad/trunk/debian/examples 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1 @@
+tut/*.py
Added: packages/python-ad/trunk/debian/patches/00list
===================================================================
--- packages/python-ad/trunk/debian/patches/00list (rev 0)
+++ packages/python-ad/trunk/debian/patches/00list 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1 @@
+01_two_dc_one_site
Added: packages/python-ad/trunk/debian/patches/01_two_dc_one_site.dpatch
===================================================================
--- packages/python-ad/trunk/debian/patches/01_two_dc_one_site.dpatch (rev 0)
+++ packages/python-ad/trunk/debian/patches/01_two_dc_one_site.dpatch 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,84 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_two_dc_one_site.dpatch by <Michele Baldessari <michele at pupazzo.org>>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: =Find the DC even when there are two Domain Controllers in one site
+
+ at DPATCH@
+diff -urNad python-ad-0.8~/lib/ad/core/locate.py python-ad-0.8/lib/ad/core/locate.py
+--- python-ad-0.8~/lib/ad/core/locate.py 2007-12-04 21:44:25.000000000 +0100
++++ python-ad-0.8/lib/ad/core/locate.py 2008-08-31 20:33:29.000000000 +0200
+@@ -239,8 +239,8 @@
+ role `role'.
+ """
+ self.m_logger.debug('Checking controller %s for domain %s role %s' %
+- (reply.orig_hostname, reply.orig_domain, role))
+- answer = self._dns_query(reply.orig_hostname, 'A')
++ (reply.q_hostname, reply.q_domain, role))
++ answer = self._dns_query(reply.q_hostname, 'A')
+ if len(answer) != 1:
+ self.m_logger.error('Forward DNS returned %d entries (need 1)' %
+ len(anser))
+@@ -266,7 +266,7 @@
+ role == 'dc' and not (reply.flags & netlogon.SERVER_LDAP):
+ self.m_logger.error('Role does not match')
+ return False
+- if reply.orig_domain.lower() != reply.domain.lower():
++ if reply.q_domain.lower() != reply.domain.lower():
+ self.m_logger.error('Domain does not match')
+ return False
+ self.m_logger.debug('Controller is OK')
+@@ -307,9 +307,15 @@
+ local.append(reply)
+ else:
+ remote.append(reply)
+- local.sort(lambda x,y: candidates.index((x.orig_hostname, x.port) -
+- candidates.index(y.orig_hostname, y.port)))
+- remote.sort(lambda x,y: cmp(x.timing, y.timing))
++ local.sort(lambda x,y: cmp(candidates.index((x.q_hostname, x.q_port)),
++ candidates.index((y.q_hostname, y.q_port))))
++ remote.sort(lambda x,y: cmp(x.q_timing, y.q_timing))
++ self.m_logger.debug('Local DCs: %s' % ', '.join(['%s:%s' %
++ (x.q_hostname, x.q_port) for x in local]))
++ self.m_logger.debug('Remote DCs: %s' % ', '.join(['%s:%s' %
++ (x.q_hostname, x.q_port) for x in remote]))
+ result = local + remote
+ result = result[:maxservers]
++ self.m_logger.debug('Selected DCs: %s' % ', '.join(['%s:%s' %
++ (x.q_hostname, x.q_port) for x in result]))
+ return result
+diff -urNad python-ad-0.8~/lib/ad/protocol/netlogon.py python-ad-0.8/lib/ad/protocol/netlogon.py
+--- python-ad-0.8~/lib/ad/protocol/netlogon.py 2007-12-02 22:42:53.000000000 +0100
++++ python-ad-0.8/lib/ad/protocol/netlogon.py 2008-08-31 20:33:29.000000000 +0200
+@@ -285,11 +285,13 @@
+ continue
+ if not reply:
+ continue
+- reply.orig_hostname = hostname
+- reply.orig_domain = domain
+- reply.address = addr
++ reply.q_hostname = hostname
++ reply.q_port = port
++ reply.q_domain = domain
++ reply.q_msgid = msgid
++ reply.q_address = addr
+ timing = time.time() - begin
+- reply.timing = timing
++ reply.q_timing = timing
+ replies.append(reply)
+ return replies
+
+diff -urNad python-ad-0.8~/lib/ad/protocol/test/test_netlogon.py python-ad-0.8/lib/ad/protocol/test/test_netlogon.py
+--- python-ad-0.8~/lib/ad/protocol/test/test_netlogon.py 2007-12-02 17:19:25.000000000 +0100
++++ python-ad-0.8/lib/ad/protocol/test/test_netlogon.py 2008-08-31 20:33:29.000000000 +0200
+@@ -229,7 +229,9 @@
+ assert len(res.netbios_hostname) > 0
+ assert len(res.client_site) > 0
+ assert len(res.server_site) > 0
+- assert res.timing >= 0.0
++ assert (res.q_hostname, res.q_port) in addrs
++ assert res.q_domain.lower() == domain.lower()
++ assert res.q_timing >= 0.0
+
+ def test_network_failure(self):
+ self.require(ad_user=True, local_admin=True, firewall=True)
Property changes on: packages/python-ad/trunk/debian/patches/01_two_dc_one_site.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/python-ad/trunk/debian/pycompat
===================================================================
--- packages/python-ad/trunk/debian/pycompat (rev 0)
+++ packages/python-ad/trunk/debian/pycompat 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1 @@
+2
Added: packages/python-ad/trunk/debian/rules
===================================================================
--- packages/python-ad/trunk/debian/rules (rev 0)
+++ packages/python-ad/trunk/debian/rules 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM := pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+# Don't compress .py files
+#DEB_COMPRESS_EXCLUDE := .py .txt .cfg
+
+# If your package provides eggs, install egg-info directories instead of real eggs
+#DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+
+build/python-ad::
+ make -C doc STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl
+
+clean::
+ @rm -rf build doc/out
Property changes on: packages/python-ad/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/python-ad/trunk/debian/watch
===================================================================
--- packages/python-ad/trunk/debian/watch (rev 0)
+++ packages/python-ad/trunk/debian/watch 2008-10-16 18:59:45 UTC (rev 6702)
@@ -0,0 +1,2 @@
+version=2
+http://www.boskant.nl/trac/python-ad/wiki/PythonAdDownload http://www.boskant.nl/python-ad/python-ad-(\d+.\d+).tar.gz
More information about the Python-modules-commits
mailing list