Control: tags -1 patch
On Fri, 4 Feb 2022 12:06:55 +0100 Sebastiaan Couwenberg wrote:
On Fri, 4 Feb 2022 10:41:23 +0000 Niko Tyni <nt...@debian.org> wrote:
> Looking at the build history there, the PHP 8.1 transition seems to fit
> the timeline.
It's actually swig that doesn't support PHP 8 yet, see:
https://bugs.debian.org/1003479
The PHP extension will need to be dropped until swig supports PHP 8.
The attached patch does so.
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
diff -Nru graphviz-2.42.2/debian/changelog graphviz-2.42.2/debian/changelog
--- graphviz-2.42.2/debian/changelog 2021-05-08 11:09:59.000000000 +0200
+++ graphviz-2.42.2/debian/changelog 2022-02-06 18:20:03.000000000 +0100
@@ -1,3 +1,11 @@
+graphviz (2.42.2-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't build PHP extension, swig doesn't support PHP 8 yet.
+ (closes: #1004956)
+
+ -- Bas Couwenberg <sebas...@debian.org> Sun, 06 Feb 2022 18:20:03 +0100
+
graphviz (2.42.2-5) unstable; urgency=high
* Fix CVE-2020-18032: out of bounds write on invalid label
diff -Nru graphviz-2.42.2/debian/control graphviz-2.42.2/debian/control
--- graphviz-2.42.2/debian/control 2020-04-26 07:25:24.000000000 +0200
+++ graphviz-2.42.2/debian/control 2022-02-06 18:18:52.000000000 +0100
@@ -29,7 +29,6 @@
libargon2-dev,
libsodium-dev,
libxml2-dev,
- php-dev,
python3-dev,
libcairo2-dev,
libpango1.0-dev,
@@ -105,17 +104,6 @@
.
This package contains the Perl bindings.
-Package: libgv-php7
-Architecture: any
-Multi-Arch: same
-Section: php
-Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}
-Description: PHP7 bindings for graphviz
- Graphviz is a set of graph drawing tools. See the description of the graphviz
- package for a full description.
- .
- This package contains the PHP7 bindings.
-
Package: python3-gv
Architecture: any
Section: python
diff -Nru graphviz-2.42.2/debian/libgv-php7.install
graphviz-2.42.2/debian/libgv-php7.install
--- graphviz-2.42.2/debian/libgv-php7.install 2019-10-09 18:24:32.000000000
+0200
+++ graphviz-2.42.2/debian/libgv-php7.install 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-usr/lib/*/graphviz/php
-usr/share/php/gv.php
-usr/share/man/man3/gv.3php
diff -Nru graphviz-2.42.2/debian/libgv-php7.README.Debian
graphviz-2.42.2/debian/libgv-php7.README.Debian
--- graphviz-2.42.2/debian/libgv-php7.README.Debian 2018-02-25
15:26:18.000000000 +0100
+++ graphviz-2.42.2/debian/libgv-php7.README.Debian 1970-01-01
01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-README for libgv-php5:
-----------------------
-
- * This PHP extension contains two parts: gv.php and gv.so.
- * Since the search path isn't recursive, one has to use the following
- to use this extension (filename relative to /usr/share/php):
- include('libgv-php5/gv.php');
- * Since this extension contains a loadable module, it seems needed to
- enable them in the PHP configuration. At the time of this writing, it
- can be done by switching enable_dl from Off to On in the following
- configuration file:
- /etc/php5/cli/php.ini
- * This particular file contains comments about possible security issues
- when enabling loadable modules. Those comments probably should be
- taken into account.
-
- -- Cyril Brulebois <k...@debian.org>, Mon, 28 Jul 2008 05:09:59 +0200
diff -Nru graphviz-2.42.2/debian/rules graphviz-2.42.2/debian/rules
--- graphviz-2.42.2/debian/rules 2019-10-09 18:24:32.000000000 +0200
+++ graphviz-2.42.2/debian/rules 2022-02-06 18:19:24.000000000 +0100
@@ -29,9 +29,6 @@
SO_GVPR = 2
SO_LAB-GAMUT = 1
-PHP_EXTENSION_DIR = $(shell php-config --extension-dir)
-PHP_PACKAGE = $(CURDIR)/debian/libgv-php7
-
override_dh_clean:
dh_clean
rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
@@ -73,7 +70,6 @@
--disable-go \
--enable-guile \
--enable-lua \
- --enable-php \
--enable-ruby \
--enable-tcl \
--disable-java \
