diff --git a/.gitignore b/.gitignore index 61be055..056745e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xmlsec1-1.2.16.tar.gz /xmlsec1-1.2.17.tar.gz /xmlsec1-1.2.18.tar.gz +/xmlsec1-1.2.19.tar.gz diff --git a/sources b/sources index 4909e43..205ec5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8694b4609aab647186607f79e1da7f1a xmlsec1-1.2.18.tar.gz +fe664ba5f01ebfaeb0ab5deeb0b2249e xmlsec1-1.2.19.tar.gz diff --git a/xmlsec1-1.2.19-openssl-no-ecdsa.patch b/xmlsec1-1.2.19-openssl-no-ecdsa.patch new file mode 100644 index 0000000..dc2120d --- /dev/null +++ b/xmlsec1-1.2.19-openssl-no-ecdsa.patch @@ -0,0 +1,25 @@ +--- configure.in.old 2013-03-25 20:12:45.641324517 +0800 ++++ configure.in 2013-03-25 20:16:55.455082932 +0800 +@@ -508,6 +508,22 @@ + fi + + if test "z$OPENSSL_FOUND" = "zyes" ; then ++ dnl Check availability of ECDSA ++ OLD_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS="$OPENSSL_CFLAGS" ++ ++ AC_EGREP_CPP(yes,[ ++ #include ++ #ifdef OPENSSL_NO_ECDSA ++ yes ++ #endif ++ ],[ ++ OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_NO_ECDSA=1" ++ ]) ++ CPPFLAGS=$OLD_CPPFLAGS ++fi ++ ++if test "z$OPENSSL_FOUND" = "zyes" ; then + XMLSEC_NO_OPENSSL="0" + if test "z$OPENSSL_VERSION" = "z0.9.6" ; then + OPENSSL_CFLAGS="$OPENSSL_CFLAGS -DXMLSEC_OPENSSL_096=1 -DXMLSEC_NO_ECDSA=1" diff --git a/xmlsec1.spec b/xmlsec1.spec index fa985ea..a7c1fda 100644 --- a/xmlsec1.spec +++ b/xmlsec1.spec @@ -1,7 +1,7 @@ Summary: Library providing support for "XML Signature" and "XML Encryption" standards Name: xmlsec1 -Version: 1.2.18 -Release: 4%{?dist}%{?extra_release} +Version: 1.2.19 +Release: 1%{?dist}%{?extra_release} License: MIT Group: Development/Libraries Source0: http://www.aleksey.com/xmlsec/download/xmlsec1-%{version}.tar.gz @@ -15,6 +15,13 @@ BuildRequires: gnutls-devel >= 1.0.20 BuildRequires: nss-devel >= 3.2 BuildRequires: nspr-devel BuildRequires: libtool-ltdl-devel +Patch1: xmlsec1-1.2.19-openssl-no-ecdsa.patch +# extra build deps needed for autoreconf after above patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext-devel +BuildRequires: libtool + %description XML Security Library is a C library based on LibXML2 and OpenSSL. @@ -113,8 +120,10 @@ Libraries, includes, etc. for developing XML Security applications with NSS. %prep %setup -q +%patch1 -p0 %build +autoreconf -if %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -210,6 +219,9 @@ rm -fr %{buildroot} %{_libdir}/pkgconfig/xmlsec1-nss.pc %changelog +* Mon Mar 25 2013 Daniel Veillard - 1.2.19-1 +- Update to upstream release 1.2.19 + * Fri Feb 15 2013 Fedora Release Engineering - 1.2.18-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild