From d5c656c7573b5b9c62564e6d7fc81dcafe2c001c Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Thu, 23 Jul 2020 11:17:57 -0400
Subject: [PATCH 1/4] adding duration for repomirror check

---
 schema/lib/elements/repomirror.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/schema/lib/elements/repomirror.xsd b/schema/lib/elements/repomirror.xsd
index 777e81c..531c726 100644
--- a/schema/lib/elements/repomirror.xsd
+++ b/schema/lib/elements/repomirror.xsd
@@ -43,6 +43,7 @@
       <xs:element name="port" minOccurs="0" type="t_net_port"/>
       <xs:element name="path" minOccurs="1" type="t_unix_dirpath"/>
     </xs:all>
+    <xs:attribute name="delayCheck" type="xs:duration" use="optional" default="P0Y0M0W2DT0H0M0S"/>
   </xs:complexType>
 
 </xs:schema>

From 6e9042f023766cea19221273c90822fc9d6b9939 Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Thu, 23 Jul 2020 11:20:44 -0400
Subject: [PATCH 2/4] whoops; missed the formatting there a bit.

---
 schema/lib/elements/repomirror.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/schema/lib/elements/repomirror.xsd b/schema/lib/elements/repomirror.xsd
index 531c726..f4848ac 100644
--- a/schema/lib/elements/repomirror.xsd
+++ b/schema/lib/elements/repomirror.xsd
@@ -43,7 +43,7 @@
       <xs:element name="port" minOccurs="0" type="t_net_port"/>
       <xs:element name="path" minOccurs="1" type="t_unix_dirpath"/>
     </xs:all>
-    <xs:attribute name="delayCheck" type="xs:duration" use="optional" default="P0Y0M0W2DT0H0M0S"/>
+    <xs:attribute name="delayCheck" type="xs:duration" use="optional" default="P0Y0M2DT0H0M0S"/>
   </xs:complexType>
 
 </xs:schema>

From 9b5b4604969bc5a31c3b65910f3bb09e74f5ee16 Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Thu, 23 Jul 2020 14:26:36 -0400
Subject: [PATCH 3/4] make repomirror a little easier to use

---
 schema/lib/elements/repomirror.xsd | 6 +++++-
 schema/lib/types/repomirror.xsd    | 4 ++++
 schema/projects/repomirror.xsd     | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/schema/lib/elements/repomirror.xsd b/schema/lib/elements/repomirror.xsd
index f4848ac..b486b11 100644
--- a/schema/lib/elements/repomirror.xsd
+++ b/schema/lib/elements/repomirror.xsd
@@ -16,6 +16,10 @@
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="e_repomir_ignoreExit">
+    <xs:attribute name="returns" type="t_repomir_returnCodeList" use="required"/>
+  </xs:complexType>
+
   <!-- Commented out; we don't bother with SSH variants. See also e_repomir_upstream -->
   <!--
   <xs:complexType name="e_repomir_sync_proto">
@@ -43,7 +47,7 @@
       <xs:element name="port" minOccurs="0" type="t_net_port"/>
       <xs:element name="path" minOccurs="1" type="t_unix_dirpath"/>
     </xs:all>
-    <xs:attribute name="delayCheck" type="xs:duration" use="optional" default="P0Y0M2DT0H0M0S"/>
+    <xs:attribute name="delayCheck" type="xs:duration" use="optional"/>
   </xs:complexType>
 
 </xs:schema>
diff --git a/schema/lib/types/repomirror.xsd b/schema/lib/types/repomirror.xsd
index 122abea..1a835dd 100644
--- a/schema/lib/types/repomirror.xsd
+++ b/schema/lib/types/repomirror.xsd
@@ -3,6 +3,10 @@
            elementFormDefault="qualified"
            attributeFormDefault="unqualified">
 
+  <xs:simpleType name="t_repomir_returnCodeList">
+    <xs:list itemType="xs:integer"/>
+  </xs:simpleType>
+
   <xs:simpleType name="t_repomir_synctype">
     <xs:restriction base="xs:token">
       <xs:enumeration value="rsync"/>
diff --git a/schema/projects/repomirror.xsd b/schema/projects/repomirror.xsd
index 4ca85d0..03e7a38 100644
--- a/schema/projects/repomirror.xsd
+++ b/schema/projects/repomirror.xsd
@@ -28,6 +28,7 @@
                 <xs:element name="mountCheck" type="t_unix_dirpath" minOccurs="1"/>
                 <xs:element name="owner" type="e_repomir_owner" minOccurs="0"/>
                 <xs:element name="rsyncArgs" minOccurs="0" maxOccurs="1" type="t_unix_args"/>
+                <xs:element name="rsyncIgnore" minOccurs="0" maxOccurs="1" type="e_repomir_ignoreExit"/>
               </xs:choice>
             </xs:sequence>
             <xs:attribute name="name" type="xs:ID" use="required"/>

From 6bdf8e55f2b1d4cbcb1b609f7d29b8adb2a2fceb Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Thu, 23 Jul 2020 23:15:53 -0400
Subject: [PATCH 4/4] adding stuff for better sync timestamp checking in
 repomirror

---
 schema/lib/elements/repomirror.xsd | 10 ++++++++++
 schema/projects/repomirror.xsd     |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/schema/lib/elements/repomirror.xsd b/schema/lib/elements/repomirror.xsd
index b486b11..27b4dbb 100644
--- a/schema/lib/elements/repomirror.xsd
+++ b/schema/lib/elements/repomirror.xsd
@@ -35,10 +35,19 @@
     <xs:simpleContent>
       <xs:extension base="t_unix_filepath">
         <xs:attribute name="timeFormat" type="xs:string" use="optional" default="UNIX_EPOCH"/>
+        <xs:attribute name="offset" type="xs:integer" use="optional"/>
       </xs:extension>
     </xs:simpleContent>
   </xs:complexType>
 
+  <xs:complexType name="e_repomir_remote_tstmp_file">
+    <xs:complexContent>
+      <xs:extension base="e_repomir_tstmp_file">
+        <xs:attribute name="mtime" type="xs:boolean" use="optional" default="false"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="e_repomir_upstream">
     <xs:all minOccurs="1">
       <!-- <xs:element name="syncType" type="e_repomir_sync_proto" minOccurs="1"/> -->
@@ -48,6 +57,7 @@
       <xs:element name="path" minOccurs="1" type="t_unix_dirpath"/>
     </xs:all>
     <xs:attribute name="delayCheck" type="xs:duration" use="optional"/>
+    <xs:attribute name="offset" type="xs:duration" use="optional"/>
   </xs:complexType>
 
 </xs:schema>
diff --git a/schema/projects/repomirror.xsd b/schema/projects/repomirror.xsd
index 03e7a38..de607f2 100644
--- a/schema/projects/repomirror.xsd
+++ b/schema/projects/repomirror.xsd
@@ -23,8 +23,8 @@
                 <xs:element name="dest" type="t_unix_dirpath" minOccurs="1" maxOccurs="1"/>
                 <xs:element name="lastLocalCheck" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
                 <xs:element name="lastLocalSync" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
-                <xs:element name="lastRemoteUpdate" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="lastRemoteSync" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="1"/>
+                <xs:element name="lastRemoteUpdate" type="e_repomir_remote_tstmp_file" minOccurs="0" maxOccurs="1"/>
+                <xs:element name="lastRemoteSync" type="e_repomir_remote_tstmp_file" minOccurs="0" maxOccurs="1"/>
                 <xs:element name="mountCheck" type="t_unix_dirpath" minOccurs="1"/>
                 <xs:element name="owner" type="e_repomir_owner" minOccurs="0"/>
                 <xs:element name="rsyncArgs" minOccurs="0" maxOccurs="1" type="t_unix_args"/>