[curl] new upstream release - 7.21.2
Kamil Dudka
kdudka at fedoraproject.org
Tue Oct 12 22:47:40 UTC 2010
commit 5be6d627b3bf2f09a81ba471998e8cc0282607fb
Author: Kamil Dudka <kdudka at redhat.com>
Date: Wed Sep 22 16:19:52 2010 +0200
new upstream release - 7.21.2
.gitignore | 2 +-
0001-curl-7.21.1-a6e088e.patch | 183 --------------------------
0002-curl-7.21.1-5907777.patch | 36 -----
0003-curl-7.21.1-13b8fc4.patch | 67 ----------
0004-curl-7.21.1-d0dea8f.patch | 73 -----------
0102-curl-7.21.1-lrt.patch | 52 --------
0102-curl-7.21.2-debug.patch | 58 +++++++++
0103-curl-7.21.1-debug.patch | 212 -------------------------------
0105-curl-7.20.0-disable-test1112.patch | 45 ++++---
curl-7.21.1.tar.lzma.asc | 7 -
curl-7.21.2.tar.lzma.asc | 7 +
curl.spec | 40 ++-----
sources | 2 +-
13 files changed, 100 insertions(+), 684 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d923397..60bc67f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-curl-7.21.1.tar.lzma
+curl-7.21.2.tar.lzma
diff --git a/0102-curl-7.21.2-debug.patch b/0102-curl-7.21.2-debug.patch
new file mode 100644
index 0000000..5a6669d
--- /dev/null
+++ b/0102-curl-7.21.2-debug.patch
@@ -0,0 +1,58 @@
+ configure | 15 ++++-----------
+ m4/curl-compilers.m4 | 15 ++++-----------
+ 2 files changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index d3ecf69..6d8f085 100755
+--- a/configure
++++ b/configure
+@@ -14192,18 +14192,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`
+- flags_dbg_all="-g -g0 -g1 -g2 -g3"
+- flags_dbg_all="$flags_dbg_all -ggdb"
+- flags_dbg_all="$flags_dbg_all -gstabs"
+- flags_dbg_all="$flags_dbg_all -gstabs+"
+- flags_dbg_all="$flags_dbg_all -gcoff"
+- flags_dbg_all="$flags_dbg_all -gxcoff"
+- flags_dbg_all="$flags_dbg_all -gdwarf-2"
+- flags_dbg_all="$flags_dbg_all -gvms"
++ flags_dbg_all=""
+ flags_dbg_yes="-g"
+- flags_dbg_off="-g0"
+- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+- flags_opt_yes="-O2"
++ flags_dbg_off=""
++ flags_opt_all=""
++ flags_opt_yes=""
+ flags_opt_off="-O0"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
+index 1ea4d17..868d65a 100644
+--- a/m4/curl-compilers.m4
++++ b/m4/curl-compilers.m4
+@@ -146,18 +146,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
+ gccvhi=`echo $gccver | cut -d . -f1`
+ gccvlo=`echo $gccver | cut -d . -f2`
+ compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+- flags_dbg_all="-g -g0 -g1 -g2 -g3"
+- flags_dbg_all="$flags_dbg_all -ggdb"
+- flags_dbg_all="$flags_dbg_all -gstabs"
+- flags_dbg_all="$flags_dbg_all -gstabs+"
+- flags_dbg_all="$flags_dbg_all -gcoff"
+- flags_dbg_all="$flags_dbg_all -gxcoff"
+- flags_dbg_all="$flags_dbg_all -gdwarf-2"
+- flags_dbg_all="$flags_dbg_all -gvms"
++ flags_dbg_all=""
+ flags_dbg_yes="-g"
+- flags_dbg_off="-g0"
+- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+- flags_opt_yes="-O2"
++ flags_dbg_off=""
++ flags_opt_all=""
++ flags_opt_yes=""
+ flags_opt_off="-O0"
+ else
+ AC_MSG_RESULT([no])
diff --git a/0105-curl-7.20.0-disable-test1112.patch b/0105-curl-7.20.0-disable-test1112.patch
index ab41db7..e7d51db 100644
--- a/0105-curl-7.20.0-disable-test1112.patch
+++ b/0105-curl-7.20.0-disable-test1112.patch
@@ -1,27 +1,30 @@
tests/data/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ tests/data/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
-index 61b1b48..90d5084 100644
+index 9370974..b553f54 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -65,7 +65,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
- test1097 test560 test561 test1098 test1099 test562 test563 test1100 \
- test564 test1101 test1102 test1103 test1104 test299 test310 test311 \
- test312 test1105 test565 test800 test1106 test801 test566 test802 test803 \
-- test1107 test1108 test1109 test1110 test1111 test1112 test129 test567 \
-+ test1107 test1108 test1109 test1110 test1111 test129 test567 \
- test568 test569 test570 test571 test572 test804 test805 test806 test807 \
- test573 test313 test1115
-
---- a/tests/data/Makefile.in 2010-08-11 18:03:31.000000000 +0100
-+++ b/tests/data/Makefile.in 2010-08-24 22:20:45.719393097 +0100
-@@ -301,7 +301,7 @@
- test1097 test560 test561 test1098 test1099 test562 test563 test1100 \
- test564 test1101 test1102 test1103 test1104 test299 test310 test311 \
- test312 test1105 test565 test800 test1106 test801 test566 test802 test803 \
-- test1107 test1108 test1109 test1110 test1111 test1112 test129 test567 \
-+ test1107 test1108 test1109 test1110 test1111 test129 test567 \
- test568 test569 test570 test571 test572 test804 test805 test806 test807 \
- test573 test313 test1115
-
+ test561 test1098 test1099 test562 test563 test1100 test564 test1101 \
+ test1102 test1103 test1104 test299 test310 test311 test312 test1105 \
+ test565 test800 test1106 test801 test566 test802 test803 test1107 \
+- test1108 test1109 test1110 test1111 test1112 test129 test567 test568 \
++ test1108 test1109 test1110 test1111 test129 test567 test568 \
+ test569 test570 test571 test572 test804 test805 test806 test807 test573 \
+ test313 test1115 test578 test579 test1116 test1200 test1201 test1202 \
+ test1203 test1117
+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
+@@ -302,7 +302,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
+ test561 test1098 test1099 test562 test563 test1100 test564 test1101 \
+ test1102 test1103 test1104 test299 test310 test311 test312 test1105 \
+ test565 test800 test1106 test801 test566 test802 test803 test1107 \
+- test1108 test1109 test1110 test1111 test1112 test129 test567 test568 \
++ test1108 test1109 test1110 test1111 test129 test567 test568 \
+ test569 test570 test571 test572 test804 test805 test806 test807 test573 \
+ test313 test1115 test578 test579 test1116 test1200 test1201 test1202 \
+ test1203 test1117
diff --git a/curl-7.21.2.tar.lzma.asc b/curl-7.21.2.tar.lzma.asc
new file mode 100644
index 0000000..d3518e4
--- /dev/null
+++ b/curl-7.21.2.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+iEYEABECAAYFAky025IACgkQeOEcayedXJHIEwCgqKMXD6Kd9MHuwDGaGME6ooNK
+1mYAn0bGy1L/qmAzyCAy5TAZnj0Lkmhk
+=CUrv
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index 68bce3b..6f80caf 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,33 +1,18 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
-Version: 7.21.1
-Release: 6%{?dist}
+Version: 7.21.2
+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
-# modify system headers to work around gcc bug (#617757)
-Patch1: 0001-curl-7.21.1-a6e088e.patch
-
-# curl -T now ignores file size of special files (#622520)
-Patch2: 0002-curl-7.21.1-5907777.patch
-
-# fix kerberos proxy authentication for https (#625676)
-Patch3: 0003-curl-7.21.1-13b8fc4.patch
-
-# avoid a warning with autoconf 2.66
-Patch4: 0004-curl-7.21.1-d0dea8f.patch
-
# patch making libcurl multilib ready
Patch101: 0101-curl-7.21.1-multilib.patch
-# force -lrt when linking the curl tool and test-cases
-Patch102: 0102-curl-7.21.1-lrt.patch
-
# prevent configure script from discarding -g in CFLAGS (#496778)
-Patch103: 0103-curl-7.21.1-debug.patch
+Patch102: 0102-curl-7.21.2-debug.patch
# use localhost6 instead of ip6-localhost in the curl test-suite
Patch104: 0104-curl-7.19.7-localhost6.patch
@@ -53,9 +38,6 @@ BuildRequires: pkgconfig
BuildRequires: stunnel
BuildRequires: zlib-devel
-# ssh(1) dies on SIGSEGV when SELinux policy is not installed (#632914)
-BuildRequires: selinux-policy-targeted
-
# valgrind is not available on s390(x)
%ifnarch s390 s390x
BuildRequires: valgrind
@@ -116,16 +98,9 @@ for f in CHANGES README; do
mv -f ${f}.utf8 ${f}
done
-# upstream patches (already applied)
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
# Fedora patches
%patch101 -p1
%patch102 -p1
-%patch103 -p1
%patch104 -p1
%patch106 -p1
@@ -148,9 +123,8 @@ sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test*
--with-libidn \
--with-libssh2 \
--without-ssl --with-nss
-
-# uncomment to turn off optimizations
-# find -name Makefile | xargs sed -i 's/-O2/-O0/'
+# --enable-debug
+# use ^^^ to turn off optimizations, etc.
# either glibc's implementation of strcasecmp() or its interpretation
# by valgrind seems to be broken on x86_64 (#626470), the same problem
@@ -244,6 +218,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Wed Oct 13 2010 Kamil Dudka <kdudka at redhat.com> 7.21.2-1
+- new upstream release, drop applied patches
+- make 0102-curl-7.21.2-debug.patch less intrusive
+
* Wed Sep 29 2010 jkeating - 7.21.1-6
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index 886ace3..dbadf84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ba24de2381c9b183aaac48f029fcb0b curl-7.21.1.tar.lzma
+4a7675737e0d3e19b193b3e765f5cf41 curl-7.21.2.tar.lzma
More information about the scm-commits
mailing list