[curl] new upstream release
Kamil Dudka
kdudka at fedoraproject.org
Tue Sep 13 19:10:43 UTC 2011
commit eaba136aa17211cdb589a1051a458e37427c1b69
Author: Kamil Dudka <kdudka at redhat.com>
Date: Tue Sep 13 20:48:12 2011 +0200
new upstream release
- new upstream release
- curl-config now provides dummy --static-libs option (#733956)
.gitignore | 1 +
0001-curl-7.21.7-a7864c4.patch | 453 -------------------------------
0002-curl-7.21.7-5eb2396.patch | 30 --
0003-curl-7.21.7-5538904.patch | 131 ---------
0004-curl-7.21.7-d6f319f.patch | 118 --------
0005-curl-7.21.7-61ae7e9.patch | 46 ---
0101-curl-7.21.1-multilib.patch | 50 ++--
0102-curl-7.21.2-debug.patch | 2 +-
0105-curl-7.21.3-disable-test1112.patch | 12 +-
curl-7.21.7.tar.lzma.asc | 7 -
curl-7.22.0.tar.lzma.asc | 7 +
curl.spec | 28 +--
sources | 2 +-
13 files changed, 51 insertions(+), 836 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b67450b..6aa0641 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/curl-7.21.6.tar.lzma
/curl-7.21.7.tar.lzma
+/curl-7.22.0.tar.lzma
diff --git a/0101-curl-7.21.1-multilib.patch b/0101-curl-7.21.1-multilib.patch
index 83c1cd8..cbb5bab 100644
--- a/0101-curl-7.21.1-multilib.patch
+++ b/0101-curl-7.21.1-multilib.patch
@@ -1,20 +1,13 @@
- curl-config.in | 22 ++++------------------
- libcurl.pc.in | 1 +
- 2 files changed, 5 insertions(+), 18 deletions(-)
+ curl-config.in | 16 +++-------------
+ docs/curl-config.1 | 4 +++-
+ libcurl.pc.in | 1 +
+ 3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/curl-config.in b/curl-config.in
-index ebda129..b404827 100644
+index 150004d..95d0759 100644
--- a/curl-config.in
+++ b/curl-config.in
-@@ -43,7 +43,6 @@ Available values for OPTION include:
- --libs library linking information
- --prefix curl install prefix
- --protocols newline separated list of enabled protocols
-- --static-libs static libcurl library linking information
- --version output version information
- --vernum output the version information as a number (hexadecimal)
- EOF
-@@ -74,7 +73,7 @@ while test $# -gt 0; do
+@@ -74,7 +74,7 @@ while test $# -gt 0; do
;;
--cc)
@@ -23,7 +16,7 @@ index ebda129..b404827 100644
;;
--prefix)
-@@ -136,25 +135,12 @@ while test $# -gt 0; do
+@@ -136,24 +136,14 @@ while test $# -gt 0; do
;;
--libs)
@@ -37,21 +30,36 @@ index ebda129..b404827 100644
- else
- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
- fi
-- ;;
--
-- --static-libs)
-- echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+ pkg-config libcurl --libs
;;
+ --static-libs)
+- echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+ ;;
+
--configure)
- echo @CONFIGURE_OPTIONS@
-- ;;
+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
-+ ;;
+ ;;
*)
- echo "unknown option: $1"
+diff --git a/docs/curl-config.1 b/docs/curl-config.1
+index c4f4e2b..3e0ea60 100644
+--- a/docs/curl-config.1
++++ b/docs/curl-config.1
+@@ -65,7 +65,9 @@ be listed using uppercase and are separated by newlines. There may be none,
+ one, or several protocols in the list. (Added in 7.13.0)
+ .IP "--static-libs"
+ Shows the complete set of libs and other linker options you will need in order
+-to link your application with libcurl statically. (Added in 7.17.1)
++to link your application with libcurl statically. Note that Fedora/RHEL libcurl
++packages do not provide any static libraries, thus cannot be linked statically.
++(Added in 7.17.1)
+ .IP "--version"
+ Outputs version information about the installed libcurl.
+ .IP "--vernum"
+diff --git a/libcurl.pc.in b/libcurl.pc.in
+index 2ba9c39..f8f8b00 100644
--- a/libcurl.pc.in
+++ b/libcurl.pc.in
@@ -29,6 +29,7 @@ libdir=@libdir@
diff --git a/0102-curl-7.21.2-debug.patch b/0102-curl-7.21.2-debug.patch
index 0c1fdc1..9e52d8d 100644
--- a/0102-curl-7.21.2-debug.patch
+++ b/0102-curl-7.21.2-debug.patch
@@ -6,7 +6,7 @@ diff --git a/configure b/configure
index d3ecf69..6d8f085 100755
--- a/configure
+++ b/configure
-@@ -15006,18 +15006,11 @@ $as_echo "yes" >&6; }
+@@ -14977,18 +14977,11 @@ $as_echo "yes" >&6; }
gccvhi=`echo $gccver | cut -d . -f1`
gccvlo=`echo $gccver | cut -d . -f2`
compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
diff --git a/0105-curl-7.21.3-disable-test1112.patch b/0105-curl-7.21.3-disable-test1112.patch
index d1c0292..4136091 100644
--- a/0105-curl-7.21.3-disable-test1112.patch
+++ b/0105-curl-7.21.3-disable-test1112.patch
@@ -6,25 +6,25 @@ diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 9370974..b553f54 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
-@@ -69,7 +69,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085 \
+@@ -70,7 +70,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085 \
test1086 test1087 test1088 test1089 test1090 test1091 test1092 test1093 \
test1094 test1095 test1096 test1097 test1098 test1099 test1100 test1101 \
test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109 \
-test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \
+test1110 test1111 test1113 test1114 test1115 test1116 test1117 \
test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \
- test1126 test1127 test1128 test1200 test1201 test1202 test1203 test1300 \
- test1301 test1302 test1303 test1304 test1305 test1306 test1307 test1308 \
+ test1126 test1127 test1128 test1129 test1130 test1131 test1200 test1201 \
+ test1202 test1203 test1300 test1301 test1302 test1303 test1304 test1305 \
diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in
index 435b126..1d71c4e 100644
--- a/tests/data/Makefile.in
+++ b/tests/data/Makefile.in
-@@ -317,7 +317,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085 \
+@@ -318,7 +318,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085 \
test1086 test1087 test1088 test1089 test1090 test1091 test1092 test1093 \
test1094 test1095 test1096 test1097 test1098 test1099 test1100 test1101 \
test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109 \
-test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \
+test1110 test1111 test1113 test1114 test1115 test1116 test1117 \
test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \
- test1126 test1127 test1128 test1200 test1201 test1202 test1203 test1300 \
- test1301 test1302 test1303 test1304 test1305 test1306 test1307 test1308 \
+ test1126 test1127 test1128 test1129 test1130 test1131 test1200 test1201 \
+ test1202 test1203 test1300 test1301 test1302 test1303 test1304 test1305 \
diff --git a/curl-7.22.0.tar.lzma.asc b/curl-7.22.0.tar.lzma.asc
new file mode 100644
index 0000000..3697fb4
--- /dev/null
+++ b/curl-7.22.0.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAk5viyUACgkQeOEcayedXJEaggCg7JyyFFNTACA/n5MGVKXwYHQC
+ovcAnRO3592IDU38/JT89o7kUWQ9Ae1m
+=Z547
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index 0c33adc..0a3784d 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,26 +1,13 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
-Version: 7.21.7
-Release: 4%{?dist}
+Version: 7.22.0
+Release: 1%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
Source2: curlbuild.h
Source3: hide_selinux.c
-# add a new option CURLOPT_GSSAPI_DELEGATION (#719939)
-Patch1: 0001-curl-7.21.7-a7864c4.patch
-
-# fix SIGSEGV of curl -O -J given more than one URLs (#723075)
-Patch2: 0002-curl-7.21.7-5eb2396.patch
-Patch5: 0005-curl-7.21.7-61ae7e9.patch
-
-# introduce the --delegation option of curl (#730444)
-Patch3: 0003-curl-7.21.7-5538904.patch
-
-# initialize NSS with no database if the selected database is broken (#728562)
-Patch4: 0004-curl-7.21.7-d6f319f.patch
-
# patch making libcurl multilib ready
Patch101: 0101-curl-7.21.1-multilib.patch
@@ -119,13 +106,6 @@ for f in CHANGES README; do
mv -f ${f}.utf8 ${f}
done
-# upstream patches (already applied)
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
# Fedora patches
%patch101 -p1
%patch102 -p1
@@ -238,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Tue Sep 13 2011 Kamil Dudka <kdudka at redhat.com> 7.22.0-1
+- new upstream release
+- curl-config now provides dummy --static-libs option (#733956)
+
* Sun Aug 21 2011 Paul Howarth <paul at city-fan.org> 7.21.7-4
- actually fix SIGSEGV of curl -O -J given more than one URL (#723075)
diff --git a/sources b/sources
index 5366a1d..f60f11b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5dbcbabe8fd577763106c4f655e31b66 curl-7.21.7.tar.lzma
+2fd7d848e143b32a42bf2a28af7caab0 curl-7.22.0.tar.lzma
More information about the scm-commits
mailing list