[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[debian]: Merge branch 'master' into debian

2017-07-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366782 )

Change subject: Merge branch 'master' into debian
..


Merge branch 'master' into debian

Change-Id: Icbacb6818484f81109236ef99bfbb7e713614971
---
M debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/php-luasandbox.install
A debian/php-luasandbox.postinst
A debian/php-luasandbox.prerm
A debian/rules
A debian/source/format
9 files changed, 160 insertions(+), 3 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/changelog b/debian/changelog
index 917e5a9..dd918b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,3 @@
-<<< HEAD   (b4a80e Add gbp.conf for non-standard branches)
 php-luasandbox (2.0.13) UNRELEASED; urgency=medium
 
   [ Kunal Mehta ]
@@ -163,5 +162,3 @@
   * Initial release
 
  -- Tim Starling   Tue, 14 Aug 2012 11:23:40 +1000
-===
->>> BRANCH (a07565 Redo PHP->Lua data structure recursion protection)
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..dbea8bb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,32 @@
+Source: php-luasandbox
+Section: web
+Priority: optional
+Maintainer: Tim Starling 
+Build-Depends: debhelper (>= 9),
+   liblua5.1-0-dev,
+   pkg-config,
+   php5-dev (<< 5.5) | php5-dev (>= 5.5),
+   php5-dev (<< 5.5) | hhvm,
+   php5-dev (<< 5.5) | hhvm-dev,
+   php5-dev (<< 5.5) | cmake,
+   php5-dev (<< 5.5) | libboost-dev,
+   php5-dev (<< 5.5) | libgoogle-glog-dev,
+   php5-dev (<< 5.5) | libdouble-conversion-dev,
+   php5-dev (<< 5.5) | libjemalloc-dev,
+   php5-dev (<< 5.5) | libtbb-dev
+Standards-Version: 3.9.5
+Homepage: https://www.mediawiki.org/wiki/Extension:Scribunto
+
+Package: php-luasandbox
+Architecture: any
+Depends: php5 | php5-cli, ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
+Description: Lua extension for PHP
+ A PHP extension providing a sandboxed Lua environment which can be used to run
+ untrusted code.
+
+Package: hhvm-luasandbox
+Architecture: any
+Depends: ${hhvm:ApiVersion}, ${shlibs:Depends}, ${misc:Depends}
+Description: Lua extension for HHVM
+ A HHVM extension providing a sandboxed Lua environment which can be used to 
run
+ untrusted code.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..9b58d8d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,25 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: luasandbox
+Source: https://www.mediawiki.org/wiki/Extension:Scribunto
+
+Files: *
+Copyright: 2011-2014 Tim Starling
+   2011-2014 Wikimedia Foundation
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/debian/php-luasandbox.install b/debian/php-luasandbox.install
new file mode 100644
index 000..e50171f
--- /dev/null
+++ b/debian/php-luasandbox.install
@@ -0,0 +1 @@
+luasandbox.ini /etc/php5/mods-available
diff --git a/debian/php-luasandbox.postinst b/debian/php-luasandbox.postinst
new file mode 100755
index 000..639753a
--- /dev/null
+++ b/debian/php-luasandbox.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#EXTRA#
+[ "$1" = "configure" ] && [ -x /usr/sbin/php5enmod ] && php5enmod -s ALL 
luasandbox
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/php-luasandbox.prerm b/debian/php-luasandbox.prerm
new file mode 100755
index 000..f9c4bc4
--- /dev/null
+++ b/debian/php-luasandbox.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+#EXTRA#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+   [ -x /usr/sbin/php5enmod ] && php5dismod -s ALL luasandbox
+fi;
+
+#DEBHELPER#
+
+exit 0
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[debian]: Merge branch 'master' into debian

2017-07-20 Thread Tim Starling (Code Review) 
Tim Starling has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366782 )

Change subject: Merge branch 'master' into debian
..

Merge branch 'master' into debian

Change-Id: Icbacb6818484f81109236ef99bfbb7e713614971
---
M debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/php-luasandbox.install
A debian/php-luasandbox.postinst
A debian/php-luasandbox.prerm
A debian/rules
A debian/source/format
9 files changed, 160 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox 
refs/changes/82/366782/1

diff --git a/debian/changelog b/debian/changelog
index 917e5a9..dd918b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,3 @@
-<<< HEAD   (b4a80e Add gbp.conf for non-standard branches)
 php-luasandbox (2.0.13) UNRELEASED; urgency=medium
 
   [ Kunal Mehta ]
@@ -163,5 +162,3 @@
   * Initial release
 
  -- Tim Starling   Tue, 14 Aug 2012 11:23:40 +1000
-===
->>> BRANCH (a07565 Redo PHP->Lua data structure recursion protection)
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..dbea8bb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,32 @@
+Source: php-luasandbox
+Section: web
+Priority: optional
+Maintainer: Tim Starling 
+Build-Depends: debhelper (>= 9),
+   liblua5.1-0-dev,
+   pkg-config,
+   php5-dev (<< 5.5) | php5-dev (>= 5.5),
+   php5-dev (<< 5.5) | hhvm,
+   php5-dev (<< 5.5) | hhvm-dev,
+   php5-dev (<< 5.5) | cmake,
+   php5-dev (<< 5.5) | libboost-dev,
+   php5-dev (<< 5.5) | libgoogle-glog-dev,
+   php5-dev (<< 5.5) | libdouble-conversion-dev,
+   php5-dev (<< 5.5) | libjemalloc-dev,
+   php5-dev (<< 5.5) | libtbb-dev
+Standards-Version: 3.9.5
+Homepage: https://www.mediawiki.org/wiki/Extension:Scribunto
+
+Package: php-luasandbox
+Architecture: any
+Depends: php5 | php5-cli, ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
+Description: Lua extension for PHP
+ A PHP extension providing a sandboxed Lua environment which can be used to run
+ untrusted code.
+
+Package: hhvm-luasandbox
+Architecture: any
+Depends: ${hhvm:ApiVersion}, ${shlibs:Depends}, ${misc:Depends}
+Description: Lua extension for HHVM
+ A HHVM extension providing a sandboxed Lua environment which can be used to 
run
+ untrusted code.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..9b58d8d
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,25 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: luasandbox
+Source: https://www.mediawiki.org/wiki/Extension:Scribunto
+
+Files: *
+Copyright: 2011-2014 Tim Starling
+   2011-2014 Wikimedia Foundation
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/debian/php-luasandbox.install b/debian/php-luasandbox.install
new file mode 100644
index 000..e50171f
--- /dev/null
+++ b/debian/php-luasandbox.install
@@ -0,0 +1 @@
+luasandbox.ini /etc/php5/mods-available
diff --git a/debian/php-luasandbox.postinst b/debian/php-luasandbox.postinst
new file mode 100755
index 000..639753a
--- /dev/null
+++ b/debian/php-luasandbox.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#EXTRA#
+[ "$1" = "configure" ] && [ -x /usr/sbin/php5enmod ] && php5enmod -s ALL 
luasandbox
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/php-luasandbox.prerm b/debian/php-luasandbox.prerm
new file mode 100755
index 000..f9c4bc4
--- /dev/null
+++ b/debian/php-luasandbox.prerm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+#EXTRA#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+   [ -x /usr/sbin/php5enmod ] && php5dismod -s ALL luasandbox
+fi;
+
+#DEBHELPER#
+
+exit 0
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...luasandbox[debian]: Merge branch 'master' into debian

2016-08-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into debian
..


Merge branch 'master' into debian

Change-Id: I702333614e0329aa9afae0c0111d343acd712d5b
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  jenkins-bot: Verified




-- 
To view, visit https://gerrit.wikimedia.org/r/298387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I702333614e0329aa9afae0c0111d343acd712d5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: debian
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits