[curl] new upstream release - curl-7.23.0 (#754391)

Kamil Dudka kdudka at fedoraproject.org
Wed Nov 16 13:17:26 UTC 2011


commit 87bfeb1dcc840b99a2ccc96b52ff59f2d00b9e97
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Wed Nov 16 14:14:07 2011 +0100

    new upstream release - curl-7.23.0 (#754391)

 .gitignore                              |    1 +
 0001-curl-7.22.0-bz733657.patch         |  560 -------------------------------
 0102-curl-7.21.2-debug.patch            |    2 +-
 0105-curl-7.21.3-disable-test1112.patch |   12 +-
 curl-7.22.0.tar.lzma.asc                |    7 -
 curl-7.23.0.tar.lzma.asc                |    7 +
 curl.spec                               |   13 +-
 sources                                 |    2 +-
 8 files changed, 21 insertions(+), 583 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6aa0641..54cee0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /curl-7.21.6.tar.lzma
 /curl-7.21.7.tar.lzma
 /curl-7.22.0.tar.lzma
+/curl-7.23.0.tar.lzma
diff --git a/0102-curl-7.21.2-debug.patch b/0102-curl-7.21.2-debug.patch
index 9e52d8d..792d753 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
-@@ -14977,18 +14977,11 @@ $as_echo "yes" >&6; }
+@@ -15030,18 +15030,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 4136091..515968e 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
-@@ -70,7 +70,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085	\
+@@ -72,7 +72,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 test1129 test1130 test1131 test1200 test1201	\
- test1202 test1203 test1300 test1301 test1302 test1303 test1304 test1305	\
+ test1126 test1127 test1128 test1129 test1130 test1131 \
+ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
 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
-@@ -318,7 +318,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085	\
+@@ -320,7 +320,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 test1129 test1130 test1131 test1200 test1201	\
- test1202 test1203 test1300 test1301 test1302 test1303 test1304 test1305	\
+ test1126 test1127 test1128 test1129 test1130 test1131 \
+ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
diff --git a/curl-7.23.0.tar.lzma.asc b/curl-7.23.0.tar.lzma.asc
new file mode 100644
index 0000000..27f86e4
--- /dev/null
+++ b/curl-7.23.0.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iEYEABECAAYFAk7CvskACgkQeOEcayedXJE+1wCfSGPiMFNxfrb4a27raX8CcBgV
+gP4AoOJ8ye2MRiYw5aMILv9xFm14kygU
+=E5o2
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index 5bfc5e9..b48bc5a 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,16 +1,13 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.22.0
-Release: 2%{?dist}
+Version: 7.23.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
 
-# nss: select client certificates by DER (#733657)
-Patch1: 0001-curl-7.22.0-bz733657.patch
-
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.21.1-multilib.patch
 
@@ -109,9 +106,6 @@ for f in CHANGES README; do
     mv -f ${f}.utf8 ${f}
 done
 
-# upstream patches (not yet applied)
-%patch1 -p1
-
 # Fedora patches
 %patch101 -p1
 %patch102 -p1
@@ -224,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Nov 16 2011 Kamil Dudka <kdudka at redhat.com> 7.23.0-1
+- new upstream release (#754391)
+
 * Mon Sep 19 2011 Kamil Dudka <kdudka at redhat.com> 7.22.0-2
 - nss: select client certificates by DER (#733657)
 
diff --git a/sources b/sources
index f60f11b..b417d66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fd7d848e143b32a42bf2a28af7caab0  curl-7.22.0.tar.lzma
+af901db5f3d21609cc6fe960a6c293fb  curl-7.23.0.tar.lzma


More information about the scm-commits mailing list