Djam/curl
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/curl.git synced 2025-02-23 15:52:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4 from alzim/curl:rosa2016.1

Browse source 
Updated to 7.51.0
This commit is contained in:
alzim 2016-11-03 16:49:22 +04:00
commit 2c65cb6dd0
5 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,3 +1,3 @@
sources: sources:
curl-7.50.1.tar.bz2: 6d9e54a7f8f5aa1f6cac652df93bb7163565b554 curl-7.51.0.tar.bz2: f02a14bbe580d2a8cf3bf45a79d39eb595220ac7
curl-7.50.1.tar.bz2.asc: 5aed43f95d008247ffd26b15d2bfee3adf0d9f91 curl-7.51.0.tar.bz2.asc: 0c402577e38ddaa7c1dd306bc033b41d3db0d3ea

14
curl-7.47.1-disable-ssl2.patch
View file

@ -1,14 +0,0 @@
diff -urN curl-7.47.1/lib/vtls/openssl.c curl-7.47.1-patched/lib/vtls/openssl.c
--- curl-7.47.1/lib/vtls/openssl.c 2016-02-08 00:43:38.000000000 +1000
+++ curl-7.47.1-patched/lib/vtls/openssl.c 2016-03-10 19:48:37.249589990 +1000
@@ -119,6 +119,10 @@
#define OPENSSL_NO_SSL2
#endif
+#ifndef OPENSSL_NO_SSL2
+#define OPENSSL_NO_SSL2
+#endif
+
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
!defined(LIBRESSL_VERSION_NUMBER)
#define SSLeay_add_ssl_algorithms() SSL_library_init()

14
curl-7.51.0-disable-ssl2.patch Normal file
View file

@ -0,0 +1,14 @@
diff -Naur curl-7.51.0-orig/lib/vtls/openssl.c curl-7.51.0/lib/vtls/openssl.c
--- curl-7.51.0-orig/lib/vtls/openssl.c 2016-10-31 12:41:17.000000000 +0300
+++ curl-7.51.0/lib/vtls/openssl.c 2016-11-03 15:15:43.364424087 +0300
@@ -102,6 +102,10 @@
#define OPENSSL_NO_SSL2
#endif
+#ifndef OPENSSL_NO_SSL2
+#define OPENSSL_NO_SSL2
+#endif
+
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
!defined(LIBRESSL_VERSION_NUMBER)
#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER

16
curl-7.49.1-do-not-build-examples.patch → curl-7.51.0-do-not-build-examples.patch
View file

@ -1,6 +1,6 @@
diff -Naur curl-7.49.1-orig/docs/Makefile.am curl-7.49.1/docs/Makefile.am diff -Naur curl-7.51.0-orig/docs/Makefile.am curl-7.51.0/docs/Makefile.am
--- curl-7.49.1-orig/docs/Makefile.am 2016-05-27 17:09:12.000000000 +0300 --- curl-7.51.0-orig/docs/Makefile.am 2016-10-31 01:48:56.000000000 +0300
+++ curl-7.49.1/docs/Makefile.am 2016-07-12 21:40:38.355479145 +0300 +++ curl-7.51.0/docs/Makefile.am 2016-11-03 15:04:57.800383409 +0300
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
HTMLPAGES = $(GENHTMLPAGES) index.html HTMLPAGES = $(GENHTMLPAGES) index.html
@ -10,9 +10,9 @@ diff -Naur curl-7.49.1-orig/docs/Makefile.am curl-7.49.1/docs/Makefile.am
CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES)
diff -Naur curl-7.49.1-orig/docs/Makefile.in curl-7.49.1/docs/Makefile.in diff -Naur curl-7.51.0-orig/docs/Makefile.in curl-7.51.0/docs/Makefile.in
--- curl-7.49.1-orig/docs/Makefile.in 2016-05-30 09:11:16.000000000 +0300 --- curl-7.51.0-orig/docs/Makefile.in 2016-10-31 12:41:43.000000000 +0300
+++ curl-7.49.1/docs/Makefile.in 2016-07-12 21:43:05.843342002 +0300 +++ curl-7.51.0/docs/Makefile.in 2016-11-03 15:06:19.620388532 +0300
@@ -446,7 +446,7 @@ @@ -446,7 +446,7 @@
GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html
PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf
@ -20,5 +20,5 @@ diff -Naur curl-7.49.1-orig/docs/Makefile.in curl-7.49.1/docs/Makefile.in
-SUBDIRS = examples libcurl -SUBDIRS = examples libcurl
+SUBDIRS = libcurl +SUBDIRS = libcurl
CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES)
EXTRA_DIST = MANUAL BUGS CONTRIBUTE FAQ FEATURES INTERNALS SSLCERTS \ EXTRA_DIST = MANUAL BUGS CONTRIBUTE.md FAQ FEATURES INTERNALS.md SSLCERTS.md \
README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS \ README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS KNOWN_BUGS \

12
curl.spec
View file

@ -5,17 +5,17 @@
Summary: Gets a file from a FTP, GOPHER or HTTP server Summary: Gets a file from a FTP, GOPHER or HTTP server
Name: curl Name: curl
Epoch: 1 Epoch: 1
Version: 7.50.1 Version: 7.51.0
Release: 2 Release: 1
License: BSD-like License: BSD-like
Group: Networking/Other Group: Networking/Other
Url: https://curl.haxx.se Url: https://curl.haxx.se
Source0: https://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Source0: https://curl.haxx.se/download/%{name}-%{version}.tar.bz2
Source1: https://curl.haxx.se/download/%{name}-%{version}.tar.bz2.asc Source1: https://curl.haxx.se/download/%{name}-%{version}.tar.bz2.asc
Patch0: curl-7.30.0-multilib.patch Patch0: curl-7.30.0-multilib.patch
Patch1: curl-7.49.1-do-not-build-examples.patch Patch1: curl-7.51.0-do-not-build-examples.patch
Patch2: curl-7.49.1-debug.patch Patch2: curl-7.49.1-debug.patch
Patch3: curl-7.47.1-disable-ssl2.patch Patch3: curl-7.51.0-disable-ssl2.patch
BuildRequires: groff BuildRequires: groff
BuildRequires: stunnel BuildRequires: stunnel
BuildRequires: krb5-devel BuildRequires: krb5-devel
@ -75,8 +75,8 @@ use libcurl.
%files -n %{devname} %files -n %{devname}
%docdir docs/ %docdir docs/
%doc docs/BUGS docs/KNOWN_BUGS docs/CONTRIBUTE docs/FAQ CHANGES %doc docs/BUGS docs/KNOWN_BUGS docs/FAQ CHANGES
%doc docs/FEATURES docs/RESOURCES docs/TODO docs/THANKS docs/INTERNALS %doc docs/FEATURES docs/RESOURCES docs/TODO docs/THANKS
%{_bindir}/curl-config %{_bindir}/curl-config
%{multiarch_bindir}/curl-config %{multiarch_bindir}/curl-config
%{_libdir}/libcurl.so %{_libdir}/libcurl.so