projects/oracle-server-admin rel-eng/packages
by Jan Pazdziora
projects/oracle-server-admin/oracle-server-admin.spec | 4 ++++
rel-eng/packages/oracle-server-admin | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 4f17a49db70f9ea77c8e4fc6df65b3cb6ed41641
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:53:25 2012 +0200
Automatic commit of package [oracle-server-admin] release [0.2.1-1].
diff --git a/projects/oracle-server-admin/oracle-server-admin.spec b/projects/oracle-server-admin/oracle-server-admin.spec
index 43e65f5..c7347f8 100644
--- a/projects/oracle-server-admin/oracle-server-admin.spec
+++ b/projects/oracle-server-admin/oracle-server-admin.spec
@@ -41,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
%{oracle_admin}
%changelog
+* Mon Jul 16 2012 Jan Pazdziora 0.2.1-1
+- Start using the .tar.gz in the .src.rpm for oracle-server-admin.
+- All the NoTgzBuilders are now spacewalkx.builderx.NoTgzBuilder.
+
* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.1.13-1
- switched to default VersionTagger
diff --git a/rel-eng/packages/oracle-server-admin b/rel-eng/packages/oracle-server-admin
index 74823a3..2ef9a76 100644
--- a/rel-eng/packages/oracle-server-admin
+++ b/rel-eng/packages/oracle-server-admin
@@ -1 +1 @@
-0.1.13-1 projects/oracle-server-admin/
+0.2.1-1 projects/oracle-server-admin/
10 years, 6 months
projects/oracle-server-admin
by Jan Pazdziora
projects/oracle-server-admin/build.py.props | 3 ---
projects/oracle-server-admin/oracle-server-admin.spec | 8 ++++----
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit a7edfd8bddd695fcfdf5dc1960f5f4a74d25e7ac
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:52:46 2012 +0200
Start using the .tar.gz in the .src.rpm for oracle-server-admin.
diff --git a/projects/oracle-server-admin/build.py.props b/projects/oracle-server-admin/build.py.props
deleted file mode 100644
index 2222932..0000000
--- a/projects/oracle-server-admin/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/projects/oracle-server-admin/oracle-server-admin.spec b/projects/oracle-server-admin/oracle-server-admin.spec
index c969510..43e65f5 100644
--- a/projects/oracle-server-admin/oracle-server-admin.spec
+++ b/projects/oracle-server-admin/oracle-server-admin.spec
@@ -1,8 +1,8 @@
Summary: Oracle Database Server command-line admin scripts
Name: oracle-server-admin
-Version: 0.1.13
+Version: 0.2.1
Release: 1%{?dist}
-Source0: admin-wrapper.sh
+Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: Oracle License
Group: Oracle Server
BuildArch: noarch
@@ -17,14 +17,14 @@ Requires: oracle-config
Command-line admin scripts for Oracle Server
%prep
-%setup -c -T
+%setup -q
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
install -m755 -d $RPM_BUILD_ROOT%{oracle_admin}
-install -m755 %{SOURCE0} $RPM_BUILD_ROOT%{oracle_admin}/
+install -m755 admin-wrapper.sh $RPM_BUILD_ROOT%{oracle_admin}/
(cd $RPM_BUILD_ROOT%{oracle_admin};
wrapper=$(basename %{SOURCE0})
for s in create-db.sh start-db.sh stop-db.sh create-user.sh; do
10 years, 6 months
Changes to 'refs/tags/oracle-rhnsat-selinux-10.2.0.21-1'
by Jan Pazdziora
Tag 'oracle-rhnsat-selinux-10.2.0.21-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-07-16 09:36 +0000
Tagging package [oracle-rhnsat-selinux] version [10.2.0.21-1] in directory [selinux/oracle-rhnsat-selinux/].
Changes since oracle-selinux-0.1.23.33-1:
Jan Pazdziora (2):
Start using the .tar.gz in the .src.rpm for oracle-rhnsat-selinux.
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.21-1].
---
rel-eng/packages/oracle-rhnsat-selinux | 2 -
selinux/oracle-rhnsat-selinux/Makefile | 4 --
selinux/oracle-rhnsat-selinux/build.py.props | 3 -
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 26 ++++++---------
4 files changed, 12 insertions(+), 23 deletions(-)
---
10 years, 6 months
2 commits - rel-eng/packages selinux/oracle-rhnsat-selinux
by Jan Pazdziora
rel-eng/packages/oracle-rhnsat-selinux | 2 -
selinux/oracle-rhnsat-selinux/Makefile | 4 --
selinux/oracle-rhnsat-selinux/build.py.props | 3 -
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 26 ++++++---------
4 files changed, 12 insertions(+), 23 deletions(-)
New commits:
commit 033668bd19779b81b6cb4ff7013ac216f806b88e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:36:42 2012 +0200
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.21-1].
diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/oracle-rhnsat-selinux
index 9c3b5c3..763f16e 100644
--- a/rel-eng/packages/oracle-rhnsat-selinux
+++ b/rel-eng/packages/oracle-rhnsat-selinux
@@ -1 +1 @@
-10.2.0.20-1 selinux/oracle-rhnsat-selinux/
+10.2.0.21-1 selinux/oracle-rhnsat-selinux/
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 9cc80c2..7bcc73a 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-rhnsat
Name: oracle-rhnsat-selinux
-Version: 10.2.0.20
+Version: 10.2.0.21
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -106,6 +106,11 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Mon Jul 16 2012 Jan Pazdziora 10.2.0.21-1
+- Start using the .tar.gz in the .src.rpm for oracle-rhnsat-selinux.
+- %%defattr is not needed since rpm 4.4
+- All the NoTgzBuilders are now spacewalkx.builderx.NoTgzBuilder.
+
* Wed May 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.20-1
- fixed typo
commit 0e008d8957d736c7cb3ff54dfed49453026086d7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:36:27 2012 +0200
Start using the .tar.gz in the .src.rpm for oracle-rhnsat-selinux.
diff --git a/selinux/oracle-rhnsat-selinux/Makefile b/selinux/oracle-rhnsat-selinux/Makefile
deleted file mode 100644
index 6705603..0000000
--- a/selinux/oracle-rhnsat-selinux/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-NO_TAR_GZ = 1
-
-include ../../rel-eng/Makefile
diff --git a/selinux/oracle-rhnsat-selinux/build.py.props b/selinux/oracle-rhnsat-selinux/build.py.props
deleted file mode 100644
index 2222932..0000000
--- a/selinux/oracle-rhnsat-selinux/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 6430d9e..9cc80c2 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -10,10 +10,7 @@ Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
License: GPLv2+
-Source1: %{modulename}.if
-Source2: %{modulename}.te
-Source3: %{modulename}.fc
-Source4: %{name}-enable
+Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: checkpolicy, selinux-policy-devel, hardlink
BuildArch: noarch
@@ -33,13 +30,10 @@ Requires: oracle-nofcontext-selinux
SELinux policy module supporting Satellite embedded Oracle server.
%prep
-rm -rf %{name}-%{version}
-mkdir -p %{name}-%{version}
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{name}-%{version}
+%setup -q
%build
# Build SELinux policy modules
-cd %{name}-%{version}
perl -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./, "%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' %{modulename}.te
for selinuxvariant in %{selinux_variants}
do
@@ -47,24 +41,21 @@ do
mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done
-cd -
%install
rm -rf %{buildroot}
# Install SELinux policy modules
-cd %{name}-%{version}
for selinuxvariant in %{selinux_variants}
do
install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
install -p -m 644 %{modulename}.pp.${selinuxvariant} \
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
done
-cd -
# Install SELinux interfaces
install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 %{name}-%{version}/%{modulename}.if \
+install -p -m 644 %{modulename}.if \
%{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
# Hardlink identical policy module packages together
@@ -72,7 +63,7 @@ install -p -m 644 %{name}-%{version}/%{modulename}.if \
# Install oracle-rhnsat-selinux-enable which will be called in %post
install -d %{buildroot}%{_sbindir}
-install -p -m 755 %{name}-%{version}/%{name}-enable %{buildroot}%{_sbindir}/%{name}-enable
+install -p -m 755 %{name}-enable %{buildroot}%{_sbindir}/%{name}-enable
%clean
rm -rf %{buildroot}
@@ -109,7 +100,7 @@ if [ $1 -eq 0 ]; then
fi
%files
-%doc %{name}-%{version}/%{modulename}.fc %{name}-%{version}/%{modulename}.if %{name}-%{version}/%{modulename}.te
+%doc %{modulename}.fc %{modulename}.if %{modulename}.te
%{_datadir}/selinux/*/%{modulename}.pp
%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
%attr(0755,root,root) %{_sbindir}/%{name}-enable
10 years, 6 months
Changes to 'refs/tags/oracle-selinux-0.1.23.33-1'
by Jan Pazdziora
Tag 'oracle-selinux-0.1.23.33-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-07-16 09:34 +0000
Tagging package [oracle-selinux] version [0.1.23.33-1] in directory [selinux/oracle-selinux/].
Changes since spacewalk-java-1.8.109-1:
Jan Pazdziora (2):
Start using the .tar.gz in the .src.rpm for oracle-selinux.
Automatic commit of package [oracle-selinux] release [0.1.23.33-1].
---
rel-eng/packages/oracle-selinux | 2 -
selinux/oracle-selinux/Makefile | 4 --
selinux/oracle-selinux/build.py.props | 3 --
selinux/oracle-selinux/oracle-selinux.spec | 41 ++++++++++++-----------------
4 files changed, 18 insertions(+), 32 deletions(-)
---
10 years, 6 months
2 commits - rel-eng/packages selinux/oracle-selinux
by Jan Pazdziora
rel-eng/packages/oracle-selinux | 2 -
selinux/oracle-selinux/Makefile | 4 --
selinux/oracle-selinux/build.py.props | 3 --
selinux/oracle-selinux/oracle-selinux.spec | 41 ++++++++++++-----------------
4 files changed, 18 insertions(+), 32 deletions(-)
New commits:
commit 8e9a07495fa30f835f82ac488ab375e6028b78d3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:34:43 2012 +0200
Automatic commit of package [oracle-selinux] release [0.1.23.33-1].
diff --git a/rel-eng/packages/oracle-selinux b/rel-eng/packages/oracle-selinux
index c14ac99..96d5e47 100644
--- a/rel-eng/packages/oracle-selinux
+++ b/rel-eng/packages/oracle-selinux
@@ -1 +1 @@
-0.1.23.32-1 selinux/oracle-selinux/
+0.1.23.33-1 selinux/oracle-selinux/
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 476edac..7ee899f 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -19,7 +19,7 @@
%endif
Name: oracle-selinux
-Version: 0.1.23.32
+Version: 0.1.23.33
Release: 1%{?obtag}%{?dist}%{?repo}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -209,6 +209,10 @@ fi
%attr(0755,root,root) %{_sbindir}/oracle-nofcontext-selinux-enable
%changelog
+* Mon Jul 16 2012 Jan Pazdziora 0.1.23.33-1
+- Start using the .tar.gz in the .src.rpm for oracle-selinux.
+- %%defattr is not needed since rpm 4.4
+
* Wed Nov 23 2011 Jan Pazdziora 0.1.23.32-1
- Require the roles.
commit e70193574b1788d42e583807fabb357e956296b1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jul 16 11:25:37 2012 +0200
Start using the .tar.gz in the .src.rpm for oracle-selinux.
diff --git a/selinux/oracle-selinux/Makefile b/selinux/oracle-selinux/Makefile
deleted file mode 100644
index 6705603..0000000
--- a/selinux/oracle-selinux/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-NO_TAR_GZ = 1
-
-include ../../rel-eng/Makefile
diff --git a/selinux/oracle-selinux/build.py.props b/selinux/oracle-selinux/build.py.props
deleted file mode 100644
index 2222932..0000000
--- a/selinux/oracle-selinux/build.py.props
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildconfig]
-builder = spacewalkx.builderx.NoTgzBuilder
-
diff --git a/selinux/oracle-selinux/oracle-selinux.spec b/selinux/oracle-selinux/oracle-selinux.spec
index 973e098..476edac 100644
--- a/selinux/oracle-selinux/oracle-selinux.spec
+++ b/selinux/oracle-selinux/oracle-selinux.spec
@@ -25,11 +25,7 @@ Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
License: GPLv2+
URL: http://www.stl.gtri.gatech.edu/rmyers/oracle-selinux/
-Source1: %{modulename}.if
-Source2: %{modulename}.te
-Source3: %{modulename}.fc
-Source4: oracle-nofcontext-selinux-enable
-Source5: %{modulename}-port.te
+Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: checkpolicy, selinux-policy-devel, hardlink
BuildArch: noarch
@@ -62,21 +58,17 @@ SELinux policy module defining types and interfaces for
Oracle RDBMS, without specifying any file contexts.
%prep
-rm -rf SELinux
-mkdir -p SELinux
-cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
+%setup -q
-# Make file contexts relative to oracle_base
-perl -pi -e 's#%{default_oracle_base}#%{oracle_base}#g' SELinux/%{modulename}.fc
+%build
+perl -pi -e 's#%{default_oracle_base}#%{oracle_base}#g' %{modulename}.fc
# Create oracle-nofcontext source files
-cp SELinux/%{modulename}.if SELinux/%{modulename}-nofcontext.if
-cp SELinux/%{modulename}.te SELinux/%{modulename}-nofcontext.te
-sed -i 's!^policy_module(oracle,!policy_module(oracle-nofcontext,!' SELinux/%{modulename}-nofcontext.te
+cp %{modulename}.if %{modulename}-nofcontext.if
+cp %{modulename}.te %{modulename}-nofcontext.te
+sed -i 's!^policy_module(oracle,!policy_module(oracle-nofcontext,!' %{modulename}-nofcontext.te
-%build
# Build SELinux policy modules
-cd SELinux
for selinuxvariant in %{selinux_variants}
do
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
@@ -85,13 +77,11 @@ do
mv %{modulename}-port.pp %{modulename}-port.pp.${selinuxvariant}
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
done
-cd -
%install
rm -rf %{buildroot}
# Install SELinux policy modules
-cd SELinux
for selinuxvariant in %{selinux_variants}
do
install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
@@ -102,13 +92,12 @@ for selinuxvariant in %{selinux_variants}
install -p -m 644 %{modulename}-port.pp.${selinuxvariant} \
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}-port.pp
done
-cd -
# Install SELinux interfaces
install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 SELinux/%{modulename}.if \
+install -p -m 644 %{modulename}.if \
%{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
-install -p -m 644 SELinux/%{modulename}-nofcontext.if \
+install -p -m 644 %{modulename}-nofcontext.if \
%{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}-nofcontext.if
# Hardlink identical policy module packages together
@@ -116,7 +105,7 @@ install -p -m 644 SELinux/%{modulename}-nofcontext.if \
# Install oracle-nofcontext-selinux-enable which will be called in %posttrans
install -d %{buildroot}%{_sbindir}
-install -p -m 755 SELinux/oracle-nofcontext-selinux-enable %{buildroot}%{_sbindir}/oracle-nofcontext-selinux-enable
+install -p -m 755 oracle-nofcontext-selinux-enable %{buildroot}%{_sbindir}/oracle-nofcontext-selinux-enable
%clean
rm -rf %{buildroot}
@@ -207,13 +196,13 @@ if [ $1 -eq 0 ]; then
fi
%files
-%doc SELinux/%{modulename}.fc SELinux/%{modulename}.if SELinux/%{modulename}.te
+%doc %{modulename}.fc %{modulename}.if %{modulename}.te
%{_datadir}/selinux/*/%{modulename}.pp
%{_datadir}/selinux/*/%{modulename}-port.pp
%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if
%files -n oracle-nofcontext-selinux
-%doc SELinux/%{modulename}-nofcontext.fc SELinux/%{modulename}-nofcontext.if SELinux/%{modulename}-nofcontext.te
+%doc %{modulename}-nofcontext.fc %{modulename}-nofcontext.if %{modulename}-nofcontext.te
%{_datadir}/selinux/*/%{modulename}-nofcontext.pp
%{_datadir}/selinux/*/%{modulename}-port.pp
%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}-nofcontext.if
10 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.8.109-1'
by StephenHerr
Tag 'spacewalk-java-1.8.109-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-07-13 15:19 +0000
Tagging package [spacewalk-java] version [1.8.109-1] in directory [java/].
Changes since spacewalk-setup-1.8.14-1:
Stephen Herr (2):
833474 - quick file list query now also returns files saved to system's 'local' config 'channel'
Automatic commit of package [spacewalk-java] release [1.8.109-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 3 ++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
10 years, 6 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 3 ++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit fc3e272e3f1e552b6bdd9903783811a57ea3bb29
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jul 13 11:19:57 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.109-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f5aae5b..e174858 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.108
+Version: 1.8.109
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jul 13 2012 Stephen Herr <sherr(a)redhat.com> 1.8.109-1
+- 833474 - quick file list query now also returns files saved to system's
+ 'local' config 'channel'
+
* Fri Jul 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.108-1
- struts jars may be available in different directories
- Show XCCDF-diff icon on the XCCDF-Details page.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5df0ca2..467fc4f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.108-1 java/
+1.8.109-1 java/
commit 869eb498001de015249d0395529a172728d33954
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Jul 13 11:19:49 2012 -0400
833474 - quick file list query now also returns files saved to system's 'local' config 'channel'
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
index 5f71e50..6793874 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml
@@ -1312,7 +1312,8 @@ select cc.label as config_channel_label,
AND CCT.label != 'server_import'
group by cf.config_file_name_id) tmp
where tmp.id = cfn.id
- and scc.position = tmp.position
+ and (scc.position = tmp.position
+ or (scc.position is null and tmp.position is null))
and scc.config_channel_id = cc.id
and scc.server_id = :sid
and cc.confchan_type_id = cct.id
10 years, 6 months
Changes to 'refs/tags/spacewalk-setup-1.8.14-1'
by Tomas Lestach
Tag 'spacewalk-setup-1.8.14-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-07-13 15:15 +0000
Tagging package [spacewalk-setup] version [1.8.14-1] in directory [spacewalk/setup/].
Changes since spacewalk-web-1.8.28-1:
Tomas Lestach (2):
increase allowed parameter count
Automatic commit of package [spacewalk-setup] release [1.8.14-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/share/tomcatX.conf.1 | 4 ++--
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 6 months
2 commits - rel-eng/packages spacewalk/setup
by Tomas Lestach
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/share/tomcatX.conf.1 | 4 ++--
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 365a27b20c0fc6d3c0bedf33b6322d3dcb89fbf5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 13 17:15:00 2012 +0200
Automatic commit of package [spacewalk-setup] release [1.8.14-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 14148d0..f18c528 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.8.13-1 spacewalk/setup/
+1.8.14-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index b86a8f3..2b93f68 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.8.13
+Version: 1.8.14
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -110,6 +110,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Jul 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.14-1
+- increase allowed parameter count
+
* Wed Jun 27 2012 Jan Pazdziora 1.8.13-1
- Exit if starting tomcat did not pass.
commit d9de3d2a98ce8d1f637507cadd328b80936faf7a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 13 17:10:33 2012 +0200
increase allowed parameter count
addressing:
java.lang.IllegalStateException: Parameter count exceeded allowed maximum: 512
at org.apache.tomcat.util.http.Parameters.addParam(Parameters.java:335)
at org.apache.tomcat.util.http.Parameters.processParameters(Parameters.java:456)
at org.apache.tomcat.util.http.Parameters.processParameters(Parameters.java:365)
at org.apache.catalina.connector.Request.parseParameters(Request.java:2593)
at org.apache.catalina.connector.Request.getParameter(Request.java:1064)
diff --git a/spacewalk/setup/share/tomcatX.conf.1 b/spacewalk/setup/share/tomcatX.conf.1
index 6b206f3..47c01a5 100644
--- a/spacewalk/setup/share/tomcatX.conf.1
+++ b/spacewalk/setup/share/tomcatX.conf.1
@@ -1,2 +1,2 @@
-^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC"\n
-JAVA_OPTS="$JAVA_OPTS -ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC"
+^JAVA_OPTS="(\$JAVA_OPTS )?-ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC"\n
+JAVA_OPTS="$JAVA_OPTS -ea -Xms256m -Xmx256m -Djava.awt.headless=true -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Dorg.apache.tomcat.util.http.Parameters.MAX_COUNT=1024 -XX:MaxNewSize=256 -XX:-UseConcMarkSweepGC"
10 years, 6 months