From e77a4c26ccf8ffb5b31727c596427ac3d63174b7 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 03 Apr 2019 19:35:54 -0400 Subject: metadata/proteanos: Allow "+" and forbid "-" in upstream versions --- 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]*)?' -- cgit v0.9.1