From e70def369c45e1897d2dc82a86b8245594969666 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 11 Nov 2014 17:05:20 +0000 Subject: [PATCH] curl: bump version * remove old versions. * handle CVE-2014-3707. * depends on pkgconfig. --- net-misc/curl/curl-7.22.0.recipe | 33 ----- net-misc/curl/curl-7.26.0.recipe | 115 ----------------- net-misc/curl/curl-7.28.1.recipe | 33 ----- net-misc/curl/curl-7.29.0.recipe | 33 ----- net-misc/curl/curl-7.32.0.recipe | 115 ----------------- net-misc/curl/curl-7.33.0.recipe | 115 ----------------- net-misc/curl/curl-7.35.0.recipe | 115 ----------------- net-misc/curl/curl-7.36.0.recipe | 116 ----------------- net-misc/curl/curl-7.37.0.recipe | 117 ------------------ ...{curl-7.37.1.recipe => curl-7.39.0.recipe} | 5 +- net-misc/curl/patches/curl-7.18.1.diff | 16 --- net-misc/curl/patches/curl-7.19.7.patch | 40 ------ net-misc/curl/patches/curl-7.22.0.patch | 15 --- net-misc/curl/patches/curl-7.25.0.patch | 12 -- net-misc/curl/patches/curl-7.26.0.patch | 12 -- 15 files changed, 4 insertions(+), 888 deletions(-) delete mode 100644 net-misc/curl/curl-7.22.0.recipe delete mode 100644 net-misc/curl/curl-7.26.0.recipe delete mode 100644 net-misc/curl/curl-7.28.1.recipe delete mode 100644 net-misc/curl/curl-7.29.0.recipe delete mode 100644 net-misc/curl/curl-7.32.0.recipe delete mode 100644 net-misc/curl/curl-7.33.0.recipe delete mode 100644 net-misc/curl/curl-7.35.0.recipe delete mode 100644 net-misc/curl/curl-7.36.0.recipe delete mode 100644 net-misc/curl/curl-7.37.0.recipe rename net-misc/curl/{curl-7.37.1.recipe => curl-7.39.0.recipe} (94%) delete mode 100644 net-misc/curl/patches/curl-7.18.1.diff delete mode 100644 net-misc/curl/patches/curl-7.19.7.patch delete mode 100644 net-misc/curl/patches/curl-7.22.0.patch delete mode 100644 net-misc/curl/patches/curl-7.25.0.patch delete mode 100644 net-misc/curl/patches/curl-7.26.0.patch diff --git a/net-misc/curl/curl-7.22.0.recipe b/net-misc/curl/curl-7.22.0.recipe deleted file mode 100644 index ad9fd6a90..000000000 --- a/net-misc/curl/curl-7.22.0.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.22.0.tar.bz2" -CHECKSUM_MD5="bdb5c226d37c4a6082c70e7ef6f63060" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.22.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL() -{ - cd curl-7.22.0 - make install -} - -TEST() -{ - cd curl-7.22.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe deleted file mode 100644 index 118a6c17a..000000000 --- a/net-misc/curl/curl-7.26.0.recipe +++ /dev/null @@ -1,115 +0,0 @@ -SUMMARY="A commandline-tool and library for downloading data from URLs" -HOMEPAGE="http://curl.haxx.se" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." -LICENSE="Curl" -SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" -CHECKSUM_SHA256="fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a" -REVISION="5" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PATCHES="curl-7.26.0.patch" - -PROVIDES=" - curl$secondaryArchSuffix = $portVersion - lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:curl = $portVersion compat >= 7.16 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - ca_root_certificates - lib:libssl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - " - -BUILD() -{ - certsInstallDir="$portPackageLinksDir/ca_root_certificates" - certsDir="$certsInstallDir/$relativeDataRootDir/ssl" - - libtoolize --force --copy --install - autoconf - runConfigure ./configure \ - --enable-ipv6 \ - --with-ca-bundle="$certsDir/CARootCertificates.pem" - make $jobArgs -} - -INSTALL() -{ - make install - - # prepare develop/lib - prepareInstalledDevelLibs libcurl - fixPkgconfig - - # fix curl-config - fixDevelopLibDirReferences $binDir/curl-config - sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ - -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config - - # install html documentation for curl - mkdir -p "$docDir" - install -c -m 644 "docs/curl.html" "$docDir" - - # install html development documentation for libcurl - mkdir -p "$developDocDir" - for h in docs/libcurl/*.html; do - install -c -m 644 "$h" "$developDocDir" - done - - # devel package - packageEntries devel \ - $binDir/curl-config \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi -} - -TEST() -{ - make check -} - -DESCRIPTION=" -Curl is a command line tool for transferring data with URL syntax, supporting \ -DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ -POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. 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. -" - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - curl${secondaryArchSuffix}_devel = $portVersion - cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 - devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -REQUIRES_devel=" - curl$secondaryArchSuffix == $portVersion base - " diff --git a/net-misc/curl/curl-7.28.1.recipe b/net-misc/curl/curl-7.28.1.recipe deleted file mode 100644 index 4edbc9429..000000000 --- a/net-misc/curl/curl-7.28.1.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.28.1.tar.bz2" -CHECKSUM_MD5="26eb081c999b0e203770869427e9a93d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.28.1 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL() -{ - cd curl-7.28.1 - make install -} - -TEST() -{ - cd curl-7.28.1 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.29.0.recipe b/net-misc/curl/curl-7.29.0.recipe deleted file mode 100644 index c9ffc72c0..000000000 --- a/net-misc/curl/curl-7.29.0.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.29.0.tar.bz2" -CHECKSUM_MD5="fa5f37f38a8042020e292ce7ec5341ce" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.29.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL() -{ - cd curl-7.29.0 - make install -} - -TEST() -{ - cd curl-7.29.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.32.0.recipe b/net-misc/curl/curl-7.32.0.recipe deleted file mode 100644 index d6f22e2d5..000000000 --- a/net-misc/curl/curl-7.32.0.recipe +++ /dev/null @@ -1,115 +0,0 @@ -SUMMARY="A commandline-tool and library for downloading data from URLs" -HOMEPAGE="http://curl.haxx.se" -COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." -LICENSE="Curl" -SRC_URI="http://curl.haxx.se/download/curl-7.32.0.tar.bz2" -CHECKSUM_SHA256="8e3db42548e01407cb2f1407660c0f528b89ec7afda6264442fc2b229b95223b" -REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" - -PATCHES="" - -PROVIDES=" - curl$secondaryArchSuffix = $portVersion - lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:curl = $portVersion compat >= 7.16 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - ca_root_certificates - lib:libssl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - " - -BUILD() -{ - certsInstallDir="$portPackageLinksDir/ca_root_certificates" - certsDir="$certsInstallDir/$relativeDataRootDir/ssl" - - libtoolize --force --copy --install - autoconf - runConfigure ./configure \ - --enable-ipv6 \ - --with-ca-bundle="$certsDir/CARootCertificates.pem" - make $jobArgs -} - -INSTALL() -{ - make install - - # prepare develop/lib - prepareInstalledDevelLibs libcurl - fixPkgconfig - - # fix curl-config - fixDevelopLibDirReferences $binDir/curl-config - sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ - -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config - - # install html documentation for curl - mkdir -p "$docDir" - install -c -m 644 "docs/curl.html" "$docDir" - - # install html development documentation for libcurl - mkdir -p "$developDocDir" - for h in docs/libcurl/*.html; do - install -c -m 644 "$h" "$developDocDir" - done - - # devel package - packageEntries devel \ - $binDir/curl-config \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi -} - -TEST() -{ - make check -} - -DESCRIPTION=" -Curl is a command line tool for transferring data with URL syntax, supporting \ -DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ -POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. 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. -" - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - curl${secondaryArchSuffix}_devel = $portVersion - cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 - devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -REQUIRES_devel=" - curl$secondaryArchSuffix == $portVersion base - " diff --git a/net-misc/curl/curl-7.33.0.recipe b/net-misc/curl/curl-7.33.0.recipe deleted file mode 100644 index 9de062176..000000000 --- a/net-misc/curl/curl-7.33.0.recipe +++ /dev/null @@ -1,115 +0,0 @@ -SUMMARY="A commandline-tool and library for downloading data from URLs" -HOMEPAGE="http://curl.haxx.se" -COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." -LICENSE="Curl" -SRC_URI="http://curl.haxx.se/download/curl-7.33.0.tar.bz2" -CHECKSUM_SHA256="0afde4cd949e2658eddc3cda675b19b165eea1af48ac5f3e1ec160792255d1b3" -REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" - -PATCHES="" - -PROVIDES=" - curl$secondaryArchSuffix = $portVersion - lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:curl = $portVersion compat >= 7.16 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - ca_root_certificates - lib:libssl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - " - -BUILD() -{ - certsInstallDir="$portPackageLinksDir/ca_root_certificates" - certsDir="$certsInstallDir/$relativeDataRootDir/ssl" - - libtoolize --force --copy --install - autoconf - runConfigure ./configure \ - --enable-ipv6 \ - --with-ca-bundle="$certsDir/CARootCertificates.pem" - make $jobArgs -} - -INSTALL() -{ - make install - - # prepare develop/lib - prepareInstalledDevelLibs libcurl - fixPkgconfig - - # fix curl-config - fixDevelopLibDirReferences $binDir/curl-config - sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ - -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config - - # install html documentation for curl - mkdir -p "$docDir" - install -c -m 644 "docs/curl.html" "$docDir" - - # install html development documentation for libcurl - mkdir -p "$developDocDir" - for h in docs/libcurl/*.html; do - install -c -m 644 "$h" "$developDocDir" - done - - # devel package - packageEntries devel \ - $binDir/curl-config \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi -} - -TEST() -{ - make check -} - -DESCRIPTION=" -Curl is a command line tool for transferring data with URL syntax, supporting \ -DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ -POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. 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. -" - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - curl${secondaryArchSuffix}_devel = $portVersion - cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 - devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -REQUIRES_devel=" - curl$secondaryArchSuffix == $portVersion base - " diff --git a/net-misc/curl/curl-7.35.0.recipe b/net-misc/curl/curl-7.35.0.recipe deleted file mode 100644 index ed0c3cfa5..000000000 --- a/net-misc/curl/curl-7.35.0.recipe +++ /dev/null @@ -1,115 +0,0 @@ -SUMMARY="A commandline-tool and library for downloading data from URLs" -HOMEPAGE="http://curl.haxx.se" -COPYRIGHT="1996-2014, Daniel Stenberg, . All rights reserved." -LICENSE="Curl" -SRC_URI="http://curl.haxx.se/download/curl-7.35.0.tar.bz2" -CHECKSUM_SHA256="d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PATCHES="" - -PROVIDES=" - curl$secondaryArchSuffix = $portVersion - lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:curl = $portVersion compat >= 7.16 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - ca_root_certificates - lib:libssl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - " - -BUILD() -{ - certsInstallDir="$portPackageLinksDir/ca_root_certificates" - certsDir="$certsInstallDir/$relativeDataRootDir/ssl" - - libtoolize --force --copy --install - autoconf - runConfigure ./configure \ - --enable-ipv6 \ - --with-ca-bundle="$certsDir/CARootCertificates.pem" - make $jobArgs -} - -INSTALL() -{ - make install - - # prepare develop/lib - prepareInstalledDevelLibs libcurl - fixPkgconfig - - # fix curl-config - fixDevelopLibDirReferences $binDir/curl-config - sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ - -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config - - # install html documentation for curl - mkdir -p "$docDir" - install -c -m 644 "docs/curl.html" "$docDir" - - # install html development documentation for libcurl - mkdir -p "$developDocDir" - for h in docs/libcurl/*.html; do - install -c -m 644 "$h" "$developDocDir" - done - - # devel package - packageEntries devel \ - $binDir/curl-config \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi -} - -TEST() -{ - make check -} - -DESCRIPTION=" -Curl is a command line tool for transferring data with URL syntax, supporting \ -DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ -POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. 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. -" - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - curl${secondaryArchSuffix}_devel = $portVersion - cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 - devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -REQUIRES_devel=" - curl$secondaryArchSuffix == $portVersion base - " diff --git a/net-misc/curl/curl-7.36.0.recipe b/net-misc/curl/curl-7.36.0.recipe deleted file mode 100644 index 423d98cab..000000000 --- a/net-misc/curl/curl-7.36.0.recipe +++ /dev/null @@ -1,116 +0,0 @@ -SUMMARY="A commandline-tool and library for downloading data from URLs" -HOMEPAGE="http://curl.haxx.se" -COPYRIGHT="1996-2014, Daniel Stenberg, . All rights reserved." -LICENSE="Curl" -SRC_URI="http://curl.haxx.se/download/curl-7.36.0.tar.bz2" -CHECKSUM_SHA256="1fbe82b89bcd6b7ccda8cb0ff076edc60e911595030e27689f4abd5ef7f3cfcd" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PATCHES="" - -PROVIDES=" - curl$secondaryArchSuffix = $portVersion - lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:curl = $portVersion compat >= 7.16 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - ca_root_certificates - lib:libssl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:nroff - " - -BUILD() -{ - certsInstallDir="$portPackageLinksDir/ca_root_certificates" - certsDir="$certsInstallDir/$relativeDataRootDir/ssl" - - libtoolize --force --copy --install - autoconf - runConfigure ./configure \ - --enable-ipv6 --enable-manual \ - --with-ca-bundle="$certsDir/CARootCertificates.pem" - make $jobArgs -} - -INSTALL() -{ - make install - - # prepare develop/lib - prepareInstalledDevelLibs libcurl - fixPkgconfig - - # fix curl-config - fixDevelopLibDirReferences $binDir/curl-config - sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ - -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config - - # install html documentation for curl - mkdir -p "$docDir" - install -c -m 644 "docs/curl.html" "$docDir" - - # install html development documentation for libcurl - mkdir -p "$developDocDir" - for h in docs/libcurl/*.html; do - install -c -m 644 "$h" "$developDocDir" - done - - # devel package - packageEntries devel \ - $binDir/curl-config \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi -} - -TEST() -{ - make check -} - -DESCRIPTION=" -Curl is a command line tool for transferring data with URL syntax, supporting \ -DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ -POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. 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. -" - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - curl${secondaryArchSuffix}_devel = $portVersion - cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 - devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -REQUIRES_devel=" - curl$secondaryArchSuffix == $portVersion base - " diff --git a/net-misc/curl/curl-7.37.0.recipe b/net-misc/curl/curl-7.37.0.recipe deleted file mode 100644 index 7c89e36ad..000000000 --- a/net-misc/curl/curl-7.37.0.recipe +++ /dev/null @@ -1,117 +0,0 @@ -SUMMARY="A commandline-tool and library for downloading data from URLs" -HOMEPAGE="http://curl.haxx.se" -COPYRIGHT="1996-2014, Daniel Stenberg, . All rights reserved." -LICENSE="Curl" -SRC_URI="http://curl.haxx.se/download/curl-$portVersion.tar.bz2" -CHECKSUM_SHA256="24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e" -REVISION="3" -ARCHITECTURES="x86_gcc2 x86 x86_64 arm" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - -PATCHES="" - -PROVIDES=" - curl$secondaryArchSuffix = $portVersion - lib:libcurl$secondaryArchSuffix = 4.3.0 compat >= 4 - " -if [ -z "$secondaryArchSuffix" ]; then - PROVIDES="$PROVIDES - cmd:curl = $portVersion compat >= 7.16 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - ca_root_certificates - lib:libssl$secondaryArchSuffix - lib:libz$secondaryArchSuffix - " -BUILD_REQUIRES=" - devel:libssl$secondaryArchSuffix - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - cmd:autoconf - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:libtoolize - cmd:make - cmd:nroff - cmd:python - " - -BUILD() -{ - certsInstallDir="$portPackageLinksDir/ca_root_certificates" - certsDir="$certsInstallDir/$relativeDataRootDir/ssl" - - libtoolize --force --copy --install - autoconf - runConfigure ./configure \ - --enable-ipv6 --enable-manual \ - --with-ca-bundle="$certsDir/CARootCertificates.pem" - make $jobArgs -} - -INSTALL() -{ - make install - - # prepare develop/lib - prepareInstalledDevelLibs libcurl - fixPkgconfig - - # fix curl-config - fixDevelopLibDirReferences $binDir/curl-config - sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ - -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config - - # install html documentation for curl - mkdir -p "$docDir" - install -c -m 644 "docs/curl.html" "$docDir" - - # install html development documentation for libcurl - mkdir -p "$developDocDir" - for h in docs/libcurl/*.html; do - install -c -m 644 "$h" "$developDocDir" - done - - # devel package - packageEntries devel \ - $binDir/curl-config \ - $developDir \ - $manDir/man3 - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi -} - -TEST() -{ - make check -} - -DESCRIPTION=" -Curl is a command line tool for transferring data with URL syntax, supporting \ -DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, POP3, \ -POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. 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. -" - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - curl${secondaryArchSuffix}_devel = $portVersion - cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 - devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 - " -REQUIRES_devel=" - curl$secondaryArchSuffix == $portVersion base - " diff --git a/net-misc/curl/curl-7.37.1.recipe b/net-misc/curl/curl-7.39.0.recipe similarity index 94% rename from net-misc/curl/curl-7.37.1.recipe rename to net-misc/curl/curl-7.39.0.recipe index 71e7ebeb7..fa4f2f675 100644 --- a/net-misc/curl/curl-7.37.1.recipe +++ b/net-misc/curl/curl-7.39.0.recipe @@ -3,7 +3,7 @@ HOMEPAGE="http://curl.haxx.se" COPYRIGHT="1996-2014, Daniel Stenberg, . All rights reserved." LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-$portVersion.tar.bz2" -CHECKSUM_SHA256="c3ef3cd148f3778ddbefb344117d7829db60656efe1031f9e3065fc0faa25136" +CHECKSUM_SHA256="b222566e7087cd9701b301dd6634b360ae118cc1cbc7697e534dc451102ea4e0" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -39,6 +39,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:nroff cmd:python + cmd:pkg_config$secondaryArchSuffix " BUILD() @@ -114,4 +115,6 @@ PROVIDES_devel=" " REQUIRES_devel=" curl$secondaryArchSuffix == $portVersion base + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix " diff --git a/net-misc/curl/patches/curl-7.18.1.diff b/net-misc/curl/patches/curl-7.18.1.diff deleted file mode 100644 index c57dd3025..000000000 --- a/net-misc/curl/patches/curl-7.18.1.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- curl-7.18.1/lib/select.c 2008-03-08 22:11:11.000000000 +0000 -+++ curl-7.18.1.patched/lib/select.c 2008-04-19 15:28:49.000000000 +0000 -@@ -35,9 +35,13 @@ - #endif - - #ifdef __BEOS__ -+#ifdef __HAIKU__ -+#include -+#else - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -+#endif - - #ifdef MSDOS - #include /* delay() */ diff --git a/net-misc/curl/patches/curl-7.19.7.patch b/net-misc/curl/patches/curl-7.19.7.patch deleted file mode 100644 index acdfa8f56..000000000 --- a/net-misc/curl/patches/curl-7.19.7.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ur curl-7.19.7/CMakeLists.txt curl-7.19.7-haiku/CMakeLists.txt ---- curl-7.19.7/CMakeLists.txt 2009-07-22 14:09:53.000000000 -0600 -+++ curl-7.19.7-haiku/CMakeLists.txt 2009-11-24 11:55:56.000000000 -0700 -@@ -227,6 +227,9 @@ - check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI) - endif(BEOS) - -+# Haiku needs libnetwork for recv and friends -+check_library_exists_concat("network" recv HAVE_LIBNETWORK) -+ - if(NOT NOT_NEED_LIBNSL) - check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL) - endif(NOT NOT_NEED_LIBNSL) -@@ -783,7 +786,11 @@ - - if(HAVE_SOCKLEN_T) - set(CURL_TYPEOF_CURL_SOCKLEN_T "socklen_t") -+ if(HAVE_SYS_SOCKET_H) -+ set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h") -+ endif(HAVE_SYS_SOCKET_H) - check_type_size("socklen_t" CURL_SIZEOF_CURL_SOCKLEN_T) -+ set(CMAKE_EXTRA_INCLUDE_FILES) - else() - set(CURL_TYPEOF_CURL_SOCKLEN_T int) - set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT}) -diff -ur curl-7.19.7/include/curl/curlbuild.h.cmake curl-7.19.7-haiku/include/curl/curlbuild.h.cmake ---- curl-7.19.7/include/curl/curlbuild.h.cmake 2009-07-22 14:09:53.000000000 -0600 -+++ curl-7.19.7-haiku/include/curl/curlbuild.h.cmake 2009-11-24 12:02:30.000000000 -0700 -@@ -144,6 +144,11 @@ - # include - #endif - -+/* on Haiku socklen_t is in here */ -+#ifdef __HAIKU__ -+# include -+#endif -+ - /* Data type definition of curl_socklen_t. */ - typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; - diff --git a/net-misc/curl/patches/curl-7.22.0.patch b/net-misc/curl/patches/curl-7.22.0.patch deleted file mode 100644 index 3ec7d21f3..000000000 --- a/net-misc/curl/patches/curl-7.22.0.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- curl-7.22.0/m4/curl-openssl.m4 2011-06-13 21:09:52.046137344 +0000 -+++ curl-7.22.0-haiku/m4/curl-openssl.m4 2011-09-14 22:16:54.307232768 +0000 -@@ -61,6 +61,12 @@ - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - ;; -+ x12) -+ tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` -+ tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` -+ tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 8` -+ tst_api=0x$tst_vermaj$tst_vermin$tst_verfix -+ ;; - *) - tst_api="unknown" - ;; diff --git a/net-misc/curl/patches/curl-7.25.0.patch b/net-misc/curl/patches/curl-7.25.0.patch deleted file mode 100644 index 661357c4e..000000000 --- a/net-misc/curl/patches/curl-7.25.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN curl-7.25.0/m4/curl-openssl.m4 curl-7.25.0-haiku/m4/curl-openssl.m4 ---- curl-7.25.0/m4/curl-openssl.m4 2012-03-08 11:35:25.043515904 -0800 -+++ curl-7.25.0-haiku/m4/curl-openssl.m4 2012-04-01 21:44:11.908066816 -0700 -@@ -55,7 +55,7 @@ - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - ;; -- x11|x10) -+ x12|x11|x10) - tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` - tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` diff --git a/net-misc/curl/patches/curl-7.26.0.patch b/net-misc/curl/patches/curl-7.26.0.patch deleted file mode 100644 index 4d29699bd..000000000 --- a/net-misc/curl/patches/curl-7.26.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN curl-7.26.0/m4/curl-openssl.m4 curl-7.26.0-haiku/m4/curl-openssl.m4 ---- curl-7.26.0/m4/curl-openssl.m4 2012-03-08 11:35:25.043515904 -0800 -+++ curl-7.26.0-haiku/m4/curl-openssl.m4 2012-04-01 21:44:11.908066816 -0700 -@@ -55,7 +55,7 @@ - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - ;; -- x11|x10) -+ x12|x11|x10) - tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` - tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7`