[Da-tools-commits] ./da-tools/userdir-ldap-turmzimmer r386: Merge debian changes for .19
Marc 'HE' Brockschmidt
he at debian.org
Sat Apr 19 21:11:15 UTC 2008
------------------------------------------------------------
revno: 386
committer: Marc 'HE' Brockschmidt <he at debian.org>
branch nick: userdir-ldap-turmzimmer
timestamp: Sat 2008-04-19 23:11:15 +0200
message:
Merge debian changes for .19
added:
debian/postrm
modified:
debian/changelog
debian/postinst
debian/rules
ud-fingerserv
ud-generate
ud-replicate
------------------------------------------------------------
revno: 349.4.30
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Wed 2008-04-16 14:08:46 +0200
message:
Create /var/lib/misc/thishost as a symlink to the hostname in postinst
added:
debian/postrm
modified:
debian/changelog
debian/postinst
------------------------------------------------------------
revno: 349.4.31
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Wed 2008-04-16 14:09:51 +0200
message:
Sleep for a random time, up to two minutes, in ud-replicate when not called
interactively. This is to prevent DoSing the db server when many clients come
at the same time.
modified:
debian/changelog
ud-replicate
------------------------------------------------------------
revno: 349.4.32
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Wed 2008-04-16 16:20:46 +0200
message:
Use full hostname
modified:
debian/postinst
------------------------------------------------------------
revno: 349.4.33
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Wed 2008-04-16 16:20:53 +0200
message:
0.3.16
modified:
debian/changelog
------------------------------------------------------------
revno: 349.4.34
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Wed 2008-04-16 19:59:51 +0200
message:
Calling dh_installdeb before dh_pysupport was probably not the smartest move.
Reorder.
modified:
debian/changelog
debian/rules
------------------------------------------------------------
revno: 349.4.35
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-04-17 19:49:45 +0200
message:
Various ud-fingerserv fixes
modified:
debian/changelog
ud-fingerserv
------------------------------------------------------------
revno: 349.4.36
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Fri 2008-04-18 14:34:05 +0200
message:
New [KEYRING] flag to indicate the debian keyring should be synced to this host.
modified:
debian/changelog
ud-generate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-01-10 15:03:07 +0000
+++ b/debian/changelog 2008-04-18 12:34:05 +0000
@@ -1,4 +1,24 @@
-userdir-ldap (0.3.15+xxx) XXunstable; urgency=low
+userdir-ldap (0.3.19) unstable; urgency=low
+
+ * New [KEYRING] flag to indicate the debian keyring should be synced
+ to this host.
+
+ -- Peter Palfrader <weasel at debian.org> Fri, 18 Apr 2008 14:33:50 +0200
+
+userdir-ldap (0.3.18) unstable; urgency=low
+
+ * Various ud-fingerserv fixes.
+
+ -- Peter Palfrader <weasel at debian.org> Thu, 17 Apr 2008 19:48:11 +0200
+
+userdir-ldap (0.3.17) unstable; urgency=low
+
+ * Calling dh_installdeb before dh_pysupport was probably not the smartest
+ move. Reorder.
+
+ -- Peter Palfrader <weasel at debian.org> Wed, 16 Apr 2008 19:59:42 +0200
+
+userdir-ldap (0.3.16) unstable; urgency=low
[ Peter Palfrader ]
* Ship userdir-ldap.schema with the package, add a note that it is
@@ -12,6 +32,10 @@
* ud-roleadd: Do not try to make role accounts of objectClass
inetOrgPerson, that doesn't work.
* Add myself to uploaders.
+ * Create /var/lib/misc/thishost as a symlink to the hostname in postinst.
+ * Sleep for a random time, up to two minutes, in ud-replicate when not
+ called interactively. This is to prevent DoSing the db server when
+ many clients come at the same time.
[ Mark Hymers ]
* ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:
@@ -60,7 +84,7 @@
* Build manpages at build time (add Build-Depend on yodl)
* Install built manpages
- -- Stephen Gran <sgran at debian.org> Mon, 07 Jan 2008 01:50:15 +0000
+ -- Peter Palfrader <weasel at debian.org> Wed, 16 Apr 2008 14:10:12 +0200
userdir-ldap (0.3.15) unstable; urgency=low
=== modified file 'debian/postinst'
--- a/debian/postinst 2007-08-12 17:40:32 +0000
+++ b/debian/postinst 2008-04-16 14:20:46 +0000
@@ -4,5 +4,9 @@
if [ "$1" = "configure" ]
then
test ! -f /usr/local/bin/ud-replicate || rm -f /usr/local/bin/ud-replicate
+
+ if ! [ -e /var/lib/misc/thishost ]; then
+ ln -s "`hostname -f`" /var/lib/misc/thishost
+ fi
fi
exit 0
=== added file 'debian/postrm'
--- a/debian/postrm 1970-01-01 00:00:00 +0000
+++ b/debian/postrm 2008-04-16 12:08:46 +0000
@@ -0,0 +1,10 @@
+#! /bin/bash -e
+#
+#DEBHELPER#
+if [ "$1" = "purge" ]
+then
+ if [ -L /var/lib/misc/thishost ]; then
+ rm /var/lib/misc/thishost
+ fi
+fi
+exit 0
=== modified file 'debian/rules'
--- a/debian/rules 2008-01-07 02:03:12 +0000
+++ b/debian/rules 2008-04-16 17:59:51 +0000
@@ -27,8 +27,8 @@
dh_installman
dh_fixperms
dh_compress
+ dh_pysupport
dh_installdeb
- dh_pysupport
dh_gencontrol
dh_md5sums
dh_builddeb
=== modified file 'ud-fingerserv'
--- a/ud-fingerserv 2007-12-25 18:39:37 +0000
+++ b/ud-fingerserv 2008-04-17 17:49:45 +0000
@@ -43,9 +43,9 @@
&help if (defined($opts{h}));
my $logfh;
-unless ($opt{i} || $opt{f}) {
- die "Need logfile unless running foreground\n" unless (defined($opt{l}));
- open ($logfh, $opt{l}) or die "Can't open logfile: $!\n";
+unless ($opts{i} || $opts{f}) {
+ die "Need logfile unless running foreground\n" unless (defined($opts{l}));
+ open ($logfh, $opts{l}) or die "Can't open logfile: $!\n";
} else {
$logfh = \*STDOUT;
}
@@ -76,7 +76,7 @@
Listen => SOMAXCONN,
Reuse => 1);
- mydie "Cannot listen on finger port" unless $server;
+ mydie("Cannot listen on finger port") unless $server;
&log("[Server listening for connections]");
my ($pid, $client, $hostinfo);
@@ -84,7 +84,7 @@
while ($client = $server->accept()) {
&log("Forking to handle client request") if (defined($opts{v}));
next if $pid = fork; # parent
- mydie "fork: $!" unless defined $pid;
+ mydie("fork: $!") unless defined $pid;
# child
$client->autoflush(1);
=== modified file 'ud-generate'
--- a/ud-generate 2008-04-08 22:02:09 +0000
+++ b/ud-generate 2008-04-19 21:11:15 +0000
@@ -21,7 +21,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha
+import string, re, time, ldap, getopt, sys, os, pwd, posix, socket, base64, sha, shutil
from userdir_ldap import *;
global Allowed;
@@ -35,6 +35,8 @@
EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
DNSZone = ".debian.net"
+Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg",
+ "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ]
def Sanitize(Str):
return Str.translate(string.maketrans("\n\r\t","$$$"))
@@ -755,6 +757,10 @@
raise;
Done(File,F,None);
+def GenKeyrings(l,OutDir):
+ for k in Keyrings:
+ shutil.copy(k, OutDir)
+
# Connect to the ldap server
l = ldap.open(LDAPServer);
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
@@ -808,10 +814,11 @@
GenMailList(l,GlobalDir+"mail-rbl","mailRBL");
GenMailList(l,GlobalDir+"mail-rhsbl","mailRHSBL");
GenMailList(l,GlobalDir+"mail-whitelist","mailWhitelist");
+GenKeyrings(l,GlobalDir);
# Compatibility.
GenForward(l,GlobalDir+"forward-alias");
-
+
while(1):
Line = F.readline();
if Line == "":
@@ -884,3 +891,11 @@
if ExtraList.has_key("[PRIVATE]"):
DoLink(GlobalDir,OutDir,"debian-private")
+
+ if ExtraList.has_key("[KEYRING]"):
+ for k in Keyrings:
+ DoLink(GlobalDir,OutDir,os.path.basename(k))
+ else:
+ for k in Keyrings:
+ try: posix.remove(OutDir+os.path.basename(k));
+ except: pass;
=== modified file 'ud-replicate'
--- a/ud-replicate 2008-01-10 14:43:33 +0000
+++ b/ud-replicate 2008-04-16 12:09:51 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
# Copyright (c) 1999-2001 Jason Gunthorpe <jgg at debian.org>
# Copyright (c) 2002-2003,2006 Ryan Murray <rmurray at debian.org>
@@ -24,6 +24,7 @@
if [ -z "$TERM" -o "$TERM" = "dumb" ]
then
exec > /dev/null 2>&1
+ sleep $(( $RANDOM % 120 ))
else
verbose=-v
fi
More information about the Da-tools-commits
mailing list