Debian 9 support

java/sync/debian/control

@@ -20,7 +20,7 @@ Description: synchronization application for Open Business Management
 
 Package: obm-locator
 Architecture: all
-Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version}), openssl
+Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version}), openssl, insserv
 Description: Locator for Open Business Management
  This package is a J2E web service, which allows can be queried to retrieve
  the location of an OBM component.
@@ -32,7 +32,7 @@ Description: Locator for Open Business Management
 
 Package: obm-provisioning
 Architecture: all
-Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version})
+Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version})
 Description: Provisioning API for Open Business Management
  This package is an HTTP web service, which can be queried to provision an OBM
  server.
@@ -68,7 +68,7 @@ Description: Tomcat common libs for Open Business Management
 
 Package: obm-imap-archive
 Architecture: all
-Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version})
+Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version})
 Description: OBM component that perform email archiving
  obm-imap-archive is a http server exposing webservices to perform email archiving.
  .

java/sync/debian/obm-imap-archive.init

@@ -43,7 +43,14 @@ if [ -z "$APP_PORT" ]; then
 	APP_PORT=8085
 fi
 if [ -z "$JAVA_HOME" ]; then
-	JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 
 if [ ! -d "$TMP_DIR" ]; then

java/sync/debian/obm-provisioning.init

@@ -55,7 +55,14 @@ if [ -z "$JAVA_HOME" ]; then
     }
 fi
 if [ -z "$JAVA_HOME" ]; then
-    JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 
 # Timeout in seconds for the shutdown of all webapps

java/sync/obm-locator/obm-locator.debian.sh

@@ -56,7 +56,14 @@ if [ -z "$JAVA_HOME" ]; then
     }
 fi
 if [ -z "$JAVA_HOME" ]; then
-    JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 
 # Timeout in seconds for the shutdown of all webapps

java/tomcat/debian/control

@@ -10,7 +10,7 @@ Homepage: http://www.obm.org
 
 Package: obm-tomcat
 Architecture: all
-Depends: openjdk-7-jre-headless, libapr1, ${misc:Depends}
+Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, libapr1, ${misc:Depends}
 Description: the Tomcat web application server for Open Business Management
  This package contains the 6.0.20 version of the Apache Tomcat application
  server for OBM.

java/tomcat/debian/obm-tomcat.init

@@ -34,9 +34,15 @@ fi
 if [ -r /etc/default/rcS ]; then
         . /etc/default/rcS
 fi
-
 if [ -z "$JAVA_HOME" ]; then
-	JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+	test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture`
+    }
+fi
+if [ -z "$JAVA_HOME" ]; then
+	test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && {
+        JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture`
+    }
 fi
 if [ -z "$SHUTDOWN_TIMEOUT" ]; then
 	SHUTDOWN_TIMEOUT=10

satellite/debian/control

@@ -22,7 +22,7 @@ Description: integration of OBM with Cyrus and Postfix
 Package: libobmsatellite-perl
 Section: perl
 Architecture: all
-Depends: libnet-server-perl, libnet-ldap-perl, libunicode-maputf8-perl, libio-socket-ssl-perl, libclass-singleton-perl, libxml-simple-perl, liblog-log4perl-perl, libmime-lite-perl, libmailtools-perl, libmime-types-perl, ${perl:Depends}, ${misc:Depends}
+Depends: libnet-server-perl, libnet-ldap-perl, libunicode-maputf8-perl, libio-socket-ssl-perl, libclass-singleton-perl, libxml-simple-perl, liblog-log4perl-perl, libmime-lite-perl, libmailtools-perl, libmime-types-perl, libhttp-daemon-perl, ${perl:Depends}, ${misc:Depends}
 Description: library for the integration of OBM with Cyrus and Postfix
  This package contains the library used by obm-satellite to interact with Cyrus
  and Postfix.

ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm

@@ -132,7 +132,13 @@ sub get {
     # Add authentication headers
     $request->authorization_basic( $self->{'obmSatelliteLogin'}, $self->{'obmSatellitePassword'} );
 
-    my $ua = LWP::UserAgent->new();
+	my $ua = LWP::UserAgent->new(
+        ssl_opts => {
+           verify_hostname => 0,
+           SSL_verify_mode => 0
+        }
+    );
+
     if( !$ua ) {
         $self->_log( 'erreur à l\'initialisation du navigateur LWP::UserAgent', 0 );
         return 1;
@@ -177,7 +183,12 @@ sub post {
     # Add authentication headers
     $request->authorization_basic( $self->{'obmSatelliteLogin'}, $self->{'obmSatellitePassword'} );
 
-    my $ua = LWP::UserAgent->new();
+	my $ua = LWP::UserAgent->new(
+        ssl_opts => {
+           verify_hostname => 0,
+           SSL_verify_mode => 0
+        }
+    );
     if( !$ua ) {
         $self->_log( 'erreur à l\'initialisation du navigateur LWP::UserAgent', 0 );
         return 1;

ui/conf/hooks/user/mailchooser.inc.sample

@@ -1,4 +1,3 @@
-<script language="php"></script>
 <?php
 /******************************************************************************
 Copyright (C) 2011-2014 Linagora

ui/conf/obm_conf.inc.sample

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 /******************************************************************************
 Copyright (C) 2011-2014 Linagora
 
@@ -353,4 +353,4 @@ $backup_desactived_mail = false;
 // New Top Bar OBM 3.0
 $conf_obm3_topbar = true;
 
-</script>
+?>

ui/conf/webmail.inc.php.sample

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 /******************************************************************************
 Copyright (C) 2011-2012 Linagora
 

ui/debian/control

@@ -46,7 +46,7 @@ Description: configuration system for Open Business Management
 
 Package: obm-storage
 Architecture: all
-Pre-Depends: obm-core (= ${binary:Version}), dbconfig-common, obm-conf (= ${binary:Version}), postgresql-8.3 | postgresql-8.4 | postgresql-9.1 | mysql-server
+Pre-Depends: obm-core (= ${binary:Version}), dbconfig-common, obm-conf (= ${binary:Version}), postgresql-8.3 | postgresql-8.4 | postgresql-9.1 | postgresql-9.6 |mysql-server
 Depends: obm-locator, ${misc:Depends}
 Description: database for Open Business Management
  This package initializes the OBM database, which can be either Postgres or
@@ -62,7 +62,7 @@ Description: database for Open Business Management
 Package: obm-core
 Architecture: all
 Pre-Depends: debconf
-Depends:  obm-conf (= ${binary:Version}), php5-cli, php5-pgsql | php5-mysql, tzdata, php5-curl, php-apc, ${misc:Depends}
+Depends:  obm-conf (= ${binary:Version}), php-cli, php-pgsql | php-mysql, tzdata, php-curl, php-apc | php-apcu, ${misc:Depends}
 Conflicts: opush (<< 3)
 Description: web interface for Open Business Management
  This package contains the web interface for OBM. It has no dependency on the
@@ -87,8 +87,8 @@ Description: certificate generation for OBM
 
 Package: obm-ui
 Architecture: all
-Depends:  obm-core (= ${binary:Version}), obm-certs (= ${binary:Version}), php5, apache2, libapache2-mod-php5, php5-pgsql | php5-mysql, php5-gd, php5-imap, php-db, php5-ldap, ${misc:Depends}
-Recommends: php5-imagick
+Depends:  obm-core (= ${binary:Version}), obm-certs (= ${binary:Version}), php, apache2, libapache2-mod-php, php-pgsql | php-mysql, php-gd, php-imap, php-db, php-ldap, php-mbstring, ${misc:Depends}
+Recommends: php-imagick
 Description: web interface configuration for OBM
  This package configures Apache to serve OBM components (obm-ui, obm-storage).
  .
@@ -100,7 +100,7 @@ Description: web interface configuration for OBM
 Package: libobm-perl
 Section: perl
 Architecture: all
-Depends: libnet-telnet-perl, libcyrus-imap-perl23|libcyrus-imap-perl22, libnet-server-perl, libcrypt-smbhash-perl, libunicode-maputf8-perl, libconfig-inifiles-perl, libnet-ldap-perl, libclass-singleton-perl, libdbi-perl, libdbd-pg-perl | libdbd-mysql-perl, libsasl2-modules, libio-socket-ssl-perl, libxml-simple-perl, liblog-log4perl-perl, ${perl:Depends}, ${misc:Depends}
+Depends: libnet-telnet-perl, libcyrus-imap-perl23|libcyrus-imap-perl22|libcyrus-imap-perl, libnet-server-perl, libcrypt-smbhash-perl, libunicode-maputf8-perl, libconfig-inifiles-perl, libnet-ldap-perl, libclass-singleton-perl, libdbi-perl, libdbd-pg-perl | libdbd-mysql-perl, libsasl2-modules, libio-socket-ssl-perl, libxml-simple-perl, liblog-log4perl-perl, ${perl:Depends}, ${misc:Depends}
 Description: library for the integration of OBM with LDAP/Postfix/Cyrus
  This package contains the library used by obm-services to interact with LDAP,
  Postfix and Cyrus.
@@ -136,7 +136,7 @@ Description: LDAP configuration for OBM
 Package: obm-cyrus
 Architecture: all
 Pre-depends: obm-satellite
-Depends:  obm-conf (= ${binary:Version}), cyrus-common-2.4|cyrus-common-2.3|cyrus-common-2.2, cyrus-admin-2.4|cyrus-admin-2.3|cyrus-admin-2.2, cyrus-imapd-2.4|cyrus-imapd-2.3|cyrus-imapd-2.2, cyrus-pop3d-2.4|cyrus-pop3d-2.3|cyrus-pop3d-2.2, cyrus-sasl2-dbg, cyrus-sasl2-doc, cyrus-clients-2.4|cyrus-clients-2.3|cyrus-clients-2.2, sasl2-bin, libsasl2|libsasl2-2, libsasl2-modules, ${misc:Depends}
+Depends:  obm-conf (= ${binary:Version}), cyrus-common-2.4|cyrus-common-2.3|cyrus-common-2.2|cyrus-common, cyrus-admin-2.4|cyrus-admin-2.3|cyrus-admin-2.2|cyrus-admin, cyrus-imapd-2.4|cyrus-imapd-2.3|cyrus-imapd-2.2|cyrus-imapd, cyrus-pop3d-2.4|cyrus-pop3d-2.3|cyrus-pop3d-2.2|cyrus-pop3d, cyrus-sasl2-dbg|sasl2-bin, cyrus-sasl2-doc, cyrus-clients-2.4|cyrus-clients-2.3|cyrus-clients-2.2|cyrus-clients, sasl2-bin, libsasl2|libsasl2-2, libsasl2-modules, ${misc:Depends}
 Description: Cyrus/SASL configuration for OBM
  This package configures Cyrus/SASL for OBM.
  .

ui/doc/conf/cyrus_cyrus.conf.sample

@@ -6,20 +6,18 @@
 
 START {
 	# do not delete this entry!
-	recover		cmd="/usr/sbin/ctl_cyrusdb -r"
+	recover		cmd="/usr/lib/cyrus/bin/ctl_cyrusdb -r"
 
 	# this is only necessary if idlemethod is set to "idled" in imapd.conf
 	idled		cmd="idled"
 
 	# this is useful on backend nodes of a Murder cluster
 	# it causes the backend to syncronize its mailbox list with
 	# the mupdate master upon startup
-	#mupdatepush   cmd="/usr/sbin/ctl_mboxlist -m"
+	#mupdatepush   cmd="/usr/lib/cyrus/bin/ctl_mboxlist -m"
 
 	# this is recommended if using duplicate delivery suppression
-	delprune	cmd="/usr/sbin/cyr_expire -E 3"
-	# this is recommended if caching TLS sessions
-	tlsprune	cmd="/usr/sbin/tls_prune"
+	delprune	cmd="/usr/lib/cyrus/bin/cyr_expire -E 3"
 }
 
 # UNIX sockets start with a slash and are absolute paths
@@ -30,21 +28,22 @@ SERVICES {
 	# --- Normal cyrus spool, or Murder backends ---
 	# add or remove based on preferences
 	imap		cmd="imapd -U 30" listen="imap" prefork=10 maxchild=200 proto=tcp4 maxforkrate=4
-	#imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100 proto=tcp4 maxforkrate=4
+	imaps		cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100 proto=tcp4 maxforkrate=4
 	pop3		cmd="pop3d -U 30" listen="pop3" prefork=10 maxchild=50 proto=tcp4 maxforkrate=4
 	#pop3s		cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50 proto=tcp4 maxforkrate
 	#nntp		cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100 proto=tcp4
 	#nntps		cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100 proto=tcp4
 
 	# At least one form of LMTP is required for delivery
 	# (you must keep the Unix socket name in sync with imap.conf)
-	lmtp		cmd="lmtpd -a" listen=":24" prefork=0 maxchild=20
-	lmtpunix	cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp" prefork=0 maxchild=20
+	lmtp        cmd="lmtpd -a" listen="localhost:24" prefork=0 maxchild=20
+    lmtpunix    cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp" prefork=0 maxchild=20
+
 	# ----------------------------------------------
 
 	# useful if you need to give users remote access to sieve
 	# by default, we limit this to localhost in Debian
-  	sieve		cmd="timsieved" listen=":sieve" prefork=1 maxchild=100
+	sieve       cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=100
 
 	# this one is needed for the notification services
 	notify		cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1
@@ -70,13 +69,13 @@ SERVICES {
 
 EVENTS {
 	# this is required
-	checkpoint	cmd="/usr/sbin/ctl_cyrusdb -c" period=30
+	checkpoint	cmd="/usr/lib/cyrus/bin/ctl_cyrusdb -c" period=30
 
 	# this is only necessary if using duplicate delivery suppression
-	delprune	cmd="/usr/sbin/cyr_expire -E 3" at=0401
+	delprune	cmd="/usr/lib/cyrus/bin/cyr_expire -E 3" at=0401
 
 	# this is only necessary if caching TLS sessions
-	tlsprune	cmd="/usr/sbin/tls_prune" at=0401
+	tlsprune	cmd="/usr/lib/cyrus/bin/tls_prune" at=0401
 
 	# indexing of mailboxs for server side fulltext searches
 

ui/doc/conf/cyrus_imapd.conf.sample

@@ -99,7 +99,7 @@ popminpoll: 0
 # If nonzero, normal users may create their own IMAP accounts by creating
 # the mailbox INBOX.  The user's quota is set to the value if it is positive,
 # otherwise the user has unlimited quota.
-autocreatequota: 0
+autocreate_quota: 0
 
 # umask used by Cyrus programs
 umask: 077
@@ -228,16 +228,16 @@ sasl_auto_transition: no
 #
 
 # Use OBM generated certs for TLS
-tls_cert_file: /etc/obm/certs/obm_cert.pem
-tls_key_file: /etc/obm/certs/obm_cert.pem
-tls_ca_file: /var/lib/obm-ca/cacert.pem
+tls_server_cert: /etc/obm/certs/obm_cert.pem
+tls_server_key: /etc/obm/certs/obm_cert.pem
+tls_client_ca_file: /var/lib/obm-ca/cacert.pem
 
 # File containing the global certificate used for ALL services (imap, pop3,
 # lmtp, sieve)
-#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
+#tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
 
 # File containing the private key belonging to the global server certificate.
-#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
+#tls_server_key: /etc/ssl/private/ssl-cert-snakeoil.key
 
 # File containing the certificate used for imap. If not specified, the global
 # certificate is used.  A value of "disabled" will disable SSL/TLS for imap.
@@ -276,10 +276,10 @@ tls_ca_file: /var/lib/obm-ca/cacert.pem
 #sieve_tls_key_file: /etc/ssl/private/cyrus-sieve.key
 
 # File containing one or more Certificate Authority (CA) certificates.
-#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
+#tls_client_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
 
 # Path to directory with certificates of CAs.
-tls_ca_path: /etc/ssl/certs
+tls_client_ca_dir: /etc/ssl/certs
 
 # The length of time (in minutes) that a TLS session will be cached for later
 # reuse.  The maximum value is 1440 (24 hours), the default.  A value of 0 will
@@ -291,7 +291,7 @@ tls_session_timeout: 1440
 # selects TLSv1 high-security ciphers only, and removes all anonymous ciphers
 # from the list (because they provide no defense against man-in-the-middle
 # attacks).  It also orders the list so that stronger ciphers come first.
-tls_cipher_list: TLSv1+HIGH:!aNULL:@STRENGTH
+tls_ciphers: TLSv1+HIGH:!aNULL:@STRENGTH
 
 # Require a client certificate for ALL services (imap, pop3, lmtp, sieve).
 #tls_require_cert: false

ui/obminclude/global_pref.inc

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 /******************************************************************************
 Copyright (C) 2011-2014 Linagora
 

ui/obminclude/javascript/category_js.inc

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 /******************************************************************************
 Copyright (C) 2011-2014 Linagora
 
@@ -71,4 +71,4 @@ function updateLine(id,category) {
   return false;
 }
 ";
-</script>
+?>

ui/obminclude/javascript/check_js.inc

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 /******************************************************************************
 Copyright (C) 2011-2014 Linagora
 
@@ -130,4 +130,4 @@ function remove_all_element(parentId) {
 }
 
 ";
-</script>
+?>

ui/obminclude/lang/en/account.inc

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 ///////////////////////////////////////////////////////////////////////////////
 // OBM - Language : English                                                  //
 //     - File     : account.inc                                              //

ui/obminclude/lang/en/admin.inc

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 ///////////////////////////////////////////////////////////////////////////////
 // OBM - Language : English                                                  //
 //     - File     : admin.inc                                                //

ui/obminclude/lang/en/admin_code.inc

@@ -1,4 +1,4 @@
-<SCRIPT language="php">
+<?php
 ///////////////////////////////////////////////////////////////////////////////
 // OBM - Language : French                                                   //
 //     - File     : admin.inc                                                //

ui/obminclude/lang/en/admin_data.inc

@@ -1,4 +1,4 @@
-<SCRIPT language="php">
+<?php
 ///////////////////////////////////////////////////////////////////////////////
 // OBM - Language : French                                                   //
 //     - File     : admin.inc                                                //

ui/obminclude/lang/en/admin_lang.inc

@@ -1,4 +1,4 @@
-<SCRIPT language="php">
+<?php
 ///////////////////////////////////////////////////////////////////////////////
 // OBM - Language : French                                                   //
 //     - File     : admin.inc                                                //

ui/obminclude/lang/en/admin_pref.inc

@@ -1,4 +1,4 @@
-<script language="php">
+<?php
 ///////////////////////////////////////////////////////////////////////////////
 // OBM - Language : English                                                  //
 //     - File     : admin_pref.inc                                           //