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
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
knuxify
aports
Commits
a8520aa0
Commit
a8520aa0
authored
5 years ago
by
Leo
Browse files
Options
Downloads
Patches
Plain Diff
community/zabbix: remove stale patches
parent
034b9466
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
community/zabbix/ZBX-11549.patch
+0
-11
0 additions, 11 deletions
community/zabbix/ZBX-11549.patch
community/zabbix/zabbix_agent2-uname-linux.patch
+0
-65
0 additions, 65 deletions
community/zabbix/zabbix_agent2-uname-linux.patch
with
0 additions
and
76 deletions
community/zabbix/ZBX-11549.patch
deleted
100644 → 0
+
0
−
11
View file @
034b9466
--- a/frontends/php/include/func.inc.php
+++ b/frontends/php/include/func.inc.php
@@ -401,6 +401,7 @@
function str2mem($val) {
$val = trim($val);
$last = strtolower(substr($val, -1));
+ $val = (int) $val;
switch ($last) {
case 'g':
This diff is collapsed.
Click to expand it.
community/zabbix/zabbix_agent2-uname-linux.patch
deleted
100644 → 0
+
0
−
65
View file @
034b9466
diff --git a/go/src/zabbix/plugins/system/uname/uname_int8.go b/go/src/zabbix/plugins/system/uname/uname_int8.go
new file mode 100644
index 0000000..5bad4ca
--- /dev/null
+++ b/go/src/zabbix/plugins/system/uname/uname_int8.go
@@ -0,0 +1,15 @@
+// +build linux,386 linux,amd64 linux,arm64
+
+package uname
+
+func arrayToString(unameArray *[65]int8) string {
+ var byteString [65]byte
+ var indexLength int
+ for ; indexLength < len(unameArray); indexLength++ {
+ if 0 == unameArray[indexLength] {
+ break
+ }
+ byteString[indexLength] = uint8(unameArray[indexLength])
+ }
+ return string(byteString[:indexLength])
+}
diff --git a/go/src/zabbix/plugins/system/uname/uname_linux.go b/go/src/zabbix/plugins/system/uname/uname_linux.go
index 874569f..6dac18b 100644
--- a/go/src/zabbix/plugins/system/uname/uname_linux.go
+++ b/go/src/zabbix/plugins/system/uname/uname_linux.go
@@ -24,18 +24,6 @@
import (
"syscall"
)
-func arrayToString(unameArray *[65]int8) string {
- var byteString [65]byte
- var indexLength int
- for ; indexLength < len(unameArray); indexLength++ {
- if 0 == unameArray[indexLength] {
- break
- }
- byteString[indexLength] = uint8(unameArray[indexLength])
- }
- return string(byteString[:indexLength])
-}
-
func getUname() (uname string, err error) {
var utsname syscall.Utsname
if err = syscall.Uname(&utsname); err != nil {
diff --git a/go/src/zabbix/plugins/system/uname/uname_uint8.go b/go/src/zabbix/plugins/system/uname/uname_uint8.go
new file mode 100644
index 0000000..893d6c5
--- /dev/null
+++ b/go/src/zabbix/plugins/system/uname/uname_uint8.go
@@ -0,0 +1,15 @@
+// +build linux,arm linux,ppc64le linux,s390x
+
+package uname
+
+func arrayToString(unameArray *[65]uint8) string {
+ var byteString [65]byte
+ var indexLength int
+ for ; indexLength < len(unameArray); indexLength++ {
+ if 0 == unameArray[indexLength] {
+ break
+ }
+ byteString[indexLength] = uint8(unameArray[indexLength])
+ }
+ return string(byteString[:indexLength])
+}
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