[Pkg-net-snmp-commits] r320 - branches/net-snmp54/debian branches/net-snmp54/debian/patches branches/net-snmp54-dev/debian branches/net-snmp54-dev/debian/patches trunk/debian
Jochen Friedrich
jochen at alioth.debian.org
Tue Dec 1 17:44:55 UTC 2009
Author: jochen
Date: 2009-12-01 17:44:54 +0000 (Tue, 01 Dec 2009)
New Revision: 320
Added:
branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README
branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.patch
branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README
branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch
Modified:
branches/net-snmp54-dev/debian/patches/series
branches/net-snmp54-dev/debian/rules
branches/net-snmp54/debian/changelog
branches/net-snmp54/debian/patches/series
branches/net-snmp54/debian/rules
trunk/debian/rules
Log:
Add patch from Pino Toscano for hurd-i386 support.
Modified: branches/net-snmp54/debian/changelog
===================================================================
--- branches/net-snmp54/debian/changelog 2009-12-01 17:41:00 UTC (rev 319)
+++ branches/net-snmp54/debian/changelog 2009-12-01 17:44:54 UTC (rev 320)
@@ -8,8 +8,10 @@
Remove the download scripts from this package (Closes: #557434, #557682)
* Move net-snmp-config to libsnmp15 as it contains platform dependent
code (Closes: #558488). Also clean up old Replaces / Conflicts.
+ * Add patch from Pino Toscano <pino at kde.org> for hurd-i386 support.
+ Closes: #530289.
- -- Jochen Friedrich <jochen at scram.de> Tue, 01 Dec 2009 13:39:32 +0100
+ -- Jochen Friedrich <jochen at scram.de> Tue, 01 Dec 2009 18:38:08 +0100
net-snmp (5.4.2.1~dfsg-3) unstable; urgency=low
Added: branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README
===================================================================
--- branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README (rev 0)
+++ branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.README 2009-12-01 17:44:54 UTC (rev 320)
@@ -0,0 +1 @@
+Do not call vacm_standard_views() if the corresponding module was not compiled.
Added: branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch
===================================================================
--- branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch (rev 0)
+++ branches/net-snmp54/debian/patches/61_vacm_missing_dependency_check.patch 2009-12-01 17:44:54 UTC (rev 320)
@@ -0,0 +1,53 @@
+--- a/agent/agent_read_config.c
++++ b/agent/agent_read_config.c
+@@ -282,7 +282,9 @@
+ snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
+ SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
+ free_config();
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ vacm_standard_views(0,0,NULL,NULL);
++#endif
+ read_configs();
+ }
+
+--- a/apps/snmptrapd.c
++++ b/apps/snmptrapd.c
+@@ -1477,7 +1477,9 @@
+ trapd_update_config(void)
+ {
+ free_config();
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ vacm_standard_views(0,0,NULL,NULL);
++#endif
+ read_configs();
+ }
+
+--- a/apps/snmptrapd_auth.c
++++ b/apps/snmptrapd_auth.c
+@@ -32,8 +32,10 @@
+ netsnmp_trapd_auth);
+ traph->authtypes = TRAP_AUTH_NONE;
+
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ /* register our configuration tokens for VACM configs */
+ init_vacm_config_tokens();
++#endif
+
+ /* register a config token for turning off the authorization entirely */
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmptrapd", "disableAuthorization",
+@@ -109,6 +111,7 @@
+ return NETSNMPTRAPD_HANDLER_FINISH;
+ }
+
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ /* check the pdu against each typo of VACM access we may want to
+ check up on later. We cache the results for future lookup on
+ each call to netsnmp_trapd_check_auth */
+@@ -125,6 +128,7 @@
+ }
+ }
+ DEBUGMSGTL(("snmptrapd:auth", "Final bitmask auth: %x\n", ret));
++#endif
+
+ if (ret) {
+ /* we have policy to at least do "something". Remember and continue. */
Modified: branches/net-snmp54/debian/patches/series
===================================================================
--- branches/net-snmp54/debian/patches/series 2009-12-01 17:41:00 UTC (rev 319)
+++ branches/net-snmp54/debian/patches/series 2009-12-01 17:44:54 UTC (rev 320)
@@ -13,3 +13,4 @@
57_fix_ipv6_memleak.patch
59_fix_python.patch
60_libsensors_api.patch
+61_vacm_missing_dependency_check.patch
Modified: branches/net-snmp54/debian/rules
===================================================================
--- branches/net-snmp54/debian/rules 2009-12-01 17:41:00 UTC (rev 319)
+++ branches/net-snmp54/debian/rules 2009-12-01 17:44:54 UTC (rev 320)
@@ -7,7 +7,8 @@
COMPAT_VERSION = $(UPSTREAM_VERSION)~dfsg
PYTHON_VERSION = 1.0a1
-MIB_MODULES = host smux ucd-snmp/dlmod
+MIB_MODULES = smux ucd-snmp/dlmod
+EXCL_MIB_MODULES =
PYVERS=$(shell pyversions -vr)
@@ -21,14 +22,20 @@
DEB_DH_GENCONTROL_ARGS=-- -Vos-specific-dev="libkvm-dev"
endif
endif
+ifeq (hurd,$(DEB_HOST_ARCH_OS))
+IPV6 = --enable-ipv6
+EXCL_MIB_MODULES += mibII
+else
+MIB_MODULES += host
+endif
%:
dh --with quilt,python-central $@
.PHONY: override_dh_auto_configure
override_dh_auto_configure:
- ln -s /usr/share/misc/config.guess .
- ln -s /usr/share/misc/config.sub .
+ ln -f -s /usr/share/misc/config.guess .
+ ln -f -s /usr/share/misc/config.sub .
libtoolize --install --copy
aclocal
autoheader
@@ -43,6 +50,7 @@
--without-dmalloc --without-efence --without-rsaref \
--with-sys-contact="root" --with-sys-location="Unknown" \
--with-mib-modules="$(MIB_MODULES)" \
+ --with-out-mib-modules="$(EXCL_MIB_MODULES)" \
--enable-mfd-rewrites \
--with-mnttab=/etc/mtab \
--with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
Added: branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README
===================================================================
--- branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README (rev 0)
+++ branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.README 2009-12-01 17:44:54 UTC (rev 320)
@@ -0,0 +1 @@
+Do not call vacm_standard_views() if the corresponding module was not compiled.
Added: branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.patch (rev 0)
+++ branches/net-snmp54-dev/debian/patches/61_vacm_missing_dependency_check.patch 2009-12-01 17:44:54 UTC (rev 320)
@@ -0,0 +1,53 @@
+--- a/agent/agent_read_config.c
++++ b/agent/agent_read_config.c
+@@ -282,7 +282,9 @@
+ snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
+ SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
+ free_config();
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ vacm_standard_views(0,0,NULL,NULL);
++#endif
+ read_configs();
+ }
+
+--- a/apps/snmptrapd.c
++++ b/apps/snmptrapd.c
+@@ -1477,7 +1477,9 @@
+ trapd_update_config(void)
+ {
+ free_config();
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ vacm_standard_views(0,0,NULL,NULL);
++#endif
+ read_configs();
+ }
+
+--- a/apps/snmptrapd_auth.c
++++ b/apps/snmptrapd_auth.c
+@@ -32,8 +32,10 @@
+ netsnmp_trapd_auth);
+ traph->authtypes = TRAP_AUTH_NONE;
+
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ /* register our configuration tokens for VACM configs */
+ init_vacm_config_tokens();
++#endif
+
+ /* register a config token for turning off the authorization entirely */
+ netsnmp_ds_register_config(ASN_BOOLEAN, "snmptrapd", "disableAuthorization",
+@@ -109,6 +111,7 @@
+ return NETSNMPTRAPD_HANDLER_FINISH;
+ }
+
++#ifdef USING_MIBII_VACM_CONF_MODULE
+ /* check the pdu against each typo of VACM access we may want to
+ check up on later. We cache the results for future lookup on
+ each call to netsnmp_trapd_check_auth */
+@@ -125,6 +128,7 @@
+ }
+ }
+ DEBUGMSGTL(("snmptrapd:auth", "Final bitmask auth: %x\n", ret));
++#endif
+
+ if (ret) {
+ /* we have policy to at least do "something". Remember and continue. */
Modified: branches/net-snmp54-dev/debian/patches/series
===================================================================
--- branches/net-snmp54-dev/debian/patches/series 2009-12-01 17:41:00 UTC (rev 319)
+++ branches/net-snmp54-dev/debian/patches/series 2009-12-01 17:44:54 UTC (rev 320)
@@ -9,3 +9,4 @@
31_silence_subcontainer.patch
32_mnttab_path.patch
56_manpage.patch
+61_vacm_missing_dependency_check.patch
Modified: branches/net-snmp54-dev/debian/rules
===================================================================
--- branches/net-snmp54-dev/debian/rules 2009-12-01 17:41:00 UTC (rev 319)
+++ branches/net-snmp54-dev/debian/rules 2009-12-01 17:44:54 UTC (rev 320)
@@ -7,7 +7,8 @@
COMPAT_VERSION = $(UPSTREAM_VERSION)~dfsg
PYTHON_VERSION = 1.0a1
-MIB_MODULES = host smux ucd-snmp/dlmod
+MIB_MODULES = smux ucd-snmp/dlmod
+EXCL_MIB_MODULES =
PYVERS=$(shell pyversions -vr)
@@ -21,14 +22,20 @@
DEB_DH_GENCONTROL_ARGS=-- -Vos-specific-dev="libkvm-dev"
endif
endif
+ifeq (hurd,$(DEB_HOST_ARCH_OS))
+IPV6 = --enable-ipv6
+EXCL_MIB_MODULES += mibII
+else
+MIB_MODULES += host
+endif
%:
dh --with quilt,python-central $@
.PHONY: override_dh_auto_configure
override_dh_auto_configure:
- ln -s /usr/share/misc/config.guess .
- ln -s /usr/share/misc/config.sub .
+ ln -f -s /usr/share/misc/config.guess .
+ ln -f -s /usr/share/misc/config.sub .
libtoolize --install --copy
aclocal
autoheader
@@ -43,6 +50,7 @@
--without-dmalloc --without-efence --without-rsaref \
--with-sys-contact="root" --with-sys-location="Unknown" \
--with-mib-modules="$(MIB_MODULES)" \
+ --with-out-mib-modules="$(EXCL_MIB_MODULES)" \
--enable-mfd-rewrites \
--with-mnttab=/etc/mtab \
--with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-12-01 17:41:00 UTC (rev 319)
+++ trunk/debian/rules 2009-12-01 17:44:54 UTC (rev 320)
@@ -7,7 +7,8 @@
COMPAT_VERSION = $(UPSTREAM_VERSION)~dfsg
PYTHON_VERSION = 1.0a1
-MIB_MODULES = host smux ucd-snmp/dlmod
+MIB_MODULES = smux ucd-snmp/dlmod
+EXCL_MIB_MODULES =
PYVERS=$(shell pyversions -vr)
@@ -21,14 +22,20 @@
DEB_DH_GENCONTROL_ARGS=-- -Vos-specific-dev="libkvm-dev"
endif
endif
+ifeq (hurd,$(DEB_HOST_ARCH_OS))
+IPV6 = --enable-ipv6
+EXCL_MIB_MODULES += mibII
+else
+MIB_MODULES += host
+endif
%:
dh --with quilt,python-central $@
.PHONY: override_dh_auto_configure
override_dh_auto_configure:
- ln -s /usr/share/misc/config.guess .
- ln -s /usr/share/misc/config.sub .
+ ln -f -s /usr/share/misc/config.guess .
+ ln -f -s /usr/share/misc/config.sub .
libtoolize --install --copy
aclocal
autoheader
@@ -43,6 +50,7 @@
--without-dmalloc --without-efence --without-rsaref \
--with-sys-contact="root" --with-sys-location="Unknown" \
--with-mib-modules="$(MIB_MODULES)" \
+ --with-out-mib-modules="$(EXCL_MIB_MODULES)" \
--enable-mfd-rewrites \
--with-mnttab=/etc/mtab \
--with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
More information about the Pkg-net-snmp-commits
mailing list