aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwen <wen@FreeBSD.org>2011-01-06 11:08:02 +0800
committerwen <wen@FreeBSD.org>2011-01-06 11:08:02 +0800
commit7f921a975dfdb0ad6e1366c1333a929fe637eb01 (patch)
tree6d0817b4d606e01b05f1d22cfe35b70d4dcddac1
parent36e294b03a5464ab28db2bfe03279e1507abc8fb (diff)
downloadfreebsd-ports-gnome-7f921a975dfdb0ad6e1366c1333a929fe637eb01.tar.gz
freebsd-ports-gnome-7f921a975dfdb0ad6e1366c1333a929fe637eb01.tar.zst
freebsd-ports-gnome-7f921a975dfdb0ad6e1366c1333a929fe637eb01.zip
- Add upstream simplified clickjacking patch and bump PORTREVISION
Approved by: maintainer(implicity)
-rw-r--r--www/mediawiki115/Makefile1
-rw-r--r--www/mediawiki115/distinfo1
-rw-r--r--www/mediawiki115/files/patch-config-index.php10
-rw-r--r--www/mediawiki115/files/patch-includes-OutputPage.php12
4 files changed, 23 insertions, 1 deletions
diff --git a/www/mediawiki115/Makefile b/www/mediawiki115/Makefile
index 6a0798f71ea9..bcd44abcf621 100644
--- a/www/mediawiki115/Makefile
+++ b/www/mediawiki115/Makefile
@@ -7,6 +7,7 @@
PORTNAME= mediawiki
PORTVERSION= 1.15.5
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://dumps.wikimedia.org/mediawiki/1.15/
diff --git a/www/mediawiki115/distinfo b/www/mediawiki115/distinfo
index 88cfd97bbe14..c968e7d78fb4 100644
--- a/www/mediawiki115/distinfo
+++ b/www/mediawiki115/distinfo
@@ -1,3 +1,2 @@
-MD5 (mediawiki-1.15.5.tar.gz) = 01c4c85fb96991d962c8acb3d892ec2d
SHA256 (mediawiki-1.15.5.tar.gz) = f838c94af81e018dcf11f77674d2a363e97b8832d0d66416294fd301db720ab5
SIZE (mediawiki-1.15.5.tar.gz) = 11595008
diff --git a/www/mediawiki115/files/patch-config-index.php b/www/mediawiki115/files/patch-config-index.php
new file mode 100644
index 000000000000..01c991118ba9
--- /dev/null
+++ b/www/mediawiki115/files/patch-config-index.php
@@ -0,0 +1,10 @@
+--- config/index.php.orig 2011-01-06 10:44:27.000000000 +0800
++++ config/index.php 2011-01-06 10:44:59.000000000 +0800
+@@ -21,6 +21,7 @@
+
+ error_reporting( E_ALL );
+ header( "Content-type: text/html; charset=utf-8" );
++header( 'X-Frame-Options: DENY' );
+ @ini_set( "display_errors", true );
+
+ # In case of errors, let output be clean.
diff --git a/www/mediawiki115/files/patch-includes-OutputPage.php b/www/mediawiki115/files/patch-includes-OutputPage.php
new file mode 100644
index 000000000000..1427f54e74c8
--- /dev/null
+++ b/www/mediawiki115/files/patch-includes-OutputPage.php
@@ -0,0 +1,12 @@
+--- includes/OutputPage.php.orig 2011-01-06 10:46:14.000000000 +0800
++++ includes/OutputPage.php 2011-01-06 10:47:53.000000000 +0800
+@@ -957,6 +957,9 @@
+ $wgRequest->response()->header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
+ $wgRequest->response()->header( 'Content-language: '.$wgContLanguageCode );
+
++ # To prevent clickjacking, do not allow this page to be inside a frame.
++ $wgRequest->response()->header( 'X-Frame-Options: DENY' );
++
+ if ($this->mArticleBodyOnly) {
+ $this->out($this->mBodytext);
+ } else {