IPFire-SCM April 2016

ipfire-scm@lists.ipfire.org

1 participants
50 discussions

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

08 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 31db25e52bc08e17a789f297bb2f7e2985380075 (commit) via fa4ac4f3dd3fd2f8e29be1ebeff9ebbc30035216 (commit) from 56f2056c67c5d73d60fa6507e6ba980064610c7e (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 31db25e52bc08e17a789f297bb2f7e2985380075 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 8 13:36:44 2016 +0200 dmidecode: fix rootfile. symlink is not working at common/arch because the check will seek files. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit fa4ac4f3dd3fd2f8e29be1ebeff9ebbc30035216 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 8 13:32:28 2016 +0200 perl-Apache-Htpasswd: fix rootfiles Signel-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/perl-Apache-Htpasswd | 6 ------ config/rootfiles/common/i586/dmidecode | 13 ++++++++++++- config/rootfiles/common/i586/perl-Apache-Htpasswd | 6 ------ .../rootfiles/common/{HTML-Tagset => perl-Apache-Htpasswd} | 12 ++++++------ config/rootfiles/common/x86_64/perl-Apache-Htpasswd | 6 ------ 5 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 config/rootfiles/common/armv5tel/perl-Apache-Htpasswd mode change 120000 => 100644 config/rootfiles/common/i586/dmidecode delete mode 100644 config/rootfiles/common/i586/perl-Apache-Htpasswd copy config/rootfiles/common/{HTML-Tagset => perl-Apache-Htpasswd} (52%) delete mode 100644 config/rootfiles/common/x86_64/perl-Apache-Htpasswd Difference in files: diff --git a/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd b/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd deleted file mode 100644 index 2eb360e..0000000 --- a/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#usr/lib/perl5/site_perl/5.12.3/Apache -usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm -#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache -#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache/Htpasswd -#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache/Htpasswd/.packlist -#usr/share/man/man3/Apache::Htpasswd.3 diff --git a/config/rootfiles/common/i586/dmidecode b/config/rootfiles/common/i586/dmidecode deleted file mode 120000 index 3fac6e3..0000000 --- a/config/rootfiles/common/i586/dmidecode +++ /dev/null @@ -1 +0,0 @@ -../x86_64/dmidecode \ No newline at end of file diff --git a/config/rootfiles/common/i586/dmidecode b/config/rootfiles/common/i586/dmidecode new file mode 100644 index 0000000..8883958 --- /dev/null +++ b/config/rootfiles/common/i586/dmidecode @@ -0,0 +1,12 @@ +usr/sbin/biosdecode +usr/sbin/dmidecode +usr/sbin/ownership +usr/sbin/vpddecode +#usr/share/doc/dmidecode +#usr/share/doc/dmidecode/AUTHORS +#usr/share/doc/dmidecode/CHANGELOG +#usr/share/doc/dmidecode/README +#usr/share/man/man8/biosdecode.8 +#usr/share/man/man8/dmidecode.8 +#usr/share/man/man8/ownership.8 +#usr/share/man/man8/vpddecode.8 diff --git a/config/rootfiles/common/i586/perl-Apache-Htpasswd b/config/rootfiles/common/i586/perl-Apache-Htpasswd deleted file mode 100644 index 7eb356f..0000000 --- a/config/rootfiles/common/i586/perl-Apache-Htpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#usr/lib/perl5/site_perl/5.12.3/Apache -usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache/Htpasswd -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache/Htpasswd/.packlist -#usr/share/man/man3/Apache::Htpasswd.3 diff --git a/config/rootfiles/common/perl-Apache-Htpasswd b/config/rootfiles/common/perl-Apache-Htpasswd new file mode 100644 index 0000000..8b25483 --- /dev/null +++ b/config/rootfiles/common/perl-Apache-Htpasswd @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.12.3/Apache +usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache/Htpasswd +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache/Htpasswd/.packlist +#usr/share/man/man3/Apache::Htpasswd.3 diff --git a/config/rootfiles/common/x86_64/perl-Apache-Htpasswd b/config/rootfiles/common/x86_64/perl-Apache-Htpasswd deleted file mode 100644 index da58e5e..0000000 --- a/config/rootfiles/common/x86_64/perl-Apache-Htpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#usr/lib/perl5/site_perl/5.12.3/Apache -usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache/Htpasswd -#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache/Htpasswd/.packlist -#usr/share/man/man3/Apache::Htpasswd.3 hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 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 56f2056c67c5d73d60fa6507e6ba980064610c7e (commit) via c899b16e2e774e65dddaf0392cf410811ffe55b2 (commit) from 9a6be065359cc1166af4caf61c0e3e1419cbc2d2 (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 56f2056c67c5d73d60fa6507e6ba980064610c7e Merge: c899b16 9a6be06 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 6 21:48:32 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit c899b16e2e774e65dddaf0392cf410811ffe55b2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 6 21:48:19 2016 +0100 squid: Update rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 2 -- 1 file changed, 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 83cfe3f..c8227e3 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -2145,8 +2145,6 @@ usr/lib/squid/icons/silk/script_palette.png usr/lib/squid/log_db_daemon usr/lib/squid/log_file_daemon usr/lib/squid/mib.txt -usr/lib/squid/negotiate_kerberos_auth -usr/lib/squid/negotiate_kerberos_auth_test usr/lib/squid/negotiate_wrapper_auth usr/lib/squid/ntlm_fake_auth usr/lib/squid/ntlm_smb_lm_auth hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 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 9a6be065359cc1166af4caf61c0e3e1419cbc2d2 (commit) from 9f19223e4e4db2b120014d562367ce697011d3f8 (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 9a6be065359cc1166af4caf61c0e3e1419cbc2d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Apr 6 19:57:46 2016 +0200 core101: start update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{100 => 101}/exclude | 0 .../{oldcore/98 => core/101}/filelists/files | 0 config/rootfiles/core/101/filelists/i586/dmidecode | 1 + .../{oldcore/94 => core/101}/filelists/pcre | 0 config/rootfiles/core/{100 => 101}/filelists/squid | 0 .../rootfiles/core/101/filelists/x86_64/dmidecode | 1 + config/rootfiles/core/{99 => 101}/meta | 0 .../rootfiles/{oldcore/93 => core/101}/update.sh | 27 +++++++++++++++------- config/rootfiles/{core => oldcore}/100/exclude | 0 .../100/filelists/armv5tel/binutils | 0 .../{core => oldcore}/100/filelists/armv5tel/gcc | 0 .../{core => oldcore}/100/filelists/armv5tel/glibc | 0 .../100/filelists/armv5tel/linux-kirkwood | 0 .../100/filelists/armv5tel/linux-multi | 0 .../100/filelists/armv5tel/linux-rpi | 0 .../100/filelists/ath10k-firmware | 0 .../rootfiles/{core => oldcore}/100/filelists/bind | 0 .../{core => oldcore}/100/filelists/diffutils | 0 .../{core => oldcore}/100/filelists/dnsmasq | 0 .../{core => oldcore}/100/filelists/files | 0 .../rootfiles/{core => oldcore}/100/filelists/grep | 0 .../{core => oldcore}/100/filelists/i586/binutils | 0 .../{core => oldcore}/100/filelists/i586/gcc | 0 .../{core => oldcore}/100/filelists/i586/glibc | 0 .../{core => oldcore}/100/filelists/i586/grub | 0 .../{core => oldcore}/100/filelists/i586/linux | 0 .../100/filelists/i586/linux-initrd | 0 .../99 => oldcore/100}/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/100/filelists/libmpc | 0 .../rootfiles/{core => oldcore}/100/filelists/lua | 0 .../100/filelists/mt7601u-firmware | 0 .../{core => oldcore}/100/filelists/ncurses | 0 .../rootfiles/{core => oldcore}/100/filelists/ntp | 0 .../{core/99 => oldcore/100}/filelists/openssh | 0 .../{core/99 => oldcore/100}/filelists/openssl | 0 .../{core => oldcore}/100/filelists/openvpn | 0 .../rootfiles/{core => oldcore}/100/filelists/sed | 0 .../rootfiles/oldcore/{94 => 100}/filelists/squid | 0 .../{core => oldcore}/100/filelists/tzdata | 0 .../100/filelists/x86_64/binutils | 0 .../{core => oldcore}/100/filelists/x86_64/gcc | 0 .../{core => oldcore}/100/filelists/x86_64/glibc | 0 .../{core => oldcore}/100/filelists/x86_64/grub | 0 .../{core => oldcore}/100/filelists/x86_64/linux | 0 .../100/filelists/x86_64/linux-initrd | 0 .../rootfiles/{core => oldcore}/100/filelists/xz | 0 config/rootfiles/{core => oldcore}/100/meta | 0 config/rootfiles/{core => oldcore}/100/update.sh | 0 config/rootfiles/{core => oldcore}/99/exclude | 0 .../rootfiles/{core => oldcore}/99/filelists/files | 0 .../100 => oldcore/99}/filelists/i586/openssl-sse2 | 0 .../{core/100 => oldcore/99}/filelists/openssh | 0 .../{core/100 => oldcore/99}/filelists/openssl | 0 config/rootfiles/oldcore/{98 => 99}/meta | 0 config/rootfiles/{core => oldcore}/99/update.sh | 0 make.sh | 2 +- 56 files changed, 22 insertions(+), 9 deletions(-) copy config/rootfiles/core/{100 => 101}/exclude (100%) copy config/rootfiles/{oldcore/98 => core/101}/filelists/files (100%) create mode 120000 config/rootfiles/core/101/filelists/i586/dmidecode copy config/rootfiles/{oldcore/94 => core/101}/filelists/pcre (100%) rename config/rootfiles/core/{100 => 101}/filelists/squid (100%) create mode 120000 config/rootfiles/core/101/filelists/x86_64/dmidecode rename config/rootfiles/core/{99 => 101}/meta (100%) copy config/rootfiles/{oldcore/93 => core/101}/update.sh (86%) rename config/rootfiles/{core => oldcore}/100/exclude (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/binutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/100/filelists/ath10k-firmware (100%) rename config/rootfiles/{core => oldcore}/100/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/100/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/100/filelists/files (100%) rename config/rootfiles/{core => oldcore}/100/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/binutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/100/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core/99 => oldcore/100}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/100/filelists/libmpc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/lua (100%) rename config/rootfiles/{core => oldcore}/100/filelists/mt7601u-firmware (100%) rename config/rootfiles/{core => oldcore}/100/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/100/filelists/ntp (100%) rename config/rootfiles/{core/99 => oldcore/100}/filelists/openssh (100%) rename config/rootfiles/{core/99 => oldcore/100}/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/100/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/100/filelists/sed (100%) copy config/rootfiles/oldcore/{94 => 100}/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/100/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/binutils (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/100/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/100/meta (100%) rename config/rootfiles/{core => oldcore}/100/update.sh (100%) rename config/rootfiles/{core => oldcore}/99/exclude (100%) rename config/rootfiles/{core => oldcore}/99/filelists/files (100%) rename config/rootfiles/{core/100 => oldcore/99}/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core/100 => oldcore/99}/filelists/openssh (100%) rename config/rootfiles/{core/100 => oldcore/99}/filelists/openssl (100%) copy config/rootfiles/oldcore/{98 => 99}/meta (100%) rename config/rootfiles/{core => oldcore}/99/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/100/exclude b/config/rootfiles/core/100/exclude deleted file mode 100644 index 8e446ce..0000000 --- a/config/rootfiles/core/100/exclude +++ /dev/null @@ -1,26 +0,0 @@ -boot/config.txt -etc/alternatives -etc/collectd.custom -etc/default/grub -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/100/filelists/armv5tel/binutils b/config/rootfiles/core/100/filelists/armv5tel/binutils deleted file mode 120000 index ac971f9..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/gcc b/config/rootfiles/core/100/filelists/armv5tel/gcc deleted file mode 120000 index 84f7b93..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/glibc b/config/rootfiles/core/100/filelists/armv5tel/glibc deleted file mode 120000 index 4c70d72..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-multi b/config/rootfiles/core/100/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-rpi b/config/rootfiles/core/100/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/100/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/ath10k-firmware b/config/rootfiles/core/100/filelists/ath10k-firmware deleted file mode 120000 index e7e87c2..0000000 --- a/config/rootfiles/core/100/filelists/ath10k-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/ath10k-firmware \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/bind b/config/rootfiles/core/100/filelists/bind deleted file mode 120000 index 48a0eba..0000000 --- a/config/rootfiles/core/100/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/diffutils b/config/rootfiles/core/100/filelists/diffutils deleted file mode 120000 index a5c02f3..0000000 --- a/config/rootfiles/core/100/filelists/diffutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/dnsmasq b/config/rootfiles/core/100/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/100/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/files b/config/rootfiles/core/100/filelists/files deleted file mode 100644 index c75a26d..0000000 --- a/config/rootfiles/core/100/filelists/files +++ /dev/null @@ -1,31 +0,0 @@ -etc/system-release -etc/issue -etc/dracut.conf -etc/ppp/ip-up -etc/rc.d/init.d/firewall -etc/rc.d/init.d/functions -etc/rc.d/init.d/networking/dhcpcd.exe -etc/rc.d/init.d/ntp -etc/modprobe.d/nf_conntrack.conf -lib/udev/rules.d/60-net.rules -opt/pakfire/etc/pakfire.conf -srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat -srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat -srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat -srv/web/ipfire/cgi-bin/optionsfw.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/webaccess.cgi -usr/bin/pgrep -usr/local/bin/backupiso -usr/local/bin/qosctrl -usr/local/bin/timectrl -usr/local/bin/wirelessctrl -usr/sbin/firewall-policy -usr/sbin/setup -var/ipfire/dhcpc/dhcpcd-hooks/10-mtu -var/ipfire/langs diff --git a/config/rootfiles/core/100/filelists/grep b/config/rootfiles/core/100/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/100/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/binutils b/config/rootfiles/core/100/filelists/i586/binutils deleted file mode 120000 index 78695d7..0000000 --- a/config/rootfiles/core/100/filelists/i586/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/gcc b/config/rootfiles/core/100/filelists/i586/gcc deleted file mode 120000 index ba328e3..0000000 --- a/config/rootfiles/core/100/filelists/i586/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/glibc b/config/rootfiles/core/100/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/100/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/grub b/config/rootfiles/core/100/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/100/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux b/config/rootfiles/core/100/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/100/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux-initrd b/config/rootfiles/core/100/filelists/i586/linux-initrd deleted file mode 120000 index 32a03e6..0000000 --- a/config/rootfiles/core/100/filelists/i586/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/openssl-sse2 b/config/rootfiles/core/100/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/100/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/libmpc b/config/rootfiles/core/100/filelists/libmpc deleted file mode 120000 index 88840fc..0000000 --- a/config/rootfiles/core/100/filelists/libmpc +++ /dev/null @@ -1 +0,0 @@ -../../../common/libmpc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/lua b/config/rootfiles/core/100/filelists/lua deleted file mode 120000 index 951f661..0000000 --- a/config/rootfiles/core/100/filelists/lua +++ /dev/null @@ -1 +0,0 @@ -../../../common/lua \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/mt7601u-firmware b/config/rootfiles/core/100/filelists/mt7601u-firmware deleted file mode 120000 index 300ac04..0000000 --- a/config/rootfiles/core/100/filelists/mt7601u-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/mt7601u-firmware \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/ncurses b/config/rootfiles/core/100/filelists/ncurses deleted file mode 120000 index 512faef..0000000 --- a/config/rootfiles/core/100/filelists/ncurses +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/ntp b/config/rootfiles/core/100/filelists/ntp deleted file mode 120000 index 7542d86..0000000 --- a/config/rootfiles/core/100/filelists/ntp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openssh b/config/rootfiles/core/100/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/100/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openssl b/config/rootfiles/core/100/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/100/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/openvpn b/config/rootfiles/core/100/filelists/openvpn deleted file mode 120000 index 493f3f7..0000000 --- a/config/rootfiles/core/100/filelists/openvpn +++ /dev/null @@ -1 +0,0 @@ -../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/sed b/config/rootfiles/core/100/filelists/sed deleted file mode 120000 index fc5f5c6..0000000 --- a/config/rootfiles/core/100/filelists/sed +++ /dev/null @@ -1 +0,0 @@ -../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/squid b/config/rootfiles/core/100/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/100/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/tzdata b/config/rootfiles/core/100/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/100/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/binutils b/config/rootfiles/core/100/filelists/x86_64/binutils deleted file mode 120000 index 7d0fda5..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/binutils \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/gcc b/config/rootfiles/core/100/filelists/x86_64/gcc deleted file mode 120000 index d1616d3..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/glibc b/config/rootfiles/core/100/filelists/x86_64/glibc deleted file mode 120000 index 1119099..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/grub b/config/rootfiles/core/100/filelists/x86_64/grub deleted file mode 120000 index 78d3bd7..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/linux b/config/rootfiles/core/100/filelists/x86_64/linux deleted file mode 120000 index 0615b5b..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/linux-initrd b/config/rootfiles/core/100/filelists/x86_64/linux-initrd deleted file mode 120000 index 1b9fff7..0000000 --- a/config/rootfiles/core/100/filelists/x86_64/linux-initrd +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/xz b/config/rootfiles/core/100/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/100/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/100/meta b/config/rootfiles/core/100/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/100/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/100/update.sh b/config/rootfiles/core/100/update.sh deleted file mode 100644 index 931930a..0000000 --- a/config/rootfiles/core/100/update.sh +++ /dev/null @@ -1,260 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function find_device() { - local mountpoint="${1}" - - local root - local dev mp fs flags rest - while read -r dev mp fs flags rest; do - # Skip unwanted entries - [ "${dev}" = "rootfs" ] && continue - - if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then - root="$(basename "${dev}")" - break - fi - done < /proc/mounts - - # Get the actual device from the partition that holds / - while [ -n "${root}" ]; do - if [ -e "/sys/block/${root}" ]; then - echo "${root}" - return 0 - fi - - # Remove last character - root="${root::-1}" - done - - return 1 -} - - -core=100 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: $1" - exit $2 -} - -# Remove old core updates from pakfire cache to save space... -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire* ) - # Ok. - ;; - * ) - exit_with_error "ERROR cannot update. No IPFire Kernel." 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - exit_with_error "ERROR cannot update because not enough free space on root." 2 - exit 2 -fi - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules, dtb's ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/zImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules - -case "$(uname -m)" in - armv*) - # Backup uEnv.txt if exist - if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org - fi - - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - mkdir -pv /boot/dtb-$KVER-ipfire-multi - touch /boot/uImage-ipfire-kirkwood - touch /boot/zImage-ipfire-multi - touch /boot/uIinit-ipfire-kirkwood - touch /boot/uIinit-ipfire-multi - ;; -esac - -# Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/dnsmasq stop -/etc/init.d/ipsec stop -/etc/init.d/ntp stop -/etc/init.d/apache stop - - -# Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# update linker config -ldconfig - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /etc/init.d/apache start - exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 - ;; - esac -fi - -# restart init because the glibc was updated. -telinit u - -# Fix hardening flags in grub -paxctl -mpexs /usr/bin/grub-script-check - -# Regenerate IPsec configuration -sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi - -# Update Language cache -/usr/local/bin/update-lang-cache - -# -# Start services -# -/etc/init.d/apache start -/etc/init.d/ntp start -/etc/init.d/dnsmasq start -/etc/init.d/sshd restart -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# Delete old QoS enabled indicator -rm -f /var/ipfire/qos/enable - -# Upadate Kernel version uEnv.txt -if [ -e /boot/uEnv.txt ]; then - sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt -fi - -# call user update script (needed for some arm boards) -if [ -e /boot/pakfire-kernel-update ]; then - /boot/pakfire-kernel-update ${KVER} -fi - -case "$(uname -m)" in - i?86) - # Force (re)install pae kernel if pae is supported - 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` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - 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 - fi - fi - ;; -esac -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/101/exclude b/config/rootfiles/core/101/exclude new file mode 100644 index 0000000..8e446ce --- /dev/null +++ b/config/rootfiles/core/101/exclude @@ -0,0 +1,26 @@ +boot/config.txt +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/101/filelists/files b/config/rootfiles/core/101/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/101/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/101/filelists/i586/dmidecode b/config/rootfiles/core/101/filelists/i586/dmidecode new file mode 120000 index 0000000..1add99b --- /dev/null +++ b/config/rootfiles/core/101/filelists/i586/dmidecode @@ -0,0 +1 @@ +../../../../common/i586/dmidecode \ No newline at end of file diff --git a/config/rootfiles/core/101/filelists/pcre b/config/rootfiles/core/101/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/101/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/101/filelists/squid b/config/rootfiles/core/101/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/101/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/101/filelists/x86_64/dmidecode b/config/rootfiles/core/101/filelists/x86_64/dmidecode new file mode 120000 index 0000000..88f5f0a --- /dev/null +++ b/config/rootfiles/core/101/filelists/x86_64/dmidecode @@ -0,0 +1 @@ +../../../../common/x86_64/dmidecode \ No newline at end of file diff --git a/config/rootfiles/core/101/meta b/config/rootfiles/core/101/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/101/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh new file mode 100644 index 0000000..f448474 --- /dev/null +++ b/config/rootfiles/core/101/update.sh @@ -0,0 +1,76 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=101 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services +/etc/init.d/squid stop + +# Extract files +extract_files + +# update linker config +ldconfig + + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/squid start + +sync +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/99/exclude b/config/rootfiles/core/99/exclude deleted file mode 100644 index d87f175..0000000 --- a/config/rootfiles/core/99/exclude +++ /dev/null @@ -1,25 +0,0 @@ -boot/config.txt -etc/alternatives -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/99/filelists/files b/config/rootfiles/core/99/filelists/files deleted file mode 100644 index 76b5b4e..0000000 --- a/config/rootfiles/core/99/filelists/files +++ /dev/null @@ -1,3 +0,0 @@ -etc/system-release -etc/issue -var/ipfire/backup/include diff --git a/config/rootfiles/core/99/filelists/i586/openssl-sse2 b/config/rootfiles/core/99/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/99/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssh b/config/rootfiles/core/99/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/99/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssl b/config/rootfiles/core/99/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/99/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/99/meta b/config/rootfiles/core/99/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/99/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/99/update.sh b/config/rootfiles/core/99/update.sh deleted file mode 100644 index b57d0a7..0000000 --- a/config/rootfiles/core/99/update.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Remove old core updates from pakfire cache to save space... -core=99 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services - -# remove slogin which is not included in new OpenSSH -rm /usr/bin/slogin - -# Extract files -extract_files - -# Update Language cache -# /usr/local/bin/update-lang-cache - -# Start services -/etc/init.d/sshd restart -/etc/init.d/apache restart - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/oldcore/100/exclude b/config/rootfiles/oldcore/100/exclude new file mode 100644 index 0000000..8e446ce --- /dev/null +++ b/config/rootfiles/oldcore/100/exclude @@ -0,0 +1,26 @@ +boot/config.txt +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/binutils b/config/rootfiles/oldcore/100/filelists/armv5tel/binutils new file mode 120000 index 0000000..ac971f9 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/gcc b/config/rootfiles/oldcore/100/filelists/armv5tel/gcc new file mode 120000 index 0000000..84f7b93 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/glibc b/config/rootfiles/oldcore/100/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/ath10k-firmware b/config/rootfiles/oldcore/100/filelists/ath10k-firmware new file mode 120000 index 0000000..e7e87c2 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/ath10k-firmware @@ -0,0 +1 @@ +../../../common/ath10k-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/bind b/config/rootfiles/oldcore/100/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/diffutils b/config/rootfiles/oldcore/100/filelists/diffutils new file mode 120000 index 0000000..a5c02f3 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/diffutils @@ -0,0 +1 @@ +../../../common/diffutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/dnsmasq b/config/rootfiles/oldcore/100/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/files b/config/rootfiles/oldcore/100/filelists/files new file mode 100644 index 0000000..c75a26d --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/files @@ -0,0 +1,31 @@ +etc/system-release +etc/issue +etc/dracut.conf +etc/ppp/ip-up +etc/rc.d/init.d/firewall +etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/init.d/ntp +etc/modprobe.d/nf_conntrack.conf +lib/udev/rules.d/60-net.rules +opt/pakfire/etc/pakfire.conf +srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/webaccess.cgi +usr/bin/pgrep +usr/local/bin/backupiso +usr/local/bin/qosctrl +usr/local/bin/timectrl +usr/local/bin/wirelessctrl +usr/sbin/firewall-policy +usr/sbin/setup +var/ipfire/dhcpc/dhcpcd-hooks/10-mtu +var/ipfire/langs diff --git a/config/rootfiles/oldcore/100/filelists/grep b/config/rootfiles/oldcore/100/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/binutils b/config/rootfiles/oldcore/100/filelists/i586/binutils new file mode 120000 index 0000000..78695d7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/gcc b/config/rootfiles/oldcore/100/filelists/i586/gcc new file mode 120000 index 0000000..ba328e3 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/glibc b/config/rootfiles/oldcore/100/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/grub b/config/rootfiles/oldcore/100/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/linux b/config/rootfiles/oldcore/100/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/linux-initrd b/config/rootfiles/oldcore/100/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/libmpc b/config/rootfiles/oldcore/100/filelists/libmpc new file mode 120000 index 0000000..88840fc --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/libmpc @@ -0,0 +1 @@ +../../../common/libmpc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/lua b/config/rootfiles/oldcore/100/filelists/lua new file mode 120000 index 0000000..951f661 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/lua @@ -0,0 +1 @@ +../../../common/lua \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/mt7601u-firmware b/config/rootfiles/oldcore/100/filelists/mt7601u-firmware new file mode 120000 index 0000000..300ac04 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/mt7601u-firmware @@ -0,0 +1 @@ +../../../common/mt7601u-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/ncurses b/config/rootfiles/oldcore/100/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/ntp b/config/rootfiles/oldcore/100/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/openssh b/config/rootfiles/oldcore/100/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/openssl b/config/rootfiles/oldcore/100/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/openvpn b/config/rootfiles/oldcore/100/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/sed b/config/rootfiles/oldcore/100/filelists/sed new file mode 120000 index 0000000..fc5f5c6 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/squid b/config/rootfiles/oldcore/100/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/tzdata b/config/rootfiles/oldcore/100/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/binutils b/config/rootfiles/oldcore/100/filelists/x86_64/binutils new file mode 120000 index 0000000..7d0fda5 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/binutils @@ -0,0 +1 @@ +../../../../common/x86_64/binutils \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/gcc b/config/rootfiles/oldcore/100/filelists/x86_64/gcc new file mode 120000 index 0000000..d1616d3 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/gcc @@ -0,0 +1 @@ +../../../../common/x86_64/gcc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/glibc b/config/rootfiles/oldcore/100/filelists/x86_64/glibc new file mode 120000 index 0000000..1119099 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/grub b/config/rootfiles/oldcore/100/filelists/x86_64/grub new file mode 120000 index 0000000..78d3bd7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/grub @@ -0,0 +1 @@ +../../../../common/x86_64/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/linux b/config/rootfiles/oldcore/100/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd new file mode 120000 index 0000000..1b9fff7 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/filelists/xz b/config/rootfiles/oldcore/100/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/100/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/100/meta b/config/rootfiles/oldcore/100/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/100/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/100/update.sh b/config/rootfiles/oldcore/100/update.sh new file mode 100644 index 0000000..931930a --- /dev/null +++ b/config/rootfiles/oldcore/100/update.sh @@ -0,0 +1,260 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +core=100 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + touch /boot/uImage-ipfire-kirkwood + touch /boot/zImage-ipfire-multi + touch /boot/uIinit-ipfire-kirkwood + touch /boot/uIinit-ipfire-multi + ;; +esac + +# Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/dnsmasq stop +/etc/init.d/ipsec stop +/etc/init.d/ntp stop +/etc/init.d/apache stop + + +# Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# update linker config +ldconfig + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# restart init because the glibc was updated. +telinit u + +# Fix hardening flags in grub +paxctl -mpexs /usr/bin/grub-script-check + +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + +# Update Language cache +/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/apache start +/etc/init.d/ntp start +/etc/init.d/dnsmasq start +/etc/init.d/sshd restart +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Delete old QoS enabled indicator +rm -f /var/ipfire/qos/enable + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + 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` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + 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 + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/99/exclude b/config/rootfiles/oldcore/99/exclude new file mode 100644 index 0000000..d87f175 --- /dev/null +++ b/config/rootfiles/oldcore/99/exclude @@ -0,0 +1,25 @@ +boot/config.txt +etc/alternatives +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/99/filelists/files b/config/rootfiles/oldcore/99/filelists/files new file mode 100644 index 0000000..76b5b4e --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/backup/include diff --git a/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/99/filelists/openssh b/config/rootfiles/oldcore/99/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/99/filelists/openssl b/config/rootfiles/oldcore/99/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/99/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/99/meta b/config/rootfiles/oldcore/99/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/99/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/99/update.sh b/config/rootfiles/oldcore/99/update.sh new file mode 100644 index 0000000..b57d0a7 --- /dev/null +++ b/config/rootfiles/oldcore/99/update.sh @@ -0,0 +1,62 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=99 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# remove slogin which is not included in new OpenSSH +rm /usr/bin/slogin + +# Extract files +extract_files + +# Update Language cache +# /usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/sshd restart +/etc/init.d/apache restart + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index d954b62..22ff820 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="100" # Core Level (Filename) +CORE="101" # Core Level (Filename) PAKFIRE_CORE="100" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 Apr '16

1 0

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

05 Apr '16

1 0

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

05 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 c07053012f7007a627a92141db162675370c909e (commit) via 8e6421d78ec03d5ad32c82328838e4fac9dfac20 (commit) via bdb319c0ca21c0540a7f2a652c0c431c6f894593 (commit) via 52b08bc1eab066e360f4dfeb5f2c6085be97947a (commit) from 6a30a2d4b758eb49940e40d90dbb96f597beaa03 (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 c07053012f7007a627a92141db162675370c909e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 1 09:01:28 2016 +0200 pcre 8.38: latest patches from upstream (LFS) * Fix auto-callout (?# comment bug. * Fix negated POSIX class within negated overall class UCP bug. * Fix bug for isolated \E between an item and its qualifier when auto callout is set. * Give error for regexec with pmatch=NULL and REG_STARTEND set. * Allow for up to 32-bit numbers in the ordin() function in pcregrep. * Fix \Q\E before qualifier bug when auto callouts are enabled. * Fix /x bug when pattern starts with white space and (?-x). * Fix copy named substring bug. * Fix (by hacking) another length computation issue. * Fix get_substring_list() bug when \K is used in an assertion. * Fix pcretest bad behaviour for callout in lookbehind. * Fix workspace overflow for (*ACCEPT) with deeply nested parentheses. * Yet another duplicate name bugfix by overestimating the memory needed (i.e. another hack - PCRE2 has this "properly" fixed). * Fix pcretest loop for global matching with an ovector size less than 2. * Fix non-diagnosis of missing assertion after (?(?C). Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8e6421d78ec03d5ad32c82328838e4fac9dfac20 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Feb 27 09:17:26 2016 +0100 squid 3.4.14: Bugfix for #4323 (Netfilter broken cross-includes with Linux 4.2) For details see: http://bugs.squid-cache.org/show_bug.cgi?id=4323 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bdb319c0ca21c0540a7f2a652c0c431c6f894593 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 5 22:52:54 2016 +0100 squid: Patch SQUID-2016:3/CVE-2016-3947 http://www.squid-cache.org/Advisories/SQUID-2016_3.txt Due to a buffer overrun Squid pinger binary is vulnerable to denial of service or information leak attack when processing ICMPv6 packets. This bug also permits the server response to manipulate other ICMP and ICMPv6 queries processing to cause information leak. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 52b08bc1eab066e360f4dfeb5f2c6085be97947a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 4 16:28:09 2016 +0100 perl-Apache-Htpasswd: New module Used to change passwords in Apache's htpasswd files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../rootfiles/common/armv5tel/perl-Apache-Htpasswd | 6 + config/rootfiles/common/i586/perl-Apache-Htpasswd | 6 + config/rootfiles/common/squid | 2 + .../rootfiles/common/x86_64/perl-Apache-Htpasswd | 6 + lfs/pcre | 1 + lfs/{perl-Device-Modem => perl-Apache-Htpasswd} | 6 +- lfs/squid | 4 +- make.sh | 1 + src/patches/pcre-8.38-upstream_fixes-1.patch | 1408 ++++++++++++++++++++ src/patches/squid-3.4-13231.patch | 48 + src/patches/squid-3.4-13232.patch | 51 + 11 files changed, 1535 insertions(+), 4 deletions(-) create mode 100644 config/rootfiles/common/armv5tel/perl-Apache-Htpasswd create mode 100644 config/rootfiles/common/i586/perl-Apache-Htpasswd create mode 100644 config/rootfiles/common/x86_64/perl-Apache-Htpasswd copy lfs/{perl-Device-Modem => perl-Apache-Htpasswd} (96%) create mode 100644 src/patches/pcre-8.38-upstream_fixes-1.patch create mode 100644 src/patches/squid-3.4-13231.patch create mode 100644 src/patches/squid-3.4-13232.patch Difference in files: diff --git a/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd b/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd new file mode 100644 index 0000000..2eb360e --- /dev/null +++ b/config/rootfiles/common/armv5tel/perl-Apache-Htpasswd @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.12.3/Apache +usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm +#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache +#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache/Htpasswd +#usr/lib/perl5/site_perl/5.12.3/armv5tel-linux-thread-multi/auto/Apache/Htpasswd/.packlist +#usr/share/man/man3/Apache::Htpasswd.3 diff --git a/config/rootfiles/common/i586/perl-Apache-Htpasswd b/config/rootfiles/common/i586/perl-Apache-Htpasswd new file mode 100644 index 0000000..7eb356f --- /dev/null +++ b/config/rootfiles/common/i586/perl-Apache-Htpasswd @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.12.3/Apache +usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache/Htpasswd +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Apache/Htpasswd/.packlist +#usr/share/man/man3/Apache::Htpasswd.3 diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index c8227e3..83cfe3f 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -2145,6 +2145,8 @@ usr/lib/squid/icons/silk/script_palette.png usr/lib/squid/log_db_daemon usr/lib/squid/log_file_daemon usr/lib/squid/mib.txt +usr/lib/squid/negotiate_kerberos_auth +usr/lib/squid/negotiate_kerberos_auth_test usr/lib/squid/negotiate_wrapper_auth usr/lib/squid/ntlm_fake_auth usr/lib/squid/ntlm_smb_lm_auth diff --git a/config/rootfiles/common/x86_64/perl-Apache-Htpasswd b/config/rootfiles/common/x86_64/perl-Apache-Htpasswd new file mode 100644 index 0000000..da58e5e --- /dev/null +++ b/config/rootfiles/common/x86_64/perl-Apache-Htpasswd @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.12.3/Apache +usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm +#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache +#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache/Htpasswd +#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Apache/Htpasswd/.packlist +#usr/share/man/man3/Apache::Htpasswd.3 diff --git a/lfs/pcre b/lfs/pcre index ddbd0b5..c946714 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.38-upstream_fixes-1.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-static \ diff --git a/lfs/perl-Apache-Htpasswd b/lfs/perl-Apache-Htpasswd new file mode 100644 index 0000000..9d9ed90 --- /dev/null +++ b/lfs/perl-Apache-Htpasswd @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.9 + +THISAPP = Apache-Htpasswd-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ee2ca41f9dd92d7a830a5ba65fcbeef0 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/squid b/lfs/squid index 997c660..7e41c16 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-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 # @@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/make.sh b/make.sh index b32dfd2..2f50eff 100755 --- a/make.sh +++ b/make.sh @@ -550,6 +550,7 @@ buildipfire() { ipfiremake GD-TextUtil ipfiremake perl-Device-SerialPort ipfiremake perl-Device-Modem + ipfiremake perl-Apache-Htpasswd ipfiremake gnupg ipfiremake hdparm ipfiremake sdparm diff --git a/src/patches/pcre-8.38-upstream_fixes-1.patch b/src/patches/pcre-8.38-upstream_fixes-1.patch new file mode 100644 index 0000000..d366e22 --- /dev/null +++ b/src/patches/pcre-8.38-upstream_fixes-1.patch @@ -0,0 +1,1408 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2016-03-16 +Initial Package Version: 8.38 +Upstream Status: Applied +Origin: Upstream, backported to 8.38 by Petr Písař at redhat +Description: Various fixes, including for CVE-2016-1263 and many other +bugs which have been fixed upstream. Many of these bugs were found by +fuzzing, upstream is trying to persuade its users to move to pcre2 and +giving low priority to further pcre1 maintenance releases. + +From 3c80e02cd464ea049e117b423fd48fab294c51a9 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Thu, 26 Nov 2015 20:29:13 +0000 +Subject: [PATCH] Fix auto-callout (?# comment bug. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1611 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Pisar: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index 4d3b313..3360a8b 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -4699,6 +4699,23 @@ for (;; ptr++) + } + } + ++ /* Skip over (?# comments. We need to do this here because we want to know if ++ the next thing is a quantifier, and these comments may come between an item ++ and its quantifier. */ ++ ++ if (c == CHAR_LEFT_PARENTHESIS && ptr[1] == CHAR_QUESTION_MARK && ++ ptr[2] == CHAR_NUMBER_SIGN) ++ { ++ ptr += 3; ++ while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++; ++ if (*ptr == CHAR_NULL) ++ { ++ *errorcodeptr = ERR18; ++ goto FAILED; ++ } ++ continue; ++ } ++ + /* See if the next thing is a quantifier. */ + + is_quantifier = +@@ -6529,21 +6546,6 @@ for (;; ptr++) + case CHAR_LEFT_PARENTHESIS: + ptr++; + +- /* First deal with comments. Putting this code right at the start ensures +- that comments have no bad side effects. */ +- +- if (ptr[0] == CHAR_QUESTION_MARK && ptr[1] == CHAR_NUMBER_SIGN) +- { +- ptr += 2; +- while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++; +- if (*ptr == CHAR_NULL) +- { +- *errorcodeptr = ERR18; +- goto FAILED; +- } +- continue; +- } +- + /* Now deal with various "verbs" that can be introduced by '*'. */ + + if (ptr[0] == CHAR_ASTERISK && (ptr[1] == ':' +diff --git a/testdata/testinput2 b/testdata/testinput2 +index e2e520f..92e3359 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4217,4 +4217,12 @@ backtracking verbs. --/ + + /a[[:punct:]b]/BZ + ++/L(?#(|++<!(2)?/BZ ++ ++/L(?#(|++<!(2)?/BOZ ++ ++/L(?#(|++<!(2)?/BCZ ++ ++/L(?#(|++<!(2)?/BCOZ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testinput7 b/testdata/testinput7 +index e411a4b..00b9738 100644 +--- a/testdata/testinput7 ++++ b/testdata/testinput7 +@@ -853,4 +853,8 @@ of case for anything other than the ASCII letters. --/ + + /a[b[:punct:]]/8WBZ + ++/L(?#(|++<!(2)?/B8COZ ++ ++/L(?#(|++<!(2)?/B8WCZ ++ + /-- End of testinput7 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 85c565d..2cf7a90 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14574,4 +14574,40 @@ No match + End + ------------------------------------------------------------------ + ++/L(?#(|++<!(2)?/BZ ++------------------------------------------------------------------ ++ Bra ++ L?+ ++ Ket ++ End ++------------------------------------------------------------------ ++ ++/L(?#(|++<!(2)?/BOZ ++------------------------------------------------------------------ ++ Bra ++ L? ++ Ket ++ End ++------------------------------------------------------------------ ++ ++/L(?#(|++<!(2)?/BCZ ++------------------------------------------------------------------ ++ Bra ++ Callout 255 0 14 ++ L?+ ++ Callout 255 14 0 ++ Ket ++ End ++------------------------------------------------------------------ ++ ++/L(?#(|++<!(2)?/BCOZ ++------------------------------------------------------------------ ++ Bra ++ Callout 255 0 14 ++ L? ++ Callout 255 14 0 ++ Ket ++ End ++------------------------------------------------------------------ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput7 b/testdata/testoutput7 +index cc9ebdd..fdfff64 100644 +--- a/testdata/testoutput7 ++++ b/testdata/testoutput7 +@@ -2348,4 +2348,24 @@ No match + End + ------------------------------------------------------------------ + ++/L(?#(|++<!(2)?/B8COZ ++------------------------------------------------------------------ ++ Bra ++ Callout 255 0 14 ++ L? ++ Callout 255 14 0 ++ Ket ++ End ++------------------------------------------------------------------ ++ ++/L(?#(|++<!(2)?/B8WCZ ++------------------------------------------------------------------ ++ Bra ++ Callout 255 0 14 ++ L?+ ++ Callout 255 14 0 ++ Ket ++ End ++------------------------------------------------------------------ ++ + /-- End of testinput7 --/ +-- +2.4.3 + +From ef6b10fcde41a2687f38d4a9ff2886b037948a1b Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Fri, 27 Nov 2015 17:13:13 +0000 +Subject: [PATCH 1/5] Fix negated POSIX class within negated overall class UCP + bug. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1612 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. +diff --git a/pcre_compile.c b/pcre_compile.c +index 3360a8b..3670f1e 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -5063,20 +5063,22 @@ for (;; ptr++) + ptr = tempptr + 1; + continue; + +- /* For the other POSIX classes (ascii, xdigit) we are going to fall +- through to the non-UCP case and build a bit map for characters with +- code points less than 256. If we are in a negated POSIX class +- within a non-negated overall class, characters with code points +- greater than 255 must all match. In the special case where we have +- not yet generated any xclass data, and this is the final item in +- the overall class, we need do nothing: later on, the opcode ++ /* For the other POSIX classes (ascii, cntrl, xdigit) we are going ++ to fall through to the non-UCP case and build a bit map for ++ characters with code points less than 256. If we are in a negated ++ POSIX class, characters with code points greater than 255 must ++ either all match or all not match. In the special case where we ++ have not yet generated any xclass data, and this is the final item ++ in the overall class, we need do nothing: later on, the opcode + OP_NCLASS will be used to indicate that characters greater than 255 + are acceptable. If we have already seen an xclass item or one may + follow (we have to assume that it might if this is not the end of +- the class), explicitly match all wide codepoints. */ ++ the class), explicitly list all wide codepoints, which will then ++ either not match or match, depending on whether the class is or is ++ not negated. */ + + default: +- if (!negate_class && local_negate && ++ if (local_negate && + (xclass || tempptr[2] != CHAR_RIGHT_SQUARE_BRACKET)) + { + *class_uchardata++ = XCL_RANGE; +diff --git a/testdata/testinput6 b/testdata/testinput6 +index aeb62a0..a178d3d 100644 +--- a/testdata/testinput6 ++++ b/testdata/testinput6 +@@ -1553,4 +1553,13 @@ + \x{200} + \x{37e} + ++/[^[:^ascii:]\d]/8W ++ a ++ ~ ++ 0 ++ \a ++ \x{7f} ++ \x{389} ++ \x{20ac} ++ + /-- End of testinput6 --/ +diff --git a/testdata/testoutput6 b/testdata/testoutput6 +index beb85aa..b64dc0d 100644 +--- a/testdata/testoutput6 ++++ b/testdata/testoutput6 +@@ -2557,4 +2557,20 @@ No match + \x{37e} + 0: \x{37e} + ++/[^[:^ascii:]\d]/8W ++ a ++ 0: a ++ ~ ++ 0: ~ ++ 0 ++No match ++ \a ++ 0: \x{07} ++ \x{7f} ++ 0: \x{7f} ++ \x{389} ++No match ++ \x{20ac} ++No match ++ + /-- End of testinput6 --/ +-- +2.4.3 + +From bfc1dfa660c24dc7a75108d934290e50d7db2719 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Fri, 27 Nov 2015 17:41:04 +0000 +Subject: [PATCH 2/5] Fix bug for isolated \E between an item and its qualifier + when auto callout is set. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1613 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index 3670f1e..5786cd3 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -4645,9 +4645,10 @@ for (;; ptr++) + goto FAILED; + } + +- /* If in \Q...\E, check for the end; if not, we have a literal */ ++ /* If in \Q...\E, check for the end; if not, we have a literal. Otherwise an ++ isolated \E is ignored. */ + +- if (inescq && c != CHAR_NULL) ++ if (c != CHAR_NULL) + { + if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E) + { +@@ -4655,7 +4656,7 @@ for (;; ptr++) + ptr++; + continue; + } +- else ++ else if (inescq) + { + if (previous_callout != NULL) + { +@@ -4670,7 +4671,6 @@ for (;; ptr++) + } + goto NORMAL_CHAR; + } +- /* Control does not reach here. */ + } + + /* In extended mode, skip white space and comments. We need a loop in order +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 92e3359..e8ca4fe 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4225,4 +4225,6 @@ backtracking verbs. --/ + + /L(?#(|++<!(2)?/BCOZ + ++/(A*)\E+/CBZ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 2cf7a90..09756b8 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14610,4 +14610,18 @@ No match + End + ------------------------------------------------------------------ + ++/(A*)\E+/CBZ ++------------------------------------------------------------------ ++ Bra ++ Callout 255 0 7 ++ SCBra 1 ++ Callout 255 1 2 ++ A* ++ Callout 255 3 0 ++ KetRmax ++ Callout 255 7 0 ++ Ket ++ End ++------------------------------------------------------------------ ++ + /-- End of testinput2 --/ +-- +2.4.3 + +From 108377b836fc29a84f5286287629d96549b1c777 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sun, 29 Nov 2015 17:38:25 +0000 +Subject: [PATCH 3/5] Give error for regexec with pmatch=NULL and REG_STARTEND + set. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1614 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcreposix.c b/pcreposix.c +index f024423..dcc13ef 100644 +--- a/pcreposix.c ++++ b/pcreposix.c +@@ -364,6 +364,7 @@ start location rather than being passed as a PCRE "starting offset". */ + + if ((eflags & REG_STARTEND) != 0) + { ++ if (pmatch == NULL) return REG_INVARG; + so = pmatch[0].rm_so; + eo = pmatch[0].rm_eo; + } +-- +2.4.3 + +From e347b40d5bb12f7ef1e632aa649571a107be7d8a Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sun, 29 Nov 2015 17:46:23 +0000 +Subject: [PATCH 4/5] Allow for up to 32-bit numbers in the ordin() function in + pcregrep. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1615 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcregrep.c b/pcregrep.c +index 64986b0..cd53c64 100644 +--- a/pcregrep.c ++++ b/pcregrep.c +@@ -2437,7 +2437,7 @@ return options; + static char * + ordin(int n) + { +-static char buffer[8]; ++static char buffer[14]; + char *p = buffer; + sprintf(p, "%d", n); + while (*p != 0) p++; +-- +2.4.3 + +From e78ad4264b16988b826bd2939a1781c1165a92d9 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Mon, 30 Nov 2015 17:44:45 +0000 +Subject: [PATCH 5/5] Fix \Q\E before qualifier bug when auto callouts are + enabled. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1616 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index 5786cd3..beed46b 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -4671,17 +4671,27 @@ for (;; ptr++) + } + goto NORMAL_CHAR; + } ++ ++ /* Check for the start of a \Q...\E sequence. We must do this here rather ++ than later in case it is immediately followed by \E, which turns it into a ++ "do nothing" sequence. */ ++ ++ if (c == CHAR_BACKSLASH && ptr[1] == CHAR_Q) ++ { ++ inescq = TRUE; ++ ptr++; ++ continue; ++ } + } + +- /* In extended mode, skip white space and comments. We need a loop in order +- to check for more white space and more comments after a comment. */ ++ /* In extended mode, skip white space and comments. */ + + if ((options & PCRE_EXTENDED) != 0) + { +- for (;;) ++ const pcre_uchar *wscptr = ptr; ++ while (MAX_255(c) && (cd->ctypes[c] & ctype_space) != 0) c = *(++ptr); ++ if (c == CHAR_NUMBER_SIGN) + { +- while (MAX_255(c) && (cd->ctypes[c] & ctype_space) != 0) c = *(++ptr); +- if (c != CHAR_NUMBER_SIGN) break; + ptr++; + while (*ptr != CHAR_NULL) + { +@@ -4695,7 +4705,15 @@ for (;; ptr++) + if (utf) FORWARDCHAR(ptr); + #endif + } +- c = *ptr; /* Either NULL or the char after a newline */ ++ } ++ ++ /* If we skipped any characters, restart the loop. Otherwise, we didn't see ++ a comment. */ ++ ++ if (ptr > wscptr) ++ { ++ ptr--; ++ continue; + } + } + +@@ -7900,16 +7918,6 @@ for (;; ptr++) + c = ec; + else + { +- if (escape == ESC_Q) /* Handle start of quoted string */ +- { +- if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E) +- ptr += 2; /* avoid empty string */ +- else inescq = TRUE; +- continue; +- } +- +- if (escape == ESC_E) continue; /* Perl ignores an orphan \E */ +- + /* For metasequences that actually match a character, we disable the + setting of a first character if it hasn't already been set. */ + +diff --git a/testdata/testinput2 b/testdata/testinput2 +index e8ca4fe..3a1134f 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4227,4 +4227,6 @@ backtracking verbs. --/ + + /(A*)\E+/CBZ + ++/()\Q\E*]/BCZ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 09756b8..ac33cc4 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14624,4 +14624,19 @@ No match + End + ------------------------------------------------------------------ + ++/()\Q\E*]/BCZ ++------------------------------------------------------------------ ++ Bra ++ Callout 255 0 7 ++ Brazero ++ SCBra 1 ++ Callout 255 1 0 ++ KetRmax ++ Callout 255 7 1 ++ ] ++ Callout 255 8 0 ++ Ket ++ End ++------------------------------------------------------------------ ++ + /-- End of testinput2 --/ +-- +2.4.3 + +From 46ed1a703b067e5b679eacf6500a54dae35f8130 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Thu, 3 Dec 2015 17:05:40 +0000 +Subject: [PATCH] Fix /x bug when pattern starts with white space and (?-x) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1617 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index beed46b..57719b9 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -7607,39 +7607,15 @@ for (;; ptr++) + newoptions = (options | set) & (~unset); + + /* If the options ended with ')' this is not the start of a nested +- group with option changes, so the options change at this level. If this +- item is right at the start of the pattern, the options can be +- abstracted and made external in the pre-compile phase, and ignored in +- the compile phase. This can be helpful when matching -- for instance in +- caseless checking of required bytes. +- +- If the code pointer is not (cd->start_code + 1 + LINK_SIZE), we are +- definitely *not* at the start of the pattern because something has been +- compiled. In the pre-compile phase, however, the code pointer can have +- that value after the start, because it gets reset as code is discarded +- during the pre-compile. However, this can happen only at top level - if +- we are within parentheses, the starting BRA will still be present. At +- any parenthesis level, the length value can be used to test if anything +- has been compiled at that level. Thus, a test for both these conditions +- is necessary to ensure we correctly detect the start of the pattern in +- both phases. +- ++ group with option changes, so the options change at this level. + If we are not at the pattern start, reset the greedy defaults and the + case value for firstchar and reqchar. */ + + if (*ptr == CHAR_RIGHT_PARENTHESIS) + { +- if (code == cd->start_code + 1 + LINK_SIZE && +- (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) +- { +- cd->external_options = newoptions; +- } +- else +- { +- greedy_default = ((newoptions & PCRE_UNGREEDY) != 0); +- greedy_non_default = greedy_default ^ 1; +- req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS:0; +- } ++ greedy_default = ((newoptions & PCRE_UNGREEDY) != 0); ++ greedy_non_default = greedy_default ^ 1; ++ req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS:0; + + /* Change options at this level, and pass them back for use + in subsequent branches. */ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index ac33cc4..6c42897 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -419,7 +419,7 @@ Need char = '>' + + /(?U)<.*>/I + Capturing subpattern count = 0 +-Options: ungreedy ++No options + First char = '<' + Need char = '>' + abc<def>ghi<klm>nop +@@ -443,7 +443,7 @@ Need char = '=' + + /(?U)={3,}?/I + Capturing subpattern count = 0 +-Options: ungreedy ++No options + First char = '=' + Need char = '=' + abc========def +@@ -477,7 +477,7 @@ Failed: lookbehind assertion is not fixed length at offset 12 + + /(?i)abc/I + Capturing subpattern count = 0 +-Options: caseless ++No options + First char = 'a' (caseless) + Need char = 'c' (caseless) + +@@ -489,7 +489,7 @@ No need char + + /(?i)^1234/I + Capturing subpattern count = 0 +-Options: anchored caseless ++Options: anchored + No first char + No need char + +@@ -502,7 +502,7 @@ No need char + /(?s).*/I + Capturing subpattern count = 0 + May match empty string +-Options: anchored dotall ++Options: anchored + No first char + No need char + +@@ -516,7 +516,7 @@ Starting chars: a b c d + + /(?i)[abcd]/IS + Capturing subpattern count = 0 +-Options: caseless ++No options + No first char + No need char + Subject length lower bound = 1 +@@ -524,7 +524,7 @@ Starting chars: A B C D a b c d + + /(?m)[xy]|(b|c)/IS + Capturing subpattern count = 1 +-Options: multiline ++No options + No first char + No need char + Subject length lower bound = 1 +@@ -538,7 +538,7 @@ No need char + + /(?i)(^a|^b)/Im + Capturing subpattern count = 1 +-Options: caseless multiline ++Options: multiline + First char at start or follows newline + No need char + +@@ -1179,7 +1179,7 @@ No need char + End + ------------------------------------------------------------------ + Capturing subpattern count = 1 +-Options: anchored dotall ++Options: anchored + No first char + No need char + +@@ -2735,7 +2735,7 @@ No match + End + ------------------------------------------------------------------ + Capturing subpattern count = 0 +-Options: caseless extended ++Options: extended + First char = 'a' (caseless) + Need char = 'c' (caseless) + +@@ -2748,7 +2748,7 @@ Need char = 'c' (caseless) + End + ------------------------------------------------------------------ + Capturing subpattern count = 0 +-Options: caseless extended ++Options: extended + First char = 'a' (caseless) + Need char = 'c' (caseless) + +@@ -3095,7 +3095,7 @@ Need char = 'b' + End + ------------------------------------------------------------------ + Capturing subpattern count = 0 +-Options: ungreedy ++No options + First char = 'x' + Need char = 'b' + xaaaab +@@ -3497,7 +3497,7 @@ Need char = 'c' + + /(?i)[ab]/IS + Capturing subpattern count = 0 +-Options: caseless ++No options + No first char + No need char + Subject length lower bound = 1 +@@ -6299,7 +6299,7 @@ Capturing subpattern count = 3 + Named capturing subpatterns: + A 2 + A 3 +-Options: anchored dupnames ++Options: anchored + Duplicate name status changes + No first char + No need char +-- +2.4.3 + +From db1fb68feddc9afe6f8822d099fa9ff25e3ea8e7 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat, 5 Dec 2015 16:30:14 +0000 +Subject: [PATCH] Fix copy named substring bug. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1618 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. +diff --git a/pcre_get.c b/pcre_get.c +index 8094b34..41eda9c 100644 +--- a/pcre_get.c ++++ b/pcre_get.c +@@ -250,6 +250,7 @@ Arguments: + code the compiled regex + stringname the name of the capturing substring + ovector the vector of matched substrings ++ stringcount number of captured substrings + + Returns: the number of the first that is set, + or the number of the last one if none are set, +@@ -258,13 +259,16 @@ Returns: the number of the first that is set, + + #if defined COMPILE_PCRE8 + static int +-get_first_set(const pcre *code, const char *stringname, int *ovector) ++get_first_set(const pcre *code, const char *stringname, int *ovector, ++ int stringcount) + #elif defined COMPILE_PCRE16 + static int +-get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector) ++get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector, ++ int stringcount) + #elif defined COMPILE_PCRE32 + static int +-get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector) ++get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector, ++ int stringcount) + #endif + { + const REAL_PCRE *re = (const REAL_PCRE *)code; +@@ -295,7 +299,7 @@ if (entrysize <= 0) return entrysize; + for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize) + { + int n = GET2(entry, 0); +- if (ovector[n*2] >= 0) return n; ++ if (n < stringcount && ovector[n*2] >= 0) return n; + } + return GET2(entry, 0); + } +@@ -402,7 +406,7 @@ pcre32_copy_named_substring(const pcre32 *code, PCRE_SPTR32 subject, + PCRE_UCHAR32 *buffer, int size) + #endif + { +-int n = get_first_set(code, stringname, ovector); ++int n = get_first_set(code, stringname, ovector, stringcount); + if (n <= 0) return n; + #if defined COMPILE_PCRE8 + return pcre_copy_substring(subject, ovector, stringcount, n, buffer, size); +@@ -619,7 +623,7 @@ pcre32_get_named_substring(const pcre32 *code, PCRE_SPTR32 subject, + PCRE_SPTR32 *stringptr) + #endif + { +-int n = get_first_set(code, stringname, ovector); ++int n = get_first_set(code, stringname, ovector, stringcount); + if (n <= 0) return n; + #if defined COMPILE_PCRE8 + return pcre_get_substring(subject, ovector, stringcount, n, stringptr); +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 3a1134f..00ffe32 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4229,4 +4229,7 @@ backtracking verbs. --/ + + /()\Q\E*]/BCZ + ++/(?<A>)(?J:(?)(?))(?<C>)/ ++ \O\CC ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 6c42897..ffb4466 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14639,4 +14639,9 @@ No match + End + ------------------------------------------------------------------ + ++/(?<A>)(?J:(?)(?))(?<C>)/ ++ \O\CC ++Matched, but too many substrings ++copy substring C failed -7 ++ + /-- End of testinput2 --/ +-- +2.4.3 + +From 40363ebc19baeab160abaaa55dc84322a89ac35a Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat, 5 Dec 2015 16:58:46 +0000 +Subject: [PATCH] Fix (by hacking) another length computation issue. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1619 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index 57719b9..087bf2a 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -7280,7 +7280,7 @@ for (;; ptr++) + issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance + only mode, we finesse the bug by allowing more memory always. */ + +- *lengthptr += 2 + 2*LINK_SIZE; ++ *lengthptr += 4 + 4*LINK_SIZE; + + /* It is even worse than that. The current reference may be to an + existing named group with a different number (so apparently not +diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16 +index 9a0a12d..280692e 100644 +--- a/testdata/testoutput11-16 ++++ b/testdata/testoutput11-16 +@@ -231,7 +231,7 @@ Memory allocation (code space): 73 + ------------------------------------------------------------------ + + /(?P<a>a)...(?P=a)bbb(?P>a)d/BM +-Memory allocation (code space): 77 ++Memory allocation (code space): 93 + ------------------------------------------------------------------ + 0 24 Bra + 2 5 CBra 1 +diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32 +index 57e5da0..cdbda74 100644 +--- a/testdata/testoutput11-32 ++++ b/testdata/testoutput11-32 +@@ -231,7 +231,7 @@ Memory allocation (code space): 155 + ------------------------------------------------------------------ + + /(?P<a>a)...(?P=a)bbb(?P>a)d/BM +-Memory allocation (code space): 157 ++Memory allocation (code space): 189 + ------------------------------------------------------------------ + 0 24 Bra + 2 5 CBra 1 +diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8 +index 748548a..cb37896 100644 +--- a/testdata/testoutput11-8 ++++ b/testdata/testoutput11-8 +@@ -231,7 +231,7 @@ Memory allocation (code space): 45 + ------------------------------------------------------------------ + + /(?P<a>a)...(?P=a)bbb(?P>a)d/BM +-Memory allocation (code space): 50 ++Memory allocation (code space): 62 + ------------------------------------------------------------------ + 0 30 Bra + 3 7 CBra 1 +-- +2.4.3 + +From 4f47274a2eb10131d88145ad7fd0eed4027a0c51 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Tue, 8 Dec 2015 11:06:40 +0000 +Subject: [PATCH] Fix get_substring_list() bug when \K is used in an assertion. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1620 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: ported to 8.38. + +diff --git a/pcre_get.c b/pcre_get.c +index 41eda9c..cdd2abc 100644 +--- a/pcre_get.c ++++ b/pcre_get.c +@@ -461,7 +461,10 @@ pcre_uchar **stringlist; + pcre_uchar *p; + + for (i = 0; i < double_count; i += 2) +- size += sizeof(pcre_uchar *) + IN_UCHARS(ovector[i+1] - ovector[i] + 1); ++ { ++ size += sizeof(pcre_uchar *) + IN_UCHARS(1); ++ if (ovector[i+1] > ovector[i]) size += IN_UCHARS(ovector[i+1] - ovector[i]); ++ } + + stringlist = (pcre_uchar **)(PUBL(malloc))(size); + if (stringlist == NULL) return PCRE_ERROR_NOMEMORY; +@@ -477,7 +480,7 @@ p = (pcre_uchar *)(stringlist + stringcount + 1); + + for (i = 0; i < double_count; i += 2) + { +- int len = ovector[i+1] - ovector[i]; ++ int len = (ovector[i+1] > ovector[i])? (ovector[i+1] - ovector[i]) : 0; + memcpy(p, subject + ovector[i], IN_UCHARS(len)); + *stringlist++ = p; + p += len; +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 00ffe32..967a241 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4232,4 +4232,7 @@ backtracking verbs. --/ + /(?<A>)(?J:(?)(?))(?<C>)/ + \O\CC + ++/(?=a\K)/ ++ ring bpattingbobnd $ 1,oern cou \rb\L ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index ffb4466..5fb28d5 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14644,4 +14644,10 @@ No match + Matched, but too many substrings + copy substring C failed -7 + ++/(?=a\K)/ ++ ring bpattingbobnd $ 1,oern cou \rb\L ++Start of matched string is beyond its end - displaying from end to start. ++ 0: a ++ 0L ++ + /-- End of testinput2 --/ +-- +2.5.0 + +From 3da5528b47b88c32224cf9d14d8a4e80cd7a0815 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat, 6 Feb 2016 16:54:14 +0000 +Subject: [PATCH] Fix pcretest bad behaviour for callout in lookbehind. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1625 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcretest.c b/pcretest.c +index 488e419..63869fd 100644 +--- a/pcretest.c ++++ b/pcretest.c +@@ -2250,7 +2250,7 @@ data is not zero. */ + static int callout(pcre_callout_block *cb) + { + FILE *f = (first_callout | callout_extra)? outfile : NULL; +-int i, pre_start, post_start, subject_length; ++int i, current_position, pre_start, post_start, subject_length; + + if (callout_extra) + { +@@ -2280,14 +2280,19 @@ printed lengths of the substrings. */ + + if (f != NULL) fprintf(f, "--->"); + ++/* If a lookbehind is involved, the current position may be earlier than the ++match start. If so, use the match start instead. */ ++ ++current_position = (cb->current_position >= cb->start_match)? ++ cb->current_position : cb->start_match; ++ + PCHARS(pre_start, cb->subject, 0, cb->start_match, f); + PCHARS(post_start, cb->subject, cb->start_match, +- cb->current_position - cb->start_match, f); ++ current_position - cb->start_match, f); + + PCHARS(subject_length, cb->subject, 0, cb->subject_length, NULL); + +-PCHARSV(cb->subject, cb->current_position, +- cb->subject_length - cb->current_position, f); ++PCHARSV(cb->subject, current_position, cb->subject_length - current_position, f); + + if (f != NULL) fprintf(f, "\n"); + +@@ -5740,3 +5745,4 @@ return yield; + } + + /* End of pcretest.c */ ++ +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 967a241..086e0f4 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4235,4 +4235,8 @@ backtracking verbs. --/ + /(?=a\K)/ + ring bpattingbobnd $ 1,oern cou \rb\L + ++/(?<=((?C)0))/ ++ 9010 ++ abcd ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 5fb28d5..d414a72 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14650,4 +14650,19 @@ Start of matched string is beyond its end - displaying from end to start. + 0: a + 0L + ++/(?<=((?C)0))/ ++ 9010 ++--->9010 ++ 0 ^ 0 ++ 0 ^ 0 ++ 0: ++ 1: 0 ++ abcd ++--->abcd ++ 0 ^ 0 ++ 0 ^ 0 ++ 0 ^ 0 ++ 0 ^ 0 ++No match ++ + /-- End of testinput2 --/ +-- +2.5.0 + +From 943a5105b9fe2842851003f692c7077a6cdbeefe Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Wed, 10 Feb 2016 19:13:17 +0000 +Subject: [PATCH] Fix workspace overflow for (*ACCEPT) with deeply nested + parentheses. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1631 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index b9a239e..5019854 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -560,6 +560,7 @@ static const char error_texts[] = + /* 85 */ + "parentheses are too deeply nested (stack check)\0" + "digits missing in \\x{} or \\o{}\0" ++ "regular expression is too complicated\0" + ; + + /* Table to identify digits and hex digits. This is used when compiling +@@ -4591,7 +4592,8 @@ for (;; ptr++) + if (code > cd->start_workspace + cd->workspace_size - + WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */ + { +- *errorcodeptr = ERR52; ++ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)? ++ ERR52 : ERR87; + goto FAILED; + } + +@@ -6626,8 +6628,21 @@ for (;; ptr++) + cd->had_accept = TRUE; + for (oc = cd->open_caps; oc != NULL; oc = oc->next) + { +- *code++ = OP_CLOSE; +- PUT2INC(code, 0, oc->number); ++ if (lengthptr != NULL) ++ { ++#ifdef COMPILE_PCRE8 ++ *lengthptr += 1 + IMM2_SIZE; ++#elif defined COMPILE_PCRE16 ++ *lengthptr += 2 + IMM2_SIZE; ++#elif defined COMPILE_PCRE32 ++ *lengthptr += 4 + IMM2_SIZE; ++#endif ++ } ++ else ++ { ++ *code++ = OP_CLOSE; ++ PUT2INC(code, 0, oc->number); ++ } + } + setverb = *code++ = + (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT; +diff --git a/pcre_internal.h b/pcre_internal.h +index f7a5ee7..dbfe80e 100644 +--- a/pcre_internal.h ++++ b/pcre_internal.h +@@ -7,7 +7,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -2289,7 +2289,7 @@ enum { ERR0, ERR1, ERR2, ERR3, ERR4, ERR5, ERR6, ERR7, ERR8, ERR9, + ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, + ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, + ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, +- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT }; ++ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT }; + + /* JIT compiling modes. The function list is indexed by them. */ + +diff --git a/pcreposix.c b/pcreposix.c +index dcc13ef..55b6ddc 100644 +--- a/pcreposix.c ++++ b/pcreposix.c +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -173,7 +173,8 @@ static const int eint[] = { + REG_BADPAT, /* group name must start with a non-digit */ + /* 85 */ + REG_BADPAT, /* parentheses too deeply nested (stack check) */ +- REG_BADPAT /* missing digits in \x{} or \o{} */ ++ REG_BADPAT, /* missing digits in \x{} or \o{} */ ++ REG_BADPAT /* pattern too complicated */ + }; + + /* Table of texts corresponding to POSIX error codes */ +diff --git a/testdata/testinput11 b/testdata/testinput11 +index ac9d228..6f0989a 100644 +--- a/testdata/testinput11 ++++ b/testdata/testinput11 +@@ -138,4 +138,6 @@ is required for these tests. --/ + + /.((?2)(?R)\1)()/B + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++ + /-- End of testinput11 --/ +diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16 +index 280692e..3c485da 100644 +--- a/testdata/testoutput11-16 ++++ b/testdata/testoutput11-16 +@@ -765,4 +765,7 @@ Memory allocation (code space): 14 + 25 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: regular expression is too complicated at offset 490 ++ + /-- End of testinput11 --/ +diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32 +index cdbda74..e19518d 100644 +--- a/testdata/testoutput11-32 ++++ b/testdata/testoutput11-32 +@@ -765,4 +765,7 @@ Memory allocation (code space): 28 + 25 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: missing ) at offset 509 ++ + /-- End of testinput11 --/ +diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8 +index cb37896..5a4fbb2 100644 +--- a/testdata/testoutput11-8 ++++ b/testdata/testoutput11-8 +@@ -765,4 +765,7 @@ Memory allocation (code space): 10 + 38 End + ------------------------------------------------------------------ + ++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/ ++Failed: missing ) at offset 509 ++ + /-- End of testinput11 --/ +-- +2.5.0 + +From b7537308b7c758f33c347cb0bec62754c43c271f Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat, 27 Feb 2016 17:38:11 +0000 +Subject: [PATCH] Yet another duplicate name bugfix by overestimating the + memory needed (i.e. another hack - PCRE2 has this "properly" fixed). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1636 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index 5019854..4ffea0c 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -7311,7 +7311,12 @@ for (;; ptr++) + so far in order to get the number. If the name is not found, leave + the value of recno as 0 for a forward reference. */ + +- else ++ /* This patch (removing "else") fixes a problem when a reference is ++ to multiple identically named nested groups from within the nest. ++ Once again, it is not the "proper" fix, and it results in an ++ over-allocation of memory. */ ++ ++ /* else */ + { + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 086e0f4..c805f5f 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4239,4 +4239,6 @@ backtracking verbs. --/ + 9010 + abcd + ++/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index d414a72..800a72f 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14665,4 +14665,6 @@ Start of matched string is beyond its end - displaying from end to start. + 0 ^ 0 + No match + ++/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/ ++ + /-- End of testinput2 --/ +-- +2.5.0 + +From 0fc2edb79b3815c6511fd75c36a57893e4acaee6 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat, 27 Feb 2016 17:55:24 +0000 +Subject: [PATCH] Fix pcretest loop for global matching with an ovector size + less than 2. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1637 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcretest.c b/pcretest.c +index 63869fd..78ef517 100644 +--- a/pcretest.c ++++ b/pcretest.c +@@ -5617,6 +5617,12 @@ while (!done) + break; + } + ++ if (use_size_offsets < 2) ++ { ++ fprintf(outfile, "Cannot do global matching with an ovector size < 2\n"); ++ break; ++ } ++ + /* If we have matched an empty string, first check to see if we are at + the end of the subject. If so, the /g loop is over. Otherwise, mimic what + Perl's /g options does. This turns out to be rather cunning. First we set +-- +2.5.0 + +From b3db1b7de5cfaa026ec2bc4a393129461a0f5c57 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat, 27 Feb 2016 18:44:41 +0000 +Subject: [PATCH] Fix non-diagnosis of missing assertion after (?(?C). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1638 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_compile.c b/pcre_compile.c +index 4ffea0c..254c629 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -485,7 +485,7 @@ static const char error_texts[] = + "lookbehind assertion is not fixed length\0" + "malformed number or name after (?(\0" + "conditional group contains more than two branches\0" +- "assertion expected after (?(\0" ++ "assertion expected after (?( or (?(?C)\0" + "(?R or (?[+-]digits must be followed by )\0" + /* 30 */ + "unknown POSIX class name\0" +@@ -6771,6 +6771,15 @@ for (;; ptr++) + for (i = 3;; i++) if (!IS_DIGIT(ptr[i])) break; + if (ptr[i] == CHAR_RIGHT_PARENTHESIS) + tempptr += i + 1; ++ ++ /* tempptr should now be pointing to the opening parenthesis of the ++ assertion condition. */ ++ ++ if (*tempptr != CHAR_LEFT_PARENTHESIS) ++ { ++ *errorcodeptr = ERR28; ++ goto FAILED; ++ } + } + + /* For conditions that are assertions, check the syntax, and then exit +diff --git a/testdata/testinput2 b/testdata/testinput2 +index c805f5f..75e402e 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4241,4 +4241,6 @@ backtracking verbs. --/ + + /((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/ + ++/\N(?(?C)0?!.)*/ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 800a72f..5e88d1a 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -555,13 +555,13 @@ Failed: malformed number or name after (?( at offset 4 + Failed: malformed number or name after (?( at offset 4 + + /(?(?i))/ +-Failed: assertion expected after (?( at offset 3 ++Failed: assertion expected after (?( or (?(?C) at offset 3 + + /(?(abc))/ + Failed: reference to non-existent subpattern at offset 7 + + /(?(?<ab))/ +-Failed: assertion expected after (?( at offset 3 ++Failed: assertion expected after (?( or (?(?C) at offset 3 + + /((?s)blah)\s+\1/I + Capturing subpattern count = 1 +@@ -7870,7 +7870,7 @@ No match + Failed: malformed number or name after (?( at offset 6 + + /(?(''))/ +-Failed: assertion expected after (?( at offset 4 ++Failed: assertion expected after (?( or (?(?C) at offset 4 + + /(?('R')stuff)/ + Failed: reference to non-existent subpattern at offset 7 +@@ -14346,7 +14346,7 @@ No match + "((?2)+)((?1))" + + "(?(?<E>.*!.*)?)" +-Failed: assertion expected after (?( at offset 3 ++Failed: assertion expected after (?( or (?(?C) at offset 3 + + "X((?2)()*+){2}+"BZ + ------------------------------------------------------------------ +@@ -14667,4 +14667,7 @@ No match + + /((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/ + ++/\N(?(?C)0?!.)*/ ++Failed: assertion expected after (?( or (?(?C) at offset 4 ++ + /-- End of testinput2 --/ +-- +2.5.0 + diff --git a/src/patches/squid-3.4-13231.patch b/src/patches/squid-3.4-13231.patch new file mode 100644 index 0000000..045ad70 --- /dev/null +++ b/src/patches/squid-3.4-13231.patch @@ -0,0 +1,48 @@ +------------------------------------------------------------ +revno: 13231 +revision-id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm +parent: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3 +fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323 +author: Francesco Chemolli <kinkie(a)squid-cache.org> +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.4 +timestamp: Sun 2016-02-21 04:08:59 +1300 +message: + Bug 4323: Netfilter broken cross-includes with Linux 4.2 +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3 +# timestamp: 2016-02-20 15:50:56 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# base_revision_id: squid3(a)treenet.co.nz-20160212045316-\ +# zwx4r9we4gf27rx3 +# +# Begin patch +=== modified file 'compat/os/linux.h' +--- compat/os/linux.h 2012-08-28 13:00:30 +0000 ++++ compat/os/linux.h 2016-02-20 15:08:59 +0000 +@@ -22,6 +22,21 @@ + #endif + + /* ++ * Netfilter header madness. (see Bug 4323) ++ * ++ * Netfilter have a history of defining their own versions of network protocol ++ * primitives without sufficient protection against the POSIX defines which are ++ * aways present in Linux. ++ * ++ * netinet/in.h must be included before any other sys header in order to properly ++ * activate include guards in <linux/libc-compat.h> the kernel maintainers added ++ * to workaround it. ++ */ ++#if HAVE_NETINET_IN_H ++#include <netinet/in.h> ++#endif ++ ++/* + * sys/capability.h is only needed in Linux apparently. + * + * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc + diff --git a/src/patches/squid-3.4-13232.patch b/src/patches/squid-3.4-13232.patch new file mode 100644 index 0000000..442c34b --- /dev/null +++ b/src/patches/squid-3.4-13232.patch @@ -0,0 +1,51 @@ +------------------------------------------------------------ +revno: 13232 +revision-id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap +parent: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm +author: Yuriy M. Kaminskiy <yumkam(a)gmail.com> +committer: Amos Jeffries <squid3(a)treenet.co.nz> +branch nick: 3.4 +timestamp: Thu 2016-03-31 03:14:10 +1300 +message: + pinger: Fix buffer overflow in Icmp6::Recv +------------------------------------------------------------ +# Bazaar merge directive format 2 (Bazaar 0.90) +# revision_id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap +# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# testament_sha1: e404755509c03ec58c0c293552a7f2a579810fd3 +# timestamp: 2016-03-30 14:51:02 +0000 +# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 +# base_revision_id: squid3(a)treenet.co.nz-20160220150859-\ +# 3unryicod1rcx9rm +# +# Begin patch +=== modified file 'src/icmp/Icmp6.cc' +--- src/icmp/Icmp6.cc 2014-09-15 05:06:14 +0000 ++++ src/icmp/Icmp6.cc 2016-03-30 14:14:10 +0000 +@@ -277,7 +277,7 @@ + #define ip6_hops // HOPS!!! (can it be true??) + + ip = (struct ip6_hdr *) pkt; +- pkt += sizeof(ip6_hdr); ++ NP: echo size needs to +sizeof(ip6_hdr); + + debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt << + ", ip6_plen=" << ip->ip6_plen << +@@ -288,7 +288,6 @@ + */ + + icmp6header = (struct icmp6_hdr *) pkt; +- pkt += sizeof(icmp6_hdr); + + if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) { + +@@ -313,7 +312,7 @@ + return; + } + +- echo = (icmpEchoData *) pkt; ++ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr)); + + preply.opcode = echo->opcode; + + hooks/post-receive -- IPFire 2.x development tree

1 0

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

01 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 6a30a2d4b758eb49940e40d90dbb96f597beaa03 (commit) via 251cde3dfc36c03d171dd6532787d7b5202445d3 (commit) via 0dbd30710dab8ca9e36d10951983373ca0dac48f (commit) via 8aa205f5fe97a9b94f9d9f478fa62c4fc584b59f (commit) via da0dec75a7d5e327dbf320c9c1c04361745c88af (commit) from b3b5bbb95a48106dd370e5e5003bacb488e4efb7 (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 6a30a2d4b758eb49940e40d90dbb96f597beaa03 Merge: 251cde3 b3b5bbb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 1 19:13:17 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 251cde3dfc36c03d171dd6532787d7b5202445d3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 1 19:12:47 2016 +0100 dmidecode: Move into core system This should not be a package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0dbd30710dab8ca9e36d10951983373ca0dac48f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 1 19:11:30 2016 +0100 dmidecode: Only build on x86 ARM is obviously not supported Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8aa205f5fe97a9b94f9d9f478fa62c4fc584b59f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Wed Mar 30 11:56:37 2016 +0200 bind: Update to 9.10.3-P4 Changelog (excerpt): [security] Duplicate EDNS COOKIE options in a response could trigger an assertion failure. (CVE-2016-2088) [RT #41809] [security] Fix resolver assertion failure due to improper DNAME handling when parsing fetch reply messages. (CVE-2016-1286) [RT #41753] [security] Malformed control messages can trigger assertions in named and rndc. (CVE-2016-1285) [RT #41666] Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit da0dec75a7d5e327dbf320c9c1c04361745c88af Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Feb 7 19:11:48 2016 +0100 bind: Update to 9.10.3-p3 Changelog (excerpt): [bug] Fixed a regression in resolver.c:possibly_mark() which caused known-bogus servers to be queried anyway. [RT #41321] [security] render_ecs errors were mishandled when printing out a OPT record resulting in a assertion failure. (CVE-2015-8705) [RT #41397] [security] Specific APL data could trigger a INSIST. (CVE-2015-8704) [RT #41396] 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/common/i586/dmidecode | 1 + config/rootfiles/{packages => common/x86_64}/dmidecode | 0 lfs/bind | 6 +++--- lfs/dmidecode | 8 +------- 4 files changed, 5 insertions(+), 10 deletions(-) create mode 120000 config/rootfiles/common/i586/dmidecode rename config/rootfiles/{packages => common/x86_64}/dmidecode (100%) Difference in files: diff --git a/config/rootfiles/common/i586/dmidecode b/config/rootfiles/common/i586/dmidecode new file mode 120000 index 0000000..3fac6e3 --- /dev/null +++ b/config/rootfiles/common/i586/dmidecode @@ -0,0 +1 @@ +../x86_64/dmidecode \ No newline at end of file diff --git a/config/rootfiles/common/x86_64/dmidecode b/config/rootfiles/common/x86_64/dmidecode new file mode 100644 index 0000000..8883958 --- /dev/null +++ b/config/rootfiles/common/x86_64/dmidecode @@ -0,0 +1,12 @@ +usr/sbin/biosdecode +usr/sbin/dmidecode +usr/sbin/ownership +usr/sbin/vpddecode +#usr/share/doc/dmidecode +#usr/share/doc/dmidecode/AUTHORS +#usr/share/doc/dmidecode/CHANGELOG +#usr/share/doc/dmidecode/README +#usr/share/man/man8/biosdecode.8 +#usr/share/man/man8/dmidecode.8 +#usr/share/man/man8/ownership.8 +#usr/share/man/man8/vpddecode.8 diff --git a/config/rootfiles/packages/dmidecode b/config/rootfiles/packages/dmidecode deleted file mode 100644 index 8883958..0000000 --- a/config/rootfiles/packages/dmidecode +++ /dev/null @@ -1,12 +0,0 @@ -usr/sbin/biosdecode -usr/sbin/dmidecode -usr/sbin/ownership -usr/sbin/vpddecode -#usr/share/doc/dmidecode -#usr/share/doc/dmidecode/AUTHORS -#usr/share/doc/dmidecode/CHANGELOG -#usr/share/doc/dmidecode/README -#usr/share/man/man8/biosdecode.8 -#usr/share/man/man8/dmidecode.8 -#usr/share/man/man8/ownership.8 -#usr/share/man/man8/vpddecode.8 diff --git a/lfs/bind b/lfs/bind index b0d5185..630b9b4 100644 --- a/lfs/bind +++ b/lfs/bind @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 9.10.3-P2 +VER = 9.10.3-P4 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 672dd3c2796b12ac8440f55bcaecfa82 +$(DL_FILE)_MD5 = 173ce5e83e9ba31f8368367ee1ff7807 install : $(TARGET) diff --git a/lfs/dmidecode b/lfs/dmidecode index c8d5005..a2dcc23 100644 --- a/lfs/dmidecode +++ b/lfs/dmidecode @@ -31,10 +31,7 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = dmidecode -PAK_VER = 1 - -DEPS = "" +SUP_ARCH = i586 x86_64 ############################################################################### # Top-level Rules @@ -53,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist:. - $(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### hooks/post-receive -- IPFire 2.x development tree

1 0

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

01 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 b3b5bbb95a48106dd370e5e5003bacb488e4efb7 (commit) via b580a05b05302ab7931ca8d92e0b64fb9b23ed74 (commit) via c91595a143f9ed878be2dfc326be9a968b38eecc (commit) via b64110cfd55f841ea11b1f43d019b84e9a6121fd (commit) via f9855d6d55f33be3bdefec3e756667fbdb538b31 (commit) from 4ffb9f95ad615e741954464e764ff4a70c38bf9b (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 b3b5bbb95a48106dd370e5e5003bacb488e4efb7 Merge: 4ffb9f9 b580a05 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 13:29:40 2016 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: lfs/e1000e | 6 ++-- lfs/igb | 5 ++-- lfs/linux | 2 +- .../igb-5.3.4.4_fix_hung_at_dev_get_stats.patch | 35 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch Difference in files: diff --git a/lfs/e1000e b/lfs/e1000e index 5f284ce..37b0c41 100644 --- a/lfs/e1000e +++ b/lfs/e1000e @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-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 # @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e -VER = 3.2.7.1 +VER = 3.3.3 THISAPP = e1000e-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8f62c220d763fa92473365e40d55bd86 +$(DL_FILE)_MD5 = 01274408a0f987457600dc7993c9d59a install : $(TARGET) diff --git a/lfs/igb b/lfs/igb index 85d228c..d00a1e1 100644 --- a/lfs/igb +++ b/lfs/igb @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/ -VER = 5.3.3.2 +VER = 5.3.4.4 THISAPP = igb-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2d753a0bd03c949ec08d68c27540044d +$(DL_FILE)_MD5 = 6c0d7dfdb161128da7c039fc83bbdba0 install : $(TARGET) @@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mv $(MODPATH)/igb.ko \ $(MODPATH)/igb.ko.org @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX) cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH) @rm -rf $(DIR_APP) diff --git a/lfs/linux b/lfs/linux index f7782ff..be2e105 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 66 +PAK_VER = 67 DEPS = "" KERNEL_ARCH = $(MACHINE) diff --git a/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch new file mode 100644 index 0000000..a92c441 --- /dev/null +++ b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch @@ -0,0 +1,35 @@ +Don't read phy_idle_errors at dev_get_stats() because this can +hung the userspace. + +https://sourceforge.net/p/e1000/bugs/500/ +Why this is set to wont-fix? + +I think it is better when phy errors are not reportet in the stats +than a random hanging of the whole sytem. + +diff -Naur igb-5.3.4.4.org/src/igb_main.c igb-5.3.4.4/src/igb_main.c +--- igb-5.3.4.4.org/src/igb_main.c 2016-02-26 01:48:39.000000000 +0100 ++++ igb-5.3.4.4/src/igb_main.c 2016-03-31 09:22:10.671794282 +0200 +@@ -6032,14 +6032,14 @@ + + /* Tx Dropped needs to be maintained elsewhere */ + +- /* Phy Stats */ +- if (hw->phy.media_type == e1000_media_type_copper) { +- if ((adapter->link_speed == SPEED_1000) && +- (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) { +- phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK; +- adapter->phy_stats.idle_errors += phy_tmp; +- } +- } ++// /* Phy Stats */ ++// if (hw->phy.media_type == e1000_media_type_copper) { ++// if ((adapter->link_speed == SPEED_1000) && ++// (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) { ++// phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK; ++// adapter->phy_stats.idle_errors += phy_tmp; ++// } ++// } + + /* Management Stats */ + adapter->stats.mgptc += E1000_READ_REG(hw, E1000_MGTPTC); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b580a05b05302ab7931ca8d92e0b64fb9b23ed74
by git＠ipfire.org 01 Apr '16

01 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, master has been updated via b580a05b05302ab7931ca8d92e0b64fb9b23ed74 (commit) via c91595a143f9ed878be2dfc326be9a968b38eecc (commit) via b64110cfd55f841ea11b1f43d019b84e9a6121fd (commit) via f9855d6d55f33be3bdefec3e756667fbdb538b31 (commit) from ae04f2400a66b8a5f7fdeb4fb940898c1572220f (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 b580a05b05302ab7931ca8d92e0b64fb9b23ed74 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:30:34 2016 +0200 kernel: set pakver to 67 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit c91595a143f9ed878be2dfc326be9a968b38eecc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:25:08 2016 +0200 e1000e: update to 3.3.3 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b64110cfd55f841ea11b1f43d019b84e9a6121fd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:15:27 2016 +0200 igb: fix hung at dev_get_stats() without this igb can bring the whole userspace to hung with "cpu_stuck for more than 22s". I don't understand why this bug is set to "wont-fix" at the bugtracker. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f9855d6d55f33be3bdefec3e756667fbdb538b31 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:13:59 2016 +0200 igb: update to 5.3.4.4 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/e1000e | 6 ++-- lfs/igb | 5 ++-- lfs/linux | 2 +- .../igb-5.3.4.4_fix_hung_at_dev_get_stats.patch | 35 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch Difference in files: diff --git a/lfs/e1000e b/lfs/e1000e index 5f284ce..37b0c41 100644 --- a/lfs/e1000e +++ b/lfs/e1000e @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-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 # @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e -VER = 3.2.7.1 +VER = 3.3.3 THISAPP = e1000e-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8f62c220d763fa92473365e40d55bd86 +$(DL_FILE)_MD5 = 01274408a0f987457600dc7993c9d59a install : $(TARGET) diff --git a/lfs/igb b/lfs/igb index 85d228c..d00a1e1 100644 --- a/lfs/igb +++ b/lfs/igb @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/ -VER = 5.3.3.2 +VER = 5.3.4.4 THISAPP = igb-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2d753a0bd03c949ec08d68c27540044d +$(DL_FILE)_MD5 = 6c0d7dfdb161128da7c039fc83bbdba0 install : $(TARGET) @@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mv $(MODPATH)/igb.ko \ $(MODPATH)/igb.ko.org @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX) cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH) @rm -rf $(DIR_APP) diff --git a/lfs/linux b/lfs/linux index f7782ff..be2e105 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 66 +PAK_VER = 67 DEPS = "" KERNEL_ARCH = $(MACHINE) diff --git a/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch new file mode 100644 index 0000000..a92c441 --- /dev/null +++ b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch @@ -0,0 +1,35 @@ +Don't read phy_idle_errors at dev_get_stats() because this can +hung the userspace. + +https://sourceforge.net/p/e1000/bugs/500/ +Why this is set to wont-fix? + +I think it is better when phy errors are not reportet in the stats +than a random hanging of the whole sytem. + +diff -Naur igb-5.3.4.4.org/src/igb_main.c igb-5.3.4.4/src/igb_main.c +--- igb-5.3.4.4.org/src/igb_main.c 2016-02-26 01:48:39.000000000 +0100 ++++ igb-5.3.4.4/src/igb_main.c 2016-03-31 09:22:10.671794282 +0200 +@@ -6032,14 +6032,14 @@ + + /* Tx Dropped needs to be maintained elsewhere */ + +- /* Phy Stats */ +- if (hw->phy.media_type == e1000_media_type_copper) { +- if ((adapter->link_speed == SPEED_1000) && +- (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) { +- phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK; +- adapter->phy_stats.idle_errors += phy_tmp; +- } +- } ++// /* Phy Stats */ ++// if (hw->phy.media_type == e1000_media_type_copper) { ++// if ((adapter->link_speed == SPEED_1000) && ++// (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) { ++// phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK; ++// adapter->phy_stats.idle_errors += phy_tmp; ++// } ++// } + + /* Management Stats */ + adapter->stats.mgptc += E1000_READ_REG(hw, E1000_MGTPTC); hooks/post-receive -- IPFire 2.x development tree

1 0

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

01 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 b580a05b05302ab7931ca8d92e0b64fb9b23ed74 (commit) via c91595a143f9ed878be2dfc326be9a968b38eecc (commit) via b64110cfd55f841ea11b1f43d019b84e9a6121fd (commit) via f9855d6d55f33be3bdefec3e756667fbdb538b31 (commit) from ae04f2400a66b8a5f7fdeb4fb940898c1572220f (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 b580a05b05302ab7931ca8d92e0b64fb9b23ed74 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:30:34 2016 +0200 kernel: set pakver to 67 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit c91595a143f9ed878be2dfc326be9a968b38eecc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:25:08 2016 +0200 e1000e: update to 3.3.3 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit b64110cfd55f841ea11b1f43d019b84e9a6121fd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:15:27 2016 +0200 igb: fix hung at dev_get_stats() without this igb can bring the whole userspace to hung with "cpu_stuck for more than 22s". I don't understand why this bug is set to "wont-fix" at the bugtracker. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f9855d6d55f33be3bdefec3e756667fbdb538b31 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 1 08:13:59 2016 +0200 igb: update to 5.3.4.4 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/e1000e | 6 ++-- lfs/igb | 5 ++-- lfs/linux | 2 +- .../igb-5.3.4.4_fix_hung_at_dev_get_stats.patch | 35 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch Difference in files: diff --git a/lfs/e1000e b/lfs/e1000e index 5f284ce..37b0c41 100644 --- a/lfs/e1000e +++ b/lfs/e1000e @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-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 # @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e -VER = 3.2.7.1 +VER = 3.3.3 THISAPP = e1000e-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8f62c220d763fa92473365e40d55bd86 +$(DL_FILE)_MD5 = 01274408a0f987457600dc7993c9d59a install : $(TARGET) diff --git a/lfs/igb b/lfs/igb index 85d228c..d00a1e1 100644 --- a/lfs/igb +++ b/lfs/igb @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/ -VER = 5.3.3.2 +VER = 5.3.4.4 THISAPP = igb-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2d753a0bd03c949ec08d68c27540044d +$(DL_FILE)_MD5 = 6c0d7dfdb161128da7c039fc83bbdba0 install : $(TARGET) @@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mv $(MODPATH)/igb.ko \ $(MODPATH)/igb.ko.org @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX) cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH) @rm -rf $(DIR_APP) diff --git a/lfs/linux b/lfs/linux index f7782ff..be2e105 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 66 +PAK_VER = 67 DEPS = "" KERNEL_ARCH = $(MACHINE) diff --git a/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch new file mode 100644 index 0000000..a92c441 --- /dev/null +++ b/src/patches/igb-5.3.4.4_fix_hung_at_dev_get_stats.patch @@ -0,0 +1,35 @@ +Don't read phy_idle_errors at dev_get_stats() because this can +hung the userspace. + +https://sourceforge.net/p/e1000/bugs/500/ +Why this is set to wont-fix? + +I think it is better when phy errors are not reportet in the stats +than a random hanging of the whole sytem. + +diff -Naur igb-5.3.4.4.org/src/igb_main.c igb-5.3.4.4/src/igb_main.c +--- igb-5.3.4.4.org/src/igb_main.c 2016-02-26 01:48:39.000000000 +0100 ++++ igb-5.3.4.4/src/igb_main.c 2016-03-31 09:22:10.671794282 +0200 +@@ -6032,14 +6032,14 @@ + + /* Tx Dropped needs to be maintained elsewhere */ + +- /* Phy Stats */ +- if (hw->phy.media_type == e1000_media_type_copper) { +- if ((adapter->link_speed == SPEED_1000) && +- (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) { +- phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK; +- adapter->phy_stats.idle_errors += phy_tmp; +- } +- } ++// /* Phy Stats */ ++// if (hw->phy.media_type == e1000_media_type_copper) { ++// if ((adapter->link_speed == SPEED_1000) && ++// (!e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_tmp))) { ++// phy_tmp &= PHY_IDLE_ERROR_COUNT_MASK; ++// adapter->phy_stats.idle_errors += phy_tmp; ++// } ++// } + + /* Management Stats */ + adapter->stats.mgptc += E1000_READ_REG(hw, E1000_MGTPTC); 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 April 2016