From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] net-snmp: Update to 5.7.3 Date: Fri, 21 Oct 2016 14:12:16 +0100 Message-ID: <1477055536.9760.9.camel@ipfire.org> In-Reply-To: <1477053284-9449-1-git-send-email-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7839665987753531178==" List-Id: --===============7839665987753531178== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Please investigate why your patches are constantly getting corrupted. This is= an other one that cannot be merged: [root(a)rice-oxley ipfire-3.x]# pwclient git-am -s 873 Applying patch #873 using 'git am -s' Description: net-snmp: Update to 5.7.3 Applying: net-snmp: Update to 5.7.3 .git/rebase-apply/patch:502: trailing whitespace. =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0}=C2=A0 error: patch failed: net-snmp/patches/net-snmp-5.5-apsl-copying.patch:333 error: net-snmp/patches/net-snmp-5.5-apsl-copying.patch: patch does not apply Patch failed at 0001 net-snmp: Update to 5.7.3 The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". 'git am' failed with exit status 128 Best, -Michael On Fri, 2016-10-21 at 14:34 +0200, Stefan Schantl wrote: > This is a minor update to the latest available version of net-snmp. >=20 > * Drop SELinux support. >=20 > Fixes #11216. >=20 > Signed-off-by: Stefan Schantl > --- > =C2=A0net-snmp/net-snmp.nm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2=A0= =C2=A05 +- > =C2=A0net-snmp/patches/net-snmp-5.5-apsl-copying.patch=C2=A0=C2=A0=C2=A0|= =C2=A0=C2=A020 +-- > =C2=A0net-snmp/patches/net-snmp-5.6-multilib.patch=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0|=C2=A0=C2=A030 ++-- > =C2=A0.../net-snmp-5.7.2-python-ipaddress-size.patch=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0|=C2=A0=C2=A023 ---- > =C2=A0net-snmp/patches/net-snmp-5.7.2-systemd.patch=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0| 151 ++++++++++-------- > --- > =C2=A05 files changed, 100 insertions(+), 129 deletions(-) > =C2=A0delete mode 100644 net-snmp/patches/net-snmp-5.7.2-python-ipaddress- > size.patch >=20 > diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm > index 8b2a7fa..36254ef 100644 > --- a/net-snmp/net-snmp.nm > +++ b/net-snmp/net-snmp.nm > @@ -4,8 +4,8 @@ > =C2=A0#####################################################################= ######## > ## > =C2=A0 > =C2=A0name=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D net-snmp > -version=C2=A0=C2=A0=C2=A0=C2=A0=3D 5.7.2 > -release=C2=A0=C2=A0=C2=A0=C2=A0=3D 2 > +version=C2=A0=C2=A0=C2=A0=C2=A0=3D 5.7.3 > +release=C2=A0=C2=A0=C2=A0=C2=A0=3D 1 > =C2=A0 > =C2=A0groups=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D Networking/Daemons > =C2=A0url=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D http://net-snm= p.sourceforge.net > @@ -27,7 +27,6 @@ build > =C2=A0 bzip2-devel > =C2=A0 chrpath > =C2=A0 elfutils-devel > - libselinux-devel > =C2=A0 lm-sensors-devel >=3D 3 > =C2=A0 openssl-devel > =C2=A0 perl(ExtUtils::Embed) > diff --git a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch b/net- > snmp/patches/net-snmp-5.5-apsl-copying.patch > index 43b85b6..5ae7ca3 100644 > --- a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch > +++ b/net-snmp/patches/net-snmp-5.5-apsl-copying.patch > @@ -11,15 +11,15 @@ the code to 'any subsequent version of this License > published by Apple'. > =C2=A0According to http://fedoraproject.org/wiki/Licensing, APSL ver. 2.0 is > =C2=A0better for us. > =C2=A0 > -diff -up net-snmp-5.5/COPYING.apsl net-snmp-5.5/COPYING > ---- net-snmp-5.5/COPYING.apsl 2010-08-04 12:40:27.494479126 +0200 > -+++ net-snmp-5.5/COPYING 2010-08-04 12:45:47.713684755 +0200 > -@@ -292,3 +292,337 @@ ON ANY THEORY OF LIABILITY, WHETHER IN C > - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE > - USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH > - DAMAGE. > +diff -up net-snmp-5.7.3/COPYING.skiFvk net-snmp-5.7.3/COPYING > +--- net-snmp-5.7.3/COPYING.skiFvk 2015-02-17 13:33:15.963257594 +0100 > ++++ net-snmp-5.7.3/COPYING 2015-02-17 13:33:37.931241818 +0100 > +@@ -325,3 +325,337 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEV > + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > =C2=A0+ > -+---- Part 10: APPLE PUBLIC SOURCE LICENSE (APSL 2.0) ---- > ++---- Part 11: APPLE PUBLIC SOURCE LICENSE (APSL 2.0) ---- > =C2=A0+ > =C2=A0+Version 2.0 -=C2=A0=C2=A0August 6, 2003 > =C2=A0+ > @@ -333,8 +333,8 @@ diff -up net-snmp-5.5/COPYING.apsl net-snmp-5.5/COPYING > =C2=A0+ > =C2=A0+Where You are located in the province of Quebec, Canada, the followi= ng > clause > =C2=A0+applies:=C2=A0=C2=A0The parties hereby confirm that they have reques= ted that this > License > -+and all related documents be drafted in English.=C2=A0=C2=A0Les parties o= nt exig que > le > -+prsent contrat et tous les documents connexes soient rdigs en anglais. > ++and all related documents be drafted in English.=C2=A0=C2=A0Les parties o= nt exige que > le > ++present contrat et tous les documents connexes soient rediges en anglais. > =C2=A0+ > =C2=A0+EXHIBIT A.=C2=A0 > =C2=A0+ > diff --git a/net-snmp/patches/net-snmp-5.6-multilib.patch b/net- > snmp/patches/net-snmp-5.6-multilib.patch > index a50f5a8..9c12385 100644 > --- a/net-snmp/patches/net-snmp-5.6-multilib.patch > +++ b/net-snmp/patches/net-snmp-5.6-multilib.patch > @@ -1,8 +1,6 @@ > -Make the man pages multilib > safe.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 > - > -diff -up net-snmp-5.6/man/netsnmp_config_api.3.def.multilib net-snmp- > 5.6/man/netsnmp_config_api.3.def > ---- net-snmp-5.6/man/netsnmp_config_api.3.def.multilib 2010-09-08 > 17:41:37.000000000 +0200 > -+++ net-snmp-5.6/man/netsnmp_config_api.3.def 2010-10-25 > 17:40:43.433726423 +0200 > +diff -up net-snmp-5.7.3/man/netsnmp_config_api.3.def.oSBcEB net-snmp- > 5.7.3/man/netsnmp_config_api.3.def > +--- net-snmp-5.7.3/man/netsnmp_config_api.3.def.oSBcEB 2014-12-08 > 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/man/netsnmp_config_api.3.def 2015-02-17 > 13:32:38.903284207 +0100 > =C2=A0@@ -295,7 +295,7 @@ for one particular machine. > =C2=A0 .PP > =C2=A0 The default list of directories to search is \fC SYSCONFDIR/snmp\fP, > @@ -19,24 +17,24 @@ diff -up net-snmp- > 5.6/man/netsnmp_config_api.3.def.multilib net-snmp-5.6/man/net > =C2=A0-Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp > =C2=A0+Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp > =C2=A0 .SH "SEE ALSO" > - .BR mib_api "(3), " snmp_api (3) > + netsnmp_mib_api(3), snmp_api(3) > =C2=A0 .\" Local Variables: > -diff -up net-snmp-5.6/man/snmp_config.5.def.multilib net-snmp- > 5.6/man/snmp_config.5.def > ---- net-snmp-5.6/man/snmp_config.5.def.multilib 2010-09-17 > 11:51:52.000000000 +0200 > -+++ net-snmp-5.6/man/snmp_config.5.def 2010-10-25 17:40:12.681976439 > +0200 > +diff -up net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB net-snmp- > 5.7.3/man/snmp_config.5.def > +--- net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB 2015-02-17 > 13:32:04.251309092 +0100 > ++++ net-snmp-5.7.3/man/snmp_config.5.def 2015-02-17 13:33:09.217262438 > +0100 > =C2=A0@@ -10,7 +10,7 @@ First off, there are numerous places tha > =C2=A0 found and read from.=C2=A0=C2=A0By default, the applications look for > =C2=A0 configuration files in the following 4 directories, in order: > =C2=A0 SYSCONFDIR/snmp, > =C2=A0-DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp.=C2=A0=C2=A0In each of th= ese > =C2=A0+DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp.=C2=A0=C2=A0In each= of these > - directories, it looks for files with the extension of both > - .IR conf " and " local.conf > - (reading the second ones last).=C2=A0=C2=A0In this manner, there are > -diff -up net-snmp-5.6/man/snmpd.conf.5.def.multilib net-snmp- > 5.6/man/snmpd.conf.5.def > ---- net-snmp-5.6/man/snmpd.conf.5.def.multilib 2010-09-17 > 11:51:52.000000000 +0200 > -+++ net-snmp-5.6/man/snmpd.conf.5.def 2010-10-25 17:40:12.682976925 > +0200 > -@@ -1387,7 +1387,7 @@ filename), and call the initialisation r > + directories, it looks for files snmp.conf, snmpd.conf and/or > + snmptrapd.conf, as well as snmp.local.conf, snmpd.local.conf > + and/or snmptrapd.local.conf. *.local.conf are always > +diff -up net-snmp-5.7.3/man/snmpd.conf.5.def.oSBcEB net-snmp- > 5.7.3/man/snmpd.conf.5.def > +--- net-snmp-5.7.3/man/snmpd.conf.5.def.oSBcEB 2014-12-08 > 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/man/snmpd.conf.5.def 2015-02-17 13:32:04.251309092 > +0100 > +@@ -1502,7 +1502,7 @@ filename), and call the initialisation r > =C2=A0 .RS > =C2=A0 .IP "Note:" > =C2=A0 If the specified PATH is not a fully qualified filename, it will > diff --git a/net-snmp/patches/net-snmp-5.7.2-python-ipaddress-size.patch > b/net-snmp/patches/net-snmp-5.7.2-python-ipaddress-size.patch > deleted file mode 100644 > index 51a489f..0000000 > --- a/net-snmp/patches/net-snmp-5.7.2-python-ipaddress-size.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -895357 - net-snmp-python adds zeros to end of IP address (IPADDR type), wh= ich > is not valid > - > -Source: upstream commit 234158b8e84cc204cbac96e6e9be6959635404b8 > - > - --- a/python/netsnmp/client_intf.c=09 > -+++ a/python/netsnmp/client_intf.c=09 > -@@ -821,14 +821,14 @@ OCT: > -=C2=A0 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case TYPE_IPADDR: > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vars->type =3D ASN_I= PADDRESS; > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vars->val.integer =3D (lo= ng *)malloc(sizeof(long)); > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vars->val.integer =3D (in= _addr_t *)malloc(sizeof(in_addr_t)); > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (val) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0*(vars->val.integer) =3D inet_addr(val); > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0else { > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0ret =3D FAILURE; > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0*(vars->val.integer) =3D 0; > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vars->val_len =3D sizeof(= long); > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vars->val_len =3D sizeof(= in_addr_t); > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0break; > -=C2=A0 > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0case TYPE_OBJID: > diff --git a/net-snmp/patches/net-snmp-5.7.2-systemd.patch b/net- > snmp/patches/net-snmp-5.7.2-systemd.patch > index b349097..4c89d60 100644 > --- a/net-snmp/patches/net-snmp-5.7.2-systemd.patch > +++ b/net-snmp/patches/net-snmp-5.7.2-systemd.patch > @@ -57,10 +57,9 @@ Date:=C2=A0=C2=A0=C2=A0Tue Aug 9 10:53:43 2011 +0200 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0- update WantedBy in socket units as recommen= ded by http://0pointer.de/bl > og/projects/socket-activation.html > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0- rephrase README.systemd > =C2=A0 > - > -diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp-5.7.2/agent/snmpd.c > ---- net-snmp-5.7.2/agent/snmpd.c.systemd 2012-10-10 00:28:58.000000000 > +0200 > -+++ net-snmp-5.7.2/agent/snmpd.c 2012-11-12 10:18:46.084369548 +0100 > +diff -up net-snmp-5.7.3/agent/snmpd.c.MPGqYh net-snmp-5.7.3/agent/snmpd.c > +--- net-snmp-5.7.3/agent/snmpd.c.MPGqYh 2014-12-08 21:23:22.000000000 > +0100 > ++++ net-snmp-5.7.3/agent/snmpd.c 2015-02-17 13:34:05.736221851 +0100 > =C2=A0@@ -164,6 +164,10 @@ typedef long=C2=A0=C2=A0=C2=A0=C2=A0fd_mask; > =C2=A0=C2=A0 > =C2=A0 #endif > @@ -72,7 +71,7 @@ diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp- > 5.7.2/agent/snmpd.c > =C2=A0 netsnmp_feature_want(logging_file) > =C2=A0 netsnmp_feature_want(logging_stdio) > =C2=A0 netsnmp_feature_want(logging_syslog) > -@@ -441,18 +445,26 @@ main(int argc, char *argv[]) > +@@ -443,18 +447,26 @@ main(int argc, char *argv[]) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0int=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0agent_mode =3D -1; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0char=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0*pid_file =3D NULL; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0char=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0option_compatability[] =3D "-Le"; > @@ -101,7 +100,7 @@ diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp- > 5.7.2/agent/snmpd.c > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0 #endif /* #WIN32 */ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > -@@ -1100,6 +1112,19 @@ main(int argc, char *argv[]) > +@@ -1107,6 +1119,19 @@ main(int argc, char *argv[]) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0netsnmp_addrcache_initialise(); > =C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* > @@ -121,9 +120,9 @@ diff -up net-snmp-5.7.2/agent/snmpd.c.systemd net-snmp- > 5.7.2/agent/snmpd.c > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0* Forever monitor the dest_port f= or incoming PDUs.=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0*/ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0DEBUGMSGTL(("snmpd/main", "We're up.=C2= =A0=C2=A0Starting to process data.\n")); > -diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-snmp- > 5.7.2/apps/snmptrapd.c > ---- net-snmp-5.7.2/apps/snmptrapd.c.systemd 2012-10-10 > 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/apps/snmptrapd.c 2012-11-12 10:18:46.084369548 > +0100 > +diff -up net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh net-snmp- > 5.7.3/apps/snmptrapd.c > +--- net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh 2014-12-08 > 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/apps/snmptrapd.c 2015-02-17 13:34:05.736221851 > +0100 > =C2=A0@@ -125,6 +125,10 @@ SOFTWARE. > =C2=A0=C2=A0 > =C2=A0 #include > @@ -135,7 +134,7 @@ diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-sn= mp- > 5.7.2/apps/snmptrapd.c > =C2=A0 #ifndef BSD4_3 > =C2=A0 #define BSD4_2 > =C2=A0 #endif > -@@ -655,15 +659,22 @@ main(int argc, char *argv[]) > +@@ -657,15 +661,22 @@ main(int argc, char *argv[]) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0int=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0agentx_subagent =3D 1; > =C2=A0 #endif > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0netsnmp_trapd_handler *traph; > @@ -160,7 +159,7 @@ diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-sn= mp- > 5.7.2/apps/snmptrapd.c > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0 #endif /* #WIN32 */ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > -@@ -1311,6 +1322,19 @@ main(int argc, char *argv[]) > +@@ -1318,6 +1329,19 @@ main(int argc, char *argv[]) > =C2=A0 #endif > =C2=A0 #endif > =C2=A0=C2=A0 > @@ -180,9 +179,9 @@ diff -up net-snmp-5.7.2/apps/snmptrapd.c.systemd net-sn= mp- > 5.7.2/apps/snmptrapd.c > =C2=A0 #ifdef WIN32SERVICE > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0trapd_status =3D SNMPTRAPD_RUNNING; > =C2=A0 #endif > -diff -up net-snmp-5.7.2/configure.d/config_modules_lib.systemd net-snmp- > 5.7.2/configure.d/config_modules_lib > ---- net-snmp-5.7.2/configure.d/config_modules_lib.systemd 2012-10-10 > 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/configure.d/config_modules_lib 2012-11-12 > 10:18:46.085369546 +0100 > +diff -up net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh net-snmp- > 5.7.3/configure.d/config_modules_lib > +--- net-snmp-5.7.3/configure.d/config_modules_lib.MPGqYh 2014-12-08 > 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/configure.d/config_modules_lib 2015-02-17 > 13:34:05.737221850 +0100 > =C2=A0@@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" =3D "xmingw32" > =C2=A0=C2=A0=C2=A0=C2=A0other_ftobjs_list=3D"$other_ftobjs_list winpipe.ft" > =C2=A0 fi > @@ -198,9 +197,9 @@ diff -up net-snmp- > 5.7.2/configure.d/config_modules_lib.systemd net-snmp-5.7.2/co > =C2=A0 AC_SUBST(other_src_list) > =C2=A0 AC_SUBST(other_objs_list) > =C2=A0 AC_SUBST(other_lobjs_list) > -diff -up net-snmp-5.7.2/configure.d/config_project_with_enable.systemd net- > snmp-5.7.2/configure.d/config_project_with_enable > ---- net-snmp-5.7.2/configure.d/config_project_with_enable.systemd 2012 > -10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/configure.d/config_project_with_enable 2012-11-12 > 10:18:46.086369544 +0100 > +diff -up net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh net- > snmp-5.7.3/configure.d/config_project_with_enable > +--- net-snmp-5.7.3/configure.d/config_project_with_enable.MPGqYh 2014- > 12-08 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/configure.d/config_project_with_enable 2015-02-17 > 13:34:05.737221850 +0100 > =C2=A0@@ -690,6 +690,15 @@ if test "x$with_dummy_values" !=3D "xyes"; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0data for]) > =C2=A0 fi > @@ -217,10 +216,10 @@ diff -up net-snmp- > 5.7.2/configure.d/config_project_with_enable.systemd net-snmp- > =C2=A0 NETSNMP_ARG_ENABLE(set-support, > =C2=A0 [=C2=A0=C2=A0--disable-set-support=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Do not allow SNMP set requests.]) > =C2=A0 if test "x$enable_set_support" =3D "xno"; then > -diff -up net-snmp-5.7.2/configure.systemd net-snmp-5.7.2/configure > ---- net-snmp-5.7.2/configure.systemd 2012-10-10 00:35:37.000000000 > +0200 > -+++ net-snmp-5.7.2/configure 2012-11-12 10:18:46.099369517 +0100 > -@@ -950,6 +950,8 @@ with_kmem_usage > +diff -up net-snmp-5.7.3/configure.MPGqYh net-snmp-5.7.3/configure > +--- net-snmp-5.7.3/configure.MPGqYh 2014-12-08 21:23:37.000000000 > +0100 > ++++ net-snmp-5.7.3/configure 2015-02-17 13:34:05.744221845 +0100 > +@@ -951,6 +951,8 @@ with_kmem_usage > =C2=A0 enable_kmem_usage > =C2=A0 with_dummy_values > =C2=A0 enable_dummy_values > @@ -229,7 +228,7 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp- > 5.7.2/configure > =C2=A0 enable_set_support > =C2=A0 with_set_support > =C2=A0 with_sys_contact > -@@ -1866,6 +1868,8 @@ Configuring the agent: > +@@ -1867,6 +1869,8 @@ Configuring the agent: > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0This is tec= hnically not compliant with the > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0SNMP specif= ications, but was how the agent > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0operated fo= r versions < 4.0. > @@ -238,7 +237,7 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp- > 5.7.2/configure > =C2=A0=C2=A0=C2=A0=C2=A0--with-sys-contact=3D"who(a)where"=C2=A0=C2=A0Defau= lt system contact. > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0(Default: LOGIN(a)DOMAINNAME) > =C2=A0=C2=A0=C2=A0=C2=A0--with-sys-location=3D"location"=C2=A0=C2=A0Default= system location. > -@@ -4397,6 +4401,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE > +@@ -4398,6 +4402,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE > =C2=A0=C2=A0 > =C2=A0 fi > =C2=A0=C2=A0 > @@ -263,7 +262,7 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp- > 5.7.2/configure > =C2=A0 # Check whether --enable-set-support was given. > =C2=A0 if test "${enable_set_support+set}" =3D set; then : > =C2=A0=C2=A0=C2=A0=C2=A0enableval=3D$enable_set_support; > -@@ -18239,6 +18261,14 @@ if test "x$PARTIALTARGETOS" =3D "xmingw32" > +@@ -18639,6 +18661,14 @@ if test "x$PARTIALTARGETOS" =3D "xmingw32" > =C2=A0=C2=A0=C2=A0=C2=A0other_ftobjs_list=3D"$other_ftobjs_list winpipe.ft" > =C2=A0 fi > =C2=A0=C2=A0 > @@ -278,9 +277,9 @@ diff -up net-snmp-5.7.2/configure.systemd net-snmp- > 5.7.2/configure > =C2=A0=C2=A0 > =C2=A0=C2=A0 > =C2=A0=C2=A0 > -diff -up net-snmp-5.7.2/dist/snmpd.service.systemd net-snmp- > 5.7.2/dist/snmpd.service > ---- net-snmp-5.7.2/dist/snmpd.service.systemd 2012-11-12 > 10:18:46.104369507 +0100 > -+++ net-snmp-5.7.2/dist/snmpd.service 2012-11-12 10:18:46.104369507 > +0100 > +diff -up net-snmp-5.7.3/dist/snmpd.service.MPGqYh net-snmp- > 5.7.3/dist/snmpd.service > +--- net-snmp-5.7.3/dist/snmpd.service.MPGqYh 2015-02-17 > 13:34:05.745221844 +0100 > ++++ net-snmp-5.7.3/dist/snmpd.service 2015-02-17 13:34:05.745221844 > +0100 > =C2=A0@@ -0,0 +1,18 @@ > =C2=A0+# > =C2=A0+# SNMP agent service file for systemd > @@ -300,9 +299,9 @@ diff -up net-snmp-5.7.2/dist/snmpd.service.systemd net- > snmp-5.7.2/dist/snmpd.ser > =C2=A0+ > =C2=A0+[Install] > =C2=A0+WantedBy=3Dmulti-user.target > -diff -up net-snmp-5.7.2/dist/snmpd.socket.systemd net-snmp- > 5.7.2/dist/snmpd.socket > ---- net-snmp-5.7.2/dist/snmpd.socket.systemd 2012-11-12 > 10:18:46.104369507 +0100 > -+++ net-snmp-5.7.2/dist/snmpd.socket 2012-11-12 10:18:46.104369507 > +0100 > +diff -up net-snmp-5.7.3/dist/snmpd.socket.MPGqYh net-snmp- > 5.7.3/dist/snmpd.socket > +--- net-snmp-5.7.3/dist/snmpd.socket.MPGqYh 2015-02-17 > 13:34:05.745221844 +0100 > ++++ net-snmp-5.7.3/dist/snmpd.socket 2015-02-17 13:34:05.745221844 > +0100 > =C2=A0@@ -0,0 +1,17 @@ > =C2=A0+[Unit] > =C2=A0+Description=3DSocket listening for SNMP and AgentX messages > @@ -321,9 +320,9 @@ diff -up net-snmp-5.7.2/dist/snmpd.socket.systemd net- > snmp-5.7.2/dist/snmpd.sock > =C2=A0+ > =C2=A0+[Install] > =C2=A0+WantedBy=3Dsockets.target > -diff -up net-snmp-5.7.2/dist/snmptrapd.service.systemd net-snmp- > 5.7.2/dist/snmptrapd.service > ---- net-snmp-5.7.2/dist/snmptrapd.service.systemd 2012-11-12 > 10:18:46.105369505 +0100 > -+++ net-snmp-5.7.2/dist/snmptrapd.service 2012-11-12 > 10:18:46.105369505 +0100 > +diff -up net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh net-snmp- > 5.7.3/dist/snmptrapd.service > +--- net-snmp-5.7.3/dist/snmptrapd.service.MPGqYh 2015-02-17 > 13:34:05.745221844 +0100 > ++++ net-snmp-5.7.3/dist/snmptrapd.service 2015-02-17 > 13:34:05.745221844 +0100 > =C2=A0@@ -0,0 +1,16 @@ > =C2=A0+# > =C2=A0+# SNMP trap-processing service file for systemd > @@ -341,9 +340,9 @@ diff -up net-snmp-5.7.2/dist/snmptrapd.service.systemd > net-snmp-5.7.2/dist/snmpt > =C2=A0+ > =C2=A0+[Install] > =C2=A0+WantedBy=3Dmulti-user.target > -diff -up net-snmp-5.7.2/dist/snmptrapd.socket.systemd net-snmp- > 5.7.2/dist/snmptrapd.socket > ---- net-snmp-5.7.2/dist/snmptrapd.socket.systemd 2012-11-12 > 10:18:46.105369505 +0100 > -+++ net-snmp-5.7.2/dist/snmptrapd.socket 2012-11-12 10:18:46.105369505 > +0100 > +diff -up net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh net-snmp- > 5.7.3/dist/snmptrapd.socket > +--- net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh 2015-02-17 > 13:34:05.745221844 +0100 > ++++ net-snmp-5.7.3/dist/snmptrapd.socket 2015-02-17 13:34:05.745221844 > +0100 > =C2=A0@@ -0,0 +1,14 @@ > =C2=A0+[Unit] > =C2=A0+Description=3DSocket listening for SNMP trap messages > @@ -359,9 +358,9 @@ diff -up net-snmp-5.7.2/dist/snmptrapd.socket.systemd n= et- > snmp-5.7.2/dist/snmptr > =C2=A0+ > =C2=A0+[Install] > =C2=A0+WantedBy=3Dsockets.target > -diff -up net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h.systemd net- > snmp-5.7.2/include/net-snmp/library/sd-daemon.h > ---- net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h.systemd 2012- > 11-12 10:18:46.106369503 +0100 > -+++ net-snmp-5.7.2/include/net-snmp/library/sd-daemon.h 2012-11-12 > 10:18:46.106369503 +0100 > +diff -up net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh net-sn= mp- > 5.7.3/include/net-snmp/library/sd-daemon.h > +--- net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh 2015- > 02-17 13:34:05.746221843 +0100 > ++++ net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h 2015-02-17 > 13:34:05.746221843 +0100 > =C2=A0@@ -0,0 +1,286 @@ > =C2=A0+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ > =C2=A0+ > @@ -649,10 +648,10 @@ diff -up net-snmp-5.7.2/include/net-snmp/library/sd- > daemon.h.systemd net-snmp-5. > =C2=A0+#endif > =C2=A0+ > =C2=A0+#endif /* SNMPD_SD_DAEMON_H */ > -diff -up net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in.systemd net- > snmp-5.7.2/include/net-snmp/net-snmp-config.h.in > ---- net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in.systemd 2012- > 10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/include/net-snmp/net-snmp-config.h.in 2012-11-12 > 10:18:46.107369501 +0100 > -@@ -1389,6 +1389,9 @@ > +diff -up net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh net- > snmp-5.7.3/include/net-snmp/net-snmp-config.h.in > +--- net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh 2014- > 12-08 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in 2015-02-17 > 13:34:05.746221843 +0100 > +@@ -1410,6 +1410,9 @@ > =C2=A0 /* If you don't have root access don't exit upon kmem errors */ > =C2=A0 #undef NETSNMP_NO_ROOT_ACCESS > =C2=A0=C2=A0 > @@ -662,9 +661,9 @@ diff -up net-snmp-5.7.2/include/net-snmp/net-snmp- > config.h.in.systemd net-snmp-5 > =C2=A0 /* Define if you want to remove all SET/write access from the code */ > =C2=A0 #undef NETSNMP_NO_WRITE_SUPPORT > =C2=A0=C2=A0 > -diff -up net-snmp-5.7.2/README.systemd.systemd net-snmp-5.7.2/README.syste= md > ---- net-snmp-5.7.2/README.systemd.systemd 2012-11-12 > 10:18:46.108369499 +0100 > -+++ net-snmp-5.7.2/README.systemd 2012-11-12 10:18:46.108369499 +0100 > +diff -up net-snmp-5.7.3/README.systemd.MPGqYh net-snmp-5.7.3/README.systemd > +--- net-snmp-5.7.3/README.systemd.MPGqYh 2015-02-17 13:34:05.747221843 > +0100 > ++++ net-snmp-5.7.3/README.systemd 2015-02-17 13:34:05.747221843 +0100 > =C2=A0@@ -0,0 +1,41 @@ > =C2=A0+README.systemd > =C2=A0+-------------- > @@ -708,9 +707,9 @@ diff -up net-snmp-5.7.2/README.systemd.systemd net-snmp- > 5.7.2/README.systemd > =C2=A0+start during boot and not after first SNMP trap arrives. Same rules = as for > snmpd > =C2=A0+applies then. > =C2=A0\ No newline at end of file > -diff -up net-snmp-5.7.2/snmplib/sd-daemon.c.systemd net-snmp- > 5.7.2/snmplib/sd-daemon.c > ---- net-snmp-5.7.2/snmplib/sd-daemon.c.systemd 2012-11-12 > 10:18:46.109369497 +0100 > -+++ net-snmp-5.7.2/snmplib/sd-daemon.c 2012-11-12 10:18:46.109369497 > +0100 > +diff -up net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh net-snmp-5.7.3/snmplib/= sd- > daemon.c > +--- net-snmp-5.7.3/snmplib/sd-daemon.c.MPGqYh 2015-02-17 > 13:34:05.747221843 +0100 > ++++ net-snmp-5.7.3/snmplib/sd-daemon.c 2015-02-17 13:34:05.747221843 > +0100 > =C2=A0@@ -0,0 +1,532 @@ > =C2=A0+/* > =C2=A0+ * Systemd integration parts. > @@ -1244,9 +1243,9 @@ diff -up net-snmp-5.7.2/snmplib/sd-daemon.c.systemd n= et- > snmp-5.7.2/snmplib/sd-da > =C2=A0+} > =C2=A0+ > =C2=A0+#endif /* ! NETSNMP_NO_SYSTEMD */ > -diff -up net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c.systemd net-snm= p- > 5.7.2/snmplib/transports/snmpTCPDomain.c > ---- net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c.systemd 2012-10- > 10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/snmplib/transports/snmpTCPDomain.c 2012-11-12 > 10:19:41.767217067 +0100 > +diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh net-snmp- > 5.7.3/snmplib/transports/snmpTCPDomain.c > +--- net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c.MPGqYh 2014-12- > 08 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/snmplib/transports/snmpTCPDomain.c 2015-02-17 > 13:34:05.748221842 +0100 > =C2=A0@@ -43,6 +43,10 @@ > =C2=A0 #include > =C2=A0 #include > @@ -1326,9 +1325,9 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpTCPDomain.c.systemd net-snmp-5.7. > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* > -diff -up net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c.systemd net- > snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c > ---- net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c.systemd 2012 > -10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/snmplib/transports/snmpTCPIPv6Domain.c 2012-11-12 > 10:20:32.019078971 +0100 > +diff -up net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh net- > snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c > +--- net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c.MPGqYh 2014- > 12-08 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c 2015-02-17 > 13:34:05.748221842 +0100 > =C2=A0@@ -49,6 +49,10 @@ > =C2=A0 #include > =C2=A0 #include > @@ -1409,9 +1408,9 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpTCPIPv6Domain.c.systemd net-snmp- > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* > -diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd > net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c > ---- net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd=09 > 2012-10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c 2012-11- > 12 10:22:30.279750750 +0100 > +diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh > net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c > +--- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c.MPGqYh 2 > 014-12-08 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c 2015-02- > 17 13:36:22.744123462 +0100 > =C2=A0@@ -40,6 +40,10 @@ > =C2=A0=C2=A0 > =C2=A0 #include > @@ -1420,10 +1419,10 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s > =C2=A0+#include > =C2=A0+#endif > =C2=A0+ > - #if (defined(linux) && defined(IP_PKTINFO)) \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|| defined(IP_RECVDSTADDR) && HAVE_STRUCT_MS= GHDR_MSG_CONTROL \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&& HAVE_STRUCT_MSGHDR_MSG_FLAGS > -@@ -67,6 +71,7 @@ netsnmp_udpipv4base_transport(struct soc > + #if defined(HAVE_IP_PKTINFO) || defined(HAVE_IP_RECVDSTADDR) > + int netsnmp_udpipv4_recvfrom(int s, void *buf, int len, struct sockaddr > *from, > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0socklen_t *fromlen, struct sockaddr *dstip, > +@@ -64,6 +68,7 @@ netsnmp_udpipv4base_transport(struct soc > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0char=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0*client_socket =3D NULL; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0netsnmp_indexed_addr_pair addr_pair; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0socklen_t=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0local_addr_len; > @@ -1431,7 +1430,7 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s > =C2=A0=C2=A0 > =C2=A0 #ifdef NETSNMP_NO_LISTEN_SUPPORT > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (local) > -@@ -91,7 +96,20 @@ netsnmp_udpipv4base_transport(struct soc > +@@ -88,7 +93,20 @@ netsnmp_udpipv4base_transport(struct soc > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0free(str); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0=C2=A0 > @@ -1453,17 +1452,16 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0DEBUGMSGTL(("UDPBase", "openned socket = %d as local=3D%d\n", t->sock, > local));=C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (t->sock < 0) { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0netsnmp_transpo= rt_free(t); > -@@ -141,13 +159,15 @@ netsnmp_udpipv4base_transport(struct soc > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0DEBUGMSGTL(("netsnmp_udp", "set IP_RECVDSTADDR\n")); > +@@ -151,12 +169,14 @@ netsnmp_udpipv4base_transport(struct soc > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > - #endif > + #endif /* !defined(WIN32) */ > =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0rc =3D bind(t->sock,= (struct sockaddr *) addr, > =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sizeof(struct sockaddr)); > =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (rc !=3D 0) { > =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0netsnmp_socketbase_close(t); > =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0netsnmp_transport_free(t); > =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0return NULL; > --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (!socket_initiali= zed) { > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0rc =3D bind(t->sock, (struct sockaddr *) addr, > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sizeof(struct sockaddr)= ); > @@ -1472,13 +1470,12 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpUDPIPv4BaseDomain.c.systemd net-s > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0netsnmp_transport_free(t); > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return NULL; > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0} > -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0t->data =3D NUL= L; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0t->data_length = =3D 0; > - #else /* NETSNMP_NO_LISTEN_SUPPORT */ > -diff -up net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd net- > snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c > ---- net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd 2012 > -10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/snmplib/transports/snmpUDPIPv6Domain.c 2012-11-12 > 10:23:19.713603003 +0100 > +diff -up net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh net- > snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c > +--- net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c.MPGqYh 2014- > 12-08 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c 2015-02-17 > 13:37:16.256087147 +0100 > =C2=A0@@ -67,6 +67,10 @@ static const struct in6_addr in6addr_any > =C2=A0 #include > =C2=A0 #include > @@ -1520,8 +1517,8 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp- > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0netsnmp_transpo= rt_free(t); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0return NULL; > =C2=A0@@ -242,13 +259,14 @@ netsnmp_udp6_transport(struct sockaddr_i > -=C2=A0 =C2=A0=C2=A0}=C2=A0 > -=C2=A0 } > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0}=C2=A0 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0 #endif > =C2=A0- > =C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0rc =3D bind(t->sock,= (struct sockaddr *) addr, > @@ -1541,9 +1538,9 @@ diff -up net-snmp- > 5.7.2/snmplib/transports/snmpUDPIPv6Domain.c.systemd net-snmp- > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0t->local =3D (u= nsigned char*)malloc(18); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (t->local = =3D=3D NULL) { > -diff -up net-snmp-5.7.2/snmplib/transports/snmpUnixDomain.c.systemd net-sn= mp- > 5.7.2/snmplib/transports/snmpUnixDomain.c > ---- net-snmp-5.7.2/snmplib/transports/snmpUnixDomain.c.systemd 2012- > 10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/snmplib/transports/snmpUnixDomain.c 2012-11-12 > 10:24:02.803466358 +0100 > +diff -up net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh net-snm= p- > 5.7.3/snmplib/transports/snmpUnixDomain.c > +--- net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c.MPGqYh 2014-12- > 08 21:23:22.000000000 +0100 > ++++ net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c 2015-02-17 > 13:34:05.749221841 +0100 > =C2=A0@@ -37,6 +37,10 @@ > =C2=A0 #include /* mkdirhier */ > =C2=A0 #include --===============7839665987753531178== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSllDaFF3QUFvSkVJQjU4UDl2a0FrSGg0d1AvMlR6SlVmQlFjU0Y0VFFCTFlIdEpaTGcK aVdVK29RNnlLa29oQkhaUjJhL0lHU3AzandIdmhKZXpuMlhrMnByVm9TdmRSRnhtclJHaU5ObzAy bERXck5GVQozSGhzditSNmhnMEVNL0o0bWFEUXo5ZGo2MmR1dzV5ckxDT2thdHpVNnUvRWoxMkc2 VG5WUWdwOXZFVWM3bUNNClNsTkNrdXVGdEVsQmxlKytJR0xiQ3dxRlp2L3I1RG1Ja2N1S0JGa2FX MUJzNjVXVmNCK1RGNUVRbWFFckh1bWIKNWJMRnM5N2dmRzBCNitIYlM0NVdQYjAwbXd6aVdnK0tX NU4xSk0rZEQ1VlVpbkVkVUZjN0hmVy95L0h4TTNZWQpHWDBGK1NIdllvSmM1UldIVlhEaUtUZHR6 U1FVSEsreDl2bjQrVGREbGFQL2l3MHlQWUtVUERjdEU1OFM4ZXdRCkppMGN5Sk1qSUpySkt6VVVa Zk9NZDhTOWFScnJocGpmRzlpWmY4MGNCK2dpTElQQTVHaEJqYXFrRWlzYWNKVncKZGdSU2FzRy91 QVZ3cVEyNzFyZXNsZmMzT2RqQ2EzNWxJb3lmdUVrTzFxeHJpc1hpS1kyTjNhOE9HdDZhYmRpNQo1 ZnMyOUtGZWhTbmNkZGlBVXR4WmNLNnlza0dScFVwdXdOREV4WHlrekVaNkZoSCswa1dxMHJkK0lP bEZ6RDJ0Ck9xc2FmazZhUkNDZmVjY244OWpFN25kQVVlbDNueHZPU3JhYzk1RjJSVHBPQWl5aUZE Rm9qWkFKeXlLeExZOTEKQXNkS3ZBb01rSEJ0N3pyUnBkaDFPTzRhUmw2UUJGN3hqaFd5eTJ1dEZV Y2pLTHdZS2JWdlJ5YndsTVdDclB5NApGMCtoSHhiWVNmbjc3N0NhNUd5Ywo9RC9PbgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============7839665987753531178==--