Enable XMLRPC-EPI extension

5 files changed, 114 insertions, 4 deletions

diff --git a/debian/control b/debian/control
index 36180bb..3579082 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,7 @@ Build-Depends: apache2-dev (>= 2.4),
                libvpx-dev,
                libwrap0-dev,
                libxml2-dev,
-               libxmlrpc-core-c3-dev,
+               libxmlrpc-epi-dev,
                libxmltok1-dev,
                libxslt1-dev (>= 1.0.18),
                libzip-dev,
@@ -71,7 +71,8 @@ Build-Depends: apache2-dev (>= 2.4),
                tzdata,
                unixodbc-dev,
                zlib1g-dev
-Build-Conflicts: bind-dev
+Build-Conflicts: bind-dev,
+                 libxmlrpc-core-c3-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-php/php.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php.git
@@ -318,6 +319,38 @@ Description: server-side, HTML-embedded scripting language (PHPDBG binary)
  open source general-purpose scripting language that is especially suited
  for web development and can be embedded into HTML.
 
+Package: php7.0-odbc
+Architecture: any
+Depends: php-common,
+         ucf,
+         ${misc:Depends},
+         ${php:Depends},
+         ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Built-Using: ${php:Built-Using}
+Description: ODBC module for PHP
+ This package provides a ODBC module for PHP.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
+Package: php7.0-readline
+Architecture: any
+Depends: php-common,
+         ucf,
+         ${misc:Depends},
+         ${php:Depends},
+         ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Built-Using: ${php:Built-Using}
+Description: readline module for PHP
+ This package provides a readline module for PHP.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
 Package: php7.0-recode
 Architecture: any
 Depends: php-common,
@@ -350,6 +383,22 @@ Description: SQLite3 module for PHP
  open source general-purpose scripting language that is especially suited
  for web development and can be embedded into HTML.
 
+Package: php7.0-xmlrpc
+Architecture: any
+Depends: php-common,
+         ucf,
+         ${misc:Depends},
+         ${php:Depends},
+         ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Built-Using: ${php:Built-Using}
+Description: XMLRPC-EPI module for PHP
+ This package provides a XMLRPC-EPI module for PHP.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
 Package: php7.0-sybase
 Architecture: any
 Depends: php-common,
@@ -382,6 +431,22 @@ Description: GD module for PHP
  open source general-purpose scripting language that is especially suited
  for web development and can be embedded into HTML.
 
+Package: php7.0-mcrypt
+Architecture: any
+Depends: php-common,
+         ucf,
+         ${misc:Depends},
+         ${php:Depends},
+         ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Built-Using: ${php:Built-Using}
+Description: libmcrypt module for PHP
+ This package provides a libmcrypt module for PHP.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
 Package: php7.0-ldap
 Architecture: any
 Depends: php-common,
@@ -478,6 +543,22 @@ Description: IMAP module for PHP
  open source general-purpose scripting language that is especially suited
  for web development and can be embedded into HTML.
 
+Package: php7.0-bz2
+Architecture: any
+Depends: php-common,
+         ucf,
+         ${misc:Depends},
+         ${php:Depends},
+         ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Built-Using: ${php:Built-Using}
+Description: bzip2 module for PHP
+ This package provides a bzip2 module for PHP.
+ .
+ PHP (recursive acronym for PHP: Hypertext Preprocessor) is a widely-used
+ open source general-purpose scripting language that is especially suited
+ for web development and can be embedded into HTML.
+
 Package: php7.0-mysql
 Architecture: any
 Depends: php-common,
diff --git a/debian/control.in b/debian/control.in
index f12ff00..e0ddfa7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -58,7 +58,7 @@ Build-Depends: apache2-dev (>= 2.4),
                libvpx-dev,
                libwrap0-dev,
                libxml2-dev,
-               libxmlrpc-core-c3-dev,
+               libxmlrpc-epi-dev,
                libxmltok1-dev,
                libxslt1-dev (>= 1.0.18),
                libzip-dev,
@@ -71,7 +71,8 @@ Build-Depends: apache2-dev (>= 2.4),
                tzdata,
                unixodbc-dev,
                zlib1g-dev
-Build-Conflicts: bind-dev
+Build-Conflicts: bind-dev,
+                 libxmlrpc-core-c3-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-php/php.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php.git
diff --git a/debian/patches/0045-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch b/debian/patches/0045-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch
new file mode 100644
index 0000000..6979934
--- /dev/null
+++ b/debian/patches/0045-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org>
+Date: Fri, 18 Dec 2015 08:29:15 +0100
+Subject: XMLRPC-EPI library has to be linked as -lxmlrpc-epi
+
+---
+ ext/xmlrpc/config.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
+index f82016e..8b4bd5b 100644
+--- a/ext/xmlrpc/config.m4
++++ b/ext/xmlrpc/config.m4
+@@ -116,7 +116,7 @@ dnl for xmlrpc-epi because of this.
+   fi
+ 
+   PHP_ADD_INCLUDE($XMLRPC_DIR)
+-  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
++  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc-epi, $XMLRPC_DIR/$PHP_LIBDIR, XMLRPC_SHARED_LIBADD)
+   PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c, $ext_shared)
+   XMLRPC_MODULE_TYPE=external
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index e94a2e7..929320b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,3 +42,4 @@
 0042-Add-patch-to-remove-build-timestamps-from-generated-.patch
 0043-Remove-W3C-validation-icon-to-not-expose-the-reader-.patch
 0044-Don-t-put-INSTALL_ROOT-into-phar.phar-exec-stanza.patch
+0045-XMLRPC-EPI-library-has-to-be-linked-as-lxmlrpc-epi.patch
diff --git a/debian/rules.d/ext-xmlrpc.mk b/debian/rules.d/ext-xmlrpc.mk
new file mode 100644
index 0000000..5b31f85
--- /dev/null
+++ b/debian/rules.d/ext-xmlrpc.mk
@@ -0,0 +1,6 @@
+ext_PACKAGES     += xmlrpc
+xmlrpc_DESCRIPTION := XMLRPC-EPI
+xmlrpc_EXTENSIONS  := xmlrpc
+xmlrpc_config      := --with-xmlrpc=shared,/usr
+export xmlrpc_EXTENSIONS
+export xmlrpc_DESCRIPTION