Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 202399 | Differences between
and this patch

Collapse All | Expand All

(-)net-snmp-5.4.1.1/agent/mibgroup/host/hr_swinst.c.jbj (-1 / +7 lines)
Lines 41-48 Link Here
41
#endif
41
#endif
42
42
43
#ifdef HAVE_LIBRPM
43
#ifdef HAVE_LIBRPM
44
#include <stdio.h>
45
#include <stdint.h>
44
#include <rpm/rpmlib.h>
46
#include <rpm/rpmlib.h>
45
#include <rpm/header.h>
47
#include <rpm/rpm4compat.h>
46
#include <fcntl.h>
48
#include <fcntl.h>
47
49
48
#ifdef HAVE_RPMGETPATH
50
#ifdef HAVE_RPMGETPATH
Lines 465-470 var_hrswinst(struct variable * vp, Link Here
465
            if ( headerGetEntry(swi->swi_h, RPMTAG_INSTALLTIME, NULL, (void **) &rpm_data, NULL) ) {
467
            if ( headerGetEntry(swi->swi_h, RPMTAG_INSTALLTIME, NULL, (void **) &rpm_data, NULL) ) {
466
                time_t          installTime = *rpm_data;
468
                time_t          installTime = *rpm_data;
467
                ret = date_n_time(&installTime, var_len);
469
                ret = date_n_time(&installTime, var_len);
470
		free((void *)rpm_data);
468
            } else {
471
            } else {
469
                ret = date_n_time(0, var_len);
472
                ret = date_n_time(0, var_len);
470
            }
473
            }
Lines 661-666 Save_HR_SW_info(int ix) Link Here
661
                       NULL);
664
                       NULL);
662
        snprintf(swi->swi_name, sizeof(swi->swi_name), "%s-%s-%s", n, v, r);
665
        snprintf(swi->swi_name, sizeof(swi->swi_name), "%s-%s-%s", n, v, r);
663
        swi->swi_name[ sizeof(swi->swi_name)-1 ] = 0;
666
        swi->swi_name[ sizeof(swi->swi_name)-1 ] = 0;
667
	free((void *)n);
668
	free((void *)v);
669
	free((void *)r);
664
    }
670
    }
665
#else
671
#else
666
    snprintf(swi->swi_name, sizeof(swi->swi_name), swi->swi_dep->d_name);
672
    snprintf(swi->swi_name, sizeof(swi->swi_name), swi->swi_dep->d_name);
(-)net-snmp-5.4.1.1/configure.jbj (-39 / +38 lines)
Lines 25823-25829 cat >>conftest.$ac_ext <<_ACEOF Link Here
25823
#include NETSNMP_SYSTEM_INCLUDE_FILE
25823
#include NETSNMP_SYSTEM_INCLUDE_FILE
25824
#include "$srcdir/$mibdir/$i.h"
25824
#include "$srcdir/$mibdir/$i.h"
25825
_ACEOF
25825
_ACEOF
25826
    mv conftest.$ac_ext module_tmp_header.h
25826
    mv conftest.$ac_ext module_tmp_rpmtag.h
25827
25827
25828
    #---------------------
25828
    #---------------------
25829
    # macro: config_belongs_in(ARG)
25829
    # macro: config_belongs_in(ARG)
Lines 25834-25840 _ACEOF Link Here
25834
    module_type=mib_module
25834
    module_type=mib_module
25835
    if test -f $srcdir/$mibdir/$i.h; then
25835
    if test -f $srcdir/$mibdir/$i.h; then
25836
25836
25837
      module_type=`$MODULECPP module_tmp_header.h | grep config_belongs_in | sed 's@.*config_belongs_in(\([^)]*\)).*@\1@'`
25837
      module_type=`$MODULECPP module_tmp_rpmtag.h | grep config_belongs_in | sed 's@.*config_belongs_in(\([^)]*\)).*@\1@'`
25838
25838
25839
    fi
25839
    fi
25840
    if test "x$module_type" = "x" ; then
25840
    if test "x$module_type" = "x" ; then
Lines 25934-25940 _ACEOF Link Here
25934
      	#
25934
      	#
25935
        # check if $i has any conflicts
25935
        # check if $i has any conflicts
25936
        #
25936
        #
25937
	new_list_excl=`$MODULECPP module_tmp_header.h | grep config_exclude | sed 's/.*config_exclude(\(.*\)).*/\1/'`
25937
	new_list_excl=`$MODULECPP module_tmp_rpmtag.h | grep config_exclude | sed 's/.*config_exclude(\(.*\)).*/\1/'`
25938
	if test "x$new_list_excl" != "x"; then
25938
	if test "x$new_list_excl" != "x"; then
25939
25939
25940
  if test $module_debug = 1; then
25940
  if test $module_debug = 1; then
Lines 25980-25986 EOF Link Here
25980
        # check if $i has any architecture specific requirements
25980
        # check if $i has any architecture specific requirements
25981
        #
25981
        #
25982
25982
25983
        new_list_arch=`$MODULECPP module_tmp_header.h | grep config_arch_require | sed 's/.*config_arch_require( *\([^ ]*\) *, *\([^ ]*\) *).*/\1-xarchx-\2/'`
25983
        new_list_arch=`$MODULECPP module_tmp_rpmtag.h | grep config_arch_require | sed 's/.*config_arch_require( *\([^ ]*\) *, *\([^ ]*\) *).*/\1-xarchx-\2/'`
25984
25984
25985
	if test "x$new_list_arch" != "x"; then
25985
	if test "x$new_list_arch" != "x"; then
25986
          for j in $new_list_arch
25986
          for j in $new_list_arch
Lines 26011-26017 EOF Link Here
26011
        #
26011
        #
26012
        # check if $i has any other required modules
26012
        # check if $i has any other required modules
26013
        #
26013
        #
26014
	new_list="$new_list `$MODULECPP module_tmp_header.h | grep config_require | sed 's/.*config_require(\(.*\)).*/\1/'`"
26014
	new_list="$new_list `$MODULECPP module_tmp_rpmtag.h | grep config_require | sed 's/.*config_require(\(.*\)).*/\1/'`"
26015
26015
26016
  if test $module_debug = 1; then
26016
  if test $module_debug = 1; then
26017
    echo " $i will test: $new_list"
26017
    echo " $i will test: $new_list"
Lines 26072-26078 EOF Link Here
26072
        #
26072
        #
26073
        # check if $i has any mibs to add
26073
        # check if $i has any mibs to add
26074
        #
26074
        #
26075
	new_mibs=`$MODULECPP module_tmp_header.h | grep config_add_mib | sed 's/.*config_add_mib(\(.*\)).*/\1/'`
26075
	new_mibs=`$MODULECPP module_tmp_rpmtag.h | grep config_add_mib | sed 's/.*config_add_mib(\(.*\)).*/\1/'`
26076
	if test "x$new_mibs" != "x"; then
26076
	if test "x$new_mibs" != "x"; then
26077
	    for j in $new_mibs
26077
	    for j in $new_mibs
26078
		do
26078
		do
Lines 26113-26119 EOF Link Here
26113
        #-------------------
26113
        #-------------------
26114
        # check for unsupported config_load_mib
26114
        # check for unsupported config_load_mib
26115
        #
26115
        #
26116
        if $MODULECPP module_tmp_header.h | grep config_load_mib > /dev/null 2>&1; then
26116
        if $MODULECPP module_tmp_rpmtag.h | grep config_load_mib > /dev/null 2>&1; then
26117
          { echo "$as_me:$LINENO: WARNING: mib module error" >&5
26117
          { echo "$as_me:$LINENO: WARNING: mib module error" >&5
26118
echo "$as_me: WARNING: mib module error" >&2;}
26118
echo "$as_me: WARNING: mib module error" >&2;}
26119
      	  { echo "$as_me:$LINENO: WARNING: mib module \"$i\" uses the \"config_load_mib\" directive, which is no longer supported.  It probably won't work." >&5
26119
      	  { echo "$as_me:$LINENO: WARNING: mib module \"$i\" uses the \"config_load_mib\" directive, which is no longer supported.  It probably won't work." >&5
Lines 26125-26131 echo "$as_me: WARNING: mib module \"$i\" Link Here
26125
        #  (generally not used any longer; old auto-load a .conf token)
26125
        #  (generally not used any longer; old auto-load a .conf token)
26126
        #
26126
        #
26127
26127
26128
        $MODULECPP module_tmp_header.h | grep config_parse_dot_conf | sed 's@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@' >> $mibdir/mib_module_dot_conf.h
26128
        $MODULECPP module_tmp_rpmtag.h | grep config_parse_dot_conf | sed 's@.*config_parse_dot_conf(\([^)]*\), *\([^),]*\), *\([^),]*\), *\([^),]*\)).*@register_config_handler("snmpd",\1, \2, \3, \4);@' >> $mibdir/mib_module_dot_conf.h
26129
26129
26130
26130
26131
        #---------------------
26131
        #---------------------
Lines 26134-26140 echo "$as_me: WARNING: mib module \"$i\" Link Here
26134
        #
26134
        #
26135
        # check if $i has any errors, or warnings
26135
        # check if $i has any errors, or warnings
26136
        #
26136
        #
26137
	error=`$MODULECPP module_tmp_header.h | grep config_error | sed 's/.*config_error(\(.*\)).*/\1/'`
26137
	error=`$MODULECPP module_tmp_rpmtag.h | grep config_error | sed 's/.*config_error(\(.*\)).*/\1/'`
26138
	if test "x$error" != "x"; then
26138
	if test "x$error" != "x"; then
26139
          echo
26139
          echo
26140
          echo
26140
          echo
Lines 26147-26153 echo "$as_me: error: $i: *** $error ***" Link Here
26147
      	# macro: config_warning(warning text)
26147
      	# macro: config_warning(warning text)
26148
      	#  - used to signal a configuration "warning" to be printed to the user
26148
      	#  - used to signal a configuration "warning" to be printed to the user
26149
        #
26149
        #
26150
	warning=`$MODULECPP module_tmp_header.h | grep config_warning | sed 's/.*config_warning(\(.*\)).*/\1/'`
26150
	warning=`$MODULECPP module_tmp_rpmtag.h | grep config_warning | sed 's/.*config_warning(\(.*\)).*/\1/'`
26151
	if test "x$warning" != "x"; then
26151
	if test "x$warning" != "x"; then
26152
          all_warnings="$all_warnings $warning
26152
          all_warnings="$all_warnings $warning
26153
"
26153
"
Lines 26384-26390 EOFOCFIN Link Here
26384
done
26384
done
26385
26385
26386
# cleanup
26386
# cleanup
26387
rm -f module_tmp_header.h
26387
rm -f module_tmp_rpmtag.h
26388
26388
26389
#-------------------
26389
#-------------------
26390
# build module lists for Makefiles
26390
# build module lists for Makefiles
Lines 28388-28395 rm -f conftest.err conftest.$ac_objext \ Link Here
28388
fi;
28388
fi;
28389
28389
28390
28390
28391
28391
for ac_header in rpm/rpmlib.h rpm/rpmtag.h
28392
for ac_header in rpm/rpmlib.h rpm/header.h
28393
do
28392
do
28394
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
28393
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
28395
if eval "test \"\${$as_ac_Header+set}\" = set"; then
28394
if eval "test \"\${$as_ac_Header+set}\" = set"; then
Lines 28684-28691 fi Link Here
28684
28683
28685
28684
28686
if test "${ac_cv_header_rpm_header_h+set}" = set; then
28685
if test "${ac_cv_header_rpm_header_h+set}" = set; then
28687
  echo "$as_me:$LINENO: checking for rpm/header.h" >&5
28686
  echo "$as_me:$LINENO: checking for rpm/rpmtag.h" >&5
28688
echo $ECHO_N "checking for rpm/header.h... $ECHO_C" >&6
28687
echo $ECHO_N "checking for rpm/rpmtag.h... $ECHO_C" >&6
28689
if test "${ac_cv_header_rpm_header_h+set}" = set; then
28688
if test "${ac_cv_header_rpm_header_h+set}" = set; then
28690
  echo $ECHO_N "(cached) $ECHO_C" >&6
28689
  echo $ECHO_N "(cached) $ECHO_C" >&6
28691
fi
28690
fi
Lines 28693-28700 echo "$as_me:$LINENO: result: $ac_cv_hea Link Here
28693
echo "${ECHO_T}$ac_cv_header_rpm_header_h" >&6
28692
echo "${ECHO_T}$ac_cv_header_rpm_header_h" >&6
28694
else
28693
else
28695
  # Is the header compilable?
28694
  # Is the header compilable?
28696
echo "$as_me:$LINENO: checking rpm/header.h usability" >&5
28695
echo "$as_me:$LINENO: checking rpm/rpmtag.h usability" >&5
28697
echo $ECHO_N "checking rpm/header.h usability... $ECHO_C" >&6
28696
echo $ECHO_N "checking rpm/rpmtag.h usability... $ECHO_C" >&6
28698
cat >conftest.$ac_ext <<_ACEOF
28697
cat >conftest.$ac_ext <<_ACEOF
28699
/* confdefs.h.  */
28698
/* confdefs.h.  */
28700
_ACEOF
28699
_ACEOF
Lines 28702-28708 cat confdefs.h >>conftest.$ac_ext Link Here
28702
cat >>conftest.$ac_ext <<_ACEOF
28701
cat >>conftest.$ac_ext <<_ACEOF
28703
/* end confdefs.h.  */
28702
/* end confdefs.h.  */
28704
$ac_includes_default
28703
$ac_includes_default
28705
#include <rpm/header.h>
28704
#include <rpm/rpmtag.h>
28706
_ACEOF
28705
_ACEOF
28707
rm -f conftest.$ac_objext
28706
rm -f conftest.$ac_objext
28708
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
28707
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
Lines 28738-28752 echo "$as_me:$LINENO: result: $ac_header Link Here
28738
echo "${ECHO_T}$ac_header_compiler" >&6
28737
echo "${ECHO_T}$ac_header_compiler" >&6
28739
28738
28740
# Is the header present?
28739
# Is the header present?
28741
echo "$as_me:$LINENO: checking rpm/header.h presence" >&5
28740
echo "$as_me:$LINENO: checking rpm/rpmtag.h presence" >&5
28742
echo $ECHO_N "checking rpm/header.h presence... $ECHO_C" >&6
28741
echo $ECHO_N "checking rpm/rpmtag.h presence... $ECHO_C" >&6
28743
cat >conftest.$ac_ext <<_ACEOF
28742
cat >conftest.$ac_ext <<_ACEOF
28744
/* confdefs.h.  */
28743
/* confdefs.h.  */
28745
_ACEOF
28744
_ACEOF
28746
cat confdefs.h >>conftest.$ac_ext
28745
cat confdefs.h >>conftest.$ac_ext
28747
cat >>conftest.$ac_ext <<_ACEOF
28746
cat >>conftest.$ac_ext <<_ACEOF
28748
/* end confdefs.h.  */
28747
/* end confdefs.h.  */
28749
#include <rpm/header.h>
28748
#include <rpm/rpmtag.h>
28750
_ACEOF
28749
_ACEOF
28751
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
28750
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
28752
  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
28751
  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Lines 28780-28804 echo "${ECHO_T}$ac_header_preproc" >&6 Link Here
28780
# So?  What about this header?
28779
# So?  What about this header?
28781
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
28780
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
28782
  yes:no: )
28781
  yes:no: )
28783
    { echo "$as_me:$LINENO: WARNING: rpm/header.h: accepted by the compiler, rejected by the preprocessor!" >&5
28782
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: accepted by the compiler, rejected by the preprocessor!" >&5
28784
echo "$as_me: WARNING: rpm/header.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
28783
echo "$as_me: WARNING: rpm/rpmtag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
28785
    { echo "$as_me:$LINENO: WARNING: rpm/header.h: proceeding with the compiler's result" >&5
28784
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: proceeding with the compiler's result" >&5
28786
echo "$as_me: WARNING: rpm/header.h: proceeding with the compiler's result" >&2;}
28785
echo "$as_me: WARNING: rpm/rpmtag.h: proceeding with the compiler's result" >&2;}
28787
    ac_header_preproc=yes
28786
    ac_header_preproc=yes
28788
    ;;
28787
    ;;
28789
  no:yes:* )
28788
  no:yes:* )
28790
    { echo "$as_me:$LINENO: WARNING: rpm/header.h: present but cannot be compiled" >&5
28789
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: present but cannot be compiled" >&5
28791
echo "$as_me: WARNING: rpm/header.h: present but cannot be compiled" >&2;}
28790
echo "$as_me: WARNING: rpm/rpmtag.h: present but cannot be compiled" >&2;}
28792
    { echo "$as_me:$LINENO: WARNING: rpm/header.h:     check for missing prerequisite headers?" >&5
28791
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h:     check for missing prerequisite headers?" >&5
28793
echo "$as_me: WARNING: rpm/header.h:     check for missing prerequisite headers?" >&2;}
28792
echo "$as_me: WARNING: rpm/rpmtag.h:     check for missing prerequisite headers?" >&2;}
28794
    { echo "$as_me:$LINENO: WARNING: rpm/header.h: see the Autoconf documentation" >&5
28793
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: see the Autoconf documentation" >&5
28795
echo "$as_me: WARNING: rpm/header.h: see the Autoconf documentation" >&2;}
28794
echo "$as_me: WARNING: rpm/rpmtag.h: see the Autoconf documentation" >&2;}
28796
    { echo "$as_me:$LINENO: WARNING: rpm/header.h:     section \"Present But Cannot Be Compiled\"" >&5
28795
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h:     section \"Present But Cannot Be Compiled\"" >&5
28797
echo "$as_me: WARNING: rpm/header.h:     section \"Present But Cannot Be Compiled\"" >&2;}
28796
echo "$as_me: WARNING: rpm/rpmtag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
28798
    { echo "$as_me:$LINENO: WARNING: rpm/header.h: proceeding with the preprocessor's result" >&5
28797
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: proceeding with the preprocessor's result" >&5
28799
echo "$as_me: WARNING: rpm/header.h: proceeding with the preprocessor's result" >&2;}
28798
echo "$as_me: WARNING: rpm/rpmtag.h: proceeding with the preprocessor's result" >&2;}
28800
    { echo "$as_me:$LINENO: WARNING: rpm/header.h: in the future, the compiler will take precedence" >&5
28799
    { echo "$as_me:$LINENO: WARNING: rpm/rpmtag.h: in the future, the compiler will take precedence" >&5
28801
echo "$as_me: WARNING: rpm/header.h: in the future, the compiler will take precedence" >&2;}
28800
echo "$as_me: WARNING: rpm/rpmtag.h: in the future, the compiler will take precedence" >&2;}
28802
    (
28801
    (
28803
      cat <<\_ASBOX
28802
      cat <<\_ASBOX
28804
## ---------------------------------------------------- ##
28803
## ---------------------------------------------------- ##
Lines 28809-28816 _ASBOX Link Here
28809
      sed "s/^/$as_me: WARNING:     /" >&2
28808
      sed "s/^/$as_me: WARNING:     /" >&2
28810
    ;;
28809
    ;;
28811
esac
28810
esac
28812
echo "$as_me:$LINENO: checking for rpm/header.h" >&5
28811
echo "$as_me:$LINENO: checking for rpm/rpmtag.h" >&5
28813
echo $ECHO_N "checking for rpm/header.h... $ECHO_C" >&6
28812
echo $ECHO_N "checking for rpm/rpmtag.h... $ECHO_C" >&6
28814
if test "${ac_cv_header_rpm_header_h+set}" = set; then
28813
if test "${ac_cv_header_rpm_header_h+set}" = set; then
28815
  echo $ECHO_N "(cached) $ECHO_C" >&6
28814
  echo $ECHO_N "(cached) $ECHO_C" >&6
28816
else
28815
else

Return to bug 202399