Branch: r14.0.x

e5876568 2019-02-21 08:09:49 Timothy Pearson
Fix missing SASL recommendations in LDAP client control modules on Debian and Ubuntu

(cherry picked from commit df2aa83e97ced01ff89ccb8e5682140ae66cb118)
M debian/lenny/applications/kcmldap/debian/control
M debian/lenny/applications/kcmldapmanager/debian/control
M debian/squeeze/applications/kcmldap/debian/control
M debian/squeeze/applications/kcmldapmanager/debian/control
M ubuntu/maverick/applications/kcmldap/debian/control
M ubuntu/maverick/applications/kcmldapmanager/debian/control

debian/lenny/applications/kcmldap/debian/control

diff --git a/debian/lenny/applications/kcmldap/debian/control b/debian/lenny/applications/kcmldap/debian/control
index a31efa0..058eab9 100644
--- a/debian/lenny/applications/kcmldap/debian/control
+++ b/debian/lenny/applications/kcmldap/debian/control
@@ -9,6 +9,7 @@
 Package: kcontrol-ldap-bonding-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
+Recommends: libsasl2-modules-gssapi-heimdal
 Description: Kerberos control module for the Trinity control center
  This is a Trinity control center module to manage TDE connections to Kerberos realms.
 

debian/lenny/applications/kcmldapmanager/debian/control

diff --git a/debian/lenny/applications/kcmldapmanager/debian/control b/debian/lenny/applications/kcmldapmanager/debian/control
index 5d87214..413c36d 100644
--- a/debian/lenny/applications/kcmldapmanager/debian/control
+++ b/debian/lenny/applications/kcmldapmanager/debian/control
@@ -8,6 +8,6 @@
 Package: kcontrol-ldap-manager-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients
-Recommends: tde-ldap-cert-updater
+Recommends: tde-ldap-cert-updater, libsasl2-modules-gssapi-heimdal
 Description: Kerberos realm management module for the Trinity control center
  This is a Trinity control center module to manage users, groups, and machines in Kerberos realms.

debian/squeeze/applications/kcmldap/debian/control

diff --git a/debian/squeeze/applications/kcmldap/debian/control b/debian/squeeze/applications/kcmldap/debian/control
index a31efa0..058eab9 100644
--- a/debian/squeeze/applications/kcmldap/debian/control
+++ b/debian/squeeze/applications/kcmldap/debian/control
@@ -9,6 +9,7 @@
 Package: kcontrol-ldap-bonding-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
+Recommends: libsasl2-modules-gssapi-heimdal
 Description: Kerberos control module for the Trinity control center
  This is a Trinity control center module to manage TDE connections to Kerberos realms.
 

debian/squeeze/applications/kcmldapmanager/debian/control

diff --git a/debian/squeeze/applications/kcmldapmanager/debian/control b/debian/squeeze/applications/kcmldapmanager/debian/control
index 5d87214..413c36d 100644
--- a/debian/squeeze/applications/kcmldapmanager/debian/control
+++ b/debian/squeeze/applications/kcmldapmanager/debian/control
@@ -8,6 +8,6 @@
 Package: kcontrol-ldap-manager-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients
-Recommends: tde-ldap-cert-updater
+Recommends: tde-ldap-cert-updater, libsasl2-modules-gssapi-heimdal
 Description: Kerberos realm management module for the Trinity control center
  This is a Trinity control center module to manage users, groups, and machines in Kerberos realms.

ubuntu/maverick/applications/kcmldap/debian/control

diff --git a/ubuntu/maverick/applications/kcmldap/debian/control b/ubuntu/maverick/applications/kcmldap/debian/control
index a31efa0..058eab9 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/control
+++ b/ubuntu/maverick/applications/kcmldap/debian/control
@@ -9,6 +9,7 @@
 Package: kcontrol-ldap-bonding-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
+Recommends: libsasl2-modules-gssapi-heimdal
 Description: Kerberos control module for the Trinity control center
  This is a Trinity control center module to manage TDE connections to Kerberos realms.
 

ubuntu/maverick/applications/kcmldapmanager/debian/control

diff --git a/ubuntu/maverick/applications/kcmldapmanager/debian/control b/ubuntu/maverick/applications/kcmldapmanager/debian/control
index 5d87214..413c36d 100644
--- a/ubuntu/maverick/applications/kcmldapmanager/debian/control
+++ b/ubuntu/maverick/applications/kcmldapmanager/debian/control
@@ -8,6 +8,6 @@
 Package: kcontrol-ldap-manager-trinity
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients
-Recommends: tde-ldap-cert-updater
+Recommends: tde-ldap-cert-updater, libsasl2-modules-gssapi-heimdal
 Description: Kerberos realm management module for the Trinity control center
  This is a Trinity control center module to manage users, groups, and machines in Kerberos realms.
4d7bd959 2019-02-21 08:09:55 Timothy Pearson
Add sudo to dependencies for LDAP bonding / controller packages

(cherry picked from commit 598dd003cf7926d87db817e29df47cbf195f936b)
M debian/squeeze/applications/kcmldap/debian/control
M debian/squeeze/applications/kcmldapcontroller/debian/control
M ubuntu/maverick/applications/kcmldap/debian/control
M ubuntu/maverick/applications/kcmldapcontroller/debian/control

debian/squeeze/applications/kcmldap/debian/control

diff --git a/debian/squeeze/applications/kcmldap/debian/control b/debian/squeeze/applications/kcmldap/debian/control
index 058eab9..1222645 100644
--- a/debian/squeeze/applications/kcmldap/debian/control
+++ b/debian/squeeze/applications/kcmldap/debian/control
@@ -8,7 +8,7 @@
 
 Package: kcontrol-ldap-bonding-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
+Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, sudo, tde-ldap-cert-updater
 Recommends: libsasl2-modules-gssapi-heimdal
 Description: Kerberos control module for the Trinity control center
  This is a Trinity control center module to manage TDE connections to Kerberos realms.

debian/squeeze/applications/kcmldapcontroller/debian/control

diff --git a/debian/squeeze/applications/kcmldapcontroller/debian/control b/debian/squeeze/applications/kcmldapcontroller/debian/control
index 3496d4a..c683333 100644
--- a/debian/squeeze/applications/kcmldapcontroller/debian/control
+++ b/debian/squeeze/applications/kcmldapcontroller/debian/control
@@ -7,7 +7,7 @@
 
 Package: kcontrol-ldap-controller-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
+Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp, sudo
 Conflicts: tde-ldap-cert-updater
 Description: Kerberos realm controller module for the Trinity control center
  This is a Trinity control center module to configure a Kerberos Realm Controller

ubuntu/maverick/applications/kcmldap/debian/control

diff --git a/ubuntu/maverick/applications/kcmldap/debian/control b/ubuntu/maverick/applications/kcmldap/debian/control
index 058eab9..1222645 100644
--- a/ubuntu/maverick/applications/kcmldap/debian/control
+++ b/ubuntu/maverick/applications/kcmldap/debian/control
@@ -8,7 +8,7 @@
 
 Package: kcontrol-ldap-bonding-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, tde-ldap-cert-updater
+Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, libpam-heimdal, libpam-ldap, libnss-ldap, libnss-db, nss-updatedb, nscd, libpam-ccreds, ntp, sudo, tde-ldap-cert-updater
 Recommends: libsasl2-modules-gssapi-heimdal
 Description: Kerberos control module for the Trinity control center
  This is a Trinity control center module to manage TDE connections to Kerberos realms.

ubuntu/maverick/applications/kcmldapcontroller/debian/control

diff --git a/ubuntu/maverick/applications/kcmldapcontroller/debian/control b/ubuntu/maverick/applications/kcmldapcontroller/debian/control
index 3496d4a..c683333 100644
--- a/ubuntu/maverick/applications/kcmldapcontroller/debian/control
+++ b/ubuntu/maverick/applications/kcmldapcontroller/debian/control
@@ -7,7 +7,7 @@
 
 Package: kcontrol-ldap-controller-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp
+Depends: ${shlibs:Depends}, ${misc:Depends}, heimdal-clients, heimdal-kdc, slapd, libsasl2-modules-gssapi-heimdal, sasl2-bin, openssl, libpam-ldap, libnss-ldap, nss-updatedb, libnss-db, nscd, ntp, sudo
 Conflicts: tde-ldap-cert-updater
 Description: Kerberos realm controller module for the Trinity control center
  This is a Trinity control center module to configure a Kerberos Realm Controller