pool/net-snmp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 145865 from net-snmp:factory

Browse Source 
Add fix for bnc#793548. (forwarded request 145863 from leonardocf)

OBS-URL: https://build.opensuse.org/request/show/145865
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/net-snmp?expand=0&rev=61
This commit is contained in:
Stephan Kulow 2012-12-20 10:02:57 +00:00 committed by Git OBS Bridge
parent 0451d39814
commit f62098c5ee
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
net-snmp-5.7.2-build-fix-for-strlcat.patch Normal file
View File

@ -0,0 +1,33 @@
commit 4a6d0378a3916571ce7604c4a3d54a8c96a8f807
Author: Bart Van Assche <bvanassche@acm.org>
Date: Sun Oct 28 09:54:12 2012 -0700
Windows: Visual Studio 6 build fix for strlcat()
Index: net-snmp-5.7.2/snmplib/strlcat.c
===================================================================
--- net-snmp-5.7.2.orig/snmplib/strlcat.c
+++ net-snmp-5.7.2/snmplib/strlcat.c
@@ -37,7 +37,7 @@
* If retval >= siz, truncation occurred.
*/
size_t
-strlcat(char * __restrict dst, const char * __restrict src, size_t siz)
+strlcat(char *dst, const char *src, size_t siz)
{
char *d = dst;
const char *s = src;
Index: net-snmp-5.7.2/include/net-snmp/library/system.h
===================================================================
--- net-snmp-5.7.2.orig/include/net-snmp/library/system.h
+++ net-snmp-5.7.2/include/net-snmp/library/system.h
@@ -196,8 +196,7 @@ SOFTWARE.
#endif
#ifndef HAVE_STRLCAT
NETSNMP_IMPORT
- size_t strlcat(char * __restrict, const char * __restrict,
- size_t);
+ size_t strlcat(char *, const char *, size_t);
#endif
int netsnmp_os_prematch(const char *ospmname,

6
net-snmp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 18 22:01:23 UTC 2012 - lchiquitto@suse.com
- net-snmp-5.7.2-build-fix-for-strlcat.patch: fix exported strlcat()
prototype that could conflict with other packages (bnc#793548)
-------------------------------------------------------------------
Wed Oct 10 18:21:19 UTC 2012 - lchiquitto@suse.com

2
net-snmp.spec
View File

@ -61,6 +61,7 @@ Patch3: net-snmp-5.7.2-pie.patch
Patch5: net-snmp-5.7.2-net-snmp-config-headercheck.patch
Patch6: net-snmp-5.7.2-perl-tk-warning.patch
Patch7: net-snmp-5.7.2-velocity-mib.patch
Patch8: net-snmp-5.7.2-build-fix-for-strlcat.patch
Patch23: net-snmp-5.7.2-fix-snmpd-crashing-when-an-agentx-disconnects.patch
#
Summary: SNMP Daemon
@ -208,6 +209,7 @@ Authors:
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch23 -p1
%build