Update to 6.3.56
- pet Portlint - use "make makepatch" for /files Sponsored by: Netzkommune GmbH
This commit is contained in:
parent
b730c06cf2
commit
d51b67ab38
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=486938
4 changed files with 638 additions and 358 deletions
|
@ -3,9 +3,10 @@
|
|||
|
||||
PORTNAME= groupoffice
|
||||
DISTVERSIONPREFIX= com-
|
||||
DISTVERSION= 6.3.6
|
||||
DISTVERSION= 6.3.56
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= SF/group-office/${DISTVERSION:R}
|
||||
DISTNAME= ${PORTNAME}-${DISTVERSION}-php-71
|
||||
|
||||
MAINTAINER= joneum@FreeBSD.org
|
||||
COMMENT= Modular web application framework for office
|
||||
|
@ -13,19 +14,16 @@ COMMENT= Modular web application framework for office
|
|||
LICENSE= AGPLv3
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE.AGPL
|
||||
|
||||
USES= mysql shebangfix php:web python
|
||||
|
||||
RESTRICTED= Free for personal use only
|
||||
|
||||
NO_ARCH= yes
|
||||
NO_BUILD= yes
|
||||
USES= mysql shebangfix php:web python
|
||||
USE_PHP= mysqli session mbstring pcre xml
|
||||
SHEBANG_FILES= groupoffice \
|
||||
groupofficecli.php \
|
||||
install/autoinstall.php \
|
||||
modules/postfixadmin/scripts/vacation.pl \
|
||||
modules/sync/z-push/install.sh \
|
||||
modules/sync/z-push/z-push-admin.php \
|
||||
modules/sync/z-push/z-push-top.php \
|
||||
vendor/sabre/dav/bin/naturalselection \
|
||||
vendor/sabre/dav/bin/googlecode_upload.py \
|
||||
vendor/bin/../sabre/dav/bin/naturalselection \
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1526482051
|
||||
SHA256 (groupoffice-com-6.3.6.tar.gz) = ad98651acffcf6e671598d41e2120ebfc142b05a09bedaa1a2f3db96657b6815
|
||||
SIZE (groupoffice-com-6.3.6.tar.gz) = 35135571
|
||||
TIMESTAMP = 1544264745
|
||||
SHA256 (groupoffice-6.3.56-php-71.tar.gz) = 7a861cc3aebaeb2675228a61d73684a1c34feaa1203772e105d4d75cc8275510
|
||||
SIZE (groupoffice-6.3.56-php-71.tar.gz) = 35919330
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- go/base/Config.php.orig 2018-05-16 17:51:27.698586000 +0200
|
||||
+++ go/base/Config.php 2018-05-16 17:57:31.398294000 +0200
|
||||
--- go/base/Config.php.orig 2018-12-04 16:00:23 UTC
|
||||
+++ go/base/Config.php
|
||||
@@ -22,7 +22,7 @@
|
||||
* This class holds the main configuration options of Group-Office
|
||||
* Don't modify this file. The values defined here are just default values.
|
||||
|
@ -9,7 +9,41 @@
|
|||
*
|
||||
* To edit these options use install.php.
|
||||
*
|
||||
@@ -873,7 +873,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
@@ -760,21 +760,21 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
- var $cmd_zip = '/usr/bin/zip';
|
||||
+ var $cmd_zip = '/usr/local/bin/zip';
|
||||
|
||||
/**
|
||||
* Command to unpack ZIP archive
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
- var $cmd_unzip = '/usr/bin/unzip';
|
||||
+ var $cmd_unzip = '/usr/local/bin/unzip';
|
||||
|
||||
/**
|
||||
* Command to control TAR archives
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
- var $cmd_tar = '/bin/tar';
|
||||
+ var $cmd_tar = '/usr/local/bin/tar';
|
||||
|
||||
/**
|
||||
* Command to set system passwords. Used by passwd.users.class.inc.
|
||||
@@ -790,7 +790,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
- var $cmd_sudo = '/usr/bin/sudo';
|
||||
+ var $cmd_sudo = '/usr/local/bin/sudo';
|
||||
|
||||
/**
|
||||
* Command to convert xml to wbxml
|
||||
@@ -798,7 +798,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
|
@ -18,7 +52,7 @@
|
|||
|
||||
/**
|
||||
* Command to convert wbxml to xml
|
||||
@@ -881,7 +881,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
@@ -806,7 +806,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
|
@ -27,7 +61,7 @@
|
|||
|
||||
/**
|
||||
* Command to unpack winmail.dat files
|
||||
@@ -889,7 +889,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
@@ -814,7 +814,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
|
@ -36,7 +70,7 @@
|
|||
|
||||
/**
|
||||
* Command to execute the php command line interface
|
||||
@@ -897,7 +897,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
@@ -822,7 +822,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
* @var StringHelper
|
||||
* @access public
|
||||
*/
|
||||
|
@ -45,23 +79,12 @@
|
|||
|
||||
|
||||
/**
|
||||
@@ -1485,8 +1485,8 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
$this->root_path = str_replace('\\','/',dirname(dirname(dirname(__FILE__)))).'/';
|
||||
|
||||
//suppress error for open_basedir warnings etc
|
||||
- if(@file_exists('/etc/groupoffice/globalconfig.inc.php')) {
|
||||
- require('/etc/groupoffice/globalconfig.inc.php');
|
||||
+ if(@file_exists('/usr/local/usr/local/etc/groupoffice/globalconfig.inc.php')) {
|
||||
+ require('/usr/local/usr/local/etc/groupoffice/globalconfig.inc.php');
|
||||
}
|
||||
|
||||
$config_file = $this->get_config_file();
|
||||
@@ -1839,7 +1839,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
}
|
||||
}*/
|
||||
if(!empty($_SERVER['SERVER_NAME'])){
|
||||
- $config_file = '/etc/groupoffice/'.$_SERVER['SERVER_NAME'].'/config.php';
|
||||
+ $config_file = '/usr/local/usr/local/etc/groupoffice/'.$_SERVER['SERVER_NAME'].'/config.php';
|
||||
if(@file_exists($config_file)) {
|
||||
$_SESSION['GO_SESSION']['config_file']=$config_file;
|
||||
return $config_file;
|
||||
@@ -1350,7 +1350,7 @@ var $billing_clear_payment_method_on_duplicate = true;
|
||||
}
|
||||
|
||||
private function getGlobalConfig() {
|
||||
- $globalConfigFile = '/etc/groupoffice/globalconfig.inc.php';
|
||||
+ $globalConfigFile = '/usr/local/usr/local/etc/groupoffice/globalconfig.inc.php';
|
||||
if (file_exists($globalConfigFile)) {
|
||||
require($globalConfigFile);
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue