Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv9388
Modified Files:
libcares2.info libcurl4.info libssh2.1.info
Added Files:
libcurl4-10.5.info
Removed Files:
libcurl4-10.6.info
Log Message:
Move to stable.
Index: libcares2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libcares2.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- libcares2.info 4 Aug 2010 16:29:54 -0000 1.5
+++ libcares2.info 4 Oct 2011 16:59:56 -0000 1.6
@@ -1,6 +1,6 @@
Info4: <<
Package: libcares2%type_pkg[-64bit]
-Version: 1.7.3
+Version: 1.7.5
Revision: 1
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
@@ -14,8 +14,8 @@
Maintainer: Daniel Johnson <[email protected]>
Homepage: http://c-ares.haxx.se/
-Source: http://c-ares.haxx.se/c-ares-%v.tar.gz
-Source-MD5: 97ebef758804a6e9b6c0bc65d3c2c25a
+Source: http://c-ares.haxx.se/download/c-ares-%v.tar.gz
+Source-MD5: 800875fc23cd8e1924d8af9172ed33e7
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
Index: libssh2.1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libssh2.1.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- libssh2.1.info 15 Oct 2010 20:20:51 -0000 1.10
+++ libssh2.1.info 4 Oct 2011 16:59:57 -0000 1.11
@@ -38,6 +38,8 @@
<<
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
--- libcurl4-10.6.info DELETED ---
Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- libcurl4.info 15 Oct 2010 20:23:08 -0000 1.14
+++ libcurl4.info 4 Oct 2011 16:59:57 -0000 1.15
@@ -1,10 +1,10 @@
Info4: <<
Package: libcurl4%type_pkg[-64bit]
-Version: 7.21.2
-Revision: 1
+Version: 7.22.0
+Revision: 1+10.6
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
+Architecture: ( %type_raw[-64bit] = -64bit ) i386
+Distribution: 10.6
Description: Lib. for transferring files with URL syntax
DescDetail: <<
curl is a command line tool for transferring files with URL syntax,
@@ -33,8 +33,9 @@
7.19.4 fixes an arbitrary file access vulnerability described at:
http://curl.haxx.se/docs/adv_20090303.html
- Disable librtmp support for now as it requires openssl 0.9.8.
-
+ 7.21.7 fixes inappropriate GSSAPI delegation described at
+ http://curl.haxx.se/docs/adv_20110623.html
+
Versions of curl before 7.11.1-11 were maintained by Max Horn.
<<
Maintainer: Daniel Johnson <[email protected]>
@@ -43,13 +44,13 @@
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
#Source: mirror:custom:curl-%v.tar.bz2
-Source-MD5: ca96df88e044c7c25d19692ec8b250b2
+Source-MD5: bdb5c226d37c4a6082c70e7ef6f63060
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1), ( %type_raw[-64bit] =
-64bit ) 64bit-cpu
BuildDepends: <<
fink (>= 0.26.2),
- libcares2%type_pkg[-64bit] (>= 1.7.3-1),
- libssh2.1%type_pkg[-64bit] (>= 1.2.6-1),
+ librtmp%type_pkg[-64bit] (>= 2.3-1),
+ libssh2.1%type_pkg[-64bit] (>= 1.2.7-1),
system-openssl-dev
<<
Conflicts: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified, libcurl4, libcurl4-64bit
@@ -64,9 +65,6 @@
perl -pi -e 's,\@LDFLAGS\@,,g; s,\@LIBCURL_LIBS\@,,g' libcurl.pc.in
#There is no more libcurl.a so trick curl-config --static-libs into
using libcurl.dylib. Fixes building of pycurl.
perl -pi -e 's/\@libext\@/dylib/' curl-config.in
- #There are issues connecting to servers with IPv6 and IPv4 addresses
when our
- #connection only supports IPv4. Default to using IPv4.
- perl -pi -e 's/^#if ARES_VERSION.*$/#if 0/' lib/hostares.c
#Set up to use system's ldap
/bin/cp /usr/include/lber*.h .
/bin/cp /usr/include/ldap*.h .
@@ -76,7 +74,7 @@
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
+SetLDFLAGS: -L%b -L%p/lib/system-openssl/lib -L%p/%lib -Wl,-dead_strip_dylibs
SetCFLAGS: -Os
ConfigureParams: <<
--with-ssl=%p/lib/system-openssl \
@@ -88,9 +86,9 @@
--with-ldap-lib=ldap \
--with-lber-lib=no \
--without-libidn \
- --without-librtmp \
+ --with-librtmp \
--enable-hidden-symbols \
- --enable-ares \
+ --enable-threaded-resolver \
--with-ca-bundle=%p/etc/ssl/certs/ca-bundle.crt \
--disable-static \
--libdir='${prefix}/%lib' \
@@ -100,12 +98,6 @@
CompileScript: <<
#!/bin/bash -ev
- # This bit enables stripping unused libs on 10.5 and later.
- let version=`uname -r | cut -f 1 -d .`
- if [ $version -ge 9 ]; then
- export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs"
- fi
-
if [ "%type_raw[-64bit]" == "-64bit" ]; then
export CC="gcc -m64"
fi
@@ -132,8 +124,8 @@
Depends: <<
( %type_raw[-64bit] = -64bit ) 64bit-cpu,
ca-bundle,
- libcares2%type_pkg[-64bit]-shlibs (>= 1.7.3-1),
- libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.6-1)
+ librtmp%type_pkg[-64bit]-shlibs (>= 2.3-1),
+ libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.7-1)
<<
Files: %lib/libcurl.4.*dylib
@@ -163,15 +155,26 @@
#and uses wildcard dns lookups.
echo '20' >>tests/data/DISABLED
echo '507' >>tests/data/DISABLED
+ echo '534' >>tests/data/DISABLED
#This test fails when run as root.
echo '1001' >>tests/data/DISABLED
echo '1112' >>tests/data/DISABLED
+
+ #This test seems to hang.
+ echo '283' >>tests/data/DISABLED
+ echo '525' >>tests/data/DISABLED
+ echo '554' >>tests/data/DISABLED
+ echo '1007' >>tests/data/DISABLED
+ echo '1086' >>tests/data/DISABLED
+ echo '1099' >>tests/data/DISABLED
+ echo '2002' >>tests/data/DISABLED
+ echo '2003' >>tests/data/DISABLED
#The SSH tests will also be skipped as root but this isn't fatal.
- #Build and run the tests
- make test-full || exit 2
+ #Build and run the tests. Disable use of valgrind because it takes a LONG
time.
+ make test-full TEST_F="-a -p -r -n" || exit 2
<<
<<
--- NEW FILE: libcurl4-10.5.info ---
Info4: <<
Package: libcurl4%type_pkg[-64bit]
Version: 7.22.0
Revision: 1
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
Distribution: 10.5
Description: Lib. for transferring files with URL syntax
DescDetail: <<
curl is a command line tool for transferring files with URL syntax,
supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP,
LDAPS and FILE. curl supports SSL certificates, HTTP POST, HTTP PUT,
FTP uploading, HTTP form based upload, proxies, cookies, user+password
authentication (Basic, Digest, NTLM, Negotiate, kerberos...), file
transfer resume, proxy tunneling and a busload of other useful tricks.
<<
DescPackaging: <<
Now use System's OpenSSL.
No longer need --mandir. Private symbols now hidden with gcc 4.
Depend on pkgconfig >= 0.20-1
per http://wiki.finkproject.org/index.php/Fink:Packaging:pkg-config
Removed -I/usr/include -L/usr/lib from krb5-config.
No longer build static libs.
Packages depending on libcurl4 no longer need to depend on its dependencies,
just Depend on libcurl4-shlibs and BuildDepend on libcurl4.
Add -dead_strip_dylibs to LDFLAGS on >=10.5 to not link indirect libs.
7.19.4 fixes an arbitrary file access vulnerability described at:
http://curl.haxx.se/docs/adv_20090303.html
7.21.7 fixes inappropriate GSSAPI delegation described at
http://curl.haxx.se/docs/adv_20110623.html
Disable librtmp support for now as it requires openssl 0.9.8.
Versions of curl before 7.11.1-11 were maintained by Max Horn.
<<
Maintainer: Daniel Johnson <[email protected]>
Homepage: http://curl.haxx.se/
License: BSD
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
#Source: mirror:custom:curl-%v.tar.bz2
Source-MD5: bdb5c226d37c4a6082c70e7ef6f63060
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1), ( %type_raw[-64bit] =
-64bit ) 64bit-cpu
BuildDepends: <<
fink (>= 0.26.2),
libssh2.1%type_pkg[-64bit] (>= 1.2.7-1),
system-openssl-dev
<<
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
BuildDependsOnly: True
PatchScript: <<
#Since we're not building static libs, no need to cascade dep libs.
perl -pi -e 's/link_all_deplibs=yes/link_all_deplibs=no/g' configure
#Clear out unnecessary junk. Leave -lssl in curl-config as a hack for
pycurl.
perl -pi -e 's,\@LDFLAGS\@,,g; s,\@LIBCURL_LIBS\@,-lssl,g'
curl-config.in
perl -pi -e 's,\@LDFLAGS\@,,g; s,\@LIBCURL_LIBS\@,,g' libcurl.pc.in
#There is no more libcurl.a so trick curl-config --static-libs into
using libcurl.dylib. Fixes building of pycurl.
perl -pi -e 's/\@libext\@/dylib/' curl-config.in
#Set up to use system's ldap
/bin/cp /usr/include/lber*.h .
/bin/cp /usr/include/ldap*.h .
/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
SetCFLAGS: -Os
ConfigureParams: <<
--with-ssl=%p/lib/system-openssl \
--without-gnutls \
--with-libssh2=%p \
--with-gssapi=/usr \
--enable-ldap \
--disable-ldaps \
--with-ldap-lib=ldap \
--with-lber-lib=no \
--without-libidn \
--without-librtmp \
--enable-hidden-symbols \
--enable-threaded-resolver \
--with-ca-bundle=%p/etc/ssl/certs/ca-bundle.crt \
--disable-static \
--libdir='${prefix}/%lib' \
--disable-dependency-tracking
<<
UseMaxBuildJobs: true
CompileScript: <<
#!/bin/bash -ev
if [ "%type_raw[-64bit]" == "-64bit" ]; then
export CC="gcc -m64"
fi
%{default_script}
<<
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
/bin/cp docs/libcurl/*.html %I/share/doc/%N/libcurl
/bin/mkdir -p %I/share/aclocal
/bin/cp docs/libcurl/libcurl.m4 %I/share/aclocal
<<
DocFiles: CHANGES COPYING README RELEASE-NOTES
SplitOff: <<
Package: %N-shlibs
Depends: <<
( %type_raw[-64bit] = -64bit ) 64bit-cpu,
ca-bundle,
libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.7-1)
<<
Files: %lib/libcurl.4.*dylib
Shlibs: %p/%lib/libcurl.4.dylib 7.0.0 %n (>= 7.20.0-1) %type_num[-64bit]
DocFiles: CHANGES COPYING README RELEASE-NOTES
<<
SplitOff2: <<
Package: curl%type_pkg[-64bit]
Description: Tool for transferring files with URL syntax
DescUsage: For additional documentation see the %N package.
Depends: %N-shlibs (= %v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu
Conflicts: curl, curl-64bit
Replaces: curl-ssl (<< %v-%r), curl-unified (<< %v-%r), curl, curl-64bit
Files: bin/curl share/man/man1/curl.1
DocFiles: CHANGES COPYING README RELEASE-NOTES docs/BINDINGS docs/BUGS
docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/HISTORY docs/KNOWN_BUGS
docs/INTERNALS docs/MANUAL docs/RESOURCES docs/THANKS docs/TODO
docs/TheArtOfHttpScripting docs/LICENSE-MIXING docs/SSLCERTS docs/VERSIONS
<<
InfoTest: <<
TestDepends: stunnel4
TestScript: <<
#!/bin/bash -ev
#These tests fail if you use OpenDNS or your ISP sucks
#and uses wildcard dns lookups.
echo '20' >>tests/data/DISABLED
echo '507' >>tests/data/DISABLED
echo '534' >>tests/data/DISABLED
#This test fails when run as root.
echo '1001' >>tests/data/DISABLED
echo '1112' >>tests/data/DISABLED
#This test seems to hang.
echo '283' >>tests/data/DISABLED
echo '525' >>tests/data/DISABLED
echo '554' >>tests/data/DISABLED
echo '1007' >>tests/data/DISABLED
echo '1086' >>tests/data/DISABLED
echo '1099' >>tests/data/DISABLED
echo '2002' >>tests/data/DISABLED
echo '2003' >>tests/data/DISABLED
#The SSH tests will also be skipped as root but this isn't fatal.
#Build and run the tests. Disable use of valgrind because it takes a LONG
time.
make test-full TEST_F="-a -p -r -n" || exit 2
<<
<<
#Mirrors taken from http://curl.haxx.se/metalink.cgi?curl=tar.bz2 on 20081128
CustomMirror: <<
eur-at: http://gd.tuwien.ac.at/utils/archivers/curl/
eur-at: ftp://gd.tuwien.ac.at/utils/archivers/curl/
eur-be: ftp://ftp.spegulo.be/pub/curl/
sam-cl: http://curl.freeby.pctools.cl/download/
eur-fr: ftp://miroir-francais.fr/pub/curl/download/
eur-de: http://curl.de-mirror.de/download/
eur-de: http://www.mirrorspace.org/curl/
eur-de: http://curl.online-mirror.de/download/
eur-de: http://curl.linux-mirror.org/download/
eur-de: http://dl.ambiweb.de/mirrors/curl.haxx.se/
eur-de: http://curl.oslevel.de/download/
eur-de: http://curl.mirror.at.stealer.net/download/
eur-de: http://curl.basemirror.de/download/
eur-de: http://curl.very-clever.com/download/
asi-hk: http://www.execve.net/curl/
eur-il: http://curl.cheap.co.il/download/
eur-nl: http://curl.nedmirror.nl/download/
eur-nl: http://curl.osmirror.nl/download/
eur-nl: http://curl.xxtracker.org/download/
eur-pl: http://curl.piotrkosoft.net/download/
eur-se: http://curl.haxx.se/download/
eur-se: http://cool.haxx.se/curl/
eur-se: http://curl2.haxx.se/download/
eur-se: ftp://ftp.sunet.se/pub/www/utilities/curl/
asi-tw: http://curl.cs.pu.edu.tw/download/
nam-us: http://curl.download.nextag.com/download/
nam-us: http://curl.hoxt.com/download/
eur-uk: http://curl.smudge-it.co.uk/download/
<<
<<
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
