From 1ea718199ae6cd3d2e6c015fb9d51c62fc8ef74e Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Thu, 21 May 2015 20:06:04 +0200 Subject: [PATCH 01/37] tor: update to 0.2.6.8 --- lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/tor b/lfs/tor index 209895297..e19747a2a 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.2.5.12 +VER = 0.2.6.8 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 10 +PAK_VER = 11 DEPS = "libevent2" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 89745069a7efb7aafd01ae263bd0fe5c +$(DL_FILE)_MD5 = 20a8c1f8cd7e8c912c4f3f0b67740fa5 install : $(TARGET) From 454a80d1dba502716ab72128da0fe1bbe2fe66c6 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 27 May 2015 22:19:39 +0200 Subject: [PATCH 02/37] netsnmpd: Update to 5.7.3, include backup Conflicts: lfs/netsnmpd --- config/backup/includes/netsnmpd | 1 + config/rootfiles/packages/netsnmpd | 346 +++++++++++++++-------------- lfs/netsnmpd | 29 +-- 3 files changed, 200 insertions(+), 176 deletions(-) create mode 100644 config/backup/includes/netsnmpd diff --git a/config/backup/includes/netsnmpd b/config/backup/includes/netsnmpd new file mode 100644 index 000000000..78ac6acf7 --- /dev/null +++ b/config/backup/includes/netsnmpd @@ -0,0 +1 @@ +/etc/snmpd.conf diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 30dbf93bc..632894922 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/netsnmpd b/lfs/netsnmpd index 661596513..1ea0a4e4c 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team # +# Copyright (C) 2015 IPFire Team # # # # 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 = 3 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) - From 648f2001879954088dd830873b141b330def52e9 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 31 May 2015 11:35:34 +0200 Subject: [PATCH 03/37] netsnmpd: extract backup include at update. --- src/paks/netsnmpd/install.sh | 27 +++++++++++++++++++++++++++ src/paks/netsnmpd/uninstall.sh | 28 ++++++++++++++++++++++++++++ src/paks/netsnmpd/update.sh | 26 ++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 src/paks/netsnmpd/install.sh create mode 100644 src/paks/netsnmpd/uninstall.sh create mode 100644 src/paks/netsnmpd/update.sh diff --git a/src/paks/netsnmpd/install.sh b/src/paks/netsnmpd/install.sh new file mode 100644 index 000000000..31c5fecae --- /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 . # +# # +############################################################################ +# +. /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 000000000..278218b26 --- /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 . # +# # +############################################################################ +# +. /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 000000000..89c40d0d7 --- /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 . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh From 79fac0111b3ecce2615d50690c492c1b4546b957 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 31 May 2015 11:37:10 +0200 Subject: [PATCH 04/37] remove unused net-snmp pakfiles. --- src/paks/net-snmp/install.sh | 27 --------------------------- src/paks/net-snmp/uninstall.sh | 27 --------------------------- src/paks/net-snmp/update.sh | 26 -------------------------- 3 files changed, 80 deletions(-) delete mode 100644 src/paks/net-snmp/install.sh delete mode 100644 src/paks/net-snmp/uninstall.sh delete mode 100644 src/paks/net-snmp/update.sh diff --git a/src/paks/net-snmp/install.sh b/src/paks/net-snmp/install.sh deleted file mode 100644 index 31c5fecae..000000000 --- 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 . # -# # -############################################################################ -# -. /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 a7b8a5370..000000000 --- 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 . # -# # -############################################################################ -# -. /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 89c40d0d7..000000000 --- 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 . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh From cb3c00e01e4f41c2712914eb13e766fdaf7f8c99 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 31 May 2015 12:03:38 +0200 Subject: [PATCH 05/37] cyrus-imapd: add backupinclude. --- config/backup/includes/cyrus-imapd | 4 ++++ config/rootfiles/packages/cyrus-imapd | 1 + lfs/cyrus-imapd | 4 +++- src/paks/cyrus-imapd/uninstall.sh | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 config/backup/includes/cyrus-imapd diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd new file mode 100644 index 000000000..bb1bb3b1c --- /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/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd index 0c0485e4e..bbaec3ffb 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/lfs/cyrus-imapd b/lfs/cyrus-imapd index 8e6135452..fc87bd62b 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/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 0d2109eb9..6e1468ec7 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 From a21df193794d422a85f822bd8cb3470b74826262 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 31 May 2015 18:56:13 +0200 Subject: [PATCH 06/37] netsnmpd: bump PAK_VER. --- lfs/netsnmpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/netsnmpd b/lfs/netsnmpd index 1ea0a4e4c..b51367855 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netsnmpd -PAK_VER = 3 +PAK_VER = 4 DEPS = "" ############################################################################### From 91fc30309fcc929ae3b4b88f6cac67e1214e73a9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 1 Jun 2015 15:56:46 +0200 Subject: [PATCH 07/37] dhcp: Enter edit mode after adding a static lease from list After a lease has been added from the list of leases it is often desirable to edit it right away. It appeared that the system was in edit mode after the lease has been added because the form had the values of the recently added lease, but hitting the "Add" button cause an error message that stated that this is a duplicate entry. This patch will switch to edit more where the user can change the values and hit "Update". If he or she chooses to ignore that the entry is still saved. --- html/cgi-bin/dhcp.cgi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index e75207a21..dd48d58cb 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -438,6 +438,9 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'add'}.'2') { if ($dhcpsettings{'KEY2'} eq '') { #add or edit ? unshift (@current2, "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n"); &General::log($Lang::tr{'fixed ip lease added'}); + + # Enter edit mode + $dhcpsettings{'KEY2'} = $key; } else { @current2[$dhcpsettings{'KEY2'}] = "$dhcpsettings{'FIX_MAC'},$dhcpsettings{'FIX_ADDR'},$dhcpsettings{'FIX_ENABLED'},$dhcpsettings{'FIX_NEXTADDR'},$dhcpsettings{'FIX_FILENAME'},$dhcpsettings{'FIX_ROOTPATH'},$dhcpsettings{'FIX_REMARK'}\n"; $dhcpsettings{'KEY2'} = ''; # End edit mode From ee29c0d7445918c7edd81b5dcfb46210e2451bff Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 2 Jun 2015 09:02:37 +0200 Subject: [PATCH 08/37] vsftpd: bump PAK_VER to fix link angainst new openssl. fixes: 10866 --- lfs/vsftpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/vsftpd b/lfs/vsftpd index f3e74a00e..7284be961 100644 --- a/lfs/vsftpd +++ b/lfs/vsftpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vsftpd -PAK_VER = 7 +PAK_VER = 8 DEPS = "" From 65712deca2d3dc3d9f94b1434446a617f107403a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 2 Jun 2015 09:09:20 +0200 Subject: [PATCH 09/37] postfix: bump PAK_VER to fix link against new openssl. fixes: #10864 --- lfs/postfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/postfix b/lfs/postfix index 77c6dd0e4..fd332537a 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 7 +PAK_VER = 8 DEPS = "amavisd mysql" From 3560f497c090dafefc1d2d5b89ad7069a58c01f3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 2 Jun 2015 19:38:34 +0200 Subject: [PATCH 10/37] core91: Ship connections.cgi because of past changes in e60cd3a4042e95cf2748aac2de9d991c724ef24d --- config/rootfiles/core/91/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files index f1a51e621..d83fabdb9 100644 --- a/config/rootfiles/core/91/filelists/files +++ b/config/rootfiles/core/91/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi From b29a624081f02a3d4161b1c181dcf064429b51c8 Mon Sep 17 00:00:00 2001 From: Lars Schuhmacher Date: Mon, 1 Jun 2015 22:50:07 +0200 Subject: [PATCH 11/37] pakfire: Add information about probable causes when pakfire cannot connect Add information about probable causes when pakfire cannot connect. This includes port 11371 TCP and incorrect date/time settings. Signed-off-by: Lars Schuhmacher Signed-off-by: Michael Tremer --- src/pakfire/lib/functions.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 6bf85afdc..d2f77fa8f 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -890,6 +890,7 @@ sub checkcryptodb { unless ( "$ret" eq "0" ) { message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this."); message("CRYPTO WARN: It's normal to see this on first execution."); + message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP."); my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2"; system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1"); system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1"); From 557d986cbb406369e0c253879e25f7c21f442830 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 2 Jun 2015 23:48:50 +0200 Subject: [PATCH 12/37] core91: pakfire: Add changed functions.pl to update --- config/rootfiles/core/91/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files index d83fabdb9..76eee3990 100644 --- a/config/rootfiles/core/91/filelists/files +++ b/config/rootfiles/core/91/filelists/files @@ -1,4 +1,5 @@ etc/system-release etc/issue +opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi From bd33c332275ccb041a908c6e53ba78a1fa82f900 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 3 Jun 2015 17:55:55 +0200 Subject: [PATCH 13/37] rebuildhosts: Fix SEGV when not online Fixes #10867 --- src/misc-progs/rebuildhosts.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/misc-progs/rebuildhosts.c b/src/misc-progs/rebuildhosts.c index 21c523600..fdaeed618 100644 --- a/src/misc-progs/rebuildhosts.c +++ b/src/misc-progs/rebuildhosts.c @@ -82,8 +82,6 @@ int main(int argc, char *argv[]) if (!(gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r"))) { fprintf(stderr, "Couldn't open remote-ipaddress file\n"); - fclose(gw); - gw = NULL; exit(1); } From e528fb2c7352bf8f2b5c2bc3e298bfa4c34b9d31 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 3 Jun 2015 18:00:13 +0200 Subject: [PATCH 14/37] rebuildhosts: Don't break when RED not online The hosts file was not regenerated when RED was not connected which should not be happening. This patch checks if the file exists. If not, the gateway line will not be written to /etc/hosts. --- src/misc-progs/rebuildhosts.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/misc-progs/rebuildhosts.c b/src/misc-progs/rebuildhosts.c index fdaeed618..f77c2dfb5 100644 --- a/src/misc-progs/rebuildhosts.c +++ b/src/misc-progs/rebuildhosts.c @@ -79,16 +79,13 @@ int main(int argc, char *argv[]) freekeyvalues(kv); kv = NULL; - if (!(gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r"))) - { + if ((gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r"))) { + if (fgets(gateway, STRING_SIZE, gw) == NULL) { + fprintf(stderr, "Couldn't read remote-ipaddress\n"); + exit(1); + } + } else { fprintf(stderr, "Couldn't open remote-ipaddress file\n"); - exit(1); - } - - if (fgets(gateway, STRING_SIZE, gw) == NULL) - { - fprintf(stderr, "Couldn't read remote-ipaddress\n"); - exit(1); } if (!(fd = fopen(CONFIG_ROOT "/main/hosts", "r"))) @@ -110,7 +107,8 @@ int main(int argc, char *argv[]) else fprintf(hosts, "%s\t%s\n",address,hostname); - fprintf(hosts, "%s\tgateway\n",gateway); + if (strlen(gateway) > 0) + fprintf(hosts, "%s\tgateway\n", gateway); while (fgets(buffer, STRING_SIZE, fd)) { From bd767b27c85b2c6992cac38781b7bb78a03b694a Mon Sep 17 00:00:00 2001 From: Lars Schuhmacher Date: Thu, 4 Jun 2015 00:58:49 +0200 Subject: [PATCH 15/37] ipsec.conf: Include ipsec.user.conf and ipsec.user-post.conf Fix bug 10869 as the code has been removed by mistake by the previous commit dfea4f86c22c83e07d0f4a6f2a02166229ecb120. It also includes ipsec.user.conf only when it exists. Signed-off-by: Lars Schuhmacher Signed-off-by: Michael Tremer --- html/cgi-bin/vpnmain.cgi | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 94900765f..218dafa26 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -253,8 +253,10 @@ sub writeipsecfiles { print CONF "\n"; # Add user includes to config file - print CONF "include /etc/ipsec.user.conf\n"; - print CONF "\n"; + if (-e "/etc/ipsec.user.conf") { + print CONF "include /etc/ipsec.user.conf\n"; + print CONF "\n"; + } print SECRETS "include /etc/ipsec.user.secrets\n"; @@ -407,6 +409,14 @@ sub writeipsecfiles { print CONF "\n"; }#foreach key + + # Add post user includes to config file + # After the GUI-connections allows to patch connections. + if (-e "/etc/ipsec.user-post.conf") { + print CONF "include /etc/ipsec.user-post.conf\n"; + print CONF "\n"; + } + print SECRETS $last_secrets if ($last_secrets); close(CONF); close(SECRETS); From 5b93b50c6d91cf69d7716c6714808b6a5f87c224 Mon Sep 17 00:00:00 2001 From: Lars Schuhmacher Date: Tue, 2 Jun 2015 21:49:24 +0200 Subject: [PATCH 16/37] Fix hardcoded strings in pppsetup.cgi Some strings for PPTP were hardcoded instead of using i18n features. Signed-off-by: Lars Schuhmacher Signed-off-by: Michael Tremer --- html/cgi-bin/pppsetup.cgi | 6 +++--- langs/de/cgi-bin/de.pl | 3 +++ langs/en/cgi-bin/en.pl | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 33f521e75..59677a4d1 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -793,15 +793,15 @@ print <$Lang::tr{'pptp settings'} - Peer + $Lang::tr{'pptp peer'}: - My Netconfig + $Lang::tr{'pptp netconfig'}: - PPTP Route * + $Lang::tr{'pptp route'}: * diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 8adefdf60..48ade280a 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1822,6 +1822,9 @@ 'ppp setup' => 'PPP-Einstellungen', 'pppoe' => 'PPPoE', 'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:', +'pptp netconfig' => 'Eigene Netzkonfiguration', +'pptp peer' => 'Gegenstelle', +'pptp route' => 'PPTP-Route', 'pptp settings' => 'Zusätzliche PPTP-Einstellungen:', 'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz', 'prefered master' => 'Prefered Master', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 43601c86e..7964644b7 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1852,6 +1852,9 @@ 'ppp setup' => 'PPP setup', 'pppoe' => 'PPPoE', 'pppoe settings' => 'Additional PPPoE settings:', +'pptp netconfig' => 'My Net Config', +'pptp peer' => 'Peer', +'pptp route' => 'PPTP Route', 'pptp settings' => 'Additional PPTP settings:', 'pre-shared key is too short' => 'Pre-shared key is too short.', 'prefered master' => 'Prefered Master', From b2faf4f566b687052d40c8a2c37ed633ed643cb8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 4 Jun 2015 18:17:33 +0200 Subject: [PATCH 17/37] core91: Add changed pppsetup.cgi and language files --- config/rootfiles/core/91/filelists/files | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files index 76eee3990..7cc5aa224 100644 --- a/config/rootfiles/core/91/filelists/files +++ b/config/rootfiles/core/91/filelists/files @@ -3,3 +3,5 @@ etc/issue opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +var/ipfire/langs From 41ed4795fe92b1b16c8d946baef3f807adc97a77 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 4 Jun 2015 19:26:44 +0200 Subject: [PATCH 18/37] strongswan: Update to 5.3.1 Fixed a denial-of-service and potential remote code execution vulnerability triggered by IKEv1/IKEv2 messages that contain payloads for the respective other IKE version. Such payload are treated specially since 5.2.2 but because they were still identified by their original payload type they were used as such in some places causing invalid function pointer dereferences. The vulnerability has been registered as CVE-2015-3991. https://www.strongswan.org/blog/2015/06/01/strongswan-vulnerability-%28cve-2015-3991%29.html The increased buffer size has been fixed in bug #943 upstream https://wiki.strongswan.org/issues/943 --- lfs/strongswan | 8 ++--- ...ke-Increase-stroke-buffer-size-to-8k.patch | 34 ------------------- .../strongswan-5.3.1-build-timeattack.patch | 11 ++++++ 3 files changed, 15 insertions(+), 38 deletions(-) delete mode 100644 src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch create mode 100644 src/patches/strongswan-5.3.1-build-timeattack.patch diff --git a/lfs/strongswan b/lfs/strongswan index f227bba66..d1a5b8c15 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.0 +VER = 5.3.1 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c52d4228231c2025d9c320d0e9990327 +$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013 install : $(TARGET) @@ -78,10 +78,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.1-build-timeattack.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch - cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure \ --prefix="/usr" \ --sysconfdir="/etc" \ diff --git a/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch b/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch deleted file mode 100644 index 2252e314d..000000000 --- a/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4b59d129fd1026bab37256af0df9ae7ace39e7ba Mon Sep 17 00:00:00 2001 -From: Michael Tremer -Date: Mon, 27 Apr 2015 18:49:45 +0200 -Subject: [PATCH] stroke: Increase stroke buffer size to 8k - -Complicated connections can have lots of arguments -for the ike= and esp= directives in the ipsec.conf -configuration file. strongSwan wouldn't import those -because the size of the message that is send from -stroke to charon exceeded the limit of 4k. - -This patch increases the size of the buffer that -can be passed to charon to 8k which should be enough -even for connections with longer configurations. ---- - src/stroke/stroke_msg.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h -index c2b923f6db9a..c391efa00105 100644 ---- a/src/stroke/stroke_msg.h -+++ b/src/stroke/stroke_msg.h -@@ -32,7 +32,7 @@ - */ - #define STROKE_SOCKET IPSEC_PIDDIR "/charon.ctl" - --#define STROKE_BUF_LEN 4096 -+#define STROKE_BUF_LEN 8192 - - typedef enum list_flag_t list_flag_t; - --- -2.1.0 - diff --git a/src/patches/strongswan-5.3.1-build-timeattack.patch b/src/patches/strongswan-5.3.1-build-timeattack.patch new file mode 100644 index 000000000..948c4fc73 --- /dev/null +++ b/src/patches/strongswan-5.3.1-build-timeattack.patch @@ -0,0 +1,11 @@ +--- strongswan-5.3.1/scripts/Makefile.am.old 2015-06-04 17:20:43.539244145 +0000 ++++ strongswan-5.3.1/scripts/Makefile.am 2015-06-04 17:20:51.760510631 +0000 +@@ -42,7 +42,7 @@ + dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +-timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la ++timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB) + + key2keyid.o : $(top_builddir)/config.status + From 57f5c85825d9f6b61e8726c5b146bae1957acfcf Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 4 Jun 2015 19:31:53 +0200 Subject: [PATCH 19/37] core91: Add strongswan update --- config/rootfiles/core/91/filelists/i586/strongswan-padlock | 1 + config/rootfiles/core/91/filelists/strongswan | 1 + 2 files changed, 2 insertions(+) create mode 120000 config/rootfiles/core/91/filelists/i586/strongswan-padlock create mode 120000 config/rootfiles/core/91/filelists/strongswan diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/core/91/filelists/i586/strongswan-padlock new file mode 120000 index 000000000..2412824fb --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/core/91/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/91/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file From 4c777aeaf06e5697ecc5e540614b4edb2b2de853 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sun, 17 May 2015 15:36:13 +0200 Subject: [PATCH 20/37] pcre: Update to 8.37 Signed-off-by: Michael Tremer --- config/rootfiles/common/pcre | 2 +- lfs/pcre | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index 78ac2a24f..8c4cc2ac2 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,7 +10,7 @@ #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.2.4 +usr/lib/libpcre.so.1.2.5 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 diff --git a/lfs/pcre b/lfs/pcre index f5c771ca8..175afc09e 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # 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,7 +24,7 @@ include Config -VER = 8.36 +VER = 8.37 THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ff7b4bb14e355f04885cf18ff4125c98 +$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e install : $(TARGET) From 4da0506b000ae41025bb5ddb6111171f6f0cf0f5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 8 Jun 2015 14:29:31 +0200 Subject: [PATCH 21/37] core91: Ship updated pcre package Signed-off-by: Michael Tremer --- config/rootfiles/core/91/filelists/pcre | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/91/filelists/pcre diff --git a/config/rootfiles/core/91/filelists/pcre b/config/rootfiles/core/91/filelists/pcre new file mode 120000 index 000000000..b390d9a36 --- /dev/null +++ b/config/rootfiles/core/91/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file From be58233aee9b2098cce171d017c35df7c1a0b978 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 9 Jun 2015 16:14:28 +0200 Subject: [PATCH 22/37] python: update optional sources package. --- lfs/python-optional-src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index 7b9e0c7c8..d09f4a4c3 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # +# Copyright (C) 2007-2015 IPFire Team # # # # 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,12 +24,12 @@ include Config -VER = 2.7.1 +VER = 2.7.9 include python PROG = python-optional-src -PAK_VER = 2 +PAK_VER = 3 DEPS = dist: From a1c3b6c87fa3a30e12904b9392ba43e64c9be73c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 9 Jun 2015 16:21:54 +0200 Subject: [PATCH 23/37] web-user-interface: fix missing graphs folder. --- config/rootfiles/common/web-user-interface | 3 ++- config/rootfiles/core/91/update.sh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index 08b87a356..3f22b725c 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -92,7 +92,6 @@ srv/web/ipfire/html/blob.gif srv/web/ipfire/html/clwarn.cgi srv/web/ipfire/html/dial.cgi srv/web/ipfire/html/favicon.ico -#srv/web/ipfire/html/graphs #srv/web/ipfire/html/images srv/web/ipfire/html/images/IPFire.png srv/web/ipfire/html/images/add.gif @@ -357,3 +356,5 @@ srv/web/ipfire/html/themes/maniac/include/style.css var/updatecache var/updatecache/download var/updatecache/metadata +srv/web/ipfire/html/accounting +srv/web/ipfire/html/graphs diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh index dfacbfe81..b332dddb7 100644 --- a/config/rootfiles/core/91/update.sh +++ b/config/rootfiles/core/91/update.sh @@ -34,6 +34,10 @@ done # Extract files extract_files +# Create some missing graphs folders (core90) +mkdir -p /srv/web/ipfire/html/{accounting,graphs} +chmod 777 /srv/web/ipfire/html/{accounting,graphs} + # Update Language cache update-lang-cache From 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 10 Jun 2015 12:21:03 +0200 Subject: [PATCH 24/37] Revert "Python: Update to 2.7.9" This reverts commit 765423cebe798bb4c8db75755979ce943f484792. build fails. --- config/rootfiles/common/python | 234 +--------------------- config/rootfiles/core/91/filelists/python | 1 - lfs/python | 6 +- lfs/python-optional-src | 2 +- src/patches/Python-2.7.9-gdbm-1.patch | 21 -- 5 files changed, 8 insertions(+), 256 deletions(-) delete mode 120000 config/rootfiles/core/91/filelists/python delete mode 100644 src/patches/Python-2.7.9-gdbm-1.patch diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 4f11c5621..3472e2517 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -171,18 +171,12 @@ usr/lib/python2.7/__phello__.foo.pyc #usr/lib/python2.7/_abcoll.py usr/lib/python2.7/_abcoll.pyc #usr/lib/python2.7/_abcoll.pyo -#usr/lib/python2.7/_osx_support.py -#usr/lib/python2.7/_osx_support.pyc -#usr/lib/python2.7/_osx_support.pyo #usr/lib/python2.7/_pyio.py usr/lib/python2.7/_pyio.pyc #usr/lib/python2.7/_pyio.pyo #usr/lib/python2.7/_strptime.py usr/lib/python2.7/_strptime.pyc #usr/lib/python2.7/_strptime.pyo -#usr/lib/python2.7/_sysconfigdata.py -#usr/lib/python2.7/_sysconfigdata.pyc -#usr/lib/python2.7/_sysconfigdata.pyo #usr/lib/python2.7/_threading_local.py usr/lib/python2.7/_threading_local.pyc #usr/lib/python2.7/_threading_local.pyo @@ -611,9 +605,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc #usr/lib/python2.7/ctypes/test/test_win32.py #usr/lib/python2.7/ctypes/test/test_win32.pyc #usr/lib/python2.7/ctypes/test/test_win32.pyo -#usr/lib/python2.7/ctypes/test/test_wintypes.py -#usr/lib/python2.7/ctypes/test/test_wintypes.pyc -#usr/lib/python2.7/ctypes/test/test_wintypes.pyo #usr/lib/python2.7/ctypes/util.py usr/lib/python2.7/ctypes/util.pyc #usr/lib/python2.7/ctypes/util.pyo @@ -1461,19 +1452,6 @@ usr/lib/python2.7/encodings/uu_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.py usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.pyo -#usr/lib/python2.7/ensurepip -#usr/lib/python2.7/ensurepip/__init__.py -#usr/lib/python2.7/ensurepip/__init__.pyc -#usr/lib/python2.7/ensurepip/__init__.pyo -#usr/lib/python2.7/ensurepip/__main__.py -#usr/lib/python2.7/ensurepip/__main__.pyc -#usr/lib/python2.7/ensurepip/__main__.pyo -#usr/lib/python2.7/ensurepip/_bundled -#usr/lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl -#usr/lib/python2.7/ensurepip/_uninstall.py -#usr/lib/python2.7/ensurepip/_uninstall.pyc -#usr/lib/python2.7/ensurepip/_uninstall.pyo #usr/lib/python2.7/filecmp.py usr/lib/python2.7/filecmp.pyc #usr/lib/python2.7/filecmp.pyo @@ -1605,13 +1583,6 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/Icons #usr/lib/python2.7/idlelib/Icons/folder.gif #usr/lib/python2.7/idlelib/Icons/idle.icns -#usr/lib/python2.7/idlelib/Icons/idle.ico -#usr/lib/python2.7/idlelib/Icons/idle_16.gif -#usr/lib/python2.7/idlelib/Icons/idle_16.png -#usr/lib/python2.7/idlelib/Icons/idle_32.gif -#usr/lib/python2.7/idlelib/Icons/idle_32.png -#usr/lib/python2.7/idlelib/Icons/idle_48.gif -#usr/lib/python2.7/idlelib/Icons/idle_48.png #usr/lib/python2.7/idlelib/Icons/minusnode.gif #usr/lib/python2.7/idlelib/Icons/openfolder.gif #usr/lib/python2.7/idlelib/Icons/plusnode.gif @@ -1730,77 +1701,6 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/idle.pyc #usr/lib/python2.7/idlelib/idle.pyo #usr/lib/python2.7/idlelib/idle.pyw -#usr/lib/python2.7/idlelib/idle_test -#usr/lib/python2.7/idlelib/idle_test/README.txt -#usr/lib/python2.7/idlelib/idle_test/__init__.py -#usr/lib/python2.7/idlelib/idle_test/__init__.pyc -#usr/lib/python2.7/idlelib/idle_test/__init__.pyo -#usr/lib/python2.7/idlelib/idle_test/htest.py -#usr/lib/python2.7/idlelib/idle_test/htest.pyc -#usr/lib/python2.7/idlelib/idle_test/htest.pyo -#usr/lib/python2.7/idlelib/idle_test/mock_idle.py -#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyc -#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyo -#usr/lib/python2.7/idlelib/idle_test/mock_tk.py -#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyc -#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyo -#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py -#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyc -#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyo -#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py -#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyc -#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyo -#usr/lib/python2.7/idlelib/idle_test/test_calltips.py -#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyc -#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyo -#usr/lib/python2.7/idlelib/idle_test/test_config_name.py -#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyc -#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyo -#usr/lib/python2.7/idlelib/idle_test/test_configdialog.py -#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyc -#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyo -#usr/lib/python2.7/idlelib/idle_test/test_delegator.py -#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc -#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo -#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py -#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc -#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo -#usr/lib/python2.7/idlelib/idle_test/test_grep.py -#usr/lib/python2.7/idlelib/idle_test/test_grep.pyc -#usr/lib/python2.7/idlelib/idle_test/test_grep.pyo -#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py -#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc -#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo -#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py -#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc -#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo -#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py -#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc -#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo -#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py -#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyc -#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyo -#usr/lib/python2.7/idlelib/idle_test/test_rstrip.py -#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyc -#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyo -#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.py -#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc -#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo -#usr/lib/python2.7/idlelib/idle_test/test_searchengine.py -#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyc -#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyo -#usr/lib/python2.7/idlelib/idle_test/test_text.py -#usr/lib/python2.7/idlelib/idle_test/test_text.pyc -#usr/lib/python2.7/idlelib/idle_test/test_text.pyo -#usr/lib/python2.7/idlelib/idle_test/test_textview.py -#usr/lib/python2.7/idlelib/idle_test/test_textview.pyc -#usr/lib/python2.7/idlelib/idle_test/test_textview.pyo -#usr/lib/python2.7/idlelib/idle_test/test_warning.py -#usr/lib/python2.7/idlelib/idle_test/test_warning.pyc -#usr/lib/python2.7/idlelib/idle_test/test_warning.pyo -#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.py -#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyc -#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyo #usr/lib/python2.7/idlelib/idlever.py #usr/lib/python2.7/idlelib/idlever.pyc #usr/lib/python2.7/idlelib/idlever.pyo @@ -1909,9 +1809,6 @@ usr/lib/python2.7/json/scanner.pyc #usr/lib/python2.7/json/tests/test_speedups.py #usr/lib/python2.7/json/tests/test_speedups.pyc #usr/lib/python2.7/json/tests/test_speedups.pyo -#usr/lib/python2.7/json/tests/test_tool.py -#usr/lib/python2.7/json/tests/test_tool.pyc -#usr/lib/python2.7/json/tests/test_tool.pyo #usr/lib/python2.7/json/tests/test_unicode.py #usr/lib/python2.7/json/tests/test_unicode.pyc #usr/lib/python2.7/json/tests/test_unicode.pyo @@ -1922,7 +1819,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -usr/lib/python2.7/lib-dynload/Python-2.7.9-py2.7.egg-info +usr/lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1963,7 +1860,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so usr/lib/python2.7/lib-dynload/cmath.so usr/lib/python2.7/lib-dynload/crypt.so usr/lib/python2.7/lib-dynload/datetime.so -#usr/lib/python2.7/lib-dynload/dbm_failed.so +usr/lib/python2.7/lib-dynload/dbm.so usr/lib/python2.7/lib-dynload/dl.so usr/lib/python2.7/lib-dynload/fcntl.so usr/lib/python2.7/lib-dynload/future_builtins.so @@ -2029,27 +1926,12 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyo -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.py -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyc -#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyo #usr/lib/python2.7/lib-tk/test/test_ttk #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.py #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.pyc @@ -2069,9 +1951,6 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyc #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyo -#usr/lib/python2.7/lib-tk/test/widget_tests.py -#usr/lib/python2.7/lib-tk/test/widget_tests.pyc -#usr/lib/python2.7/lib-tk/test/widget_tests.pyo #usr/lib/python2.7/lib-tk/tkColorChooser.py #usr/lib/python2.7/lib-tk/tkColorChooser.pyc #usr/lib/python2.7/lib-tk/tkColorChooser.pyo @@ -2098,9 +1977,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.9.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.9.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2126,9 +2005,6 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/fixes/fix_apply.py #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyc #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyo -#usr/lib/python2.7/lib2to3/fixes/fix_asserts.py -#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyc -#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyo #usr/lib/python2.7/lib2to3/fixes/fix_basestring.py #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyc #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyo @@ -2331,7 +2207,6 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/tests/data/bom.py #usr/lib/python2.7/lib2to3/tests/data/crlf.py #usr/lib/python2.7/lib2to3/tests/data/different_encoding.py -#usr/lib/python2.7/lib2to3/tests/data/false_encoding.py #usr/lib/python2.7/lib2to3/tests/data/fixers #usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.py #usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes @@ -2753,33 +2628,12 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo -#usr/lib/python2.7/test/_mock_backport.py -#usr/lib/python2.7/test/_mock_backport.pyc -#usr/lib/python2.7/test/_mock_backport.pyo -#usr/lib/python2.7/test/audiodata -#usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm16.au -#usr/lib/python2.7/test/audiodata/pluck-pcm16.wav -#usr/lib/python2.7/test/audiodata/pluck-pcm24.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm24.wav -#usr/lib/python2.7/test/audiodata/pluck-pcm32.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm32.au -#usr/lib/python2.7/test/audiodata/pluck-pcm32.wav -#usr/lib/python2.7/test/audiodata/pluck-pcm8.aiff -#usr/lib/python2.7/test/audiodata/pluck-pcm8.au -#usr/lib/python2.7/test/audiodata/pluck-pcm8.wav -#usr/lib/python2.7/test/audiodata/pluck-ulaw.aifc -#usr/lib/python2.7/test/audiodata/pluck-ulaw.au #usr/lib/python2.7/test/audiotest.au -#usr/lib/python2.7/test/audiotests.py -#usr/lib/python2.7/test/audiotests.pyc -#usr/lib/python2.7/test/audiotests.pyo #usr/lib/python2.7/test/autotest.py #usr/lib/python2.7/test/autotest.pyc #usr/lib/python2.7/test/autotest.pyo #usr/lib/python2.7/test/bad_coding.py #usr/lib/python2.7/test/bad_coding2.py -#usr/lib/python2.7/test/bad_coding3.py #usr/lib/python2.7/test/badcert.pem #usr/lib/python2.7/test/badkey.pem #usr/lib/python2.7/test/badsyntax_future3.py @@ -2793,11 +2647,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/buffer_tests.py #usr/lib/python2.7/test/buffer_tests.pyc #usr/lib/python2.7/test/buffer_tests.pyo -#usr/lib/python2.7/test/capath -#usr/lib/python2.7/test/capath/4e1295a3.0 -#usr/lib/python2.7/test/capath/5ed36f99.0 -#usr/lib/python2.7/test/capath/6e88d7b8.0 -#usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/check_soundcard.vbs #usr/lib/python2.7/test/cjkencodings @@ -2981,7 +2830,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest -#usr/lib/python2.7/test/dh512.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -3001,18 +2849,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/greyrgb.uue #usr/lib/python2.7/test/https_svn_python_org_root.pem #usr/lib/python2.7/test/ieee754.txt -#usr/lib/python2.7/test/imghdrdata -#usr/lib/python2.7/test/imghdrdata/python.bmp -#usr/lib/python2.7/test/imghdrdata/python.gif -#usr/lib/python2.7/test/imghdrdata/python.jpg -#usr/lib/python2.7/test/imghdrdata/python.pbm -#usr/lib/python2.7/test/imghdrdata/python.pgm -#usr/lib/python2.7/test/imghdrdata/python.png -#usr/lib/python2.7/test/imghdrdata/python.ppm -#usr/lib/python2.7/test/imghdrdata/python.ras -#usr/lib/python2.7/test/imghdrdata/python.sgi -#usr/lib/python2.7/test/imghdrdata/python.tiff -#usr/lib/python2.7/test/imghdrdata/python.xbm #usr/lib/python2.7/test/infinite_reload.py #usr/lib/python2.7/test/infinite_reload.pyc #usr/lib/python2.7/test/infinite_reload.pyo @@ -3022,29 +2858,18 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/inspect_fodder2.py #usr/lib/python2.7/test/inspect_fodder2.pyc #usr/lib/python2.7/test/inspect_fodder2.pyo -#usr/lib/python2.7/test/keycert.passwd.pem #usr/lib/python2.7/test/keycert.pem -#usr/lib/python2.7/test/keycert2.pem -#usr/lib/python2.7/test/keycert3.pem -#usr/lib/python2.7/test/keycert4.pem #usr/lib/python2.7/test/list_tests.py #usr/lib/python2.7/test/list_tests.pyc #usr/lib/python2.7/test/list_tests.pyo #usr/lib/python2.7/test/lock_tests.py #usr/lib/python2.7/test/lock_tests.pyc #usr/lib/python2.7/test/lock_tests.pyo -#usr/lib/python2.7/test/make_ssl_certs.py -#usr/lib/python2.7/test/make_ssl_certs.pyc -#usr/lib/python2.7/test/make_ssl_certs.pyo #usr/lib/python2.7/test/mapping_tests.py #usr/lib/python2.7/test/mapping_tests.pyc #usr/lib/python2.7/test/mapping_tests.pyo #usr/lib/python2.7/test/math_testcases.txt -#usr/lib/python2.7/test/mp_fork_bomb.py -#usr/lib/python2.7/test/mp_fork_bomb.pyc -#usr/lib/python2.7/test/mp_fork_bomb.pyo #usr/lib/python2.7/test/nokia.pem -#usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem #usr/lib/python2.7/test/outstanding_bugs.py #usr/lib/python2.7/test/outstanding_bugs.pyc @@ -3055,7 +2880,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/profilee.py #usr/lib/python2.7/test/profilee.pyc #usr/lib/python2.7/test/profilee.pyo -#usr/lib/python2.7/test/pycacert.pem #usr/lib/python2.7/test/pyclbr_input.py #usr/lib/python2.7/test/pyclbr_input.pyc #usr/lib/python2.7/test/pyclbr_input.pyo @@ -3083,20 +2907,12 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/reperf.py #usr/lib/python2.7/test/reperf.pyc #usr/lib/python2.7/test/reperf.pyo -#usr/lib/python2.7/test/revocation.crl #usr/lib/python2.7/test/sample_doctest.py #usr/lib/python2.7/test/sample_doctest.pyc #usr/lib/python2.7/test/sample_doctest.pyo -#usr/lib/python2.7/test/sample_doctest_no_docstrings.py -#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyc -#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyo -#usr/lib/python2.7/test/sample_doctest_no_doctests.py -#usr/lib/python2.7/test/sample_doctest_no_doctests.pyc -#usr/lib/python2.7/test/sample_doctest_no_doctests.pyo #usr/lib/python2.7/test/script_helper.py #usr/lib/python2.7/test/script_helper.pyc #usr/lib/python2.7/test/script_helper.pyo -#usr/lib/python2.7/test/selfsigned_pythontestdotnet.pem #usr/lib/python2.7/test/seq_tests.py #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo @@ -3106,11 +2922,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo #usr/lib/python2.7/test/ssl_cert.pem -#usr/lib/python2.7/test/ssl_key.passwd.pem #usr/lib/python2.7/test/ssl_key.pem -#usr/lib/python2.7/test/ssl_servers.py -#usr/lib/python2.7/test/ssl_servers.pyc -#usr/lib/python2.7/test/ssl_servers.pyo #usr/lib/python2.7/test/string_tests.py #usr/lib/python2.7/test/string_tests.pyc #usr/lib/python2.7/test/string_tests.pyo @@ -3118,9 +2930,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo -#usr/lib/python2.7/test/symlink_support.py -#usr/lib/python2.7/test/symlink_support.pyc -#usr/lib/python2.7/test/symlink_support.pyo #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -3139,9 +2948,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test__locale.py #usr/lib/python2.7/test/test__locale.pyc #usr/lib/python2.7/test/test__locale.pyo -#usr/lib/python2.7/test/test__osx_support.py -#usr/lib/python2.7/test/test__osx_support.pyc -#usr/lib/python2.7/test/test__osx_support.pyo #usr/lib/python2.7/test/test_abc.py #usr/lib/python2.7/test/test_abc.pyc #usr/lib/python2.7/test/test_abc.pyo @@ -3474,9 +3280,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_email_renamed.py #usr/lib/python2.7/test/test_email_renamed.pyc #usr/lib/python2.7/test/test_email_renamed.pyo -#usr/lib/python2.7/test/test_ensurepip.py -#usr/lib/python2.7/test/test_ensurepip.pyc -#usr/lib/python2.7/test/test_ensurepip.pyo #usr/lib/python2.7/test/test_enumerate.py #usr/lib/python2.7/test/test_enumerate.pyc #usr/lib/python2.7/test/test_enumerate.pyo @@ -3507,9 +3310,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_file2k.py #usr/lib/python2.7/test/test_file2k.pyc #usr/lib/python2.7/test/test_file2k.pyo -#usr/lib/python2.7/test/test_file_eintr.py -#usr/lib/python2.7/test/test_file_eintr.pyc -#usr/lib/python2.7/test/test_file_eintr.pyo #usr/lib/python2.7/test/test_filecmp.py #usr/lib/python2.7/test/test_filecmp.pyc #usr/lib/python2.7/test/test_filecmp.pyo @@ -3645,9 +3445,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_httpservers.py #usr/lib/python2.7/test/test_httpservers.pyc #usr/lib/python2.7/test/test_httpservers.pyo -#usr/lib/python2.7/test/test_idle.py -#usr/lib/python2.7/test/test_idle.pyc -#usr/lib/python2.7/test/test_idle.pyo #usr/lib/python2.7/test/test_imageop.py #usr/lib/python2.7/test/test_imageop.pyc #usr/lib/python2.7/test/test_imageop.pyo @@ -3657,9 +3454,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_imgfile.py #usr/lib/python2.7/test/test_imgfile.pyc #usr/lib/python2.7/test/test_imgfile.pyo -#usr/lib/python2.7/test/test_imghdr.py -#usr/lib/python2.7/test/test_imghdr.pyc -#usr/lib/python2.7/test/test_imghdr.pyo #usr/lib/python2.7/test/test_imp.py #usr/lib/python2.7/test/test_imp.pyc #usr/lib/python2.7/test/test_imp.pyo @@ -3747,9 +3541,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_macpath.py #usr/lib/python2.7/test/test_macpath.pyc #usr/lib/python2.7/test/test_macpath.pyo -#usr/lib/python2.7/test/test_macurl2path.py -#usr/lib/python2.7/test/test_macurl2path.pyc -#usr/lib/python2.7/test/test_macurl2path.pyo #usr/lib/python2.7/test/test_mailbox.py #usr/lib/python2.7/test/test_mailbox.pyc #usr/lib/python2.7/test/test_mailbox.pyo @@ -3819,9 +3610,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_nis.py #usr/lib/python2.7/test/test_nis.pyc #usr/lib/python2.7/test/test_nis.pyo -#usr/lib/python2.7/test/test_nntplib.py -#usr/lib/python2.7/test/test_nntplib.pyc -#usr/lib/python2.7/test/test_nntplib.pyo #usr/lib/python2.7/test/test_normalization.py #usr/lib/python2.7/test/test_normalization.pyc #usr/lib/python2.7/test/test_normalization.pyo @@ -4053,9 +3841,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_sort.py #usr/lib/python2.7/test/test_sort.pyc #usr/lib/python2.7/test/test_sort.pyo -#usr/lib/python2.7/test/test_spwd.py -#usr/lib/python2.7/test/test_spwd.pyc -#usr/lib/python2.7/test/test_spwd.pyo #usr/lib/python2.7/test/test_sqlite.py #usr/lib/python2.7/test/test_sqlite.pyc #usr/lib/python2.7/test/test_sqlite.pyo @@ -4065,9 +3850,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_startfile.py #usr/lib/python2.7/test/test_startfile.pyc #usr/lib/python2.7/test/test_startfile.pyo -#usr/lib/python2.7/test/test_stat.py -#usr/lib/python2.7/test/test_stat.pyc -#usr/lib/python2.7/test/test_stat.pyo #usr/lib/python2.7/test/test_str.py #usr/lib/python2.7/test/test_str.pyc #usr/lib/python2.7/test/test_str.pyo @@ -4101,9 +3883,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_subprocess.py #usr/lib/python2.7/test/test_subprocess.pyc #usr/lib/python2.7/test/test_subprocess.pyo -#usr/lib/python2.7/test/test_sunau.py -#usr/lib/python2.7/test/test_sunau.pyc -#usr/lib/python2.7/test/test_sunau.pyo #usr/lib/python2.7/test/test_sunaudiodev.py #usr/lib/python2.7/test/test_sunaudiodev.pyc #usr/lib/python2.7/test/test_sunaudiodev.pyo @@ -4176,9 +3955,6 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tokenize.py #usr/lib/python2.7/test/test_tokenize.pyc #usr/lib/python2.7/test/test_tokenize.pyo -#usr/lib/python2.7/test/test_tools.py -#usr/lib/python2.7/test/test_tools.pyc -#usr/lib/python2.7/test/test_tools.pyo #usr/lib/python2.7/test/test_trace.py #usr/lib/python2.7/test/test_trace.pyc #usr/lib/python2.7/test/test_trace.pyo @@ -4624,6 +4400,4 @@ usr/lib/python2.7/xmlrpclib.pyc #usr/lib/python2.7/zipfile.py usr/lib/python2.7/zipfile.pyc #usr/lib/python2.7/zipfile.pyo -#usr/share/man/man1/python.1 -#usr/share/man/man1/python2.1 #usr/share/man/man1/python2.7.1 diff --git a/config/rootfiles/core/91/filelists/python b/config/rootfiles/core/91/filelists/python deleted file mode 120000 index ffe6e2c49..000000000 --- a/config/rootfiles/core/91/filelists/python +++ /dev/null @@ -1 +0,0 @@ -../../../common/python \ No newline at end of file diff --git a/lfs/python b/lfs/python index acd230cb0..6095e5ed0 100644 --- a/lfs/python +++ b/lfs/python @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team # +# Copyright (C) 2007-2011 IPFire Team # # # # 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,7 +24,7 @@ include Config -VER = 2.7.9 +VER = 2.7.3 THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 38d530f7efc373d64a8fb1637e3baaa7 +$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0 install : $(TARGET) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index d09f4a4c3..3b9f1c5c6 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -24,7 +24,7 @@ include Config -VER = 2.7.9 +VER = 2.7.3 include python diff --git a/src/patches/Python-2.7.9-gdbm-1.patch b/src/patches/Python-2.7.9-gdbm-1.patch deleted file mode 100644 index c72b45277..000000000 --- a/src/patches/Python-2.7.9-gdbm-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py ---- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200 -+++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200 -@@ -1125,7 +1125,7 @@ - 'ndbm'): - ndbm_libs = ['ndbm'] - else: -- ndbm_libs = [] -+ ndbm_libs = ['gdbm', 'gdbm_compat' ] - print "building dbm using ndbm" - dbmext = Extension('dbm', ['dbmmodule.c'], - define_macros=[ -@@ -1140,7 +1140,7 @@ - if self.compiler.find_library_file(lib_dirs, - 'gdbm_compat'): - gdbm_libs.append('gdbm_compat') -- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: -+ if find_file("ndbm.h", inc_dirs, []) is not None: - print "building dbm using gdbm" - dbmext = Extension( - 'dbm', ['dbmmodule.c'], From 8bd45f85efc8a282c5d1d1f6b3c47609eb265ba7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 10 Jun 2015 18:38:41 +0200 Subject: [PATCH 25/37] cyrus-imapd: fix typo at backup include extraction. --- src/paks/cyrus-imapd/uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh index 6e1468ec7..e34fa5698 100644 --- a/src/paks/cyrus-imapd/uninstall.sh +++ b/src/paks/cyrus-imapd/uninstall.sh @@ -22,7 +22,7 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -extract_backup_include +extract_backup_includes stop_service ${NAME} make_backup ${NAME} remove_files From b65251c87d28e09f0c299fc1ca0e9c6ce8ccc43f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 10 Jun 2015 18:45:29 +0200 Subject: [PATCH 26/37] postfix: add backup/restore at package update. --- src/paks/default/uninstall.sh | 2 +- src/paks/postfix/install.sh | 4 +++- src/paks/postfix/uninstall.sh | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh index a7b8a5370..88f5faf51 100644 --- a/src/paks/default/uninstall.sh +++ b/src/paks/default/uninstall.sh @@ -1,4 +1,4 @@ -#!/bin/bash + #!/bin/bash ############################################################################ # # # This file is part of the IPFire Firewall. # diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh index 56c23e2c2..0932d2e54 100644 --- a/src/paks/postfix/install.sh +++ b/src/paks/postfix/install.sh @@ -23,10 +23,12 @@ # . /opt/pakfire/lib/functions.sh extract_files +restore_backup ${NAME} postalias /etc/aliases # Set postfix's hostname postconf -e "myhostname=$(hostname -f)" -/etc/init.d/postfix start + +start_service ${NAME} # Enable autostart for postfix ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix diff --git a/src/paks/postfix/uninstall.sh b/src/paks/postfix/uninstall.sh index 39f1ef969..bc70451a1 100644 --- a/src/paks/postfix/uninstall.sh +++ b/src/paks/postfix/uninstall.sh @@ -22,5 +22,8 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh +extract_backup_includes +stop_service ${NAME} +make_backup ${NAME} remove_files rm -rfv /etc/rc.d/rc*.d/*postfix From e36af11945c8217a2bc957e42aa87c6578ab573e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 10 Jun 2015 21:12:04 +0200 Subject: [PATCH 27/37] paks: Remove unintentional tab Signed-off-by: Michael Tremer --- src/paks/default/uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh index 88f5faf51..a7b8a5370 100644 --- a/src/paks/default/uninstall.sh +++ b/src/paks/default/uninstall.sh @@ -1,4 +1,4 @@ - #!/bin/bash +#!/bin/bash ############################################################################ # # # This file is part of the IPFire Firewall. # From 36215f793fd455c1721844ee95a535b19636d1d5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 11 Jun 2015 09:42:54 +0200 Subject: [PATCH 28/37] default-pak: remove wrong tab. --- src/paks/default/uninstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/paks/default/uninstall.sh b/src/paks/default/uninstall.sh index 88f5faf51..a7b8a5370 100644 --- a/src/paks/default/uninstall.sh +++ b/src/paks/default/uninstall.sh @@ -1,4 +1,4 @@ - #!/bin/bash +#!/bin/bash ############################################################################ # # # This file is part of the IPFire Firewall. # From aec0c3102e3061d4df9002efc93e45ec50975be9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jun 2015 14:44:52 +0200 Subject: [PATCH 29/37] Update translations Signed-off-by: Michael Tremer --- doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.it | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 12 ++++++++++++ 8 files changed, 33 insertions(+) diff --git a/doc/language_issues.es b/doc/language_issues.es index fe8b72624..9910db6a0 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -960,6 +960,9 @@ WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly diff --git a/doc/language_issues.fr b/doc/language_issues.fr index fee481d25..ef01a1e10 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -971,6 +971,9 @@ WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly diff --git a/doc/language_issues.it b/doc/language_issues.it index 2f61cb61b..522fee3ba 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -708,6 +708,9 @@ WARNING: untranslated string: no data WARNING: untranslated string: outgoing compression in bytes per second WARNING: untranslated string: outgoing overhead in bytes per second WARNING: untranslated string: ovpn add conf +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.nl b/doc/language_issues.nl index fadc79272..e7d8e08ea 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -749,6 +749,9 @@ WARNING: untranslated string: ovpn dh upload WARNING: untranslated string: ovpn generating the root and host certificates WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: random number generator daemon WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added diff --git a/doc/language_issues.pl b/doc/language_issues.pl index fe8b72624..9910db6a0 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -960,6 +960,9 @@ WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice WARNING: untranslated string: pakfire ago +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a9e900134..95caaa53f 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -954,6 +954,9 @@ WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: p2p block WARNING: untranslated string: p2p block save notice +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: proxy reports WARNING: untranslated string: proxy reports daily WARNING: untranslated string: proxy reports monthly diff --git a/doc/language_issues.tr b/doc/language_issues.tr index d94953a84..d57c721a1 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -687,6 +687,9 @@ WARNING: untranslated string: no data WARNING: untranslated string: outgoing compression in bytes per second WARNING: untranslated string: outgoing overhead in bytes per second WARNING: untranslated string: ovpn add conf +WARNING: untranslated string: pptp netconfig +WARNING: untranslated string: pptp peer +WARNING: untranslated string: pptp route WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index 03a9e3f35..b88db5754 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -437,6 +437,9 @@ < ovpn reneg sec < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly @@ -1023,6 +1026,9 @@ < ovpn routes push options < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly @@ -1573,6 +1579,9 @@ < ovpn routes push options < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly @@ -2126,6 +2135,9 @@ < ovpn reneg sec < p2p block < p2p block save notice +< pptp netconfig +< pptp peer +< pptp route < proxy reports < proxy reports daily < proxy reports monthly From 3e95f420280d49eebc07d864bc41e6ab3ea0adc3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jun 2015 17:03:56 +0200 Subject: [PATCH 30/37] openssl: Update to version 1.0.2b https://www.openssl.org/news/secadv_20150611.txt Signed-off-by: Michael Tremer --- config/rootfiles/core/91/filelists/i586/openssl-sse2 | 1 + config/rootfiles/core/91/filelists/openssl | 1 + lfs/openssl | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 120000 config/rootfiles/core/91/filelists/i586/openssl-sse2 create mode 120000 config/rootfiles/core/91/filelists/openssl diff --git a/config/rootfiles/core/91/filelists/i586/openssl-sse2 b/config/rootfiles/core/91/filelists/i586/openssl-sse2 new file mode 120000 index 000000000..f424713d6 --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/openssl b/config/rootfiles/core/91/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/lfs/openssl b/lfs/openssl index 455dcf15c..3b9f3e121 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.2a +VER = 1.0.2b THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -82,7 +82,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a06c547dac9044161a477211049f60ef +$(DL_FILE)_MD5 = 7729b259e2dea7d60b32fc3934d6984b install : $(TARGET) From 0ab3e07f9d96074eefb0ecbc4359f90feb520635 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jun 2015 17:05:27 +0200 Subject: [PATCH 31/37] core91: Ship openssh after openssl has been updated Signed-off-by: Michael Tremer --- config/rootfiles/core/91/filelists/openssh | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/91/filelists/openssh diff --git a/config/rootfiles/core/91/filelists/openssh b/config/rootfiles/core/91/filelists/openssh new file mode 120000 index 000000000..d8c77fd8e --- /dev/null +++ b/config/rootfiles/core/91/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file From 69a8ce7d9782eeace26c92584a0aa524b573aa43 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jun 2015 17:10:12 +0200 Subject: [PATCH 32/37] core91: Call update-lang-cache with full path Signed-off-by: Michael Tremer --- config/rootfiles/core/91/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh index b332dddb7..866711260 100644 --- a/config/rootfiles/core/91/update.sh +++ b/config/rootfiles/core/91/update.sh @@ -39,7 +39,7 @@ mkdir -p /srv/web/ipfire/html/{accounting,graphs} chmod 777 /srv/web/ipfire/html/{accounting,graphs} # Update Language cache -update-lang-cache +/usr/local/bin/update-lang-cache sync From 06a076e0d881f2a4f6c6c57913cb8bf487cf9f2e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jun 2015 17:12:16 +0200 Subject: [PATCH 33/37] core91: Restart IPsec Signed-off-by: Michael Tremer --- config/rootfiles/core/91/update.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh index 866711260..e3341d2d3 100644 --- a/config/rootfiles/core/91/update.sh +++ b/config/rootfiles/core/91/update.sh @@ -31,6 +31,9 @@ do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done +# Stop services +/etc/init.d/ipsec stop + # Extract files extract_files @@ -41,8 +44,16 @@ chmod 777 /srv/web/ipfire/html/{accounting,graphs} # Update Language cache /usr/local/bin/update-lang-cache +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + sync +# Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + # This update need a reboot... #touch /var/run/need_reboot From cb82fb206bbff70d8b2a63a3a2036642b46f9809 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jun 2015 17:13:34 +0200 Subject: [PATCH 34/37] core91: Require reboot Signed-off-by: Michael Tremer --- config/rootfiles/core/91/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh index e3341d2d3..1e55e8bd5 100644 --- a/config/rootfiles/core/91/update.sh +++ b/config/rootfiles/core/91/update.sh @@ -55,7 +55,7 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then fi # This update need a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot # Finish /etc/init.d/fireinfo start From 6646be5a53c2fa4846f6403d887a2975469800f6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jun 2015 17:13:51 +0200 Subject: [PATCH 35/37] make.sh: Change PAKFIRE_CORE to 91 Signed-off-by: Michael Tremer --- make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 3d4360379..29245bc59 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number CORE="91" # Core Level (Filename) -PAKFIRE_CORE="90" # Core Level (PAKFIRE) +PAKFIRE_CORE="91" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir From 57a3100d2dc91fd7dea7204e3c77d17d723d66d1 Mon Sep 17 00:00:00 2001 From: Jan Paul Tuecking Date: Fri, 12 Jun 2015 00:05:02 +0200 Subject: [PATCH 36/37] tor: update to 0.2.6.9 --- lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/tor b/lfs/tor index e19747a2a..eb188373d 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.2.6.8 +VER = 0.2.6.9 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 11 +PAK_VER = 12 DEPS = "libevent2" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 20a8c1f8cd7e8c912c4f3f0b67740fa5 +$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d install : $(TARGET) From 1f15cc0993aebc53870c685836db2eaeafdc767a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 13 Jun 2015 15:22:37 +0200 Subject: [PATCH 37/37] webaccess.cgi: Fix loading language Fixes #10879 Signed-off-by: Michael Tremer --- html/cgi-bin/webaccess.cgi | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/html/cgi-bin/webaccess.cgi b/html/cgi-bin/webaccess.cgi index b38171762..afa3770cf 100644 --- a/html/cgi-bin/webaccess.cgi +++ b/html/cgi-bin/webaccess.cgi @@ -30,7 +30,6 @@ my $acl_src_noaccess_mac = "$apdir/acls/src_noaccess_mac.acl"; my $banner = "A D V A N C E D   P R O X Y   -   W E B   A C C E S S   M A N A G E R"; my %cgiparams; -my %mainsettings; my %proxysettings; my %acl=(); @@ -38,18 +37,10 @@ my @group_defs=(); my @groups=(); ### Initialize environment -&readhash("${swroot}/main/settings", \%mainsettings); &readhash("${swroot}/proxy/advanced/settings", \%proxysettings); -$language = $mainsettings{'LANGUAGE'}; ### Initialize language -if ($language =~ /^(\w+)$/) {$language = $1;} - # - # Uncomment this to force a certain language: - # $language='en'; - # -require "${swroot}/langs/en.pl"; -require "${swroot}/langs/${language}.pl"; +require "${swroot}/lang.pl"; &getcgihash(\%cgiparams);