This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via a21df193794d422a85f822bd8cb3470b74826262 (commit) via cb3c00e01e4f41c2712914eb13e766fdaf7f8c99 (commit) via 79fac0111b3ecce2615d50690c492c1b4546b957 (commit) via 648f2001879954088dd830873b141b330def52e9 (commit) via 454a80d1dba502716ab72128da0fe1bbe2fe66c6 (commit) from 38b8efddca9432f119fc4f71605c5fdb79b2c492 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a21df193794d422a85f822bd8cb3470b74826262 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 31 18:56:13 2015 +0200

netsnmpd: bump PAK_VER.

commit cb3c00e01e4f41c2712914eb13e766fdaf7f8c99 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 31 12:03:38 2015 +0200

cyrus-imapd: add backupinclude.

commit 79fac0111b3ecce2615d50690c492c1b4546b957 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 31 11:37:10 2015 +0200

remove unused net-snmp pakfiles.

commit 648f2001879954088dd830873b141b330def52e9 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun May 31 11:35:34 2015 +0200

netsnmpd: extract backup include at update.

commit 454a80d1dba502716ab72128da0fe1bbe2fe66c6 Author: Matthias Fischer fischerm@ipfire.org Date: Wed May 27 22:19:39 2015 +0200

netsnmpd: Update to 5.7.3, include backup

Conflicts: lfs/netsnmpd

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

Summary of changes: config/backup/includes/cyrus-imapd | 4 + config/backup/includes/netsnmpd | 1 + config/rootfiles/packages/cyrus-imapd | 1 + config/rootfiles/packages/netsnmpd | 346 ++++++++++++++------------ lfs/cyrus-imapd | 4 +- lfs/netsnmpd | 29 +-- src/paks/cyrus-imapd/uninstall.sh | 1 + src/paks/net-snmp/uninstall.sh | 27 -- src/paks/{net-snmp => netsnmpd}/install.sh | 0 src/paks/{igmpproxy => netsnmpd}/uninstall.sh | 2 +- src/paks/{net-snmp => netsnmpd}/update.sh | 0 11 files changed, 210 insertions(+), 205 deletions(-) create mode 100644 config/backup/includes/cyrus-imapd create mode 100644 config/backup/includes/netsnmpd delete mode 100644 src/paks/net-snmp/uninstall.sh rename src/paks/{net-snmp => netsnmpd}/install.sh (100%) copy src/paks/{igmpproxy => netsnmpd}/uninstall.sh (100%) rename src/paks/{net-snmp => netsnmpd}/update.sh (100%)

Difference in files: diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd new file mode 100644 index 0000000..bb1bb3b --- /dev/null +++ b/config/backup/includes/cyrus-imapd @@ -0,0 +1,4 @@ +/usr/sieve +/var/imap +/var/ipfire/cyrusimap +/var/log/imap diff --git a/config/backup/includes/netsnmpd b/config/backup/includes/netsnmpd new file mode 100644 index 0000000..78ac6ac --- /dev/null +++ b/config/backup/includes/netsnmpd @@ -0,0 +1 @@ +/etc/snmpd.conf diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd index 0c0485e..bbaec3f 100644 --- a/config/rootfiles/packages/cyrus-imapd +++ b/config/rootfiles/packages/cyrus-imapd @@ -146,6 +146,7 @@ var/imap/msg var/imap/proc var/imap/ptclient var/imap/socket +var/ipfire/backup/addons/includes/cyrus-imapd var/ipfire/cyrusimap var/ipfire/cyrusimap/cyrus.conf var/ipfire/cyrusimap/imapd.conf diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 30dbf93..6328949 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/config/rootfiles/packages/netsnmpd @@ -2,12 +2,16 @@ etc/rc.d/rc0.d/K02netsnmpd etc/rc.d/rc3.d/S65netsnmpd etc/rc.d/rc6.d/K02netsnmpd etc/snmpd.conf +usr/bin/agentxtrap usr/bin/encode_keychange usr/bin/fixproc usr/bin/ipf-mod.pl usr/bin/mib2c usr/bin/mib2c-update +usr/bin/net-snmp-cert usr/bin/net-snmp-config +usr/bin/net-snmp-create-v3-user +usr/bin/snmp-bridge-mib usr/bin/snmpbulkget usr/bin/snmpbulkwalk usr/bin/snmpcheck @@ -37,6 +41,7 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/agent_module_config.h #usr/include/net-snmp/agent/agent_read_config.h #usr/include/net-snmp/agent/agent_registry.h +#usr/include/net-snmp/agent/agent_sysORTable.h #usr/include/net-snmp/agent/agent_trap.h #usr/include/net-snmp/agent/all_helpers.h #usr/include/net-snmp/agent/auto_nlist.h @@ -62,9 +67,12 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/serialize.h #usr/include/net-snmp/agent/set_helper.h #usr/include/net-snmp/agent/snmp_agent.h +#usr/include/net-snmp/agent/snmp_get_statistic.h #usr/include/net-snmp/agent/snmp_vars.h #usr/include/net-snmp/agent/stash_cache.h #usr/include/net-snmp/agent/stash_to_next.h +#usr/include/net-snmp/agent/struct.h +#usr/include/net-snmp/agent/sysORTable.h #usr/include/net-snmp/agent/table.h #usr/include/net-snmp/agent/table_array.h #usr/include/net-snmp/agent/table_container.h @@ -72,7 +80,11 @@ usr/bin/traptoemail #usr/include/net-snmp/agent/table_dataset.h #usr/include/net-snmp/agent/table_iterator.h #usr/include/net-snmp/agent/table_tdata.h +#usr/include/net-snmp/agent/util_funcs #usr/include/net-snmp/agent/util_funcs.h +#usr/include/net-snmp/agent/util_funcs/MIB_STATS_CACHE_TIMEOUT.h +#usr/include/net-snmp/agent/util_funcs/header_generic.h +#usr/include/net-snmp/agent/util_funcs/header_simple_table.h #usr/include/net-snmp/agent/var_struct.h #usr/include/net-snmp/agent/watcher.h #usr/include/net-snmp/config_api.h @@ -81,8 +93,8 @@ usr/bin/traptoemail #usr/include/net-snmp/library/README #usr/include/net-snmp/library/asn1.h #usr/include/net-snmp/library/callback.h +#usr/include/net-snmp/library/cert_util.h #usr/include/net-snmp/library/check_varbind.h -#usr/include/net-snmp/library/cmu_compat.h #usr/include/net-snmp/library/container.h #usr/include/net-snmp/library/container_binary_array.h #usr/include/net-snmp/library/container_iterator.h @@ -90,25 +102,34 @@ usr/bin/traptoemail #usr/include/net-snmp/library/container_null.h #usr/include/net-snmp/library/data_list.h #usr/include/net-snmp/library/default_store.h +#usr/include/net-snmp/library/dir_utils.h #usr/include/net-snmp/library/factory.h #usr/include/net-snmp/library/fd_event_manager.h #usr/include/net-snmp/library/file_utils.h #usr/include/net-snmp/library/getopt.h #usr/include/net-snmp/library/int64.h #usr/include/net-snmp/library/keytools.h +#usr/include/net-snmp/library/large_fd_set.h #usr/include/net-snmp/library/lcd_time.h #usr/include/net-snmp/library/md5.h #usr/include/net-snmp/library/mib.h #usr/include/net-snmp/library/mt_support.h +#usr/include/net-snmp/library/oid.h #usr/include/net-snmp/library/oid_stash.h #usr/include/net-snmp/library/parse.h #usr/include/net-snmp/library/read_config.h #usr/include/net-snmp/library/scapi.h #usr/include/net-snmp/library/snmp-tc.h #usr/include/net-snmp/library/snmp.h +#usr/include/net-snmp/library/snmpAliasDomain.h #usr/include/net-snmp/library/snmpCallbackDomain.h +#usr/include/net-snmp/library/snmpIPv4BaseDomain.h +#usr/include/net-snmp/library/snmpSocketBaseDomain.h +#usr/include/net-snmp/library/snmpTCPBaseDomain.h #usr/include/net-snmp/library/snmpTCPDomain.h +#usr/include/net-snmp/library/snmpUDPBaseDomain.h #usr/include/net-snmp/library/snmpUDPDomain.h +#usr/include/net-snmp/library/snmpUDPIPv4BaseDomain.h #usr/include/net-snmp/library/snmpUnixDomain.h #usr/include/net-snmp/library/snmp_alarm.h #usr/include/net-snmp/library/snmp_api.h @@ -129,6 +150,7 @@ usr/bin/traptoemail #usr/include/net-snmp/library/text_utils.h #usr/include/net-snmp/library/tools.h #usr/include/net-snmp/library/transform_oids.h +#usr/include/net-snmp/library/types.h #usr/include/net-snmp/library/ucd_compat.h #usr/include/net-snmp/library/vacm.h #usr/include/net-snmp/library/winpipe.h @@ -137,6 +159,7 @@ usr/bin/traptoemail #usr/include/net-snmp/machine/generic.h #usr/include/net-snmp/mib_api.h #usr/include/net-snmp/net-snmp-config.h +#usr/include/net-snmp/net-snmp-features.h #usr/include/net-snmp/net-snmp-includes.h #usr/include/net-snmp/output_api.h #usr/include/net-snmp/pdu_api.h @@ -150,17 +173,24 @@ usr/bin/traptoemail #usr/include/net-snmp/system/bsdi4.h #usr/include/net-snmp/system/cygwin.h #usr/include/net-snmp/system/darwin.h +#usr/include/net-snmp/system/darwin10.h #usr/include/net-snmp/system/darwin7.h #usr/include/net-snmp/system/darwin8.h #usr/include/net-snmp/system/darwin9.h #usr/include/net-snmp/system/dragonfly.h #usr/include/net-snmp/system/dynix.h #usr/include/net-snmp/system/freebsd.h +#usr/include/net-snmp/system/freebsd10.h +#usr/include/net-snmp/system/freebsd11.h +#usr/include/net-snmp/system/freebsd12.h #usr/include/net-snmp/system/freebsd2.h #usr/include/net-snmp/system/freebsd3.h #usr/include/net-snmp/system/freebsd4.h #usr/include/net-snmp/system/freebsd5.h #usr/include/net-snmp/system/freebsd6.h +#usr/include/net-snmp/system/freebsd7.h +#usr/include/net-snmp/system/freebsd8.h +#usr/include/net-snmp/system/freebsd9.h #usr/include/net-snmp/system/generic.h #usr/include/net-snmp/system/hpux.h #usr/include/net-snmp/system/irix.h @@ -169,6 +199,8 @@ usr/bin/traptoemail #usr/include/net-snmp/system/mips.h #usr/include/net-snmp/system/netbsd.h #usr/include/net-snmp/system/openbsd.h +#usr/include/net-snmp/system/openbsd4.h +#usr/include/net-snmp/system/openbsd5.h #usr/include/net-snmp/system/osf5.h #usr/include/net-snmp/system/solaris.h #usr/include/net-snmp/system/solaris2.3.h @@ -186,28 +218,28 @@ usr/bin/traptoemail #usr/lib/libnetsnmp.a #usr/lib/libnetsnmp.la usr/lib/libnetsnmp.so -usr/lib/libnetsnmp.so.15 -usr/lib/libnetsnmp.so.15.1.2 +usr/lib/libnetsnmp.so.30 +usr/lib/libnetsnmp.so.30.0.3 #usr/lib/libnetsnmpagent.a #usr/lib/libnetsnmpagent.la usr/lib/libnetsnmpagent.so -usr/lib/libnetsnmpagent.so.15 -usr/lib/libnetsnmpagent.so.15.1.2 +usr/lib/libnetsnmpagent.so.30 +usr/lib/libnetsnmpagent.so.30.0.3 #usr/lib/libnetsnmphelpers.a #usr/lib/libnetsnmphelpers.la usr/lib/libnetsnmphelpers.so -usr/lib/libnetsnmphelpers.so.15 -usr/lib/libnetsnmphelpers.so.15.1.2 +usr/lib/libnetsnmphelpers.so.30 +usr/lib/libnetsnmphelpers.so.30.0.3 #usr/lib/libnetsnmpmibs.a #usr/lib/libnetsnmpmibs.la usr/lib/libnetsnmpmibs.so -usr/lib/libnetsnmpmibs.so.15 -usr/lib/libnetsnmpmibs.so.15.1.2 +usr/lib/libnetsnmpmibs.so.30 +usr/lib/libnetsnmpmibs.so.30.0.3 #usr/lib/libnetsnmptrapd.a #usr/lib/libnetsnmptrapd.la usr/lib/libnetsnmptrapd.so -usr/lib/libnetsnmptrapd.so.15 -usr/lib/libnetsnmptrapd.so.15.1.2 +usr/lib/libnetsnmptrapd.so.30 +usr/lib/libnetsnmptrapd.so.30.0.3 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/Makefile.subs.pl #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP @@ -253,159 +285,37 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_s #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.so #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/autosplit.ix -#usr/man/man1/encode_keychange.1 -#usr/man/man1/fixproc.1 -#usr/man/man1/mib2c-update.1 -#usr/man/man1/mib2c.1 -#usr/man/man1/net-snmp-config.1 -#usr/man/man1/snmpbulkget.1 -#usr/man/man1/snmpbulkwalk.1 -#usr/man/man1/snmpcmd.1 -#usr/man/man1/snmpconf.1 -#usr/man/man1/snmpdelta.1 -#usr/man/man1/snmpdf.1 -#usr/man/man1/snmpget.1 -#usr/man/man1/snmpgetnext.1 -#usr/man/man1/snmpinform.1 -#usr/man/man1/snmpnetstat.1 -#usr/man/man1/snmpset.1 -#usr/man/man1/snmpstatus.1 -#usr/man/man1/snmptable.1 -#usr/man/man1/snmptest.1 -#usr/man/man1/snmptranslate.1 -#usr/man/man1/snmptrap.1 -#usr/man/man1/snmpusm.1 -#usr/man/man1/snmpvacm.1 -#usr/man/man1/snmpwalk.1 -#usr/man/man1/tkmib.1 -#usr/man/man1/traptoemail.1 -#usr/man/man3/add_mibdir.3 -#usr/man/man3/add_module_replacement.3 -#usr/man/man3/config_perror.3 -#usr/man/man3/config_pwarn.3 -#usr/man/man3/default_store.3 -#usr/man/man3/fprint_description.3 -#usr/man/man3/fprint_objid.3 -#usr/man/man3/fprint_value.3 -#usr/man/man3/fprint_variable.3 -#usr/man/man3/get_module_node.3 -#usr/man/man3/init_mib.3 -#usr/man/man3/init_mib_internals.3 -#usr/man/man3/mib_api.3 -#usr/man/man3/netsnmp_Container_iterator.3 -#usr/man/man3/netsnmp_agent.3 -#usr/man/man3/netsnmp_baby_steps.3 -#usr/man/man3/netsnmp_bulk_to_next.3 -#usr/man/man3/netsnmp_cache_handler.3 -#usr/man/man3/netsnmp_container.3 -#usr/man/man3/netsnmp_debug.3 -#usr/man/man3/netsnmp_ds_get_boolean.3 -#usr/man/man3/netsnmp_ds_get_int.3 -#usr/man/man3/netsnmp_ds_get_string.3 -#usr/man/man3/netsnmp_ds_register_config.3 -#usr/man/man3/netsnmp_ds_register_premib.3 -#usr/man/man3/netsnmp_ds_set_boolean.3 -#usr/man/man3/netsnmp_ds_set_int.3 -#usr/man/man3/netsnmp_ds_set_string.3 -#usr/man/man3/netsnmp_ds_shutdown.3 -#usr/man/man3/netsnmp_example_scalar_int.3 -#usr/man/man3/netsnmp_handler.3 -#usr/man/man3/netsnmp_instance.3 -#usr/man/man3/netsnmp_iterator_info_s.3 -#usr/man/man3/netsnmp_leaf.3 -#usr/man/man3/netsnmp_library.3 -#usr/man/man3/netsnmp_mib_handler_methods.3 -#usr/man/man3/netsnmp_mib_utilities.3 -#usr/man/man3/netsnmp_mode_end_call.3 -#usr/man/man3/netsnmp_multiplexer.3 -#usr/man/man3/netsnmp_old_api.3 -#usr/man/man3/netsnmp_read_only.3 -#usr/man/man3/netsnmp_row_merge.3 -#usr/man/man3/netsnmp_scalar.3 -#usr/man/man3/netsnmp_scalar_group_group.3 -#usr/man/man3/netsnmp_serialize.3 -#usr/man/man3/netsnmp_stash_cache.3 -#usr/man/man3/netsnmp_table.3 -#usr/man/man3/netsnmp_table_array.3 -#usr/man/man3/netsnmp_table_data.3 -#usr/man/man3/netsnmp_table_dataset.3 -#usr/man/man3/netsnmp_table_iterator.3 -#usr/man/man3/netsnmp_utilities.3 -#usr/man/man3/netsnmp_watcher.3 -#usr/man/man3/print_description.3 -#usr/man/man3/print_mib.3 -#usr/man/man3/print_objid.3 -#usr/man/man3/print_value.3 -#usr/man/man3/print_variable.3 -#usr/man/man3/read_all_mibs.3 -#usr/man/man3/read_config.3 -#usr/man/man3/read_config_print_usage.3 -#usr/man/man3/read_configs.3 -#usr/man/man3/read_mib.3 -#usr/man/man3/read_module.3 -#usr/man/man3/read_module_node.3 -#usr/man/man3/read_objid.3 -#usr/man/man3/read_premib_configs.3 -#usr/man/man3/register_app_config_handler.3 -#usr/man/man3/register_app_premib_handler.3 -#usr/man/man3/register_config_handler.3 -#usr/man/man3/register_mib_handlers.3 -#usr/man/man3/register_premib_handler.3 -#usr/man/man3/send_easy_trap.3 -#usr/man/man3/send_trap_vars.3 -#usr/man/man3/send_v2trap.3 -#usr/man/man3/shutdown_mib.3 -#usr/man/man3/snmp_agent_api.3 -#usr/man/man3/snmp_alarm.3 -#usr/man/man3/snmp_alarm_register.3 -#usr/man/man3/snmp_alarm_register_hr.3 -#usr/man/man3/snmp_alarm_unregister.3 -#usr/man/man3/snmp_api.3 -#usr/man/man3/snmp_api_errstring.3 -#usr/man/man3/snmp_close.3 -#usr/man/man3/snmp_error.3 -#usr/man/man3/snmp_free_pdu.3 -#usr/man/man3/snmp_open.3 -#usr/man/man3/snmp_perror.3 -#usr/man/man3/snmp_read.3 -#usr/man/man3/snmp_select_info.3 -#usr/man/man3/snmp_send.3 -#usr/man/man3/snmp_sess_api.3 -#usr/man/man3/snmp_sess_async_send.3 -#usr/man/man3/snmp_sess_close.3 -#usr/man/man3/snmp_sess_error.3 -#usr/man/man3/snmp_sess_init.3 -#usr/man/man3/snmp_sess_open.3 -#usr/man/man3/snmp_sess_perror.3 -#usr/man/man3/snmp_sess_read.3 -#usr/man/man3/snmp_sess_select_info.3 -#usr/man/man3/snmp_sess_send.3 -#usr/man/man3/snmp_sess_session.3 -#usr/man/man3/snmp_sess_timeout.3 -#usr/man/man3/snmp_set_mib_warnings.3 -#usr/man/man3/snmp_set_save_descriptions.3 -#usr/man/man3/snmp_timeout.3 -#usr/man/man3/snmp_trap_api.3 -#usr/man/man3/snprint_objid.3 -#usr/man/man3/snprint_value.3 -#usr/man/man3/snprint_variable.3 -#usr/man/man3/sprint_realloc_objid.3 -#usr/man/man3/sprint_realloc_value.3 -#usr/man/man3/sprint_realloc_variable.3 -#usr/man/man3/unregister_app_config_handler.3 -#usr/man/man3/unregister_config_handler.3 -#usr/man/man5/mib2c.conf.5 -#usr/man/man5/snmp.conf.5 -#usr/man/man5/snmp_config.5 -#usr/man/man5/snmpd.conf.5 -#usr/man/man5/snmpd.examples.5 -#usr/man/man5/snmpd.internal.5 -#usr/man/man5/snmptrapd.conf.5 -#usr/man/man5/variables.5 -#usr/man/man8/snmpd.8 -#usr/man/man8/snmptrapd.8 usr/sbin/snmpd usr/sbin/snmptrapd +#usr/share/man/man1/agentxtrap.1 +#usr/share/man/man1/encode_keychange.1 +#usr/share/man/man1/fixproc.1 +#usr/share/man/man1/mib2c-update.1 +#usr/share/man/man1/mib2c.1 +#usr/share/man/man1/net-snmp-config.1 +#usr/share/man/man1/net-snmp-create-v3-user.1 +#usr/share/man/man1/snmp-bridge-mib.1 +#usr/share/man/man1/snmpbulkget.1 +#usr/share/man/man1/snmpbulkwalk.1 +#usr/share/man/man1/snmpcmd.1 +#usr/share/man/man1/snmpconf.1 +#usr/share/man/man1/snmpdelta.1 +#usr/share/man/man1/snmpdf.1 +#usr/share/man/man1/snmpget.1 +#usr/share/man/man1/snmpgetnext.1 +#usr/share/man/man1/snmpinform.1 +#usr/share/man/man1/snmpnetstat.1 +#usr/share/man/man1/snmpset.1 +#usr/share/man/man1/snmpstatus.1 +#usr/share/man/man1/snmptable.1 +#usr/share/man/man1/snmptest.1 +#usr/share/man/man1/snmptranslate.1 +#usr/share/man/man1/snmptrap.1 +#usr/share/man/man1/snmpusm.1 +#usr/share/man/man1/snmpvacm.1 +#usr/share/man/man1/snmpwalk.1 +#usr/share/man/man1/tkmib.1 +#usr/share/man/man1/traptoemail.1 #usr/share/man/man3/NetSNMP::ASN.3 #usr/share/man/man3/NetSNMP::OID.3 #usr/share/man/man3/NetSNMP::TrapReceiver.3 @@ -414,6 +324,109 @@ usr/sbin/snmptrapd #usr/share/man/man3/NetSNMP::default_store.3 #usr/share/man/man3/NetSNMP::netsnmp_request_infoPtr.3 #usr/share/man/man3/SNMP.3 +#usr/share/man/man3/add_mibdir.3 +#usr/share/man/man3/add_module_replacement.3 +#usr/share/man/man3/config_perror.3 +#usr/share/man/man3/config_pwarn.3 +#usr/share/man/man3/default_store.3 +#usr/share/man/man3/fprint_description.3 +#usr/share/man/man3/fprint_objid.3 +#usr/share/man/man3/fprint_value.3 +#usr/share/man/man3/fprint_variable.3 +#usr/share/man/man3/get_module_node.3 +#usr/share/man/man3/netsnmp_agent_api.3 +#usr/share/man/man3/netsnmp_config_api.3 +#usr/share/man/man3/netsnmp_init_mib.3 +#usr/share/man/man3/netsnmp_mib_api.3 +#usr/share/man/man3/netsnmp_pdu_api.3 +#usr/share/man/man3/netsnmp_read_module.3 +#usr/share/man/man3/netsnmp_sess_api.3 +#usr/share/man/man3/netsnmp_session_api.3 +#usr/share/man/man3/netsnmp_trap_api.3 +#usr/share/man/man3/netsnmp_varbind_api.3 +#usr/share/man/man3/print_description.3 +#usr/share/man/man3/print_mib.3 +#usr/share/man/man3/print_objid.3 +#usr/share/man/man3/print_value.3 +#usr/share/man/man3/print_variable.3 +#usr/share/man/man3/read_all_mibs.3 +#usr/share/man/man3/read_config_print_usage.3 +#usr/share/man/man3/read_configs.3 +#usr/share/man/man3/read_mib.3 +#usr/share/man/man3/read_objid.3 +#usr/share/man/man3/read_premib_configs.3 +#usr/share/man/man3/register_app_config_handler.3 +#usr/share/man/man3/register_app_prenetsnmp_mib_handler.3 +#usr/share/man/man3/register_config_handler.3 +#usr/share/man/man3/register_const_config_handler.3 +#usr/share/man/man3/register_mib_handlers.3 +#usr/share/man/man3/register_prenetsnmp_mib_handler.3 +#usr/share/man/man3/send_easy_trap.3 +#usr/share/man/man3/send_trap_vars.3 +#usr/share/man/man3/send_v2trap.3 +#usr/share/man/man3/shutdown_mib.3 +#usr/share/man/man3/snmp_add_null_var.3 +#usr/share/man/man3/snmp_alarm.3 +#usr/share/man/man3/snmp_alarm_register.3 +#usr/share/man/man3/snmp_alarm_register_hr.3 +#usr/share/man/man3/snmp_alarm_unregister.3 +#usr/share/man/man3/snmp_api_errstring.3 +#usr/share/man/man3/snmp_async_send.3 +#usr/share/man/man3/snmp_clone_pdu.3 +#usr/share/man/man3/snmp_clone_varbind.3 +#usr/share/man/man3/snmp_close.3 +#usr/share/man/man3/snmp_error.3 +#usr/share/man/man3/snmp_fix_pdu.3 +#usr/share/man/man3/snmp_free_pdu.3 +#usr/share/man/man3/snmp_free_var.3 +#usr/share/man/man3/snmp_free_varbind.3 +#usr/share/man/man3/snmp_open.3 +#usr/share/man/man3/snmp_parse_oid.3 +#usr/share/man/man3/snmp_pdu_add_variable.3 +#usr/share/man/man3/snmp_pdu_create.3 +#usr/share/man/man3/snmp_perror.3 +#usr/share/man/man3/snmp_read.3 +#usr/share/man/man3/snmp_select_info.3 +#usr/share/man/man3/snmp_send.3 +#usr/share/man/man3/snmp_sess_async_send.3 +#usr/share/man/man3/snmp_sess_close.3 +#usr/share/man/man3/snmp_sess_error.3 +#usr/share/man/man3/snmp_sess_init.3 +#usr/share/man/man3/snmp_sess_open.3 +#usr/share/man/man3/snmp_sess_perror.3 +#usr/share/man/man3/snmp_sess_read.3 +#usr/share/man/man3/snmp_sess_select_info.3 +#usr/share/man/man3/snmp_sess_send.3 +#usr/share/man/man3/snmp_sess_session.3 +#usr/share/man/man3/snmp_sess_synch_response.3 +#usr/share/man/man3/snmp_sess_timeout.3 +#usr/share/man/man3/snmp_set_mib_errors.3 +#usr/share/man/man3/snmp_set_mib_warnings.3 +#usr/share/man/man3/snmp_set_save_descriptions.3 +#usr/share/man/man3/snmp_set_var_objid.3 +#usr/share/man/man3/snmp_set_var_typed_integer.3 +#usr/share/man/man3/snmp_set_var_typed_value.3 +#usr/share/man/man3/snmp_set_var_value.3 +#usr/share/man/man3/snmp_synch_response.3 +#usr/share/man/man3/snmp_timeout.3 +#usr/share/man/man3/snmp_varlist_add_variable.3 +#usr/share/man/man3/snprint_description.3 +#usr/share/man/man3/snprint_objid.3 +#usr/share/man/man3/snprint_value.3 +#usr/share/man/man3/snprint_variable.3 +#usr/share/man/man3/unregister_all_config_handlers.3 +#usr/share/man/man3/unregister_app_config_handler.3 +#usr/share/man/man3/unregister_config_handler.3 +#usr/share/man/man5/mib2c.conf.5 +#usr/share/man/man5/snmp.conf.5 +#usr/share/man/man5/snmp_config.5 +#usr/share/man/man5/snmpd.conf.5 +#usr/share/man/man5/snmpd.examples.5 +#usr/share/man/man5/snmpd.internal.5 +#usr/share/man/man5/snmptrapd.conf.5 +#usr/share/man/man5/variables.5 +#usr/share/man/man8/snmpd.8 +#usr/share/man/man8/snmptrapd.8 usr/share/snmp usr/share/snmp/mib2c-data usr/share/snmp/mib2c-data/default-mfd-top.m2c @@ -425,6 +438,7 @@ usr/share/snmp/mib2c-data/generic-ctx-get.m2i usr/share/snmp/mib2c-data/generic-ctx-set.m2i usr/share/snmp/mib2c-data/generic-data-allocate.m2i usr/share/snmp/mib2c-data/generic-data-context.m2i +usr/share/snmp/mib2c-data/generic-get-U64.m2i usr/share/snmp/mib2c-data/generic-get-char.m2i usr/share/snmp/mib2c-data/generic-get-decl-bot.m2i usr/share/snmp/mib2c-data/generic-get-decl.m2i @@ -500,10 +514,12 @@ usr/share/snmp/mib2c.mfd.conf usr/share/snmp/mib2c.notify.conf usr/share/snmp/mib2c.old-api.conf usr/share/snmp/mib2c.perl.conf +usr/share/snmp/mib2c.raw-table.conf usr/share/snmp/mib2c.scalar.conf usr/share/snmp/mib2c.table_data.conf usr/share/snmp/mibs usr/share/snmp/mibs/AGENTX-MIB.txt +usr/share/snmp/mibs/BRIDGE-MIB.txt usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt usr/share/snmp/mibs/DISMAN-SCHEDULE-MIB.txt usr/share/snmp/mibs/DISMAN-SCRIPT-MIB.txt @@ -520,6 +536,7 @@ usr/share/snmp/mibs/IF-MIB.txt usr/share/snmp/mibs/INET-ADDRESS-MIB.txt usr/share/snmp/mibs/IP-FORWARD-MIB.txt usr/share/snmp/mibs/IP-MIB.txt +usr/share/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt usr/share/snmp/mibs/IPV6-ICMP-MIB.txt usr/share/snmp/mibs/IPV6-MIB.txt usr/share/snmp/mibs/IPV6-TC.txt @@ -529,6 +546,7 @@ usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt usr/share/snmp/mibs/NET-SNMP-MIB.txt +usr/share/snmp/mibs/NET-SNMP-PASS-MIB.txt usr/share/snmp/mibs/NET-SNMP-TC.txt usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt @@ -544,6 +562,8 @@ usr/share/snmp/mibs/SNMP-MPD-MIB.txt usr/share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt usr/share/snmp/mibs/SNMP-PROXY-MIB.txt usr/share/snmp/mibs/SNMP-TARGET-MIB.txt +usr/share/snmp/mibs/SNMP-TLS-TM-MIB.txt +usr/share/snmp/mibs/SNMP-TSM-MIB.txt usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt @@ -555,6 +575,7 @@ usr/share/snmp/mibs/SNMPv2-TC.txt usr/share/snmp/mibs/SNMPv2-TM.txt usr/share/snmp/mibs/TCP-MIB.txt usr/share/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt +usr/share/snmp/mibs/TUNNEL-MIB.txt usr/share/snmp/mibs/UCD-DEMO-MIB.txt usr/share/snmp/mibs/UCD-DISKIO-MIB.txt usr/share/snmp/mibs/UCD-DLMOD-MIB.txt @@ -586,4 +607,5 @@ usr/share/snmp/snmpconf-data/snmptrapd-data/logging usr/share/snmp/snmpconf-data/snmptrapd-data/runtime usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle +var/ipfire/backup/addons/includes/netsnmpd etc/rc.d/init.d/netsnmpd diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index 8e61354..fc87bd6 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cyrus-imapd -PAK_VER = 4 +PAK_VER = 5

DEPS = ""

@@ -100,5 +100,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_APP)/tools/mkimap /usr/bin sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf chown cyrus.mail /var/imap/socket + install -v -m 644 $(DIR_SRC)/config/backup/includes/cyrus-imapd \ + /var/ipfire/backup/addons/includes/cyrus-imapd @rm -rf $(DIR_APP) /usr/include/com_err.h @$(POSTBUILD) diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 6615965..b513678 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team info@ipfire.org # +# Copyright (C) 2015 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,15 +24,15 @@

include Config

-VER = 5.4.2.1 +VER = 5.7.3

THISAPP = net-snmp-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = netsnmpd -PAK_VER = 3 +PROG = netsnmpd +PAK_VER = 4 DEPS = ""

############################################################################### @@ -43,7 +43,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 984932520143f0c8bf7b7ce1fc9e1da1 +$(DL_FILE)_MD5 = d4a3459e1577d0efa8d96ca70a885e53

install : $(TARGET)

@@ -77,21 +77,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --with-default-snmp-version="2" \ - --with-sys-contact="root@" \ - --with-sys-location="localhost" \ - --with-logfile="/var/log/snmpd.log" \ - --with-persistent-directory="/var/net-snmp" \ - --libdir=/usr/lib \ - --sysconfdir="/etc" + --prefix=/usr \ + --with-default-snmp-version="2" \ + --with-sys-contact="root@" \ + --with-sys-location="localhost" \ + --with-logfile="/var/log/snmpd.log" \ + --with-persistent-directory="/var/net-snmp" \ + --libdir=/usr/lib \ + --sysconfdir="/etc" cd $(DIR_APP) && make cd $(DIR_APP) && make install install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf + install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \ + /var/ipfire/backup/addons/includes/netsnmpd install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd @rm -rf $(DIR_APP) @$(POSTBUILD) - diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 0d2109e..6e1468e 100644 --- a/src/paks/cyrus-imapd/uninstall.sh +++ b/src/paks/cyrus-imapd/uninstall.sh @@ -22,6 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_include stop_service ${NAME} make_backup ${NAME} remove_files diff --git a/src/paks/net-snmp/install.sh b/src/paks/net-snmp/install.sh deleted file mode 100644 index 31c5fec..0000000 --- a/src/paks/net-snmp/install.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} -start_service --background ${NAME} diff --git a/src/paks/net-snmp/uninstall.sh b/src/paks/net-snmp/uninstall.sh deleted file mode 100644 index a7b8a53..0000000 --- a/src/paks/net-snmp/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -make_backup ${NAME} -remove_files diff --git a/src/paks/net-snmp/update.sh b/src/paks/net-snmp/update.sh deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/net-snmp/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/netsnmpd/install.sh b/src/paks/netsnmpd/install.sh new file mode 100644 index 0000000..31c5fec --- /dev/null +++ b/src/paks/netsnmpd/install.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/netsnmpd/uninstall.sh b/src/paks/netsnmpd/uninstall.sh new file mode 100644 index 0000000..278218b --- /dev/null +++ b/src/paks/netsnmpd/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_backup_includes +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/netsnmpd/update.sh b/src/paks/netsnmpd/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/netsnmpd/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh

hooks/post-receive -- IPFire 2.x development tree