Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv28071
Modified Files:
libcurl4.info libssh2.1.info nmap.info rtmpdump.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.7/stable/main/finkinfo/net/libssh2.1.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libssh2.1.info 4 Feb 2012 03:16:22 -0000 1.2
+++ libssh2.1.info 31 Mar 2012 21:56:05 -0000 1.3
@@ -1,7 +1,7 @@
Info4: <<
Package: libssh2.1
Version: 1.4.0
-Revision: 1
+Revision: 2
Description: Library implementing the SSH2 protocol
DescDetail: libssh2 is a C library that implements the SSH2 protocol.
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
@@ -18,27 +18,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)
-BuildDepends: system-openssl-dev, fink (>= 0.26.2)
+BuildDepends: openssl100-dev (>= 1.0.1-1), fink (>= 0.26.2)
BuildDependsOnly: true
Conflicts: libssh2
Replaces: libssh2
+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 F77=no CXX=no
+ConfigureParams: --with-openssl=%p --with-libz=/usr
--disable-dependency-tracking --disable-static F77=no CXX=no
InstallScript: <<
make install DESTDIR=%d
@@ -49,6 +50,8 @@
SplitOff: <<
Package: %N-shlibs
+ Depends: openssl100-shlibs (>= 1.0.1-1)
+
Files: lib/libssh2.1*dylib
Shlibs: %p/lib/libssh2.1.dylib 2.0.0 %n (>= 0.14.99-1)
DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README
Index: nmap.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/nmap.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nmap.info 5 Feb 2012 18:15:58 -0000 1.2
+++ nmap.info 31 Mar 2012 21:56:05 -0000 1.3
@@ -1,7 +1,7 @@
Info2: <<
Package: nmap
Version: 5.51
-Revision: 4
+Revision: 4.1
GCC: 4.0
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Type: python 2.7
@@ -10,11 +10,12 @@
fink (>= 0.24.12),
lua51-dev,
libpcre1,
- system-openssl-dev
+ openssl100-dev
<<
Depends: <<
lua51-shlibs,
libpcre1-shlibs,
+ openssl100-shlibs,
python%type_pkg[python]
<<
Conflicts: nmap-nox (<< 4.76-2), nmap (<< 4.76-2)
@@ -39,7 +40,7 @@
--mandir='$(prefix)/share/man' \
--libexecdir='$(prefix)/lib' \
--with-libpcap=included \
- --with-openssl=%p/lib/system-openssl \
+ --with-openssl=%p \
--with-libpcre \
--with-libdnet=included \
--with-liblua=yes \
Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libcurl4.info 25 Jan 2012 00:55:46 -0000 1.5
+++ libcurl4.info 31 Mar 2012 21:56:05 -0000 1.6
@@ -1,6 +1,6 @@
Info4: <<
Package: libcurl4
-Version: 7.24.0
+Version: 7.25.0
Revision: 1
Description: Lib. for transferring files with URL syntax
DescDetail: <<
@@ -41,14 +41,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)
BuildDepends: <<
fink (>= 0.26.2),
+ fink-package-precedence,
librtmp (>= 2.3-1),
libssh2.1 (>= 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
Replaces: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified
@@ -68,13 +69,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 \
@@ -88,15 +86,18 @@
--enable-threaded-resolver \
--with-ca-bundle=%p/etc/ssl/certs/ca-bundle.crt \
--disable-static \
- --disable-dependency-tracking
+ --enable-dependency-tracking
<<
UseMaxBuildJobs: true
+CompileScript: <<
+ %{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
@@ -112,7 +113,8 @@
Depends: <<
ca-bundle,
librtmp-shlibs (>= 2.3-1),
- libssh2.1-shlibs (>= 1.2.7-1)
+ libssh2.1-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
Index: rtmpdump.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/net/rtmpdump.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rtmpdump.info 1 Aug 2011 23:00:13 -0000 1.2
+++ rtmpdump.info 31 Mar 2012 21:56:05 -0000 1.3
@@ -1,7 +1,7 @@
Info4: <<
Package: rtmpdump
Version: 2.3
-Revision: 1
+Revision: 4
Description: RTMP streaming media client
DescDetail: <<
rtmpdump is a tool for dumping media content streamed over RTMP.
@@ -13,8 +13,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 <dan...@daniel-johnson.org>
-License: GPL2
+License: Restrictive
Homepage: http://rtmpdump.mplayerhq.hu/
Source: http://rtmpdump.mplayerhq.hu/download/%{ni}-%v.tgz
@@ -23,7 +24,7 @@
PatchFile: %{ni}.patch
PatchFile-MD5: ecd1343e47f920b03bd900554b28abec
-BuildDepends: system-openssl-dev, fink (>= 0.24.12)
+BuildDepends: openssl100-dev (>= 1.0.1-1), fink (>= 0.24.12)
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
@@ -58,6 +59,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)
------------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
