Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
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
alpine
aports
Commits
6439b870
Verified
Commit
6439b870
authored
2 years ago
by
alice
Browse files
Options
Downloads
Patches
Plain Diff
community/libssh: fix strerror_r usage
parent
688c25db
No related branches found
No related tags found
1 merge request
!39304
[3.16] main/expat: security upgrade to 2.4.9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
community/libssh/APKBUILD
+3
-1
3 additions, 1 deletion
community/libssh/APKBUILD
community/libssh/strerror_r.patch
+12
-0
12 additions, 0 deletions
community/libssh/strerror_r.patch
with
15 additions
and
1 deletion
community/libssh/APKBUILD
+
3
−
1
View file @
6439b870
...
...
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
libssh
pkgver
=
0.10.0
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"Library for accessing ssh client services through C libraries"
options
=
"!check"
# Tests require CLIENT_TESTING enabled which needs socket_wrapper
url
=
"https://www.libssh.org/"
...
...
@@ -13,6 +13,7 @@ makedepends="$depends_dev cmake samurai"
checkdepends
=
"cmocka-dev"
subpackages
=
"
$pkgname
-dev"
source
=
"https://www.libssh.org/files/
${
pkgver
%.*
}
/libssh-
$pkgver
.tar.xz
strerror_r.patch
"
# secfixes:
...
...
@@ -51,4 +52,5 @@ package() {
sha512sums
=
"
d97235f78b94a980aabc844ee7614108944967441219f0c2417b207734d5200eb26efd5fd6de0da97a34fb612b843dc0a3b32a3364c1d8333e4c49680212aaaa libssh-0.10.0.tar.xz
e8af3698ddd55adcee6ddf58f5916cd8cc7b18792928d686ac8ed9463d645355c9e1b6c984d11d5399005372a35f347cccc45a320ce3464f5f39e4aee948d74b strerror_r.patch
"
This diff is collapsed.
Click to expand it.
community/libssh/strerror_r.patch
0 → 100644
+
12
−
0
View file @
6439b870
uses the xsi-compliant strerror in the else block below instead
--- a/src/misc.c
+++ b/src/misc.c
@@ -1956,7 +1956,7 @@
#if defined(_WIN32)
strerror_s(buf, buflen, err_num);
return buf;
-#elif defined(__linux__) && defined(_GNU_SOURCE)
+#elif 0 && defined(__linux__) && defined(_GNU_SOURCE)
/* GNU extension on Linux */
return strerror_r(err_num, buf, buflen);
#else
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