Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18589
Modified Files:
libcurl3-unified.info libcurl4.info
Added Files:
curl-ssl.info curl-unified-dev.info curl-unified-dev.patch
Removed Files:
curl-unified.info curl-unified.patch
Log Message:
Moved to stable.
--- NEW FILE: curl-unified-dev.patch ---
diff -ru curl-7.11.2.orig/lib/url.c curl-7.11.2/lib/url.c
--- curl-7.11.2.orig/lib/url.c 2004-04-23 01:59:22.000000000 -0400
+++ curl-7.11.2/lib/url.c 2009-02-10 17:43:45.000000000 -0500
@@ -2096,13 +2096,19 @@
urllen=strlen(data->change.url);
if(urllen < LEAST_PATH_ALLOC)
urllen=LEAST_PATH_ALLOC;
+
+ /*
+ * We malloc() the buffers below urllen+3 to make room for two possibilities:
+ * 1 - an extra terminating zero
+ * 2 - (possibly an extra slash and) a terminating zero
+ */
- conn->pathbuffer=(char *)malloc(urllen);
+ conn->pathbuffer=(char *)malloc(urllen+3);
if(NULL == conn->pathbuffer)
return CURLE_OUT_OF_MEMORY; /* really bad error */
conn->path = conn->pathbuffer;
- conn->namebuffer=(char *)malloc(urllen);
+ conn->namebuffer=(char *)malloc(urllen+3);
if(NULL == conn->namebuffer)
return CURLE_OUT_OF_MEMORY;
conn->hostname = conn->namebuffer;
--- curl-unified.patch DELETED ---
--- NEW FILE: curl-unified-dev.info ---
Package: curl-unified-dev
Version: 7.11.2
Revision: 12
Maintainer: Daniel Johnson <[email protected]>
Depends: curl-unified-shlibs (= %v-%r)
BuildDepends: system-openssl-dev, pkgconfig, fink (>= 0.24.12)
BuildDependsOnly: True
Conflicts: libcurl3, libcurl3-ssl, libcurl3-unified, libcurl4, libcurl4-64bit
Replaces: curl-unified (<= 7.9.6-2), libcurl3, libcurl3-ssl, libcurl3-unified,
curl-dev (<< %v-%r), curl-ssl-dev (<< %v-%r), libcurl4, libcurl4-64bit
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
Source-MD5: 542fbdafd2fb051477fa544770b566de
PatchFile: %n.patch
PatchFile-MD5: 0a5aa9a2316c07d64b855b544479afed
PatchScript: <<
%{default_script}
perl -pi.bak -e's,(echo) (-...@libdir@),$1 -L%p/lib/system-openssl/lib $2,'
curl-config.in
<<
SetCPPFLAGS: -I%p/lib/system-openssl/include
SetLDFLAGS: -no-undefined -L%p/lib/system-openssl/lib
ConfigureParams: --mandir=%p/share/man --with-ssl=%p/lib/system-openssl
--disable-dependency-tracking
InstallScript: <<
make install DESTDIR=%d
#No longer install curl binary.
rm -rf %i/bin/curl share/man/man1/curl.1 share/curl/curl-ca-bundle.crt
<<
SplitOff: <<
Package: curl-unified-shlibs
Description: Lib. for transferring files with URL syntax
DescUsage: <<
This version is obsolete and has security flaws.
Please use libcurl4 instead.
<<
Replaces: curl-unified (<= 7.9.6-1), curl-shlibs (<< %n-%r), curl-ssl-shlibs
(<< %n-%r)
Files: lib/libcurl.2.0.2.dylib lib/libcurl.2.dylib
Shlibs: %p/lib/libcurl.2.dylib 3.0.0 %n (>= 7.10-1)
DocFiles: CHANGES COPYING README
<<
SplitOff3: <<
Package: curl-dev
Description: OBSOLETE use curl-unified-dev instead
BuildDependsOnly: true
Depends: curl-unified-dev (= %v-%r), fink-obsolete-packages
Conflicts: libcurl3, libcurl3-ssl, libcurl3-unified, libcurl4
Replaces: libcurl3, libcurl3-ssl, libcurl3-unified, libcurl4
DocFiles: CHANGES COPYING README
<<
SplitOff4: <<
Package: curl-shlibs
Description: OBSOLETE use curl-unified-shlibs instead
Depends: curl-unified-shlibs (= %v-%r), fink-obsolete-packages
DocFiles: CHANGES COPYING README
<<
SplitOff6: <<
Package: curl-ssl-dev
Description: OBSOLETE use curl-unified-dev instead
BuildDependsOnly: true
Depends: curl-unified-dev (= %v-%r), fink-obsolete-packages
Conflicts: libcurl3, libcurl3-ssl, libcurl3-unified, libcurl4
Replaces: libcurl3, libcurl3-ssl, libcurl3-unified, libcurl4
DocFiles: CHANGES COPYING README
<<
SplitOff7: <<
Package: curl-ssl-shlibs
Description: OBSOLETE use curl-unified-shlibs instead
Depends: curl-unified-shlibs (= %v-%r), fink-obsolete-packages
DocFiles: CHANGES COPYING README
<<
DocFiles: <<
CHANGES COPYING README 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
<<
Description: Lib. for transferring files with URL syntax
DescPackaging: <<
Add "-no-undefined" to LDFLAGS to allow prebinding
(thanks to Daniel Johnson for this trick).
Now use System's OpenSSL.
Since a couple of packages still use this ancient thing,
added a patch to fix vulnerability CVE-2005-4077.
Versions before 7.11.1-11 were maintained by Max Horn
<<
DescUsage: <<
This version is obsolete and has security flaws.
Please use libcurl4 instead.
<<
Homepage: http://curl.haxx.se/
License: OSI-Approved
Index: libcurl4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libcurl4.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- libcurl4.info 9 Feb 2010 22:47:54 -0000 1.12
+++ libcurl4.info 4 Aug 2010 16:46:30 -0000 1.13
@@ -1,7 +1,7 @@
Info4: <<
Package: libcurl4%type_pkg[-64bit]
-Version: 7.19.7
-Revision: 2
+Version: 7.21.0
+Revision: 3
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
@@ -32,6 +32,8 @@
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.
Versions of curl before 7.11.1-11 were maintained by Max Horn.
<<
@@ -41,13 +43,13 @@
Source: http://curl.haxx.se/download/curl-%v.tar.bz2
#Source: mirror:custom:curl-%v.tar.bz2
-Source-MD5: 79a8fbb2eed5464b97bdf94bee109380
+Source-MD5: e1a2a773e93a39f3c04cab92c55bf197
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.0-1),
- libssh2.1%type_pkg[-64bit] (>= 1.2-1),
+ libcares2%type_pkg[-64bit] (>= 1.7.3-1),
+ libssh2.1%type_pkg[-64bit] (>= 1.2.6-1),
system-openssl-dev
<<
Conflicts: curl-dev, curl-ssl-dev, curl-unified-dev, libcurl3, libcurl3-ssl,
libcurl3-unified, libcurl4, libcurl4-64bit
@@ -62,8 +64,9 @@
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
- #This patch only needed for 10.4 but doesn't hurt 10.5
- perl -pi -e 's(krb5-config --cflags gssapi)($& | sed
"s,-I/usr/include,,g")g; s(krb5-config --libs gssapi)($& | sed
"s,-L/usr/lib,,g")g' configure
+ #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 .
@@ -85,6 +88,7 @@
--with-ldap-lib=ldap \
--with-lber-lib=no \
--without-libidn \
+ --without-librtmp \
--enable-hidden-symbols \
--enable-ares \
--with-ca-bundle=%p/etc/ssl/certs/ca-bundle.crt \
@@ -127,12 +131,12 @@
Depends: <<
( %type_raw[-64bit] = -64bit ) 64bit-cpu,
ca-bundle,
- libcares2%type_pkg[-64bit]-shlibs (>= 1.7.0-1),
- libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2-1)
+ libcares2%type_pkg[-64bit]-shlibs (>= 1.7.3-1),
+ libssh2.1%type_pkg[-64bit]-shlibs (>= 1.2.6-1)
<<
Files: %lib/libcurl.4.*dylib
- Shlibs: %p/%lib/libcurl.4.dylib 6.0.0 %n (>= 7.18.2-1) %type_num[-64bit]
+ Shlibs: %p/%lib/libcurl.4.dylib 7.0.0 %n (>= 7.20.0-1) %type_num[-64bit]
DocFiles: CHANGES COPYING README RELEASE-NOTES
<<
@@ -148,18 +152,6 @@
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
<<
-SplitOff3: <<
- Package: curl-ssl%type_pkg[-64bit]
- Description: OBSOLETE use curl instead
- Depends: curl%type_pkg[-64bit] (= %v-%r), fink-obsolete-packages
- DocFiles: CHANGES COPYING README RELEASE-NOTES
-<<
-SplitOff4: <<
- Package: curl-unified%type_pkg[-64bit]
- Description: OBSOLETE use curl instead
- Depends: curl%type_pkg[-64bit] (= %v-%r)
- DocFiles: CHANGES COPYING README RELEASE-NOTES
-<<
InfoTest: <<
TestDepends: stunnel4
@@ -173,7 +165,8 @@
#This test fails when run as root.
echo '1001' >>tests/data/DISABLED
-
+ echo '1112' >>tests/data/DISABLED
+
#The SSH tests will also be skipped as root but this isn't fatal.
#Build and run the tests
--- NEW FILE: curl-ssl.info ---
Info4: <<
Package: curl-ssl%type_pkg[-64bit]
Version: 7.21.0
Revision: 3
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
Description: OBSOLETE use curl instead
Maintainer: Daniel Johnson <[email protected]>
Homepage: http://curl.haxx.se/
License: BSD
Source: none
Depends: curl%type_pkg[-64bit] (>= 7.21.0-3), ( %type_raw[-64bit] = -64bit )
64bit-cpu, fink-obsolete-packages
BuildDepends: fink (>= 0.26.2)
CompileScript: echo "This is a dummy package." >README
InstallScript: true
DocFiles: README
SplitOff: <<
Package: curl-unified%type_pkg[-64bit]
Description: OBSOLETE use curl instead
Depends: curl%type_pkg[-64bit] (>= 7.21.0-3), ( %type_raw[-64bit] = -64bit )
64bit-cpu, fink-obsolete-packages
DocFiles: README
<<
<<
--- curl-unified.info DELETED ---
Index: libcurl3-unified.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/net/libcurl3-unified.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libcurl3-unified.info 13 Mar 2009 14:31:59 -0000 1.6
+++ libcurl3-unified.info 4 Aug 2010 16:46:30 -0000 1.7
@@ -45,6 +45,8 @@
/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
+ #No longer install curl binary.
+ rm -rf %i/bin/curl share/man/man1/curl.1 share/curl/curl-ca-bundle.crt
<<
DocFiles: CHANGES COPYING README RELEASE-NOTES
@@ -63,17 +65,6 @@
DocFiles: CHANGES COPYING README RELEASE-NOTES
<<
-SplitOff2: <<
- Package: curl-unified
- Description: OBSOLETE use curl instead
- DescUsage: For additional documentation see the %N package.
-
- Depends: %N-shlibs (= %v-%r)
- Replaces: curl (<< %v-%r), curl-ssl(<< %v-%r)
-
- Files: bin/curl share/man/man1/curl.1 share/curl/curl-ca-bundle.crt
- 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
-<<
SplitOff3: <<
Package: libcurl3
Description: OBSOLETE use libcurl3-unified instead
@@ -89,12 +80,6 @@
Depends: %N-shlibs (= %v-%r), fink-obsolete-packages
DocFiles: CHANGES COPYING README RELEASE-NOTES
<<
-SplitOff5: <<
- Package: curl
- Description: Upgrade package
- Depends: curl-unified (= %v-%r)
- DocFiles: CHANGES COPYING README RELEASE-NOTES
-<<
SplitOff6: <<
Package: libcurl3-ssl
Description: OBSOLETE use libcurl3-unified instead
@@ -110,12 +95,6 @@
Depends: %N-shlibs (= %v-%r), fink-obsolete-packages
DocFiles: CHANGES COPYING README RELEASE-NOTES
<<
-SplitOff8: <<
- Package: curl-ssl
- Description: OBSOLETE use curl instead
- Depends: curl-unified (= %v-%r), fink-obsolete-packages
- DocFiles: CHANGES COPYING README RELEASE-NOTES
-<<
# tests currently broken on Mac OS X
#InfoTest: <<
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
