Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/backup/includes/cyrus-imapd b/config/backup/includes/cyrus-imapd
new file mode 100644 (file)
index 0000000..bb1bb3b
--- /dev/null
+++ b/config/backup/includes/cyrus-imapd
@@ -0,0 +1,4 @@
+/usr/sieve
+/var/imap
+/var/ipfire/cyrusimap
+/var/log/imap

diff --git a/config/backup/includes/netsnmpd b/config/backup/includes/netsnmpd
new file mode 100644 (file)
index 0000000..78ac6ac
--- /dev/null
+++ b/config/backup/includes/netsnmpd
@@ -0,0 +1 @@
+/etc/snmpd.conf

diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 5da892bbdf81ba0e403eb9b936eca1c36aff8c75..08b87a356739bdfcb339007cf713516a421b0abd 100644 (file)
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -92,6 +92,7 @@ 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

diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 90a6d776b09e0434967660d186635a4836265500..13c645a1a2ffacdac7a34bc62ade0b2816bb2a27 100644 (file)
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -75,15 +75,17 @@ chown nobody.nobody \
        /var/run/ovpnserver.log
 
 # Update OpenVPN/collectd configuration
-files=`find /var/ipfire/ovpn/n2nconf/ -type d`
-for i in $files;
-do
-       if ! grep -q "status-version" $i/${i##*/}.conf; then
-               echo "# Logfile" >> $i/${i##*/}.conf
-               echo "status-version 1" >> $i/${i##*/}.conf
+for i in /var/ipfire/ovpn/n2nconf/*/*.conf; do
+       name="${i##*/}"
+       name="${name%*.conf}"
+
+       if ! grep -qE "^status-version" ${i}; then
+               echo "# Logfile" >> ${i}
+               echo "status-version 1" >> ${i}
        fi
-       if ! grep -q "status " $i/${i##*/}.conf; then
-               echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf
+
+       if ! grep -qE "^status " ${i}; then
+               echo "status /var/run/openvpn/${name}-n2n 10" >> ${i}
        fi
 done
 

diff --git a/config/rootfiles/core/90/exclude b/config/rootfiles/core/90/exclude
index 56e840d8cc430f92a45b03e2c122fadc2061050e..73b7b73e630fb896f20e3af5331ebde0476121f5 100644 (file)
--- a/config/rootfiles/core/90/exclude
+++ b/config/rootfiles/core/90/exclude
@@ -15,7 +15,6 @@ etc/sudoers
 etc/sysconfig/firewall.local
 etc/sysconfig/modules
 etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
 var/ipfire/firewall/geoipblock
 var/ipfire/fwhosts/custmgeoipgrp

diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index 431dcd61c061c451fbb78908b609d1a7593d8bbd..ee596a070133cc46cb21cde91802c64dd1738777 100644 (file)
--- a/config/rootfiles/core/90/filelists/files
+++ b/config/rootfiles/core/90/filelists/files
@@ -5,6 +5,8 @@ etc/rc.d/init.d/network-trigger
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/rcsysinit.d/S90network-trigger
+opt/pakfire/pakfire
+opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi

diff --git a/config/rootfiles/core/90/filelists/openldap b/config/rootfiles/core/90/filelists/openldap
new file mode 120000 (symlink)
index 0000000..80c324f
--- /dev/null
+++ b/config/rootfiles/core/90/filelists/openldap
@@ -0,0 +1 @@
+../../../common/openldap
\ No newline at end of file

diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh
index 4835c5a29cbec3cfbc4e71eaabd9cf5acfa35da7..34dacf1134654caab5f8ef8a23e6c0bc26175717 100644 (file)
--- a/config/rootfiles/core/90/update.sh
+++ b/config/rootfiles/core/90/update.sh
@@ -208,6 +208,13 @@ sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove old udev configuration
+rm -vf /etc/udev/rules.d/30-persistent-network.rules
+
+# Remove pids from dhcp client because it hang at normal shutdown
+# so let the sysvinit kill it
+rm -f /run/dhcpcd-*.pid
+
 #
 # Start services
 #
@@ -218,22 +225,9 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
        /etc/init.d/ipsec start
 fi
 
-case "$(uname -m)" in
-       i?86)
-       case "$(find_device "/")" in
-               xvd* )
-                       echo Skip remove grub2 files, because pygrub fail.
-                       rm -f /boot/grub/*
-                       echo config will recreated by linux-pae install.
-                       ;;
-               * )
-                       #
-                       # Update to GRUB2 config
-                       #
-                       grub-mkconfig > /boot/grub/grub.cfg
-                       ;;
-       esac
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+               grub-mkconfig > /boot/grub/grub.cfg
+fi
 
 # Upadate Kernel version uEnv.txt
 if [ -e /boot/uEnv.txt ]; then
@@ -247,7 +241,7 @@ fi
 
 
 # Force (re)install pae kernel if pae is supported
-rm -rf /opt/pakfire/db/*/meta-linux-pae
+rm -rf /opt/pakfire/db/installed/meta-linux-pae
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
        ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
        BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
@@ -258,9 +252,7 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
+#              rm -f /opt/pakfire/db/meta/meta-linux-pae 2>&1 > /dev/null
        fi
 fi
 

diff --git a/config/rootfiles/packages/cyrus-imapd b/config/rootfiles/packages/cyrus-imapd
index 0c0485e4ef685cb8eea4c2ba9f27cc76b6dfe196..bbaec3ffb05ca2690c2a0d48863a0403f1f8d5ed 100644 (file)
--- a/config/rootfiles/packages/cyrus-imapd
+++ b/config/rootfiles/packages/cyrus-imapd
@@ -146,6 +146,7 @@ var/imap/msg
 var/imap/proc
 var/imap/ptclient
 var/imap/socket
+var/ipfire/backup/addons/includes/cyrus-imapd
 var/ipfire/cyrusimap
 var/ipfire/cyrusimap/cyrus.conf
 var/ipfire/cyrusimap/imapd.conf

diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd
index 30dbf93bce894309f53d25b9cda0182f5cbb56a6..63289492223b9c7ee176c023f81dbb766eb2ed60 100644 (file)
--- 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/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi
index 60c2e5869e260b89d2f37f1c98a90892ff6d9822..f2ae81300905ee5fafb995224471cdbe5a09aa54 100644 (file)
--- a/html/cgi-bin/country.cgi
+++ b/html/cgi-bin/country.cgi
@@ -23,12 +23,9 @@ use strict;
 
 use Locale::Codes::Country;
 
-my $flagdir = '/srv/web/ipfire/html/images/flags';
+my $col;
 my $lines = '1';
 my $lines2 = '';
-my @flaglist=();
-my @flaglistfiles=();
-my $flag = '';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/geoip-functions.pl";
@@ -41,44 +38,41 @@ require "${General::swroot}/header.pl";
 &Header::openbigbox('100%', 'left');
 
 &Header::openbox('100%', 'left', $Lang::tr{'country codes and flags'});
-print "<table class='tbl'>";
-print "<tr><th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th>";
-print "<th>&nbsp;</th>";
-print "<th style='width=5%;'><b>$Lang::tr{'flag'}</b></th>";
-print "<th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>";
-print "<th style='width=40%; text-align:left;'><b>$Lang::tr{'country'}</b></th></tr>";
-
-@flaglist = <$flagdir/*>;
-
-undef @flaglistfiles;
-
-foreach (@flaglist)
-{
-       if (!-d) { push(@flaglistfiles,substr($_,rindex($_,"/")+1));    }
-}
-my $col="";
-foreach $flag (@flaglistfiles)
-{
+
+print<<END;
+<table class='tbl'>
+       <tr>
+               <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+               <th style='width=5%'><b>$Lang::tr{'countrycode'}</b></th>
+               <th style='width=40% text-align:left'><b>$Lang::tr{'country'}</b></th>
+               <th>&nbsp;</th>
+               <th style='width=5%'><b>$Lang::tr{'flag'}</b></th>
+               <th style='width=5%;'><b>$Lang::tr{'countrycode'}</b></th>
+               <th style='width=40% text-align:left;'><b>$Lang::tr{'country'}</b></th>
+       </tr>
+END
+
+# Get a list of all supported country codes.
+my @countries = Locale::Codes::Country::all_country_codes();
+
+# Loop through whole country list.
+foreach my $country (@countries) {
        $lines++;
 
-       my $flagcode = uc(substr($flag, 0, 2));
-       my $fcode = lc($flagcode);
+       # Convert country code into upper case.
+       my $country_uc = uc($country);
 
        # Get flag icon for of the country.
-       my $flag_icon = &GeoIP::get_flag_icon($fcode);
+       my $flag_icon = &GeoIP::get_flag_icon($country);
+
+       # Get country name.
+       my $name = &GeoIP::get_full_country_name($country);
 
-       my $country = Locale::Country::code2country($fcode);
-       if($fcode eq 'eu') { $country = 'Europe'; }
-       if($fcode eq 'tp') { $country = 'East Timor'; }
-       if($fcode eq 'yu') { $country = 'Yugoslavia'; }
        if ($lines % 2) {
-               print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
-               print "<td $col>$flagcode</td>";
-               print "<td $col>$country</td></tr>\n";
-       }
-       else {
+               print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
+               print "<td $col>$country_uc</td>";
+               print "<td $col>$name</td></tr>\n";
+       } else {
                $lines2++;
                if($lines2 % 2) {
                        $col="style='background-color:${Header::table2colour};'";
@@ -86,25 +80,25 @@ foreach $flag (@flaglistfiles)
                        $col="style='background-color:${Header::table1colour};'";
                }
                print "<tr>";
-               print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>";
-               print "<td $col>$flagcode</td>";
-               print "<td $col>$country</td>";
+               print "<td $col><a id='$country'><img src='$flag_icon' alt='$country_uc' title='$country_uc'/></a></td>";
+               print "<td $col>$country_uc</td>";
+               print "<td $col>$name</td>";
                print "<td $col>&nbsp;</td>";
+
+               # Finish column when the last element in the array has passed and we have an uneven amount of items.
+               if ( $country eq $countries[-1] ) {
+                       print "<td $col>&nbsp;</td>\n";
+                       print "<td $col>&nbsp;</td>\n";
+                       print "<td $col>&nbsp;</td></tr>\n";
+               }
        }
 }
-
-
 print "</table>";
 &Header::closebox();
 
 &Header::closebigbox();
 
-print <<END
-<div style='text-align:center'>
-<a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a>
-</div>
-END
-; 
+print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n";
 
 &Header::closepage();
 

diff --git a/html/cgi-bin/geoip-block.cgi b/html/cgi-bin/geoip-block.cgi
index ccbfa926a0ad3c576217107f0fbc7842edf1cfc4..056b333e8c955eee667a982c2b227804c75c2d0b 100644 (file)
--- a/html/cgi-bin/geoip-block.cgi
+++ b/html/cgi-bin/geoip-block.cgi
@@ -225,7 +225,16 @@ foreach my $location (@locations) {
        print "<td align='center' $col>$flag</td>\n";
        print "<td align='center' $col>$ccode_uc</td>\n";
        print "<td align='left' $col>$cname</td>$line_end\n";
-                       
+
+       # Finish column when the last element in the array has passed and we have an uneven amount of items.
+       if(! ($lines2 % 2) && ($location eq $locations[-1] )) {
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td>\n";
+               print "<td $col>&nbsp;</td></tr>\n";
+       }
+
 $lines2++;
 }
 

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 2a020eaddd84060688898b4f66ede388726f2028..94900765f523107efed7327e88e0491c87716436 100644 (file)
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -3029,12 +3029,6 @@ sub make_algos($$$$$) {
                                        if (!$is_aead) {
                                                push(@algo, $int);
                                        }
-
-                                       if ($grp =~ m/^e(.*)$/) {
-                                               push(@algo, "ecp$1");
-                                       } else {
-                                               push(@algo, "modp$grp");
-                                       }
                                }
 
                                push(@algos, join("-", @algo));

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

diff --git a/lfs/elinks b/lfs/elinks
index 59f1426ead95a57304beb675cc97e5cc161b268b..2727423f0269a565d5ed7a2f0e993695740bcdd9 100644 (file)
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = elinks
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 

diff --git a/lfs/linux b/lfs/linux
index b2d2552dc848200fec573a8c6e2c022a579a62b9..f59a709a5827eeab1e70cb3b54dea57011b5074b 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 3.14.41
+VER        = 3.14.43
 
-RPI_PATCHES = 3.14.41-grsec-ipfire1
-A7M_PATCHES = 3.14.41-grsec-ipfire1
-GRS_PATCHES = grsecurity-3.1-3.14.41-201505072056.patch.xz
+RPI_PATCHES = 3.14.43-grsec-ipfire1
+A7M_PATCHES = 3.14.43-grsec-ipfire1
+GRS_PATCHES = grsecurity-3.1-3.14.43-201505191737.patch.xz
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -37,7 +37,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 59
+PAK_VER    = 61
 DEPS      = ""
 
 VERSUFIX=ipfire$(KCFG)
@@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz         = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz     = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)                                 = $(URL_IPFIRE)/$(GRS_PATCHES)
 
-$(DL_FILE)_MD5                                 = b28dfc6907c388c2adcc65aee2ad68ff
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = 9c8b20647429a64d656999a3c7af890f
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc
-$(GRS_PATCHES)_MD5                             = 8af3b27954311da581cc6f803f048779
+$(DL_FILE)_MD5                                 = 927f2343f298dfe531a8371f81356e53
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5                = b5ba925ae1d4279d3ac0f03c27dd16eb
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = b9c696fe4f22b05b81c168329ca33c94
+$(GRS_PATCHES)_MD5                             = 35e26b1214b1b0b515ee67e5ce50633a
 
 install : $(TARGET)
 

diff --git a/lfs/netsnmpd b/lfs/netsnmpd
index 388b20b120d68a5396e7568e275901b85faf5a22..b51367855f714f3b330790da7d05aa24ee335c64 100644 (file)
--- a/lfs/netsnmpd
+++ b/lfs/netsnmpd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2015  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 5.4.2.1
+VER        = 5.7.3
 
 THISAPP    = net-snmp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG      = netsnmpd
-PAK_VER           = 2
+PROG       = netsnmpd
+PAK_VER    = 4
 DEPS       = ""
 
 ###############################################################################
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 984932520143f0c8bf7b7ce1fc9e1da1
+$(DL_FILE)_MD5 = d4a3459e1577d0efa8d96ca70a885e53
 
 install : $(TARGET)
 
@@ -77,21 +77,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure \
-                                   --prefix=/usr \
-                                   --with-default-snmp-version="2" \
-                                   --with-sys-contact="root@" \
-                                   --with-sys-location="localhost" \
-                                   --with-logfile="/var/log/snmpd.log" \
-                                   --with-persistent-directory="/var/net-snmp" \
-                                   --libdir=/usr/lib \
-                                   --sysconfdir="/etc"
+               --prefix=/usr \
+               --with-default-snmp-version="2" \
+               --with-sys-contact="root@" \
+               --with-sys-location="localhost" \
+               --with-logfile="/var/log/snmpd.log" \
+               --with-persistent-directory="/var/net-snmp" \
+               --libdir=/usr/lib \
+               --sysconfdir="/etc"
        cd $(DIR_APP) && make 
        cd $(DIR_APP) && make install
        install -v -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \
+               /var/ipfire/backup/addons/includes/netsnmpd
        install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd /etc/init.d/netsnmpd
        ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd
        ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd
        ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
-       

diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index dca3e40163caeb050dc546684ff0d00258171851..70c30b4e230fb8b9fcff9e4f607394f2f948e8b1 100644 (file)
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -40,9 +40,6 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
                echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
                echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
                echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
-               echo "Name: linux-pae" > /opt/pakfire/db/meta/meta-linux-pae
-               echo "ProgVersion: 0" >> /opt/pakfire/db/meta/meta-linux-pae
-               echo "Release: 0"     >> /opt/pakfire/db/meta/meta-linux-pae
        fi
 fi
 

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index d14e0314da05e1a7bfd5377cd7811c1812e22afd..6bf85afdca3895b7b4c32a2387e44cd5d66f0f0c 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -393,6 +393,7 @@ sub dbgetlist {
        foreach $file (@files) {
                next if ( $file eq "." );
                next if ( $file eq ".." );
+               next if ( $file eq "meta-" );
                next if ( $file =~ /^old/ );
                open(FILE, "<$Conf::dbdir/meta/$file");
                @meta = <FILE>;
@@ -589,6 +590,25 @@ sub resolvedeps {
        return @all;
 }
 
+sub resolvedeps_recursive {
+       my @packages = shift;
+       my @result = ();
+
+       foreach my $pkg (@packages) {
+               my @deps = &Pakfire::resolvedeps($pkg);
+
+               foreach my $dep (@deps) {
+                       push(@result, $dep);
+               }
+       }
+
+       # Sort the result array and remove dupes
+       my %sort = map{ $_, 1 } @result;
+       @result = keys %sort;
+
+       return @result;
+}
+
 sub cleanup {
        my $dir = shift;
        my $path;
@@ -695,7 +715,7 @@ sub getpak {
        }
        
        unless ($file) {
-               message("No filename given in meta-file. Please phone the developers.");
+               message("No filename given in meta-file.");
                exit 1;
        }
        

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 3d0270aa41db8fb49f0f4f1002c9ba1e826606e6..8bca061aba696b34807c6cda0e19f928fa668736 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -255,14 +255,11 @@
        } elsif ("$ARGV[0]" eq "upgrade") {
                &Pakfire::upgradecore();
                my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
-               my @temp, $pak;
-               
-               foreach (@upgradepaks) {
-                       @temp = &Pakfire::resolvedeps("$_");
-                       foreach (@temp) { push(@upgradepaks,$_) if $_; }
-               }
-               
+
                if (@upgradepaks) {
+                       # Resolve the dependencies of the to be upgraded packages
+                       my @deps = &Pakfire::resolvedeps_recursive(@upgradepaks);
+
                        &Pakfire::message("");
                        &Pakfire::message("PAKFIRE UPGR: We are going to install all packages listed above.");
                        if ($interactive) {
@@ -277,16 +274,24 @@
                        }
                }
                
-               ### Download first
+               # Download packages
                foreach $pak (@upgradepaks) {
-                       #system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak");
                        &Pakfire::getpak("$pak", "");
                }
-               
+
+               # Download dependencies
+               foreach $pak (@deps) {
+                       &Pakfire::getpak("$pak", "");
+               }
+
+               # Install dependencies first
+               foreach $pak (@deps) {
+                       &Pakfire::setuppak("$pak");
+               }
+
+               # Install all upgrades
                foreach $pak (@upgradepaks) {
-                       if (&Pakfire::upgradepak("$pak")) {
-                               #system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak");
-                       }
+                       &Pakfire::upgradepak("$pak");
                }
                
        } elsif ("$ARGV[0]" eq "list") {

diff --git a/src/paks/cyrus-imapd/uninstall.sh b/src/paks/cyrus-imapd/uninstall.sh
index 0d2109eb9e6337d1c5838982f6b82f04e7f4e4d1..6e1468ec7f6ca27bad2617d7a76543f78f608e96 100644 (file)
--- a/src/paks/cyrus-imapd/uninstall.sh
+++ b/src/paks/cyrus-imapd/uninstall.sh
@@ -22,6 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_include
 stop_service ${NAME}
 make_backup ${NAME}
 remove_files

diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index c980a0136bfd81732965bfda823522846531895d..27e665f9243b1e18be7a31b5d23b6843be7957fe 100644 (file)
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -55,29 +55,24 @@ depmod -a $KVER-ipfire-pae
 #
 /usr/bin/dracut --force --xz /boot/initramfs-$KVER-ipfire-pae.img $KVER-ipfire-pae  
 
-
-ROOT="$(find_partition "/")"
-case $ROOT in
-       xvd* )
-               #
-               # We are on XEN so create new grub.conf / menu.lst for pygrub
-               #
-               echo "timeout 10"                          > /boot/grub/grub.conf
-               echo "default 0"                          >> /boot/grub/grub.conf
-               echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
-               echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
-                                                         >> /boot/grub/grub.conf
-               echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
-               echo "# savedefault 0"                    >> /boot/grub/grub.conf
-               ln -s grub.conf $MNThdd/boot/grub/menu.lst
-               ;;
-       * )
-               #
-               # Update grub2 config
-               #
-               grub-mkconfig > /boot/grub/grub.cfg
-               ;;
-esac
+if [ -e /boot/grub/grub.cfg ]; then
+       #
+       # Update grub2 config
+       #
+       grub-mkconfig > /boot/grub/grub.cfg
+else
+       #
+       # xen pv with pygrub need grub.conf / menu.lst
+       #
+       echo "timeout 10"                          > /boot/grub/grub.conf
+       echo "default 0"                          >> /boot/grub/grub.conf
+       echo "title IPFire (pae-kernel)"          >> /boot/grub/grub.conf
+       echo "  kernel /vmlinuz-$KVER-ipfire-pae root=/dev/$ROOT rootdelay=10 panic=10 console=hvc0" \
+                                                 >> /boot/grub/grub.conf
+       echo "  initrd /initramfs-$KVER-ipfire-pae.img" >> /boot/grub/grub.conf
+       echo "# savedefault 0"                    >> /boot/grub/grub.conf
+       ln -s grub.conf $MNThdd/boot/grub/menu.lst
+fi
 
 # request a reboot if pae is supported
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then

diff --git a/src/paks/net-snmp/install.sh b/src/paks/netsnmpd/install.sh
similarity index 100%
rename from src/paks/net-snmp/install.sh
rename to src/paks/netsnmpd/install.sh

diff --git a/src/paks/net-snmp/uninstall.sh b/src/paks/netsnmpd/uninstall.sh
similarity index 98%
rename from src/paks/net-snmp/uninstall.sh
rename to src/paks/netsnmpd/uninstall.sh
index a7b8a5370f68e23809d3bd94083f0150545980cb..278218b26066bb104c4e310d58e5e9f4782f00e4 100644 (file)
--- a/src/paks/net-snmp/uninstall.sh
+++ b/src/paks/netsnmpd/uninstall.sh
@@ -22,6 +22,7 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
 stop_service ${NAME}
 make_backup ${NAME}
 remove_files

diff --git a/src/paks/net-snmp/update.sh b/src/paks/netsnmpd/update.sh
similarity index 100%
rename from src/paks/net-snmp/update.sh
rename to src/paks/netsnmpd/update.sh