Updated package kerio-firewall-admin 6.7.1.6544-5

7 files changed, 169 insertions, 147 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1ee95351e197..0ec4ec661f0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,46 @@
 pkgbase = kerio-firewall-admin
 	pkgdesc = Kerio Administration Console to manage Kerio Firewall (previously named Kerio Winroute) servers
 	pkgver = 6.7.1.6544
-	pkgrel = 4
+	pkgrel = 5
 	url = http://download.kerio.com/archive/download.php
 	install = kerio-firewall-admin.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	depends = glibc
-	depends = libxext
-	depends = hicolor-icon-theme
 	depends = gtk-update-icon-cache
 	depends = desktop-file-utils
 	depends = shared-mime-info
 	source = http://download.kerio.com/dwn/kwf/kerio-kwf-admin-6.7.1-6544-win32.exe
-	source = wine-1.3.11-linux-x86.tar.gz::http://www.playonlinux.com/wine/binaries/linux-x86/PlayOnLinux-wine-1.3.11-linux-x86.pol
-	source = files-needed-by-wine-1.3.11.txt
+	source = wine-1.7.53-linux-x86.tar.gz::http://www.playonlinux.com/wine/binaries/linux-x86/PlayOnLinux-wine-1.7.53-linux-x86.pol
+	source = files-needed-by-wine-1.7.53.txt
 	source = kerio-firewall-admin
 	source = kerio-firewall-admin-16.png
 	source = kerio-firewall-admin-24.png
 	source = kerio-firewall-admin-32.png
 	source = kerio-firewall-admin-48.png
 	source = kerio-firewall-admin.desktop
+	source = kerio-firewall-admin-wradmin.desktop
 	source = kerio-firewall-admin.xml
-	md5sums = 83b7adf85da2f2948d0a6629fd30b8db
-	md5sums = 7fb1bcabb94592de791705cfc72e6b60
-	md5sums = 6ea34509a717806f75fb2c74ba90408f
-	md5sums = 4377e2436f55062d065a61e5aba34f3a
-	md5sums = 0c9d42e9abaaa2d03640e74c608d292c
-	md5sums = 7b6acf1cb87630b08f9b0758e6ea0bc3
-	md5sums = bfeca82192a9520b526f0bb53ad00506
-	md5sums = 0a016cf1daf2958b236aad4676a2c96e
-	md5sums = e10a5c9abc956c667e889d2d1802eefe
-	md5sums = 8f21e8dca28c3f8d68fa6b48a89e6fb6
+	sha256sums = 231a51ace76f94464b107cabfed5c8fd79cfce8a6d618f33a94c01f73d7979bf
+	sha256sums = 460f16e2cf5c9851305d4f5f411c93e46731e0e3af5ff9fcf78757c2df93b490
+	sha256sums = 22ed5585b6d52bf9914b1ad48b97d55d66288ebee3d005800b403b13282b47e4
+	sha256sums = fa4e1af9669c91252c705063deb5f8de83d249dd5f5de4fd4c4f8a16ce67a650
+	sha256sums = 950c6f17587578c1a6a900790112261437e41af34769e8eff17a34307a2bdc5e
+	sha256sums = 0000cb7a8225e6bdbc00e28e3c660f919e563d0153322dcf9581f3d97ea7ebcb
+	sha256sums = c2f7a59b33a0c6862003f7461fc573cac5c6a7468c24e6d567e5d13aae00e311
+	sha256sums = 13ec6a852125cd499936e54560fd5d7593b93241fc3ff222d26aec2b557118a3
+	sha256sums = 89685e598ca5daacd1a0eed90407474c0122c3095e2a4f581cc2bebd0593fe88
+	sha256sums = 0225a313576ddd8211cac7f6a979c7a20a5718d04907b77371818106a54ebc0d
+	sha256sums = 8b614c7bcb589f7e7dee22e3a43c634cad6d9f45ad3df8c3b34e1b13fe2e6c7c
+	depends_i686 = libxext
+	makedepends_i686 = freetype2
+	depends_x86_64 = lib32-freetype2
+	depends_x86_64 = lib32-alsa-lib
+	depends_x86_64 = lib32-glu
+	depends_x86_64 = lib32-libldap
+	depends_x86_64 = lib32-libsm
+	depends_x86_64 = lib32-libxml2
+	makedepends_x86_64 = lib32-freetype2
 
 pkgname = kerio-firewall-admin
 
diff --git a/PKGBUILD b/PKGBUILD
index be817723b19f..72736a5a634a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,20 @@
-# Maintainer: Muflone <muflone@vbsimple.net>
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
 
 pkgname=kerio-firewall-admin
 pkgver=6.7.1.6544
-pkgrel=4
-_pkgmainver=6.7.1
-_pkgsubver=6544
-_wineversion=1.3.11
+pkgrel=5
+_wineversion=1.7.53
 pkgdesc="Kerio Administration Console to manage Kerio Firewall (previously named Kerio Winroute) servers"
 arch=('i686' 'x86_64')
 url="http://download.kerio.com/archive/download.php"
 license=('custom')
-depends=(glibc libxext hicolor-icon-theme gtk-update-icon-cache desktop-file-utils shared-mime-info)
-makedepends=()
-install=$pkgname.install
-source=("http://download.kerio.com/dwn/kwf/kerio-kwf-admin-${_pkgmainver}-${_pkgsubver}-win32.exe"
+depends=('gtk-update-icon-cache' 'desktop-file-utils' 'shared-mime-info')
+depends_i686=('libxext')
+depends_x86_64=('lib32-freetype2' 'lib32-alsa-lib' 'lib32-glu' 'lib32-libldap' 'lib32-libsm' 'lib32-libxml2')
+makedepends_i686=('freetype2')
+makedepends_x86_64=('lib32-freetype2')
+install=${pkgname}.install
+source=("http://download.kerio.com/dwn/kwf/kerio-kwf-admin-${pkgver%.*}-${pkgver##*.}-win32.exe"
         "wine-${_wineversion}-linux-x86.tar.gz::http://www.playonlinux.com/wine/binaries/linux-x86/PlayOnLinux-wine-${_wineversion}-linux-x86.pol"
         "files-needed-by-wine-${_wineversion}.txt"
         "${pkgname}"
@@ -22,61 +23,63 @@ source=("http://download.kerio.com/dwn/kwf/kerio-kwf-admin-${_pkgmainver}-${_pkg
         "${pkgname}-32.png"
         "${pkgname}-48.png"
         "${pkgname}.desktop"
-        "${pkgname}.xml"
-       )
-md5sums=('83b7adf85da2f2948d0a6629fd30b8db'
-         '7fb1bcabb94592de791705cfc72e6b60'
-         '6ea34509a717806f75fb2c74ba90408f'
-         '4377e2436f55062d065a61e5aba34f3a'
-         '0c9d42e9abaaa2d03640e74c608d292c'
-         '7b6acf1cb87630b08f9b0758e6ea0bc3'
-         'bfeca82192a9520b526f0bb53ad00506'
-         '0a016cf1daf2958b236aad4676a2c96e'
-         'e10a5c9abc956c667e889d2d1802eefe'
-         '8f21e8dca28c3f8d68fa6b48a89e6fb6'
-        )
-
-if [ "$CARCH" = "x86_64" ]
-then
-  depends+=(lib32-glibc lib32-alsa-lib lib32-gcc-libs lib32-mesa lib32-glu lib32-libldap lib32-libsm lib32-libxext lib32-libxml2)
-fi
+        "${pkgname}-wradmin.desktop"
+        "${pkgname}.xml")
+sha256sums=('231a51ace76f94464b107cabfed5c8fd79cfce8a6d618f33a94c01f73d7979bf'
+            '460f16e2cf5c9851305d4f5f411c93e46731e0e3af5ff9fcf78757c2df93b490'
+            '22ed5585b6d52bf9914b1ad48b97d55d66288ebee3d005800b403b13282b47e4'
+            'fa4e1af9669c91252c705063deb5f8de83d249dd5f5de4fd4c4f8a16ce67a650'
+            '950c6f17587578c1a6a900790112261437e41af34769e8eff17a34307a2bdc5e'
+            '0000cb7a8225e6bdbc00e28e3c660f919e563d0153322dcf9581f3d97ea7ebcb'
+            'c2f7a59b33a0c6862003f7461fc573cac5c6a7468c24e6d567e5d13aae00e311'
+            '13ec6a852125cd499936e54560fd5d7593b93241fc3ff222d26aec2b557118a3'
+            '89685e598ca5daacd1a0eed90407474c0122c3095e2a4f581cc2bebd0593fe88'
+            '0225a313576ddd8211cac7f6a979c7a20a5718d04907b77371818106a54ebc0d'
+            '8b614c7bcb589f7e7dee22e3a43c634cad6d9f45ad3df8c3b34e1b13fe2e6c7c')
 
 build() {
   # Prepares the wine environment
   install -m755 -d "${srcdir}/wine" "${srcdir}/local"
-  export WINEPREFIX="$srcdir"/wine
+  export WINEPREFIX="${srcdir}/wine"
   export XDG_DATA_HOME="${srcdir}/local"
   export WINEDLLOVERRIDES="mscoree,mshtml,winemp3.acm="
+  export WINEDEBUG=-all
   msg2 "Install Kerio Firewall Administration in a temporary wine environment"
-  LD_PRELOAD= wineversion/${_wineversion}/bin/wine "${srcdir}/kerio-kwf-admin-${_pkgmainver}-${_pkgsubver}-win32.exe" /S /v'/qn INSTALLDIR="C:\\Kerio"'
+  LD_PRELOAD= wineversion/${_wineversion}/bin/wine "${srcdir}/kerio-kwf-admin-${pkgver%.*}-${pkgver##*.}-win32.exe" /S /v'/qn INSTALLDIR="C:\\Kerio"'
 }
 
 package() {
   msg2 "Copy the Kerio program files"
   install -m 755 -d "${pkgdir}/usr/share/${pkgname}"
   cp -r "${srcdir}/wine/drive_c/Kerio/Admin" "${pkgdir}/usr/share/${pkgname}/Admin"
-  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/wine/bin"
 
   msg2 "Copy the files needed by the portable wine instance"
+  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}"
+  install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/wine"
   while read file
   do
-    if [ "${file:${#file}-1}" = '/' ]
+    if [ ! "${file:0:1}" = '#' ]
     then
-      # Create directory
-      install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/wine/${file}"
+      if [ "${file:${#file}-1}" = '/' ]
+      then
+        # Create directory
+        install -m 755 -d "${pkgdir}/usr/lib/${pkgname}/wine/${file}"
+      else
+        # Copy file
+        install -m 644 -t "${pkgdir}/usr/lib/${pkgname}/wine/${file%/*}" "${srcdir}/wineversion/${_wineversion}/${file}"
+      fi
     else
-      # Copy file
-      install -m 644 -t "${pkgdir}/usr/lib/${pkgname}/wine/${file%/*}" "${srcdir}/wineversion/${_wineversion}/${file}"
+      msg2 "Skipping file ${file:1}"
     fi
   done < files-needed-by-wine-${_wineversion}.txt
+  msg2 "Create libraries symlinks"
+  ln -s "libwine.so.1.0" "${pkgdir}/usr/lib/${pkgname}/wine/lib/libwine.so"
+  ln -s "libwine.so.1.0" "${pkgdir}/usr/lib/${pkgname}/wine/lib/libwine.so.1"
 
   msg2 "Change files permissions"
   chmod +x "${pkgdir}/usr/lib/${pkgname}/wine/bin"/*
   chmod +x "${pkgdir}/usr/lib/${pkgname}/wine/lib"/*
   chmod +x "${pkgdir}/usr/lib/${pkgname}/wine/lib/wine"/*
-  msg2 "Create libraries symlinks"
-  ln -s "libwine.so.1.0" "${pkgdir}/usr/lib/${pkgname}/wine/lib/libwine.so"
-  ln -s "libwine.so.1.0" "${pkgdir}/usr/lib/${pkgname}/wine/lib/libwine.so.1"
   msg2 "Install startup script"
   install -m 755 -d "${pkgdir}/usr/bin"
   install -m 755 -t "${pkgdir}/usr/bin" "${pkgname}"
@@ -84,11 +87,12 @@ package() {
   install -m 755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   ln -s "../../${pkgname}/Admin/acknowledgments.txt" "${pkgdir}/usr/share/licenses/${pkgname}"
   msg2 "Install icons and desktop files"
-  install -m 644 -D ${pkgname}-16.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/${pkgname}.png"
-  install -m 644 -D ${pkgname}-24.png "$pkgdir/usr/share/icons/hicolor/24x24/apps/${pkgname}.png"
-  install -m 644 -D ${pkgname}-32.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/${pkgname}.png"
-  install -m 644 -D ${pkgname}-48.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
-  install -m 644 -D ${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop"
-  install -m 644 -D ${pkgname}.xml "$pkgdir/usr/share/mime/packages/${pkgname}.xml"
+  install -m 644 -D ${pkgname}-16.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png"
+  install -m 644 -D ${pkgname}-24.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/${pkgname}.png"
+  install -m 644 -D ${pkgname}-32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png"
+  install -m 644 -D ${pkgname}-48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
+  install -m 644 -D ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -m 644 -D ${pkgname}-wradmin.desktop "${pkgdir}/usr/share/applications/${pkgname}-wradmin.desktop"
+  install -m 644 -D ${pkgname}.xml "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
 }
 
diff --git a/files-needed-by-wine-1.3.11.txt b/files-needed-by-wine-1.3.11.txt
deleted file mode 100644
index 756c854e8d8f..000000000000
--- a/files-needed-by-wine-1.3.11.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-bin/
-bin/wine
-bin/wineboot
-bin/wine-preloader
-bin/wineserver
-lib/
-lib/libwine.so.1.0
-lib/wine/
-lib/wine/advapi32.dll.so
-lib/wine/avicap32.dll.so
-lib/wine/comctl32.dll.so
-lib/wine/comdlg32.dll.so
-lib/wine/crypt32.dll.so
-lib/wine/dbghelp.dll.so
-lib/wine/ddraw.dll.so
-lib/wine/devenum.dll.so
-lib/wine/dsound.dll.so
-lib/wine/explorer.exe.so
-lib/wine/gdi32.dll.so
-lib/wine/gdiplus.dll.so
-lib/wine/imagehlp.dll.so
-lib/wine/imm32.dll.so
-lib/wine/iphlpapi.dll.so
-lib/wine/kernel32.dll.so
-lib/wine/mapi32.dll.so
-lib/wine/midimap.dll.so
-lib/wine/mmdevapi.dll.so
-lib/wine/mpr.dll.so
-lib/wine/msacm32.dll.so
-lib/wine/msacm32.drv.so
-lib/wine/msimg32.dll.so
-lib/wine/msvcrt.dll.so
-lib/wine/msvfw32.dll.so
-lib/wine/netapi32.dll.so
-lib/wine/ntdll.dll.so
-lib/wine/ole32.dll.so
-lib/wine/oleaut32.dll.so
-lib/wine/opengl32.dll.so
-lib/wine/psapi.dll.so
-lib/wine/quartz.dll.so
-lib/wine/regedit.exe.so
-lib/wine/riched20.dll.so
-lib/wine/rpcrt4.dll.so
-lib/wine/rsaenh.dll.so
-lib/wine/rundll32.exe.so
-lib/wine/secur32.dll.so
-lib/wine/sensapi.dll.so
-lib/wine/services.exe.so
-lib/wine/setupapi.dll.so
-lib/wine/shell32.dll.so
-lib/wine/shlwapi.dll.so
-lib/wine/user32.dll.so
-lib/wine/userenv.dll.so
-lib/wine/usp10.dll.so
-lib/wine/uxtheme.dll.so
-lib/wine/version.dll.so
-lib/wine/winealsa.drv.so
-lib/wine/wineboot.exe.so
-lib/wine/winecfg.exe.so
-lib/wine/wined3d.dll.so
-lib/wine/winedbg.exe.so
-lib/wine/winemapi.dll.so
-lib/wine/winex11.drv.so
-lib/wine/winhttp.dll.so
-lib/wine/wininet.dll.so
-lib/wine/winmm.dll.so
-lib/wine/winspool.drv.so
-lib/wine/wintrust.dll.so
-lib/wine/ws2_32.dll.so
-lib/wine/wsock32.dll.so
-lib/wine/wtsapi32.dll.so
-share/
-share/wine/
-share/wine/generic.ppd
-share/wine/l_intl.nls
-share/wine/wine.inf
-share/wine/fonts/
-share/wine/fonts/ssee1255.fon
-share/wine/fonts/ssee1256.fon
-share/wine/fonts/ssee1257.fon
-share/wine/fonts/ssee874.fon
-share/wine/fonts/sserifee.fon
-share/wine/fonts/sserife.fon
-share/wine/fonts/sserifeg.fon
-share/wine/fonts/sserifer.fon
-share/wine/fonts/sserifet.fon
diff --git a/files-needed-by-wine-1.7.53.txt b/files-needed-by-wine-1.7.53.txt
new file mode 100644
index 000000000000..31c59fe6dbe0
--- /dev/null
+++ b/files-needed-by-wine-1.7.53.txt
@@ -0,0 +1,52 @@
+bin/
+bin/wine
+bin/wineboot
+bin/wine-preloader
+bin/wineserver
+lib/
+lib/libwine.so.1.0
+lib/wine/
+lib/wine/actxprxy.dll.so
+lib/wine/advapi32.dll.so
+lib/wine/comctl32.dll.so
+lib/wine/comdlg32.dll.so
+lib/wine/crypt32.dll.so
+lib/wine/explorer.exe.so
+lib/wine/gdi32.dll.so
+lib/wine/imm32.dll.so
+lib/wine/iphlpapi.dll.so
+lib/wine/kernel32.dll.so
+lib/wine/msacm32.dll.so
+lib/wine/msimg32.dll.so
+lib/wine/msvcp80.dll.so
+lib/wine/msvcr80.dll.so
+lib/wine/netapi32.dll.so
+lib/wine/ntdll.dll.so
+lib/wine/ntoskrnl.exe.so
+lib/wine/ole32.dll.so
+lib/wine/oleaut32.dll.so
+lib/wine/plugplay.exe.so
+lib/wine/rpcrt4.dll.so
+lib/wine/rsaenh.dll.so
+lib/wine/rundll32.exe.so
+lib/wine/secur32.dll.so
+lib/wine/services.exe.so
+lib/wine/setupapi.dll.so
+lib/wine/shell32.dll.so
+lib/wine/shlwapi.dll.so
+lib/wine/user32.dll.so
+lib/wine/userenv.dll.so
+lib/wine/usp10.dll.so
+lib/wine/uxtheme.dll.so
+lib/wine/version.dll.so
+lib/wine/wineboot.exe.so
+lib/wine/winedevice.exe.so
+lib/wine/winex11.drv.so
+lib/wine/winmm.dll.so
+lib/wine/winspool.drv.so
+lib/wine/ws2_32.dll.so
+lib/wine/wsock32.dll.so
+share/
+share/wine/
+share/wine/l_intl.nls
+share/wine/wine.inf
diff --git a/kerio-firewall-admin b/kerio-firewall-admin
index 5732e80a5d9c..6e33cc00d165 100644
--- a/kerio-firewall-admin
+++ b/kerio-firewall-admin
@@ -8,7 +8,6 @@ export WINEPREFIX="$CONFIG_DIR/kerio-firewall-admin"
 export WINEDLLOVERRIDES="mscoree,mshtml,winemp3.acm="
 export WINEBASE="/usr/lib/kerio-firewall-admin/wine"
 export WINESERVER="$WINEBASE/bin/wineserver"
-export WINEDEBUG=-all
 
 if [ ! -d "$WINEPREFIX" ] ; then
   mkdir -p "$WINEPREFIX/drive_c/Kerio" || exit 1
diff --git a/kerio-firewall-admin-wradmin.desktop b/kerio-firewall-admin-wradmin.desktop
new file mode 100644
index 000000000000..41fb55c5aa10
--- /dev/null
+++ b/kerio-firewall-admin-wradmin.desktop
@@ -0,0 +1,44 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Kerio Administration Console
+Name[en_GB]=Kerio Administration Console
+Name[cs]=Kerio Administrační program
+Name[de]=Kerio Verwaltungskonsole
+Name[es]=Kerio Consola de administración
+Name[fr]=Kerio Console d’administration
+Name[hr]=Kerio Administracijska konzola
+Name[it]=Console di amministrazione Kerio
+Name[ja]=Kerio Firewall 用管理コンソール
+Name[nl]=Kerio Beheerconsole
+Name[pl]=Kerio Konsola administracyjna
+Name[pt]=Kerio Administration Console
+Name[ru]=Kerio Консоль администрирования
+Name[sk]=Kerio Administračný program
+Name[sv]=Kerio Hanteringskonsol
+Name[zh]=Kerio Firewall 的管理控制台
+Type=Application
+Exec=kerio-firewall-admin %f
+Icon=kerio-firewall-admin
+Hidden=false
+MimeType=application/x-kerio-firewall-admin
+Categories=Network;
+Comment=Kerio Administration Console for Kerio Firewall
+Comment[en_GB]=Kerio Administration Console for Kerio Firewall
+Comment[cs]=Kerio Administrační program pro Kerio Firewall
+Comment[de]=Verwaltungskonsole für Kerio Firewall
+Comment[es]=Consola de administración para Kerio Firewall
+Comment[fr]=Console d’administration pour Kerio Firewall
+Comment[hr]=Administracijska konzola za Kerio Firewall
+Comment[it]=Console di amministrazione per Kerio Firewall
+Comment[ja]=Kerio Firewall 用管理コンソール
+Comment[nl]=Beheerconsole voor Kerio Firewall
+Comment[pl]=Konsola administracyjna zapory Kerio Firewall
+Comment[pt]=Administration Console para Kerio Firewall
+Comment[ru]=Консоль администрирования межсетевого экрана Kerio Firewall
+Comment[sk]=Administračný program pre Kerio Firewall
+Comment[sv]=Hanteringskonsol för Kerio Firewall
+Comment[zh]=Kerio Firewall 的管理控制台
+Keywords=Kerio;Firewall;Administration;Console;Winroute
+StartupWMClass=wradmin60701.exe
+NoDisplay=true
diff --git a/kerio-firewall-admin.desktop b/kerio-firewall-admin.desktop
index 3a125bce9f89..920f8ad5c743 100644
--- a/kerio-firewall-admin.desktop
+++ b/kerio-firewall-admin.desktop
@@ -40,3 +40,4 @@ Comment[sk]=Administračný program pre Kerio Firewall
 Comment[sv]=Hanteringskonsol för Kerio Firewall
 Comment[zh]=Kerio Firewall 的管理控制台
 Keywords=Kerio;Firewall;Administration;Console;Winroute
+StartupWMClass=kadmin.exe