branch.diff

   1 Index: package2.xml
   2 ===================================================================
   3 Cannot display: file marked as a binary type.
   4 svn:mime-type = application/xml
   5 Index: config.m4
   6 ===================================================================
   7 --- config.m4   (.../tags/RELEASE_0_4)
   8 +++ config.m4   (.../trunk)
   9 @@ -6,7 +6,14 @@
  10  [  --with-crack            Include crack support.])
  11
  12  if test "$PHP_CRACK" != "no"; then
  13 -
  14 +  AC_CHECK_HEADERS(sys/types.h)
  15 +  AC_CHECK_TYPES([u_int8_t, u_int16_t, u_int32_t], [], [], [
  16 +#include <stdio.h>
  17 +#ifdef HAVE_SYS_TYPES_H
  18 +# include <sys/types.h>
  19 +#endif
  20 +])
  21 +
  22    if test "$PHP_CRACK" != "yes"; then
  23      AC_MSG_ERROR(Only the bundled library is supported right now)
  24
  25
  26 Property changes on: config.m4
  27 ___________________________________________________________________
  28 Modified: cvs2svn:cvs-rev
  29 ## -1 +1 ##
  30 -1.11
  31 \ No newline at end of property
  32 +1.12
  33 \ No newline at end of property
  34 Index: crack.c
  35 ===================================================================
  36 --- crack.c     (.../tags/RELEASE_0_4)
  37 +++ crack.c     (.../trunk)
  38 @@ -38,7 +38,7 @@
  39
  40  /* {{{ crack_functions[]
  41   */
  42 -function_entry crack_functions[] = {
  43 +zend_function_entry crack_functions[] = {
  44         PHP_FE(crack_opendict,                  NULL)
  45         PHP_FE(crack_closedict,                 NULL)
  46         PHP_FE(crack_check,                             NULL)
  47 @@ -60,9 +60,7 @@
  48         PHP_RINIT(crack),
  49         PHP_RSHUTDOWN(crack),
  50         PHP_MINFO(crack),
  51 -#if ZEND_MODULE_API_NO >= 20010901
  52 -       "0.3",
  53 -#endif
  54 +       PHP_CRACK_VERSION,
  55         STANDARD_MODULE_PROPERTIES,
  56  };
  57  /* }}} */
  58 @@ -96,6 +94,7 @@
  59         int filename_len;
  60         int result = SUCCESS;
  61
  62 +#if PHP_VERSION_ID < 50400
  63         if (PG(safe_mode)) {
  64                 filename_len = strlen(path) + 10;
  65                 filename = (char *) emalloc(filename_len);
  66 @@ -127,6 +126,7 @@
  67                         return FAILURE;
  68                 }
  69         }
  70 +#endif
  71
  72         if (php_check_open_basedir(path TSRMLS_CC)) {
  73                 return FAILURE;
  74 @@ -155,7 +155,6 @@
  75  {
  76         if ((-1 == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) {
  77                 CRACKLIB_PWDICT *pwdict;
  78 -               printf("trying to open: %s\n", CRACKG(default_dictionary));
  79                 pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r");
  80                 if (NULL != pwdict) {
  81                         ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
  82 @@ -232,6 +231,7 @@
  83  {
  84         php_info_print_table_start();
  85         php_info_print_table_header(2, "crack support", "enabled");
  86 +       php_info_print_table_row(2, "extension version", PHP_CRACK_VERSION);
  87         php_info_print_table_end();
  88
  89         DISPLAY_INI_ENTRIES();
  90
  91 Property changes on: crack.c
  92 ___________________________________________________________________
  93 Modified: cvs2svn:cvs-rev
  94 ## -1 +1 ##
  95 -1.26
  96 \ No newline at end of property
  97 +1.28
  98 \ No newline at end of property
  99 Index: package_dll.xml
 100 ===================================================================
 101 --- package_dll.xml     (.../tags/RELEASE_0_4)
 102 +++ package_dll.xml     (.../trunk)
 103
 104 Property changes on: package_dll.xml
 105 ___________________________________________________________________
 106 Deleted: svn:mime-type
 107 ## -1 +0,0 ##
 108 -application/xml
 109 \ No newline at end of property
 110 Index: libcrack/src/config.h
 111 ===================================================================
 112 --- libcrack/src/config.h       (.../tags/RELEASE_0_4)
 113 +++ libcrack/src/config.h       (.../trunk)
 114 @@ -1,7 +0,0 @@
 115 -#include "../../config.h"
 116 -#if ZTS
 117 -# define THREADSAFE 1
 118 -#endif
 119 -#if !ZEND_DEBUG
 120 -# define NDEBUG
 121 -#endif
 122 Index: libcrack/src/cracklib.h
 123 ===================================================================
 124 --- libcrack/src/cracklib.h     (.../tags/RELEASE_0_4)
 125 +++ libcrack/src/cracklib.h     (.../trunk)
 126 @@ -24,10 +24,17 @@
 127  #endif
 128
 129  #ifdef HAVE_CONFIG_H
 130 -# include "config.h"
 131 +# include "../../config.h"
 132  #endif
 133
 134 -#if HAVE_CRACK_BUNDLED || defined(WIN32)
 135 +#ifdef HAVE_SYS_TYPES_H
 136 +# include <sys/types.h>
 137 +#endif
 138 +
 139 +#ifdef IN_CRACKLIB
 140 +# define MALLOC(x)                          (malloc(x))
 141 +# define FREE(x)                            (free(x))
 142 +#else
 143  # include "php.h"
 144  # include "php_ini.h"
 145  # include "ext/standard/info.h"
 146 @@ -34,20 +41,29 @@
 147  # include "../../php_crack.h"
 148  # define MALLOC(x)                          (emalloc(x))
 149  # define FREE(x)                            (efree(x))
 150 -#elif defined(IN_CRACKLIB)
 151 -# define MALLOC(x)                          (malloc(x))
 152 -# define FREE(x)                            (free(x))
 153 +#endif
 154 +
 155 +#ifdef HAVE_U_INT8_T
 156 +typedef u_int8_t int8;
 157  #else
 158 -# error not available yet
 159 +typedef unsigned char int8;
 160  #endif
 161
 162 +#ifdef HAVE_U_INT16_T
 163 +typedef u_int16_t int16;
 164 +#else
 165 +typedef unsigned short int int16;
 166 +#endif
 167 +
 168 +#ifdef HAVE_U_INT32_T
 169 +typedef u_int32_t int32;
 170 +#else
 171 +typedef unsigned int int32;
 172 +#endif
 173 +
 174  #define STRINGSIZE                          1024
 175  #define TRUNCSTRINGSIZE                     (STRINGSIZE/4)
 176
 177 -typedef unsigned char int8;
 178 -typedef unsigned short int int16;
 179 -typedef unsigned long int int32;
 180 -
 181  #ifndef NUMWORDS
 182  # define NUMWORDS                           16
 183  #endif
 184
 185 Property changes on: libcrack/src/cracklib.h
 186 ___________________________________________________________________
 187 Modified: cvs2svn:cvs-rev
 188 ## -1 +1 ##
 189 -1.1
 190 \ No newline at end of property
 191 +1.4
 192 \ No newline at end of property
 193 Index: libcrack/src/packlib.c
 194 ===================================================================
 195 --- libcrack/src/packlib.c      (.../tags/RELEASE_0_4)
 196 +++ libcrack/src/packlib.c      (.../trunk)
 197 @@ -91,9 +91,9 @@
 198      strcpy(name, prefix);
 199      strcat(name, ".pwi");
 200         if (!(pdesc->ifp = fopen(name, mode))) {
 201 +               perror(name);
 202                 fclose(pdesc->dfp);
 203 -               perror(name);
 204 -        FREE(name);
 205 +               FREE(name);
 206                 FREE(pdesc);
 207
 208                 return (CRACKLIB_PWDICT *) 0;
 209 @@ -128,6 +128,9 @@
 210
 211                         fclose(ifp);
 212                         fclose(dfp);
 213 +                       if (wfp) {
 214 +                               fclose(wfp);
 215 +                       }
 216                         FREE(pdesc);
 217
 218                         return (CRACKLIB_PWDICT *) 0;
 219 @@ -149,6 +152,9 @@
 220
 221                         fclose(ifp);
 222                         fclose(dfp);
 223 +                       if (wfp) {
 224 +                               fclose(wfp);
 225 +                       }
 226                         FREE(pdesc);
 227
 228                         return (CRACKLIB_PWDICT *) 0;
 229 @@ -159,6 +165,9 @@
 230
 231                         fclose(ifp);
 232                         fclose(dfp);
 233 +                       if (wfp) {
 234 +                               fclose(wfp);
 235 +                       }
 236                         FREE(pdesc);
 237
 238                         return (CRACKLIB_PWDICT *) 0;
 239
 240 Property changes on: libcrack/src/packlib.c
 241 ___________________________________________________________________
 242 Modified: cvs2svn:cvs-rev
 243 ## -1 +1 ##
 244 -1.1
 245 \ No newline at end of property
 246 +1.2
 247 \ No newline at end of property
 248 Index: libcrack/src/rules.c
 249 ===================================================================
 250 --- libcrack/src/rules.c        (.../tags/RELEASE_0_4)
 251 +++ libcrack/src/rules.c        (.../trunk)
 252 @@ -433,7 +433,7 @@
 253                                         return (char *) 0;
 254                                 }
 255
 256 -                               if (strlen(area) <= limit) {
 257 +                               if ((int) strlen(area) <= limit) {
 258                                         return (char *) 0;
 259                                 }
 260                                 break;
 261 @@ -450,7 +450,7 @@
 262                                         return (char *) 0;
 263                                 }
 264
 265 -                               if (strlen(area) >= limit) {
 266 +                               if ((int) strlen(area) >= limit) {
 267                                         return (char *) 0;
 268                                 }
 269                                 break;
 270
 271 Property changes on: libcrack/src/rules.c
 272 ___________________________________________________________________
 273 Modified: cvs2svn:cvs-rev
 274 ## -1 +1 ##
 275 -1.1
 276 \ No newline at end of property
 277 +1.2
 278 \ No newline at end of property
 279 Index: package.xml
 280 ===================================================================
 281 --- package.xml (.../tags/RELEASE_0_4)
 282 +++ package.xml (.../trunk)
 283 @@ -0,0 +1,154 @@
 284 +<?xml version="1.0" encoding="ISO-8859-1" ?>
 285 +<!DOCTYPE package SYSTEM "http://pear.php.net/dtd/package-2.0">
 286 +<package version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
 287 +  <name>crack</name>
 288 +  <channel>pecl.php.net</channel>
 289 +  <summary>"Good Password" Checking Utility: Keep your users' passwords reasonably safe from dictionary based attacks</summary>
 290 +  <description>This package provides an interface to the cracklib (libcrack) libraries that come standard on most unix-like distributions. This allows you to check passwords against dictionaries of words to ensure some minimal level of password security.
 291 +
 292 +From the cracklib README
 293 +CrackLib makes literally hundreds of tests to determine whether you've
 294 +chosen a bad password.
 295 +
 296 +* It tries to generate words from your username and gecos entry to tries
 297 +to match them against what you've chosen.
 298 +
 299 +* It checks for simplistic patterns.
 300 +
 301 +* It then tries to reverse-engineer your password into a dictionary
 302 +word, and searches for it in your dictionary.
 303 +
 304 +- after all that, it's PROBABLY a safe(-ish) password. 8-)
 305 +  </description>
 306 +  <lead>
 307 +    <name>Joseph Tate</name>
 308 +    <user>jtate</user>
 309 +    <email>jtate@php.net</email>
 310 +    <active>yes</active>
 311 +  </lead>
 312 +  <lead>
 313 +    <name>Sascha Kettler</name>
 314 +    <user>skettler</user>
 315 +    <email>skettler@php.net</email>
 316 +    <active>yes</active>
 317 +  </lead>
 318 +  <date>2005-09-21</date>
 319 +  <version>
 320 +    <release>0.4</release>
 321 +    <api>0.4</api>
 322 +  </version>
 323 +  <stability>
 324 +    <release>stable</release>
 325 +    <api>stable</api>
 326 +  </stability>
 327 +  <license uri="http://www.php.net/license/3_0.txt">PHP</license>
 328 +  <notes>Updated to PEAR 1.4 (package2.xml format), added binary package for Win32, fixed compatibility with PHP 4.1</notes>
 329 +  <contents>
 330 +    <dir name="">
 331 +      <file role="doc" name="CREDITS" />
 332 +      <file role="doc" name="EXPERIMENTAL" />
 333 +      <file role="src" name="config.m4" />
 334 +      <file role="src" name="config.w32" />
 335 +      <file role="src" name="crack.dsp" />
 336 +      <file role="src" name="crack.c" />
 337 +      <file role="src" name="php_crack.h" />
 338 +      <dir name="libcrack">
 339 +        <file role="doc" name="HISTORY" />
 340 +        <file role="doc" name="LICENCE" />
 341 +        <file role="doc" name="MANIFEST" />
 342 +        <file role="doc" name="POSTER" />
 343 +        <file role="doc" name="README" />
 344 +        <dir name="util">
 345 +          <file role="src" name="mkdict" />
 346 +          <file role="src" name="packer.c" />
 347 +          <file role="src" name="testlib.c" />
 348 +          <file role="src" name="testnum.c" />
 349 +          <file role="src" name="teststr.c" />
 350 +          <file role="src" name="unpacker.c" />
 351 +        </dir>
 352 +        <dir name="src">
 353 +          <file role="src" name="config.h" />
 354 +          <file role="src" name="cracklib.h" />
 355 +          <file role="src" name="fascist.c" />
 356 +          <file role="src" name="genrules.pl" />
 357 +          <file role="src" name="packlib.c" />
 358 +          <file role="src" name="rules.c" />
 359 +        </dir>
 360 +        <dir name="include">
 361 +          <file role="src" name="crack.h" />
 362 +        </dir>
 363 +      </dir>
 364 +      <dir name="tests">
 365 +        <file role="test" name="001.phpt" />
 366 +      </dir>
 367 +    </dir>
 368 +  </contents>
 369 +  <dependencies>
 370 +    <required>
 371 +      <php>
 372 +        <min>4.1.0</min>
 373 +      </php>
 374 +      <pearinstaller>
 375 +        <min>1.4.0b1</min>
 376 +      </pearinstaller>
 377 +    </required>
 378 +  </dependencies>
 379 +  <providesextension>crack</providesextension>
 380 +  <extsrcrelease>
 381 +   <binarypackage>crack_dll</binarypackage>
 382 +  </extsrcrelease>
 383 +  <changelog>
 384 +    <release>
 385 +      <date>2005-09-21</date>
 386 +      <version>
 387 +        <release>0.4</release>
 388 +        <api>0.4</api>
 389 +      </version>
 390 +      <stability>
 391 +        <release>stable</release>
 392 +        <api>stable</api>
 393 +      </stability>
 394 +      <license uri="http://www.php.net/license/3_0.txt">PHP</license>
 395 +      <notes>Updated to PEAR 1.4 (package2.xml format), added binary package for Win32, fixed compatibility with PHP 4.1</notes>
 396 +    </release>
 397 +    <release>
 398 +      <date>2005-09-05</date>
 399 +      <version>
 400 +        <release>0.3</release>
 401 +        <api>0.3</api>
 402 +      </version>
 403 +      <stability>
 404 +        <release>beta</release>
 405 +        <api>beta</api>
 406 +      </stability>
 407 +      <license uri="http://www.php.net/license/3_0.txt">PHP</license>
 408 +      <notes>Bundled with cracklib, removed static variables for thread safety, new functionality</notes>
 409 +    </release>
 410 +    <release>
 411 +      <date>2005-03-17</date>
 412 +      <version>
 413 +        <release>0.2</release>
 414 +        <api>0.2</api>
 415 +      </version>
 416 +      <stability>
 417 +        <release>stable</release>
 418 +        <api>beta</api>
 419 +      </stability>
 420 +      <license uri="http://www.php.net/license/3_0.txt">PHP</license>
 421 +      <notes>Fixes PHP bug #28905</notes>
 422 +    </release>
 423 +    <release>
 424 +      <date>2004-07-21</date>
 425 +      <version>
 426 +        <release>0.1</release>
 427 +        <api>0.1</api>
 428 +      </version>
 429 +      <stability>
 430 +        <release>stable</release>
 431 +        <api>beta</api>
 432 +      </stability>
 433 +      <license uri="http://www.php.net/license/3_0.txt">PHP</license>
 434 +      <notes>Extension moved from PHP source to PECL</notes>
 435 +    </release>
 436 +  </changelog>
 437 +</package>
 438
 439 Property changes on: package.xml
 440 ___________________________________________________________________
 441 Added: cvs2svn:cvs-rev
 442 ## -0,0 +1 ##
 443 +1.4
 444 \ No newline at end of property
 445 Index: win32_dll
 446 ===================================================================
 447 --- win32_dll   (.../tags/RELEASE_0_4)
 448 +++ win32_dll   (.../trunk)
 449
 450 Property changes on: win32_dll
 451 ___________________________________________________________________
 452 Added: svn:ignore
 453 ## -0,0 +1 ##
 454 +*.dll
 455 Index: config.w32
 456 ===================================================================
 457 --- config.w32  (.../tags/RELEASE_0_4)
 458 +++ config.w32  (.../trunk)
 459 @@ -0,0 +1,18 @@
 460 +// $Id$
 461 +// vim:ft=javascript
 462 +
 463 +ARG_WITH("crack", "for cracklib support", "no");
 464 +
 465 +if (PHP_CRACK != "no") {
 466 +       if (PHP_CRACK != "yes") {
 467 +               ERROR("Only the bundled library is supported right now");
 468 +       }
 469 +       else {
 470 +               // Use bundled library
 471 +
 472 +               EXTENSION("crack", "crack.c", null, "-I" + configure_module_dirname + "/libcrack/src");
 473 +               ADD_SOURCES(configure_module_dirname + "/libcrack/src", "fascist.c packlib.c rules.c", "crack");
 474 +               AC_DEFINE("HAVE_CRACK", 1, "Define to 1 if we are building with the crack library.");
 475 +               AC_DEFINE("HAVE_CRACK_BUNDLED", 1, "Define to 1 to build against the bundled crack library.");
 476 +       }
 477 +}
 478
 479 Property changes on: config.w32
 480 ___________________________________________________________________
 481 Added: svn:eol-style
 482 ## -0,0 +1 ##
 483 +native
 484 \ No newline at end of property
 485 Added: cvs2svn:cvs-rev
 486 ## -0,0 +1 ##
 487 +1.3
 488 \ No newline at end of property
 489 Added: svn:keywords
 490 ## -0,0 +1 ##
 491 +Id Rev Revision Date LastChangedDate LastChangedRevision Author LastChangedBy HeadURL URL
 492 \ No newline at end of property
 493 Index: php_crack.h
 494 ===================================================================
 495 --- php_crack.h (.../tags/RELEASE_0_4)
 496 +++ php_crack.h (.../trunk)
 497 @@ -38,6 +38,8 @@
 498
 499  #define crack_module_ptr &crack_module_entry
 500
 501 +#define PHP_CRACK_VERSION "0.5.0-dev"
 502 +
 503  PHP_MINIT_FUNCTION(crack);
 504  PHP_MSHUTDOWN_FUNCTION(crack);
 505  PHP_RINIT_FUNCTION(crack);
 506
 507 Property changes on: php_crack.h
 508 ___________________________________________________________________
 509 Modified: cvs2svn:cvs-rev
 510 ## -1 +1 ##
 511 -1.7
 512 \ No newline at end of property
 513 +1.8
 514 \ No newline at end of property
 515 Index: tests
 516 ===================================================================
 517 --- tests       (.../tags/RELEASE_0_4)
 518 +++ tests       (.../trunk)
 519
 520 Property changes on: tests
 521 ___________________________________________________________________
 522 Added: svn:ignore
 523 ## -0,0 +1,6 ##
 524 +phpt.*
 525 +*.diff
 526 +*.log
 527 +*.exp
 528 +*.out
 529 +*.php
 530 Index: .
 531 ===================================================================
 532 --- .   (.../tags/RELEASE_0_4)
 533 +++ .   (.../trunk)
 534
 535 Property changes on: .
 536 ___________________________________________________________________
 537 Added: svn:ignore
 538 ## -0,0 +1,13 ##
 539 +*.lo
 540 +*.la
 541 +.deps
 542 +*.plg
 543 +*.opt
 544 +*.ncb
 545 +Release
 546 +Release_inline
 547 +Debug
 548 +Release_TS
 549 +Release_TSDbg
 550 +Release_TS_inline
 551 +Debug_TS