2.9.8

3 files changed, 38 insertions, 164 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82fabbac35b1..047b82051ac4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,14 @@
 pkgbase = php71-xdebug
-	pkgdesc = PHP extension module that aids debugging and profiling
-	pkgver = 2.6.0
+	pkgdesc = php71 Xdebug extension
+	pkgver = 2.9.8
 	pkgrel = 1
-	url = http://www.xdebug.org
-	arch = i686
+	url = https://xdebug.org/
 	arch = x86_64
-	license = GPL
-	depends = php>=7.1.0
-	depends = php<7.2.0
-	source = https://www.xdebug.org/files/xdebug-2.6.0.tgz
-	source = xdebug.ini
-	sha256sums = b5264cc03bf68fcbb04b97229f96dca505d7b87ec2fb3bd4249896783d29cbdc
-	sha256sums = 7c66883dc2ade69069ef84e30188b25630748aa9c8b0dd123727c00505421205
+	arch = i686
+	license = Xdebug
+	makedepends = php71
+	source = http://pecl.php.net/get/xdebug-2.9.8.tgz
+	sha256sums = f555b6cc58d96c9965af942d22e0f1818b7a477a410c76b1ab0eebe85a762f8a
 
 pkgname = php71-xdebug
-	backup = etc/php71/conf.d/xdebug.ini
-
+	backup = 
diff --git a/PKGBUILD b/PKGBUILD
index 1b102aba469b..d82233506eac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,153 +1,36 @@
-#
-# Maintainer: Tung Ha <tunght13488 [at] gmail [dot] com>
-# Contributor: Michael Rynn <michael.rynn@parracan.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jonathan Wiersma <arch aur at jonw dot org>
-# Contributor: Thore Bödecker <me [at] foxxx0 [dot] de>
-#
-# Credit to all other past PHP version AUR packages
-
-php_suffix="71" # This mutation
-php_version="7.1"
-php_ext="xdebug"
-pkgname="php${php_suffix}-${php_ext}"
-pkgver="2.6.0"
+ext_name=xdebug
+phpbase=71
+suffix=
+pkgname="php${phpbase}-${ext_name}${suffix}"
+pkgver=2.9.8
+source=("http://pecl.php.net/get/$ext_name-$pkgver.tgz")
 pkgrel=1
+pkgdesc="php${phpbase}${suffix} Xdebug extension"
+arch=("x86_64" "i686")
+url="https://xdebug.org/"
+license=('Xdebug')
+makedepends=("php${phpbase}${suffix}")
+backup=()
 
-
-pkgdesc="PHP extension module that aids debugging and profiling"
-arch=('i686' 'x86_64')
-url="http://www.xdebug.org"
-license=('GPL')
-depends=('php>=7.1.0' 'php<7.2.0')
-
-pkg_src="${php_ext}-${pkgver}"
-
-source=("https://www.xdebug.org/files/${pkg_src}.tgz"  'xdebug.ini')
-
-sha256sums=('b5264cc03bf68fcbb04b97229f96dca505d7b87ec2fb3bd4249896783d29cbdc'
-            '7c66883dc2ade69069ef84e30188b25630748aa9c8b0dd123727c00505421205')
-
-
-# locate php-config[suffix], get options
-# xdebug build uses phpize[suffix]
-
-php_select()
-{
-    declare -a php_configy # paths
-
-
-    # pass a folder to be searched for any php-config*
-    findconfig()
-    {
-      local _myglob="$1/php-config${php_suffix}*"
-      for f in $_myglob;
-      do
-        if [ "$f" != "$_myglob" ]; then
-          php_configy+=("$f")
-        fi
-      done
-    }
-
-    binpath="${PATH}"
-
-    re='([^:]+):(.*)'
-    while [[ $binpath =~ $re ]]
-    do
-      bindir="${BASH_REMATCH[1]}"
-      binpath="${BASH_REMATCH[2]}"
-      findconfig $bindir
-    done
-    if [[ -n $binpath ]]; then
-      findconfig $binpath
-    fi
-
-    # see how many we have
-    optct="${#php_configy[@]}"
-
-    # if only one, do automatic??
-    if [[ $optct -lt "1" ]]; then
-        echo "No php-config* found"
-        exit -1
-    elif [[ $optct -eq "1" ]]; then
-        php_config="${php_configy[0]}"
-    else
-      declare -a php_options # assemble user menu
-      optct=0
-      php_options+=("0) Get me out of here!")
-      for cfg in "${php_configy[@]}";
-      do
-        let optct='((optct+1))'
-        PHP_FULL_VERSION=`${cfg} --version`
-        php_options+=("${optct}) ${cfg}  (php-${PHP_FULL_VERSION})")
-      done
-      echo
-      echo "More than one php-config found. Select:"
-      echo
-      for opt in "${php_options[@]}"; do
-        echo $opt
-      done
-      echo
-      read -p "Which php-config do you want? " choice
-      numbers='[0-9]+$'
-      if ! [[ "${choice}" =~ $numbers ]]; then
-        echo "bye"
-        exit
-      fi
-      if [[ ( "${choice}" -gt "$optct" ) || ( "${choice}" -lt  "1" ) ]]; then
-        echo "OK"
-        exit
-      fi
-      let choice='((choice-1))'
-      php_config="${php_configy[$choice]}"
-    fi
-
-    #get some config options,  assumable from php70
-    all_options=`${php_config} --configure-options`
-
-    declare -A config_options # AA for key lookup
-    attre='--([^=]+)=(.*)'
-    for option in $all_options; do
-        [[ $option =~ $attre ]] && vname="${BASH_REMATCH[1]}" && nvalue="${BASH_REMATCH[2]}"
-        config_options[$vname]=$nvalue
-    done
-
-    # export so makepkg remembers. PHP-build dependent
-    export PHPCONFIG_SCANDIR="${config_options[with-config-file-scan-dir]#/*}"
-    export PHPIZE_CMD="phpize${config_options[program-suffix]}"
-    export PHPCONFIG_CMD="${php_config}"
-
-}
-
-prepare()
-{
-    echo "PHPIZE path is ${PHPIZE_CMD}"
-    echo "PHP scan directory is $PHPCONFIG_SCANDIR"
-}
 build() {
-  cd "$srcdir"/$pkg_src
-  "$PHPIZE_CMD"
-  echo "Using php-config=${PHPCONFIG_CMD}"
-  ./configure --prefix=/usr --enable-xdebug --with-php-config="${PHPCONFIG_CMD}"
-  make
-
-  cd "$srcdir"/$pkg_src/debugclient
-  ./configure --prefix=/usr --program-suffix="$_pkg_suffix"
-  make
+    cd "${ext_name}-${pkgver}"
+    phpize${phpbase}${suffix}
+    ./configure \
+        --with-php-config=php-config${phpbase}${suffix}
+    make
 }
 
 package() {
-  backup=("${PHPCONFIG_SCANDIR}/xdebug.ini")
-  #cd "$srcdir"/$pkg_src/debugclient
-  #make DESTDIR="$pkgdir" install
-
-  cd "$srcdir"/$pkg_src
-  make INSTALL_ROOT="$pkgdir" install
-  install -D -m 644 "$srcdir"/xdebug.ini "$pkgdir/${PHPCONFIG_SCANDIR}/xdebug.ini"
-
-  install -D -m755 "./debugclient/debugclient" "${pkgdir}/usr/bin/debugclient${php_suffix}"
+    cd "$ext_name-$pkgver"
+    _priority=40
+    ext_dir="$(php-config${phpbase}${suffix} --extension-dir)"
+    _ini_dir="/etc/php${phpbase}${suffix}/conf.d"
+    _ini_file="${_ini_dir}/${_priority}-${ext_name}.ini"
+    backup+=("${_ini_file}")
+    install -m0755 -d "${pkgdir}/${_ini_dir}"
+    echo "zend_extension=${ext_name}.so" > "${pkgdir}/${_ini_file}"
+    chmod 0644 "${pkgdir}/${_ini_file}"
+    install -m0755 -D ".libs/${ext_name}.so" "${pkgdir}/${ext_dir}/${ext_name}.so"
 }
-# Run this  before the backup file variables get evaluated
-if [[ -z $PHPIZE_CMD ]]; then
-    php_select
-fi
+
+sha256sums=('f555b6cc58d96c9965af942d22e0f1818b7a477a410c76b1ab0eebe85a762f8a')
diff --git a/xdebug.ini b/xdebug.ini
deleted file mode 100644
index 779718ea93a9..000000000000
--- a/xdebug.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-;zend_extension=xdebug.so
-;xdebug.remote_enable=on
-;xdebug.remote_host=127.0.0.1
-;xdebug.remote_port=9000
-;xdebug.remote_handler=dbgp