2.1.2-2 fixed x-frame-option to sameorigin

3 files changed, 5 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 202d7db637e8..d683b06d2254 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 20:16:49 UTC 2016
+# Sat Mar  5 11:06:55 UTC 2016
 pkgbase = zarafa-webapp
 	pkgdesc = WebApp for Zarafa
 	pkgver = 2.1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.zarafa.com/
 	arch = any
 	groups = zarafa
@@ -54,8 +54,6 @@ pkgname = zarafa-webapp-gmaps
 
 pkgname = zarafa-webapp-oauthlib
 
-pkgname = zarafa-webapp-pdfbox
-
 pkgname = zarafa-webapp-pimfolder
 
 pkgname = zarafa-webapp-quickitems
diff --git a/PKGBUILD b/PKGBUILD
index b6fce95e0b15..0766a3c7ec85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,6 @@ pkgname=('zarafa-webapp'
 	 'zarafa-webapp-folderwidgets'
 	 'zarafa-webapp-gmaps'
 	 'zarafa-webapp-oauthlib'
-	 'zarafa-webapp-pdfbox'
 	 'zarafa-webapp-pimfolder'
 	 'zarafa-webapp-quickitems'
 	 'zarafa-webapp-titlecounter'
@@ -22,7 +21,7 @@ pkgname=('zarafa-webapp'
 groups=('zarafa')
 pkgver=2.1.2
 _pkgrel=2.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='WebApp for Zarafa'
 arch=('any')
 url='http://www.zarafa.com/'
@@ -40,7 +39,7 @@ source=("webapp-${pkgver}.tar.gz::http://download.zarafa.com/community/final/Web
 	"zarafa-webapp.install"
 	"compress-static")
 md5sums=('231a0ceb064c9c213de6dcdd2b7ae732'
-         'b64d0a12ff31cac4357ba8bb4cbfb6f8'
+         'fa930c1df0c132dd9edbbe7004452851'
          '1bdab5b1e4473c1b0f6ce2e5c8f1da61'
          '7adcf5e023718421a5e8e07e5e9a2480'
          'cc8143c1fa12911a17578c1e775225fe'
@@ -176,10 +175,6 @@ package_zarafa-webapp-oauthlib() {
     package_plugin ${pkgname//zarafa-webapp-/}
 }
 
-package_zarafa-webapp-pdfbox() {
-    package_plugin ${pkgname//zarafa-webapp-/}
-}
-
 package_zarafa-webapp-pimfolder() {
     package_plugin ${pkgname//zarafa-webapp-/}
 }
diff --git a/nginx-location.conf b/nginx-location.conf
index 4779d6875321..87ca2e5f7f07 100644
--- a/nginx-location.conf
+++ b/nginx-location.conf
@@ -21,7 +21,7 @@
 	    ## [WARNING] The following header states that the browser should only communicate
 	    ## with your server over a secure connection for the next 24 months.
     	    add_header Strict-Transport-Security max-age=63072000;
-    	    add_header X-Frame-Options DENY;
+    	    add_header X-Frame-Options SAMEORIGIN;
     	    add_header X-Content-Type-Options nosniff;
 
     	    # HIDDEN FILES AND FOLDERS