From 16e49b7378d0e4387f9e049ad45fa719a8a4c193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Mon, 1 Jun 2009 18:23:03 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for xml-security-c --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From d60592539a9ac4bc9de32b890aaa508c9d14d40d Mon Sep 17 00:00:00 2001 From: Antti Andreimann Date: Mon, 1 Jun 2009 19:26:14 +0000 Subject: [PATCH 2/5] Initial import --- .cvsignore | 1 + import.log | 1 + sources | 1 + xml-security-c.spec | 93 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 import.log create mode 100644 xml-security-c.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3179937 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xml-security-c-1.4.0.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..c582668 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xml-security-c-1_4_0-2_fc10:F-11:xml-security-c-1.4.0-2.src.rpm:1243884087 diff --git a/sources b/sources index e69de29..15935a4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +dd9accf6727eb008dbf1dd674d5d4dcc xml-security-c-1.4.0.tar.gz diff --git a/xml-security-c.spec b/xml-security-c.spec new file mode 100644 index 0000000..ed4f916 --- /dev/null +++ b/xml-security-c.spec @@ -0,0 +1,93 @@ +Name: xml-security-c +Version: 1.4.0 +Release: 2%{?dist} +Summary: C++ Implementation of W3C security standards for XML + +Group: System Environment/Libraries +License: ASL 2.0 +URL: http://santuario.apache.org/c/ +Source: http://santuario.apache.org/dist/c-library/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: xerces-c-devel xalan-c-devel openssl-devel +BuildRequires: pkgconfig + +%description +The xml-security-c library is a C++ implementation of the XML Digital Signature +specification. The library makes use of the Apache XML project's Xerces-C XML +Parser and Xalan-C XSLT processor. The latter is used for processing XPath and +XSLT transforms. + + +%package devel +Summary: Development files for xml-security-c +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: xerces-c-devel xalan-c-devel openssl-devel +# There are a number of headers that can use NSS if HAVE_NSS is set to 1 +# Current build does not set it (configure does not even check for NSS) +# so we do not include this dependency for now. +# Requires: nss-devel + +%description devel +This package provides development files for xml-security-c, a C++ library for +XML Digital Signatures. + + +%prep +%setup -q +# Remove bogus "-O2" from CXXFLAGS to avoid overriding RPM_OPT_FLAGS. +sed -i -e 's/-O2 -DNDEBUG/-DNDEBUG/g' configure + +%build +%configure --disable-static +make %{?_smp_mflags} + +%check +# Verify that what was compiled actually works. +./bin/xtest + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT CPPROG="cp -p" + +# We do not ship .la files. +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + +# Do not ship library test utilities. These are only needed for +# xml-security-c developers and they should have the whole source anyway. +rm -rf $RPM_BUILD_ROOT%{_bindir} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%{_libdir}/libxml-security-c.so.* + + +%files devel +%defattr(-,root,root,-) +%{_includedir}/xsec +%{_libdir}/libxml-security-c.so + +# Upstream does not provide any docs (yet!) +# %doc CHANGELOG.txt + +%changelog +* Tue Apr 28 2009 Antti Andreimann - 1.4.0-2 +- Execute sed magic against configure instead of configure.ac to + avoid calling autotools +- Removed build dependency on autotools. +- Do not ship test binaries (not needed for end-users) +- Added proper dependencies for devel sub-package +- Added CPPROG="cp -p" to preserve header file timestamps. + +* Mon Mar 30 2009 Antti Andreimann - 1.4.0-1 +- Initial RPM release. From 839c19a60bb09ebf3d51b6935137bce11733c30b Mon Sep 17 00:00:00 2001 From: Antti Andreimann Date: Wed, 29 Jul 2009 15:26:39 +0000 Subject: [PATCH 3/5] Upgrade to 1.5.1 --- .cvsignore | 2 +- sources | 2 +- xml-security-c.spec | 20 +++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3179937..1049786 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xml-security-c-1.4.0.tar.gz +xml-security-c-1.5.1.tar.gz diff --git a/sources b/sources index 15935a4..62c55a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dd9accf6727eb008dbf1dd674d5d4dcc xml-security-c-1.4.0.tar.gz +2c47c4ec12e8d6abe967aa5e5e99000c xml-security-c-1.5.1.tar.gz diff --git a/xml-security-c.spec b/xml-security-c.spec index ed4f916..fd0ab05 100644 --- a/xml-security-c.spec +++ b/xml-security-c.spec @@ -1,6 +1,6 @@ Name: xml-security-c -Version: 1.4.0 -Release: 2%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: C++ Implementation of W3C security standards for XML Group: System Environment/Libraries @@ -10,7 +10,7 @@ Source: http://santuario.apache.org/dist/c-library/%{name}-%{version}.ta BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xerces-c-devel xalan-c-devel openssl-devel -BuildRequires: pkgconfig +BuildRequires: pkgconfig %description The xml-security-c library is a C++ implementation of the XML Digital Signature @@ -23,11 +23,11 @@ XSLT transforms. Summary: Development files for xml-security-c Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: xerces-c-devel xalan-c-devel openssl-devel +Requires: xerces-c-devel xalan-c-devel openssl-devel # There are a number of headers that can use NSS if HAVE_NSS is set to 1 # Current build does not set it (configure does not even check for NSS) # so we do not include this dependency for now. -# Requires: nss-devel +# Requires: nss-devel %description devel This package provides development files for xml-security-c, a C++ library for @@ -81,6 +81,16 @@ rm -rf $RPM_BUILD_ROOT # %doc CHANGELOG.txt %changelog +* Tue Jul 28 2009 Antti Andreimann 1.5.1-1 +- New upstream relase (#513078) +- Fixes CVE-2009-0217 (#511915) + +* Mon Jul 27 2009 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jul 06 2009 Antti Andreimann - 1.5.0-1 +- New upstream release + * Tue Apr 28 2009 Antti Andreimann - 1.4.0-2 - Execute sed magic against configure instead of configure.ac to avoid calling autotools From fc5de90cf6ea3c68da9041cd8c1da7906f242e06 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:27 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 141709e..37af04d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xml-security-c -# $Id$ +# $Id: Makefile,v 1.1 2009/06/01 18:23:00 tibbs Exp $ NAME := xml-security-c SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From adada461d9056cfdd403fc7f12137f94c0950249 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:55:45 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 37af04d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xml-security-c -# $Id: Makefile,v 1.1 2009/06/01 18:23:00 tibbs Exp $ -NAME := xml-security-c -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index c582668..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xml-security-c-1_4_0-2_fc10:F-11:xml-security-c-1.4.0-2.src.rpm:1243884087