@@ -1,6 +1,6 @@

 Name:           apparmor

 Version:        2.13

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        AppArmor is an effective and easy-to-use Linux application security system.

 License:        GNU LGPL v2.1

 URL:            https://launchpad.net/apparmor

@@ -370,8 +370,10 @@ make DESTDIR=%{buildroot} install

 %files -n ruby-apparmor

 %defattr(-,root,root)

-%{_libdir}/ruby/site_ruby/2.4.0/x86_64-linux/LibAppArmor.so

+%{_libdir}/ruby/site_ruby/*

 %changelog

+*   Thu Sep 20 2018 Keerthana K <keerthanak@vmware.com> 2.13-2

+-   Updated the ruby packagefor latest version.

 *   Thu Aug 30 2018 Keerthana K <keerthanak@vmware.com> 2.13-1

 -   Initial Apparmor package for Photon.

@@ -1,11 +1,11 @@

 Summary:        C debugger

 Name:           gdb

-Version:        7.12.1

-Release:        8%{?dist}

+Version:        8.2

+Release:        1%{?dist}

 License:        GPLv2+

 URL:            http://www.gnu.org/software/%{name}

 Source0:        http://ftp.gnu.org/gnu/gdb/%{name}-%{version}.tar.xz

-%define sha1    gdb=ef77c5345d6f9fdcdf7a5d8503301242b701936e

+%define sha1    gdb=ee66294d87a109f88a459d0da5d0bb2da5135f45

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -80,6 +80,8 @@ make %{?_smp_mflags} check || tail gdb/testsuite/gdb.sum  | grep "# of unexpecte

 %{_mandir}/*/*

 %changelog

+*   Fri Sep 14 2018 Keerthana K <keerthanak@vmware.com> 8.2-1

+-   Update to version 8.2

 *   Thu Dec 07 2017 Alexey Makhalov <amakhalov@vmware.com> 7.12.1-8

 -   Enable LZMA support

 *   Tue Nov 14 2017 Alexey Makhalov <amakhalov@vmware.com> 7.12.1-7

@@ -1,14 +1,14 @@

 Summary:        The GNU Database Manager

 Name:           gdbm

-Version:        1.13

-Release:        3%{?dist}

+Version:        1.18

+Release:        1%{?dist}

 License:        GPLv3+

 URL:            http://www.gnu.org/software/gdbm

 Group:          Applications/Databases

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://ftp.gnu.org/gnu/gdbm/%{name}-%{version}.tar.gz

-%define sha1    gdbm=7f2a8301497bbcac91808b011ca533380914fd21

+%define sha1    gdbm=0f1056ab3beb1bf09dad06f8083f2c79716a5b1b

 %description

 This is a disk file format database which stores key/data-pairs in

@@ -69,6 +69,8 @@ make %{?_smp_mflags} check

 %{_mandir}/man3/*

 %changelog

+*   Fri Sep 14 2018 Keerthana K <keerthanak@vmware.com> 1.18-1

+-   Update to version 1.18

 *   Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 1.13-3

 -   Add devel package.

 *   Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 1.13-2

@@ -1,11 +1,11 @@

 Summary:        Library to find geographical and network information of an IP address

 Name:           geoip-api-c

-Version:        1.6.10

+Version:        1.6.12

 Release:        1%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/maxmind/geoip-api-c

 Source0:        https://github.com/maxmind/geoip-api-c/releases/download/v%{version}/GeoIP-%{version}.tar.gz 

-%define sha1 GeoIP=d37a12bae0e375344288f6fe80c281cf9e6e107d

+%define sha1 GeoIP=ac1a6809afbb7624aff2f6e12ceb300b12de1715

 Group:          Development/Libraries

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -60,6 +60,8 @@ make %{?_smp_mflags} -k check

 %{_libdir}/pkgconfig/geoip.pc

 %changelog

+*   Fri Sep 14 2018 Keerthana K <keerthanak@vmware.com> 1.6.12-1

+-   Update to version 1.6.12

 *   Wed Apr 05 2017 Danut Moraru <dmoraru@vmware.com> 1.6.10-1

 -   Upgrade geoip-api-c to 1.6.10

 *   Wed Jul 27 2016 Anish Swaminathan <anishs@vmware.com> 1.6.9-1

@@ -1,6 +1,6 @@

 Summary:	Utilities for internationalization and localization

 Name:		gettext

-Version:	0.19.8

+Version:	0.19.8.1

 Release:	1%{?dist}

 License:	GPLv3

 URL:		http://www.gnu.org/software/gettext

@@ -8,7 +8,7 @@ Group:		Applications/System

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz

-%define sha1 gettext=dc551d4783edf691c1f0095ca927d3128b5093e8

+%define sha1 gettext=e0fe90ede22f7f16bbde7bdea791a835f2773fc9

 %description

 These allow programs to be compiled with NLS

@@ -48,12 +48,14 @@ make %{?_smp_mflags} check

 %{_libdir}/*.so

 %{_libdir}/*.a

 %{_datarootdir}/aclocal/*

-%{_datarootdir}/%{name}-%{version}/*

+%{_datadir}/*

 %{_defaultdocdir}/%{name}-%{version}/*

 %{_datarootdir}/%{name}/*

 %{_mandir}/*

 %changelog

+*       Fri Sep 14 2018 Keerthana K <keerthanak@vmware.com> 0.19.8.1-1

+-       Update to version 0.19.8.1

 *	Wed Apr 05 2017 Danut Moraru <dmoraru@vmware.com> 0.19.8-1

 -	Upgrade to 0.19.8

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.19.5.1-2

@@ -1,14 +1,14 @@

 Summary:	C++ interface to the glib

 Name:		glibmm

-Version:	2.50.1

-Release:	2%{?dist}

+Version:	2.56.0

+Release:	1%{?dist}

 License:	LGPLv2+

 URL:		http://ftp.gnome.org/pub/GNOME/sources/glibmm

 Group:		Applications/System

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.53/%{name}-%{version}.tar.xz

-%define sha1 glibmm=07ceb53b995f10ae0f9c572fb11febaa3e33d669

+%define sha1 glibmm=d733d9206d706d53058749f92dfb319bb189c289

 BuildRequires:	python2 >= 2.7

 BuildRequires:	libsigc++ >= 2.10.0

 BuildRequires:	glib-devel glib-schemas

@@ -66,6 +66,8 @@ export GIO_EXTRA_MODULES=/usr/lib/gio/modules; make check

 %{_datadir}/*

 %changelog

+*   Fri Sep 14 2018 Keerthana K <keerthanak@vmware.com> 2.56.0-1

+-   Update to version 2.56.0

 *   Thu Aug 24 2017 Rongrong Qiu <rqiu@vmware.com> 2.50.1-2

 -   add buildrequires for make check for bug 1900286

 *   Thu May 26 2017 Harish Udaiya Kumar <hudaiykumar@vmware.com> 2.50.1-1

@@ -1,7 +1,7 @@

 Summary:	GIO-based library with Unix/Linux specific API

 Name:		libgsystem

 Version:	2015.2

-Release:	1%{?dist}

+Release:	2%{?dist}

 Group:		Development/Libraries

 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgsystem/%{version}/%{name}-%{version}.tar.gz

 %define sha1 libgsystem=d7f12beb17d3a3b288d68ca2cdcb595f9e5fccea

@@ -84,12 +84,15 @@ rm -rf $RPM_BUILD_ROOT

 %{_datadir}/gir-*/*.gir

 %changelog

+*   Tue Sep 18 2018 Keerthana K <keerthanak@vmware.com> 2015.2-2

+-   Removed % from autosetup in the changelog to address the

+-   build break with latest RPM version.

 *   Wed Apr 26 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2015.2-1

 -   Updated to version 2015.2

 *   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.1-4

 -   BuildRequired attr-devel.

 *   Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.1-3

--   Use %setup instead of %autosetup

+-   Use setup instead of autosetup

 *   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2015.1-2

 -   GA - Bump release of all rpms

 *   Mon Nov 24 2014 Divya Thaluru <dthaluru@vmware.com> 2014.2-1

deleted file mode 100644

@@ -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 <jsafranek@users.sourceforge.net>

-Date:   Mon Aug 8 15:48:54 2011 +0200

-

-    CHANGES: snmpd: integrated with systemd, see README.systemd for details.

-    

-    It brings sd-daemon.c and .h directly downloaded from systemd. I've made very

-    few changes to it to match our NETSNMP_NO_SYSTEMD and include paths.

-

-commit fef6cddfdb94da1a6b1fb768af62918b80f11fd3

-Author: Jan Safranek <jsafranek@users.sourceforge.net>

-Date:   Mon Aug 8 15:48:54 2011 +0200

-

-    CHANGES: snmptrapd: integrate systemd notification support.

-

-commit 0641e43c694c485cbbffef0556efc4641bd3ff50

-Author: Jan Safranek <jsafranek@users.sourceforge.net>

-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 <jsafranek@users.sourceforge.net>

-Date:   Mon Aug 8 15:48:54 2011 +0200

-

-    Check sockets created by systemd when opening new server sockets.

-    

-    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 <jsafranek@users.sourceforge.net>

-Date:   Mon Aug 8 15:48:54 2011 +0200

-

-    Added sample systemd service files.

-

-commit 884ec488a6596380ba283d707827dd926a52e0b2

-Author: Jan Safranek <jsafranek@users.sourceforge.net>

-Date:   Mon Aug 8 15:48:55 2011 +0200

-

-    Run autoheader+autoconf.

-

-commit 86132e3f1e6ef7b4e0b96d8fa24e37c81b71b0e0

-Author: Jan Safranek <jsafranek@users.sourceforge.net>

-Date:   Tue Aug 9 10:53:43 2011 +0200

-

-    Update systemd documentation and samples.

-    

-    - 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	2015-02-17 13:34:05.736221851 +0100

-@@ -164,6 +164,10 @@ typedef long    fd_mask;

- 

- #endif

- 

-+#ifndef NETSNMP_NO_SYSTEMD

-+#include <net-snmp/library/sd-daemon.h>

-+#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 = -1;

-     char           *pid_file = NULL;

-     char            option_compatability[] = "-Le";

-+    int             prepared_sockets = 0;

- #if HAVE_GETPID

-     int fd;

-     FILE           *PID;

- #endif

- 

- #ifndef WIN32

-+#ifndef NETSNMP_NO_SYSYSTEMD

-+    /* check if systemd has sockets for us and don't close them */

-+    prepared_sockets = netsnmp_sd_listen_fds(0);

-+#endif /* NETSNMP_NO_SYSYSTEMD */

-+

-     /*

-      * close all non-standard file descriptors we may have

-      * inherited from the shell.

-      */

--    for (i = getdtablesize() - 1; i > 2; --i) {

--        (void) close(i);

-+    if (!prepared_sockets) {

-+        for (i = getdtablesize() - 1; i > 2; --i) {

-+            (void) close(i);

-+        }

-     }

- #endif /* #WIN32 */

-     

-@@ -1107,6 +1119,19 @@ main(int argc, char *argv[])

-     netsnmp_addrcache_initialise();

- 

-     /*

-+     * Let systemd know we're up.

-+     */

-+#ifndef NETSNMP_NO_SYSTEMD

-+    netsnmp_sd_notify(1, "READY=1\n");

-+    if (prepared_sockets)

-+        /*

-+         * Clear the environment variable, we already processed all the sockets

-+         * by now.

-+         */

-+        netsnmp_sd_listen_fds(1);

-+#endif

-+

-+    /*

-      * Forever monitor the dest_port for incoming PDUs.  

-      */

-     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/snmptrapd.c

-+++ net-snmp-5.7.3/apps/snmptrapd.c	2015-02-17 13:34:05.736221851 +0100

-@@ -125,6 +125,10 @@ SOFTWARE.

- 

- #include <net-snmp/net-snmp-features.h>

- 

-+#ifndef NETSNMP_NO_SYSTEMD

-+#include <net-snmp/library/sd-daemon.h>

-+#endif

-+

- #ifndef BSD4_3

- #define BSD4_2

- #endif

-@@ -657,15 +661,22 @@ main(int argc, char *argv[])

-     int             agentx_subagent = 1;

- #endif

-     netsnmp_trapd_handler *traph;

-+    int             prepared_sockets = 0;

- 

- 

- #ifndef WIN32

-+#ifndef NETSNMP_NO_SYSTEMD

-+    /* check if systemd has sockets for us and don't close them */

-+    prepared_sockets = netsnmp_sd_listen_fds(0);

-+#endif

-     /*

-      * close all non-standard file descriptors we may have

-      * inherited from the shell.

-      */

--    for (i = getdtablesize() - 1; i > 2; --i) {

--        (void) close(i);

-+    if (!prepared_sockets) {

-+        for (i = getdtablesize() - 1; i > 2; --i) {

-+            (void) close(i);

-+        }

-     }

- #endif /* #WIN32 */

-     

-@@ -1318,6 +1329,19 @@ main(int argc, char *argv[])

- #endif

- #endif

- 

-+    /*

-+     * Let systemd know we're up.

-+     */

-+#ifndef NETSNMP_NO_SYSTEMD

-+    netsnmp_sd_notify(1, "READY=1\n");

-+    if (prepared_sockets)

-+        /*

-+         * Clear the environment variable, we already processed all the sockets

-+         * by now.

-+         */

-+        netsnmp_sd_listen_fds(1);

-+#endif

-+

- #ifdef WIN32SERVICE

-     trapd_status = 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	2015-02-17 13:34:05.737221850 +0100

-@@ -53,6 +53,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32"

-   other_ftobjs_list="$other_ftobjs_list winpipe.ft"

- fi

- 

-+# Linux systemd

-+if test "x$with_systemd" == "xyes"; then

-+  other_src_list="$other_src_list sd-daemon.c"

-+  other_objs_list="$other_objs_list sd-daemon.o"

-+  other_lobjs_list="$other_lobjs_list sd-daemon.lo"

-+  other_ftobjs_list="$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	2015-02-17 13:34:05.737221850 +0100

-@@ -690,6 +690,15 @@ if test "x$with_dummy_values" != "xyes";

-      data for])

- fi

- 

-+NETSNMP_ARG_WITH(systemd,

-+[  --with-systemd                 Provide systemd support. See README.systemd

-+                                  for details.])

-+# Define unless specifically suppressed (i.e., option defaults to false).

-+if test "x$with_systemd" != "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" = "xno"; then

-diff -up net-snmp-5.7.3/configure.MPGqYh net-snmp-5.7.3/configure

-+++ 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 agent

-                                   operated for versions < 4.0.

-+  --with-systemd                 Provide systemd support. See README.systemd

-+                                  for details.

-   --with-sys-contact="who@where"  Default system contact.

-                                     (Default: LOGIN@DOMAINNAME)

-   --with-sys-location="location"  Default system location.

-@@ -4398,6 +4402,24 @@ $as_echo "#define NETSNMP_NO_DUMMY_VALUE

- 

- fi

- 

-+

-+# Check whether --with-systemd was given.

-+if test "${with_systemd+set}" = set; then :

-+  withval=$with_systemd;

-+fi

-+

-+   # Check whether --enable-systemd was given.

-+if test "${enable_systemd+set}" = set; then :

-+  enableval=$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" != "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}" = set; then :

-   enableval=$enable_set_support;

-@@ -18639,6 +18661,14 @@ if test "x$PARTIALTARGETOS" = "xmingw32"

-   other_ftobjs_list="$other_ftobjs_list winpipe.ft"

- fi

- 

-+# Linux systemd

-+if test "x$with_systemd" == "xyes"; then

-+  other_src_list="$other_src_list sd-daemon.c"

-+  other_objs_list="$other_objs_list sd-daemon.o"

-+  other_lobjs_list="$other_lobjs_list sd-daemon.lo"

-+  other_ftobjs_list="$other_ftobjs_list sd-daemon.ft"

-+fi

-+

- 

- 

- 

-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	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 boot.

-+# Socket activation shall not be used. See README.systemd for details.

-+

-+[Unit]

-+Description=Simple Network Management Protocol (SNMP) daemon.

-+After=syslog.target network.target

-+

-+[Service]

-+# Type=notify is also supported. It should be set when snmpd.socket is not used.

-+Type=simple

-+ExecStart=/usr/sbin/snmpd -f

-+

-+[Install]

-+WantedBy=multi-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	2015-02-17 13:34:05.745221844 +0100

-@@ -0,0 +1,17 @@

-+[Unit]

-+Description=Socket listening for SNMP and AgentX messages

-+

-+[Socket]

-+ListenDatagram=0.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=0.0.0.0:161

-+# ListenDatagram=[::]:161

-+# ListenStream=[::]:161

-+#

-+# Uncomment AgentX socket if snmpd.conf enables AgentX protocol.

-+# ListenStream=/var/agentx/master

-+

-+[Install]

-+WantedBy=sockets.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	2015-02-17 13:34:05.745221844 +0100

-@@ -0,0 +1,16 @@

-+#

-+# SNMP trap-processing service file for systemd

-+#

-+

-+[Unit]

-+Description=Simple Network Management Protocol (SNMP) Trap daemon.

-+After=syslog.target network.target

-+

-+[Service]

-+# Type=notify is also supported. It should be set when snmptrapd.socket is not

-+# used.

-+Type=simple

-+ExecStart=/usr/sbin/snmptrapd -f

-+

-+[Install]

-+WantedBy=multi-user.target

-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	2015-02-17 13:34:05.745221844 +0100

-@@ -0,0 +1,14 @@

-+[Unit]

-+Description=Socket listening for SNMP trap messages

-+

-+[Socket]

-+ListenDatagram=0.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=0.0.0.0:162

-+# ListenDatagram=[::]:162

-+# ListenStream=[::]:162

-+

-+[Install]

-+WantedBy=sockets.target

-diff -up net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h.MPGqYh net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h

-+++ net-snmp-5.7.3/include/net-snmp/library/sd-daemon.h	2015-02-17 13:34:05.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 <sys/types.h>

-+#include <inttypes.h>

-+

-+#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__ >= 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 == 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=1      Tells systemd that daemon startup is finished (only

-+                  relevant for services of Type=notify). 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=1".

-+

-+     STATUS=...   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=Completed

-+                  66% of file system check..."

-+

-+     ERRNO=...    If a daemon fails, the errno-style error code,

-+                  formatted as string. Example: "ERRNO=2" for ENOENT.

-+

-+     BUSERROR=... If a daemon fails, the D-Bus error-style error

-+                  code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut"

-+

-+     MAINPID=...  The main pid of a daemon, in case systemd did not

-+                  fork off the process itself. Example: "MAINPID=4711"

-+

-+  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=1");

-+

-+  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=1\n"

-+                   "STATUS=Processing requests...\n"

-+                   "MAINPID=%lu",

-+                   (unsigned long) getpid());

-+

-+  Example 2: A daemon could send the following shortly before

-+  exiting, on failure:

-+

-+     sd_notifyf(0, "STATUS=Failed to start up: %s\n"

-+                   "ERRNO=%i",

-+                   strerror(errno),

-+                   errno);

-+

-+  See sd_notifyf(3) for more information.

-+*/

-+int netsnmp_sd_notifyf(int unset_environment, const char *format, ...) _sd_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 for

-+ * 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-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	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

- 

-+/* 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

- 

-diff -up net-snmp-5.7.3/README.systemd.MPGqYh net-snmp-5.7.3/README.systemd

-+++ 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. 

-+See http://www.freedesktop.org/wiki/Software/systemd to learn how

-+systemd works. Both socket activation and notification is supported by these

-+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=notification' and without a socket

-+   unit

-+2) or as snmpd service unit with 'Type=simple', appropriate socket socket unit

-+   and the snmpd service enabled. This way systemd creates the snmpd listening

-+   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 manually,

-+   depending if the snmpd support AgentX, IPv6, SMUX etc.

-+

-+snmpd should be started with '-f' command line parameter to disable forking -

-+systemd does that for us automatically.

-+

-+

-+snmptrapd - The trap processing daemon

-+--------------------------------------

-+snmptrapd supports full socket activation and also notification (if needed).