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

Крупное обновление программы с версии 3.3 на 4.0. Отлючена поддержка загрузки дополнительных пакетов. Файлы конфигураций scheduler_watchdog и GenericAgent.pm перенесены в /etc/webapps/otrs. Создан пользователь otrs.
author: Артём Шустров 2014-12-28 14:19:37 +1000
committer: Артём Шустров 2014-12-28 14:19:38 +1000
commit: bc6c5cb9a1a4f5e3fd23f10445041c1066835cb3 (patch)
tree: b8b4374b8888a56ffe91b37f1c0504ae6dc19ff5
parent: 0815eedd997f22a04f34d6980b45130474d75b0a (diff)
download: aur-bc6c5cb9a1a4f5e3fd23f10445041c1066835cb3.tar.gz
3 files changed, 47 insertions, 211 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4ce34d8a7467..2a0331c292af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,12 @@
 pkgbase = otrs
 	pkgdesc = OTRS is the leading open-source Help Desk and IT Service Management (ITSM)
-	pkgver = 3.3.10
+	pkgver = 4.0.3
 	pkgrel = 1
 	url = http://www.otrs.com/
 	install = otrs.install
 	arch = any
 	license = GPLv3
-	depends = apache>=2
-	depends = mariadb>=5.5
-	depends = perl>=5.8.8
-	depends = mod_perl>=2
+	depends = perl
 	depends = perl-dbi
 	depends = perl-archive-zip
 	depends = perl-crypt-ssleay
@@ -24,75 +21,24 @@ pkgbase = otrs
 	depends = perl-net-dns
 	depends = perl-ldap
 	depends = perl-pdf-api2
+	depends = perl-template-toolkit
 	depends = perl-yaml-libyaml
 	depends = perl-text-csv-xs
 	depends = perl-xml-parser
 	depends = perl-crypt-eksblowfish
+	optdepends = mariadb: Fast SQL database server, drop-in replacement for MySQL
+	optdepends = apache: A high performance Unix-based HTTP server
+	optdepends = mod_perl: Apache module that embeds the Perl interpreter within the server
 	options = emptydirs
 	backup = etc/webapps/otrs/Config.pm
+	backup = etc/webapps/otrs/GenericAgent.pm
+	backup = etc/webapps/otrs/scheduler_watchdog
 	source = otrs.install
-	source = http://ftp.otrs.org/pub/otrs/otrs-3.3.10.tar.gz
-	source = http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMCore-3.3.10.opm
-	source = http://ftp.otrs.org/pub/otrs/itsm/packages33/GeneralCatalog-3.3.10.opm
-	source = http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMChangeManagement-3.3.10.opm
-	source = http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMConfigurationManagement-3.3.10.opm
-	source = http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMIncidentProblemManagement-3.3.10.opm
-	source = http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMServiceLevelManagement-3.3.10.opm
-	source = http://ftp.otrs.org/pub/otrs/itsm/packages33/ImportExport-3.3.10.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/Calendar-1.9.5.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/FAQ-3.3.91.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/FileManager-1.4.9.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/MasterSlave-1.1.2.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/OTRSCodePolicy-1.0.7.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/OTRSMasterSlave-3.3.92.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/Support-1.5.4.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/Survey-3.3.91.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/SystemMonitoring-3.3.91.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/TimeAccounting-3.3.91.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/WebMail-0.13.2.opm
-	source = http://ftp.otrs.org/pub/otrs/packages/iPhoneHandle-3.3.91.opm
-	md5sums = 6ae7c4f13927318f80c838b6ac4c9e0c
-	md5sums = a0c93c13d79b3c1963c962fb0d98c595
-	md5sums = 010911189e1e05c0603a9d866f646de3
-	md5sums = 092545149673d654f724a2bcabd9443c
-	md5sums = 0b731e7bc1d5a4546ceebbf62715138f
-	md5sums = b67299dd331e9f7a8213f76ae7380bc4
-	md5sums = 94fc454c534b5db0488d07bf8805ffaf
-	md5sums = 01ef577add4875760462fc16da020220
-	md5sums = 56975595adc678c5f2b3444b2931e821
-	md5sums = 3a9342a8b7347bf47f832d58020beb9c
-	md5sums = aee666b3df8af554da2bc96ff512939c
-	md5sums = 693dfab8458e202d935f31f4c7128670
-	md5sums = cec1d57f6fc904d6b8ed4748ed07e92c
-	md5sums = 7279898031e441cf5ffdbe8ee31d90dc
-	md5sums = e59a132ec0705318c3266a8677d6dc6d
-	md5sums = d2279a0d9881f2dd67abb7133b1763b0
-	md5sums = 9ebe525f2b220254a9a342b9e64bd6bb
-	md5sums = c3f7e556032c21ca6fa90a4219ffcb71
-	md5sums = 07a4fea3d41018b3466c8c3ecdccb5fa
-	md5sums = 7083a797c1a6a7da73fde4b3f289a9fe
-	md5sums = 0a7033260b481796f887779caa7ce560
-	sha1sums = aa8e024dcf6dc0f29fe421ca5f0451b701ede0b8
-	sha1sums = 1dafc4f0849256bc3798b7347c1dcf89d28f0330
-	sha1sums = 69bba86c9ea6be77d50a8b222874768ba62bf5ba
-	sha1sums = 1e8201b911003f7d64bb35629f992c4de812cf34
-	sha1sums = db641e893f0cdac7c31b38d96e4f938c5f2185c6
-	sha1sums = ce1b6b37ea9f62432f0c0a2063d3b1ca94c27b42
-	sha1sums = abe282253fb28593688f1f1861a5ae434873db92
-	sha1sums = ee03e7e0efcafe820c81ac7686296c25133ea024
-	sha1sums = 052efab673f74a7f8be48ecca6a60ec4f5203b69
-	sha1sums = 5362cc6fc56d8b5e2a9b208c8d5789213bba5576
-	sha1sums = 602e6a21f143050c009e66cfc966cf945b994485
-	sha1sums = 06b0f08497e33bf243b34c075507367baeaca071
-	sha1sums = 319c419b4533b7daa66a5decbb61fb2a7f945105
-	sha1sums = eaba31f10e559ec3f707d4d3318abf825aa9a844
-	sha1sums = 032deaa0a49d8d80fdcf738bf093e9e9cd88f142
-	sha1sums = bd95753e1c1ac2584286ce45aec7ac42aae6aedc
-	sha1sums = 39b771d76f7856ebbb3d0c278041a9692d322b89
-	sha1sums = d3f24aa5875292be19d307a26d20dfbe310be1a0
-	sha1sums = b61954f14bbe1832ce278a3f76929466f3e07c01
-	sha1sums = 0f0e466b1e25ab0ff4554e953b5f5804fab65efa
-	sha1sums = 242aab61ffecd41efc87b02cb032c838e4ac41f4
+	source = http://ftp.otrs.org/pub/otrs/otrs-4.0.3.tar.gz
+	md5sums = 08c3f7d25bc82f6abd605c6f085cf76d
+	md5sums = aa17e5966006c1614936a961a086fdde
+	sha1sums = fc070d7db1b3fe4d150d8900dff4e0f4f4a1dcdb
+	sha1sums = 49882ae2dd1ec61119c0aba6df55efc59054aa62
 
 pkgname = otrs
 
diff --git a/PKGBUILD b/PKGBUILD
index 973ccd38ffd7..c2ecef9ac983 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,12 @@
 pkgname=otrs
-pkgver=3.3.10
+pkgver=4.0.3
 pkgrel=1
 pkgdesc="OTRS is the leading open-source Help Desk and IT Service Management (ITSM)"
 arch=("any")
 options=("emptydirs")
 url="http://www.otrs.com/"
 license=("GPLv3")
-depends=("apache>=2"
-         "mariadb>=5.5"
-         "perl>=5.8.8"
-         "mod_perl>=2"
+depends=("perl"
          "perl-dbi"
          "perl-archive-zip"
          "perl-crypt-ssleay"
@@ -24,117 +21,44 @@ depends=("apache>=2"
          "perl-net-dns"
          "perl-ldap"
          "perl-pdf-api2"
+         "perl-template-toolkit"
          "perl-yaml-libyaml"
          "perl-text-csv-xs"
          "perl-xml-parser"
          "perl-crypt-eksblowfish")
-backup=("etc/webapps/${pkgname}/Config.pm")
+optdepends=("mariadb:  Fast SQL database server, drop-in replacement for MySQL"
+            "apache:   A high performance Unix-based HTTP server"
+            "mod_perl: Apache module that embeds the Perl interpreter within the server")
+backup=("etc/webapps/${pkgname}/Config.pm"
+        "etc/webapps/${pkgname}/GenericAgent.pm"
+        "etc/webapps/${pkgname}/scheduler_watchdog")
 install="${pkgname}.install"
 source=("${pkgname}.install"
-        "http://ftp.otrs.org/pub/otrs/${pkgname}-${pkgver}.tar.gz"
-        # ITSM
-        "http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMCore-${pkgver}.opm"
-        "http://ftp.otrs.org/pub/otrs/itsm/packages33/GeneralCatalog-${pkgver}.opm"
-        "http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMChangeManagement-${pkgver}.opm"
-        "http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMConfigurationManagement-${pkgver}.opm"
-        "http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMIncidentProblemManagement-${pkgver}.opm"
-        "http://ftp.otrs.org/pub/otrs/itsm/packages33/ITSMServiceLevelManagement-${pkgver}.opm"
-        "http://ftp.otrs.org/pub/otrs/itsm/packages33/ImportExport-${pkgver}.opm"
-        # Packages
-        "http://ftp.otrs.org/pub/otrs/packages/Calendar-1.9.5.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/FAQ-3.3.91.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/FileManager-1.4.9.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/MasterSlave-1.1.2.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/OTRSCodePolicy-1.0.7.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/OTRSMasterSlave-3.3.92.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/Support-1.5.4.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/Survey-3.3.91.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/SystemMonitoring-3.3.91.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/TimeAccounting-3.3.91.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/WebMail-0.13.2.opm"
-        "http://ftp.otrs.org/pub/otrs/packages/iPhoneHandle-3.3.91.opm")
+        "http://ftp.otrs.org/pub/otrs/${pkgname}-${pkgver}.tar.gz")
+md5sums=("08c3f7d25bc82f6abd605c6f085cf76d"
+         "aa17e5966006c1614936a961a086fdde")
+sha1sums=("fc070d7db1b3fe4d150d8900dff4e0f4f4a1dcdb"
+          "49882ae2dd1ec61119c0aba6df55efc59054aa62")
+
 package() {
   install -dm 0755 "${pkgdir}/etc/webapps/${pkgname}"
   install -dm 0755 "${pkgdir}/usr/share/webapps/${pkgname}"
-  install -dm 0755 "${pkgdir}/usr/share/webapps/${pkgname}/extentions"
-  install -dm 0755 "${pkgdir}/usr/share/webapps/${pkgname}/extentions/itsm"
-  install -dm 0755 "${pkgdir}/usr/share/webapps/${pkgname}/extentions/packages"
+
   install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/Kernel/Config.pm.dist" \
                    "${pkgdir}/etc/webapps/${pkgname}/Config.pm"
+  install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/Kernel/Config/GenericAgent.pm.dist" \
+                   "${pkgdir}/etc/webapps/${pkgname}/GenericAgent.pm"
+  install -Dm 0644 "${srcdir}/${pkgname}-${pkgver}/var/cron/scheduler_watchdog.dist" \
+                   "${pkgdir}/etc/webapps/${pkgname}/scheduler_watchdog"
 
-  cp -r ${srcdir}/${pkgname}-${pkgver}/* ${pkgdir}/usr/share/webapps/${pkgname}/
-  ln -s "/etc/webapps/${pkgname}/Config.pm" "${pkgdir}/usr/share/webapps/${pkgname}/Kernel/Config.pm"
+  cp -ra ${srcdir}/${pkgname}-${pkgver}/* ${pkgdir}/usr/share/webapps/${pkgname}/
 
-  length=${#source[@]}
-  for((index=0; index<${length}; index++))
-  do
-    if [ "${index}" -gt 1 ] && [ "${index}" -lt 9 ]
-    then
-      install -Dm 0644 "${srcdir}/$(echo ${source[${index}]} | sed 's/http:\/\/.*\///g')" \
-                       "${pkgdir}/usr/share/webapps/${pkgname}/extentions/itsm/$(echo ${source[${index}]} | sed 's/http:\/\/.*\///g')"
-    elif [ "${index}" -gt 8 ]
-    then
-      install -Dm 0644 "${srcdir}/$(echo ${source[${index}]} | sed 's/http:\/\/.*\///g')" \
-                       "${pkgdir}/usr/share/webapps/${pkgname}/extentions/packages/$(echo ${source[${index}]} | sed 's/http:\/\/.*\///g')"
-    fi
-  done
+  ln -s  "/etc/webapps/${pkgname}/Config.pm"          "${pkgdir}/usr/share/webapps/${pkgname}/Kernel/Config.pm"
+  ln -s  "/etc/webapps/${pkgname}/GenericAgent.pm"    "${pkgdir}/usr/share/webapps/${pkgname}/Kernel/Config/GenericAgent.pm"
+  ln -s  "/etc/webapps/${pkgname}/scheduler_watchdog" "${pkgdir}/usr/share/webapps/${pkgname}/var/cron/scheduler_watchdog"
 
-  chown -R 33:33 "${pkgdir}/etc/webapps/${pkgname}"
-  chown -R 33:33 "${pkgdir}/usr/share/webapps/${pkgname}"
-  chmod -R 0770  "${pkgdir}/usr/share/webapps/${pkgname}"
-  chmod    0750  "${pkgdir}/usr/share/webapps/${pkgname}"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/log"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/spool"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/stats"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/sessions"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/httpd/htdocs/skins/Agent"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/httpd/htdocs/skins/Agent/default"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/httpd/htdocs/skins/Agent/default/css"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/httpd/htdocs/skins/Customer"
-  chmod -R 2770  "${pkgdir}/usr/share/webapps/${pkgname}/var/httpd/htdocs/skins/Customer/default"
+  find "${pkgdir}/usr/share/webapps/${pkgname}" -type d -exec chmod 2775 {} \;
 
   sed -i "s/\/opt/\/usr\/share\/webapps/g" $(grep -rl "/opt" "${pkgdir}/etc/webapps/${pkgname}")
   sed -i "s/\/opt/\/usr\/share\/webapps/g" $(grep -rl "/opt" "${pkgdir}/usr/share/webapps/${pkgname}")
 }
-md5sums=('6ae7c4f13927318f80c838b6ac4c9e0c'
-         'a0c93c13d79b3c1963c962fb0d98c595'
-         '010911189e1e05c0603a9d866f646de3'
-         '092545149673d654f724a2bcabd9443c'
-         '0b731e7bc1d5a4546ceebbf62715138f'
-         'b67299dd331e9f7a8213f76ae7380bc4'
-         '94fc454c534b5db0488d07bf8805ffaf'
-         '01ef577add4875760462fc16da020220'
-         '56975595adc678c5f2b3444b2931e821'
-         '3a9342a8b7347bf47f832d58020beb9c'
-         'aee666b3df8af554da2bc96ff512939c'
-         '693dfab8458e202d935f31f4c7128670'
-         'cec1d57f6fc904d6b8ed4748ed07e92c'
-         '7279898031e441cf5ffdbe8ee31d90dc'
-         'e59a132ec0705318c3266a8677d6dc6d'
-         'd2279a0d9881f2dd67abb7133b1763b0'
-         '9ebe525f2b220254a9a342b9e64bd6bb'
-         'c3f7e556032c21ca6fa90a4219ffcb71'
-         '07a4fea3d41018b3466c8c3ecdccb5fa'
-         '7083a797c1a6a7da73fde4b3f289a9fe'
-         '0a7033260b481796f887779caa7ce560')
-sha1sums=('aa8e024dcf6dc0f29fe421ca5f0451b701ede0b8'
-          '1dafc4f0849256bc3798b7347c1dcf89d28f0330'
-          '69bba86c9ea6be77d50a8b222874768ba62bf5ba'
-          '1e8201b911003f7d64bb35629f992c4de812cf34'
-          'db641e893f0cdac7c31b38d96e4f938c5f2185c6'
-          'ce1b6b37ea9f62432f0c0a2063d3b1ca94c27b42'
-          'abe282253fb28593688f1f1861a5ae434873db92'
-          'ee03e7e0efcafe820c81ac7686296c25133ea024'
-          '052efab673f74a7f8be48ecca6a60ec4f5203b69'
-          '5362cc6fc56d8b5e2a9b208c8d5789213bba5576'
-          '602e6a21f143050c009e66cfc966cf945b994485'
-          '06b0f08497e33bf243b34c075507367baeaca071'
-          '319c419b4533b7daa66a5decbb61fb2a7f945105'
-          'eaba31f10e559ec3f707d4d3318abf825aa9a844'
-          '032deaa0a49d8d80fdcf738bf093e9e9cd88f142'
-          'bd95753e1c1ac2584286ce45aec7ac42aae6aedc'
-          '39b771d76f7856ebbb3d0c278041a9692d322b89'
-          'd3f24aa5875292be19d307a26d20dfbe310be1a0'
-          'b61954f14bbe1832ce278a3f76929466f3e07c01'
-          '0f0e466b1e25ab0ff4554e953b5f5804fab65efa'
-          '242aab61ffecd41efc87b02cb032c838e4ac41f4')
diff --git a/otrs.install b/otrs.install
index f411e444bb2f..08df8defacdc 100644
--- a/otrs.install
+++ b/otrs.install
@@ -1,54 +1,20 @@
 post_install() {
+  getent passwd otrs > /dev/null || useradd -g http -d /usr/share/webapps/otrs otrs -M -N > /dev/null
   /usr/share/webapps/otrs/bin/./otrs.SetPermissions.pl \
-    --otrs-user=http \
-    --otrs-group=http \
-    --web-user=http \
-    --web-group=http \
+    --otrs-user=otrs  \
+    --web-group=http  \
       /usr/share/webapps/otrs > /dev/null
-
-cat << EOM
-
--------------------------------------------------------------------------------------
-Manual post-installation steps:
--------------------------------------------------------------------------------------
-Read /usr/share/webapps/otrs/INSTALL.md
-     /usr/share/webapps/otrs/README.database.md
-     /usr/share/webapps/otrs/README.webserver.md
--------------------------------------------------------------------------------------
-Extentions ITSM     is located /usr/share/webapps/otrs/extentions/itsm
-Extentions Packages is located /usr/share/webapps/otrs/extentions/packages
--------------------------------------------------------------------------------------
-
-EOM
+  chmod 2775 /usr/share/webapps/otrs
 }
 
-pre_upgrade(){
-  if [ ! -h /usr/share/webapps/otrs/Kernel/Config.pm ]
-  then
-    mkdir -p /etc/webapps/otrs
-    cp /usr/share/webapps/otrs/Kernel/Config.pm /etc/webapps/otrs/Config.pm
-    chown http:http -R /etc/webapps/otrs
-  fi
+post_remove() {
+   userdel -rf otrs
 }
 
 post_upgrade() {
   /usr/share/webapps/otrs/bin/./otrs.SetPermissions.pl \
-    --otrs-user=http \
-    --otrs-group=http \
-    --web-user=http \
-    --web-group=http \
+    --otrs-user=otrs  \
+    --web-group=http  \
       /usr/share/webapps/otrs > /dev/null
-
-cat << EOM
-
--------------------------------------------------------------------------------------
-Manual post-upgrade steps:
--------------------------------------------------------------------------------------
-Read /usr/share/webapps/otrs/UPGRADING.md
--------------------------------------------------------------------------------------
-Extentions ITSM     is located /usr/share/webapps/otrs/extentions/itsm
-Extentions Packages is located /usr/share/webapps/otrs/extentions/packages
--------------------------------------------------------------------------------------
-
-EOM
+  chmod 2775 /usr/share/webapps/otrs
 }
author	Артём Шустров	2014-12-28 14:19:37 +1000
committer	Артём Шустров	2014-12-28 14:19:38 +1000
commit	bc6c5cb9a1a4f5e3fd23f10445041c1066835cb3 (patch)
tree	b8b4374b8888a56ffe91b37f1c0504ae6dc19ff5
parent	0815eedd997f22a04f34d6980b45130474d75b0a (diff)
download	aur-bc6c5cb9a1a4f5e3fd23f10445041c1066835cb3.tar.gz