IPFire-SCM August 2018

ipfire-scm@lists.ipfire.org

1 participants
54 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 366b40c740bd61e412be23dcc987619b243b9c7b
by Michael Tremer 23 Aug '18

23 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 366b40c740bd61e412be23dcc987619b243b9c7b (commit) from 95b87f39ac309eb352dca6adbccfcff631bfe914 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 366b40c740bd61e412be23dcc987619b243b9c7b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 23 11:17:23 2018 +0100 setup: Don't write any mount errors over the GUI Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/installer/hw.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) Difference in files: diff --git a/src/installer/hw.c b/src/installer/hw.c index c9b95017d..8189aba18 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -146,14 +146,7 @@ int hw_mount(const char* source, const char* target, const char* fs, int flags) } } - int r = mount(source, target, fs, flags, NULL); - - if (r) { - fprintf(stderr, "Error mounting %s to %s (fs = %s, flags = %d): %s\n", - source, target, fs, flags, strerror(r)); - } - - return r; + return mount(source, target, fs, flags, NULL); } int hw_umount(const char* target) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 95b87f39ac309eb352dca6adbccfcff631bfe914
by Michael Tremer 23 Aug '18

23 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 95b87f39ac309eb352dca6adbccfcff631bfe914 (commit) from 702f0ba8357aa11ccee4cf7c43efd5d8f362a343 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 95b87f39ac309eb352dca6adbccfcff631bfe914 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 13:36:23 2018 +0100 localnet: Set FQDN without using domainname command Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/system/localnet | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) Difference in files: diff --git a/src/initscripts/system/localnet b/src/initscripts/system/localnet index 97f4d381c..a16b32e46 100644 --- a/src/initscripts/system/localnet +++ b/src/initscripts/system/localnet @@ -36,16 +36,10 @@ case "${1}" in ip link set lo up evaluate_retval - boot_mesg "Setting hostname to ${HOSTNAME}..." - hostname "${HOSTNAME}" + boot_mesg "Setting hostname to ${HOSTNAME}.${DOMAINNAME}..." + hostname "${HOSTNAME}.${DOMAINNAME}" evaluate_retval - if [ -n "${DOMAINNAME}" ]; then - boot_mesg "Setting domainname to ${DOMAINNAME}..." - domainname "${DOMAINNAME}" - evaluate_retval - fi - # Update hosts write_hosts hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 702f0ba8357aa11ccee4cf7c43efd5d8f362a343
by Michael Tremer 22 Aug '18

22 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 702f0ba8357aa11ccee4cf7c43efd5d8f362a343 (commit) via d303638793c2ad21e296289eadc4ec3584bd215d (commit) from 7141cb1ee4fab26771319fc5cf61f454f321bcaf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 702f0ba8357aa11ccee4cf7c43efd5d8f362a343 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:46:53 2018 +0100 core124: Ship updated firewall.cgi Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d303638793c2ad21e296289eadc4ec3584bd215d Author: Alexander Marx <amarx(a)ipfire.org> Date: Wed Aug 22 11:23:16 2018 +0200 BUG11805: Firewall rule with source orange and target firewall-interface-orange not possible Now its possible to create a rule with orange source and target orange interface of the firewall. Fixes: #11805 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/124/filelists/files | 1 + html/cgi-bin/firewall.cgi | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 34aaf9dfd..ebebccdc1 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -4,6 +4,7 @@ etc/rc.d/helper/aws-setup etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/partresize +srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/ids.cgi usr/bin/install-bootloader usr/local/bin/backupiso diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 499f279d1..fb1c25dfd 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -241,10 +241,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') $checkorange='on'; } } - #check useless rules - if( ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){ - $errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>"; - } #check if we try to break rules if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){ $errormessage=$Lang::tr{'fwdfw err same'}; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7141cb1ee4fab26771319fc5cf61f454f321bcaf
by Michael Tremer 22 Aug '18

22 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 7141cb1ee4fab26771319fc5cf61f454f321bcaf (commit) from 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7141cb1ee4fab26771319fc5cf61f454f321bcaf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:17:15 2018 +0100 core124: Fix typo in rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/124/filelists/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 8d4da08ab..34aaf9dfd 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -1,6 +1,6 @@ etc/system-release etc/issue -etc/rc.d/helpers/aws-setup +etc/rc.d/helper/aws-setup etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/partresize hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c
by Michael Tremer 22 Aug '18

22 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c (commit) via 84cd9b91627e3b70240c944e4424905c46b9e72c (commit) via f3d59d2c94f3757bd10b74577c85740cd094ccee (commit) via c5465a94533beee243d447e92bc31ee8d4a40ca5 (commit) from caf5dcb1e741d93c686c2db0df6f2615bdc68c19 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8e11e1e8692265d6e5e6f94a6e6f9b0386ca664c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:06:53 2018 +0100 core124: Ship updated AWS setup scripts Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 84cd9b91627e3b70240c944e4424905c46b9e72c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:05:43 2018 +0100 Drop the network-trigger script This is done at boot time and doesn't normally need to be done again. On AWS or in the setup, renaming any network interfaces is being handled automatically. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f3d59d2c94f3757bd10b74577c85740cd094ccee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:02:43 2018 +0100 firstsetup: There is no need to restart udev here All network interfaces are renamed accordingly in setup Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c5465a94533beee243d447e92bc31ee8d4a40ca5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 22 14:00:39 2018 +0100 aws: Let udev rename all network interfaces Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/initscripts | 2 -- config/rootfiles/common/armv5tel/initscripts | 2 -- config/rootfiles/common/i586/initscripts | 2 -- config/rootfiles/common/x86_64/initscripts | 2 -- config/rootfiles/core/124/filelists/files | 2 ++ config/rootfiles/core/124/update.sh | 5 +++++ lfs/initscripts | 1 - src/initscripts/helper/aws-setup | 29 +++++----------------------- src/initscripts/system/aws | 3 +++ src/initscripts/system/firstsetup | 6 ------ src/initscripts/system/network-trigger | 22 --------------------- 11 files changed, 15 insertions(+), 61 deletions(-) delete mode 100644 src/initscripts/system/network-trigger Difference in files: diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 66a7be55b..bce6d0fb6 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 66a7be55b..bce6d0fb6 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -191,7 +190,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 8f3d41476..f79395227 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -189,7 +188,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 8f3d41476..f79395227 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -30,7 +30,6 @@ etc/rc.d/init.d/mountfs etc/rc.d/init.d/mountkernfs etc/rc.d/init.d/mounttmpfs etc/rc.d/init.d/network -etc/rc.d/init.d/network-trigger #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -189,7 +188,6 @@ etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S81pakfire etc/rc.d/rcsysinit.d/S85firewall -etc/rc.d/rcsysinit.d/S90network-trigger etc/rc.d/rcsysinit.d/S92rngd #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index bfe50cffa..8d4da08ab 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/issue +etc/rc.d/helpers/aws-setup +etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/partresize srv/web/ipfire/cgi-bin/ids.cgi diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index f8fd2116b..d2954a00c 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -33,6 +33,11 @@ done # Stop services +# Remove files +rm -f \ + /etc/rc.d/rcsysinit.d/S90network-trigger \ + /etc/rc.d/init.d/network-trigger + # Extract files extract_files diff --git a/lfs/initscripts b/lfs/initscripts index 1058779f1..7da018a6c 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -177,7 +177,6 @@ $(TARGET) : ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S81pakfire ln -sf ../init.d/firewall /etc/rc.d/rcsysinit.d/S85firewall - ln -sf ../init.d/network-trigger /etc/rc.d/rcsysinit.d/S90network-trigger ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S92rngd ln -sf ../init.d/vnstat /etc/rc.d/rc3.d/S01vnstat ln -sf ../init.d/vnstat /etc/rc.d/rc0.d/K51vnstat diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index 893246ba1..b2bb5a966 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -50,22 +50,6 @@ prefix2netmask() { to_address "$(( netmask ^ 0xffffffff ))" } -find_interface() { - local mac="${1}" - - local path - for path in /sys/class/net/*; do - local address="$(<${path}/address)" - - if [ "${mac}" = "${address}" ]; then - basename "${path}" - return 0 - fi - done - - return 1 -} - import_aws_configuration() { local instance_id="$(get meta-data/instance-id)" @@ -243,19 +227,13 @@ import_aws_configuration() { ) >> /var/ipfire/ethernet/settings ;; esac - - # Rename interface - local interface="$(find_interface "${mac}")" - - if [ -n "${interface}" ] && [ -n "${interface_name}" ] && [ "${interface}" != "${interface_name}" ]; then - ip link set "${interface}" down - ip link set "${interface}" name "${interface_name}" - fi done # Save CONFIG_TYPE echo "CONFIG_TYPE=${config_type}" >> /var/ipfire/ethernet/settings + + # Actions performed only on the very first start if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then # Enable SSH @@ -322,6 +300,9 @@ case "${reason}" in # Remove all IP addresses ip addr flush dev "${interface}" + + # Shut down the interface + ip link set "${interface}" down ;; *) diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws index 6fce670a0..2a556801a 100644 --- a/src/initscripts/system/aws +++ b/src/initscripts/system/aws @@ -60,6 +60,9 @@ case "${1}" in # End DHCP client immediately dhclient -sf /etc/rc.d/helper/aws-setup -r "${intf}" &>/dev/null + # Rename network devices + udevadm trigger --action="add" --subsystem-match="net" + exit 0 ;; diff --git a/src/initscripts/system/firstsetup b/src/initscripts/system/firstsetup index 0704a98dc..e79c144d9 100644 --- a/src/initscripts/system/firstsetup +++ b/src/initscripts/system/firstsetup @@ -36,11 +36,5 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then fi fi -echo Restarting udev... -killall udevd -/sbin/udevadm hwdb --update -/sbin/udevd --daemon -/sbin/udevadm trigger -/sbin/udevadm settle /etc/init.d/sysklogd stop touch /var/ipfire/main/firstsetup_ok diff --git a/src/initscripts/system/network-trigger b/src/initscripts/system/network-trigger deleted file mode 100644 index 0d9de45c6..000000000 --- a/src/initscripts/system/network-trigger +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/network-trigger -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - boot_mesg "Triggering network devices..." - udevadm trigger --action="add" --subsystem-match="net" - evaluate_retval - ;; - - *) - echo "Usage: ${0} {start}" - exit 1 - ;; -esac - -# End $rc_base/init.d/network-trigger hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. caf5dcb1e741d93c686c2db0df6f2615bdc68c19
by Michael Tremer 21 Aug '18

21 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via caf5dcb1e741d93c686c2db0df6f2615bdc68c19 (commit) from 0ff9099443994b167e4ddc4a4912328e6c40e241 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit caf5dcb1e741d93c686c2db0df6f2615bdc68c19 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Aug 21 18:27:02 2018 +0200 nano: Update to 2.9.8 For details see: https://www.nano-editor.org/news.php Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/nano | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/nano b/lfs/nano index 98dec8897..9783c2917 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.9.7 +VER = 2.9.8 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 22 +PAK_VER = 23 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 804a0e91cb11f2e8884aee7bfac2d18d +$(DL_FILE)_MD5 = fd58e87c20abbf029e5c4b153c89232a install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ff9099443994b167e4ddc4a4912328e6c40e241
by Michael Tremer 21 Aug '18

21 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 0ff9099443994b167e4ddc4a4912328e6c40e241 (commit) via f868ccb7632e56fa9038b72d9adb3fe4a4c88cea (commit) via 9b0618c09f634358415e963cfa618b3fafdcce0e (commit) via 7486e30eebc5f7d6f456274ac82191987135f2e1 (commit) from 3b81e38a08c7433c1462d01b26754913752d6c4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0ff9099443994b167e4ddc4a4912328e6c40e241 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 15:06:22 2018 +0100 core124: Ship updated backup include/exclude files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f868ccb7632e56fa9038b72d9adb3fe4a4c88cea Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 15:05:40 2018 +0100 backup: Add root's SSH keys and settings Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9b0618c09f634358415e963cfa618b3fafdcce0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 15:05:13 2018 +0100 backup: Add custom squid configuration files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7486e30eebc5f7d6f456274ac82191987135f2e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 21 11:32:04 2018 +0100 backup: Order incldue/exclude alphabetically Nothing has been added or removed Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/exclude | 2 +- config/backup/include | 49 ++++++++++++++++--------------- config/rootfiles/core/124/filelists/files | 2 ++ 3 files changed, 29 insertions(+), 24 deletions(-) Difference in files: diff --git a/config/backup/exclude b/config/backup/exclude index 7ca9d10b2..0d3de04d2 100644 --- a/config/backup/exclude +++ b/config/backup/exclude @@ -1,5 +1,5 @@ -*.tmp /etc/sysconfig/lm_sensors +*.tmp /var/ipfire/ethernet/settings /var/ipfire/firewall/bin/* /var/ipfire/ovpn/openssl/* diff --git a/config/backup/include b/config/backup/include index 59430c576..6982b1c92 100644 --- a/config/backup/include +++ b/config/backup/include @@ -1,38 +1,48 @@ -/var/ipfire/*/settings -/var/ipfire/*/*.conf -/var/ipfire/*/*.pem -/var/ipfire/*/config -/var/ipfire/*/enable -/var/ipfire/*/*enable* -/var/ipfire/ovpn/collectd.vpn -/etc/unbound -/etc/passwd -/etc/shadow /etc/group -/etc/ipsec.user.* -/etc/ipsec.user-post.conf -/etc/sysconfig/* /etc/hosts* /etc/httpd/server.crt /etc/httpd/server.csr -/etc/httpd/server.key /etc/httpd/server-ecdsa.crt /etc/httpd/server-ecdsa.csr /etc/httpd/server-ecdsa.key -/etc/ssh/ssh_host* -/etc/ssh/sshd_config +/etc/httpd/server.key +/etc/ipsec.user.* +/etc/ipsec.user-post.conf /etc/logrotate.d +/etc/passwd +/etc/shadow +/etc/ssh/sshd_config +/etc/ssh/ssh_host* +/etc/squid/squid.conf.local +/etc/squid/squid.conf.pre.local +/etc/sysconfig/* +/etc/sysconfig/firewall.local +/etc/sysconfig/rc.local +/etc/unbound +/root/.bash_history +/root/.gitconfig +/root/.ssh /var/ipfire/auth/users +/var/ipfire/captive/* +/var/ipfire/*/*.conf +/var/ipfire/*/config /var/ipfire/dhcp/* /var/ipfire/dnsforward/* +/var/ipfire/*/enable +/var/ipfire/*/*enable* +/var/ipfire/ethernet/aliases +/var/ipfire/ethernet/wireless /var/ipfire/firewall /var/ipfire/fwhosts /var/ipfire/main/* /var/ipfire/ovpn +/var/ipfire/ovpn/collectd.vpn +/var/ipfire/*/*.pem /var/ipfire/ppp /var/ipfire/proxy /var/ipfire/qos/* /var/ipfire/qos/bin/qos.sh +/var/ipfire/*/settings /var/ipfire/time/ /var/ipfire/urlfilter /var/ipfire/vpn @@ -40,10 +50,3 @@ /var/log/rrd/* /var/log/rrd/collectd /var/log/vnstat -/etc/sysconfig/firewall.local -/etc/sysconfig/rc.local -/root/.gitconfig -/root/.bash_history -/var/ipfire/ethernet/aliases -/var/ipfire/ethernet/wireless -/var/ipfire/captive/* diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 037a779cd..bfe50cffa 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -5,4 +5,6 @@ etc/rc.d/init.d/partresize srv/web/ipfire/cgi-bin/ids.cgi usr/bin/install-bootloader usr/local/bin/backupiso +var/ipfire/backup/exclude +var/ipfire/backup/include var/ipfire/langs hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3b81e38a08c7433c1462d01b26754913752d6c4e
by Arne Fitzenreiter 20 Aug '18

20 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 3b81e38a08c7433c1462d01b26754913752d6c4e (commit) from 943cfcc311aa64e0aab62ff3e42c15e9b2e3fc65 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3b81e38a08c7433c1462d01b26754913752d6c4e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 20 16:22:20 2018 +0200 gcc: x86_64 add libspp to rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/gcc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/x86_64/gcc b/config/rootfiles/common/x86_64/gcc index b461f6532..667ec9e49 100644 --- a/config/rootfiles/common/x86_64/gcc +++ b/config/rootfiles/common/x86_64/gcc @@ -1434,8 +1434,8 @@ usr/lib/libquadmath.so.0.0.0 #usr/lib/libssp.a #usr/lib/libssp.la #usr/lib/libssp.so -#usr/lib/libssp.so.0 -#usr/lib/libssp.so.0.0.0 +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 #usr/lib/libssp_nonshared.a #usr/lib/libssp_nonshared.la #usr/lib/libstdc++.a hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core123, updated. a019c963a2bc232a381aefbafc260b3ea3bf4f2b
by Arne Fitzenreiter 20 Aug '18

20 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core123 has been updated via a019c963a2bc232a381aefbafc260b3ea3bf4f2b (commit) via 66c449c053c9e059f04e28d0ccad74840f1a528e (commit) from b38239f90715974b7744499cb65c97b961fb6ff4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a019c963a2bc232a381aefbafc260b3ea3bf4f2b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 20 16:23:49 2018 +0200 core123: ship libssp (was missing on x86_64) Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 66c449c053c9e059f04e28d0ccad74840f1a528e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 20 16:22:20 2018 +0200 gcc: x86_64 add libspp to rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/gcc | 4 ++-- config/rootfiles/core/123/filelists/files | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/x86_64/gcc b/config/rootfiles/common/x86_64/gcc index b461f6532..667ec9e49 100644 --- a/config/rootfiles/common/x86_64/gcc +++ b/config/rootfiles/common/x86_64/gcc @@ -1434,8 +1434,8 @@ usr/lib/libquadmath.so.0.0.0 #usr/lib/libssp.a #usr/lib/libssp.la #usr/lib/libssp.so -#usr/lib/libssp.so.0 -#usr/lib/libssp.so.0.0.0 +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 #usr/lib/libssp_nonshared.a #usr/lib/libssp_nonshared.la #usr/lib/libstdc++.a diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files index 3ff006fe5..e2be472f6 100644 --- a/config/rootfiles/core/123/filelists/files +++ b/config/rootfiles/core/123/filelists/files @@ -13,6 +13,8 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/local/bin/backupiso +usr/lib/libssp.so.0 +usr/lib/libssp.so.0.0.0 usr/sbin/dhclient usr/share/GeoIP/GeoIP.dat var/ipfire/backup/bin/backup.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core123, updated. b38239f90715974b7744499cb65c97b961fb6ff4
by Arne Fitzenreiter 17 Aug '18

17 Aug '18

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core123 has been updated via b38239f90715974b7744499cb65c97b961fb6ff4 (commit) from ee84b26a271139cd37fb361db9fbed21b894ffec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b38239f90715974b7744499cb65c97b961fb6ff4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 17 20:30:17 2018 +0200 core123: ship xtables-addons. xtables are build for installed iptables version so we need to ship it even if it was not updated. Also clean /lib/xtables because some modules are renamed. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/121 => core/123}/filelists/xtables-addons | 0 config/rootfiles/core/123/update.sh | 3 +++ 2 files changed, 3 insertions(+) copy config/rootfiles/{oldcore/121 => core/123}/filelists/xtables-addons (100%) Difference in files: diff --git a/config/rootfiles/core/123/filelists/xtables-addons b/config/rootfiles/core/123/filelists/xtables-addons new file mode 120000 index 000000000..2e24c4298 --- /dev/null +++ b/config/rootfiles/core/123/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh index 76eff74bb..964a23862 100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/123/update.sh @@ -34,6 +34,9 @@ done # Stop services /etc/init.d/squid stop +# remove old xtables modules / some are renamend +rm -rf /lib/xtables + # Extract files extract_files hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2018