Refactor and update to official PECL repository

3 files changed, 27 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46e25598560a..6d0eba337c13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,11 @@
+# Generated by mksrcinfo v8
+# Fri Feb 26 15:34:29 UTC 2016
 pkgbase = php-ssh-git
-	pkgdesc = An SSH2 extension for PHP (git version)
-	pkgver = 135.ddaa6a0
+	pkgdesc = An SSH2 extension for PHP
+	pkgver = r159.50d97a5
 	pkgrel = 2
 	url = http://pecl.php.net/package/ssh2
-	install = install
+	install = php-ssh.install
 	arch = i686
 	arch = x86_64
 	license = PHP
@@ -13,7 +15,7 @@ pkgbase = php-ssh-git
 	depends = openssh
 	provides = php-ssh
 	conflicts = php-ssh
-	source = ssh2::git+https://github.com/yardenac/php-ssh2.git#commit=ddaa6a0
+	source = php-ssh-git::git+https://git.php.net/repository/pecl/networking/ssh2.git
 	sha512sums = SKIP
 
 pkgname = php-ssh-git
diff --git a/PKGBUILD b/PKGBUILD
index 36f715f54633..2fcd7ebee086 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,12 @@
-# Maintainer: Yardena Cohen <yardenack at gmail dot com>
+# Maintainer: Stefan Auditor <stefan.auditor@erdfisch.de>
+# Contributor: Yardena Cohen <yardenack at gmail dot com>
 # quick check for commits https://git.php.net/?p=pecl/networking/ssh2.git;a=shortlog
 
-pkgname=php-ssh-git
-pkgver=135.ddaa6a0
+_pkgname=php-ssh
+pkgname=${_pkgname}-git
+pkgver=r159.50d97a5
 pkgrel=2
-pkgdesc="An SSH2 extension for PHP (git version)"
+pkgdesc="An SSH2 extension for PHP"
 url="http://pecl.php.net/package/ssh2"
 license=('PHP')
 arch=('i686' 'x86_64')
@@ -12,24 +14,25 @@ depends=('php' 'openssh')
 makedepends=('php' 'git')
 provides=('php-ssh')
 conflicts=('php-ssh')
-install=install
-source=("ssh2::git+https://github.com/yardenac/php-ssh2.git#commit=ddaa6a0")
+install=${_pkgname}.install
+source=("${pkgname}::git+https://git.php.net/repository/pecl/networking/ssh2.git")
 sha512sums=('SKIP')
 
 pkgver() {
-	 cd "${srcdir}/ssh2"
-	 local ver="$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-	 printf "%s" "${ver//-/.}"
+  cd "${srcdir}/${pkgname}"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	 cd "${srcdir}/ssh2"
-	 phpize
-	 ./configure --prefix=/usr --with-ssh2
-	 make
+  cd "${srcdir}/${pkgname}"
+  phpize
+  ./configure --prefix=/usr --with-ssh2
+  make
 }
 
 package() {
-	 cd "${srcdir}/ssh2"
-	 make install INSTALL_ROOT="${pkgdir}/"
+  cd "${srcdir}/${pkgname}"
+  echo ';extension=ssh2.so' > ssh2.ini
+  install -Dm644 ssh2.ini "${pkgdir}/etc/php/conf.d/ssh2.ini"
+  make install INSTALL_ROOT="${pkgdir}/"
 }
diff --git a/php-ssh.install b/php-ssh.install
new file mode 100644
index 000000000000..979f363ca619
--- /dev/null
+++ b/php-ssh.install
@@ -0,0 +1,3 @@
+post_install() {
+  echo "To enable uncomment ';extension=ssh2.so' in /etc/php/conf.d/ssh2.ini and restart httpd"
+}