[evolvis-commits] r7152: drop hard dependency on php5-perl ( ITP failed and it’s?==?UTF-8?Q? broken anyway ) ↵

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Jan 19 17:06:03 CET 2011


Author: mirabilos
Date: 2011-01-19 17:06:03 +0100 (Wed, 19 Jan 2011)
New Revision: 7152

Modified:
   trunk/gforge_base/evolvisforge/gforge/README.evolvis
   trunk/gforge_base/evolvisforge/gforge/common/include/session.php
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/debian/control
Log:
drop hard dependency on php5-perl (ITP failed and it’s broken anyway)


Modified: trunk/gforge_base/evolvisforge/gforge/README.evolvis
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/README.evolvis	2011-01-19 16:06:01 UTC (rev 7151)
+++ trunk/gforge_base/evolvisforge/gforge/README.evolvis	2011-01-19 16:06:03 UTC (rev 7152)
@@ -59,6 +59,7 @@
   – Patrick Apel
   – Waldemar Brodkorb
   – Lukas Degener
+  – Mike Esser
   – Sven Frommeyer
   – Elmar Geese
   – Sebastian Gerhards

Modified: trunk/gforge_base/evolvisforge/gforge/common/include/session.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/session.php	2011-01-19 16:06:01 UTC (rev 7151)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/session.php	2011-01-19 16:06:03 UTC (rev 7152)
@@ -166,11 +166,21 @@
 		$userstatus = $usr['status'];
 		$num_uid = $usr['user_id'];
 
-		// Compare (crypt) unix_pw first, try Authen::Passphrase next
+		/* compare (crypt) unix_pw first */
 		$is_valid = false;
 		if (crypt($passwd, $usr['unix_pw']) == $usr['unix_pw']) {
 			$is_valid = true;
+		} else if (
+		    /* check for "{crypt}foo" */
+		    strlen($usr['unix_pw']) >= 8 &&
+		    substr($foo, 0, 7) == '{crypt}' &&
+		    crypt($passwd, substr($usr['unix_pw'], 7)) ==
+		    substr($usr['unix_pw'], 7)) {
+			/* we regenerate both user_pw and unix_pw below → ok */
+			$is_valid = true;
 		} else if (extension_loaded("Perl") && $usr['user_pw'] != '') {
+			/* try Authen::Passphrase next, if available */
+
 			if ($usr['user_pw'][0] == '{' /* } */) {
 				// RFC2307 hash
 				$pwhash = $usr['user_pw'];

Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-01-19 16:06:01 UTC (rev 7151)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2011-01-19 16:06:03 UTC (rev 7152)
@@ -15,11 +15,14 @@
     Florian Thiel, so clients can work against a specified target API.
   * Prefer unscd over nscd, it’s said to be more stable and reliable.
   * Fix mis-encoded single quotes in scmsvn:tasktrac and use getopts.
+  * Demote php5-perl dependency to Recommends since it doesn’t work
+    with PHP 5.3; make common/include/session.php run without it as
+    far as possible with crypt hashes even in LDAP format.
 
   [ Mike Esser ]
   * [#1179] Browse Tasks: show Unix name with Realname on hover.
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 19 Jan 2011 16:31:45 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 19 Jan 2011 16:47:04 +0100
 
 gforge (4.8.3+evolvis27) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge/gforge/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/control	2011-01-19 16:06:01 UTC (rev 7151)
+++ trunk/gforge_base/evolvisforge/gforge/debian/control	2011-01-19 16:06:03 UTC (rev 7152)
@@ -48,7 +48,8 @@
 
 Package: gforge-common
 Architecture: all
-Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, python, mksh, php5-perl (>= 1.0.0-2~), libauthen-passphrase-perl, xmlstarlet, w3c-dtd-xhtml, libbsd-arc4random-perl, ed, xz-utils, ${misc:Depends}
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, python, mksh, xmlstarlet, w3c-dtd-xhtml, libbsd-arc4random-perl, ed, xz-utils, ${misc:Depends}
+Recommends: php5-perl (>= 1.0.0-2~), libauthen-passphrase-perl
 Conflicts: sourceforge, gforge-plugin-scmcvs (<< 4.1), gforge-plugin-scmsvn (<< 4.1), gforge-plugin-scmccase (<< 4.1), gforge-theme-starterpack (<< 4.0)
 Description: collaborative development tool - shared files
  FusionForge provides many tools to aid collaboration in a



More information about the evolvis-commits mailing list