diff options
| author | Chin-San Huang <chinsan@FreeBSD.org> | 2007-08-12 06:23:01 +0000 |
|---|---|---|
| committer | Chin-San Huang <chinsan@FreeBSD.org> | 2007-08-12 06:23:01 +0000 |
| commit | 3daf1b65edec4aa6ad011f83f4c32034c5128efd (patch) | |
| tree | 0cb1b51a3335eb0d2a2acd6dfce34abab9a2df0e /security/pecl-ssh2/files | |
| parent | 2f7f551ef16099fbc5e65d7aa2d85595634d727e (diff) | |
| download | ports-3daf1b65edec4aa6ad011f83f4c32034c5128efd.tar.gz ports-3daf1b65edec4aa6ad011f83f4c32034c5128efd.zip | |
Notes
Diffstat (limited to 'security/pecl-ssh2/files')
| -rw-r--r-- | security/pecl-ssh2/files/patch-config.m4 | 53 | ||||
| -rw-r--r-- | security/pecl-ssh2/files/patch-ssh2.c | 11 |
2 files changed, 64 insertions, 0 deletions
diff --git a/security/pecl-ssh2/files/patch-config.m4 b/security/pecl-ssh2/files/patch-config.m4 new file mode 100644 index 000000000000..c9a5559c9f25 --- /dev/null +++ b/security/pecl-ssh2/files/patch-config.m4 @@ -0,0 +1,53 @@ +--- config.m4 2006-03-15 03:10:23.000000000 +0100 ++++ config.m4.oden 2007-08-07 17:00:07.000000000 +0200 +@@ -31,12 +31,12 @@ + + PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, + [ +- PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SSH2_DIR/lib, SSH2_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SSH2_DIR/$PHP_LIBDIR, SSH2_SHARED_LIBADD) + AC_DEFINE(HAVE_SSH2LIB,1,[Have libssh2]) + ],[ + AC_MSG_ERROR([libssh2 version >= 0.4 not found]) + ],[ +- -L$SSH2_DIR/lib -lm ++ -L$SSH2_DIR/$PHP_LIBDIR -lm + ]) + + PHP_CHECK_LIBRARY($LIBNAME,libssh2_channel_forward_listen_ex, +@@ -45,7 +45,7 @@ + ],[ + AC_MSG_WARN([libssh2 <= 0.4, remote forwarding not enabled]) + ],[ +- -L$SSH2_DIR/lib -lm ++ -L$SSH2_DIR/$PHP_LIBDIR -lm + ]) + + PHP_CHECK_LIBRARY($LIBNAME,libssh2_userauth_hostbased_fromfile_ex, +@@ -54,7 +54,7 @@ + ],[ + AC_MSG_WARN([libssh2 <= 0.6, hostbased authentication not enabled]) + ],[ +- -L$SSH2_DIR/lib -lm ++ -L$SSH2_DIR/$PHP_LIBDIR -lm + ]) + + PHP_CHECK_LIBRARY($LIBNAME,libssh2_poll, +@@ -63,7 +63,7 @@ + ],[ + AC_MSG_WARN([libssh2 <= 0.7, poll support not enabled]) + ],[ +- -L$SSH2_DIR/lib -lm ++ -L$SSH2_DIR/$PHP_LIBDIR -lm + ]) + + PHP_CHECK_LIBRARY($LIBNAME,libssh2_publickey_init, +@@ -72,7 +72,7 @@ + ],[ + AC_MSG_WARN([libssh2 <= 0.11, publickey subsystem support not enabled]) + ],[ +- -L$SSH2_DIR/lib -lm ++ -L$SSH2_DIR/$PHP_LIBDIR -lm + ]) + + PHP_SUBST(SSH2_SHARED_LIBADD) diff --git a/security/pecl-ssh2/files/patch-ssh2.c b/security/pecl-ssh2/files/patch-ssh2.c new file mode 100644 index 000000000000..9a59644d2d5a --- /dev/null +++ b/security/pecl-ssh2/files/patch-ssh2.c @@ -0,0 +1,11 @@ +--- ssh2.c 2006-06-07 19:35:34.000000000 +0200 ++++ ssh2.c.oden 2007-08-07 17:32:29.000000000 +0200 +@@ -484,7 +484,7 @@ + + ZEND_FETCH_RESOURCE(session, LIBSSH2_SESSION*, &zsession, -1, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); + +-#if LIBSSH2_APINO < 200412301450 ++#if LIBSSH2_VERSION_NUM < 0x001000 + libssh2_session_methods(session, &kex, &hostkey, &crypt_cs, &crypt_sc, &mac_cs, &mac_sc, &comp_cs, &comp_sc, &lang_cs, &lang_sc); + #else + kex = libssh2_session_methods(session, LIBSSH2_METHOD_KEX); |