Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377243 )
Change subject: Rebuild for php5.5 on jessie-wikimedia
......................................................................
Rebuild for php5.5 on jessie-wikimedia
Bug: T174972
Change-Id: If36a82b1a232efe6806bd11c8d8d9a7777f469f3
---
M debian/changelog
M debian/control
D debian/hhvm-luasandbox.lintian-overrides
D debian/php-luasandbox.lintian-overrides
R debian/php5.5-luasandbox.install
A debian/php5.5-luasandbox.lintian-overrides
R debian/php5.5-luasandbox.postinst
R debian/php5.5-luasandbox.prerm
M debian/rules
9 files changed, 23 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox
refs/changes/43/377243/1
diff --git a/debian/changelog b/debian/changelog
index ac5fd70..71f15ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+php-luasandbox (2.0.13) jessie-wikimedia; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for jessie-wikimedia with php5.5
+
+ -- Antoine Musso <has...@free.fr> Mon, 11 Sep 2017 13:52:56 +0200
+
php-luasandbox (2.0.13) trusty-wikimedia; urgency=medium
[ Kunal Mehta ]
diff --git a/debian/control b/debian/control
index dbea8bb..58ab7d0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,28 +5,19 @@
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
+ php5.5-dev,
+ cmake,
+ libboost-dev,
+ libgoogle-glog-dev,
+ libdouble-conversion-dev,
+ libjemalloc-dev,
+ libtbb-dev
Standards-Version: 3.9.5
Homepage: https://www.mediawiki.org/wiki/Extension:Scribunto
-Package: php-luasandbox
+Package: php5.5-luasandbox
Architecture: any
-Depends: php5 | php5-cli, ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}
+Depends: php5.5 | php5.5-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/hhvm-luasandbox.lintian-overrides
b/debian/hhvm-luasandbox.lintian-overrides
deleted file mode 100644
index 820cff8..0000000
--- a/debian/hhvm-luasandbox.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-hhvm-luasandbox: latest-debian-changelog-entry-changed-to-native
diff --git a/debian/php-luasandbox.lintian-overrides
b/debian/php-luasandbox.lintian-overrides
deleted file mode 100644
index d96c690..0000000
--- a/debian/php-luasandbox.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-php-luasandbox: latest-debian-changelog-entry-changed-to-native
diff --git a/debian/php-luasandbox.install b/debian/php5.5-luasandbox.install
similarity index 100%
rename from debian/php-luasandbox.install
rename to debian/php5.5-luasandbox.install
diff --git a/debian/php5.5-luasandbox.lintian-overrides
b/debian/php5.5-luasandbox.lintian-overrides
new file mode 100644
index 0000000..47d0b5c
--- /dev/null
+++ b/debian/php5.5-luasandbox.lintian-overrides
@@ -0,0 +1 @@
+php5.5-luasandbox: latest-debian-changelog-entry-changed-to-native
diff --git a/debian/php-luasandbox.postinst b/debian/php5.5-luasandbox.postinst
similarity index 100%
rename from debian/php-luasandbox.postinst
rename to debian/php5.5-luasandbox.postinst
diff --git a/debian/php-luasandbox.prerm b/debian/php5.5-luasandbox.prerm
similarity index 100%
rename from debian/php-luasandbox.prerm
rename to debian/php5.5-luasandbox.prerm
diff --git a/debian/rules b/debian/rules
index c19f212..3e8b3ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,9 @@
#!/usr/bin/make -f
-HHVM=$(shell test -f /usr/bin/hphpize && echo "HHVM")
-
-ifeq ($(HHVM), HHVM)
- configure_targets = php_configure hhvm_configure
- build_targets = php_build hhvm_build
- install_targets = php_install hhvm_install
- gencontrol_targets = php_gencontrol hhvm_gencontrol
-else
- configure_targets = php_configure
- build_targets = php_build
- install_targets = php_install
- gencontrol_targets = php_gencontrol hhvm_gencontrol
-endif
+configure_targets = php_configure
+build_targets = php_build
+install_targets = php_install
+gencontrol_targets = php_gencontrol
%:
dh $@
@@ -26,49 +17,23 @@
| tar -xf - -C debian/build-php
cd debian/build-php && /usr/bin/phpize && dh_auto_configure
-hhvm_configure:
- ## HHVM
- mkdir -p debian/build-hhvm
- tar -cf - --exclude=debian/build* --exclude=.pc . \
- | tar -xf - -C debian/build-hhvm
- cd debian/build-hhvm && /usr/bin/hphpize
- # workaround "cmake .." bug in HHVM's CMake extension code
- # Also, link to lua-c++
- cd debian/build-hhvm && cmake . \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_BUILD_TYPE=None \
- -DLUA_USE_CPP=1
- cd debian/build-hhvm && dh_auto_configure
-
override_dh_auto_build: $(build_targets)
php_build:
cd debian/build-php && dh_auto_build
-
-hhvm_build:
- cd debian/build-hhvm && dh_auto_build
override_dh_auto_test:
override_dh_auto_install: $(install_targets)
php_install:
- INSTALL_ROOT=$(CURDIR)/debian/php-luasandbox make -C debian/build-php
install
-
-hhvm_install:
- DESTDIR=$(CURDIR)/debian/hhvm-luasandbox make -C debian/build-hhvm
install
+ INSTALL_ROOT=$(CURDIR)/debian/php5.5-luasandbox make -C
debian/build-php install
override_dh_gencontrol: $(gencontrol_targets)
dh_gencontrol
php_gencontrol:
- echo "php:Depends=phpapi-$(shell php-config5 --phpapi)" >>
debian/php-luasandbox.substvars
-
-hhvm_gencontrol:
- # HHVM does *not* ensure binary compatibility
- hhvmapi=$(shell /usr/bin/hhvm --version | sed -ne 's/^HipHop VM
\(.*\)\..*/\1/p') && \
- [ -n "$${hhvmapi}" ] && echo
"hhvm:ApiVersion=hhvm-api-$${hhvmapi}" >> debian/hhvm-luasandbox.substvars
+ echo "php:Depends=phpapi-$(shell php-config5.5 --phpapi)" >>
debian/php5.5-luasandbox.substvars
override_dh_auto_clean:
rm -rf debian/build*
--
To view, visit https://gerrit.wikimedia.org/r/377243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If36a82b1a232efe6806bd11c8d8d9a7777f469f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: debian
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
