Merge branch 'maint'

Conflicts:
	doc/appendix/guides/centos.txt
	doc/server/plugins/grouping/metadata.txt
	setup.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/SSHbase.py
	src/sbin/bcfg2-lint

3 files changed, 73 insertions, 7 deletions

diff --git a/schemas/packages.xsd b/schemas/packages.xsd
index 2645a8be0..e01093c56 100644
--- a/schemas/packages.xsd
+++ b/schemas/packages.xsd
@@ -172,6 +172,15 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:boolean" name="debsrc">
+      <xsd:annotation>
+        <xsd:documentation>
+          Include ``deb-src`` lines in the generated APT
+          configuration. This only applies to sources with
+          :xml:attribute:`SourceType:type` = ``apt``.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attribute type="xsd:string" name="url">
       <xsd:annotation>
         <xsd:documentation>
diff --git a/schemas/selinux.xsd b/schemas/selinux.xsd
index 760953e34..3651549f5 100644
--- a/schemas/selinux.xsd
+++ b/schemas/selinux.xsd
@@ -80,6 +80,13 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:token" name="mlsrange">
+      <xsd:annotation>
+        <xsd:documentation>
+          SELinux MLS range to apply to this port
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
@@ -127,6 +134,13 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:token" name="mlsrange">
+      <xsd:annotation>
+        <xsd:documentation>
+          SELinux MLS range to apply to files matching this specification
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
@@ -157,6 +171,13 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:token" name="mlsrange">
+      <xsd:annotation>
+        <xsd:documentation>
+          SELinux MLS range to apply to this node
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
@@ -205,6 +226,13 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:token" name="mlsrange">
+      <xsd:annotation>
+        <xsd:documentation>
+          SELinux MLS range to apply to this user
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
@@ -235,6 +263,13 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:token" name="mlsrange">
+      <xsd:annotation>
+        <xsd:documentation>
+          SELinux MLS range to apply to this user
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
@@ -258,6 +293,13 @@
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
+    <xsd:attribute type="xsd:token" name="mlsrange">
+      <xsd:annotation>
+        <xsd:documentation>
+          SELinux MLS range to apply to this interface
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
diff --git a/schemas/types.xsd b/schemas/types.xsd
index 9c4a0a48e..fe9b5c7d4 100644
--- a/schemas/types.xsd
+++ b/schemas/types.xsd
@@ -389,6 +389,27 @@
     </xsd:restriction>
   </xsd:simpleType>
 
+  <xsd:complexType name="MemberOfType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Specify additional supplementary groups for the POSIXUser
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:token">
+        <xsd:attribute name="group" type="xsd:token">
+          <xsd:annotation>
+            <xsd:documentation>
+              The name of the supplementary group.  This can also be
+              specified as content of the tag, although that is
+              deprecated.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
   <xsd:complexType name="POSIXUserType">
     <xsd:annotation>
       <xsd:documentation>
@@ -396,13 +417,7 @@
       </xsd:documentation>
     </xsd:annotation>
     <xsd:choice minOccurs='0' maxOccurs='unbounded'>
-      <xsd:element name='MemberOf' type='xsd:token'>
-        <xsd:annotation>
-          <xsd:documentation>
-            Specify additional supplementary groups for the POSIXUser
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
+      <xsd:element name='MemberOf' type='MemberOfType'/>
     </xsd:choice>
     <xsd:attribute type="xsd:token" name="name" use="required">
       <xsd:annotation>