[arch-commits] Commit in phpldapadmin/repos/community-any (4 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Wed Aug 14 08:49:24 UTC 2013
Date: Wednesday, August 14, 2013 @ 10:49:23
Author: spupykin
Revision: 95558
archrelease: copy trunk to community-any
Added:
phpldapadmin/repos/community-any/PKGBUILD
(from rev 95557, phpldapadmin/trunk/PKGBUILD)
phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch
(from rev 95557, phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch)
Deleted:
phpldapadmin/repos/community-any/PKGBUILD
phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch
---------------------------------+
PKGBUILD | 98 +++++++++++++--------------
phpldapadmin-1.2.3-php5_5.patch | 134 +++++++++++++++++++-------------------
2 files changed, 116 insertions(+), 116 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-08-14 08:49:14 UTC (rev 95557)
+++ PKGBUILD 2013-08-14 08:49:23 UTC (rev 95558)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=phpldapadmin
-pkgver=1.2.3
-pkgrel=3
-pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
-arch=('any')
-url="http://phpldapadmin.sourceforge.net/"
-license=('GPL')
-depends=('libldap' 'php' 'php-ldap')
-makedepends=('optipng')
-backup=("etc/webapps/phpldapadmin/.htaccess"
- "etc/webapps/phpldapadmin/config.php")
-source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
- phpldapadmin-1.2.3-php5_5.patch )
-md5sums=('59a49054039ceb852c2da377d8742360'
- '966de02d066d9cb90dadf12a213726d3')
-
-build() {
- cd $srcdir/phpldapadmin-${pkgver}/
- find -name '*.png' -exec optipng -quiet -force -fix {} \;
- # patch from http://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
- patch -p1 -i $srcdir/phpldapadmin-1.2.3-php5_5.patch
-}
-
-package() {
- _instdir=$pkgdir/usr/share/webapps/phpldapadmin
- mkdir -p ${_instdir} $pkgdir/etc/webapps/phpldapadmin
- cd ${_instdir}
-
- cp -ra $srcdir/phpldapadmin-${pkgver}/* .
- echo "deny from all" >$pkgdir/etc/webapps/phpldapadmin/.htaccess
-
- ln -s /etc/webapps/phpldapadmin/.htaccess ${_instdir}/.htaccess
- ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
- cp ${_instdir}/config/config.php.example $pkgdir/etc/webapps/phpldapadmin/config.php
-
- cat >$pkgdir/etc/webapps/phpldapadmin/apache.example.conf <<EOF
- Alias /phpldapadmin "/usr/share/webapps/phpldapAdmin"
- <Directory "/usr/share/webapps/phpldapAdmin">
- AllowOverride All
- Options FollowSymlinks
- Order allow,deny
- Allow from all
- php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/"
- </Directory>
-EOF
-}
Copied: phpldapadmin/repos/community-any/PKGBUILD (from rev 95557, phpldapadmin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-08-14 08:49:23 UTC (rev 95558)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=phpldapadmin
+pkgver=1.2.3
+pkgrel=4
+pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
+arch=('any')
+url="http://phpldapadmin.sourceforge.net/"
+license=('GPL')
+depends=('libldap' 'php' 'php-ldap')
+makedepends=('optipng')
+backup=("etc/webapps/phpldapadmin/.htaccess"
+ "etc/webapps/phpldapadmin/config.php")
+source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
+ phpldapadmin-1.2.3-php5_5.patch )
+md5sums=('59a49054039ceb852c2da377d8742360'
+ '966de02d066d9cb90dadf12a213726d3')
+
+build() {
+ cd $srcdir/phpldapadmin-${pkgver}/
+ find -name '*.png' -exec optipng -quiet -force -fix {} \;
+ # patch from http://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
+ patch -p1 -i $srcdir/phpldapadmin-1.2.3-php5_5.patch
+}
+
+package() {
+ _instdir=$pkgdir/usr/share/webapps/phpldapadmin
+ mkdir -p ${_instdir} $pkgdir/etc/webapps/phpldapadmin
+ cd ${_instdir}
+
+ cp -ra $srcdir/phpldapadmin-${pkgver}/* .
+ echo "deny from all" >$pkgdir/etc/webapps/phpldapadmin/.htaccess
+
+ ln -s /etc/webapps/phpldapadmin/.htaccess ${_instdir}/.htaccess
+ ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
+ cp ${_instdir}/config/config.php.example $pkgdir/etc/webapps/phpldapadmin/config.php
+
+ cat >$pkgdir/etc/webapps/phpldapadmin/apache.example.conf <<EOF
+ Alias /phpldapadmin "/usr/share/webapps/phpldapadmin"
+ <Directory "/usr/share/webapps/phpldapadmin">
+ AllowOverride All
+ Options FollowSymlinks
+ Order allow,deny
+ Allow from all
+ php_admin_value open_basedir "/srv/:/tmp/:/usr/share/webapps/:/etc/webapps:/usr/share/pear/"
+ </Directory>
+EOF
+}
Deleted: phpldapadmin-1.2.3-php5_5.patch
===================================================================
--- phpldapadmin-1.2.3-php5_5.patch 2013-08-14 08:49:14 UTC (rev 95557)
+++ phpldapadmin-1.2.3-php5_5.patch 2013-08-14 08:49:23 UTC (rev 95558)
@@ -1,67 +0,0 @@
-diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php phpldapadmin-1.2.3-OK/lib/ds_ldap.php
---- phpldapadmin-1.2.3/lib/ds_ldap.php 2012-10-01 10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php 2013-06-18 16:03:52.295235583 +0400
-@@ -1117,12 +1117,14 @@
- if (is_array($dn)) {
- $a = array();
- foreach ($dn as $key => $rdn)
-- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
-+ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+ function ($matches) { return chr(hexdec($matches[1])); }, $rdn);
-
- return $a;
-
- } else
-- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
-+ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+ function ($matches) { return chr(hexdec($matches[1])); }, $dn);
- }
-
- public function getRootDSE($method=null) {
-diff -Nrbu phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3-OK/lib/functions.php
---- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3-OK/lib/functions.php 2013-06-18 16:03:52.330235281 +0400
-@@ -2127,7 +2127,7 @@
- * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
- * @return string The hashed password.
- */
--function password_hash($password_clear,$enc_type) {
-+function pla_password_hash($password_clear,$enc_type) {
- if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
- debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
-
-@@ -2318,7 +2318,7 @@
-
- # SHA crypted passwords
- case 'sha':
-- if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
-+ if (strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
- return true;
- else
- return false;
-@@ -2327,7 +2327,7 @@
-
- # MD5 crypted passwords
- case 'md5':
-- if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
-+ if( strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
- return true;
- else
- return false;
-@@ -2565,12 +2565,14 @@
- $a = array();
-
- foreach ($dn as $key => $rdn)
-- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
-+ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+ function ($matches) { return chr(hexdec($matches[1])); }, $rdn );
-
- return $a;
-
- } else {
-- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
-+ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
-+ function ($matches) { return chr(hexdec($matches[1])); }, $dn);
- }
- }
-
Copied: phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch (from rev 95557, phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch)
===================================================================
--- phpldapadmin-1.2.3-php5_5.patch (rev 0)
+++ phpldapadmin-1.2.3-php5_5.patch 2013-08-14 08:49:23 UTC (rev 95558)
@@ -0,0 +1,67 @@
+diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php phpldapadmin-1.2.3-OK/lib/ds_ldap.php
+--- phpldapadmin-1.2.3/lib/ds_ldap.php 2012-10-01 10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php 2013-06-18 16:03:52.295235583 +0400
+@@ -1117,12 +1117,14 @@
+ if (is_array($dn)) {
+ $a = array();
+ foreach ($dn as $key => $rdn)
+- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return chr(hexdec($matches[1])); }, $rdn);
+
+ return $a;
+
+ } else
+- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return chr(hexdec($matches[1])); }, $dn);
+ }
+
+ public function getRootDSE($method=null) {
+diff -Nrbu phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3-OK/lib/functions.php
+--- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3-OK/lib/functions.php 2013-06-18 16:03:52.330235281 +0400
+@@ -2127,7 +2127,7 @@
+ * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear.
+ * @return string The hashed password.
+ */
+-function password_hash($password_clear,$enc_type) {
++function pla_password_hash($password_clear,$enc_type) {
+ if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
+ debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
+
+@@ -2318,7 +2318,7 @@
+
+ # SHA crypted passwords
+ case 'sha':
+- if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
++ if (strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0)
+ return true;
+ else
+ return false;
+@@ -2327,7 +2327,7 @@
+
+ # MD5 crypted passwords
+ case 'md5':
+- if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
++ if( strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0)
+ return true;
+ else
+ return false;
+@@ -2565,12 +2565,14 @@
+ $a = array();
+
+ foreach ($dn as $key => $rdn)
+- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn);
++ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return chr(hexdec($matches[1])); }, $rdn );
+
+ return $a;
+
+ } else {
+- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn);
++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/',
++ function ($matches) { return chr(hexdec($matches[1])); }, $dn);
+ }
+ }
+
More information about the arch-commits
mailing list