b2dc2d3287
- Decouple snmp-mibs from net-snmp version to allow major version upgrade (bsc#1196955). - Fix LFH violation during v3 user creation (bsc#1181591). Add net-snmp-5.9.1-fix-create-v3-user-outfile.patch - Fix subagent crash at save_set_var() (bsc#1178021). Add net-snmp-5.9.1-subagent-set-response.patch - Fix missing sysconfig files creation (bsc#1108471). - Rename patches to version number 5.9.1: delete: * net-snmp-5.8-socket-path.patch * net-snmp-5.8-testing-empty-arptable.patch * net-snmp-5.8-pie.patch * net-snmp-5.8-net-snmp-config-headercheck.patch * net-snmp-5.8-perl-tk-warning.patch * net-snmp-5.8-velocity-mib.patch * net-snmp-5.8-snmpstatus-suppress-output.patch * net-snmp-5.8-fix-Makefile.PL.patch * net-snmp-5.8-modern-rpm-api.patch add: * net-snmp-5.9.1-socket-path.patch * net-snmp-5.9.1-testing-empty-arptable.patch * net-snmp-5.9.1-pie.patch * net-snmp-5.9.1-net-snmp-config-headercheck.patch * net-snmp-5.9.1-perl-tk-warning.patch * net-snmp-5.9.1-velocity-mib.patch * net-snmp-5.9.1-snmpstatus-suppress-output.patch * net-snmp-5.9.1-fix-Makefile.PL.patch * net-snmp-5.9.1-modern-rpm-api.patch OBS-URL: https://build.opensuse.org/request/show/966059 OBS-URL: https://build.opensuse.org/package/show/network:utilities/net-snmp?expand=0&rev=42
85 lines
2.5 KiB
Diff
85 lines
2.5 KiB
Diff
diff -Nurp net-snmp-5.8-orig/net-snmp-config.in net-snmp-5.8/net-snmp-config.in
|
|
--- net-snmp-5.8-orig/net-snmp-config.in 2018-10-10 09:45:14.947075442 +0000
|
|
+++ net-snmp-5.8/net-snmp-config.in 2018-10-10 09:48:04.792631474 +0000
|
|
@@ -41,6 +41,14 @@ count()
|
|
echo $#
|
|
}
|
|
|
|
+check_devel_files()
|
|
+{
|
|
+ if [ ! -e "${NSC_INCDIR}/net-snmp/net-snmp-config.h" ] ; then
|
|
+ echo "Can not find \"${NSC_INCDIR}/net-snmp/net-snmp-config.h\". The net-snmp development files seems to be missing. Exiting" >&2
|
|
+ # exit 2
|
|
+ fi
|
|
+}
|
|
+
|
|
prefix=@prefix@
|
|
exec_prefix=@exec_prefix@
|
|
includedir=@includedir@
|
|
@@ -140,9 +148,11 @@ else
|
|
;;
|
|
#################################################### compile
|
|
--base-cflags)
|
|
+ check_devel_files
|
|
echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
|
|
;;
|
|
--cflags|--cf*)
|
|
+ check_devel_files
|
|
echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
|
|
;;
|
|
--srcdir)
|
|
@@ -153,6 +163,7 @@ else
|
|
echo $NSC_LIBDIR
|
|
;;
|
|
--ldflags|--ld*)
|
|
+ check_devel_files
|
|
echo $NSC_LDFLAGS
|
|
;;
|
|
--build-lib-dirs)
|
|
@@ -190,29 +201,37 @@ else
|
|
#################################################### client lib
|
|
--libs)
|
|
# use this one == --netsnmp-libs + --external-libs
|
|
+ check_devel_files
|
|
echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS
|
|
;;
|
|
--netsnmp-libs)
|
|
+ check_devel_files
|
|
echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS
|
|
;;
|
|
--external-libs)
|
|
+ check_devel_files
|
|
echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@
|
|
;;
|
|
#################################################### agent lib
|
|
--base-agent-libs)
|
|
+ check_devel_files
|
|
echo $NSC_BASE_AGENT_LIBS
|
|
;;
|
|
--base-subagent-libs)
|
|
+ check_devel_files
|
|
echo $NSC_BASE_SUBAGENT_LIBS
|
|
;;
|
|
--agent-libs)
|
|
# use this one == --netsnmp-agent-libs + --external-libs
|
|
+ check_devel_files
|
|
echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS
|
|
;;
|
|
--netsnmp-agent-libs)
|
|
+ check_devel_files
|
|
echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
|
|
;;
|
|
--external-agent-libs)
|
|
+ check_devel_files
|
|
echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS
|
|
;;
|
|
####################################################
|
|
@@ -238,6 +257,7 @@ else
|
|
|
|
####################################################
|
|
--compile-subagent)
|
|
+ check_devel_files
|
|
shift
|
|
shifted=1
|
|
while test "x$done" = "x" -a "x$1" != "x" ; do
|