summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-03 19:35:54 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-03 19:35:54 (EDT)
commite77a4c26ccf8ffb5b31727c596427ac3d63174b7 (patch)
treebd2a2e77a220c4548489555f66b9b1777aee5111
parent5cbcb3b5f91bea4149cba02544ccaff1f232328f (diff)
metadata/proteanos: Allow "+" and forbid "-" in upstream versions
-rw-r--r--NEWS3
-rw-r--r--lib/metadata/proteanos.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index eca4ef6..93b5ae6 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ Bug fixes and minor changes:
now detects whether the exit status is reversed, to support build
dependency version comparisons with any version of opkg (or
opkg-lede).
+ * Plus signs are now allowed in ProteanOS source package upstream
+ version strings, and minus signs are no longer allowed. This
+ complies with the latest draft of SPF 2.0.
opkbuild version 4.0.1
----------------------
diff --git a/lib/metadata/proteanos.sh b/lib/metadata/proteanos.sh
index d0066f5..4cc982d 100644
--- a/lib/metadata/proteanos.sh
+++ b/lib/metadata/proteanos.sh
@@ -19,7 +19,7 @@
_OB_NAME_RE_PROTEANOS='^[a-z0-9][a-z0-9+.-]+$'
_OB_VERSION_RE_PROTEANOS='^'
-_OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'[0-9a-z.~-]+'
+_OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'[0-9a-z.~+]+'
_OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'(\+sip[1-9][0-9]*)?'
_OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'(-[1-9][0-9]*)?'
_OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'(\+[a-z0-9]+~[1-9][0-9]*)?'