Request 237 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 237 (accepted)

Updates to Debian packaging for UCS

Created by vanmeeuwen almost 11 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit package home:vanmeeuwen:...lab:Development / chwala to package Kolab:Development / chwala

chwala.dsc Changed

debian.changelog Changed

debian.tar.gz/postinst Changed

Build Results
RPM Lint

Refresh

Submit package home:vanmeeuwen:...olab:Development / iRony to package Kolab:Development / iRony

debian.changelog Changed

debian.tar.gz/postinst Changed

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Submit package home:vanmee...Development / kolab-syncroton to package Kolab:Development / kolab-syncroton

debian.changelog Changed

debian.tar.gz/dirs Changed

debian.tar.gz/install Changed

debian.tar.gz/links Changed

debian.tar.gz/postinst Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Submit package home:vanmeeuwen...lab:Development / pykolab to package Kolab:Development / pykolab

pykolab.spec Changed

debian.changelog Changed

debian.control Changed

@@ -31,23 +31,27 @@
 
 Package: pykolab
 Architecture: all
-Depends: ${shlibs:Depends},
-          ${misc:Depends},
-          python,
-          python-ldap,
-          python-pyasn1,
-          python-pyasn1-modules,
-          python-sqlalchemy,
-          adduser (>= 3.11),
-          python-icalendar,
-          python-mysqldb,
-          libpython2.7 | libpython2.6
+Depends:    adduser (>= 3.11),
+            libpython2.7 | libpython2.6,
+            python,
+            python-icalendar,
+            python-mysqldb,
+            python-ldap,
+            python-pyasn1,
+            python-pyasn1-modules,
+            python-sqlalchemy,
+            ${misc:Depends},
+            ${shlibs:Depends}
 Description: Kolab Groupware daemon and utilities                                                                                          
  Python implementation of the Kolab Groupware server
 
 Package: kolab-cli
 Architecture: all
-Depends: pykolab (= ${binary:Version}), python, ${misc:Depends}, python-augeas, python-cheetah
+Depends:    pykolab (= ${binary:Version}),
+            python,
+            python-augeas,
+            python-cheetah,
+            ${misc:Depends}
 Description: Command-line utilities for Kolab
  This package includes command-line utilities for Kolab Groupware
 
@@ -60,7 +64,11 @@
 
 Package: kolab-saslauthd
 Architecture: all
-Depends: pykolab (= ${binary:Version}), python, ${misc:Depends}, sasl2-bin, lsb-base (>= 3.0-6)
+Depends:    lsb-base (>= 3.0-6),
+            pykolab (= ${binary:Version}),
+            python,
+            sasl2-bin,
+            ${misc:Depends}
 Description: SASL Authentication Daemon for Kolab
  A multi-domain capable Kolab SASL Authentication daemon.

debian.rules Changed

debian.tar.gz/kolab-saslauthd.postinst Added

debian.tar.gz/patches/master.cf.tpl.patch Deleted

@@ -1,25 +0,0 @@
---- pykolab-orig/share/templates/master.cf.tpl	2013-11-13 19:58:16.000000000 +0100
-+++ pykolab/share/templates/master.cf.tpl	2013-11-13 19:59:49.000000000 +0100
-@@ -105,17 +105,17 @@
-     -o smtpd_authorized_xforward_hosts=127.0.0.0/8
- 
- recipient_policy    unix        -       n       n       -       -       spawn
--    user=kolab-n argv=/usr/libexec/postfix/kolab_smtp_access_policy --verify-recipient
-+    user=kolab-n argv=/usr/lib/postfix/kolab_smtp_access_policy --verify-recipient
- 
- recipient_policy_incoming unix  -       n       n       -       -       spawn
--    user=kolab-n argv=/usr/libexec/postfix/kolab_smtp_access_policy --verify-recipient --allow-unauthenticated
-+    user=kolab-n argv=/usr/lib/postfix/kolab_smtp_access_policy --verify-recipient --allow-unauthenticated
- 
- sender_policy       unix        -       n       n       -       -       spawn
--    user=kolab-n argv=/usr/libexec/postfix/kolab_smtp_access_policy --verify-sender
-+    user=kolab-n argv=/usr/lib/postfix/kolab_smtp_access_policy --verify-sender
- 
- sender_policy_incoming unix     -       n       n       -       -       spawn
--    user=kolab-n argv=/usr/libexec/postfix/kolab_smtp_access_policy --verify-sender --allow-unauthenticated
-+    user=kolab-n argv=/usr/lib/postfix/kolab_smtp_access_policy --verify-sender --allow-unauthenticated
- 
- submission_policy   unix        -       n       n       -       -       spawn
--    user=kolab-n argv=/usr/libexec/postfix/kolab_smtp_access_policy --verify-sender --verify-recipient
-+    user=kolab-n argv=/usr/lib/postfix/kolab_smtp_access_policy --verify-sender --verify-recipient
-

debian.tar.gz/patches/remove-syncroton-setup.patch Deleted

debian.tar.gz/patches/series Changed

pykolab-0.6.8.tar.gz -> pykolab-0.6.9.tar.gz Changed

pykolab.dsc Changed

Build Results
RPM Lint

Refresh

Submit package home:vanmeeu...:Development / roundcubemail to package Kolab:Development / roundcubemail

debian.changelog Changed

debian.tar.gz/postinst Changed

@@ -5,17 +5,37 @@
 
 set -e
 
-fix_permissions() {
-	chown -R www-data:adm /var/log/roundcubemail
-	chown -R www-data:adm /var/lib/roundcubemail
+fixperms() {
+    chown -R www-data:adm \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
+    chmod 750 \
+        /var/lib/roundcubemail \
+        /var/log/roundcubemail
 	chown -R root:www-data /etc/roundcubemail
 	find /etc/roundcubemail -type d -exec chmod u+rwx,g+rx,g-w,o-rwx {} \;
 	find /etc/roundcubemail -type f -exec chmod u+rw,u-x,g+r,g-wx,o-rwx {} \;
 }
 
-fix_permissions
+reload_apache()
+{
+    if apache2ctl configtest 2>/dev/null; then
+        invoke-rc.d apache2 $1 || true
+    else
+        echo "Your apache2 configuration is broken, so we're not restarting it for you."
+    fi
+}
+
+
+case "$1" in
+    configure)
+        fixperms
+        if [ -e "/etc/apache2/sites-available/roundcubemail" -a ! -e "/etc/apache2/sites-enabled/roundcubemail" ]; then
+            a2ensite roundcubemail
+            reload_apache reload
+        fi
+    ;;
+esac
+
+exit 0
 
-if [ "$1" = "configure" ]; then
-    # Enable the site
-    a2ensite roundcubemail
-fi

roundcubemail.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 237 0

Request History

vanmeeuwen created request almost 11 years ago

Updates to Debian packaging for UCS

vanmeeuwen accepted request almost 11 years ago

Please add a comment

vanmeeuwen accepted request almost 11 years ago

Please add a comment