From a729dd337db56652f8a2f61b826d466ee11423c9 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Mon, 17 Mar 2008 21:36:21 +0000 Subject: [PATCH] More Solaris package changes. --- dependencies/curl/pkginfo | 7 +- dependencies/curl/postinstall | 5 + dependencies/log4cpp/pkginfo | 1 - dependencies/log4cpp/postinstall | 5 + dependencies/log4shib/pkginfo | 1 - dependencies/log4shib/postinstall | 5 + dependencies/xerces/pkginfo | 11 +- dependencies/xerces/xerces-c.spec | 147 -------------------------- dependencies/xml-security/pkginfo | 7 +- dependencies/xml-security/xml-security-c.spec | 85 --------------- pkginfo.in | 1 - 11 files changed, 26 insertions(+), 249 deletions(-) delete mode 100644 dependencies/xerces/xerces-c.spec delete mode 100644 dependencies/xml-security/xml-security-c.spec diff --git a/dependencies/curl/pkginfo b/dependencies/curl/pkginfo index ac811b5..e0944d9 100644 --- a/dependencies/curl/pkginfo +++ b/dependencies/curl/pkginfo @@ -1,10 +1,9 @@ -ARCH=sparc PKG=SHIBcurl NAME=curl - Library and tool for common Internet protocols -VERSION=7.16.2 +VERSION=7.18.0 CATEGORY=system VENDOR=http://curl.haxx.se/ packaged for Shibboleth by Scott Cantor -HOTLINE=http://bugs.internet2.edu/ +HOTLINE=https://bugs.internet2.edu/ EMAIL=cantor.2@osu.edu -PSTAMP=11Jun2007 +PSTAMP=17Mar2008 CLASSES=none diff --git a/dependencies/curl/postinstall b/dependencies/curl/postinstall index 89c0e2d..5edb885 100644 --- a/dependencies/curl/postinstall +++ b/dependencies/curl/postinstall @@ -5,4 +5,9 @@ sed "s|^prefix=.*|prefix=${CLIENT_BASEDIR}|1" curl-config > curl-config.tmp mv curl-config.tmp curl-config chmod 755 curl-config +cd ${CLIENT_BASEDIR}/lib/pkgconfig +sed "s|^prefix=.*|prefix=${CLIENT_BASEDIR}|1" libcurl.pc > libcurl.pc.tmp +mv libcurl.pc.tmp libcurl.pc +chmod 644 libcurl.pc + exit 0 diff --git a/dependencies/log4cpp/pkginfo b/dependencies/log4cpp/pkginfo index 50910b5..43dee83 100644 --- a/dependencies/log4cpp/pkginfo +++ b/dependencies/log4cpp/pkginfo @@ -1,7 +1,6 @@ PKG=SHIBlog4shib NAME=Logging Library for C++ forked from log4cpp VERSION=1.0 -BASEDIR=/usr/local CATEGORY=system VENDOR=Internet2 HOTLINE=https://bugs.internet2.edu/ diff --git a/dependencies/log4cpp/postinstall b/dependencies/log4cpp/postinstall index 9859a01..323324b 100644 --- a/dependencies/log4cpp/postinstall +++ b/dependencies/log4cpp/postinstall @@ -5,4 +5,9 @@ sed "s|^ prefix=.*| prefix=${CLIENT_BASEDIR}|1" log4shib-config > log4shib-con mv log4shib-config.tmp log4shib-config chmod 755 log4shib-config +cd ${CLIENT_BASEDIR}/lib/pkgconfig +sed "s|^prefix=.*|prefix=${CLIENT_BASEDIR}|1" log4cpp.pc > log4cpp.pc.tmp +mv log4cpp.pc.tmp log4cpp.pc +chmod 644 log4cpp.pc + exit 0 diff --git a/dependencies/log4shib/pkginfo b/dependencies/log4shib/pkginfo index 50910b5..43dee83 100644 --- a/dependencies/log4shib/pkginfo +++ b/dependencies/log4shib/pkginfo @@ -1,7 +1,6 @@ PKG=SHIBlog4shib NAME=Logging Library for C++ forked from log4cpp VERSION=1.0 -BASEDIR=/usr/local CATEGORY=system VENDOR=Internet2 HOTLINE=https://bugs.internet2.edu/ diff --git a/dependencies/log4shib/postinstall b/dependencies/log4shib/postinstall index 9859a01..de742eb 100644 --- a/dependencies/log4shib/postinstall +++ b/dependencies/log4shib/postinstall @@ -5,4 +5,9 @@ sed "s|^ prefix=.*| prefix=${CLIENT_BASEDIR}|1" log4shib-config > log4shib-con mv log4shib-config.tmp log4shib-config chmod 755 log4shib-config +cd ${CLIENT_BASEDIR}/lib/pkgconfig +sed "s|^prefix=.*|prefix=${CLIENT_BASEDIR}|1" log4shib.pc > log4shib.pc.tmp +mv log4shib.pc.tmp log4shib.pc +chmod 644 log4shib.pc + exit 0 diff --git a/dependencies/xerces/pkginfo b/dependencies/xerces/pkginfo index fcf6890..219fdca 100644 --- a/dependencies/xerces/pkginfo +++ b/dependencies/xerces/pkginfo @@ -1,10 +1,9 @@ -ARCH=sparc PKG=SHIBxerces -NAME=Apache Xerces XML parser for C++ plus Shib Project patches -VERSION=2.7.1 +NAME=Apache Xerces XML parser for C++ +VERSION=2.8.0 CATEGORY=system -VENDOR=http://xml.apache.org packaged for Shibboleth by Scott Cantor -HOTLINE=http://bugs.internet2.edu/ +VENDOR=http://xerces.apache.org packaged for Shibboleth by Scott Cantor +HOTLINE=https://bugs.internet2.edu/ EMAIL=cantor.2@osu.edu -PSTAMP=11Jun2007 +PSTAMP=17Mar2008 CLASSES=none diff --git a/dependencies/xerces/xerces-c.spec b/dependencies/xerces/xerces-c.spec deleted file mode 100644 index a6dff01..0000000 --- a/dependencies/xerces/xerces-c.spec +++ /dev/null @@ -1,147 +0,0 @@ -%define tarversion 2_7_1 -%define barename xerces-c - -# threads -# values: pthreads, none -%define threads pthreads - -Summary: Xerces-C++ validating XML parser -Name: xerces271-c -Version: 2.7.1 -Release: 1 -URL: http://shibboleth.internet2.edu/downloads/ -Source0: %{barename}-src_%{tarversion}.tar.gz -License: Apache -Group: Libraries -BuildRoot: %{_tmppath}/%{name}-root -Prefix: /usr -Obsoletes: %{barename} <= %{version} - -%description -Xerces-C++ is a validating XML parser written in a portable subset of C++. -Xerces-C++ makes it easy to give your application the ability to read and -write XML data. A shared library is provided for parsing, generating, -manipulating, and validating XML documents. - -The parser provides high performance, modularity, and scalability. Source -code, samples and API documentation are provided with the parser. For -portability, care has been taken to make minimal use of templates, no RTTI, -and minimal use of #ifdefs. - -%package samples -Summary: Sample applications using Xerces-C++ -Group: Applications/Text -Requires: %{name} = %{version}-%{release} -Obsoletes: %{barename}-samples <= %{version} - -%description samples -Sample applications using Xerces-C++. - -%package devel -Requires: %{name} = %{version}-%{release} -Obsoletes: %{barename}-devel <= %{version} -Group: Development/Libraries -Summary: Header files for Xerces-C++ validating XML parser - -%description devel -Header files you can use to develop XML applications with Xerces-C++. - -Xerces-C++ is a validating XML parser written in a portable subset of C++. -Xerces-C++ makes it easy to give your application the ability to read and -write XML data. A shared library is provided for parsing, generating, -manipulating, and validating XML documents. - -%package doc -Obsoletes: %{barename}-doc <= %{version} -Group: Documentation -Summary: Documentation for Xerces-C++ validating XML parser - -%description doc -Documentation for Xerces-C++. - -Xerces-C++ is a validating XML parser written in a portable subset of C++. -Xerces-C++ makes it easy to give your application the ability to read and -write XML data. A shared library is provided for parsing, generating, -manipulating, and validating XML documents. - -%prep -%setup -q -n %{barename}-src_%{tarversion} - -%build -export CC=%{__cc} -export CXX=%{__cxx} - -%ifarch alpha ppc64 s390x sparc64 x86_64 ia64 - %define rcopts -b 64 -p %{_target_os} -%else - %define rcopts -b 32 -p %{_target_os} -%endif - -export XERCESCROOT=`pwd` -cd $XERCESCROOT/src/xercesc -./runConfigure %{rcopts} -C --libdir="%{_libdir}" -minmem -nsocket -tnative -r%{threads} -P%{prefix} -make -cd $XERCESCROOT/samples -./runConfigure %{rcopts} -make - -%install -rm -rf $RPM_BUILD_ROOT -make -C src/xercesc install XERCESCROOT=`pwd` DESTDIR=$RPM_BUILD_ROOT -if [ ! -e $RPM_BUILD_ROOT%{_prefix}/%{_lib} ]; then - mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_prefix}/%{_lib} -fi -# Samples -mv bin/obj __obj -install -dm 755 $RPM_BUILD_ROOT%{_bindir} -install -pm 755 bin/* $RPM_BUILD_ROOT%{_bindir} -mv __obj bin/obj - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc LICENSE* NOTICE STATUS credits.txt -%{_libdir}/libxerces-*.so.* - -%files samples -%defattr(-,root,root,-) -%{_bindir}/* - -%files devel -%defattr(-,root,root,-) -%{_includedir}/xercesc -%{_libdir}/libxerces-*.so - -%files doc -%defattr(644,root,root,755) -%doc doc/html/* - -%changelog -* Wed Jun 6 2007 Scott Cantor -- reapply improvements from our spec file for 2.6.0 - -* Fri Jun 6 2003 Tuan Hoang -- updated for new Xerces-C filename and directory format -- fixed date format in changelog section - -* Fri Mar 14 2003 Tinny Ng -- changed to 2.3 - -* Wed Dec 18 2002 Albert Strasheim -- added symlink to libxerces-c.so in lib directory - -* Fri Dec 13 2002 Albert Strasheim -- added seperate doc package -- major cleanups - -* Tue Sep 03 2002 -- fixed missing DESTDIR in Makefile.util.submodule - -* Mon Sep 02 2002 -- Initial build. diff --git a/dependencies/xml-security/pkginfo b/dependencies/xml-security/pkginfo index 6b61587..30d7bc2 100644 --- a/dependencies/xml-security/pkginfo +++ b/dependencies/xml-security/pkginfo @@ -1,10 +1,9 @@ -ARCH=sparc PKG=SHIBxmlsec NAME=Apache XML-Security library for C++ -VERSION=1.3.1 +VERSION=1.4.0 CATEGORY=system VENDOR=http://xml.apache.org packaged for Shibboleth by Scott Cantor -HOTLINE=http://bugs.internet2.edu/ +HOTLINE=https://bugs.internet2.edu/ EMAIL=cantor.2@osu.edu -PSTAMP=11Jun2007 +PSTAMP=17Mar2008 CLASSES=none diff --git a/dependencies/xml-security/xml-security-c.spec b/dependencies/xml-security/xml-security-c.spec deleted file mode 100644 index 5f2d136..0000000 --- a/dependencies/xml-security/xml-security-c.spec +++ /dev/null @@ -1,85 +0,0 @@ -Name: xml-security-c -Version: 1.3.1 -Release: 1 -Summary: C++ XML security library - -Group: System Environment/Libraries -License: Apache Software License -URL: http://xml.apache.org/security/c/ -Source0: http://xml.apache.org/security/dist/c-library/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: xerces%{?xercesver}-c-devel >= 2.3, openssl-devel -%{?_with_xalan:BuildRequires: xalan-c-devel >= 1.6} - -%description -The Apache %{summary}. - -Non-default rpmbuild options: -"--with xalan": use the Xalan XSLT processor. - -%package devel -Summary: Development files for the Apache C++ XML security library -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -%{summary}. - -%package docs -Summary: Developer documentation for the Apache C++ XML security library -Group: Documentation - -%description docs -%{summary}. - - -%prep -%setup0 -q - -%build -%configure %{!?_with_xalan: --without-xalan} -make # %{?_smp_mflags} # fails as of 1.[01].0. - - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -pm 755 $RPM_BUILD_ROOT%{_libdir} # FIXME in Makefiles -make install DESTDIR=$RPM_BUILD_ROOT - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc LICENSE NOTICE -%{_libdir}/*.so.* -%{_libdir}/*.a -%exclude %{_libdir}/*.la -%{_bindir}/* - -%files devel -%defattr(-,root,root,-) -%{_includedir}/xsec -%{_libdir}/*.so - -%files docs -%defattr(644,root,root,755) -%doc doc/c/* - - -%changelog -* Mon Jun 11 2007 Scott Cantor 1.3.1-1 -- update to 1.3.1 -* Thu Mar 23 2006 Ian Young - 1.2.0-2 -- patch to remove extra qualifications for compat with g++ 4.1 -* Sun Jul 03 2005 Scott Cantor - 1.2.0-1 -- Updated version. -* Mon Oct 19 2004 Derek Atkins - 1.1.1-1 -- First Package. diff --git a/pkginfo.in b/pkginfo.in index f124d6f..4fe456e 100644 --- a/pkginfo.in +++ b/pkginfo.in @@ -1,7 +1,6 @@ PKG=SHIBxmltool ARCH=sparc VERSION=@-VERSION-@ -BASEDIR=/usr/local NAME=xmltooling-c CATEGORY=application,textproc,security DESC=Library for DOM processing with Signature/Encryption for C++ -- 2.1.4