From 9eed96053c381b290f0ca0e5538116b48637cf7786953c8aa73e6c1e6f1622fd Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 2 Feb 2007 15:10:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=2 --- curl-7.15.5.tar.bz2 | 3 -- curl-7.16.0-strict-aliasing.patch | 30 +++++++++++++ curl-7.16.0.tar.bz2 | 3 ++ ....1-ipv6tests.patch => curl-ipv6tests.patch | 0 curl-7.15.1-lfs.patch => curl-lfs.patch | 0 curl.changes | 21 +++++++++ curl.spec | 45 ++++++++++++------- 7 files changed, 83 insertions(+), 19 deletions(-) delete mode 100644 curl-7.15.5.tar.bz2 create mode 100644 curl-7.16.0-strict-aliasing.patch create mode 100644 curl-7.16.0.tar.bz2 rename curl-7.15.1-ipv6tests.patch => curl-ipv6tests.patch (100%) rename curl-7.15.1-lfs.patch => curl-lfs.patch (100%) diff --git a/curl-7.15.5.tar.bz2 b/curl-7.15.5.tar.bz2 deleted file mode 100644 index 57496f2..0000000 --- a/curl-7.15.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2980815e53f4caeafc5e35d183d9379bcaaec49f759be1a4ac628cfb6c392fe0 -size 1543007 diff --git a/curl-7.16.0-strict-aliasing.patch b/curl-7.16.0-strict-aliasing.patch new file mode 100644 index 0000000..583e2bd --- /dev/null +++ b/curl-7.16.0-strict-aliasing.patch @@ -0,0 +1,30 @@ +--- lib/ldap.c ++++ lib/ldap.c +@@ -204,7 +204,10 @@ static dynafunc DynaGetFunction(const ch + * cannot typecast a data pointer to a function pointer, but that's + * exactly what we need to do here to avoid compiler warnings on picky + * compilers! */ +- *(void**) (&func) = dlsym(libldap, name); ++ /* mmarek@suse.cz: I guess we can live with the void* -> funcptr conversion ++ * on systems where dlsym is supported... anyway less harm that risking ++ * strict aliasing bugs... */ ++ func = dlsym(libldap, name); + } + #elif defined(WIN32) + if (libldap) { +--- lib/connect.c ++++ lib/connect.c +@@ -384,11 +384,10 @@ static CURLcode bindlocal(struct connect + if( bind(sockfd, sock, socksize) >= 0) { + /* we succeeded to bind */ + struct Curl_sockaddr_storage add; +- size_t size; ++ socklen_t size; + + size = sizeof(add); +- if(getsockname(sockfd, (struct sockaddr *) &add, +- (socklen_t *)&size)<0) { ++ if(getsockname(sockfd, (struct sockaddr *) &add, &size)<0) { + failf(data, "getsockname() failed"); + return CURLE_HTTP_PORT_FAILED; + } diff --git a/curl-7.16.0.tar.bz2 b/curl-7.16.0.tar.bz2 new file mode 100644 index 0000000..4dc7491 --- /dev/null +++ b/curl-7.16.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc8dcda5a933c370c15c832bf1e7316a0690f473fdd6000454d233edaa33bc23 +size 1566391 diff --git a/curl-7.15.1-ipv6tests.patch b/curl-ipv6tests.patch similarity index 100% rename from curl-7.15.1-ipv6tests.patch rename to curl-ipv6tests.patch diff --git a/curl-7.15.1-lfs.patch b/curl-lfs.patch similarity index 100% rename from curl-7.15.1-lfs.patch rename to curl-lfs.patch diff --git a/curl.changes b/curl.changes index 8b1428c..a0d5bd5 100644 --- a/curl.changes +++ b/curl.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Jan 26 09:55:19 CET 2007 - mmarek@suse.cz + +- remove libcurl.a and libcurl.la (rationale: there are security + updates of curl from time to time, so statically linking it is + not acceptable) + +------------------------------------------------------------------- +Thu Jan 25 15:36:29 CET 2007 - mmarek@suse.cz + +- fixed strict aliasing warnings + +------------------------------------------------------------------- +Tue Dec 19 14:59:34 CET 2006 - mmarek@suse.cz + +- updated to 7.16.0 + * removed CURLOPT_SOURCE_* options and --3p* command line option + (breaks python-curl atm) + * for a complete list of changes, see + /usr/share/doc/packages/curl/RELEASE-NOTES + ------------------------------------------------------------------- Tue Aug 15 11:23:58 CEST 2006 - mmarek@suse.cz diff --git a/curl.spec b/curl.spec index fd51b37..51e3307 100644 --- a/curl.spec +++ b/curl.spec @@ -1,7 +1,7 @@ # -# spec file for package curl (Version 7.15.5) +# spec file for package curl (Version 7.16.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,16 +14,17 @@ Name: curl BuildRequires: libidn-devel openssl-devel Obsoletes: curl_ssl Provides: curl_ssl -Version: 7.15.5 -Release: 12 +Version: 7.16.0 +Release: 2 Autoreqprov: on License: MOZILLA PUBLIC LICENSE (MPL/NPL) Group: Productivity/Networking/Web/Utilities Summary: A Tool for Transferring Data from URLs URL: http://curl.haxx.se/ -Source: %{name}-%{version}.tar.bz2 -Patch2: %{name}-7.15.1-lfs.patch -Patch3: %{name}-7.15.1-ipv6tests.patch +Source: curl-%{version}.tar.bz2 +Patch1: curl-lfs.patch +Patch2: curl-ipv6tests.patch +Patch3: curl-7.16.0-strict-aliasing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ Authors: %prep %setup -q +%patch1 %patch2 %patch3 @@ -68,11 +70,12 @@ export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" %endif ./configure \ - --prefix=%{_prefix} \ - --enable-ipv6 \ - --with-ssl \ - --libdir=%{_libdir} \ - --enable-hidden-symbols + --prefix=%{_prefix} \ + --enable-ipv6 \ + --with-ssl \ + --libdir=%{_libdir} \ + --enable-hidden-symbols \ + --disable-static make %{?jobs:-j%jobs} %if %{?_with_testsuite:1}0 make check @@ -81,6 +84,7 @@ make check %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} +rm $RPM_BUILD_ROOT%_libdir/libcurl.la %clean rm -rf $RPM_BUILD_ROOT @@ -93,11 +97,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc CHANGES README +%doc CHANGES README RELEASE-NOTES %doc docs/{BUGS,CONTRIBUTE,FAQ,FEATURES,INTERNALS,MANUAL,RESOURCES,TODO,TheArtOfHttpScripting} %{_prefix}/bin/curl %{_libdir}/libcurl.so.* -%{_libdir}/libcurl.la %doc %{_mandir}/man1/curl.1.gz /usr/share/curl @@ -105,14 +108,24 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_prefix}/bin/curl-config %{_prefix}/include/curl -#%{_prefix}/lib/libcurl.la -%{_libdir}/libcurl.a %{_libdir}/libcurl.so %{_libdir}/pkgconfig/libcurl.pc %doc %{_mandir}/man1/curl-config.1.gz %doc %{_mandir}/man3/* %changelog -n curl +* Fri Jan 26 2007 - mmarek@suse.cz +- remove libcurl.a and libcurl.la (rationale: there are security + updates of curl from time to time, so statically linking it is + not acceptable) +* Thu Jan 25 2007 - mmarek@suse.cz +- fixed strict aliasing warnings +* Tue Dec 19 2006 - mmarek@suse.cz +- updated to 7.16.0 + * removed CURLOPT_SOURCE_* options and --3p* command line option + (breaks python-curl atm) + * for a complete list of changes, see + /usr/share/doc/packages/curl/RELEASE-NOTES * Tue Aug 15 2006 - mmarek@suse.cz - configure with --enable-hidden-symbols to compile libcurl with -fvisibility=hidden, exporting only symbols from the API