projects/oracle-lib-compat/build.py.props | 3 projects/oracle-lib-compat/oracle-lib-compat.spec | 154 +++++++++++++++++++++ projects/oracle-lib-compat/tomcat-setenv.sh | 10 + rel-eng/packages/oracle-lib-compat | 2 spec-tree/oracle-lib-compat/build.py.props | 4 spec-tree/oracle-lib-compat/oracle-lib-compat.spec | 139 ------------------ 6 files changed, 168 insertions(+), 144 deletions(-)
New commits: commit 0ca119bec3efea80d21d5f9187a8dc9db8844d8e Author: Jan Pazdziora jpazdziora@redhat.com Date: Mon Sep 13 14:49:24 2010 +0200
Automatic commit of package [oracle-lib-compat] minor release [10.2-23].
diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec index e28ba27..5cc126c 100644 --- a/projects/oracle-lib-compat/oracle-lib-compat.spec +++ b/projects/oracle-lib-compat/oracle-lib-compat.spec @@ -1,6 +1,6 @@ Name: oracle-lib-compat Version: 10.2 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Compatibility package so that perl-DBD-Oracle will install Group: Applications/Multimedia License: GPLv2 @@ -97,6 +97,10 @@ find %{_prefix}/lib/oracle/%{icversion} \ | xargs execstack -c
%changelog +* Mon Sep 13 2010 Jan Pazdziora 10.2-23 +- 623115 - force tomcat to use the stock openldap, overriding the ldap_* + symbols in libclntsh.so*. + * Thu Apr 15 2010 Michael Mraka michael.mraka@redhat.com 10.2-22 - fixed errors in %%post
diff --git a/rel-eng/packages/oracle-lib-compat b/rel-eng/packages/oracle-lib-compat index 087a747..f33f647 100644 --- a/rel-eng/packages/oracle-lib-compat +++ b/rel-eng/packages/oracle-lib-compat @@ -1 +1 @@ -10.2-22 spec-tree/oracle-lib-compat/ +10.2-23 projects/oracle-lib-compat/
commit c2966b5699118c2362a14fd7440dd3d1cfb59605 Author: Jan Pazdziora jpazdziora@redhat.com Date: Mon Sep 13 14:48:54 2010 +0200
As the oracle-lib-compat package now ships the tomcat-setenv.sh and thus has .tar.gz content in .src.rpm, moving to projects/.
diff --git a/projects/oracle-lib-compat/build.py.props b/projects/oracle-lib-compat/build.py.props new file mode 100644 index 0000000..ccc90ea --- /dev/null +++ b/projects/oracle-lib-compat/build.py.props @@ -0,0 +1,3 @@ +[buildconfig] +tagger = spacewalk.releng.tagger.ReleaseTagger + diff --git a/projects/oracle-lib-compat/oracle-lib-compat.spec b/projects/oracle-lib-compat/oracle-lib-compat.spec new file mode 100644 index 0000000..e28ba27 --- /dev/null +++ b/projects/oracle-lib-compat/oracle-lib-compat.spec @@ -0,0 +1,150 @@ +Name: oracle-lib-compat +Version: 10.2 +Release: 22%{?dist} +Summary: Compatibility package so that perl-DBD-Oracle will install +Group: Applications/Multimedia +License: GPLv2 +# This src.rpm is cannonical upstream +# You can obtain it using this set of commands +# git clone git://git.fedorahosted.org/git/spacewalk.git/ +# cd spec-tree/oracle-lib-compat +# make srpm +URL: https://fedorahosted.org/spacewalk +Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... +BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) + +%ifarch s390 s390x +%define icversion 10.2.0.2 +%else +%define icversion 10.2.0.4 +%endif + +Requires: oracle-instantclient-basic = %{icversion} +Requires: oracle-instantclient-sqlplus = %{icversion} +Requires(post): ldconfig +Requires(post): /usr/bin/execstack +Requires(post): /usr/bin/file +Requires(post): /usr/bin/xargs + +%ifarch x86_64 +%define lib64 ()(64bit) +%endif +Provides: libocci.so.10.1%{?lib64} = %{icversion} +Provides: libnnz10.so%{?lib64} = %{icversion} +Provides: libocijdbc10.so%{?lib64} = %{icversion} +Provides: libclntsh.so.10.1%{?lib64} = %{icversion} +Provides: libociei.so%{?lib64} = %{icversion} +Provides: ojdbc14 = %{icversion} +Obsoletes: rhn-oracle-jdbc <= 1.0 +Requires: libstdc++.so.5%{?lib64} + +%description +Compatibility package so that perl-DBD-Oracle will install. + +%prep +%setup -q + +%build + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d +echo %{_libdir}/oracle/%{icversion}/client/lib >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}.conf +# do not replace /usr/lib with _libdir macro here +# XE server is 32bit even on 64bit platforms +echo /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/lib >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}.conf + +%ifarch x86_64 s390x +mkdir -p $RPM_BUILD_ROOT%{_bindir} +ln -s ../%{_lib}/oracle/%{icversion}/client/bin/sqlplus $RPM_BUILD_ROOT%{_bindir}/sqlplus + +mkdir -p $RPM_BUILD_ROOT%{_libdir}/oracle/%{icversion} +ln -s ../../../lib/oracle/%{icversion}/client64 $RPM_BUILD_ROOT%{_libdir}/oracle/%{icversion}/client +%endif + +mkdir -p $RPM_BUILD_ROOT/%{_javadir} +ln -s ../../%{_lib}/oracle/%{icversion}/client/lib/ojdbc14.jar $RPM_BUILD_ROOT/%{_javadir}/ojdbc14.jar + +%if 0%{?rhel} && 0%{?rhel} < 6 +%define tomcatname tomcat5 +%else +%define tomcatname tomcat6 +%endif +install -d $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin +install tomcat-setenv.sh $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin/setenv.sh + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%ifarch x86_64 s390x +%{_bindir}/sqlplus +%{_libdir}/oracle +%endif +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}.conf +%{_javadir}/ojdbc14.jar +%{_datadir}/%{tomcatname}/bin/setenv.sh + +%post +ldconfig + +# clear execstack on libs in oracle's provided instantclient rpm +find %{_prefix}/lib/oracle/%{icversion} \ + | xargs file | awk -F: '/ELF.*(executable|shared object)/ {print $1}' \ + | xargs execstack -c + +%changelog +* Thu Apr 15 2010 Michael Mraka michael.mraka@redhat.com 10.2-22 +- fixed errors in %%post + +* Wed Sep 09 2009 Michael Mraka michael.mraka@redhat.com 10.2-21 +- 506951 - clear exec stack on instantclient libs (fixes selinux avc denial) + +* Tue Apr 07 2009 Michael Mraka michael.mraka@redhat.com 10.2-20 +- specified exact version of instantclient + +* Mon Mar 02 2009 Devan Goodwin dgoodwin@redhat.com 10.2-19 +- Version bump to allow fresh dist-cvs tags. + +* Mon Dec 15 2008 Michael Mraka michael.mraka@redhat.com 10.2-16 +- added /usr/bin/sqlplus for 64bit platforms +- added filesystem standard compatible link /usr/lib64/oracle/10.2.0.4/client +- added Requires: libstdc++.so.5 to satisfy instantclient libs +- added Provides: ojdbc14, Obsoletes: rhn-oracle-jdbc +- fixed rpmlint warnings + +* Wed Oct 22 2008 Michael Mraka michael.mraka@redhat.com 10.2-13 +- resolved #461765 - oracle libs not loaded + +* Thu Sep 25 2008 Milan Zazrivec 10.2-12 +- merged changes from release-0.2 branch +- fixed s390x + +* Thu Sep 11 2008 Jesus Rodriguez jesusr@redhat.com 10.2-11 +- fix x86_64 + +* Thu Sep 4 2008 Michael Mraka michael.mraka@redhat.com 10.2-8 +- fixed rpmlint errors and warnings +- built in brew/koji + +* Mon Jul 29 2008 Mike McCune mmccune@redhat.com +- Removing uneeded Requires compat-libstdc++ + +* Tue Jul 2 2008 Mike McCune mmccune@redhat.com +- Adding ldconfig for the 64bit instantclient libs + +* Tue Jul 1 2008 Mike McCune mmccune@redhat.com +- relaxing instantclient version requirement to be >= vs = + +* Mon Jun 16 2008 Michael Mraka michael.mraka@redhat.com +- added 64bit libs macro + +* Fri Jun 13 2008 Devan Goodwin dgoodwin@redhat.com 10.2-3 +- Add symlink for to Oracle 10.2.0.4 libraries. + +* Wed Jun 4 2008 Jesus Rodriguez <jmrodri at gmail dot com> 10.2-1 +- initial compat rpm + diff --git a/projects/oracle-lib-compat/tomcat-setenv.sh b/projects/oracle-lib-compat/tomcat-setenv.sh new file mode 100644 index 0000000..526226f --- /dev/null +++ b/projects/oracle-lib-compat/tomcat-setenv.sh @@ -0,0 +1,10 @@ + +# To address bug 623115/627859, we need to override the ldap_* symbols +# in libclntsh.so* upon tomcat5 startup with those from standard library. +if [ -f /usr/lib64/libldap.so ] ; then + LD_PRELOAD=/usr/lib64/libldap.so +else + LD_PRELOAD=/usr/lib/libldap.so +fi +export LD_PRELOAD + diff --git a/spec-tree/oracle-lib-compat/build.py.props b/spec-tree/oracle-lib-compat/build.py.props deleted file mode 100644 index ccc90ea..0000000 --- a/spec-tree/oracle-lib-compat/build.py.props +++ /dev/null @@ -1,3 +0,0 @@ -[buildconfig] -tagger = spacewalk.releng.tagger.ReleaseTagger - diff --git a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec b/spec-tree/oracle-lib-compat/oracle-lib-compat.spec deleted file mode 100644 index e28ba27..0000000 --- a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec +++ /dev/null @@ -1,150 +0,0 @@ -Name: oracle-lib-compat -Version: 10.2 -Release: 22%{?dist} -Summary: Compatibility package so that perl-DBD-Oracle will install -Group: Applications/Multimedia -License: GPLv2 -# This src.rpm is cannonical upstream -# You can obtain it using this set of commands -# git clone git://git.fedorahosted.org/git/spacewalk.git/ -# cd spec-tree/oracle-lib-compat -# make srpm -URL: https://fedorahosted.org/spacewalk -Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... -BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) - -%ifarch s390 s390x -%define icversion 10.2.0.2 -%else -%define icversion 10.2.0.4 -%endif - -Requires: oracle-instantclient-basic = %{icversion} -Requires: oracle-instantclient-sqlplus = %{icversion} -Requires(post): ldconfig -Requires(post): /usr/bin/execstack -Requires(post): /usr/bin/file -Requires(post): /usr/bin/xargs - -%ifarch x86_64 -%define lib64 ()(64bit) -%endif -Provides: libocci.so.10.1%{?lib64} = %{icversion} -Provides: libnnz10.so%{?lib64} = %{icversion} -Provides: libocijdbc10.so%{?lib64} = %{icversion} -Provides: libclntsh.so.10.1%{?lib64} = %{icversion} -Provides: libociei.so%{?lib64} = %{icversion} -Provides: ojdbc14 = %{icversion} -Obsoletes: rhn-oracle-jdbc <= 1.0 -Requires: libstdc++.so.5%{?lib64} - -%description -Compatibility package so that perl-DBD-Oracle will install. - -%prep -%setup -q - -%build - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d -echo %{_libdir}/oracle/%{icversion}/client/lib >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}.conf -# do not replace /usr/lib with _libdir macro here -# XE server is 32bit even on 64bit platforms -echo /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/lib >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}.conf - -%ifarch x86_64 s390x -mkdir -p $RPM_BUILD_ROOT%{_bindir} -ln -s ../%{_lib}/oracle/%{icversion}/client/bin/sqlplus $RPM_BUILD_ROOT%{_bindir}/sqlplus - -mkdir -p $RPM_BUILD_ROOT%{_libdir}/oracle/%{icversion} -ln -s ../../../lib/oracle/%{icversion}/client64 $RPM_BUILD_ROOT%{_libdir}/oracle/%{icversion}/client -%endif - -mkdir -p $RPM_BUILD_ROOT/%{_javadir} -ln -s ../../%{_lib}/oracle/%{icversion}/client/lib/ojdbc14.jar $RPM_BUILD_ROOT/%{_javadir}/ojdbc14.jar - -%if 0%{?rhel} && 0%{?rhel} < 6 -%define tomcatname tomcat5 -%else -%define tomcatname tomcat6 -%endif -install -d $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin -install tomcat-setenv.sh $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin/setenv.sh - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%ifarch x86_64 s390x -%{_bindir}/sqlplus -%{_libdir}/oracle -%endif -%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}.conf -%{_javadir}/ojdbc14.jar -%{_datadir}/%{tomcatname}/bin/setenv.sh - -%post -ldconfig - -# clear execstack on libs in oracle's provided instantclient rpm -find %{_prefix}/lib/oracle/%{icversion} \ - | xargs file | awk -F: '/ELF.*(executable|shared object)/ {print $1}' \ - | xargs execstack -c - -%changelog -* Thu Apr 15 2010 Michael Mraka michael.mraka@redhat.com 10.2-22 -- fixed errors in %%post - -* Wed Sep 09 2009 Michael Mraka michael.mraka@redhat.com 10.2-21 -- 506951 - clear exec stack on instantclient libs (fixes selinux avc denial) - -* Tue Apr 07 2009 Michael Mraka michael.mraka@redhat.com 10.2-20 -- specified exact version of instantclient - -* Mon Mar 02 2009 Devan Goodwin dgoodwin@redhat.com 10.2-19 -- Version bump to allow fresh dist-cvs tags. - -* Mon Dec 15 2008 Michael Mraka michael.mraka@redhat.com 10.2-16 -- added /usr/bin/sqlplus for 64bit platforms -- added filesystem standard compatible link /usr/lib64/oracle/10.2.0.4/client -- added Requires: libstdc++.so.5 to satisfy instantclient libs -- added Provides: ojdbc14, Obsoletes: rhn-oracle-jdbc -- fixed rpmlint warnings - -* Wed Oct 22 2008 Michael Mraka michael.mraka@redhat.com 10.2-13 -- resolved #461765 - oracle libs not loaded - -* Thu Sep 25 2008 Milan Zazrivec 10.2-12 -- merged changes from release-0.2 branch -- fixed s390x - -* Thu Sep 11 2008 Jesus Rodriguez jesusr@redhat.com 10.2-11 -- fix x86_64 - -* Thu Sep 4 2008 Michael Mraka michael.mraka@redhat.com 10.2-8 -- fixed rpmlint errors and warnings -- built in brew/koji - -* Mon Jul 29 2008 Mike McCune mmccune@redhat.com -- Removing uneeded Requires compat-libstdc++ - -* Tue Jul 2 2008 Mike McCune mmccune@redhat.com -- Adding ldconfig for the 64bit instantclient libs - -* Tue Jul 1 2008 Mike McCune mmccune@redhat.com -- relaxing instantclient version requirement to be >= vs = - -* Mon Jun 16 2008 Michael Mraka michael.mraka@redhat.com -- added 64bit libs macro - -* Fri Jun 13 2008 Devan Goodwin dgoodwin@redhat.com 10.2-3 -- Add symlink for to Oracle 10.2.0.4 libraries. - -* Wed Jun 4 2008 Jesus Rodriguez <jmrodri at gmail dot com> 10.2-1 -- initial compat rpm - diff --git a/spec-tree/oracle-lib-compat/tomcat-setenv.sh b/spec-tree/oracle-lib-compat/tomcat-setenv.sh deleted file mode 100644 index 526226f..0000000 --- a/spec-tree/oracle-lib-compat/tomcat-setenv.sh +++ /dev/null @@ -1,10 +0,0 @@ - -# To address bug 623115/627859, we need to override the ldap_* symbols -# in libclntsh.so* upon tomcat5 startup with those from standard library. -if [ -f /usr/lib64/libldap.so ] ; then - LD_PRELOAD=/usr/lib64/libldap.so -else - LD_PRELOAD=/usr/lib/libldap.so -fi -export LD_PRELOAD -
commit f5a5bb16292d33bf63941d5d45d361ebb2f39975 Author: Jan Pazdziora jpazdziora@redhat.com Date: Mon Sep 13 14:05:11 2010 +0200
623115 - force tomcat to use the stock openldap, overriding the ldap_* symbols in libclntsh.so*.
diff --git a/spec-tree/oracle-lib-compat/build.py.props b/spec-tree/oracle-lib-compat/build.py.props index 6341939..ccc90ea 100644 --- a/spec-tree/oracle-lib-compat/build.py.props +++ b/spec-tree/oracle-lib-compat/build.py.props @@ -1,4 +1,3 @@ [buildconfig] -builder = spacewalk.releng.builder.NoTgzBuilder tagger = spacewalk.releng.tagger.ReleaseTagger
diff --git a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec b/spec-tree/oracle-lib-compat/oracle-lib-compat.spec index 8827af0..e28ba27 100644 --- a/spec-tree/oracle-lib-compat/oracle-lib-compat.spec +++ b/spec-tree/oracle-lib-compat/oracle-lib-compat.spec @@ -10,6 +10,7 @@ License: GPLv2 # cd spec-tree/oracle-lib-compat # make srpm URL: https://fedorahosted.org/spacewalk +Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%ifarch s390 s390x @@ -41,6 +42,7 @@ Requires: libstdc++.so.5%{?lib64} Compatibility package so that perl-DBD-Oracle will install.
%prep +%setup -q
%build
@@ -65,6 +67,14 @@ ln -s ../../../lib/oracle/%{icversion}/client64 $RPM_BUILD_ROOT%{_libdir}/oracle mkdir -p $RPM_BUILD_ROOT/%{_javadir} ln -s ../../%{_lib}/oracle/%{icversion}/client/lib/ojdbc14.jar $RPM_BUILD_ROOT/%{_javadir}/ojdbc14.jar
+%if 0%{?rhel} && 0%{?rhel} < 6 +%define tomcatname tomcat5 +%else +%define tomcatname tomcat6 +%endif +install -d $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin +install tomcat-setenv.sh $RPM_BUILD_ROOT%{_datadir}/%{tomcatname}/bin/setenv.sh + %clean rm -rf $RPM_BUILD_ROOT
@@ -76,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT %endif %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}.conf %{_javadir}/ojdbc14.jar +%{_datadir}/%{tomcatname}/bin/setenv.sh
%post ldconfig diff --git a/spec-tree/oracle-lib-compat/tomcat-setenv.sh b/spec-tree/oracle-lib-compat/tomcat-setenv.sh new file mode 100644 index 0000000..526226f --- /dev/null +++ b/spec-tree/oracle-lib-compat/tomcat-setenv.sh @@ -0,0 +1,10 @@ + +# To address bug 623115/627859, we need to override the ldap_* symbols +# in libclntsh.so* upon tomcat5 startup with those from standard library. +if [ -f /usr/lib64/libldap.so ] ; then + LD_PRELOAD=/usr/lib64/libldap.so +else + LD_PRELOAD=/usr/lib/libldap.so +fi +export LD_PRELOAD +
spacewalk-commits@lists.fedorahosted.org