Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
  • Loading branch information...
commit 7d59b2264e4ea75c34c86df756a2c2795b94753f 2 parents cbb857f + dbb72de
Christopher Jones authored
15 ext/oci8/config.m4
@@ -8,6 +8,13 @@ else
8 8 PHP_OCI8_SED="$SED";
9 9 fi
10 10
  11 +PHP_OCI8_TAIL1=`echo a | tail -n1 2>/dev/null`
  12 +if test "$PHP_OCI8_TAIL1" = "a"; then
  13 + PHP_OCI8_TAIL1="tail -n1"
  14 +else
  15 + PHP_OCI8_TAIL1="tail -1"
  16 +fi
  17 +
11 18 AC_DEFUN([PHP_OCI_IF_DEFINED],[
12 19 old_CPPFLAGS=$CPPFLAGS
13 20 CPPFLAGS=$3
@@ -49,8 +56,8 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
49 56 AC_DEFUN([AC_OCI8IC_VERSION],[
50 57 AC_MSG_CHECKING([Oracle Instant Client library version compatibility])
51 58 OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
52   - OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -n1` # Oracle 10g, 11g etc
53   - OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | tail -n1`
  59 + OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1` # Oracle 10g, 11g etc
  60 + OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1`
54 61 if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then
55 62 if test ! -f "$OCI8_LCS_BASE"; then
56 63 AC_MSG_ERROR([Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found])
@@ -65,7 +72,7 @@ AC_DEFUN([AC_OCI8IC_VERSION],[
65 72 AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
66 73 AC_MSG_CHECKING([Oracle library version compatibility])
67 74 OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
68   - OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -n1` # Oracle 10g, 11g etc
  75 + OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1` # Oracle 10g, 11g etc
69 76 if test -s "$OCI8_DIR/orainst/unix.rgs"; then
70 77 OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
71 78 test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
@@ -278,7 +285,7 @@ if test "$PHP_OCI8" != "no"; then
278 285 dnl user must pass in the library directory. But on Linux we default
279 286 dnl to the most recent version in /usr/lib which is where the Oracle
280 287 dnl Instant Client RPM gets installed.
281   - PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -n1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
  288 + PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
282 289 if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
283 290 AC_MSG_ERROR([Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR])
284 291 fi
25 ext/oci8/package.xml
@@ -37,8 +37,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
37 37 <time>12:00:00</time>
38 38
39 39 <version>
40   - <release>1.4.8</release>
41   - <api>1.4.8</api>
  40 + <release>1.4.9</release>
  41 + <api>1.4.9</api>
42 42 </version>
43 43 <stability>
44 44 <release>stable</release>
@@ -46,9 +46,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
46 46 </stability>
47 47 <license uri="http://www.php.net/license">PHP</license>
48 48 <notes>
49   - Fixed bug #63307 (Unused variable in oci8.c)
50   - Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
51   - Fixed bug #60901 (Improve "tail" syntax for AIX installation)
  49 + Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
52 50 </notes>
53 51 <contents>
54 52 <dir name="/">
@@ -414,6 +412,23 @@ http://pear.php.net/dtd/package-2.0.xsd">
414 412
415 413 <release>
416 414 <version>
  415 + <release>1.4.8</release>
  416 + <api>1.4.8</api>
  417 + </version>
  418 + <stability>
  419 + <release>stable</release>
  420 + <api>stable</api>
  421 + </stability>
  422 + <license uri="http://www.php.net/license">PHP</license>
  423 + <notes>
  424 + Fixed bug #63307 (Unused variable in oci8.c)
  425 + Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
  426 + Fixed bug #60901 (Improve "tail" syntax for AIX installation)
  427 + </notes>
  428 +</release>
  429 +
  430 +<release>
  431 + <version>
417 432 <release>1.4.7</release>
418 433 <api>1.4.7</api>
419 434 </version>
2  ext/oci8/php_oci8.h
@@ -46,7 +46,7 @@
46 46 */
47 47 #undef PHP_OCI8_VERSION
48 48 #endif
49   -#define PHP_OCI8_VERSION "1.4.8"
  49 +#define PHP_OCI8_VERSION "1.4.9"
50 50
51 51 extern zend_module_entry oci8_module_entry;
52 52 #define phpext_oci8_ptr &oci8_module_entry

0 comments on commit 7d59b22

Please sign in to comment.
Something went wrong with that request. Please try again.