IPFire-SCM April 2016

ipfire-scm@lists.ipfire.org

1 participants
50 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9fcba2b5df715041e4a9057e749de2faee46e508
by git＠ipfire.org 20 Apr '16

20 Apr '16

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 9fcba2b5df715041e4a9057e749de2faee46e508 (commit) via 32d91ecad81e1d18b5631d9a58692725926cc908 (commit) via 977007bfd9b463e9c6418ccf1547dee0944cc82b (commit) via a3712ff967ddc5dff05a39a8319981ba9b42b6a6 (commit) via 2f662bf05894c031754e4e7d9c807709a72bb674 (commit) via 8e7c5e65ad3ad6ab9005b0018b9dfaa4532183b4 (commit) from c485f38c996cab87c98a78f1cadc2c2197d30625 (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 9fcba2b5df715041e4a9057e749de2faee46e508 Merge: 32d91ec c485f38 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 20 16:24:12 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 32d91ecad81e1d18b5631d9a58692725926cc908 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 20 16:23:22 2016 +0100 conntrack: Remove old disable_nf_sip indicator file This is not used any more and not needed either. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 977007bfd9b463e9c6418ccf1547dee0944cc82b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 20 16:22:31 2016 +0100 core101: Migrate conntrack settings that broke in 100 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a3712ff967ddc5dff05a39a8319981ba9b42b6a6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 20 16:15:55 2016 +0100 core101: Add recent changes on firewall Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2f662bf05894c031754e4e7d9c807709a72bb674 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 20 16:14:14 2016 +0100 optionsfw.cgi: Clean up code Add translation to radio buttons. No functional changes. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e7c5e65ad3ad6ab9005b0018b9dfaa4532183b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 20 16:04:24 2016 +0100 firewall: Fix connection tracking for PPTP GRE connections were not correctly forwarded without the helper being enabled. Choosing the wrong protocol here did not allow us to load it properly. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 1 - config/rootfiles/core/101/filelists/files | 2 + config/rootfiles/core/101/update.sh | 16 ++++++++ html/cgi-bin/optionsfw.cgi | 65 +++++++++++++++++++++++++------ lfs/configroot | 2 +- src/initscripts/init.d/firewall | 2 +- 6 files changed, 73 insertions(+), 15 deletions(-) Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 71539ef..f37f97e 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -94,7 +94,6 @@ var/ipfire/logging var/ipfire/mac #var/ipfire/mac/settings var/ipfire/main -#var/ipfire/main/disable_nf_sip #var/ipfire/main/hosts #var/ipfire/main/routing #var/ipfire/main/settings diff --git a/config/rootfiles/core/101/filelists/files b/config/rootfiles/core/101/filelists/files index 0f75ac8..c04cff6 100644 --- a/config/rootfiles/core/101/filelists/files +++ b/config/rootfiles/core/101/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/chpasswd.cgi srv/web/ipfire/cgi-bin/ipinfo.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh index f448474..eb81d61 100644 --- a/config/rootfiles/core/101/update.sh +++ b/config/rootfiles/core/101/update.sh @@ -50,6 +50,22 @@ extract_files # update linker config ldconfig +# Fix conntrack configuration +for i in CONNTRACK_H323 CONNTRACK_FTP CONNTRACK_PPTP CONNTRACK_TFTP CONNTRACK_IRC; do + if ! grep -q "^${i}" /var/ipfire/optionsfw/settings; then + echo "${i}=on" + fi +done >> /var/ipfire/optionsfw/settings + +# Special handling for SIP +if ! grep -q "^CONNTRACK_SIP" /var/ipfire/optionsfw/settings; then + if [ -e "/var/ipfire/main/disable_nf_sip" ]; then + echo "CONNTRACK_SIP=off" >> /var/ipfire/optionsfw/settings + rm -f /var/ipfire/main/disable_nf_sip + else + echo "CONNTRACK_SIP=on" >> /var/ipfire/optionsfw/settings + fi +fi # Update Language cache #/usr/local/bin/update-lang-cache diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 7a0e8e0..1ab3c7d 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -129,6 +129,9 @@ $checked{'CONNTRACK_H323'}{$settings{'CONNTRACK_H323'}} = "checked='checked'"; $checked{'CONNTRACK_IRC'}{'off'} = ''; $checked{'CONNTRACK_IRC'}{'on'} = ''; $checked{'CONNTRACK_IRC'}{$settings{'CONNTRACK_IRC'}} = "checked='checked'"; +$checked{'CONNTRACK_PPTP'}{'off'} = ''; +$checked{'CONNTRACK_PPTP'}{'on'} = ''; +$checked{'CONNTRACK_PPTP'}{$settings{'CONNTRACK_PPTP'}} = "checked='checked'"; $checked{'CONNTRACK_SIP'}{'off'} = ''; $checked{'CONNTRACK_SIP'}{'on'} = ''; $checked{'CONNTRACK_SIP'}{$settings{'CONNTRACK_SIP'}} = "checked='checked'"; @@ -239,21 +242,59 @@ END <tr><td align='left' width='60%'>$Lang::tr{'fw settings dropdown'}</td><td align='left'>on <input type='radio' name='SHOWDROPDOWN' value='on' $checked{'SHOWDROPDOWN'}{'on'} />/ <input type='radio' name='SHOWDROPDOWN' value='off' $checked{'SHOWDROPDOWN'}{'off'} /> off</td></tr> </table> + <br /> -<table width='95%' cellspacing='0'> -<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'application layer gateways'}</b></td></tr> -<tr><td align='left' width='60%'>FTP</td><td align='left'>on <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} />/ - <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> off</td></tr> -<tr><td align='left' width='60%'>H.323</td><td align='left'>on <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} />/ - <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> off</td></tr> -<tr><td align='left' width='60%'>IRC</td><td align='left'>on <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} />/ - <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> off</td></tr> -<tr><td align='left' width='60%'>SIP</td><td align='left'>on <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} />/ - <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> off</td></tr> -<tr><td align='left' width='60%'>TFTP</td><td align='left'>on <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} />/ - <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> off</td></tr> +<table width='95%' cellspacing='0'> + <tr bgcolor='$color{'color20'}'> + <td colspan='2' align='left'> + <b>$Lang::tr{'application layer gateways'}</b> + </td> + </tr> + <tr> + <td align='left' width='60%'>FTP</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} /> / + <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> + <tr> + <td align='left' width='60%'>H.323</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} /> / + <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> + <tr> + <td align='left' width='60%'>IRC</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} /> / + <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> + <tr> + <td align='left' width='60%'>PPTP</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='CONNTRACK_PPTP' value='on' $checked{'CONNTRACK_PPTP'}{'on'} /> / + <input type='radio' name='CONNTRACK_PPTP' value='off' $checked{'CONNTRACK_PPTP'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> + <tr> + <td align='left' width='60%'>SIP</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} /> / + <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> + <tr> + <td align='left' width='60%'>TFTP</td> + <td align='left'> + $Lang::tr{'on'} <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} /> / + <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> $Lang::tr{'off'} + </td> + </tr> </table> + <br /> <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw default drop'}</b></td></tr> diff --git a/lfs/configroot b/lfs/configroot index f8e9ce4..f02894e 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -66,7 +66,7 @@ $(TARGET) : dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \ - isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \ + isdn/settings mac/settings main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig snort/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index cb52670..1d6309c 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -128,7 +128,7 @@ iptables_init() { if [ "${CONNTRACK_PPTP}" = "on" ]; then iptables -A CONNTRACK -m conntrack --ctstate RELATED \ -m helper --helper pptp -j ACCEPT - iptables -t raw -A CONNTRACK -p udp --dport 1723 -j CT --helper pptp + iptables -t raw -A CONNTRACK -p tcp --dport 1723 -j CT --helper pptp fi # TFTP hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c485f38c996cab87c98a78f1cadc2c2197d30625
by git＠ipfire.org 19 Apr '16

19 Apr '16

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 c485f38c996cab87c98a78f1cadc2c2197d30625 (commit) via 4bee1eb491e8193fa75be2dd6b450aacf3772368 (commit) via 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b (commit) via a2c6ae9e1576a5f9720f300a485a850390168bf9 (commit) from b243767b1069c587996cad4ca60578ff8b06379d (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 c485f38c996cab87c98a78f1cadc2c2197d30625 Merge: b243767 4bee1eb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 19 22:04:24 2016 +0200 Merge remote-tracking branch 'origin/core100' into next ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- config/rootfiles/oldcore/100/exclude | 2 ++ config/xen-image/xen-image-maker.sh | 4 ++-- lfs/linux | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f596a44..cfc3a6a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -246,8 +246,8 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_CC_STACKPROTECTOR_REGULAR=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y diff --git a/config/rootfiles/oldcore/100/exclude b/config/rootfiles/oldcore/100/exclude index 8e446ce..7ddeae0 100644 --- a/config/rootfiles/oldcore/100/exclude +++ b/config/rootfiles/oldcore/100/exclude @@ -1,4 +1,6 @@ boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv etc/alternatives etc/collectd.custom etc/default/grub diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index bd29855..00abb89 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 Arne Fitzenreiter <arne_f(a)ipfire.org> # +# Copyright (C) 2007-2016 Arne Fitzenreiter <arne_f(a)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 # @@ -104,7 +104,7 @@ dd bs=1M if=/dev/zero of=$IMGvar count=$SIZEvar mkfs.$FSTYPE -F $IMGvar echo -------------------------------------------------------- -echo - Intall IPFire to the Images ... +echo - Install IPFire to the images ... echo -------------------------------------------------------- # Mount Images diff --git a/lfs/linux b/lfs/linux index be2e105..8e1536c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 67 +PAK_VER = 68 DEPS = "" KERNEL_ARCH = $(MACHINE) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b243767b1069c587996cad4ca60578ff8b06379d
by git＠ipfire.org 19 Apr '16

19 Apr '16

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 b243767b1069c587996cad4ca60578ff8b06379d (commit) from f64aae96e49b8e81096bdb3043e79ce5edb6ebe2 (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 b243767b1069c587996cad4ca60578ff8b06379d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 19 18:41:32 2016 +0200 kernel: fix mac80211 build on rpi. mac80211 depends on CRYPTO_GCM don't know why this was off before in rpi config. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-rpi | 6 +++--- .../rootfiles/{oldcore/95 => core/101}/filelists/armv5tel/linux-rpi | 0 2 files changed, 3 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/95 => core/101}/filelists/armv5tel/linux-rpi (100%) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 989b2d6..3c354e2 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -3296,8 +3296,8 @@ CONFIG_UIO_PDRV_GENIRQ=m # CONFIG_STAGING=y # CONFIG_USBIP_CORE is not set -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m +# CONFIG_W35UND is not set +# CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_COMEDI is not set # CONFIG_RTLLIB is not set @@ -3965,7 +3965,7 @@ CONFIG_CRYPTO_AUTHENC=m # Authenticated Encryption with Associated Data # CONFIG_CRYPTO_CCM=m -# CONFIG_CRYPTO_GCM is not set +CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_SEQIV=m # diff --git a/config/rootfiles/core/101/filelists/armv5tel/linux-rpi b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core100, updated. 4bee1eb491e8193fa75be2dd6b450aacf3772368
by git＠ipfire.org 18 Apr '16

18 Apr '16

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, core100 has been updated via 4bee1eb491e8193fa75be2dd6b450aacf3772368 (commit) via 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b (commit) from a2c6ae9e1576a5f9720f300a485a850390168bf9 (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 4bee1eb491e8193fa75be2dd6b450aacf3772368 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 17 22:25:16 2016 +0200 kernel: change stackprotector from strong to regular. Xen/Paravirt crash with stackprotect in strong mode. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 17 22:23:11 2016 +0200 xen-image-maker: fix typos and missing doublequote. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- config/xen-image/xen-image-maker.sh | 6 +++--- lfs/linux | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f596a44..cfc3a6a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -246,8 +246,8 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_CC_STACKPROTECTOR_REGULAR=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 07414f7..00abb89 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 Arne Fitzenreiter <arne_f(a)ipfire.org> # +# Copyright (C) 2007-2016 Arne Fitzenreiter <arne_f(a)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 # @@ -104,7 +104,7 @@ dd bs=1M if=/dev/zero of=$IMGvar count=$SIZEvar mkfs.$FSTYPE -F $IMGvar echo -------------------------------------------------------- -echo - Intall IPFire to the Images ... +echo - Install IPFire to the images ... echo -------------------------------------------------------- # Mount Images @@ -130,7 +130,7 @@ mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " root (hd0) >> $MNThdd/boot/grub/grub.conf +echo " root (hd0)" >> $MNThdd/boot/grub/grub.conf echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \ >> $MNThdd/boot/grub/grub.conf echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf diff --git a/lfs/linux b/lfs/linux index be2e105..8e1536c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 67 +PAK_VER = 68 DEPS = "" KERNEL_ARCH = $(MACHINE) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f64aae96e49b8e81096bdb3043e79ce5edb6ebe2
by git＠ipfire.org 17 Apr '16

17 Apr '16

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 f64aae96e49b8e81096bdb3043e79ce5edb6ebe2 (commit) via b01d8a6830bce91ad148d6d781ecc66fe42c01f6 (commit) from a2f63d7e2e9eebcef66dfb92dfff749e4857e445 (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 f64aae96e49b8e81096bdb3043e79ce5edb6ebe2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 17 20:22:44 2016 +0100 core101: Ship updated dma Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b01d8a6830bce91ad148d6d781ecc66fe42c01f6 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Apr 17 19:34:47 2016 +0200 dma: Update to 0.11 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/96 => core/101}/filelists/dma | 0 lfs/dma | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/96 => core/101}/filelists/dma (100%) Difference in files: diff --git a/config/rootfiles/core/101/filelists/dma b/config/rootfiles/core/101/filelists/dma new file mode 120000 index 0000000..60f4682 --- /dev/null +++ b/config/rootfiles/core/101/filelists/dma @@ -0,0 +1 @@ +../../../common/dma \ No newline at end of file diff --git a/lfs/dma b/lfs/dma index 64ed944..fc49122 100644 --- a/lfs/dma +++ b/lfs/dma @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2016 IPFire Team <info(a)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,7 +24,7 @@ include Config -VER = 0.10 +VER = 0.11 THISAPP = dma-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 91f521b0749e16f5d78e139e717245ea +$(DL_FILE)_MD5 = 4090572921fc33be0977f4010881b501 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a2f63d7e2e9eebcef66dfb92dfff749e4857e445
by git＠ipfire.org 17 Apr '16

17 Apr '16

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 a2f63d7e2e9eebcef66dfb92dfff749e4857e445 (commit) via 8f31e52dbcef59c43fdede570aa9bebbe05b21fd (commit) from 0e664ce92f8f183d8b26869cae99a9955ac4db8b (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 a2f63d7e2e9eebcef66dfb92dfff749e4857e445 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Apr 17 20:50:49 2016 +0200 lcdproc 0.5.7: Fixes for rootfile Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8f31e52dbcef59c43fdede570aa9bebbe05b21fd Author: Eberhard Beilharz <eb1(a)sil.org> Date: Sat Apr 16 23:28:11 2016 +0200 Add missing end-quote to xen-image-maker Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/lcdproc | 1 + config/xen-image/xen-image-maker.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/packages/lcdproc b/config/rootfiles/packages/lcdproc index 8bef5a3..d2a59e0 100644 --- a/config/rootfiles/packages/lcdproc +++ b/config/rootfiles/packages/lcdproc @@ -44,6 +44,7 @@ usr/lib/lcdproc #usr/lib/lcdproc/mtc_s16209x.so #usr/lib/lcdproc/picolcd.so #usr/lib/lcdproc/pyramid.so +#usr/lib/lcdproc/rawserial.so #usr/lib/lcdproc/sdeclcd.so #usr/lib/lcdproc/sed1330.so #usr/lib/lcdproc/sed1520.so diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 07414f7..bd29855 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -130,7 +130,7 @@ mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf -echo " root (hd0) >> $MNThdd/boot/grub/grub.conf +echo " root (hd0)" >> $MNThdd/boot/grub/grub.conf echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \ >> $MNThdd/boot/grub/grub.conf echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0e664ce92f8f183d8b26869cae99a9955ac4db8b
by git＠ipfire.org 15 Apr '16

15 Apr '16

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 0e664ce92f8f183d8b26869cae99a9955ac4db8b (commit) from d00032e76530e9ba18f24ed182e1b5e9a4bfebe5 (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 0e664ce92f8f183d8b26869cae99a9955ac4db8b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 15 14:19:19 2016 +0200 core101: exclude grub.cfg and grubenv from updates. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/101/exclude | 2 ++ 1 file changed, 2 insertions(+) Difference in files: diff --git a/config/rootfiles/core/101/exclude b/config/rootfiles/core/101/exclude index 8e446ce..7ddeae0 100644 --- a/config/rootfiles/core/101/exclude +++ b/config/rootfiles/core/101/exclude @@ -1,4 +1,6 @@ boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv etc/alternatives etc/collectd.custom etc/default/grub hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core100, updated. a2c6ae9e1576a5f9720f300a485a850390168bf9
by git＠ipfire.org 15 Apr '16

15 Apr '16

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, core100 has been updated via a2c6ae9e1576a5f9720f300a485a850390168bf9 (commit) from b580a05b05302ab7931ca8d92e0b64fb9b23ed74 (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 a2c6ae9e1576a5f9720f300a485a850390168bf9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 15 13:19:25 2016 +0200 core100: remove grub.cfg and grubenv from updater. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/100/exclude | 2 ++ 1 file changed, 2 insertions(+) Difference in files: diff --git a/config/rootfiles/core/100/exclude b/config/rootfiles/core/100/exclude index 8e446ce..7ddeae0 100644 --- a/config/rootfiles/core/100/exclude +++ b/config/rootfiles/core/100/exclude @@ -1,4 +1,6 @@ boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv etc/alternatives etc/collectd.custom etc/default/grub hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d00032e76530e9ba18f24ed182e1b5e9a4bfebe5
by git＠ipfire.org 14 Apr '16

14 Apr '16

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 d00032e76530e9ba18f24ed182e1b5e9a4bfebe5 (commit) via 41a8f7f3cc90f4abbb448d630b62a20a27c017a9 (commit) from 77ecb239d30f979d6fca595aaf79c40214bf758a (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 d00032e76530e9ba18f24ed182e1b5e9a4bfebe5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 14 11:24:40 2016 +0100 lcdproc: Bump release Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 41a8f7f3cc90f4abbb448d630b62a20a27c017a9 Author: Sascha Kilian <sascha(a)sakisoft.de> Date: Wed Apr 13 15:04:39 2016 +0000 lcdproc: Update to 0.5.7 Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/lcdproc | 7 +++---- src/patches/lcdproc-0.5.6-menuitem.patch | 11 ----------- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 src/patches/lcdproc-0.5.6-menuitem.patch Difference in files: diff --git a/lfs/lcdproc b/lfs/lcdproc index 9e88622..83b2437 100644 --- a/lfs/lcdproc +++ b/lfs/lcdproc @@ -24,7 +24,7 @@ include Config -VER = 0.5.6 +VER = 0.5.7 THISAPP = lcdproc-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcdproc -PAK_VER = 1 +PAK_VER = 2 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f +$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d install : $(TARGET) @@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ diff --git a/src/patches/lcdproc-0.5.6-menuitem.patch b/src/patches/lcdproc-0.5.6-menuitem.patch deleted file mode 100644 index b9e933d..0000000 --- a/src/patches/lcdproc-0.5.6-menuitem.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- server/menuitem.c 2012/04/25 19:53:15 1.37 -+++ server/menuitem.c 2013/01/17 21:27:27 1.38 -@@ -33,6 +33,8 @@ - - #define MAX_NUMERIC_LEN 40 - -+extern Menu *main_menu; /* Access to the main menu */ -+ - char *error_strs[] = {"", "Out of range", "Too long", "Too short", "Invalid Address"}; - char *menuitemtypenames[] = {"menu", "action", "checkbox", "ring", "slider", "numeric", "alpha", "ip"}; - char *menueventtypenames[] = {"select", "update", "plus", "minus", "enter", "leave"}; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 899e58342f3fc8b3b532f593768d90be04f7c48a
by git＠ipfire.org 14 Apr '16

14 Apr '16

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 3.x development tree". The branch, master has been updated via 899e58342f3fc8b3b532f593768d90be04f7c48a (commit) via 5faca7389297e96843d85e8bbdd6ac86626464ac (commit) via 71a54a862162c761381e6a39454a86b7135d7221 (commit) from 4b74ccda23dcd35158033a74456172d50aa850c2 (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 899e58342f3fc8b3b532f593768d90be04f7c48a Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Apr 14 11:30:05 2016 +0200 libvirt: Update to 1.3.3 Massive security and performance improvements. See original Logfile for details. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5faca7389297e96843d85e8bbdd6ac86626464ac Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Apr 14 10:57:50 2016 +0200 libuser: Update to 0.62 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71a54a862162c761381e6a39454a86b7135d7221 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Apr 14 10:37:44 2016 +0200 libusb: Update to 1.0.20 * Add Haiku support * Fix multiple memory and resource leaks (#16, #52, #76, #81) * Fix possible deadlock when executing transfer callback * New libusb_free_pollfds() API * Linux: Allow larger isochronous transfer submission (#23) * Examples: Add two-stage load support to fxload (#12) * Correctly report cancellations due to timeouts * Improve efficiency of event handling * Improve speed of transfer submission in multi-threaded environments * Various other bug fixes and improvements Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: libusb/libusb.nm | 2 +- libuser/libuser.nm | 2 +- libvirt/libvirt.nm | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/libusb/libusb.nm b/libusb/libusb.nm index 12ab65f..a9eaded 100644 --- a/libusb/libusb.nm +++ b/libusb/libusb.nm @@ -4,7 +4,7 @@ ############################################################################### name = libusb -version = 1.0.19 +version = 1.0.20 release = 1 groups = System/Libraries diff --git a/libuser/libuser.nm b/libuser/libuser.nm index f159482..c0751dc 100644 --- a/libuser/libuser.nm +++ b/libuser/libuser.nm @@ -4,7 +4,7 @@ ############################################################################### name = libuser -version = 0.58 +version = 0.62 release = 1 groups = System/Libraries diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm index 3ec47d8..25de9c9 100644 --- a/libvirt/libvirt.nm +++ b/libvirt/libvirt.nm @@ -4,7 +4,7 @@ ############################################################################### name = libvirt -version = 0.9.9 +version = 1.3.3 release = 1 maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org> @@ -18,7 +18,8 @@ description versions of Linux. end -source_dl = +source_dl = ftp://libvirt.org/libvirt/ +sources = %{thisapp}.tar.gz build requires hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2016