java/buildconf java/code
by Justin Sherrill
java/buildconf/apidoc/html/handler.txt | 2 +-
java/buildconf/apidoc/jsp/handler.txt | 2 +-
java/buildconf/apidoc/singlepage/handler.txt | 2 +-
java/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java | 4 ++--
java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 07e5d73f389d536268dbc0b5867575ba6f9ddf48
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 13 11:24:41 2010 -0400
580998 - making deprecatedVersion become deprecatedReason since we never used it as a version
diff --git a/java/buildconf/apidoc/html/handler.txt b/java/buildconf/apidoc/html/handler.txt
index 007872d..6aade4f 100644
--- a/java/buildconf/apidoc/html/handler.txt
+++ b/java/buildconf/apidoc/html/handler.txt
@@ -39,7 +39,7 @@ $call.doc
#if($call.deprecated)
-Deprecated as of version - $call.deprecatedVersion <p />
+Deprecated - $call.deprecatedReason <p />
#end
diff --git a/java/buildconf/apidoc/jsp/handler.txt b/java/buildconf/apidoc/jsp/handler.txt
index 11dfde9..09f7c47 100644
--- a/java/buildconf/apidoc/jsp/handler.txt
+++ b/java/buildconf/apidoc/jsp/handler.txt
@@ -55,7 +55,7 @@ $call.doc
#if($call.deprecated)
-Deprecated as of version - $call.deprecatedVersion <p />
+Deprecated - $call.deprecatedReason <p />
#end
diff --git a/java/buildconf/apidoc/singlepage/handler.txt b/java/buildconf/apidoc/singlepage/handler.txt
index 483d95d..bf06df9 100644
--- a/java/buildconf/apidoc/singlepage/handler.txt
+++ b/java/buildconf/apidoc/singlepage/handler.txt
@@ -35,7 +35,7 @@ $call.doc
#if($call.deprecated)
-Deprecated as of version - $call.deprecatedVersion <p />
+Deprecated - $call.deprecatedReason <p />
#end
diff --git a/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java b/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java
index add3871..e23fa16 100644
--- a/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java
+++ b/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiCall.java
@@ -56,7 +56,7 @@ public class ApiCall implements Comparable<ApiCall> {
* Gets the deprecated version
* @return the deprecated version
*/
- public String getDeprecatedVersion() {
+ public String getDeprecatedReason() {
return deprecatedVersion;
}
@@ -64,7 +64,7 @@ public class ApiCall implements Comparable<ApiCall> {
* sets the deprecated version
* @param deprecatedVersionIn the version
*/
- public void setDeprecatedVersion(String deprecatedVersionIn) {
+ public void setDeprecatedReason(String deprecatedVersionIn) {
this.deprecatedVersion = deprecatedVersionIn;
}
diff --git a/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java b/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
index c3968ea..f5126a8 100644
--- a/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
+++ b/java/code/internal/src/com/redhat/rhn/internal/doclet/ApiDoclet.java
@@ -109,7 +109,7 @@ public class ApiDoclet {
if (method.tags(DEPRECATED).length > 0) {
call.setDeprecated(true);
- call.setDeprecatedVersion(getFirst(
+ call.setDeprecatedReason(getFirst(
method.tags(DEPRECATED)).text());
}
13 years, 9 months
Changes to 'refs/tags/oracle-lib-compat-10.2-23'
by Jan Pazdziora
Tag 'oracle-lib-compat-10.2-23' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-09-13 12:49 +0000
Tagging package [oracle-lib-compat] version [10.2-23] in directory [projects/oracle-lib-compat/].
Changes since spacewalk-backend-1.2.12-1:
Jan Pazdziora (3):
623115 - force tomcat to use the stock openldap, overriding the ldap_* symbols in libclntsh.so*.
As the oracle-lib-compat package now ships the tomcat-setenv.sh and thus has .tar.gz content in .src.rpm, moving to projects/.
Automatic commit of package [oracle-lib-compat] minor release [10.2-23].
Milan Zazrivec (1):
--db option is no longer valid
---
backend/satellite_tools/rhn_ssl_dbstore.py | 5
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 ------------------
7 files changed, 170 insertions(+), 147 deletions(-)
---
13 years, 9 months
3 commits - projects/oracle-lib-compat rel-eng/packages spec-tree/oracle-lib-compat
by Jan Pazdziora
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(a)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(a)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(a)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/%{name}-%{version}.tar.gz
+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(a)redhat.com> 10.2-22
+- fixed errors in %%post
+
+* Wed Sep 09 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-21
+- 506951 - clear exec stack on instantclient libs (fixes selinux avc denial)
+
+* Tue Apr 07 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-20
+- specified exact version of instantclient
+
+* Mon Mar 02 2009 Devan Goodwin <dgoodwin(a)redhat.com> 10.2-19
+- Version bump to allow fresh dist-cvs tags.
+
+* Mon Dec 15 2008 Michael Mraka <michael.mraka(a)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(a)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(a)redhat.com> 10.2-11
+- fix x86_64
+
+* Thu Sep 4 2008 Michael Mraka <michael.mraka(a)redhat.com> 10.2-8
+- fixed rpmlint errors and warnings
+- built in brew/koji
+
+* Mon Jul 29 2008 Mike McCune <mmccune(a)redhat.com>
+- Removing uneeded Requires compat-libstdc++
+
+* Tue Jul 2 2008 Mike McCune <mmccune(a)redhat.com>
+- Adding ldconfig for the 64bit instantclient libs
+
+* Tue Jul 1 2008 Mike McCune <mmccune(a)redhat.com>
+- relaxing instantclient version requirement to be >= vs =
+
+* Mon Jun 16 2008 Michael Mraka <michael.mraka(a)redhat.com>
+- added 64bit libs macro
+
+* Fri Jun 13 2008 Devan Goodwin <dgoodwin(a)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/%{name}-%{version}.tar.gz
-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(a)redhat.com> 10.2-22
-- fixed errors in %%post
-
-* Wed Sep 09 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-21
-- 506951 - clear exec stack on instantclient libs (fixes selinux avc denial)
-
-* Tue Apr 07 2009 Michael Mraka <michael.mraka(a)redhat.com> 10.2-20
-- specified exact version of instantclient
-
-* Mon Mar 02 2009 Devan Goodwin <dgoodwin(a)redhat.com> 10.2-19
-- Version bump to allow fresh dist-cvs tags.
-
-* Mon Dec 15 2008 Michael Mraka <michael.mraka(a)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(a)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(a)redhat.com> 10.2-11
-- fix x86_64
-
-* Thu Sep 4 2008 Michael Mraka <michael.mraka(a)redhat.com> 10.2-8
-- fixed rpmlint errors and warnings
-- built in brew/koji
-
-* Mon Jul 29 2008 Mike McCune <mmccune(a)redhat.com>
-- Removing uneeded Requires compat-libstdc++
-
-* Tue Jul 2 2008 Mike McCune <mmccune(a)redhat.com>
-- Adding ldconfig for the 64bit instantclient libs
-
-* Tue Jul 1 2008 Mike McCune <mmccune(a)redhat.com>
-- relaxing instantclient version requirement to be >= vs =
-
-* Mon Jun 16 2008 Michael Mraka <michael.mraka(a)redhat.com>
-- added 64bit libs macro
-
-* Fri Jun 13 2008 Devan Goodwin <dgoodwin(a)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(a)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/%{name}-%{version}.tar.gz
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
+
13 years, 9 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/rhn_ssl_dbstore.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 020111d9d671cfbc2b8163a651ecabe6bc8142cc
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Sep 13 13:34:01 2010 +0200
--db option is no longer valid
See commit: eacd7c1a5077b6e7f36136d138743e7fe36f8b20
diff --git a/backend/satellite_tools/rhn_ssl_dbstore.py b/backend/satellite_tools/rhn_ssl_dbstore.py
index 0aa4c08..5e66e10 100644
--- a/backend/satellite_tools/rhn_ssl_dbstore.py
+++ b/backend/satellite_tools/rhn_ssl_dbstore.py
@@ -71,14 +71,13 @@ def processCommandline():
username=db_user, password=db_password, database=db_name)
except:
sys.stderr.write("""\
-ERROR: there was a problem trying to initialize the database: %s
+ERROR: there was a problem trying to initialize the database:
-%s\n""" (values.db, fetchTraceback()))
+%s\n""" % fetchTraceback())
sys.exit(11)
if values.verbose:
print 'Public CA SSL certificate: %s' % values.ca_cert
- print 'Database connection string: %s' % values.db
return values
13 years, 9 months
Changes to 'refs/tags/spacewalk-backend-1.2.12-1'
by Justin Sherrill
Tag 'spacewalk-backend-1.2.12-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-09-10 22:21 +0000
Tagging package [spacewalk-backend] version [1.2.12-1] in directory [backend/].
Changes since spacewalk-web-1.2.7-1:
Justin Sherrill (3):
626764 - adding man page for spacewalk-repo-sync
updating spec for repo-sync man page
Automatic commit of package [spacewalk-backend] release [1.2.12-1].
---
backend/satellite_tools/reposync.py | 6 -
backend/satellite_tools/spacewalk-repo-sync.sgml | 120 +++++++++++++++++++++++
backend/spacewalk-backend.spec | 9 +
rel-eng/packages/spacewalk-backend | 2
4 files changed, 129 insertions(+), 8 deletions(-)
---
13 years, 9 months
3 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Justin Sherrill
backend/satellite_tools/reposync.py | 6 -
backend/satellite_tools/spacewalk-repo-sync.sgml | 120 +++++++++++++++++++++++
backend/spacewalk-backend.spec | 9 +
rel-eng/packages/spacewalk-backend | 2
4 files changed, 129 insertions(+), 8 deletions(-)
New commits:
commit 377fd5984b5828bd6d69262dec3089d4099744c7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 10 18:21:10 2010 -0400
Automatic commit of package [spacewalk-backend] release [1.2.12-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index a71c85e..a818899 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -10,7 +10,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.2.11
+Version: 1.2.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -687,6 +687,12 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Sep 10 2010 Justin Sherrill <jsherril(a)redhat.com> 1.2.12-1
+- 626764 - adding man page for spacewalk-repo-sync (jsherril(a)redhat.com)
+- style fixes (jsherril(a)redhat.com)
+- 571355 - fixing issue where packages that were physically deleted are not re-
+ downloaded during a reposync (jsherril(a)redhat.com)
+
* Wed Sep 08 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.11-1
- 555046 - when installtime change, update package in db
- create string representation of object dbPackage for better debugging
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 6e5c030..9d86315 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.2.11-1 backend/
+1.2.12-1 backend/
commit f811b19e95ad3ac170c782ad4be79abe69440d50
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 10 18:19:06 2010 -0400
updating spec for repo-sync man page
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c7faf1d..a71c85e 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -663,6 +663,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{_mandir}/man8/satpasswd.8*
%{_mandir}/man8/satwho.8*
%{_mandir}/man8/spacewalk-remove-channel.8*
+%{_mandir}/man8/spacewalk-repo-sync.8*
%files xml-export-libs
%defattr(-,root,root)
commit b94dcc24bbd0cc400ae8c3602a86ca86ec1aea7c
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 10 18:00:08 2010 -0400
626764 - adding man page for spacewalk-repo-sync
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index b8a49f1..df24f12 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -80,10 +80,6 @@ class RepoSync:
if not options.channel_label:
quit = True
self.error_msg("--channel must be specified")
- if options.label:
- self.error_msg("--label is obsoleted")
- if options.mirror:
- self.error_msg("--mirrorlist is obsoleted; mirrorlist is recognized automatically")
self.log_msg("\nSync started: %s" % (time.asctime(time.localtime())))
self.log_msg(str(sys.argv))
@@ -116,10 +112,8 @@ class RepoSync:
self.parser.add_option('-u', '--url', action='store', dest='url', help='The url to sync')
self.parser.add_option('-c', '--channel', action='store', dest='channel_label', help='The label of the channel to sync packages to')
self.parser.add_option('-t', '--type', action='store', dest='type', help='The type of repo, currently only "yum" is supported', default='yum')
- self.parser.add_option('-l', '--label', action='store_true', dest='label', help='Ignored; for compatibility with old versions')
self.parser.add_option('-f', '--fail', action='store_true', dest='fail', default=False , help="If a package import fails, fail the entire operation")
self.parser.add_option('-q', '--quiet', action='store_true', dest='quiet', default=False, help="Print no output, still logs output")
- self.parser.add_option('-m', '--mirrorlist', action='store_true', dest='mirror', default=False, help="Ignored; for compatibility with old versions. Mirrorlist is recognized automatically.")
return self.parser.parse_args()
def load_plugin(self):
diff --git a/backend/satellite_tools/spacewalk-repo-sync.sgml b/backend/satellite_tools/spacewalk-repo-sync.sgml
new file mode 100644
index 0000000..88e3aad
--- /dev/null
+++ b/backend/satellite_tools/spacewalk-repo-sync.sgml
@@ -0,0 +1,120 @@
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+<!ENTITY RHNSAT "RHN Satellite Server" >
+<!ENTITY RHNCHANRM "Spacewalk repository syncing tool" >
+
+]>
+<refentry>
+
+<RefMeta>
+<RefEntryTitle>spacewalk-repo-sync</RefEntryTitle><manvolnum>8</manvolnum>
+<RefMiscInfo>Version 3.5.0</RefMiscInfo>
+</RefMeta>
+
+<RefNameDiv>
+<RefName><command>spacewalk-repo-sync</command></RefName>
+<RefPurpose>
+Syncs the content from yum repos into Spacewalk or Satellite channels.
+</RefPurpose>
+</RefNameDiv>
+
+<RefSynopsisDiv>
+<Synopsis>
+ <cmdsynopsis>
+ <command>spaceawlk-remove-channel</command>
+ <arg>options <replaceable>...</replaceable></arg>
+ <arg>-c<replaceable>CHANNEL_LABEL</replaceable></arg>
+ <arg>--channel=<replaceable>CHANNEL_LABEL</replaceable></arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-u<replaceable>URL</replaceable></arg>
+ <arg>--url=<replaceable>URL</replaceable></arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-q</arg>
+ <arg>--quiet</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-f</arg>
+ <arg>--fail</arg>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <arg>-t<replaceable>TYPE</replaceable></arg>
+ <arg>--type=<replaceable>TYPE</replaceable></arg>
+ </cmdsynopsis>
+</Synopsis>
+</RefSynopsisDiv>
+
+<RefSect1><Title>Description</Title>
+<para>
+ The <emphasis>spacewalk-repo-sync</emphasis> tool is used to sync packages from
+ external or local yum repositories. All the packages within the specified repository
+ will be added to the channel.
+</para>
+
+<para>
+ Any url supported by yum is supported by this utility, including mirror lists.
+ If the url is not supplied, the tool will look to see what repositories are associated
+ with the specified channel and use those.
+</para>
+</RefSect1>
+
+<RefSect1><Title>Options</Title>
+<variablelist>
+ <varlistentry>
+ <term>-h, --help</term>
+ <listitem>
+ <para>Display the help screen with a list of options.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-c<replaceable>CHANNEL</replaceable>, --channel=<replaceable>CHANNEL</replaceable></term>
+ <listitem>
+ <para>The channel to sync the repository too.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-u<replaceable>URL</replaceable>, --url=<replaceable>URL</replaceable></term>
+ <listitem>
+ <para>The repository URL. Any protocol supported by yum is supported including http://, nfs://, file://. (Optional)</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-t<replaceable>TYPE</replaceable>, --type=<replaceable>TYPE</replaceable></term>
+ <listitem>
+ <para>The type of repository to sync. Currently only yum is supported and is the default. (Optional)</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-f, --fail</term>
+ <listitem>
+ <para>By default if an error occurs with a single package, the rest of the sync continues. When using this option, the entire sync will terminate upon any error.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-q, --quiet</term>
+ <listitem>
+ <para>Do not print any output except for errors.</para>
+ </listitem>
+ </varlistentry>
+</variablelist>
+</RefSect1>
+
+<RefSect1><Title>Examples</Title>
+<simplelist>
+ <member><command>spacewalk-repo-sync --channel=my-custom-channel</command></member>
+ <member><command>spacewalk-remove-channel --channel=my-custom-channel --url=http://example.com/yum-repo/</command></member>
+ <member><command>spacewalk-remove-channel --channel=my-custom-channel --url=file:///var/share/localrepo/</command></member>
+ <member><command>spacewalk-remove-channel --channel=my-custom-channel --url=http://example.com/mirrorlist.xml/</command></member>
+</simplelist>
+</RefSect1>
+
+<RefSect1><Title>Authors</Title>
+<simplelist>
+ <member>Justin Sherrill <email>jsherril(a)redhat.com</email></member>
+</simplelist>
+</RefSect1>
+</RefEntry>
+
+<!--
+vim: sw=4
+-->
13 years, 9 months
Changes to 'refs/tags/spacewalk-web-1.2.7-1'
by Partha Aji
Tag 'spacewalk-web-1.2.7-1' created by Partha Aji <paji(a)redhat.com> at 2010-09-10 22:04 +0000
Tagging package [spacewalk-web] version [1.2.7-1] in directory [web/].
Changes since spacewalk-setup-jabberd-1.2.1-1:
Justin Sherrill (1):
591899 - fixing error where cloning an already cloned channel would still result in errata showing up on the clone tab when managing it
Partha Aji (2):
629606 - Fixed a list tag check box issue
Automatic commit of package [spacewalk-web] release [1.2.7-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/html/javascript/check_all.js | 13 ++++++++++---
web/modules/rhn/RHN/DB/DataSource/xml/Errata_queries.xml | 4 ++++
web/spacewalk-web.spec | 8 +++++++-
4 files changed, 22 insertions(+), 5 deletions(-)
---
13 years, 9 months
rel-eng/packages web/spacewalk-web.spec
by Partha Aji
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 5f48c26e976ec8cdecf8be4eaa05ce0643af0ea5
Author: Partha Aji <paji(a)redhat.com>
Date: Fri Sep 10 18:04:52 2010 -0400
Automatic commit of package [spacewalk-web] release [1.2.7-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 83528b8..4b7e69a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.2.6-1 web/
+1.2.7-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 9ff86c8..353433e 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.6
+Version: 1.2.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,12 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Sep 10 2010 Partha Aji <paji(a)redhat.com> 1.2.7-1
+- 629606 - Fixed a list tag check box issue (paji(a)redhat.com)
+- 591899 - fixing error where cloning an already cloned channel would still
+ result in errata showing up on the clone tab when managing it
+ (jsherril(a)redhat.com)
+
* Fri Sep 10 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.2.6-1
- 630950 - fix ISE in proxy webUI installer
13 years, 9 months
web/html
by Partha Aji
web/html/javascript/check_all.js | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 0189f9d61db66f229d131131c9e867e3c5f7f2fc
Author: Partha Aji <paji(a)redhat.com>
Date: Fri Sep 10 18:02:49 2010 -0400
629606 - Fixed a list tag check box issue
diff --git a/web/html/javascript/check_all.js b/web/html/javascript/check_all.js
index 76c86a7..0861ee8 100644
--- a/web/html/javascript/check_all.js
+++ b/web/html/javascript/check_all.js
@@ -32,10 +32,17 @@ function process_check_all(set_label, cbox_items, flag, ignorables_ids) {
var ignorables = ids_to_elements(ignorables_ids);
var cboxes = new Array();
cboxes = cboxes.concat(ignorables);
- for (var i = 0 ; i < cbox_items.length; i++) {
- cboxes.push(cbox_items[i]);
+ if (cbox_items.length) {
+ for (var i = 0 ; i < cbox_items.length; i++) {
+ cboxes.push(cbox_items[i]);
+ }
+ }
+ else {
+ //for a single element check box
+ //push the form element
+ cboxes.push(cbox_items);
}
-
+
var boxes = process_group(set_label, cboxes, flag);
var includes = new Array();
for (var i = 0; i < boxes.length; i++) {
13 years, 9 months
web/modules
by Justin Sherrill
web/modules/rhn/RHN/DB/DataSource/xml/Errata_queries.xml | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 1636e1a9cf90da8b946a25782313f2cd48c8b4e6
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 10 14:32:51 2010 -0400
591899 - fixing error where cloning an already cloned channel would still result in errata showing up on the clone tab when managing it
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Errata_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/Errata_queries.xml
index 9a5c9a9..4a8621c 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Errata_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Errata_queries.xml
@@ -191,6 +191,10 @@ SELECT DISTINCT E.id, E.update_date, E.advisory_name, E.advisory_type, E.synopsi
WHERE CE2.channel_id = :cid_2
AND EC.original_id = CE.errata_id
AND EC.id = CE2.errata_id)
+ AND NOT EXISTS (select 1
+ from rhnChannelErrata CE3
+ where CE3.channel_id = :cid_2
+ AND CE3.errata_id = E.id)
ORDER BY E.update_date, E.id
</query>
<elaborator name="errata_overview" />
13 years, 9 months