[28650] in Source-Commits
ldap-config commit: Remove MIT CA configuration
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sat Jun 25 22:23:48 2016
Date: Sat, 25 Jun 2016 22:23:42 -0400
From: Anders Kaseorg <andersk@mit.edu>
Message-Id: <201606260223.u5Q2Ngfm010684@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/ldap-config/commit/5296e5b0d646b7ef493551c092bf8d23c50bd40f
commit 5296e5b0d646b7ef493551c092bf8d23c50bd40f
Author: Anders Kaseorg <andersk@mit.edu>
Date: Thu Jun 23 03:56:38 2016 -0400
Remove MIT CA configuration
debian/changelog | 7 +++++++
debian/control | 2 +-
debian/transform_ldap.conf.debathena | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 779805f..f750f01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debathena-ldap-config (1.10) unstable; urgency=medium
+
+ * Remove MIT CA configuration. (As it turns out, it was being
+ overridden by a later TLS_CACERT line in the upstream file anyway.)
+
+ -- Anders Kaseorg <andersk@mit.edu> Sat, 25 Jun 2016 22:14:48 -0400
+
debathena-ldap-config (1.9) unstable; urgency=low
[ Jonathan Reed ]
diff --git a/debian/control b/debian/control
index 86943f8..da624b2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.3
Package: debathena-ldap-config
Architecture: all
-Depends: debathena-ssl-certificates, libsasl2-modules-gssapi-mit | libsasl2-gssapi-mit, ${misc:Depends}
+Depends: libsasl2-modules-gssapi-mit | libsasl2-gssapi-mit, ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: LDAP configuration for Debathena
diff --git a/debian/transform_ldap.conf.debathena b/debian/transform_ldap.conf.debathena
index 3290d05..9230000 100755
--- a/debian/transform_ldap.conf.debathena
+++ b/debian/transform_ldap.conf.debathena
@@ -1,3 +1,3 @@
#!/usr/bin/perl -0p
s/^#BASE.*$/BASE\tdc=mit, dc=edu/m or die;
-s/^#URI.*$/URI\tldap:\/\/ldap-too.mit.edu\nTLS_CACERT\t\/usr\/share\/ca-certificates\/mit.edu\/mitCA.crt/m or die;
+s/^#URI.*$/URI\tldap:\/\/ldap-too.mit.edu/m or die;
