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.9.1 Date: Thu, 16 Feb 2023 18:17:11 +0100 Message-ID: <548EACA8-A1B0-47E1-9678-5538F9D9BBB1@ipfire.org> In-Reply-To: <20230216171203.1411263-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3575500276941524754==" List-Id: --===============3575500276941524754== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 16 Feb 2023, at 18:12, Stefan Schantl wrot= e: >=20 > * Drop patchset > * Drop perl modules > * Drop additional script which are related on the > SNMP perl modules or depricated ones. >=20 > Signed-off-by: Stefan Schantl > --- > net-snmp/net-snmp.nm | 48 +- > .../patches/net-snmp-5.5-apsl-copying.patch | 354 ---- > net-snmp/patches/net-snmp-5.5-dir-fix.patch | 14 - > .../patches/net-snmp-5.5-perl-linking.patch | 16 - > net-snmp/patches/net-snmp-5.6-multilib.patch | 45 - > .../patches/net-snmp-5.6-test-debug.patch | 29 - > net-snmp/patches/net-snmp-5.7.2-pie.patch | 24 - > net-snmp/patches/net-snmp-5.7.2-systemd.patch | 1650 ----------------- > 8 files changed, 21 insertions(+), 2159 deletions(-) > delete mode 100644 net-snmp/patches/net-snmp-5.5-apsl-copying.patch > delete mode 100644 net-snmp/patches/net-snmp-5.5-dir-fix.patch > delete mode 100644 net-snmp/patches/net-snmp-5.5-perl-linking.patch > delete mode 100644 net-snmp/patches/net-snmp-5.6-multilib.patch > delete mode 100644 net-snmp/patches/net-snmp-5.6-test-debug.patch > delete mode 100644 net-snmp/patches/net-snmp-5.7.2-pie.patch > delete mode 100644 net-snmp/patches/net-snmp-5.7.2-systemd.patch >=20 > diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm > index 9e86e355d..cd32f28cc 100644 > --- a/net-snmp/net-snmp.nm > +++ b/net-snmp/net-snmp.nm > @@ -4,7 +4,7 @@ > ###########################################################################= #### >=20 > name =3D net-snmp > -version =3D 5.7.3 > +version =3D 5.9.1 > release =3D 1 >=20 > groups =3D Networking/Daemons > @@ -28,19 +28,15 @@ build > chrpath > elfutils-devel > lm-sensors-devel >=3D 3 > - openssl-devel > - perl(ExtUtils::Embed) > + openssl-devel < 3.0.0 We do not have any previous versions in the repository and ideally I would li= ke to drop all compat-* packages before we throw the distribution into the bu= ild services. Is there no patch from any other distribution? > procps > - python-setuptools > - python-devel > + python3-devel > + python3-setuptools > systemd-devel > - systemd-units > end >=20 > - PARALLELISMFLAGS =3D # No parallel build > - > prepare_cmds > - autoreconf -vfi > + #autoreconf -vfi > end >=20 > MIBS =3D host agentx smux \ > @@ -64,25 +60,17 @@ build > --enable-ucd-snmp-compatibility \ > --with-openssl \ > --with-pic \ > - --enable-embedded-perl \ > --enable-as-needed \ > - --with-perl-modules=3D"INSTALLDIRS=3Dvendor" \ > --enable-mfd-rewrites \ > --enable-local-smux \ > --with-temp-file-pattern=3D/var/run/net-snmp/snmp-tmp-XXXXXX \ > --with-transports=3D"DTLSUDP TLSTCP" \ > --with-security-modules=3Dtsm \ > - --with-systemd > - > - build_cmds > - # Remove rpath from compiled perl libs > - find perl/blib -type f -name "*.so" -print -exec chrpath --delete {} \; > - > - # Compile python module > - pushd python > - %{python} setup.py --basedir=3D".." build > - popd > - end > + --with-systemd \ > + --with-default-snmp-version=3D"3" \ > + --without-perl-modules \ > + --disable-embedded-perl \ > + --with-python-modules >=20 > install_cmds > # Remove stuff we don't want to distribute. > @@ -95,11 +83,6 @@ build > # Copy missing mib2c.conf files. > install -v -m 644 local/mib2c.*.conf %{BUILDROOT}%{datadir}/snmp >=20 > - # Install python module. > - pushd python > - %{python} setup.py --basedir=3D".." install -O1 --skip-build --root %{BUI= LDROOT} > - popd > - > # Make libs executable. > find %{BUILDROOT} -name "*.so" | xargs chmod -v 755 >=20 > @@ -113,6 +96,17 @@ build > # Prepare runtime directories. > mkdir -pv %{BUILDROOT}%{localstatedir}/{lib,run}/net-snmp >=20 > + # Remove scripts in /bin which requires the SNMP > + # perl bindings. > + rm -rvf %{BUILDROOT}%{bindir}/net-snmp-cert > + rm -rvf %{BUILDROOT}%{bindir}/tkmib > + rm -rvf %{BUILDROOT}%{bindir}/mib2c > + rm -rvf %{BUILDROOT}%{bindir}/snmp-bridge-mib > + > + # Remove checkbandwidth script > + # This uses a deprecated perl module (Mail::Sender) > + rm -rvf %{BUILDROOT}%{bindir}/checkbandwidth > + > # Remove more RPATHs. > find %{BUILDROOT}%{bindir} -type f -print \ > -exec chrpath --delete {} \; > diff --git a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch b/net-snmp/pa= tches/net-snmp-5.5-apsl-copying.patch > deleted file mode 100644 > index 5ae7ca30c..000000000 > --- a/net-snmp/patches/net-snmp-5.5-apsl-copying.patch > +++ /dev/null > @@ -1,354 +0,0 @@ > -Add APSL 2.0 license to the COPYING file. > - > -There is only one file covered by this license: > -net-snmp-5.5/agent/mibgroup/host/data_access/swrun_darwin.c > - > -This file is not used on Linux at all, it's only present in source > -tarball and net-snmp.src.rpm. > - > -In addition, it's licensed under APSL 1.1, but it allows to relicense > -the code to 'any subsequent version of this License published by Apple'. > -According to http://fedoraproject.org/wiki/Licensing, APSL ver. 2.0 is > -better for us. > - > -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. > -+ > -+---- Part 11: APPLE PUBLIC SOURCE LICENSE (APSL 2.0) ---- > -+ > -+Version 2.0 - August 6, 2003 > -+ > -+Please read this License carefully before downloading this software. By > -+downloading or using this software, you are agreeing to be bound by the t= erms > -+of this License. If you do not or cannot agree to the terms of this Lice= nse, > -+please do not download or use the software. > -+ > -+Apple Note: In January 2007, Apple changed its corporate name from "Apple > -+Computer, Inc." to "Apple Inc." This change has been reflected below and > -+copyright years updated, but no other changes have been made to the APSL = 2.0. > -+ > -+1. General; Definitions. This License applies to any program or other > -+work which Apple Inc. ("Apple") makes publicly available and which contai= ns a > -+notice placed by Apple identifying such program or work as "Original Code= " and > -+stating that it is subject to the terms of this Apple Public Source Licen= se > -+version 2.0 ("License"). As used in this License: > -+ > -+1.1 "Applicable Patent Rights" mean: (a) in the case where Apple is the > -+grantor of rights, (i) claims of patents that are now or hereafter acquir= ed, > -+owned by or assigned to Apple and (ii) that cover subject matter containe= d in > -+the Original Code, but only to the extent necessary to use, reproduce and= /or > -+distribute the Original Code without infringement; and (b) in the case wh= ere > -+You are the grantor of rights, (i) claims of patents that are now or here= after > -+acquired, owned by or assigned to You and (ii) that cover subject matter = in > -+Your Modifications, taken alone or in combination with Original Code. > -+ > -+1.2 "Contributor" means any person or entity that creates or contributes = to > -+the creation of Modifications. > -+ > -+1.3 "Covered Code" means the Original Code, Modifications, the combination > -+of Original Code and any Modifications, and/or any respective portions th= ereof. > -+ > -+1.4 "Externally Deploy" means: (a) to sublicense, distribute or otherwise > -+make Covered Code available, directly or indirectly, to anyone other than= You; > -+and/or (b) to use Covered Code, alone or as part of a Larger Work, in any= way > -+to provide a service, including but not limited to delivery of content, t= hrough > -+electronic communication with a client other than You. > -+ > -+1.5 "Larger Work" means a work which combines Covered Code or portions > -+thereof with code not governed by the terms of this License. > -+ > -+1.6 "Modifications" mean any addition to, deletion from, and/or change to, > -+the substance and/or structure of the Original Code, any previous > -+Modifications, the combination of Original Code and any previous Modifica= tions, > -+and/or any respective portions thereof. When code is released as a serie= s of > -+files, a Modification is: (a) any addition to or deletion from the conte= nts of > -+a file containing Covered Code; and/or (b) any new file or other represen= tation > -+of computer program statements that contains any part of Covered Code.=20 > -+ > -+1.7 "Original Code" means (a) the Source Code of a program or other work = as > -+originally made available by Apple under this License, including the Sour= ce > -+Code of any updates or upgrades to such programs or works made available = by > -+Apple under this License, and that has been expressly identified by Apple= as > -+such in the header file(s) of such work; and (b) the object code compiled= from > -+such Source Code and originally made available by Apple under this License > -+ > -+1.8 "Source Code" means the human readable form of a program or other work > -+that is suitable for making modifications to it, including all modules it > -+contains, plus any associated interface definition files, scripts used to > -+control compilation and installation of an executable (object code). > -+ > -+1.9 "You" or "Your" means an individual or a legal entity exercising righ= ts > -+under this License. For legal entities, "You" or "Your" includes any ent= ity > -+which controls, is controlled by, or is under common control with, You, w= here > -+"control" means (a) the power, direct or indirect, to cause the direction= or > -+management of such entity, whether by contract or otherwise, or (b) owner= ship > -+of fifty percent (50%) or more of the outstanding shares or beneficial > -+ownership of such entity. > -+ > -+2. Permitted Uses; Conditions & Restrictions. Subject to the terms and > -+conditions of this License, Apple hereby grants You, effective on the dat= e You > -+accept this License and download the Original Code, a world-wide, royalty= -free, > -+non-exclusive license, to the extent of Apple's Applicable Patent Rights = and > -+copyrights covering the Original Code, to do the following: > -+ > -+2.1 Unmodified Code. You may use, reproduce, display, perform, internally > -+distribute within Your organization, and Externally Deploy verbatim, unmo= dified > -+copies of the Original Code, for commercial or non-commercial purposes, > -+provided that in each instance: > -+ > -+(a) You must retain and reproduce in all copies of Original Code the > -+copyright and other proprietary notices and disclaimers of Apple as they = appear > -+in the Original Code, and keep intact all notices in the Original Code th= at > -+refer to this License; and > -+ > -+(b) You must include a copy of this License with every copy of Source Code > -+of Covered Code and documentation You distribute or Externally Deploy, an= d You > -+may not offer or impose any terms on such Source Code that alter or restr= ict > -+this License or the recipients' rights hereunder, except as permitted und= er > -+Section 6. > -+ > -+2.2 Modified Code. You may modify Covered Code and use, reproduce, > -+display, perform, internally distribute within Your organization, and > -+Externally Deploy Your Modifications and Covered Code, for commercial or > -+non-commercial purposes, provided that in each instance You also meet all= of > -+these conditions: > -+ > -+(a) You must satisfy all the conditions of Section 2.1 with respect to the > -+Source Code of the Covered Code;=20 > -+ > -+(b) You must duplicate, to the extent it does not already exist, the noti= ce > -+in Exhibit A in each file of the Source Code of all Your Modifications, a= nd > -+cause the modified files to carry prominent notices stating that You chan= ged > -+the files and the date of any change; and > -+ > -+(c) If You Externally Deploy Your Modifications, You must make Source Code > -+of all Your Externally Deployed Modifications either available to those t= o whom > -+You have Externally Deployed Your Modifications, or publicly available. = Source > -+Code of Your Externally Deployed Modifications must be released under the= terms > -+set forth in this License, including the license grants set forth in Sect= ion 3 > -+below, for as long as you Externally Deploy the Covered Code or twelve (1= 2) > -+months from the date of initial External Deployment, whichever is longer.= You > -+should preferably distribute the Source Code of Your Externally Deployed > -+Modifications electronically (e.g. download from a web site). > -+ > -+2.3 Distribution of Executable Versions. In addition, if You Externally > -+Deploy Covered Code (Original Code and/or Modifications) in object code, > -+executable form only, You must include a prominent notice, in the code it= self > -+as well as in related documentation, stating that Source Code of the Cove= red > -+Code is available under the terms of this License with information on how= and > -+where to obtain such Source Code. =20 > -+ > -+2.4 Third Party Rights. You expressly acknowledge and agree that although > -+Apple and each Contributor grants the licenses to their respective portio= ns of > -+the Covered Code set forth herein, no assurances are provided by Apple or= any > -+Contributor that the Covered Code does not infringe the patent or other > -+intellectual property rights of any other entity. Apple and each Contribu= tor > -+disclaim any liability to You for claims brought by any other entity base= d on > -+infringement of intellectual property rights or otherwise. As a condition= to > -+exercising the rights and licenses granted hereunder, You hereby assume s= ole > -+responsibility to secure any other intellectual property rights needed, i= f any. > -+For example, if a third party patent license is required to allow You to > -+distribute the Covered Code, it is Your responsibility to acquire that li= cense > -+before distributing the Covered Code. > -+ > -+3. Your Grants. In consideration of, and as a condition to, the licenses > -+granted to You under this License, You hereby grant to any person or enti= ty > -+receiving or distributing Covered Code under this License a non-exclusive, > -+royalty-free, perpetual, irrevocable license, under Your Applicable Patent > -+Rights and other intellectual property rights (other than patent) owned or > -+controlled by You, to use, reproduce, display, perform, modify, sublicens= e, > -+distribute and Externally Deploy Your Modifications of the same scope and > -+extent as Apple's licenses under Sections 2.1 and 2.2 above. =20 > -+ > -+4. Larger Works. You may create a Larger Work by combining Covered Code > -+with other code not governed by the terms of this License and distribute = the > -+Larger Work as a single product. In each such instance, You must make su= re the > -+requirements of this License are fulfilled for the Covered Code or any po= rtion > -+thereof.=20 > -+ > -+5. Limitations on Patent License. Except as expressly stated in Section > -+2, no other patent rights, express or implied, are granted by Apple herei= n. > -+Modifications and/or Larger Works may require additional patent licenses = from > -+Apple which Apple may grant in its sole discretion. =20 > -+ > -+6. Additional Terms. You may choose to offer, and to charge a fee for, > -+warranty, support, indemnity or liability obligations and/or other rights > -+consistent with the scope of the license granted herein ("Additional Term= s") to > -+one or more recipients of Covered Code. However, You may do so only on Yo= ur own > -+behalf and as Your sole responsibility, and not on behalf of Apple or any > -+Contributor. You must obtain the recipient's agreement that any such Addi= tional > -+Terms are offered by You alone, and You hereby agree to indemnify, defend= and > -+hold Apple and every Contributor harmless for any liability incurred by or > -+claims asserted against Apple or such Contributor by reason of any such > -+Additional Terms.=20 > -+ > -+7. Versions of the License. Apple may publish revised and/or new versions > -+of this License from time to time. Each version will be given a distingu= ishing > -+version number. Once Original Code has been published under a particular > -+version of this License, You may continue to use it under the terms of th= at > -+version. You may also choose to use such Original Code under the terms of= any > -+subsequent version of this License published by Apple. No one other than= Apple > -+has the right to modify the terms applicable to Covered Code created unde= r this > -+License. =20 > -+ > -+8. NO WARRANTY OR SUPPORT. The Covered Code may contain in whole or in > -+part pre-release, untested, or not fully tested works. The Covered Code = may > -+contain errors that could cause failures or loss of data, and may be inco= mplete > -+or contain inaccuracies. You expressly acknowledge and agree that use of= the > -+Covered Code, or any portion thereof, is at Your sole and entire risk. T= HE > -+COVERED CODE IS PROVIDED "AS IS" AND WITHOUT WARRANTY, UPGRADES OR SUPPOR= T OF > -+ANY KIND AND APPLE AND APPLE'S LICENSOR(S) (COLLECTIVELY REFERRED TO AS "= APPLE" > -+FOR THE PURPOSES OF SECTIONS 8 AND 9) AND ALL CONTRIBUTORS EXPRESSLY DISC= LAIM > -+ALL WARRANTIES AND/OR CONDITIONS, EXPRESS OR IMPLIED, INCLUDING, BUT NOT > -+LIMITED TO, THE IMPLIED WARRANTIES AND/OR CONDITIONS OF MERCHANTABILITY, = OF > -+SATISFACTORY QUALITY, OF FITNESS FOR A PARTICULAR PURPOSE, OF ACCURACY, OF > -+QUIET ENJOYMENT, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. APPLE AND EA= CH > -+CONTRIBUTOR DOES NOT WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF = THE > -+COVERED CODE, THAT THE FUNCTIONS CONTAINED IN THE COVERED CODE WILL MEET = YOUR > -+REQUIREMENTS, THAT THE OPERATION OF THE COVERED CODE WILL BE UNINTERRUPTE= D OR > -+ERROR-FREE, OR THAT DEFECTS IN THE COVERED CODE WILL BE CORRECTED. NO OR= AL OR > -+WRITTEN INFORMATION OR ADVICE GIVEN BY APPLE, AN APPLE AUTHORIZED > -+REPRESENTATIVE OR ANY CONTRIBUTOR SHALL CREATE A WARRANTY. You acknowled= ge > -+that the Covered Code is not intended for use in the operation of nuclear > -+facilities, aircraft navigation, communication systems, or air traffic co= ntrol > -+machines in which case the failure of the Covered Code could lead to deat= h, > -+personal injury, or severe physical or environmental damage. > -+ > -+9. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO > -+EVENT SHALL APPLE OR ANY CONTRIBUTOR BE LIABLE FOR ANY INCIDENTAL, SPECIA= L, > -+INDIRECT OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO THIS LICE= NSE OR > -+YOUR USE OR INABILITY TO USE THE COVERED CODE, OR ANY PORTION THEREOF, WH= ETHER > -+UNDER A THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), PRODUC= TS > -+LIABILITY OR OTHERWISE, EVEN IF APPLE OR SUCH CONTRIBUTOR HAS BEEN ADVISE= D OF > -+THE POSSIBILITY OF SUCH DAMAGES AND NOTWITHSTANDING THE FAILURE OF ESSENT= IAL > -+PURPOSE OF ANY REMEDY. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF > -+LIABILITY OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY = NOT > -+APPLY TO YOU. In no event shall Apple's total liability to You for all da= mages > -+(other than as may be required by applicable law) under this License exce= ed the > -+amount of fifty dollars ($50.00). > -+ > -+10. Trademarks. This License does not grant any rights to use the > -+trademarks or trade names "Apple", "Mac", "Mac OS", "QuickTime", "QuickT= ime > -+Streaming Server" or any other trademarks, service marks, logos or trade = names > -+belonging to Apple (collectively "Apple Marks") or to any trademark, serv= ice > -+mark, logo or trade name belonging to any Contributor. You agree not to = use > -+any Apple Marks in or as part of the name of products derived from the Or= iginal > -+Code or to endorse or promote products derived from the Original Code oth= er > -+than as expressly permitted by and in strict compliance at all times with > -+Apple's third party trademark usage guidelines which are posted at > -+http://www.apple.com/legal/guidelinesfor3rdparties.html. =20 > -+ > -+11. Ownership. Subject to the licenses granted under this License, each > -+Contributor retains all rights, title and interest in and to any Modifica= tions > -+made by such Contributor. Apple retains all rights, title and interest i= n and > -+to the Original Code and any Modifications made by or on behalf of Apple > -+("Apple Modifications"), and such Apple Modifications will not be automat= ically > -+subject to this License. Apple may, at its sole discretion, choose to li= cense > -+such Apple Modifications under this License, or on different terms from t= hose > -+contained in this License or may choose not to license them at all. =20 > -+ > -+12. Termination. =20 > -+ > -+12.1 Termination. This License and the rights granted hereunder will > -+terminate: > -+ > -+(a) automatically without notice from Apple if You fail to comply with any > -+term(s) of this License and fail to cure such breach within 30 days of be= coming > -+aware of such breach; (b) immediately in the event of the circumstances > -+described in Section 13.5(b); or (c) automatically without notice from Ap= ple > -+if You, at any time during the term of this License, commence an action f= or > -+patent infringement against Apple; provided that Apple did not first comm= ence > -+an action for patent infringement against You in that instance. > -+ > -+12.2 Effect of Termination. Upon termination, You agree to immediately s= top > -+any further use, reproduction, modification, sublicensing and distributio= n of > -+the Covered Code. All sublicenses to the Covered Code which have been pr= operly > -+granted prior to termination shall survive any termination of this Licens= e. > -+Provisions which, by their nature, should remain in effect beyond the > -+termination of this License shall survive, including but not limited to > -+Sections 3, 5, 8, 9, 10, 11, 12.2 and 13. No party will be liable to any= other > -+for compensation, indemnity or damages of any sort solely as a result of > -+terminating this License in accordance with its terms, and termination of= this > -+License will be without prejudice to any other right or remedy of any par= ty. > -+ > -+13. Miscellaneous. > -+ > -+13.1 Government End Users. The Covered Code is a "commercial item" as > -+defined in FAR 2.101. Government software and technical data rights in t= he > -+Covered Code include only those rights customarily provided to the public= as > -+defined in this License. This customary commercial license in technical d= ata > -+and software is provided in accordance with FAR 12.211 (Technical Data) a= nd > -+12.212 (Computer Software) and, for Department of Defense purchases, DFAR > -+252.227-7015 (Technical Data -- Commercial Items) and 227.7202-3 (Rights = in > -+Commercial Computer Software or Computer Software Documentation). Accord= ingly, > -+all U.S. Government End Users acquire Covered Code with only those rights= set > -+forth herein. > -+ > -+13.2 Relationship of Parties. This License will not be construed as > -+creating an agency, partnership, joint venture or any other form of legal > -+association between or among You, Apple or any Contributor, and You will = not > -+represent to the contrary, whether expressly, by implication, appearance = or > -+otherwise. > -+ > -+13.3 Independent Development. Nothing in this License will impair Apple= 's > -+right to acquire, license, develop, have others develop for it, market an= d/or > -+distribute technology or products that perform the same or similar functi= ons > -+as, or otherwise compete with, Modifications, Larger Works, technology or > -+products that You may develop, produce, market or distribute. > -+ > -+13.4 Waiver; Construction. Failure by Apple or any Contributor to enforce > -+any provision of this License will not be deemed a waiver of future enfor= cement > -+of that or any other provision. Any law or regulation which provides tha= t the > -+language of a contract shall be construed against the drafter will not ap= ply to > -+this License. > -+ > -+13.5 Severability. (a) If for any reason a court of competent jurisdicti= on > -+finds any provision of this License, or portion thereof, to be unenforcea= ble, > -+that provision of the License will be enforced to the maximum extent > -+permissible so as to effect the economic benefits and intent of the parti= es, > -+and the remainder of this License will continue in full force and effect.= (b) > -+Notwithstanding the foregoing, if applicable law prohibits or restricts Y= ou > -+from fully and/or specifically complying with Sections 2 and/or 3 or prev= ents > -+the enforceability of either of those Sections, this License will immedia= tely > -+terminate and You must immediately discontinue any use of the Covered Cod= e and > -+destroy all copies of it that are in your possession or control. > -+ > -+13.6 Dispute Resolution. Any litigation or other dispute resolution betw= een > -+You and Apple relating to this License shall take place in the Northern > -+District of California, and You and Apple hereby consent to the personal > -+jurisdiction of, and venue in, the state and federal courts within that > -+District with respect to this License. The application of the United Nati= ons > -+Convention on Contracts for the International Sale of Goods is expressly > -+excluded. > -+ > -+13.7 Entire Agreement; Governing Law. This License constitutes the entire > -+agreement between the parties with respect to the subject matter hereof. = This > -+License shall be governed by the laws of the United States and the State = of > -+California, except that body of California law concerning conflicts of la= w.=20 > -+ > -+Where You are located in the province of Quebec, Canada, the following cl= ause > -+applies: The parties hereby confirm that they have requested that this L= icense > -+and all related documents be drafted in English. Les parties ont exige q= ue le > -+present contrat et tous les documents connexes soient rediges en anglais. > -+ > -+EXHIBIT A.=20 > -+ > -+"Portions Copyright (c) 1999-2007 Apple Inc. All Rights Reserved. > -+ > -+This file contains Original Code and/or Modifications of Original Code as > -+defined in and that are subject to the Apple Public Source License Versio= n 2.0 > -+(the 'License'). You may not use this file except in compliance with the > -+License. Please obtain a copy of the License at > -+http://www.opensource.apple.com/apsl/ and read it before using this file. > -+ > -+The Original Code and all software distributed under the License are > -+distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER EXP= RESS > -+OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, INCLUDING WIT= HOUT > -+LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR > -+PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. Please see the License for= the > -+specific language governing rights and limitations under the License."=20 > diff --git a/net-snmp/patches/net-snmp-5.5-dir-fix.patch b/net-snmp/patches= /net-snmp-5.5-dir-fix.patch > deleted file mode 100644 > index b726c4713..000000000 > --- a/net-snmp/patches/net-snmp-5.5-dir-fix.patch > +++ /dev/null > @@ -1,14 +0,0 @@ > -Let net-snmp-create-v3-user save settings into /etc/ instead of /usr/ > - > -diff -up net-snmp-5.5/net-snmp-create-v3-user.in.orig net-snmp-5.5/net-snm= p-create-v3-user.in > ---- net-snmp-5.5/net-snmp-create-v3-user.in.orig 2008-07-22 16:33:25.00000= 0000 +0200 > -+++ net-snmp-5.5/net-snmp-create-v3-user.in 2009-09-29 16:30:36.000000000 = +0200 > -@@ -158,7 +158,7 @@ if test ! -d $outfile ; then > - touch $outfile > - fi > - echo $line >> $outfile > --outfile=3D"@datadir@/snmp/snmpd.conf" > -+outfile=3D"/etc/snmp/snmpd.conf" > - line=3D"$token $user" > - echo "adding the following line to $outfile:" > - echo " " $line > diff --git a/net-snmp/patches/net-snmp-5.5-perl-linking.patch b/net-snmp/pa= tches/net-snmp-5.5-perl-linking.patch > deleted file mode 100644 > index ceb63630a..000000000 > --- a/net-snmp/patches/net-snmp-5.5-perl-linking.patch > +++ /dev/null > @@ -1,16 +0,0 @@ > -554747 - net-snmp-config should not contain perl options > - > -Remove rpath from net-snmp-config --agent-libs output. > - > -diff -up net-snmp-5.7/net-snmp-config.in.perl-linking net-snmp-5.7/net-snm= p-config.in > ---- net-snmp-5.7/net-snmp-config.in.perl-linking 2011-07-02 00:35:46.00000= 0000 +0200 > -+++ net-snmp-5.7/net-snmp-config.in 2011-07-07 13:30:01.635798817 +0200 > -@@ -50,7 +50,7 @@ NSC_LDFLAGS=3D"@LDFLAGS@" > -=20 > - NSC_LIBS=3D"@LIBS@" > - NSC_LNETSNMPLIBS=3D"@LNETSNMPLIBS@" > --NSC_LAGENTLIBS=3D"@LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@" > -+NSC_LAGENTLIBS=3D"@LAGENTLIBS@" > - NSC_LMIBLIBS=3D"@LMIBLIBS@" > -=20 > - NSC_INCLUDEDIR=3D${includedir} > diff --git a/net-snmp/patches/net-snmp-5.6-multilib.patch b/net-snmp/patche= s/net-snmp-5.6-multilib.patch > deleted file mode 100644 > index 9c12385a1..000000000 > --- a/net-snmp/patches/net-snmp-5.6-multilib.patch > +++ /dev/null > @@ -1,45 +0,0 @@ > -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.903284= 207 +0100 > -@@ -295,7 +295,7 @@ for one particular machine. > - .PP > - The default list of directories to search is \fC SYSCONFDIR/snmp\fP, > - followed by \fC DATADIR/snmp\fP, > --followed by \fC LIBDIR/snmp\fP, > -+followed by \fC /usr/lib(64)/snmp\fP, > - followed by \fC $HOME/.snmp\fP. > - This list can be changed by setting the environmental variable > - .I SNMPCONFPATH > -@@ -365,7 +365,7 @@ function that it should abort the operat > - SNMPCONFPATH > - A colon separated list of directories to search for configuration > - files in. > --Default: SYSCONFDIR/snmp:DATADIR/snmp:LIBDIR/snmp:$HOME/.snmp > -+Default: SYSCONFDIR/snmp:DATADIR/snmp:/usr/lib(64)/snmp:$HOME/.snmp > - .SH "SEE ALSO" > - netsnmp_mib_api(3), snmp_api(3) > - .\" Local Variables: > -diff -up net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB net-snmp-5.7.3/man/sn= mp_config.5.def > ---- net-snmp-5.7.3/man/snmp_config.5.def.oSBcEB 2015-02-17 13:32:04.251309= 092 +0100 > -+++ net-snmp-5.7.3/man/snmp_config.5.def 2015-02-17 13:33:09.217262438 +01= 00 > -@@ -10,7 +10,7 @@ First off, there are numerous places tha > - found and read from. By default, the applications look for > - configuration files in the following 4 directories, in order: > - SYSCONFDIR/snmp, > --DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp. In each of these > -+DATADIR/snmp, /usr/lib(64)/snmp, and $HOME/.snmp. In each of these > - 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/snm= pd.conf.5.def > ---- net-snmp-5.7.3/man/snmpd.conf.5.def.oSBcEB 2014-12-08 21:23:22.0000000= 00 +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 > - .RS > - .IP "Note:" > - If the specified PATH is not a fully qualified filename, it will > --be interpreted relative to LIBDIR/snmp/dlmod, and \fC.so\fR > -+be interpreted relative to /usr/lib(64)/snmp/dlmod, and \fC.so\fR > - will be appended to the filename. > - .RE > - .PP > diff --git a/net-snmp/patches/net-snmp-5.6-test-debug.patch b/net-snmp/patc= hes/net-snmp-5.6-test-debug.patch > deleted file mode 100644 > index 4ae97fbee..000000000 > --- a/net-snmp/patches/net-snmp-5.6-test-debug.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -Don't check tests which depend on DNS - it's disabled in Koji > - > -diff -up net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple.debug= net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple > ---- net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple.debug 2012= -10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/testing/fulltests/default/T070com2sec_simple 2012-10-18= 10:16:39.276416510 +0200 > -@@ -134,6 +134,10 @@ SAVECHECKAGENT '<"c406a", 255.255.255.25 > - SAVECHECKAGENT 'line 30: Error:' # msg from h_strerror so it varies > - SAVECHECKAGENT 'line 31: Error:' # msg from h_strerror so it varies > -=20 > -+FINISHED > -+ > -+# don't test the later, it depends on DNS, which is not available in Koji > -+ > - CHECKAGENT '<"c408a"' > - if [ "$snmp_last_test_result" -eq 0 ] ; then > - CHECKAGENT 'line 32: Error:' > -diff -up net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple.debu= g net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple > ---- net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple.debug 201= 2-10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/testing/fulltests/default/T071com2sec6_simple 2012-10-1= 8 10:16:39.276416510 +0200 > -@@ -132,6 +132,9 @@ SAVECHECKAGENT '<"c606a", ffff:ffff:ffff > - SAVECHECKAGENT 'line 27: Error:' > - SAVECHECKAGENT 'line 28: Error:' > -=20 > -+FINISHED > -+ > -+# don't test the later, it depends on DNS, which is not available in Koji > - # 608 > - CHECKAGENT '<"c608a"' > - if [ "$snmp_last_test_result" -eq 0 ] ; then > diff --git a/net-snmp/patches/net-snmp-5.7.2-pie.patch b/net-snmp/patches/n= et-snmp-5.7.2-pie.patch > deleted file mode 100644 > index ee02001b3..000000000 > --- a/net-snmp/patches/net-snmp-5.7.2-pie.patch > +++ /dev/null > @@ -1,24 +0,0 @@ > -diff -up net-snmp-5.7.2/agent/Makefile.in.pie net-snmp-5.7.2/agent/Makefil= e.in > ---- net-snmp-5.7.2/agent/Makefile.in.pie 2012-10-10 00:28:58.000000000 +02= 00 > -+++ net-snmp-5.7.2/agent/Makefile.in 2012-10-18 09:45:13.298613099 +0200 > -@@ -294,7 +294,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c > - $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $?=20 > -=20 > - snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLI= B) $(LIBTARG)=20 > -- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} > -+ $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} > -=20 > - libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USE= LIBS) > - $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_N= O_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@ > -diff -up net-snmp-5.7.2/apps/Makefile.in.pie net-snmp-5.7.2/apps/Makefile.= in > ---- net-snmp-5.7.2/apps/Makefile.in.pie 2012-10-10 00:28:58.000000000 +0200 > -+++ net-snmp-5.7.2/apps/Makefile.in 2012-10-18 09:44:27.827774580 +0200 > -@@ -170,7 +170,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX > - $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS} > -=20 > - snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) > -- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRA= PLIBS} > -+ $(LINK) ${CFLAGS} -o $@ -pie $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} = ${TRAPLIBS} > -=20 > - snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) > - $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS} > diff --git a/net-snmp/patches/net-snmp-5.7.2-systemd.patch b/net-snmp/patch= es/net-snmp-5.7.2-systemd.patch > deleted file mode 100644 > index 4c89d608e..000000000 > --- a/net-snmp/patches/net-snmp-5.7.2-systemd.patch > +++ /dev/null > @@ -1,1650 +0,0 @@ > -718183 - Provide native systemd unit file > - > -Gathered from following upstream git commits and backported to 5.7. > - > -commit 19499c3c90bf9d7b2b9e5d08baa26cc6bba28a11 > -Author: Jan Safranek > -Date: Mon Aug 8 15:48:54 2011 +0200 > - > - CHANGES: snmpd: integrated with systemd, see README.systemd for detail= s. > - =20 > - It brings sd-daemon.c and .h directly downloaded from systemd. I've ma= de very > - few changes to it to match our NETSNMP_NO_SYSTEMD and include paths. > - > -commit fef6cddfdb94da1a6b1fb768af62918b80f11fd3 > -Author: Jan Safranek > -Date: Mon Aug 8 15:48:54 2011 +0200 > - > - CHANGES: snmptrapd: integrate systemd notification support. > - > -commit 0641e43c694c485cbbffef0556efc4641bd3ff50 > -Author: Jan Safranek > -Date: Mon Aug 8 15:48:54 2011 +0200 > - > - Add sd_find_inet_socket() and sd_find_inet_unisx() helpers into > - system-specific code. This will help us to find various sockets > - created by systemd much easier. > - > -commit 76530a89f1c8bbd0b63acce63e10d5d4812a1a16 > -Author: Jan Safranek > -Date: Mon Aug 8 15:48:54 2011 +0200 > - > - Check sockets created by systemd when opening new server sockets. > - =20 > - systemd can pass sockets to our daemons during startup using LISTEN_FDS > - environment variable. So check this variable when opening new listening > - socket - maybe system has already opened the socket for us. > - > -commit bf108d7f1354f6276fc43c129963f2c49b9fc242 > -Author: Jan Safranek > -Date: Mon Aug 8 15:48:54 2011 +0200 > - > - Added sample systemd service files. > - > -commit 884ec488a6596380ba283d707827dd926a52e0b2 > -Author: Jan Safranek > -Date: Mon Aug 8 15:48:55 2011 +0200 > - > - Run autoheader+autoconf. > - > -commit 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0 > -Author: Jan Safranek > -Date: Tue Aug 9 10:53:43 2011 +0200 > - > - Update systemd documentation and samples. > - =20 > - - add socket unit for snmpd to paralelize boot > - - update WantedBy in socket units as recommended by http://0pointer.de= /blog/projects/socket-activation.html > - - rephrase README.systemd > - > -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 > -@@ -164,6 +164,10 @@ typedef long fd_mask; > -=20 > - #endif > -=20 > -+#ifndef NETSNMP_NO_SYSTEMD > -+#include > -+#endif > -+ > - netsnmp_feature_want(logging_file) > - netsnmp_feature_want(logging_stdio) > - netsnmp_feature_want(logging_syslog) > -@@ -443,18 +447,26 @@ main(int argc, char *argv[]) > - int agent_mode =3D -1; > - char *pid_file =3D NULL; > - char option_compatability[] =3D "-Le"; > -+ int prepared_sockets =3D 0; > - #if HAVE_GETPID > - int fd; > - FILE *PID; > - #endif > -=20 > - #ifndef WIN32 > -+#ifndef NETSNMP_NO_SYSYSTEMD > -+ /* check if systemd has sockets for us and don't close them */ > -+ prepared_sockets =3D netsnmp_sd_listen_fds(0); > -+#endif /* NETSNMP_NO_SYSYSTEMD */ > -+ > - /* > - * close all non-standard file descriptors we may have > - * inherited from the shell. > - */ > -- for (i =3D getdtablesize() - 1; i > 2; --i) { > -- (void) close(i); > -+ if (!prepared_sockets) { > -+ for (i =3D getdtablesize() - 1; i > 2; --i) { > -+ (void) close(i); > -+ } > - } > - #endif /* #WIN32 */ > - =20 > -@@ -1107,6 +1119,19 @@ main(int argc, char *argv[]) > - netsnmp_addrcache_initialise(); > -=20 > - /* > -+ * Let systemd know we're up. > -+ */ > -+#ifndef NETSNMP_NO_SYSTEMD > -+ netsnmp_sd_notify(1, "READY=3D1\n"); > -+ if (prepared_sockets) > -+ /* > -+ * Clear the environment variable, we already processed all the s= ockets > -+ * by now. > -+ */ > -+ netsnmp_sd_listen_fds(1); > -+#endif > -+ > -+ /* > - * Forever monitor the dest_port for incoming PDUs. =20 > - */ > - DEBUGMSGTL(("snmpd/main", "We're up. Starting to process data.\n")); > -diff -up net-snmp-5.7.3/apps/snmptrapd.c.MPGqYh net-snmp-5.7.3/apps/snmptr= apd.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 > -@@ -125,6 +125,10 @@ SOFTWARE. > -=20 > - #include > -=20 > -+#ifndef NETSNMP_NO_SYSTEMD > -+#include > -+#endif > -+ > - #ifndef BSD4_3 > - #define BSD4_2 > - #endif > -@@ -657,15 +661,22 @@ main(int argc, char *argv[]) > - int agentx_subagent =3D 1; > - #endif > - netsnmp_trapd_handler *traph; > -+ int prepared_sockets =3D 0; > -=20 > -=20 > - #ifndef WIN32 > -+#ifndef NETSNMP_NO_SYSTEMD > -+ /* check if systemd has sockets for us and don't close them */ > -+ prepared_sockets =3D netsnmp_sd_listen_fds(0); > -+#endif > - /* > - * close all non-standard file descriptors we may have > - * inherited from the shell. > - */ > -- for (i =3D getdtablesize() - 1; i > 2; --i) { > -- (void) close(i); > -+ if (!prepared_sockets) { > -+ for (i =3D getdtablesize() - 1; i > 2; --i) { > -+ (void) close(i); > -+ } > - } > - #endif /* #WIN32 */ > - =20 > -@@ -1318,6 +1329,19 @@ main(int argc, char *argv[]) > - #endif > - #endif > -=20 > -+ /* > -+ * Let systemd know we're up. > -+ */ > -+#ifndef NETSNMP_NO_SYSTEMD > -+ netsnmp_sd_notify(1, "READY=3D1\n"); > -+ if (prepared_sockets) > -+ /* > -+ * Clear the environment variable, we already processed all the s= ockets > -+ * by now. > -+ */ > -+ netsnmp_sd_listen_fds(1); > -+#endif > -+ > - #ifdef WIN32SERVICE > - trapd_status =3D SNMPTRAPD_RUNNING; > - #endif > -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.7372= 21850 +0100 > -@@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" =3D "xmingw32" > - other_ftobjs_list=3D"$other_ftobjs_list winpipe.ft" > - fi > -=20 > -+# Linux systemd > -+if test "x$with_systemd" =3D=3D "xyes"; then > -+ other_src_list=3D"$other_src_list sd-daemon.c" > -+ other_objs_list=3D"$other_objs_list sd-daemon.o" > -+ other_lobjs_list=3D"$other_lobjs_list sd-daemon.lo" > -+ other_ftobjs_list=3D"$other_ftobjs_list sd-daemon.ft" > -+fi > -+ > - AC_SUBST(other_src_list) > - AC_SUBST(other_objs_list) > - AC_SUBST(other_lobjs_list) > -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-0= 8 21:23:22.000000000 +0100 > -+++ net-snmp-5.7.3/configure.d/config_project_with_enable 2015-02-17 13:34= :05.737221850 +0100 > -@@ -690,6 +690,15 @@ if test "x$with_dummy_values" !=3D "xyes"; > - data for]) > - fi > -=20 > -+NETSNMP_ARG_WITH(systemd, > -+[ --with-systemd Provide systemd support. See README.sys= temd > -+ for details.]) > -+# Define unless specifically suppressed (i.e., option defaults to false). > -+if test "x$with_systemd" !=3D "xyes"; then > -+ AC_DEFINE(NETSNMP_NO_SYSTEMD, 1, > -+ [If you don't want to integrate with systemd.]) > -+fi > -+ > - NETSNMP_ARG_ENABLE(set-support, > - [ --disable-set-support Do not allow SNMP set requests.]) > - if test "x$enable_set_support" =3D "xno"; then > -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 > - enable_kmem_usage > - with_dummy_values > - enable_dummy_values > -+with_systemd > -+enable_systemd > - enable_set_support > - with_set_support > - with_sys_contact > -@@ -1867,6 +1869,8 @@ Configuring the agent: > - This is technically not compliant with = the > - SNMP specifications, but was how the ag= ent > - operated for versions < 4.0. > -+ --with-systemd Provide systemd support. See README.syst= emd > -+ for details. > - --with-sys-contact=3D"who(a)where" Default system contact. > - (Default: LOGIN(a)DOMAINNAME) > - --with-sys-location=3D"location" Default system location. > -@@ -4398,6 +4402,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE > -=20 > - fi > -=20 > -+ > -+# Check whether --with-systemd was given. > -+if test "${with_systemd+set}" =3D set; then : > -+ withval=3D$with_systemd; > -+fi > -+ > -+ # Check whether --enable-systemd was given. > -+if test "${enable_systemd+set}" =3D set; then : > -+ enableval=3D$enable_systemd; as_fn_error $? "Invalid option. Use --with= -systemd/--without-systemd instead" "$LINENO" 5 > -+fi > -+ > -+# Define unless specifically suppressed (i.e., option defaults to false). > -+if test "x$with_systemd" !=3D "xyes"; then > -+ > -+$as_echo "#define NETSNMP_NO_SYSTEMD 1" >>confdefs.h > -+ > -+fi > -+ > - # Check whether --enable-set-support was given. > - if test "${enable_set_support+set}" =3D set; then : > - enableval=3D$enable_set_support; > -@@ -18639,6 +18661,14 @@ if test "x$PARTIALTARGETOS" =3D "xmingw32" > - other_ftobjs_list=3D"$other_ftobjs_list winpipe.ft" > - fi > -=20 > -+# Linux systemd > -+if test "x$with_systemd" =3D=3D "xyes"; then > -+ other_src_list=3D"$other_src_list sd-daemon.c" > -+ other_objs_list=3D"$other_objs_list sd-daemon.o" > -+ other_lobjs_list=3D"$other_lobjs_list sd-daemon.lo" > -+ other_ftobjs_list=3D"$other_ftobjs_list sd-daemon.ft" > -+fi > -+ > -=20 > -=20 > -=20 > -diff -up net-snmp-5.7.3/dist/snmpd.service.MPGqYh net-snmp-5.7.3/dist/snmp= d.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 > -@@ -0,0 +1,18 @@ > -+# > -+# SNMP agent service file for systemd > -+# > -+# > -+# The service should be enabled, i.e. snmpd should start during machine b= oot. > -+# Socket activation shall not be used. See README.systemd for details. > -+ > -+[Unit] > -+Description=3DSimple Network Management Protocol (SNMP) daemon. > -+After=3Dsyslog.target network.target > -+ > -+[Service] > -+# Type=3Dnotify is also supported. It should be set when snmpd.socket is = not used. > -+Type=3Dsimple > -+ExecStart=3D/usr/sbin/snmpd -f > -+ > -+[Install] > -+WantedBy=3Dmulti-user.target > -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 > -@@ -0,0 +1,17 @@ > -+[Unit] > -+Description=3DSocket listening for SNMP and AgentX messages > -+ > -+[Socket] > -+ListenDatagram=3D0.0.0.0:161 > -+# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. > -+# It must match listening addresses/ports defined in snmpd.service > -+# or snmpd.conf. > -+# ListenStream=3D0.0.0.0:161 > -+# ListenDatagram=3D[::]:161 > -+# ListenStream=3D[::]:161 > -+# > -+# Uncomment AgentX socket if snmpd.conf enables AgentX protocol. > -+# ListenStream=3D/var/agentx/master > -+ > -+[Install] > -+WantedBy=3Dsockets.target > -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.74522= 1844 +0100 > -+++ net-snmp-5.7.3/dist/snmptrapd.service 2015-02-17 13:34:05.745221844 +0= 100 > -@@ -0,0 +1,16 @@ > -+# > -+# SNMP trap-processing service file for systemd > -+# > -+ > -+[Unit] > -+Description=3DSimple Network Management Protocol (SNMP) Trap daemon. > -+After=3Dsyslog.target network.target > -+ > -+[Service] > -+# Type=3Dnotify is also supported. It should be set when snmptrapd.socket= is not > -+# used. > -+Type=3Dsimple > -+ExecStart=3D/usr/sbin/snmptrapd -f > -+ > -+[Install] > -+WantedBy=3Dmulti-user.target > -diff -up net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh net-snmp-5.7.3/dist/s= nmptrapd.socket > ---- net-snmp-5.7.3/dist/snmptrapd.socket.MPGqYh 2015-02-17 13:34:05.745221= 844 +0100 > -+++ net-snmp-5.7.3/dist/snmptrapd.socket 2015-02-17 13:34:05.745221844 +01= 00 > -@@ -0,0 +1,14 @@ > -+[Unit] > -+Description=3DSocket listening for SNMP trap messages > -+ > -+[Socket] > -+ListenDatagram=3D0.0.0.0:162 > -+# Uncomment other listening addresses as needed - TCP, UDP6, TCP6. > -+# It must match listening addresses/ports defined in snmptrapd.service > -+# or snmptrapd.conf. > -+# ListenStream=3D0.0.0.0:162 > -+# ListenDatagram=3D[::]:162 > -+# ListenStream=3D[::]:162 > -+ > -+[Install] > -+WantedBy=3Dsockets.target > -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:0= 5.746221843 +0100 > -@@ -0,0 +1,286 @@ > -+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ > -+ > -+#ifndef SNMPD_SD_DAEMON_H > -+#define SNMPD_SD_DAEMON_H > -+ > -+/*** > -+ Copyright 2010 Lennart Poettering > -+ > -+ Permission is hereby granted, free of charge, to any person > -+ obtaining a copy of this software and associated documentation files > -+ (the "Software"), to deal in the Software without restriction, > -+ including without limitation the rights to use, copy, modify, merge, > -+ publish, distribute, sublicense, and/or sell copies of the Software, > -+ and to permit persons to whom the Software is furnished to do so, > -+ subject to the following conditions: > -+ > -+ The above copyright notice and this permission notice shall be > -+ included in all copies or substantial portions of the Software. > -+ > -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > -+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > -+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > -+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > -+ SOFTWARE. > -+***/ > -+ > -+#include > -+#include > -+ > -+#ifdef __cplusplus > -+extern "C" { > -+#endif > -+ > -+/* > -+ Reference implementation of a few systemd related interfaces for > -+ writing daemons. These interfaces are trivial to implement. To > -+ simplify porting we provide this reference implementation. > -+ Applications are welcome to reimplement the algorithms described > -+ here if they do not want to include these two source files. > -+ > -+ The following functionality is provided: > -+ > -+ - Support for logging with log levels on stderr > -+ - File descriptor passing for socket-based activation > -+ - Daemon startup and status notification > -+ - Detection of systemd boots > -+ > -+ You may compile this with -DDISABLE_SYSTEMD to disable systemd > -+ support. This makes all those calls NOPs that are directly related to > -+ systemd (i.e. only sd_is_xxx() will stay useful). > -+ > -+ Since this is drop-in code we don't want any of our symbols to be > -+ exported in any case. Hence we declare hidden visibility for all of > -+ them. > -+ > -+ You may find an up-to-date version of these source files online: > -+ > -+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > -+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > -+ > -+ This should compile on non-Linux systems, too, but with the > -+ exception of the sd_is_xxx() calls all functions will become NOPs. > -+ > -+ See sd-daemon(7) for more information. > -+*/ > -+ > -+#ifndef _sd_printf_attr_ > -+#if __GNUC__ >=3D 4 > -+#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b))) > -+#else > -+#define _sd_printf_attr_(a,b) > -+#endif > -+#endif > -+ > -+/* > -+ Log levels for usage on stderr: > -+ > -+ fprintf(stderr, SD_NOTICE "Hello World!\n"); > -+ > -+ This is similar to printk() usage in the kernel. > -+*/ > -+#define SD_EMERG "<0>" /* system is unusable */ > -+#define SD_ALERT "<1>" /* action must be taken immediately */ > -+#define SD_CRIT "<2>" /* critical conditions */ > -+#define SD_ERR "<3>" /* error conditions */ > -+#define SD_WARNING "<4>" /* warning conditions */ > -+#define SD_NOTICE "<5>" /* normal but significant condition */ > -+#define SD_INFO "<6>" /* informational */ > -+#define SD_DEBUG "<7>" /* debug-level messages */ > -+ > -+/* The first passed file descriptor is fd 3 */ > -+#define SD_LISTEN_FDS_START 3 > -+ > -+/* > -+ Returns how many file descriptors have been passed, or a negative > -+ errno code on failure. Optionally, removes the $LISTEN_FDS and > -+ $LISTEN_PID file descriptors from the environment (recommended, but > -+ problematic in threaded environments). If r is the return value of > -+ this function you'll find the file descriptors passed as fds > -+ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative > -+ errno style error code on failure. This function call ensures that > -+ the FD_CLOEXEC flag is set for the passed file descriptors, to make > -+ sure they are not passed on to child processes. If FD_CLOEXEC shall > -+ not be set, the caller needs to unset it after this call for all file > -+ descriptors that are used. > -+ > -+ See sd_listen_fds(3) for more information. > -+*/ > -+int netsnmp_sd_listen_fds(int unset_environment); > -+ > -+/* > -+ Helper call for identifying a passed file descriptor. Returns 1 if > -+ the file descriptor is a FIFO in the file system stored under the > -+ specified path, 0 otherwise. If path is NULL a path name check will > -+ not be done and the call only verifies if the file descriptor > -+ refers to a FIFO. Returns a negative errno style error code on > -+ failure. > -+ > -+ See sd_is_fifo(3) for more information. > -+*/ > -+int netsnmp_sd_is_fifo(int fd, const char *path); > -+ > -+/* > -+ Helper call for identifying a passed file descriptor. Returns 1 if > -+ the file descriptor is a special character device on the file > -+ system stored under the specified path, 0 otherwise. > -+ If path is NULL a path name check will not be done and the call > -+ only verifies if the file descriptor refers to a special character. > -+ Returns a negative errno style error code on failure. > -+ > -+ See sd_is_special(3) for more information. > -+*/ > -+int netsnmp_sd_is_special(int fd, const char *path); > -+ > -+/* > -+ Helper call for identifying a passed file descriptor. Returns 1 if > -+ the file descriptor is a socket of the specified family (AF_INET, > -+ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If > -+ family is 0 a socket family check will not be done. If type is 0 a > -+ socket type check will not be done and the call only verifies if > -+ the file descriptor refers to a socket. If listening is > 0 it is > -+ verified that the socket is in listening mode. (i.e. listen() has > -+ been called) If listening is =3D=3D 0 it is verified that the socket is > -+ not in listening mode. If listening is < 0 no listening mode check > -+ is done. Returns a negative errno style error code on failure. > -+ > -+ See sd_is_socket(3) for more information. > -+*/ > -+int netsnmp_sd_is_socket(int fd, int family, int type, int listening); > -+ > -+/* > -+ Helper call for identifying a passed file descriptor. Returns 1 if > -+ the file descriptor is an Internet socket, of the specified family > -+ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM, > -+ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version > -+ check is not done. If type is 0 a socket type check will not be > -+ done. If port is 0 a socket port check will not be done. The > -+ listening flag is used the same way as in sd_is_socket(). Returns a > -+ negative errno style error code on failure. > -+ > -+ See sd_is_socket_inet(3) for more information. > -+*/ > -+int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening= , uint16_t port); > -+ > -+/* > -+ Helper call for identifying a passed file descriptor. Returns 1 if > -+ the file descriptor is an AF_UNIX socket of the specified type > -+ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0 > -+ a socket type check will not be done. If path is NULL a socket path > -+ check will not be done. For normal AF_UNIX sockets set length to > -+ 0. For abstract namespace sockets set length to the length of the > -+ socket name (including the initial 0 byte), and pass the full > -+ socket path in path (including the initial 0 byte). The listening > -+ flag is used the same way as in sd_is_socket(). Returns a negative > -+ errno style error code on failure. > -+ > -+ See sd_is_socket_unix(3) for more information. > -+*/ > -+int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char= *path, size_t length); > -+ > -+/* > -+ Informs systemd about changed daemon state. This takes a number of > -+ newline separated environment-style variable assignments in a > -+ string. The following variables are known: > -+ > -+ READY=3D1 Tells systemd that daemon startup is finished (only > -+ relevant for services of Type=3Dnotify). The passed > -+ argument is a boolean "1" or "0". Since there is > -+ little value in signaling non-readiness the only > -+ value daemons should send is "READY=3D1". > -+ > -+ STATUS=3D... Passes a single-line status string back to systemd > -+ that describes the daemon state. This is free-from > -+ and can be used for various purposes: general state > -+ feedback, fsck-like programs could pass completion > -+ percentages and failing programs could pass a human > -+ readable error message. Example: "STATUS=3DCompleted > -+ 66% of file system check..." > -+ > -+ ERRNO=3D... If a daemon fails, the errno-style error code, > -+ formatted as string. Example: "ERRNO=3D2" for ENOENT. > -+ > -+ BUSERROR=3D... If a daemon fails, the D-Bus error-style error > -+ code. Example: "BUSERROR=3Dorg.freedesktop.DBus.Error.T= imedOut" > -+ > -+ MAINPID=3D... The main pid of a daemon, in case systemd did not > -+ fork off the process itself. Example: "MAINPID=3D4711" > -+ > -+ Daemons can choose to send additional variables. However, it is > -+ recommended to prefix variable names not listed above with X_. > -+ > -+ Returns a negative errno-style error code on failure. Returns > 0 > -+ if systemd could be notified, 0 if it couldn't possibly because > -+ systemd is not running. > -+ > -+ Example: When a daemon finished starting up, it could issue this > -+ call to notify systemd about it: > -+ > -+ sd_notify(0, "READY=3D1"); > -+ > -+ See sd_notifyf() for more complete examples. > -+ > -+ See sd_notify(3) for more information. > -+*/ > -+int netsnmp_sd_notify(int unset_environment, const char *state); > -+ > -+/* > -+ Similar to sd_notify() but takes a format string. > -+ > -+ Example 1: A daemon could send the following after initialization: > -+ > -+ sd_notifyf(0, "READY=3D1\n" > -+ "STATUS=3DProcessing requests...\n" > -+ "MAINPID=3D%lu", > -+ (unsigned long) getpid()); > -+ > -+ Example 2: A daemon could send the following shortly before > -+ exiting, on failure: > -+ > -+ sd_notifyf(0, "STATUS=3DFailed to start up: %s\n" > -+ "ERRNO=3D%i", > -+ strerror(errno), > -+ errno); > -+ > -+ See sd_notifyf(3) for more information. > -+*/ > -+int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) _s= d_printf_attr_(2,3); > -+ > -+/* > -+ Returns > 0 if the system was booted with systemd. Returns < 0 on > -+ error. Returns 0 if the system was not booted with systemd. Note > -+ that all of the functions above handle non-systemd boots just > -+ fine. You should NOT protect them with a call to this function. Also > -+ note that this function checks whether the system, not the user > -+ session is controlled by systemd. However the functions above work > -+ for both user and system services. > -+ > -+ See sd_booted(3) for more information. > -+*/ > -+int netsnmp_sd_booted(void); > -+ > -+/** > -+ * Find an socket with given parameters. See man sd_is_socket_inet for > -+ * description of the arguments. > -+ * > -+ * Returns the file descriptor if it is found, 0 otherwise. > -+ */ > -+int netsnmp_sd_find_inet_socket(int family, int type, int listening, int = port); > -+ > -+/** > -+ * Find an unix socket with given parameters. See man sd_is_socket_unix f= or > -+ * description of the arguments. > -+ * > -+ * Returns the file descriptor if it is found, 0 otherwise. > -+ */ > -+int > -+netsnmp_sd_find_unix_socket(int type, int listening, const char *path); > -+ > -+#ifdef __cplusplus > -+} > -+#endif > -+ > -+#endif /* SNMPD_SD_DAEMON_H */ > -diff -up net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in.MPGqYh net-s= nmp-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 @@ > - /* If you don't have root access don't exit upon kmem errors */ > - #undef NETSNMP_NO_ROOT_ACCESS > -=20 > -+/* If you don't want to integrate with systemd. */ > -+#undef NETSNMP_NO_SYSTEMD > -+ > - /* Define if you want to remove all SET/write access from the code */ > - #undef NETSNMP_NO_WRITE_SUPPORT > -=20 > -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 +01= 00 > -+++ net-snmp-5.7.3/README.systemd 2015-02-17 13:34:05.747221843 +0100 > -@@ -0,0 +1,41 @@ > -+README.systemd > -+-------------- > -+Net-SNMP provides two daemons, which support systemd system manager.=20 > -+See http://www.freedesktop.org/wiki/Software/systemd to learn how > -+systemd works. Both socket activation and notification is supported by th= ese > -+daemons. > -+ > -+To enable systemd support, the sources must be compiled with > -+--with-systemd configure option. > -+ > -+snmpd - The SNMP agent > -+---------------------- > -+Socket activation od snmpd daemon is implemented, but it's discouraged. > -+The reason is simple - snmpd not only listens and processes SNMP requests > -+from network, but also gathers system statistics counters, sends traps and > -+communicates with subagents. It even opens few netlink sockets. > -+ > -+In other words, snmpd should run from system start to properly work. > -+This can be done in two ways: > -+1) either as snmpd service unit with 'Type=3Dnotification' and without a = socket > -+ unit > -+2) or as snmpd service unit with 'Type=3Dsimple', appropriate socket sock= et unit > -+ and the snmpd service enabled. This way systemd creates the snmpd list= ening > -+ socket early during boot and passes the sockets to snmpd slightly later > -+ (but still during machine boot). This way systemd can paralelize start= of > -+ services, which depend on snmpd. Admins must adjust the socket file ma= nually, > -+ depending if the snmpd support AgentX, IPv6, SMUX etc. > -+ > -+snmpd should be started with '-f' command line parameter to disable forki= ng - > -+systemd does that for us automatically. > -+ > -+ > -+snmptrapd - The trap processing daemon > -+-------------------------------------- > -+snmptrapd supports full socket activation and also notification (if neede= d). > -+Both 'Type=3Dsimple' (with appropriate socket unit) and 'Type=3Dnotify' s= ervices > -+will work. Again, '-f' parameter should be provided on snmptrapd command = line. > -+ > -+If integration with SNMP agent using AgentX protocol is enabled, snmptrap= d should > -+start during boot and not after first SNMP trap arrives. Same rules as fo= r snmpd > -+applies then. > -\ No newline at end of file > -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.74722184= 3 +0100 > -+++ net-snmp-5.7.3/snmplib/sd-daemon.c 2015-02-17 13:34:05.747221843 +0100 > -@@ -0,0 +1,532 @@ > -+/* > -+ * Systemd integration parts. > -+ * > -+ * Most of this file is directly copied from systemd sources. > -+ * Changes: > -+ * - all functions were renamed to have netsnmp_ prefix > -+ * - includes were changed to match Net-SNMP style. > -+ * - removed gcc export macros > -+ * - removed POSIX message queues > -+ */ > -+ > -+#include > -+#include > -+#include > -+#include > -+ > -+#ifndef NETSNMP_NO_SYSTEMD > -+ > -+/*** > -+ Copyright 2010 Lennart Poettering > -+ > -+ Permission is hereby granted, free of charge, to any person > -+ obtaining a copy of this software and associated documentation files > -+ (the "Software"), to deal in the Software without restriction, > -+ including without limitation the rights to use, copy, modify, merge, > -+ publish, distribute, sublicense, and/or sell copies of the Software, > -+ and to permit persons to whom the Software is furnished to do so, > -+ subject to the following conditions: > -+ > -+ The above copyright notice and this permission notice shall be > -+ included in all copies or substantial portions of the Software. > -+ > -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > -+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > -+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS > -+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN > -+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN > -+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE > -+ SOFTWARE. > -+***/ > -+ > -+#ifndef _GNU_SOURCE > -+#define _GNU_SOURCE > -+#endif > -+ > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+#include > -+ > -+#include > -+ > -+int netsnmp_sd_listen_fds(int unset_environment) { > -+ > -+ int r, fd; > -+ const char *e; > -+ char *p =3D NULL; > -+ unsigned long l; > -+ > -+ if (!(e =3D getenv("LISTEN_PID"))) { > -+ r =3D 0; > -+ goto finish; > -+ } > -+ > -+ errno =3D 0; > -+ l =3D strtoul(e, &p, 10); > -+ > -+ if (errno !=3D 0) { > -+ r =3D -errno; > -+ goto finish; > -+ } > -+ > -+ if (!p || *p || l <=3D 0) { > -+ r =3D -EINVAL; > -+ goto finish; > -+ } > -+ > -+ /* Is this for us? */ > -+ if (getpid() !=3D (pid_t) l) { > -+ r =3D 0; > -+ goto finish; > -+ } > -+ > -+ if (!(e =3D getenv("LISTEN_FDS"))) { > -+ r =3D 0; > -+ goto finish; > -+ } > -+ > -+ errno =3D 0; > -+ l =3D strtoul(e, &p, 10); > -+ > -+ if (errno !=3D 0) { > -+ r =3D -errno; > -+ goto finish; > -+ } > -+ > -+ if (!p || *p) { > -+ r =3D -EINVAL; > -+ goto finish; > -+ } > -+ > -+ for (fd =3D SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int)= l; fd ++) { > -+ int flags; > -+ > -+ if ((flags =3D fcntl(fd, F_GETFD)) < 0) { > -+ r =3D -errno; > -+ goto finish; > -+ } > -+ > -+ if (flags & FD_CLOEXEC) > -+ continue; > -+ > -+ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) { > -+ r =3D -errno; > -+ goto finish; > -+ } > -+ } > -+ > -+ r =3D (int) l; > -+ > -+finish: > -+ if (unset_environment) { > -+ unsetenv("LISTEN_PID"); > -+ unsetenv("LISTEN_FDS"); > -+ } > -+ > -+ return r; > -+} > -+ > -+int netsnmp_sd_is_fifo(int fd, const char *path) { > -+ struct stat st_fd; > -+ > -+ if (fd < 0) > -+ return -EINVAL; > -+ > -+ memset(&st_fd, 0, sizeof(st_fd)); > -+ if (fstat(fd, &st_fd) < 0) > -+ return -errno; > -+ > -+ if (!S_ISFIFO(st_fd.st_mode)) > -+ return 0; > -+ > -+ if (path) { > -+ struct stat st_path; > -+ > -+ memset(&st_path, 0, sizeof(st_path)); > -+ if (stat(path, &st_path) < 0) { > -+ > -+ if (errno =3D=3D ENOENT || errno =3D=3D ENOTDIR) > -+ return 0; > -+ > -+ return -errno; > -+ } > -+ > -+ return > -+ st_path.st_dev =3D=3D st_fd.st_dev && > -+ st_path.st_ino =3D=3D st_fd.st_ino; > -+ } > -+ > -+ return 1; > -+} > -+ > -+int netsnmp_sd_is_special(int fd, const char *path) { > -+ struct stat st_fd; > -+ > -+ if (fd < 0) > -+ return -EINVAL; > -+ > -+ if (fstat(fd, &st_fd) < 0) > -+ return -errno; > -+ > -+ if (!S_ISREG(st_fd.st_mode) && !S_ISCHR(st_fd.st_mode)) > -+ return 0; > -+ > -+ if (path) { > -+ struct stat st_path; > -+ > -+ if (stat(path, &st_path) < 0) { > -+ > -+ if (errno =3D=3D ENOENT || errno =3D=3D ENOTDIR) > -+ return 0; > -+ > -+ return -errno; > -+ } > -+ > -+ if (S_ISREG(st_fd.st_mode) && S_ISREG(st_path.st_mode)) > -+ return > -+ st_path.st_dev =3D=3D st_fd.st_dev && > -+ st_path.st_ino =3D=3D st_fd.st_ino; > -+ else if (S_ISCHR(st_fd.st_mode) && S_ISCHR(st_path.st_mod= e)) > -+ return st_path.st_rdev =3D=3D st_fd.st_rdev; > -+ else > -+ return 0; > -+ } > -+ > -+ return 1; > -+} > -+ > -+static int sd_is_socket_internal(int fd, int type, int listening) { > -+ struct stat st_fd; > -+ > -+ if (fd < 0 || type < 0) > -+ return -EINVAL; > -+ > -+ if (fstat(fd, &st_fd) < 0) > -+ return -errno; > -+ > -+ if (!S_ISSOCK(st_fd.st_mode)) > -+ return 0; > -+ > -+ if (type !=3D 0) { > -+ int other_type =3D 0; > -+ socklen_t l =3D sizeof(other_type); > -+ > -+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) = < 0) > -+ return -errno; > -+ > -+ if (l !=3D sizeof(other_type)) > -+ return -EINVAL; > -+ > -+ if (other_type !=3D type) > -+ return 0; > -+ } > -+ > -+ if (listening >=3D 0) { > -+ int accepting =3D 0; > -+ socklen_t l =3D sizeof(accepting); > -+ > -+ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting,= &l) < 0) > -+ return -errno; > -+ > -+ if (l !=3D sizeof(accepting)) > -+ return -EINVAL; > -+ > -+ if (!accepting !=3D !listening) > -+ return 0; > -+ } > -+ > -+ return 1; > -+} > -+ > -+union sockaddr_union { > -+ struct sockaddr sa; > -+ struct sockaddr_in in4; > -+ struct sockaddr_in6 in6; > -+ struct sockaddr_un un; > -+ struct sockaddr_storage storage; > -+}; > -+ > -+int netsnmp_sd_is_socket(int fd, int family, int type, int listening) { > -+ int r; > -+ > -+ if (family < 0) > -+ return -EINVAL; > -+ > -+ if ((r =3D sd_is_socket_internal(fd, type, listening)) <=3D 0) > -+ return r; > -+ > -+ if (family > 0) { > -+ union sockaddr_union sockaddr; > -+ socklen_t l; > -+ > -+ memset(&sockaddr, 0, sizeof(sockaddr)); > -+ l =3D sizeof(sockaddr); > -+ > -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) > -+ return -errno; > -+ > -+ if (l < sizeof(sa_family_t)) > -+ return -EINVAL; > -+ > -+ return sockaddr.sa.sa_family =3D=3D family; > -+ } > -+ > -+ return 1; > -+} > -+ > -+int netsnmp_sd_is_socket_inet(int fd, int family, int type, int listening= , uint16_t port) { > -+ union sockaddr_union sockaddr; > -+ socklen_t l; > -+ int r; > -+ > -+ if (family !=3D 0 && family !=3D AF_INET && family !=3D AF_INET6) > -+ return -EINVAL; > -+ > -+ if ((r =3D sd_is_socket_internal(fd, type, listening)) <=3D 0) > -+ return r; > -+ > -+ memset(&sockaddr, 0, sizeof(sockaddr)); > -+ l =3D sizeof(sockaddr); > -+ > -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) > -+ return -errno; > -+ > -+ if (l < sizeof(sa_family_t)) > -+ return -EINVAL; > -+ > -+ if (sockaddr.sa.sa_family !=3D AF_INET && > -+ sockaddr.sa.sa_family !=3D AF_INET6) > -+ return 0; > -+ > -+ if (family > 0) > -+ if (sockaddr.sa.sa_family !=3D family) > -+ return 0; > -+ > -+ if (port > 0) { > -+ if (sockaddr.sa.sa_family =3D=3D AF_INET) { > -+ if (l < sizeof(struct sockaddr_in)) > -+ return -EINVAL; > -+ > -+ return htons(port) =3D=3D sockaddr.in4.sin_port; > -+ } else { > -+ if (l < sizeof(struct sockaddr_in6)) > -+ return -EINVAL; > -+ > -+ return htons(port) =3D=3D sockaddr.in6.sin6_port; > -+ } > -+ } > -+ > -+ return 1; > -+} > -+ > -+int netsnmp_sd_is_socket_unix(int fd, int type, int listening, const char= *path, size_t length) { > -+ union sockaddr_union sockaddr; > -+ socklen_t l; > -+ int r; > -+ > -+ if ((r =3D sd_is_socket_internal(fd, type, listening)) <=3D 0) > -+ return r; > -+ > -+ memset(&sockaddr, 0, sizeof(sockaddr)); > -+ l =3D sizeof(sockaddr); > -+ > -+ if (getsockname(fd, &sockaddr.sa, &l) < 0) > -+ return -errno; > -+ > -+ if (l < sizeof(sa_family_t)) > -+ return -EINVAL; > -+ > -+ if (sockaddr.sa.sa_family !=3D AF_UNIX) > -+ return 0; > -+ > -+ if (path) { > -+ if (length <=3D 0) > -+ length =3D strlen(path); > -+ > -+ if (length <=3D 0) > -+ /* Unnamed socket */ > -+ return l =3D=3D offsetof(struct sockaddr_un, sun_= path); > -+ > -+ if (path[0]) > -+ /* Normal path socket */ > -+ return > -+ (l >=3D offsetof(struct sockaddr_un, sun_= path) + length + 1) && > -+ memcmp(path, sockaddr.un.sun_path, length= +1) =3D=3D 0; > -+ else > -+ /* Abstract namespace socket */ > -+ return > -+ (l =3D=3D offsetof(struct sockaddr_un, su= n_path) + length) && > -+ memcmp(path, sockaddr.un.sun_path, length= ) =3D=3D 0; > -+ } > -+ > -+ return 1; > -+} > -+ > -+int netsnmp_sd_notify(int unset_environment, const char *state) { > -+ int fd =3D -1, r; > -+ struct msghdr msghdr; > -+ struct iovec iovec; > -+ union sockaddr_union sockaddr; > -+ const char *e; > -+ > -+ if (!state) { > -+ r =3D -EINVAL; > -+ goto finish; > -+ } > -+ > -+ if (!(e =3D getenv("NOTIFY_SOCKET"))) > -+ return 0; > -+ > -+ /* Must be an abstract socket, or an absolute path */ > -+ if ((e[0] !=3D '@' && e[0] !=3D '/') || e[1] =3D=3D 0) { > -+ r =3D -EINVAL; > -+ goto finish; > -+ } > -+ > -+ if ((fd =3D socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) { > -+ r =3D -errno; > -+ goto finish; > -+ } > -+ > -+ memset(&sockaddr, 0, sizeof(sockaddr)); > -+ sockaddr.sa.sa_family =3D AF_UNIX; > -+ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path)); > -+ > -+ if (sockaddr.un.sun_path[0] =3D=3D '@') > -+ sockaddr.un.sun_path[0] =3D 0; > -+ > -+ memset(&iovec, 0, sizeof(iovec)); > -+ iovec.iov_base =3D (char *)state; > -+ iovec.iov_len =3D strlen(state); > -+ > -+ memset(&msghdr, 0, sizeof(msghdr)); > -+ msghdr.msg_name =3D &sockaddr; > -+ msghdr.msg_namelen =3D offsetof(struct sockaddr_un, sun_path) + s= trlen(e); > -+ > -+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un)) > -+ msghdr.msg_namelen =3D sizeof(struct sockaddr_un); > -+ > -+ msghdr.msg_iov =3D &iovec; > -+ msghdr.msg_iovlen =3D 1; > -+ > -+ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { > -+ r =3D -errno; > -+ goto finish; > -+ } > -+ > -+ r =3D 1; > -+ > -+finish: > -+ if (unset_environment) > -+ unsetenv("NOTIFY_SOCKET"); > -+ > -+ if (fd >=3D 0) > -+ close(fd); > -+ > -+ return r; > -+} > -+ > -+int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) { > -+ va_list ap; > -+ char *p =3D NULL; > -+ int r; > -+ > -+ va_start(ap, format); > -+ r =3D vasprintf(&p, format, ap); > -+ va_end(ap); > -+ > -+ if (r < 0 || !p) > -+ return -ENOMEM; > -+ > -+ r =3D netsnmp_sd_notify(unset_environment, p); > -+ free(p); > -+ > -+ return r; > -+} > -+ > -+int netsnmp_sd_booted(void) { > -+ struct stat a, b; > -+ > -+ /* We simply test whether the systemd cgroup hierarchy is > -+ * mounted */ > -+ > -+ if (lstat("/sys/fs/cgroup", &a) < 0) > -+ return 0; > -+ > -+ if (lstat("/sys/fs/cgroup/systemd", &b) < 0) > -+ return 0; > -+ > -+ return a.st_dev !=3D b.st_dev; > -+} > -+ > -+/* End of original sd-daemon.c from systemd sources */ > -+ > -+int > -+netsnmp_sd_find_inet_socket(int family, int type, int listening, int port) > -+{ > -+ int count, fd; > -+ > -+ count =3D netsnmp_sd_listen_fds(0); > -+ if (count <=3D 0) { > -+ DEBUGMSGTL(("systemd:find_inet_socket", "No LISTEN_FDS found.\n")= ); > -+ return 0; > -+ } > -+ DEBUGMSGTL(("systemd:find_inet_socket", "LISTEN_FDS reports %d socket= s.\n", > -+ count)); > -+ > -+ for (fd =3D 3; fd < 3+count; fd++) { > -+ int rc =3D netsnmp_sd_is_socket_inet(fd, family, type, listening,= port); > -+ if (rc < 0) > -+ DEBUGMSGTL(("systemd:find_inet_socket", > -+ "sd_is_socket_inet error: %d\n", rc)); > -+ if (rc > 0) { > -+ DEBUGMSGTL(("systemd:find_inet_socket", > -+ "Found the socket in LISTEN_FDS\n")); > -+ return fd; > -+ } > -+ } > -+ DEBUGMSGTL(("systemd:find_inet_socket", "Socket not found in LISTEN_F= DS\n")); > -+ return 0; > -+} > -+ > -+int > -+netsnmp_sd_find_unix_socket(int type, int listening, const char *path) > -+{ > -+ int count, fd; > -+ > -+ count =3D netsnmp_sd_listen_fds(0); > -+ if (count <=3D 0) { > -+ DEBUGMSGTL(("systemd:find_unix_socket", "No LISTEN_FDS found.\n")= ); > -+ return 0; > -+ } > -+ DEBUGMSGTL(("systemd:find_unix_socket", "LISTEN_FDS reports %d socket= s.\n", > -+ count)); > -+ > -+ for (fd =3D 3; fd < 3+count; fd++) { > -+ int rc =3D netsnmp_sd_is_socket_unix(fd, type, listening, path, 0= ); > -+ if (rc < 0) > -+ DEBUGMSGTL(("systemd:find_unix_socket", > -+ "netsnmp_sd_is_socket_unix error: %d\n", rc)); > -+ if (rc > 0) { > -+ DEBUGMSGTL(("systemd:find_unix_socket", > -+ "Found the socket in LISTEN_FDS\n")); > -+ return fd; > -+ } > -+ } > -+ DEBUGMSGTL(("systemd:find_unix_socket", "Socket not found in LISTEN_F= DS\n")); > -+ return 0; > -+} > -+ > -+#endif /* ! NETSNMP_NO_SYSTEMD */ > -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 > -@@ -43,6 +43,10 @@ > - #include > - #include > -=20 > -+#ifndef NETSNMP_NO_SYSTEMD > -+#include > -+#endif > -+ > - /* > - * needs to be in sync with the definitions in snmplib/snmpUDPDomain.c > - * and perl/agent/agent.xs > -@@ -149,6 +153,7 @@ netsnmp_tcp_transport(struct sockaddr_in > - netsnmp_transport *t =3D NULL; > - netsnmp_udp_addr_pair *addr_pair =3D NULL; > - int rc =3D 0; > -+ int socket_initialized =3D 0; > -=20 > - #ifdef NETSNMP_NO_LISTEN_SUPPORT > - if (local) > -@@ -178,7 +183,19 @@ netsnmp_tcp_transport(struct sockaddr_in > - t->domain_length =3D > - sizeof(netsnmp_snmpTCPDomain) / sizeof(netsnmp_snmpTCPDomain[0]); > -=20 > -- t->sock =3D socket(PF_INET, SOCK_STREAM, 0); > -+#ifndef NETSNMP_NO_SYSTEMD > -+ /* > -+ * Maybe the socket was already provided by systemd... > -+ */ > -+ if (local) { > -+ t->sock =3D netsnmp_sd_find_inet_socket(PF_INET, SOCK_STREAM, 1, > -+ ntohs(addr->sin_port)); > -+ if (t->sock) > -+ socket_initialized =3D 1; > -+ } > -+#endif > -+ if (!socket_initialized) > -+ t->sock =3D socket(PF_INET, SOCK_STREAM, 0); > - if (t->sock < 0) { > - netsnmp_transport_free(t); > - return NULL; > -@@ -215,11 +232,13 @@ netsnmp_tcp_transport(struct sockaddr_in > - setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, > - sizeof(opt)); > -=20 > -- rc =3D bind(t->sock, (struct sockaddr *)addr, sizeof(struct socka= ddr)); > -- if (rc !=3D 0) { > -- netsnmp_socketbase_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > -+ if (!socket_initialized) { > -+ rc =3D bind(t->sock, (struct sockaddr *)addr, sizeof(struct s= ockaddr)); > -+ if (rc !=3D 0) { > -+ netsnmp_socketbase_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > - } > -=20 > - /* > -@@ -235,12 +254,13 @@ netsnmp_tcp_transport(struct sockaddr_in > - /* > - * Now sit here and wait for connections to arrive. =20 > - */ > -- > -- rc =3D listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); > -- if (rc !=3D 0) { > -- netsnmp_socketbase_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > -+ if (!socket_initialized) { > -+ rc =3D listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); > -+ if (rc !=3D 0) { > -+ netsnmp_socketbase_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > - } > - =20 > - /* > -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-0= 8 21:23:22.000000000 +0100 > -+++ net-snmp-5.7.3/snmplib/transports/snmpTCPIPv6Domain.c 2015-02-17 13:34= :05.748221842 +0100 > -@@ -49,6 +49,10 @@ > - #include > - #include > -=20 > -+#ifndef NETSNMP_NO_SYSTEMD > -+#include > -+#endif > -+ > - #include "inet_ntop.h" > -=20 > - oid netsnmp_TCPIPv6Domain[] =3D { TRANSPORT_DOMAIN_TCP_IPV6 }; > -@@ -140,6 +144,7 @@ netsnmp_tcp6_transport(struct sockaddr_i > - { > - netsnmp_transport *t =3D NULL; > - int rc =3D 0; > -+ int socket_initialized =3D 0; > -=20 > - #ifdef NETSNMP_NO_LISTEN_SUPPORT > - if (local) > -@@ -174,7 +179,19 @@ netsnmp_tcp6_transport(struct sockaddr_i > - t->domain =3D netsnmp_TCPIPv6Domain; > - t->domain_length =3D sizeof(netsnmp_TCPIPv6Domain) / sizeof(oid); > -=20 > -- t->sock =3D socket(PF_INET6, SOCK_STREAM, 0); > -+#ifndef NETSNMP_NO_SYSTEMD > -+ /* > -+ * Maybe the socket was already provided by systemd... > -+ */ > -+ if (local) { > -+ t->sock =3D netsnmp_sd_find_inet_socket(PF_INET6, SOCK_STREAM, 1, > -+ ntohs(addr->sin6_port)); > -+ if (t->sock) > -+ socket_initialized =3D 1; > -+ } > -+#endif > -+ if (!socket_initialized) > -+ t->sock =3D socket(PF_INET6, SOCK_STREAM, 0); > - if (t->sock < 0) { > - netsnmp_transport_free(t); > - return NULL; > -@@ -220,12 +237,14 @@ netsnmp_tcp6_transport(struct sockaddr_i > -=20 > - setsockopt(t->sock, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeo= f(opt)); > -=20 > -- rc =3D bind(t->sock, (struct sockaddr *) addr, > -- sizeof(struct sockaddr_in6)); > -- if (rc !=3D 0) { > -- netsnmp_socketbase_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > -+ if (!socket_initialized) { > -+ rc =3D bind(t->sock, (struct sockaddr *) addr, > -+ sizeof(struct sockaddr_in6)); > -+ if (rc !=3D 0) { > -+ netsnmp_socketbase_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > - } > -=20 > - /* > -@@ -242,11 +261,13 @@ netsnmp_tcp6_transport(struct sockaddr_i > - * Now sit here and wait for connections to arrive. =20 > - */ > -=20 > -- rc =3D listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); > -- if (rc !=3D 0) { > -- netsnmp_socketbase_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > -+ if (!socket_initialized) { > -+ rc =3D listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); > -+ if (rc !=3D 0) { > -+ netsnmp_socketbase_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > - } > - =20 > - /* > -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 2014-= 12-08 21:23:22.000000000 +0100 > -+++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv4BaseDomain.c 2015-02-17 1= 3:36:22.744123462 +0100 > -@@ -40,6 +40,10 @@ > -=20 > - #include > -=20 > -+#ifndef NETSNMP_NO_SYSTEMD > -+#include > -+#endif > -+ > - #if defined(HAVE_IP_PKTINFO) || defined(HAVE_IP_RECVDSTADDR) > - int netsnmp_udpipv4_recvfrom(int s, void *buf, int len, struct sockaddr *= from, > - socklen_t *fromlen, struct sockaddr *dstip, > -@@ -64,6 +68,7 @@ netsnmp_udpipv4base_transport(struct soc > - char *client_socket =3D NULL; > - netsnmp_indexed_addr_pair addr_pair; > - socklen_t local_addr_len; > -+ int socket_initialized =3D 0; > -=20 > - #ifdef NETSNMP_NO_LISTEN_SUPPORT > - if (local) > -@@ -88,7 +93,20 @@ netsnmp_udpipv4base_transport(struct soc > - free(str); > - } > -=20 > -- t->sock =3D socket(PF_INET, SOCK_DGRAM, 0); > -+#ifndef NETSNMP_NO_SYSTEMD > -+ /* > -+ * Maybe the socket was already provided by systemd... > -+ */ > -+ if (local) { > -+ t->sock =3D netsnmp_sd_find_inet_socket(PF_INET, SOCK_DGRAM, -1, > -+ ntohs(addr->sin_port)); > -+ if (t->sock) > -+ socket_initialized =3D 1; > -+ } > -+#endif > -+ if (!socket_initialized) > -+ t->sock =3D socket(PF_INET, SOCK_DGRAM, 0); > -+ > - DEBUGMSGTL(("UDPBase", "openned socket %d as local=3D%d\n", t->sock, = local));=20 > - if (t->sock < 0) { > - netsnmp_transport_free(t); > -@@ -151,12 +169,14 @@ netsnmp_udpipv4base_transport(struct soc > - } > - } > - #endif /* !defined(WIN32) */ > -- rc =3D bind(t->sock, (struct sockaddr *) addr, > -- sizeof(struct sockaddr)); > -- if (rc !=3D 0) { > -- netsnmp_socketbase_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > -+ if (!socket_initialized) { > -+ rc =3D bind(t->sock, (struct sockaddr *) addr, > -+ sizeof(struct sockaddr)); > -+ if (rc !=3D 0) { > -+ netsnmp_socketbase_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > - } > - t->data =3D NULL; > - t->data_length =3D 0; > -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-0= 8 21:23:22.000000000 +0100 > -+++ net-snmp-5.7.3/snmplib/transports/snmpUDPIPv6Domain.c 2015-02-17 13:37= :16.256087147 +0100 > -@@ -67,6 +67,10 @@ static const struct in6_addr in6addr_any > - #include > - #include > -=20 > -+#ifndef NETSNMP_NO_SYSTEMD > -+#include > -+#endif > -+ > - #include "inet_ntop.h" > - #include "inet_pton.h" > -=20 > -@@ -190,6 +194,7 @@ netsnmp_udp6_transport(struct sockaddr_i > - { > - netsnmp_transport *t =3D NULL; > - int rc =3D 0; > -+ int socket_initialized =3D 0; > -=20 > - #ifdef NETSNMP_NO_LISTEN_SUPPORT > - if (local) > -@@ -217,7 +222,19 @@ netsnmp_udp6_transport(struct sockaddr_i > - t->domain_length =3D > - sizeof(netsnmp_UDPIPv6Domain) / sizeof(netsnmp_UDPIPv6Domain[0]); > -=20 > -- t->sock =3D socket(PF_INET6, SOCK_DGRAM, 0); > -+#ifndef NETSNMP_NO_SYSTEMD > -+ /* > -+ * Maybe the socket was already provided by systemd... > -+ */ > -+ if (local) { > -+ t->sock =3D netsnmp_sd_find_inet_socket(PF_INET6, SOCK_DGRAM, -1, > -+ ntohs(addr->sin6_port)); > -+ if (t->sock) > -+ socket_initialized =3D 1; > -+ } > -+#endif > -+ if (!socket_initialized) > -+ t->sock =3D socket(PF_INET6, SOCK_DGRAM, 0); > - if (t->sock < 0) { > - netsnmp_transport_free(t); > - return NULL; > -@@ -242,13 +259,14 @@ netsnmp_udp6_transport(struct sockaddr_i > - }=20 > - } > - #endif > -- > -- rc =3D bind(t->sock, (struct sockaddr *) addr, > -- sizeof(struct sockaddr_in6)); > -- if (rc !=3D 0) { > -- netsnmp_socketbase_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > -+ if (!socket_initialized) { > -+ rc =3D bind(t->sock, (struct sockaddr *) addr, > -+ sizeof(struct sockaddr_in6)); > -+ if (rc !=3D 0) { > -+ netsnmp_socketbase_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > - } > - t->local =3D (unsigned char*)malloc(18); > - if (t->local =3D=3D NULL) { > -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 2= 1:23:22.000000000 +0100 > -+++ net-snmp-5.7.3/snmplib/transports/snmpUnixDomain.c 2015-02-17 13:34:05= .749221841 +0100 > -@@ -37,6 +37,10 @@ > - #include /* mkdirhier */ > - #include > -=20 > -+#ifndef NETSNMP_NO_SYSTEMD > -+#include > -+#endif > -+ > - netsnmp_feature_child_of(transport_unix_socket_all, transport_all) > - netsnmp_feature_child_of(unix_socket_paths, transport_unix_socket_all) > -=20 > -@@ -295,6 +299,7 @@ netsnmp_unix_transport(struct sockaddr_u > - netsnmp_transport *t =3D NULL; > - sockaddr_un_pair *sup =3D NULL; > - int rc =3D 0; > -+ int socket_initialized =3D 0; > -=20 > - #ifdef NETSNMP_NO_LISTEN_SUPPORT > - /* SPECIAL CIRCUMSTANCE: We still want AgentX to be able to operate, > -@@ -333,7 +338,18 @@ netsnmp_unix_transport(struct sockaddr_u > - t->data_length =3D sizeof(sockaddr_un_pair); > - sup =3D (sockaddr_un_pair *) t->data; > -=20 > -- t->sock =3D socket(PF_UNIX, SOCK_STREAM, 0); > -+#ifndef NETSNMP_NO_SYSTEMD > -+ /* > -+ * Maybe the socket was already provided by systemd... > -+ */ > -+ if (local) { > -+ t->sock =3D netsnmp_sd_find_unix_socket(SOCK_STREAM, 1, addr->sun= _path); > -+ if (t->sock) > -+ socket_initialized =3D 1; > -+ } > -+#endif > -+ if (!socket_initialized) > -+ t->sock =3D socket(PF_UNIX, SOCK_STREAM, 0); > - if (t->sock < 0) { > - netsnmp_transport_free(t); > - return NULL; > -@@ -357,25 +373,26 @@ netsnmp_unix_transport(struct sockaddr_u > -=20 > - t->flags |=3D NETSNMP_TRANSPORT_FLAG_LISTEN; > -=20 > -- unlink(addr->sun_path); > -- rc =3D bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); > -- > -- if (rc !=3D 0 && errno =3D=3D ENOENT && create_path) { > -- rc =3D mkdirhier(addr->sun_path, create_mode, 1); > -+ if (!socket_initialized) { > -+ unlink(addr->sun_path); > -+ rc =3D bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); > -+ if (rc !=3D 0 && errno =3D=3D ENOENT && create_path) { > -+ rc =3D mkdirhier(addr->sun_path, create_mode, 1); > -+ if (rc !=3D 0) { > -+ netsnmp_unix_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > -+ rc =3D bind(t->sock, (struct sockaddr *) addr, SUN_LEN(ad= dr)); > -+ } > - if (rc !=3D 0) { > -+ DEBUGMSGTL(("netsnmp_unix_transport", > -+ "couldn't bind \"%s\", errno %d (%s)\n", > -+ addr->sun_path, errno, strerror(errno))); > - netsnmp_unix_close(t); > - netsnmp_transport_free(t); > - return NULL; > - } > -- rc =3D bind(t->sock, (struct sockaddr *) addr, SUN_LEN(addr)); > -- } > -- if (rc !=3D 0) { > -- DEBUGMSGTL(("netsnmp_unix_transport", > -- "couldn't bind \"%s\", errno %d (%s)\n", > -- addr->sun_path, errno, strerror(errno))); > -- netsnmp_unix_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > - } > -=20 > - /* > -@@ -391,16 +408,17 @@ netsnmp_unix_transport(struct sockaddr_u > - * Now sit here and listen for connections to arrive. > - */ > -=20 > -- rc =3D listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); > -- if (rc !=3D 0) { > -- DEBUGMSGTL(("netsnmp_unix_transport", > -- "couldn't listen to \"%s\", errno %d (%s)\n", > -- addr->sun_path, errno, strerror(errno))); > -- netsnmp_unix_close(t); > -- netsnmp_transport_free(t); > -- return NULL; > -+ if (!socket_initialized) { > -+ rc =3D listen(t->sock, NETSNMP_STREAM_QUEUE_LEN); > -+ if (rc !=3D 0) { > -+ DEBUGMSGTL(("netsnmp_unix_transport", > -+ "couldn't listen to \"%s\", errno %d (%s)\n", > -+ addr->sun_path, errno, strerror(errno))); > -+ netsnmp_unix_close(t); > -+ netsnmp_transport_free(t); > -+ return NULL; > -+ } > - } > -- > - } else { > - t->remote =3D (u_char *)malloc(strlen(addr->sun_path)); > - if (t->remote =3D=3D NULL) { > --=20 > 2.30.2 >=20 --===============3575500276941524754==--