Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
apk-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sertonix
apk-tools
Commits
dd1693ff
Commit
dd1693ff
authored
11 months ago
by
Timo Teräs
Browse files
Options
Downloads
Patches
Plain Diff
package: allow additional characters in provided names
fixes
#10988
parent
85ac6cb5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/apk-package.5.scd
+3
-2
3 additions, 2 deletions
doc/apk-package.5.scd
src/ctype.c
+3
-0
3 additions, 0 deletions
src/ctype.c
with
6 additions
and
2 deletions
doc/apk-package.5.scd
+
3
−
2
View file @
dd1693ff
...
...
@@ -184,8 +184,9 @@ Unfortunately it is not possible to deduce if a given string is of format
*
provides
*
(
*
provides
*
,
*
p
*
)
List
of
package
names
(
and
optionally
its
version
)
this
package
provides
in
addition
to
its
primary
name
and
version
.
The
provided
name
can
contain
additionally
colons
(
:
)
and
slashes
(
/
)
in
the
name
.
This
allows
using
namespaces
for
automatically
generated
names
.
name
can
contain
additionally
characters:
comma
(,),
brackets
([]),
colons
(
:
)
and
slashes
(
/
)
in
the
name
.
This
allows
using
namespaces
for
automatically
generated
names
.
If
the
provided
name
contains
a
version
number:
-
the
solver
will
treat
it
as
-
if
a
real
package
with
the
provided
...
...
This diff is collapsed.
Click to expand it.
src/ctype.c
+
3
−
0
View file @
dd1693ff
...
...
@@ -23,6 +23,7 @@ static uint8_t apk_ctype[128] = {
[
'\n'
]
=
DEPSEP
,
[
' '
]
=
REPOSEP
|
DEPSEP
,
[
'+'
]
=
PKGNAME
,
[
','
]
=
DEPNAME
,
[
'-'
]
=
PKGNAME
,
[
'.'
]
=
PKGNAME
,
[
':'
]
=
REPOSEP
|
DEPNAME
,
...
...
@@ -66,6 +67,8 @@ static uint8_t apk_ctype[128] = {
[
'X'
]
=
PKGNAME
,
[
'Y'
]
=
PKGNAME
,
[
'Z'
]
=
PKGNAME
,
[
'['
]
=
DEPNAME
,
[
']'
]
=
DEPNAME
,
[
'_'
]
=
PKGNAME
,
[
'a'
]
=
HEXDGT
|
VERSUF
|
PKGNAME
,
[
'b'
]
=
HEXDGT
|
VERSUF
|
PKGNAME
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment