[Nut-upsdev] [nut-commits] svn commit r3225 - trunk/tools/nut-scanner

[Frédéric Bohé]

On Wed, 2011-09-14 at 12:24 +0000, Charles Lepple wrote:
> Author: clepple-guest
> Date: Wed Sep 14 12:24:58 2011
> New Revision: 3225
> URL: http://trac.networkupstools.org/projects/nut/changeset/3225
> 
> Log:
> Silence redefined PACKAGE_ macro warnings
> 
> This should be fixed properly upstream, but in the mean time, the SNMP-based
> tools can't use these macros properly (since they will have the values for
> Net-SNMP, not NUT).
> 
> Modified:
>    trunk/tools/nut-scanner/scan_snmp.c
> 
> Modified: trunk/tools/nut-scanner/scan_snmp.c
> ==============================================================================
> --- trunk/tools/nut-scanner/scan_snmp.c	Wed Sep 14 08:39:13 2011	(r3224)
> +++ trunk/tools/nut-scanner/scan_snmp.c	Wed Sep 14 12:24:58 2011	(r3225)
> @@ -26,6 +26,31 @@
>  #include <netinet/in.h>
>  #include <arpa/inet.h>
>  #include <stdio.h>
> +
> +/* workaround for buggy Net-SNMP config
> + * from drivers/snmp-ups.h */
> +#ifdef PACKAGE_BUGREPORT
> +#undef PACKAGE_BUGREPORT
> +#endif
> +
> +#ifdef PACKAGE_NAME
> +#undef PACKAGE_NAME
> +#endif
> +
> +#ifdef PACKAGE_VERSION
> +#undef PACKAGE_VERSION
> +#endif
> +
> +#ifdef PACKAGE_STRING
> +#undef PACKAGE_STRING
> +#endif
> +
> +#ifdef PACKAGE_TARNAME
> +#undef PACKAGE_TARNAME
> +#endif
> +
> +#endif
> +
>  #include <net-snmp/net-snmp-config.h>
>  #include <net-snmp/net-snmp-includes.h>
>  #ifdef HAVE_PTHREAD
> 

I am not sure this one is needed. It seems that, on Solaris,
nut-scanner uses a very old net-snmp library lying in /usr/sfw on the
buildbot. Using this library raise an error on usmAESPrivProtocol
constant.
When building the snmp-ups driver, the tool chain uses a newer net-snmp
libray lying in /usr/local, which do not raise the error on
usmAESPrivProtocol and hopefully shouldn't require this commit.
I am in the process of trying to remove this old library on the buildbot
but I am not very familiar with SunOS so I try to be very careful.

Regards,
Fred



--------------------------------------------------------------------------