Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv28185
Modified Files:
libcurl4-10.5.info libcurl4.info libssh2.1.info
rtmpdump-10.6.info
Added Files:
libssh2.1.patch
Log Message:
New upstream libcurl4 7.25.0.
Switch from system-openssl to openssl100.
Index: libssh2.1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libssh2.1.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- libssh2.1.info 4 Feb 2012 03:16:31 -0000 1.12
+++ libssh2.1.info 31 Mar 2012 21:56:13 -0000 1.13
@@ -1,7 +1,7 @@
Info4: <<
Package: libssh2.1%type_pkg[-64bit]
Version: 1.4.0
-Revision: 1
+Revision: 2
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
Distribution: ( %type_raw[-64bit] = -64bit ) 10.5, ( %type_raw[-64bit] =
-64bit ) 10.6
@@ -21,27 +21,28 @@
just Depend on libssh2.1-shlibs and BuildDepend on libssh2.1.
Patch to not build example programs.
+ Patch to work with openssl100 from upstream.
<<
Source: http://www.libssh2.org/download/libssh2-%v.tar.gz
Source-MD5: ee670161d8c5dff93ae84a3f34f15669
Depends: %N-shlibs (= %v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu
-BuildDepends: system-openssl-dev, fink (>= 0.26.2)
+BuildDepends: openssl100-dev (>= 1.0.1-1), fink (>= 0.26.2)
BuildDependsOnly: true
Conflicts: libssh2, libssh2.1, libssh2.1-64bit
Replaces: libssh2, libssh2.1, libssh2.1-64bit
+PatchFile: %n.patch
+PatchFile-MD5: 22e3f16f14b4480145025a87b9470728
PatchScript: <<
+ %{default_script}
# Don't build example programs
perl -pi -e 's/^SUBDIRS = src example tests docs/SUBDIRS = src tests docs/'
Makefile.in
<<
-NoSetCPPFLAGS: true
-NoSetLDFLAGS: true
-SetCPPFLAGS: -I%p/lib/system-openssl/include
-SetLDFLAGS: -L%p/lib/system-openssl/lib
+
SetCFLAGS: -Os
-ConfigureParams: --with-openssl=%p/lib/system-openssl --with-libz=/usr
--disable-dependency-tracking --disable-static --libdir='${prefix}/%lib' F77=no
CXX=no
+ConfigureParams: --with-openssl=%p --with-libz=/usr
--disable-dependency-tracking --disable-static F77=no CXX=no
CompileScript: <<
#!/bin/bash -ev
@@ -53,8 +54,6 @@
InstallScript: <<
make install DESTDIR=%d
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/%lib/*.la
<<
DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README
@@ -62,7 +61,7 @@
SplitOff: <<
Package: %N-shlibs
- Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu
+ Depends: openssl100-shlibs (>= 1.0.1-1), ( %type_raw[-64bit] = -64bit )
64bit-cpu
Files: %lib/libssh2.1*dylib
Shlibs: %p/%lib/libssh2.1.dylib 2.0.0 %n (>= 0.14.99-1) %type_num[-64bit]
Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- libcurl4.info 25 Jan 2012 00:55:55 -0000 1.17
+++ libcurl4.info 31 Mar 2012 21:56:13 -0000 1.18
@@ -1,6 +1,6 @@
Info4: <<
Package: libcurl4%type_pkg[-64bit]
-Version: 7.24.0
+Version: 7.25.0
Revision: 1+10.6
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) i386
@@ -44,14 +44,15 @@
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
#Source: mirror:custom:curl-%v.tar.bz2
-Source-MD5: f912221d75eb8d8fe08900eaf011b023
+Source-MD5: f0303d47d9d3e6e4f08c2863c6504823
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1), ( %type_raw[-64bit] =
-64bit ) 64bit-cpu
BuildDepends: <<
fink (>= 0.2 << (= %v-%r), pkgconfig (>= 0.20-1), ( %type_raw[-64bit]
= -64bit ) 64bit-cpu tic F77=no CXX=no tic --libdir='${prefix}/%lib' F77=no
CXX=no ¬=ÿ P=ÿ ó¨})q+ Ê~)q+ è´)q+ *q+ P=ÿ °¼*q+ `¢=ÿ 0¡=ÿ ë½})q+ 6
è è ! è ! à¬=ÿ P=ÿ xT*q+ `£=ÿ "¡})q+ ¾})q+ à¬=ÿ ð })q+ =ÿ ÀOþ*q+ ó¨})q+ @þ*q+ ØDþ*q+ ¨Iþ*q+ Ê~)q+ xT*q+ `£=ÿ 0¢=ÿ ë½})q+ à! à! à¬=ÿ P=ÿ È z*q+ @¤=ÿ "¡})q+ ¾})q+ à¬=ÿ ð })q+ =ÿ =ÿ =ÿ »)q+ p P=ÿ ó¨})q+ Ê~)q+ @¤=ÿ £=ÿ ë½})q+ G H I J K M N O P à¬=ÿ P=ÿ HÕP*q+ à¥=ÿ "¡})q+ ¾})q+ à¬=ÿ 0Oþ*q+ ó¨})q+ `*q+
.*q+ @þ*q+ ØDþ*q+ ¨Iþ*q+ Ê~)q+ HÕP*q+ à¥=ÿ
¤=ÿ ë½})q+ 8ÕP*q+ à¥=ÿ P¤=ÿ ë½})q+ (ÕP*q+ à¥=ÿ ¤=ÿ ë½})q+ ÕP*q+ à¥=ÿ °¤=ÿ ë½})q+
¨Nþ*q+ ó¨})q+ ¨Iþ*q+ 0=ÿ X.*q+ æ§})q+ ØDþ*q+ P¥=ÿ yX.*q+ æ§})q+ @þ*q+ ¥=ÿ ZX.*q+ æ§})q+ Ø.*q+ `*q+
.*q+ @þ*q+ Ød*q+ ØDþ*q+ ¨Iþ*q+ Ê~)q+ »)q+ Ýù)q+ P=ÿ p-*q+ 0§=ÿ ¦=ÿ ë½})q+ 5 6 7 8 : < = > ? @ B D à¬=ÿ P=ÿ àÝö)q+ P=ÿ ó¨})q+ è´)q+ °¥=ÿ Ýù)q+ æ§})q+ è´)q+ Õ_@f ÆS
Qöl±í ÁóÅ)q+ P=ÿ àÝö)q+ @¨=ÿ §=ÿ ë½})q+ u]ÞÓ
4Q ÷U^Qʧ ¶uª¹ñìò*Äv´rÿ)q+ ®=ÿ Fpa+q+ Fpa+q+ ?Åü)q+ P®=ÿ à¬=ÿ p©=ÿ =ÿ =ÿ =ÿ Я=ÿ Bpa+q+ ®=ÿ Ød*q+ i*q+ Ê~)q+ ÿÿÿÿÿÿÿÿBpa+q+ X=ÿ ë½}) 6.2),
+ fink-package-precedence,
librtmp%type_pkg[-64bit] (>= 2.3-1),
libssh2.1%type_pkg[-64bit] (>= 1.2.7-1),
- system-openssl-dev
+ openssl100-dev (>= 1.0.1-1)
<<
Conflicts: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified, libcurl4, libcurl4-64bit
Replaces: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified, libcurl4, libcurl4-64bit
@@ -71,13 +72,10 @@
/bin/cp /usr/lib/libldap.dylib .
<<
-NoSetCPPFLAGS: true
-NoSetLDFLAGS: true
-SetCPPFLAGS: -I%b -I%p/lib/system-openssl/include -I%p/include
-SetLDFLAGS: -L%b -L%p/lib/system-openssl/lib -L%p/%lib -Wl,-dead_strip_dylibs
+SetLDFLAGS: -Wl,-dead_strip_dylibs
SetCFLAGS: -Os
ConfigureParams: <<
- --with-ssl=%p/lib/system-openssl \
+ --with-ssl=%p \
--without-gnutls \
--with-libssh2=%p \
--with-gssapi=/usr \
@@ -92,7 +90,7 @@
--with-ca-bundle=%p/etc/ssl/certs/ca-bundle.crt \
--disable-static \
--libdir='${prefix}/%lib' \
- --disable-dependency-tracking
+ --enable-dependency-tracking
<<
UseMaxBuildJobs: true
@@ -102,13 +100,12 @@
export CC="gcc -m64"
fi
%{default_script}
+ fink-package-precedence --prohibit-bdep=%n .
<<
InstallScript: <<
perl -pi -e 's/-g -Os -Wl,-search_paths_first //g; s/-dynamic //g'
curl-config libcurl.pc
make install DESTDIR=%d
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/%lib/*.la
/bin/mkdir -p %I/share/doc/%N
/bin/cp docs/*.html %I/share/doc/%N
/bin/mkdir -p %I/share/doc/%N/libcurl
@@ -125,7 +122,8 @@
( %type_raw[-64bit] = -64bit ) 64bit-cpu,
ca-bundle,
librtmp%type_pkg[-64bit]-shlibs (>= 2.3-1),
- libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.7-1)
+ libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.7-1),
+ openssl100-shlibs (>= 1.0.1-1)
<<
Files: %lib/libcurl.4.*dylib
Index: rtmpdump-10.6.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/rtmpdump-10.6.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rtmpdump-10.6.info 20 Dec 2011 23:58:05 -0000 1.2
+++ rtmpdump-10.6.info 31 Mar 2012 21:56:13 -0000 1.3
@@ -1,10 +1,9 @@
Info4: <<
Package: rtmpdump%type_pkg[-64bit]
Version: 2.3
-Revision: 3
+Revision: 4
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) i386
-#Needs openssl 0.9.8 or later so only builds on 10.6
Distribution: 10.6
Description: RTMP streaming media client
DescDetail: <<
@@ -17,8 +16,9 @@
Plain rtmp, as well as tunneled and encrypted sessions are supported.
<<
+DescPackaging: Actual license is GPL2 but use Restrictive due to openssl.
Maintainer: Daniel Johnson <[email protected]>
-License: GPL2
+License: Restrictive
Homepage: http://rtmpdump.mplayerhq.hu/
Source: http://rtmpdump.mplayerhq.hu/download/%{ni}-%v.tgz
@@ -32,7 +32,7 @@
<<
Depends: ( %type_raw[-64bit] = -64bit ) 64bit-cpu
-BuildDepends: system-openssl-dev, fink (>= 0.24.12)
+BuildDepends: openssl100-dev (>= 1.0.1-1), fink (>= 0.24.12)
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
@@ -84,6 +84,7 @@
Description: Shared ibraries for RTMP streaming
License: LGPL2
+ Depends: openssl100-shlibs (>= 1.0.1-1)
Files: %lib/librtmp.0.dylib
Shlibs: %p/%lib/librtmp.0.dylib 1.0.0 %n (>= 2.3-1) %type_num[-64bit]
Index: libcurl4-10.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libcurl4-10.5.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libcurl4-10.5.info 25 Jan 2012 00:55:55 -0000 1.3
+++ libcurl4-10.5.info 31 Mar 2012 21:56:13 -0000 1.4
@@ -1,6 +1,6 @@
Info4: <<
Package: libcurl4%type_pkg[-64bit]
-Version: 7.24.0
+Version: 7.25.0
Revision: 1
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
@@ -46,13 +46,14 @@
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
#Source: mirror:custom:curl-%v.tar.bz2
-Source-MD5: f912221d75eb8d8fe08900eaf011b023
+Source-MD5: f0303d47d9d3e6e4f08c2863c6504823
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1), ( %type_raw[-64bit] =
-64bit ) 64bit-cpu
BuildDepends: <<
fink (>= 0.26.2),
+ fink-package-precedence,
libssh2.1%type_pkg[-64bit] (>= 1.2.7-1),
- system-openssl-dev
+ openssl100-dev (>= 1.0.1-1)
<<
Conflicts: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified, libcurl4, libcurl4-64bit
Replaces: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified, libcurl4, libcurl4-64bit
@@ -72,13 +73,10 @@
/bin/cp /usr/lib/libldap.dylib .
<<
-NoSetCPPFLAGS: true
-NoSetLDFLAGS: true
-SetCPPFLAGS: -I%b -I%p/lib/system-openssl/include -I%p/include
-SetLDFLAGS: -L%b -L%p/lib/system-openssl/lib -L%p/%lib -Wl,-dead_strip_dylibs
+SetLDFLAGS: -Wl,-dead_strip_dylibs
SetCFLAGS: -Os
ConfigureParams: <<
- --with-ssl=%p/lib/system-openssl \
+ --with-ssl=%p \
--without-gnutls \
--with-libssh2=%p \
--with-gssapi=/usr \
@@ -93,7 +91,7 @@
--with-ca-bundle=%p/etc/ssl/certs/ca-bundle.crt \
--disable-static \
--libdir='${prefix}/%lib' \
- --disable-dependency-tracking
+ --enable-dependency-tracking
<<
UseMaxBuildJobs: true
@@ -103,13 +101,12 @@
export CC="gcc -m64"
fi
%{default_script}
+ fink-package-precedence --prohibit-bdep=%n .
<<
InstallScript: <<
perl -pi -e 's/-g -Os -Wl,-search_paths_first //g; s/-dynamic //g'
curl-config libcurl.pc
make install DESTDIR=%d
- #No need for dependency_libs in .la files if not building static libs
- perl -pi -e "s/dependency_libs=.*$/dependency_libs=''/" %i/%lib/*.la
/bin/mkdir -p %I/share/doc/%N
/bin/cp docs/*.html %I/share/doc/%N
/bin/mkdir -p %I/share/doc/%N/libcurl
@@ -125,7 +122,8 @@
Depends: <<
( %type_raw[-64bit] = -64bit ) 64bit-cpu,
ca-bundle,
- libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.7-1)
+ libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.7-1),
+ openssl100-shlibs (>= 1.0.1-1)
<<
Files: %lib/libcurl.4.*dylib
--- NEW FILE: libssh2.1.patch ---
diff --git a/src/openssl.c b/src/openssl.c
index db95b12..481982c 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -201,7 +201,7 @@ _libssh2_cipher_crypt(_libssh2_cipher_ctx * ctx,
return ret == 1 ? 0 : 1;
}
-#if LIBSSH2_AES_CTR && !defined(HAVE_EVP_AES_128_CTR)
+#if LIBSSH2_AES_CTR
#include <openssl/aes.h>
#include <openssl/evp.h>
@@ -217,6 +217,10 @@ static int
aes_ctr_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc) /* init key */
{
+ /*
+ * variable "c" is leaked from this scope, but is later freed
+ * in aes_ctr_cleanup
+ */
aes_ctr_ctx *c = malloc(sizeof(*c));
const EVP_CIPHER *aes_cipher;
(void) enc;
@@ -358,6 +362,8 @@ void _libssh2_init_aes_ctr(void)
_libssh2_EVP_aes_256_ctr();
}
+#else
+void _libssh2_init_aes_ctr(void) {}
#endif /* LIBSSH2_AES_CTR */
/* TODO: Optionally call a passphrase callback specified by the
diff --git a/src/openssl.h b/src/openssl.h
index a196184..6d2aeed 100644
--- a/src/openssl.h
+++ b/src/openssl.h
@@ -148,15 +148,9 @@ void libssh2_md5(const unsigned char *message, unsigned
long len, unsigned char
#define _libssh2_cipher_aes256 EVP_aes_256_cbc
#define _libssh2_cipher_aes192 EVP_aes_192_cbc
#define _libssh2_cipher_aes128 EVP_aes_128_cbc
-#ifdef HAVE_EVP_AES_128_CTR
-#define _libssh2_cipher_aes128ctr EVP_aes_128_ctr
-#define _libssh2_cipher_aes192ctr EVP_aes_192_ctr
-#define _libssh2_cipher_aes256ctr EVP_aes_256_ctr
-#else
#define _libssh2_cipher_aes128ctr _libssh2_EVP_aes_128_ctr
#define _libssh2_cipher_aes192ctr _libssh2_EVP_aes_192_ctr
#define _libssh2_cipher_aes256ctr _libssh2_EVP_aes_256_ctr
-#endif
#define _libssh2_cipher_blowfish EVP_bf_cbc
#define _libssh2_cipher_arcfour EVP_rc4
#define _libssh2_cipher_cast5 EVP_cast5_cbc
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
