Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17:/tmp/cvs-serv3127
Modified Files:
libcurl4.info libcurl4.patch libssh2.1.info
Added Files:
libssh2.1.patch
Log Message:
New upstream version.
Index: libssh2.1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libssh2.1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libssh2.1.info 25 Jun 2007 21:08:44 -0000 1.1
+++ libssh2.1.info 15 Sep 2007 01:45:09 -0000 1.2
@@ -1,5 +1,5 @@
Package: libssh2.1
-Version: 0.15
+Version: 0.17
Revision: 1
Description: Library implementing the SSH2 protocol
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
@@ -9,13 +9,18 @@
The actual name of this library is libssh2; the "2" has
nothing to do with the version number. The major version
number is actually 1.
+
+ Includes latest upstream CVS bug fixes in patch.
<<
Source: mirror:sourceforge:libssh2/libssh2-%v.tar.gz
-Source-MD5: 6c641d6dc0d0e546249cad1d16f10a6a
+Source-MD5: ab172f0737617ba2cd594d7fae03ddbb
+
+PatchFile: %n.patch
+PatchFile-MD5: 98743be1e45cf202ae5b3d5d8b04a6f7
Depends: %N-shlibs (= %v-%r)
-BuildDepends: system-openssl-dev
+BuildDepends: system-openssl-dev, fink (>= 0.24.12)
BuildDependsOnly: true
Conflicts: libssh2
Replaces: libssh2
@@ -40,4 +45,4 @@
InfoTest: <<
TestScript: make check || exit 2
-<<
\ No newline at end of file
+<<
Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- libcurl4.info 12 Jul 2007 01:00:58 -0000 1.13
+++ libcurl4.info 15 Sep 2007 01:45:09 -0000 1.14
@@ -1,6 +1,6 @@
Package: libcurl4
-Version: 7.16.4
-Revision: 101
+Version: 7.17.0
+Revision: 1
Description: Lib. for transferring files with URL syntax
DescPackaging: <<
Now use System's OpenSSL.
@@ -17,6 +17,8 @@
Depend on pkgconfig >= 0.20-1
per http://wiki.finkproject.org/index.php/Fink:Packaging:pkg-config
+ Disabled LDAP for now. Removed -I/usr/include -L/usr/lib from krb5-config.
+
Versions of curl before 7.11.1-11 were maintained by Max Horn.
<<
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
@@ -24,20 +26,29 @@
License: OSI-Approved
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
-Source-MD5: ffa6d1f4e28ca493a43f9dc17882c4d8
+Source-MD5: b529a8d2778c8ad09c33d9bbddee7e44
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1)
-BuildDepends: system-openssl-dev, fink (>= 0.25.0), libssh2.1
+BuildDepends: system-openssl-dev, fink (>= 0.25.0), libssh2.1 (>= 0.17-1)
Conflicts: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified
Replaces: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified
BuildDependsOnly: True
PatchFile: %n.patch
-PatchFile-MD5: 2ce99b9ff92f43cbe72b39647bc8bae0
+PatchFile-MD5: dd7ada70260e399e80947f4f00106039
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-ConfigureParams: --with-ssl=%p/lib/system-openssl --without-gnutls
--without-libidn --disable-dependency-tracking
--with-ldap-lib=/usr/lib/libldap.dylib --with-lber-lib=/usr/lib/liblber.dylib
--enable-hidden-symbols --with-libssh2=%p --with-gssapi=/usr
+ConfigureParams: <<
+ --with-ssl=%p/lib/system-openssl \
+ --without-gnutls \
+ --with-libssh2=%p \
+ --with-gssapi=/usr \
+ --without-libidn \
+ --disable-ldap \
+ --enable-hidden-symbols \
+ --disable-dependency-tracking
+<<
InstallScript: <<
make install DESTDIR=%d
/bin/mkdir -p %I/share/doc/%N
@@ -52,7 +63,7 @@
SplitOff: <<
Package: %N-shlibs
- Depends: libssh2.1-shlibs
+ Depends: libssh2.1-shlibs (>= 0.17-1)
Files: lib/libcurl.4.0.0.dylib lib/libcurl.4.dylib
Shlibs: %p/lib/libcurl.4.dylib 5.0.0 %n (>= 7.16.0-1)
@@ -113,7 +124,8 @@
echo '612' >>tests/data/DISABLED
echo '613' >>tests/data/DISABLED
echo '614' >>tests/data/DISABLED
-
+ echo '615' >>tests/data/DISABLED
+
#Build and run the tests
make test-full || exit 2
<<
--- NEW FILE: libssh2.1.patch ---
diff -Naur libssh2-0.17.orig/NEWS libssh2-0.17/NEWS
--- libssh2-0.17.orig/NEWS 2007-08-06 16:49:41.000000000 -0400
+++ libssh2-0.17/NEWS 2007-09-14 18:34:02.000000000 -0400
@@ -1,3 +1,20 @@
+Version 0.18
+------------
+
+- Peter O'Gorman reported how a SCP transfer would hang for him, and it was
+ fairly easy reproducable. One bug was in the transport layer, ignoring to
+ read more data while there was data left even though it couldn't decrypt the
+ data that was left due to it being too little... The other bug was in the
+ channel layer, where the libssh2_channel_receive_window_adjust() function
+ missed to set the state variables at times and thus this function would
+ misbehave on repeated invokes.
+
+- Changed the signature of libssh2_channel_setenv_ex to add const to the
+ "varname" parameter (Dan Fandrich)
+
+- Satish Mittal and David J Sullivan fixed an infinit recv() loop in
+ libssh2_banner_receive()
+
Version 0.17
------------
Changes since previous version include:
diff -Naur libssh2-0.17.orig/include/libssh2.h libssh2-0.17/include/libssh2.h
--- libssh2-0.17.orig/include/libssh2.h 2007-08-06 16:50:50.000000000 -0400
+++ libssh2-0.17/include/libssh2.h 2007-09-14 18:38:10.000000000 -0400
@@ -79,13 +79,13 @@
typedef long long libssh2_int64_t;
#endif
-#define LIBSSH2_VERSION "0.17"
+#define LIBSSH2_VERSION "0.18-CVS"
/* The numeric version number is also available "in parts" by using these
defines: */
#define LIBSSH2_VERSION_MAJOR 0
-#define LIBSSH2_VERSION_MINOR 17
-#define LIBSSH2_VERSION_PATCH
+#define LIBSSH2_VERSION_MINOR 18
+#define LIBSSH2_VERSION_PATCH 0
/* This is the numeric version of the libssh2 version number, meant for easier
parsing and comparions by programs. The LIBSSH2_VERSION_NUM define will
@@ -102,7 +102,7 @@
and it is always a greater number in a more recent release. It makes
comparisons with greater than and less than work.
*/
-#define LIBSSH2_VERSION_NUM 0x001100
+#define LIBSSH2_VERSION_NUM 0x001200
/*
* This is the date and time when the full source package was created. The
@@ -380,7 +380,7 @@
LIBSSH2_API LIBSSH2_CHANNEL *libssh2_channel_forward_accept(LIBSSH2_LISTENER
*listener);
-LIBSSH2_API int libssh2_channel_setenv_ex(LIBSSH2_CHANNEL *channel, char
*varname, unsigned int varname_len, const char *value, unsigned int value_len);
+LIBSSH2_API int libssh2_channel_setenv_ex(LIBSSH2_CHANNEL *channel, const char
*varname, unsigned int varname_len, const char *value, unsigned int value_len);
#define libssh2_channel_setenv(channel, varname, value)
libssh2_channel_setenv_ex((channel), (varname), strlen(varname), (value),
strlen(value))
LIBSSH2_API int libssh2_channel_request_pty_ex(LIBSSH2_CHANNEL *channel, const
char *term, unsigned int term_len, const char *modes, unsigned int modes_len,
int width, int height, int width_px, int height_px);
diff -Naur libssh2-0.17.orig/src/channel.c libssh2-0.17/src/channel.c
--- libssh2-0.17.orig/src/channel.c 2007-08-06 16:41:31.000000000 -0400
+++ libssh2-0.17/src/channel.c 2007-09-14 18:34:02.000000000 -0400
@@ -700,7 +700,7 @@
* Set an environment variable prior to requesting a shell/program/subsystem
*/
LIBSSH2_API int
-libssh2_channel_setenv_ex(LIBSSH2_CHANNEL * channel, char *varname,
+libssh2_channel_setenv_ex(LIBSSH2_CHANNEL * channel, const char *varname,
unsigned int varname_len, const char *value,
unsigned int value_len)
{
@@ -1327,7 +1327,9 @@
"Unable to send transfer-window adjustment packet,
deferring",
0);
channel->adjust_queue = adjustment;
+ channel->adjust_state = libssh2_NB_state_idle;
} else {
+ channel->adjust_state = libssh2_NB_state_idle;
channel->remote.window_size += adjustment;
}
diff -Naur libssh2-0.17.orig/src/session.c libssh2-0.17/src/session.c
--- libssh2-0.17.orig/src/session.c 2007-08-06 16:41:31.000000000 -0400
+++ libssh2-0.17/src/session.c 2007-09-14 18:34:02.000000000 -0400
@@ -135,16 +135,18 @@
if (errno == EAGAIN) {
session->banner_TxRx_total_send = banner_len;
return PACKET_EAGAIN;
- } else {
- /* Some kinda error */
- session->banner_TxRx_state = libssh2_NB_state_idle;
- session->banner_TxRx_total_send = 0;
- return 1;
}
+
+ /* Some kinda error */
+ session->banner_TxRx_state = libssh2_NB_state_idle;
+ session->banner_TxRx_total_send = 0;
+ return 1;
}
- if (ret <= 0)
- continue;
+ if (ret == 0) {
+ session->socket_state = LIBSSH2_SOCKET_DISCONNECTED;
+ return PACKET_FAIL;
+ }
if (c == '\0') {
/* NULLs are not allowed in SSH banners */
diff -Naur libssh2-0.17.orig/src/transport.c libssh2-0.17/src/transport.c
--- libssh2-0.17.orig/src/transport.c 2007-08-06 16:46:36.000000000 -0400
+++ libssh2-0.17/src/transport.c 2007-09-14 18:34:02.000000000 -0400
@@ -267,7 +267,6 @@
int numdecrypt;
unsigned char block[MAX_BLOCKSIZE];
int blocksize;
- int minimum;
int encrypted = 1;
/*
@@ -293,7 +292,6 @@
blocksize = 5; /* not strictly true, but we can use 5 here to
make the checks below work fine still */
}
- minimum = p->total_num ? p->total_num - p->data_num : blocksize;
/* read/use a whole big chunk into a temporary area stored in
the LIBSSH2_SESSION struct. We will decrypt data from that
@@ -308,8 +306,8 @@
/* if remainbuf turns negative we have a bad internal error */
assert(remainbuf >= 0);
- if (remainbuf < minimum) {
- /* If we have less than a minimum left, it is too
+ if (remainbuf < blocksize) {
+ /* If we have less than a blocksize left, it is too
little data to deal with, read more */
ssize_t nread;
Index: libcurl4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libcurl4.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libcurl4.patch 11 Apr 2007 15:12:29 -0000 1.5
+++ libcurl4.patch 15 Sep 2007 01:45:09 -0000 1.6
@@ -1,6 +1,27 @@
-diff -ru curl-7.16.2.orig/curl-config.in curl-7.16.2/curl-config.in
---- curl-7.16.2.orig/curl-config.in 2007-02-18 04:41:27.000000000 -0500
-+++ curl-7.16.2/curl-config.in 2007-04-11 10:23:59.000000000 -0400
+diff -Naur curl-7.17.0.orig/configure curl-7.17.0/configure
+--- curl-7.17.0.orig/configure 2007-09-02 17:53:27.000000000 -0400
++++ curl-7.17.0/configure 2007-09-14 20:53:51.000000000 -0400
+@@ -24357,7 +24357,7 @@
+
+ if test -z "$GSSAPI_INCS"; then
+ if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+- GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
++ GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi | sed
's,-I/usr/include ,,g'`
+ elif test "$GSSAPI_ROOT" != "yes"; then
+ GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+ fi
+@@ -24821,7 +24821,7 @@
+ LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgss"
+ elif test -z "$GSSAPI_LIB_DIR"; then
+ if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+- gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
++ gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi | sed
's,-L/usr/lib ,,g'`
+ LDFLAGS="$LDFLAGS $gss_ldflags"
+ elif test "$GSSAPI_ROOT" != "yes"; then
+ LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff -lgssapi"
+diff -Naur curl-7.17.0.orig/curl-config.in curl-7.17.0/curl-config.in
+--- curl-7.17.0.orig/curl-config.in 2007-02-18 04:41:27.000000000 -0500
++++ curl-7.17.0/curl-config.in 2007-09-14 20:42:27.000000000 -0400
@@ -187,9 +187,9 @@
CURLLIBDIR=""
fi
@@ -13,9 +34,9 @@
fi
;;
-diff -ru curl-7.16.2.orig/libcurl.pc.in curl-7.16.2/libcurl.pc.in
---- curl-7.16.2.orig/libcurl.pc.in 2007-02-18 04:41:27.000000000 -0500
-+++ curl-7.16.2/libcurl.pc.in 2007-04-11 10:24:28.000000000 -0400
+diff -Naur curl-7.17.0.orig/libcurl.pc.in curl-7.17.0/libcurl.pc.in
+--- curl-7.17.0.orig/libcurl.pc.in 2007-02-18 04:41:27.000000000 -0500
++++ curl-7.17.0/libcurl.pc.in 2007-09-14 20:42:27.000000000 -0400
@@ -33,6 +33,6 @@
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
