Changes to 'refs/tags/spacewalk-web-1.9.16-1'
by Michael Mraka
Tag 'spacewalk-web-1.9.16-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-11 10:06 +0000
Tagging package [spacewalk-web] version [1.9.16-1] in directory [web/].
Changes since SputLite-1.9.1-1:
Michael Mraka (5):
install Apache24Config.pm in on Fedora with apache 2.4
cleanup old CVS files
cleanup old accidentaly commited eclipse project files
removed java survival
Automatic commit of package [spacewalk-web] release [1.9.16-1].
Tomas Lestach (1):
link channels on /rhn/channels/ChannelDetail.do page
---
client/tools/rhncfg/.project | 17 ---------
java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp | 6 ++-
java/conf/eclipse/.project | 17 ---------
proxy/proxy/.cvsignore | 9 ----
proxy/proxy/broker/.cvsignore | 9 ----
proxy/proxy/pm/.cvsignore | 4 --
proxy/proxy/redirect/.cvsignore | 9 ----
rel-eng/packages/spacewalk-web | 2 -
satellite/install/.cvsignore | 4 --
search-server/.classpath | 28 ---------------
search-server/.project | 17 ---------
spacewalk/certs-tools/.cvsignore | 8 ----
spacewalk/setup/.cvsignore | 10 -----
web/spacewalk-web.spec | 8 +++-
14 files changed, 13 insertions(+), 135 deletions(-)
---
11 years, 3 months
rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 748725fd6824d721fedd53d67c530a10d0469c48
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 11 11:06:22 2013 +0100
Automatic commit of package [spacewalk-web] release [1.9.16-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index bfe2c4f..30b0dfc 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.15-1 web/
+1.9.16-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index dc291a9..ddc12ce 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.15
+Version: 1.9.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -259,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Feb 11 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.16-1
+- install Apache24Config.pm in on Fedora with apache 2.4
+
* Fri Feb 08 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.15-1
- $reqs was always equal $passes
- acl is the only one supported type now
11 years, 3 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit b1a7a206e30dce41f9309eedf832ff2c5fb658d3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 11 10:50:32 2013 +0100
link channels on /rhn/channels/ChannelDetail.do page
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
index a525a8e..720e7c4 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
@@ -18,7 +18,11 @@
<c:forEach items="${channels}" var="current">
<div class="page-summary">
- <b><c:out value="${current.name}"/> </b>
+ <b>
+ <a href="/rhn/channels/ChannelDetail.do?cid=${current.id}">
+ <c:out value="${current.name}"/>
+ </a>
+ </b>
<br/>
<c:if test="${empty current.packages}">
11 years, 3 months
4 commits - client/tools java/conf proxy/proxy satellite/install search-server/.classpath search-server/.project spacewalk/certs-tools spacewalk/setup web/spacewalk-web.spec
by Michael Mraka
client/tools/rhncfg/.project | 17 -----------------
java/conf/eclipse/.project | 17 -----------------
proxy/proxy/.cvsignore | 9 ---------
proxy/proxy/broker/.cvsignore | 9 ---------
proxy/proxy/pm/.cvsignore | 4 ----
proxy/proxy/redirect/.cvsignore | 9 ---------
satellite/install/.cvsignore | 4 ----
search-server/.classpath | 28 ----------------------------
search-server/.project | 17 -----------------
spacewalk/certs-tools/.cvsignore | 8 --------
spacewalk/setup/.cvsignore | 10 ----------
web/spacewalk-web.spec | 3 +++
12 files changed, 3 insertions(+), 132 deletions(-)
New commits:
commit 2ece9128b7da61ff1ca847754c1bb576fe91ac0a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 5 21:11:56 2013 +0100
removed java survival
once there was a java code in this directory but it was moved long time ago
diff --git a/search-server/.classpath b/search-server/.classpath
deleted file mode 100644
index 0cfff62..0000000
--- a/search-server/.classpath
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry excluding="com/redhat/satellite/search/scheduler/tasks/IndexDocumentsTask.java|com/redhat/satellite/search/scheduler/tasks/crawl/WebCrawl.java" kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/config"/>
- <classpathentry kind="lib" path="lib/commons-lang-2.0.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging-1.1.jar"/>
- <classpathentry kind="lib" path="lib/simple-core-3.1.3.jar" sourcepath="libsrc/simple-3.1.3-src.zip">
- <attributes>
- <attribute name="javadoc_location" value="http://www.simpleframework.org/javadoc/"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="task-lib/junit-3.8.1.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/ibatis-2.3.0.677.jar" sourcepath="libsrc/ibatis-2.3.0.677-src.zip"/>
- <classpathentry kind="lib" path="lib/ojdbc14-1.10.jar"/>
- <classpathentry kind="lib" path="lib/quartz-1.8.1.jar" sourcepath="libsrc/quartz-1.5.1-src.jar"/>
- <classpathentry kind="lib" path="lib/picocontainer-1.3.jar"/>
- <classpathentry kind="lib" path="lib/tanukiwrapper-3.1.2.jar" sourcepath="libsrc/tanukiwrapper-3.1.2-src.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.8.jar" sourcepath="libsrc/log4j-1.2.8-src.jar"/>
- <classpathentry kind="lib" path="lib/logdriver-0.1.jar"/>
- <classpathentry kind="lib" path="lib/redstone-xmlrpc-1.1_20071120.jar" sourcepath="libsrc/redstone-xmlrpc-1.1_20071120-src.jar"/>
- <classpathentry kind="lib" path="lib/redstone-xmlrpc-client-1.1_20071120.jar" sourcepath="libsrc/redstone-xmlrpc-1.1_20071120-src.jar"/>
- <classpathentry kind="lib" path="lib/lucene-analyzers-2.3.2.jar" sourcepath="libsrc/lucene-2.3.2-src.zip"/>
- <classpathentry kind="lib" path="lib/lucene-core-2.3.2.jar" sourcepath="libsrc/lucene-2.3.2-src.zip"/>
- <classpathentry kind="lib" path="lib/hadoop-0.18.1-core.jar"/>
- <classpathentry kind="lib" path="lib/nutch-2008-12-01_04-01-21.jar" sourcepath="libsrc/nutch-2008-12-01_04-01-21-src.zip"/>
- <classpathentry kind="output" path="build"/>
-</classpath>
commit 882f2d248a6936cab6712a957954c237765cbed2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 5 20:53:36 2013 +0100
cleanup old accidentaly commited eclipse project files
diff --git a/client/tools/rhncfg/.project b/client/tools/rhncfg/.project
deleted file mode 100644
index 25045b3..0000000
--- a/client/tools/rhncfg/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>rhncfg</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.python.pydev.PyDevBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.python.pydev.pythonNature</nature>
- </natures>
-</projectDescription>
diff --git a/java/conf/eclipse/.project b/java/conf/eclipse/.project
deleted file mode 100644
index c10a2ca..0000000
--- a/java/conf/eclipse/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>spacewalk-java</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/search-server/.project b/search-server/.project
deleted file mode 100644
index 92f65ec..0000000
--- a/search-server/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>sat-search-server</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
commit 36e9e22f247c5141e10e0cbc7cecc4ae6fd13afc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 5 20:49:59 2013 +0100
cleanup old CVS files
diff --git a/proxy/proxy/.cvsignore b/proxy/proxy/.cvsignore
deleted file mode 100644
index bdc12a2..0000000
--- a/proxy/proxy/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.pyc
-*.pyo
-*.o
-*.so
-*.cgic
-*.cgio
-*.tar.gz
-.*
-*~
diff --git a/proxy/proxy/broker/.cvsignore b/proxy/proxy/broker/.cvsignore
deleted file mode 100644
index bdc12a2..0000000
--- a/proxy/proxy/broker/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.pyc
-*.pyo
-*.o
-*.so
-*.cgic
-*.cgio
-*.tar.gz
-.*
-*~
diff --git a/proxy/proxy/pm/.cvsignore b/proxy/proxy/pm/.cvsignore
deleted file mode 100644
index 7c69367..0000000
--- a/proxy/proxy/pm/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.pyc
-*.pyo
-*.tar.gz
-*.rpm
diff --git a/proxy/proxy/redirect/.cvsignore b/proxy/proxy/redirect/.cvsignore
deleted file mode 100644
index bdc12a2..0000000
--- a/proxy/proxy/redirect/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.pyc
-*.pyo
-*.o
-*.so
-*.cgic
-*.cgio
-*.tar.gz
-.*
-*~
diff --git a/satellite/install/.cvsignore b/satellite/install/.cvsignore
deleted file mode 100644
index 0aa77da..0000000
--- a/satellite/install/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.pyc
-.*~
-*~
-.*.swp
diff --git a/spacewalk/certs-tools/.cvsignore b/spacewalk/certs-tools/.cvsignore
deleted file mode 100644
index 8ccd083..0000000
--- a/spacewalk/certs-tools/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.*
-*.pyc
-.*~
-*~
-*.rpm
-*.key
-*.crt
-*.tar.gz
diff --git a/spacewalk/setup/.cvsignore b/spacewalk/setup/.cvsignore
deleted file mode 100644
index f6c6bb6..0000000
--- a/spacewalk/setup/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-blib*
-Makefile
-Makefile.old
-Build
-_build*
-pm_to_blib*
-*.tar.gz
-.lwpcookies
-Spacewalk-Setup-*
-cover_db
commit 69bb00017b8dda92916627adf806ca30bccea53e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 11 10:44:28 2013 +0100
install Apache24Config.pm in on Fedora with apache 2.4
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 5ddff76..dc291a9 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -140,6 +140,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
install -m 644 conf/rhn_web.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -m 644 conf/rhn_dobby.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -m 755 modules/dobby/scripts/check-database-space-usage.sh $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/check-database-space-usage.sh
+%if 0%{?fedora} < 18
+rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/PXT/Apache24Config.pm
+%endif
%clean
11 years, 3 months
Changes to 'refs/tags/SputLite-1.9.1-1'
by Michael Mraka
Tag 'SputLite-1.9.1-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-08 22:46 +0000
Tagging package [SputLite] version [1.9.1-1] in directory [monitoring/SputLite/].
Changes since spacewalk-config-1.9.5-1:
Michael Mraka (1):
Automatic commit of package [SputLite] release [1.9.1-1].
---
monitoring/SputLite/SputLite.spec | 6 +++++-
rel-eng/packages/SputLite | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 3 months
monitoring/SputLite rel-eng/packages
by Michael Mraka
monitoring/SputLite/SputLite.spec | 6 +++++-
rel-eng/packages/SputLite | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 90a5959a81fe403172dad9ef58253ea6024d9aa4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 23:46:12 2013 +0100
Automatic commit of package [SputLite] release [1.9.1-1].
diff --git a/monitoring/SputLite/SputLite.spec b/monitoring/SputLite/SputLite.spec
index 6860873..25a4110 100644
--- a/monitoring/SputLite/SputLite.spec
+++ b/monitoring/SputLite/SputLite.spec
@@ -5,7 +5,7 @@
%define vardir /var/lib/nocpulse
Name: SputLite
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.9.0
+Version: 1.9.1
Release: 1%{?dist}
Summary: Command queue processor (Sputnik Lite)
URL: https://fedorahosted.org/spacewalk
@@ -96,6 +96,10 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 08 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.1-1
+- removed lost files we are not packing for ages
+- %%defattr is not needed since rpm 4.4
+
* Thu Feb 02 2012 Jan Pazdziora 1.7.2-1
- import used module (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/SputLite b/rel-eng/packages/SputLite
index 62f9ec6..facbfe0 100644
--- a/rel-eng/packages/SputLite
+++ b/rel-eng/packages/SputLite
@@ -1 +1 @@
-1.7.2-1 monitoring/SputLite/
+1.9.1-1 monitoring/SputLite/
11 years, 3 months
Changes to 'refs/tags/spacewalk-config-1.9.5-1'
by Michael Mraka
Tag 'spacewalk-config-1.9.5-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-08 22:45 +0000
Tagging package [spacewalk-config] version [1.9.5-1] in directory [spacewalk/config/].
Changes since spacewalk-web-1.9.15-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-config] release [1.9.5-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
11 years, 3 months
rel-eng/packages spacewalk/config
by Michael Mraka
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit cef1df41fed51f3046af96b140af3e620b3a7f6c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 23:45:34 2013 +0100
Automatic commit of package [spacewalk-config] release [1.9.5-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index 4e65a06..34fd389 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-1.9.4-1 spacewalk/config/
+1.9.5-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index fb425ed..e02493f 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 1.9.4
+Version: 1.9.5
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -104,6 +104,12 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Fri Feb 08 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.5-1
+- don't overload standard valid-user keyword
+- make pxt ACL work in apache 2.4
+- put requires for single file/directory to one line
+- merged .htaccess to main httpd configuration
+
* Fri Feb 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.4-1
- made apache 2.4 happy with our acl auth definitions
11 years, 3 months
Changes to 'refs/tags/spacewalk-web-1.9.15-1'
by Michael Mraka
Tag 'spacewalk-web-1.9.15-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-08 22:44 +0000
Tagging package [spacewalk-web] version [1.9.15-1] in directory [web/].
Changes since cobbler20-2.0.11-11:
Michael Mraka (11):
merged .htaccess to main httpd configuration
removed lost files we are not packing for ages
put requires for single file/directory to one line
simplify @requires list
make pxt ACL work in apache 2.4
don't overload standard valid-user keyword
removed unused valid-user type
acl is the only one supported type now
fixed indent
$reqs was always equal $passes
Automatic commit of package [spacewalk-web] release [1.9.15-1].
---
monitoring/SputLite/html/cgi-bin/.htaccess | 1
monitoring/SputLite/html/cgi-bin/.new | 1
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 25 +++---
web/html/network/systems/.htaccess | 6 -
web/modules/pxt/PXT/Apache24Config.pm | 62 ++++++++++++++++
web/modules/pxt/PXT/ApacheAuth.pm | 49 ++++--------
web/spacewalk-web.spec | 12 ++-
8 files changed, 104 insertions(+), 54 deletions(-)
---
11 years, 3 months
11 commits - monitoring/SputLite rel-eng/packages spacewalk/config web/html web/modules web/spacewalk-web.spec
by Michael Mraka
monitoring/SputLite/html/cgi-bin/.htaccess | 1
monitoring/SputLite/html/cgi-bin/.new | 1
rel-eng/packages/spacewalk-web | 2
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 25 +++---
web/html/network/systems/.htaccess | 6 -
web/modules/pxt/PXT/Apache24Config.pm | 62 ++++++++++++++++
web/modules/pxt/PXT/ApacheAuth.pm | 49 ++++--------
web/spacewalk-web.spec | 12 ++-
8 files changed, 104 insertions(+), 54 deletions(-)
New commits:
commit 91635882685dc03133b4b4769246dcc1ebc8497b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 23:44:40 2013 +0100
Automatic commit of package [spacewalk-web] release [1.9.15-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c2243af..bfe2c4f 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.9.14-1 web/
+1.9.15-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 54e90e0..5ddff76 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.9.14
+Version: 1.9.15
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,16 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Feb 08 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.15-1
+- $reqs was always equal $passes
+- acl is the only one supported type now
+- removed unused valid-user type
+- make pxt ACL work in apache 2.4
+- simplify @requires list
+- merged .htaccess to main httpd configuration
+- Silence the Statement unlikely to be reached at /usr/bin/db-control line 29
+ warning.
+
* Wed Feb 06 2013 Stephen Herr <sherr(a)redhat.com> 1.9.14-1
- Make it possible to run db-control without doing su - oracle first.
commit f94f05035558ce7212af3684011fd19d7dc20282
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 22:59:12 2013 +0100
$reqs was always equal $passes
otherwise we must have return FORBIDDEN after eval_acl()
diff --git a/web/modules/pxt/PXT/ApacheAuth.pm b/web/modules/pxt/PXT/ApacheAuth.pm
index 579a9ba..5560075 100644
--- a/web/modules/pxt/PXT/ApacheAuth.pm
+++ b/web/modules/pxt/PXT/ApacheAuth.pm
@@ -115,10 +115,7 @@ sub authz_handler {
: map {$_->{requirement} =~ s/^acl\s+//;
$_->{requirement};} @{$r->requires});
- my ($reqs, $passes);
-
foreach my $entry (@requires) {
- $reqs++;
# support addition mixin'able acls directly from the .htaccess file...
my @mixins;
@@ -135,19 +132,12 @@ sub authz_handler {
warn "acl fail: $entry";
return FORBIDDEN;
}
- $passes++;
}
# $r->log_reason('User ' . $user->login . ' not allowed by "require"');
- if ($reqs == $passes) {
- $session->uid($user_id);
- return OK;
- }
- else {
- warn "User did not pass all auth requisites ($passes/$reqs matched)";
- return FORBIDDEN;
- }
+ $session->uid($user_id);
+ return OK;
}
1;
commit b4b7c733d95fd7d6bb4a8519b905994f075f2d5b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 22:57:33 2013 +0100
fixed indent
diff --git a/web/modules/pxt/PXT/ApacheAuth.pm b/web/modules/pxt/PXT/ApacheAuth.pm
index 7ed3773..579a9ba 100644
--- a/web/modules/pxt/PXT/ApacheAuth.pm
+++ b/web/modules/pxt/PXT/ApacheAuth.pm
@@ -120,22 +120,22 @@ sub authz_handler {
foreach my $entry (@requires) {
$reqs++;
- # support addition mixin'able acls directly from the .htaccess file...
- my @mixins;
- while ($entry =~ m/mixin\s+(.*?)\s+/g) {
- push @mixins, $1;
- }
+ # support addition mixin'able acls directly from the .htaccess file...
+ my @mixins;
+ while ($entry =~ m/mixin\s+(.*?)\s+/g) {
+ push @mixins, $1;
+ }
- # clean up the string for the acl parser...
- $entry =~ s{mixin\s+.*?\s+}{}g;
+ # clean up the string for the acl parser...
+ $entry =~ s{mixin\s+.*?\s+}{}g;
- my $acl_parser = new PXT::ACL(mixins => \@mixins);
+ my $acl_parser = new PXT::ACL(mixins => \@mixins);
- if (not $acl_parser->eval_acl($pxt, $entry)) {
- warn "acl fail: $entry";
- return FORBIDDEN;
- }
- $passes++;
+ if (not $acl_parser->eval_acl($pxt, $entry)) {
+ warn "acl fail: $entry";
+ return FORBIDDEN;
+ }
+ $passes++;
}
# $r->log_reason('User ' . $user->login . ' not allowed by "require"');
commit 015a44ade4f4c6aae440a1c95ab5cb7cb6a40501
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 22:34:21 2013 +0100
acl is the only one supported type now
diff --git a/web/modules/pxt/PXT/Apache24Config.pm b/web/modules/pxt/PXT/Apache24Config.pm
index 8844fd4..f254ea6 100644
--- a/web/modules/pxt/PXT/Apache24Config.pm
+++ b/web/modules/pxt/PXT/Apache24Config.pm
@@ -53,7 +53,7 @@ sub acl_check_authorization {
# print acl to log.
#$r->log_error($require_args);
PXT::ApacheAuth::handler($r);
- return (PXT::ApacheAuth::authz_handler($r, "acl $require_args") == Apache2::Const::OK ?
+ return (PXT::ApacheAuth::authz_handler($r, $require_args) == Apache2::Const::OK ?
Apache2::Const::AUTHZ_GRANTED : Apache2::Const::AUTHZ_DENIED);
}
diff --git a/web/modules/pxt/PXT/ApacheAuth.pm b/web/modules/pxt/PXT/ApacheAuth.pm
index 1ae0dc1..7ed3773 100644
--- a/web/modules/pxt/PXT/ApacheAuth.pm
+++ b/web/modules/pxt/PXT/ApacheAuth.pm
@@ -112,16 +112,14 @@ sub authz_handler {
my $pxt = $r->pnotes('pxt_request');
my @requires = ($acl_require ? ($acl_require)
- : map {$_->{requirement}} @{$r->requires});
+ : map {$_->{requirement} =~ s/^acl\s+//;
+ $_->{requirement};} @{$r->requires});
my ($reqs, $passes);
foreach my $entry (@requires) {
- my ($type, $string) = split /\s+/, $entry, 2;
$reqs++;
- if ($type eq 'acl') {
-
# support addition mixin'able acls directly from the .htaccess file...
my @mixins;
while ($entry =~ m/mixin\s+(.*?)\s+/g) {
@@ -129,19 +127,15 @@ sub authz_handler {
}
# clean up the string for the acl parser...
- $string =~ s{mixin\s+.*?\s+}{}g;
+ $entry =~ s{mixin\s+.*?\s+}{}g;
my $acl_parser = new PXT::ACL(mixins => \@mixins);
- if (not $acl_parser->eval_acl($pxt, $string)) {
- warn "acl fail: $string";
+ if (not $acl_parser->eval_acl($pxt, $entry)) {
+ warn "acl fail: $entry";
return FORBIDDEN;
}
$passes++;
- }
- else {
- die "Unknown 'require' type '$type' in .htaccess";
- }
}
# $r->log_reason('User ' . $user->login . ' not allowed by "require"');
commit a22db60b7c28bd964514e78377d4ae2f201e5887
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 22:34:21 2013 +0100
removed unused valid-user type
diff --git a/web/modules/pxt/PXT/ApacheAuth.pm b/web/modules/pxt/PXT/ApacheAuth.pm
index 9a61861..1ae0dc1 100644
--- a/web/modules/pxt/PXT/ApacheAuth.pm
+++ b/web/modules/pxt/PXT/ApacheAuth.pm
@@ -120,10 +120,7 @@ sub authz_handler {
my ($type, $string) = split /\s+/, $entry, 2;
$reqs++;
- if ($type eq 'valid-user') {
- $passes++;
- }
- elsif ($type eq 'acl') {
+ if ($type eq 'acl') {
# support addition mixin'able acls directly from the .htaccess file...
my @mixins;
commit 5e81aade2a5697a0e526d19ea2d692698ccdc042
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 22:26:47 2013 +0100
don't overload standard valid-user keyword
it's proccessed by mod_authz_core in apache 2.4 and doesn't call
our perl handler
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 7c2e787..2dae7d5 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -210,7 +210,7 @@ PerlConfigRequire PXT/Apache24Config.pm
AuthType Basic
AuthName "RHN Org Admin Area"
PerlAuthenHandler PXT::ApacheAuth
- require valid-user
+ require acl user_authenticated()
</Directory>
<Directory "/var/www/html/network/systems/ssm">
@@ -267,7 +267,7 @@ PerlConfigRequire PXT/Apache24Config.pm
AuthType Basic
AuthName "RHN Org Admin Area"
PerlAuthenHandler PXT::ApacheAuth
- require valid-user
+ require acl user_authenticated()
DirectoryIndex index.pxt
Options -Indexes
</Directory>
commit e351e94f1bbafe1d4d71481abb57ad1a0be4acf7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 13:40:05 2013 +0100
make pxt ACL work in apache 2.4
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index 4b5a937..7c2e787 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -114,9 +114,7 @@ PerlModule PXT::ApacheHandler
PerlModule PXT::ApacheAuth
<IfVersion >= 2.4>
- <AuthzProviderAlias user acl>
- PerlAuthenHandler PXT::ApacheAuth
- </AuthzProviderAlias>
+PerlConfigRequire PXT/Apache24Config.pm
</IfVersion>
<Directory "/var/www/html/network/systems">
diff --git a/web/modules/pxt/PXT/Apache24Config.pm b/web/modules/pxt/PXT/Apache24Config.pm
new file mode 100644
index 0000000..8844fd4
--- /dev/null
+++ b/web/modules/pxt/PXT/Apache24Config.pm
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 2013 Red Hat, Inc.
+#
+# This software is licensed to you under the GNU General Public License,
+# version 2 (GPLv2). There is NO WARRANTY for this software, express or
+# implied, including the implied warranties of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+# along with this software; if not, see
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+#
+# Red Hat trademarks are not licensed under GPLv2. No permission is
+# granted to use or replicate Red Hat trademarks that are incorporated
+# in this software or its documentation.
+#
+
+use strict;
+
+package PXT::Apache24Config;
+
+use Apache2::Util ();
+use Apache2::Provider ();
+use Apache2::RequestUtil ();
+use Apache2::ServerUtil ();
+use Apache2::ServerRec ();
+use Apache2::Process ();
+use Apache2::Const qw/:common AUTHZ_PROVIDER_VERSION AUTHZ_PROVIDER_GROUP
+ AUTH_INTERNAL_PER_CONF
+ AUTHZ_GRANTED AUTHZ_DENIED OK/;
+use PXT::ApacheAuth;
+
+Apache2::RequestUtil::register_auth_provider(
+ Apache2::ServerUtil->server->process->pool,
+ Apache2::Const::AUTHZ_PROVIDER_GROUP, "acl",
+ Apache2::Const::AUTHZ_PROVIDER_VERSION,
+ \&acl_check_authorization,
+ \&parse_require_line,
+ Apache2::Const::AUTH_INTERNAL_PER_CONF);
+
+sub parse_require_line {
+ my $parms = shift; # Apache2::CmdParms
+ my $require_line = shift;
+
+ # Return non-empty string if there is an error in require_line, othewise
+ # return empty string.
+ # acl could be any string, we check syntax in runtime
+ return "";
+}
+
+sub acl_check_authorization {
+ my $r = shift;
+ my $require_args = shift;
+
+ # print acl to log.
+ #$r->log_error($require_args);
+ PXT::ApacheAuth::handler($r);
+ return (PXT::ApacheAuth::authz_handler($r, "acl $require_args") == Apache2::Const::OK ?
+ Apache2::Const::AUTHZ_GRANTED : Apache2::Const::AUTHZ_DENIED);
+
+}
+
+
+1;
diff --git a/web/modules/pxt/PXT/ApacheAuth.pm b/web/modules/pxt/PXT/ApacheAuth.pm
index 969c746..9a61861 100644
--- a/web/modules/pxt/PXT/ApacheAuth.pm
+++ b/web/modules/pxt/PXT/ApacheAuth.pm
@@ -100,6 +100,7 @@ sub handler {
sub authz_handler {
my $r = shift;
+ my $acl_require = shift; # apache 2.4
return OK if $r->main;
@@ -110,7 +111,8 @@ sub authz_handler {
my $session = $r->pnotes('pxt_session');
my $pxt = $r->pnotes('pxt_request');
- my @requires = map {$_->{requirement}} @{$r->requires};
+ my @requires = ($acl_require ? ($acl_require)
+ : map {$_->{requirement}} @{$r->requires});
my ($reqs, $passes);
commit 8b1c07b70e92579f87c9d00a0b46d1c7b023f3d4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 13:27:00 2013 +0100
simplify @requires list
diff --git a/web/modules/pxt/PXT/ApacheAuth.pm b/web/modules/pxt/PXT/ApacheAuth.pm
index 1dc4fbe..969c746 100644
--- a/web/modules/pxt/PXT/ApacheAuth.pm
+++ b/web/modules/pxt/PXT/ApacheAuth.pm
@@ -110,12 +110,12 @@ sub authz_handler {
my $session = $r->pnotes('pxt_session');
my $pxt = $r->pnotes('pxt_request');
- my @requires = @{$r->requires};
+ my @requires = map {$_->{requirement}} @{$r->requires};
my ($reqs, $passes);
foreach my $entry (@requires) {
- my ($type, $string) = split /\s+/, $entry->{requirement}, 2;
+ my ($type, $string) = split /\s+/, $entry, 2;
$reqs++;
if ($type eq 'valid-user') {
@@ -125,7 +125,7 @@ sub authz_handler {
# support addition mixin'able acls directly from the .htaccess file...
my @mixins;
- while ($entry->{requirement} =~ m/mixin\s+(.*?)\s+/g) {
+ while ($entry =~ m/mixin\s+(.*?)\s+/g) {
push @mixins, $1;
}
commit 8515b060e076f7bfa7f333e864ff3781538de835
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 8 12:24:53 2013 +0100
put requires for single file/directory to one line
to simplify apache 2.4 configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index b064618..4b5a937 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -149,22 +149,19 @@ PerlModule PXT::ApacheAuth
<Files admin_list.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
+ require acl user_role(system_group_admin); user_has_access_to_servergroup()
</Files>
<Files delete_confirm.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
+ require acl user_role(system_group_admin); user_has_access_to_servergroup()
</Files>
<Files edit_properties.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
+ require acl user_role(system_group_admin); user_has_access_to_servergroup()
</Files>
<Files errata_list.pxt>
commit 36a8fd5b427c90e15f02b9685f4538b97cedd455
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 4 16:34:10 2013 +0100
removed lost files we are not packing for ages
diff --git a/monitoring/SputLite/html/cgi-bin/.htaccess b/monitoring/SputLite/html/cgi-bin/.htaccess
deleted file mode 100644
index 8a06ba6..0000000
--- a/monitoring/SputLite/html/cgi-bin/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Options ExecCGI FollowSymLinks Indexes
diff --git a/monitoring/SputLite/html/cgi-bin/.new b/monitoring/SputLite/html/cgi-bin/.new
deleted file mode 100644
index 1e8b314..0000000
--- a/monitoring/SputLite/html/cgi-bin/.new
+++ /dev/null
@@ -1 +0,0 @@
-6
commit 3d2169e37b606b8a1c39e81ade748f9c21bdfb76
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Feb 4 16:24:23 2013 +0100
merged .htaccess to main httpd configuration
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index e7ad1c4..b064618 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -119,6 +119,14 @@ PerlModule PXT::ApacheAuth
</AuthzProviderAlias>
</IfVersion>
+<Directory "/var/www/html/network/systems">
+ <Files system_list>
+ ForceType text/pxt
+ SetHandler perl-script
+ PerlHandler PXT::ApacheHandler
+ </Files>
+</Directory>
+
<Directory "/var/www/html/network/systems/groups">
AuthType Basic
AuthName "RHN System Group List"
diff --git a/web/html/network/systems/.htaccess b/web/html/network/systems/.htaccess
deleted file mode 100644
index ebeb0af..0000000
--- a/web/html/network/systems/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files system_list>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
11 years, 3 months