[jboss-cvs] JBossAS SVN: r104776 - branches/JBPAPP_5_0/build.

[jboss-cvs-commits at lists.jboss.org]

Author: bshim
Date: 2010-05-13 14:06:00 -0400 (Thu, 13 May 2010)
New Revision: 104776

Modified:
   branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
   branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
Log:
fixed enable and disable auth patches to compensate for removed lines for CVE-2010-0738

Modified: branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch	2010-05-13 18:03:54 UTC (rev 104775)
+++ branches/JBPAPP_5_0/build/jbossas-5-disableauth.patch	2010-05-13 18:06:00 UTC (rev 104776)
@@ -100,7 +100,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -112,6 +111,7 @@
+@@ -110,6 +109,7 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -147,7 +147,7 @@
  
     <security-constraint>
     <web-resource-collection>
-@@ -355,6 +354,7 @@
+@@ -353,6 +352,7 @@
     <role-name>JBossAdmin</role-name>
     </auth-constraint>
     </security-constraint>
@@ -277,7 +277,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -112,6 +111,7 @@
+@@ -110,6 +109,7 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -324,7 +324,7 @@
  
     <security-constraint>
     <web-resource-collection>
-@@ -355,6 +354,7 @@
+@@ -353,6 +352,7 @@
     <role-name>JBossAdmin</role-name>
     </auth-constraint>
     </security-constraint>
@@ -454,7 +454,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -112,6 +111,7 @@
+@@ -110,6 +109,7 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -501,7 +501,7 @@
  
     <security-constraint>
     <web-resource-collection>
-@@ -355,6 +354,7 @@
+@@ -353,6 +352,7 @@
     <role-name>JBossAdmin</role-name>
     </auth-constraint>
     </security-constraint>
@@ -618,7 +618,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -112,6 +111,7 @@
+@@ -110,6 +109,7 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -750,7 +750,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -112,6 +111,7 @@
+@@ -110,6 +109,7 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>

Modified: branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch
===================================================================
--- branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch	2010-05-13 18:03:54 UTC (rev 104775)
+++ branches/JBPAPP_5_0/build/jbossas-5-enableauth.patch	2010-05-13 18:06:00 UTC (rev 104776)
@@ -40,7 +40,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -111,7 +112,6 @@
+@@ -109,7 +110,6 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -87,7 +87,7 @@
  
     <security-constraint>
     <web-resource-collection>
-@@ -354,7 +355,6 @@
+@@ -352,7 +353,6 @@
     <role-name>JBossAdmin</role-name>
     </auth-constraint>
     </security-constraint>
@@ -138,7 +138,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -111,7 +112,6 @@
+@@ -109,7 +110,6 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -185,7 +185,7 @@
  
     <security-constraint>
     <web-resource-collection>
-@@ -354,7 +355,6 @@
+@@ -352,7 +353,6 @@
     <role-name>JBossAdmin</role-name>
     </auth-constraint>
     </security-constraint>
@@ -223,7 +223,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -111,7 +112,6 @@
+@@ -109,7 +110,6 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -270,7 +270,7 @@
  
     <security-constraint>
     <web-resource-collection>
-@@ -354,7 +355,6 @@
+@@ -352,7 +353,6 @@
     <role-name>JBossAdmin</role-name>
     </auth-constraint>
     </security-constraint>
@@ -301,7 +301,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -111,7 +112,6 @@
+@@ -109,7 +110,6 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>
@@ -346,7 +346,7 @@
     <security-constraint>
       <web-resource-collection>
         <web-resource-name>HtmlAdaptor</web-resource-name>
-@@ -111,7 +112,6 @@
+@@ -109,7 +110,6 @@
         <role-name>JBossAdmin</role-name>
       </auth-constraint>
     </security-constraint>