6.0.1-1 Обновление программы

Плановое обновление программы

3 files changed, 20 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b25bc824cf96..068172a371ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Dec 20 12:14:10 UTC 2017
+# Mon Jan  1 14:02:02 UTC 2018
 pkgbase = otrs
 	pkgdesc = OTRS is the leading open-source Help Desk and IT Service Management (ITSM)
-	pkgver = 5.0.26
+	pkgver = 6.0.1
 	pkgrel = 1
 	url = http://www.otrs.com/
 	install = otrs.install
@@ -12,10 +12,12 @@ pkgbase = otrs
 	depends = perl-gd
 	depends = perl-dbi
 	depends = perl-ldap
+	depends = perl-ntlm
 	depends = perl-dbd-pg
 	depends = perl-gdgraph
 	depends = perl-json-xs
 	depends = perl-net-dns
+	depends = perl-datetime
 	depends = perl-timedate
 	depends = perl-pdf-api2
 	depends = perl-dbd-odbc
@@ -25,6 +27,7 @@ pkgbase = otrs
 	depends = perl-archive-zip
 	depends = perl-text-csv-xs
 	depends = perl-xml-libxslt
+	depends = perl-authen-sasl
 	depends = perl-crypt-ssleay
 	depends = perl-yaml-libyaml
 	depends = perl-mail-imapclient
@@ -36,11 +39,9 @@ pkgbase = otrs
 	options = emptydirs
 	backup = etc/webapps/otrs/Config.pm
 	source = otrs.install
-	source = http://ftp.otrs.org/pub/otrs/otrs-5.0.26.tar.gz
-	md5sums = 9305e7a2dd41a19a10c0d9ab376965fd
-	md5sums = a0261e084de108a7a80e2ded5d7f9767
-	sha1sums = d88cdb1d905aebe146cc83bcf31dec9dcff62c30
-	sha1sums = 5c9b403ef1fc4d13e7bccadc5983d9d0bc7560b5
+	source = http://ftp.otrs.org/pub/otrs/otrs-6.0.1.tar.gz
+	sha256sums = cb10dda941c7477880ae06362ef69fe0cfb1d06ad9ad1315cb7322d4dd65963e
+	sha256sums = 046ca4f5792ddeb25c7aba1e56dc7769e95f9304f1e96c4f44c3bfb6a5ae17c8
 
 pkgname = otrs
 
diff --git a/PKGBUILD b/PKGBUILD
index a1b62680b929..f00f1924617b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=otrs
-pkgver=5.0.26
+pkgver=6.0.1
 pkgrel=1
 pkgdesc="OTRS is the leading open-source Help Desk and IT Service Management (ITSM)"
 arch=("any")
@@ -10,10 +10,12 @@ depends=("perl"
          "perl-gd"
          "perl-dbi"
          "perl-ldap"
+         "perl-ntlm"
          "perl-dbd-pg"
          "perl-gdgraph"
          "perl-json-xs"
          "perl-net-dns"
+         "perl-datetime"
          "perl-timedate"
          "perl-pdf-api2"
          "perl-dbd-odbc"
@@ -23,6 +25,7 @@ depends=("perl"
          "perl-archive-zip"
          "perl-text-csv-xs"
          "perl-xml-libxslt"
+         "perl-authen-sasl"
          "perl-crypt-ssleay"
          "perl-yaml-libyaml"
          "perl-mail-imapclient"
@@ -35,10 +38,8 @@ backup=("etc/webapps/${pkgname}/Config.pm")
 install="${pkgname}.install"
 source=("${pkgname}.install"
         "http://ftp.otrs.org/pub/otrs/${pkgname}-${pkgver}.tar.gz")
-md5sums=("9305e7a2dd41a19a10c0d9ab376965fd"
-         "a0261e084de108a7a80e2ded5d7f9767")
-sha1sums=("d88cdb1d905aebe146cc83bcf31dec9dcff62c30"
-          "5c9b403ef1fc4d13e7bccadc5983d9d0bc7560b5")
+sha256sums=("cb10dda941c7477880ae06362ef69fe0cfb1d06ad9ad1315cb7322d4dd65963e"
+            "046ca4f5792ddeb25c7aba1e56dc7769e95f9304f1e96c4f44c3bfb6a5ae17c8")
 
 prepare() {
 cat << EOL > "${srcdir}/${pkgname}-cron.service"
diff --git a/otrs.install b/otrs.install
index 40b53b2c636c..e143238f1906 100644
--- a/otrs.install
+++ b/otrs.install
@@ -1,14 +1,11 @@
 post_install() {
-  getent passwd otrs > /dev/null || useradd -r -M -N -g http -s /bin/bash -d /usr/share/webapps/otrs otrs > /dev/null
-  /usr/share/webapps/otrs/bin/./otrs.SetPermissions.pl \
-    --otrs-user=otrs  \
-    --web-group=http  \
-      /usr/share/webapps/otrs > /dev/null
-  chmod 2775 /usr/share/webapps/otrs
+    getent passwd otrs > /dev/null 2>&1 || useradd -r -M -N -g http -s /bin/bash -d /usr/share/webapps/otrs otrs > /dev/null 2>&1
+    /usr/share/webapps/otrs/bin/otrs.SetPermissions.pl --otrs-user=otrs --web-group=http /usr/share/webapps/otrs > /dev/null 2>&1
+    chmod 2775 /usr/share/webapps/otrs
 }
 
 post_remove() {
-   userdel -rf otrs
+    getent passwd otrs > /dev/null 2>&1 && userdel -rf otrs > /dev/null 2>&1
 }
 
 pre_upgrade() {
@@ -17,9 +14,6 @@ pre_upgrade() {
 }
 
 post_upgrade() {
-  /usr/share/webapps/otrs/bin/./otrs.SetPermissions.pl \
-    --otrs-user=otrs  \
-    --web-group=http  \
-      /usr/share/webapps/otrs > /dev/null
-  chmod 2775 /usr/share/webapps/otrs
+    /usr/share/webapps/otrs/bin/otrs.SetPermissions.pl --otrs-user=otrs --web-group=http /usr/share/webapps/otrs > /dev/null 2>&1
+    chmod 2775 /usr/share/webapps/otrs
 }