Branch 'pykolab-0.4' - 8 commits - configure.ac pykolab/auth pykolab/setup pykolab.spec.in wallace/wallace.systemd

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri May 18 16:13:13 CEST 2012


 configure.ac                  |    4 ++--
 pykolab.spec.in               |    6 +++---
 pykolab/auth/ldap/__init__.py |    3 ++-
 pykolab/setup/setup_imap.py   |    1 +
 wallace/wallace.systemd       |    2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit eda6b87c1a8e1db5ee92fc2dfc73f04d7998f635
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 12:49:09 2012 +0100

    Bump release

diff --git a/configure.ac b/configure.ac
index 92b8eb3..648799a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.4.7)
-AC_SUBST([RELEASE], 2)
+AC_SUBST([RELEASE], 3)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit 8a6db5ecb5d6829fa2a17f44f28b0cd9278843e7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 12:48:30 2012 +0100

    Correct the permissions on /var/lib/kolab and /var/log/kolab

diff --git a/pykolab.spec.in b/pykolab.spec.in
index 90caa45..0e7dce7 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -268,8 +268,8 @@ rm -rf %{buildroot}
 %exclude %{python_sitelib}/pykolab/tests/
 %{python_sitelib}/kolab/
 %{python_sitelib}/cyruslib.py*
-%dir %{_localstatedir}/lib/kolab/
-%dir %{_localstatedir}/log/kolab/
+%attr(0775,kolab,kolab-n) %dir %{_localstatedir}/lib/kolab/
+%attr(0775,kolab,kolab-n) %dir %{_localstatedir}/log/kolab/
 
 %files telemetry
 %defattr(-,root,root,-)


commit 3c140f4edc1ba2c91a1e504e6289c7a4a6f4d132
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 12:46:34 2012 +0100

    Bump release

diff --git a/configure.ac b/configure.ac
index e22368d..92b8eb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.4.7)
-AC_SUBST([RELEASE], 1)
+AC_SUBST([RELEASE], 2)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit 481473734ed1915e787cf8bfccd4a5fc454eabdc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 12:43:54 2012 +0100

    Prevent attempting to modify an entry with an empty modlist (#786)

diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 7cdb018..d98dfa9 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -676,7 +676,8 @@ class LDAP(pykolab.base.Base):
                 modlist.append((ldap.MOD_ADD, attribute, attrs[attribute]))
 
         dn = entry_dn
-        self.ldap.modify_s(dn, modlist)
+        if len(modlist) > 0:
+            self.ldap.modify_s(dn, modlist)
 
     def synchronize(self):
         """


commit 64af1446121402cb2eeed871c97c4e39dd3ae3ce
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 10:56:51 2012 +0100

    Release 0.4.7

diff --git a/configure.ac b/configure.ac
index 8acca10..e22368d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([pykolab], 0.4.6)
-AC_SUBST([RELEASE], 2)
+AC_INIT([pykolab], 0.4.7)
+AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit 61542c48a821179b12a9fb159e370dd5b3782a6c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 10:50:06 2012 +0100

    Set shared to be the postuser

diff --git a/pykolab/setup/setup_imap.py b/pykolab/setup/setup_imap.py
index de927f3..750e43d 100644
--- a/pykolab/setup/setup_imap.py
+++ b/pykolab/setup/setup_imap.py
@@ -62,6 +62,7 @@ def execute(*args, **kw):
             "ldap_member_method": "attribute",
             "ldap_member_attribute": "nsrole",
             "admins": conf.get('cyrus-imap', 'admin_login'),
+            "postuser": "shared",
         }
 
     template_file = None


commit 740840eca0c8712f7637418bafd794e03164b8e1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 10:50:53 2012 +0100

    Correct command name

diff --git a/wallace/wallace.systemd b/wallace/wallace.systemd
index 73c16d7..814f4c5 100644
--- a/wallace/wallace.systemd
+++ b/wallace/wallace.systemd
@@ -6,7 +6,7 @@ After=syslog.target network.target
 Type=forking
 PIDFile=/var/run/wallaced/wallaced.pid
 EnvironmentFile=/etc/sysconfig/wallace
-ExecStart=/usr/sbin/wallace $FLAGS
+ExecStart=/usr/sbin/wallaced $FLAGS
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStop=/bin/kill -TERM $MAINPID
 


commit ffa0a275e2f0591854d98aa55ae82d53291b3f79
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri May 18 10:29:12 2012 +0100

    Set the permissions on /var/run/kolabd/ to the kolab user

diff --git a/pykolab.spec.in b/pykolab.spec.in
index 7f2c5a9..90caa45 100644
--- a/pykolab.spec.in
+++ b/pykolab.spec.in
@@ -321,7 +321,7 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/sysconfig/kolabd
 %{_sbindir}/kolabd
 %{python_sitelib}/kolabd/
-%dir %{_localstatedir}/run/kolabd
+%attr(0770,kolab,kolab) %dir %{_localstatedir}/run/kolabd
 
 %files -n postfix-kolab
 %defattr(-,root,root,-)





More information about the commits mailing list