IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7876 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5a9c93964bb4411fcadff78fbd6c82a043744285
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 5a9c93964bb4411fcadff78fbd6c82a043744285 (commit) from c07053012f7007a627a92141db162675370c909e (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 5a9c93964bb4411fcadff78fbd6c82a043744285 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Fri Apr 1 21:49:02 2016 +0200 New package iperf3 Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/iperf3 | 9 ++++++ lfs/{libshout => iperf3} | 16 +++++----- make.sh | 1 + src/patches/iperf3/0001-remove-pg-flag.patch | 46 ++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 8 deletions(-) create mode 100644 config/rootfiles/packages/iperf3 copy lfs/{libshout => iperf3} (91%) create mode 100644 src/patches/iperf3/0001-remove-pg-flag.patch Difference in files: diff --git a/config/rootfiles/packages/iperf3 b/config/rootfiles/packages/iperf3 new file mode 100644 index 0000000..7057f11 --- /dev/null +++ b/config/rootfiles/packages/iperf3 @@ -0,0 +1,9 @@ +usr/bin/iperf3 +#usr/include/iperf_api.h +#usr/lib/libiperf.a +#usr/lib/libiperf.la +#usr/lib/libiperf.so +usr/lib/libiperf.so.0 +usr/lib/libiperf.so.0.0.0 +#usr/share/man/man1/iperf3.1 +#usr/share/man/man3/libiperf.3 diff --git a/lfs/iperf3 b/lfs/iperf3 new file mode 100644 index 0000000..9eb1e8a --- /dev/null +++ b/lfs/iperf3 @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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 = 3.1.2 + +THISAPP = iperf-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = iperf3 +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = f48a1b45c68647a9d8a8491af44470d6 + +install : $(TARGET) +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist:. + $(PAK) + +############################################################################### +# 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) && patch -Np1 -i $(DIR_SRC)/src/patches/iperf3/0001-remove-pg-flag.patch + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 2f50eff..fc7843e 100755 --- a/make.sh +++ b/make.sh @@ -750,6 +750,7 @@ buildipfire() { ipfiremake gutenprint ipfiremake apcupsd ipfiremake iperf + ipfiremake iperf3 ipfiremake netcat ipfiremake 7zip ipfiremake lynis diff --git a/src/patches/iperf3/0001-remove-pg-flag.patch b/src/patches/iperf3/0001-remove-pg-flag.patch new file mode 100644 index 0000000..601712d --- /dev/null +++ b/src/patches/iperf3/0001-remove-pg-flag.patch @@ -0,0 +1,46 @@ +From be7dafdb802f39c3ad8bcc896216508842c42751 Mon Sep 17 00:00:00 2001 +From: Jonatan Schlag <jonatan.schlag(a)ipfire.org> +Date: Thu, 31 Mar 2016 19:33:17 +0200 +Subject: [PATCH] remove -pg flag + +Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> +--- + src/Makefile.am | 4 ++-- + src/Makefile.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 23b0c72..6268145 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g + iperf3_profile_SOURCES = main.c \ + $(libiperf_la_SOURCES) + +-iperf3_profile_CFLAGS = -pg -g ++iperf3_profile_CFLAGS = -g + iperf3_profile_LDADD = libiperf.la +-iperf3_profile_LDFLAGS = -pg -g ++iperf3_profile_LDFLAGS = -g + + # Specify the sources and various flags for the test cases + t_timer_SOURCES = t_timer.c +diff --git a/src/Makefile.in b/src/Makefile.in +index f7c46ad..016a022 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -610,9 +610,9 @@ iperf3_LDFLAGS = -g + iperf3_profile_SOURCES = main.c \ + $(libiperf_la_SOURCES) + +-iperf3_profile_CFLAGS = -pg -g ++iperf3_profile_CFLAGS = -g + iperf3_profile_LDADD = libiperf.la +-iperf3_profile_LDFLAGS = -pg -g ++iperf3_profile_LDFLAGS = -g + + # Specify the sources and various flags for the test cases + t_timer_SOURCES = t_timer.c +-- +2.1.4 + hooks/post-receive -- IPFire 2.x development tree

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

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

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 301beda7fb5836cfd0248c0b6a599045aa07ef16
by git＠ipfire.org 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 301beda7fb5836cfd0248c0b6a599045aa07ef16 (commit) from b79c4468c031daad78bb8deeacda65d5948d582f (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 301beda7fb5836cfd0248c0b6a599045aa07ef16 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 31 22:03:47 2016 +0100 glibc: Ship libmvec_nonshared.a in glibc-devel This library is required to link against libm. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: glibc/glibc.nm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index c0af694..0653382 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -5,7 +5,7 @@ name = glibc version = 2.23 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -174,6 +174,7 @@ build keep_libraries %{libdir}/libc_nonshared.a + %{libdir}/libmvec_nonshared.a %{libdir}/libpthread_nonshared.a end end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b79c4468c031daad78bb8deeacda65d5948d582f
by git＠ipfire.org 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via b79c4468c031daad78bb8deeacda65d5948d582f (commit) via 9503e363f5790674ccdaee19751014468f7edee3 (commit) via 3c22c38cfa3bc7991a7bbbfca1903e11aa99d183 (commit) via a95629e4ff0d68637f82cee777de9910d5c584ea (commit) via ee62c3f9f4642d6cb2f62a60608639da733a7efd (commit) via 2576d87312b5a5c35692cd20eff9ae4b31f78277 (commit) from 5039121de711662c9d7668eca4d3cc0fc02e1d0c (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 b79c4468c031daad78bb8deeacda65d5948d582f Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 30 08:14:15 2016 +0200 libcap: Update to 2.25 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9503e363f5790674ccdaee19751014468f7edee3 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 30 08:13:32 2016 +0200 libassuan: Update to 2.4.2 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3c22c38cfa3bc7991a7bbbfca1903e11aa99d183 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 30 08:12:48 2016 +0200 libapr: Update to 1.5.2 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a95629e4ff0d68637f82cee777de9910d5c584ea Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed Mar 30 07:14:05 2016 +0200 kmod: Update to 22 Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ee62c3f9f4642d6cb2f62a60608639da733a7efd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 31 13:59:10 2016 +0100 glibc: Update to version 2.23 Requires Linux kernel 3.2 now. Security related changes: * An out-of-bounds value in a broken-out struct tm argument to strftime no longer causes a crash. Reported by Adam Nielsen. (CVE-2015-8776) * The LD_POINTER_GUARD environment variable can no longer be used to disable the pointer guard feature. It is always enabled. Previously, LD_POINTER_GUARD could be used to disable security hardening in binaries running in privileged AT_SECURE mode. Reported by Hector Marco-Gisbert. (CVE-2015-8777) * An integer overflow in hcreate and hcreate_r could lead to an out-of-bounds memory access. Reported by Szabolcs Nagy. (CVE-2015-8778) * The catopen function no longer has unbounded stack usage. Reported by Max. (CVE-2015-8779) * The nan, nanf and nanl functions no longer have unbounded stack usage depending on the length of the string passed as an argument to the functions. Reported by Joseph Myers. (CVE-2014-9761) * A stack-based buffer overflow was found in libresolv when invoked from libnss_dns, allowing specially crafted DNS responses to seize control of execution flow in the DNS client. The buffer overflow occurs in the functions send_dg (send datagram) and send_vc (send TCP) for the NSS module libnss_dns.so.2 when calling getaddrinfo with AF_UNSPEC family. The use of AF_UNSPEC triggers the low-level resolver code to send out two parallel queries for A and AAAA. A mismanagement of the buffers used for those queries could result in the response of a query writing beyond the alloca allocated buffer created by _nss_dns_gethostbyname4_r. Buffer management is simplified to remove the overflow. Thanks to the Google Security Team and Red Hat for reporting the security impact of this issue, and Robert Holiday of Ciena for reporting the related bug 18665. (CVE-2015-7547) Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2576d87312b5a5c35692cd20eff9ae4b31f78277 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 29 17:02:43 2016 +0100 glibc: Update to version 2.22 Security fix: A buffer overflow in gethostbyname_r and related functions performing DNS requests has been fixed. If the NSS functions were called with a misaligned buffer, the buffer length change due to pointer alignment was not taken into account. This could result in application crashes or, potentially arbitrary code execution, using crafted, but syntactically valid DNS responses. (CVE-2015-1781) Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: glibc/glibc.nm | 15 +- .../glibc-2.10.1-localedef_trampoline-1.patch | 64 -------- .../patches/glibc-fedora-localedata-rh61908.patch | 38 ----- .../patches/glibc-fedora-manual-dircategory.patch | 20 --- glibc/patches/glibc-fedora-ppc-unwind.patch | 20 --- glibc/patches/glibc-fedora-pt_chown.patch | 57 ------- glibc/patches/glibc-fedora-streams-rh436349.patch | 28 ---- glibc/patches/glibc-fedora-uname-getrlimit.patch | 50 ------ glibc/patches/glibc-rh1009145.patch | 19 --- glibc/patches/glibc-rh1013801.patch | 90 ----------- glibc/patches/glibc-rh1124987.patch | 32 ---- glibc/patches/glibc-rh697421.patch | 10 -- glibc/patches/glibc-rh741105.patch | 20 --- glibc/patches/glibc-rh757881.patch | 167 --------------------- glibc/patches/glibc-rh825061.patch | 13 -- glibc/patches/glibc-rh827510.patch | 27 ---- glibc/patches/glibc-rh841787.patch | 33 ---- kmod/kmod.nm | 2 +- libapr/libapr.nm | 2 +- libassuan/libassuan.nm | 2 +- libcap/libcap.nm | 6 +- 21 files changed, 16 insertions(+), 699 deletions(-) delete mode 100644 glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch delete mode 100644 glibc/patches/glibc-fedora-localedata-rh61908.patch delete mode 100644 glibc/patches/glibc-fedora-manual-dircategory.patch delete mode 100644 glibc/patches/glibc-fedora-ppc-unwind.patch delete mode 100644 glibc/patches/glibc-fedora-pt_chown.patch delete mode 100644 glibc/patches/glibc-fedora-streams-rh436349.patch delete mode 100644 glibc/patches/glibc-fedora-uname-getrlimit.patch delete mode 100644 glibc/patches/glibc-rh1009145.patch delete mode 100644 glibc/patches/glibc-rh1013801.patch delete mode 100644 glibc/patches/glibc-rh1124987.patch delete mode 100644 glibc/patches/glibc-rh697421.patch delete mode 100644 glibc/patches/glibc-rh741105.patch delete mode 100644 glibc/patches/glibc-rh757881.patch delete mode 100644 glibc/patches/glibc-rh825061.patch delete mode 100644 glibc/patches/glibc-rh827510.patch delete mode 100644 glibc/patches/glibc-rh841787.patch Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index d406aa3..c0af694 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,7 +4,7 @@ ############################################################################### name = glibc -version = 2.21 +version = 2.23 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -28,16 +28,18 @@ sources = %{thisapp}.tar.xz build # Optimize glibc for kernel - OPTIMIZED_KERNEL = 2.6.32 + OPTIMIZED_KERNEL = 3.2 requires audit-devel autoconf automake + gcc >= 4.7 gettext kernel-headers >= %{OPTIMIZED_KERNEL} libcap-devel libselinux-devel + libstdc++-static texinfo end @@ -67,12 +69,11 @@ build # program interpreter to /bin/bash in case another /bin/sh is installed. sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in - # We don't install pt_chown(1) on the final system, so why install it to - # $(TOOLS_DIR): + # We don't install pt_chown(1) on the final system sed -e "/^install.*pt_chown/d" -i login/Makefile # Build nscd with -fstack-protector-all, instead of -fstack-protector: - sed -e "s/fstack-protector/&-all/" -i nscd/Makefile + sed -e "s/fstack-protector/&-strong/" -i nscd/Makefile # Use gnu hash style sed -i Makeconfig \ @@ -186,6 +187,10 @@ packages provides += ld-linux.so.3(GLIBC_2.4) provides += ld-linux.so.3(GLIBC_PRIVATE) end + + conflicts + kernel < %{OPTIMIZED_KERNEL} + end end package glibc-common diff --git a/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch b/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch deleted file mode 100644 index 4d26016..0000000 --- a/glibc/patches/glibc-2.10.1-localedef_trampoline-1.patch +++ /dev/null @@ -1,64 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2007-05-05 -Initial Package Version: 2.5 -Upstream Status: Rejected - http://sources.redhat.com/bugzilla/show_bug.cgi?id=3333 -Origin: Fedora's glibc-fedora.patch (via glibc-2.5.90-21) -Description: Avoid segmentation faults, or kills, on PaX and Exe-Shield kernels, - and some non-x86 architectures. - -* Sun Jun 01 2003 Jakub Jelinek <jakub(a)redhat.com> 2.3.2-46 - - avoid using trampolines in localedef - -This patch is also known as: -local-localedef-fix-trampoline.diff (Debian) -1040_all_2.3.3-localedef-fix-trampoline.patch (Gentoo) - -Also see: -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=231438 - -diff -Naur glibc-2.5.orig/locale/programs/3level.h glibc-2.5/locale/programs/3level.h ---- glibc-2.5.orig/locale/programs/3level.h 2005-12-07 05:47:27.000000000 +0000 -+++ glibc-2.5/locale/programs/3level.h 2006-10-11 08:05:00.000000000 +0000 -@@ -202,6 +202,42 @@ - } - } - } -+ -+/* GCC ATM seems to do a poor job with pointers to nested functions passed -+ to inlined functions. Help it a little bit with this hack. */ -+#define wchead_table_iterate(tp, fn) \ -+do \ -+ { \ -+ struct wchead_table *t = (tp); \ -+ uint32_t index1; \ -+ for (index1 = 0; index1 < t->level1_size; index1++) \ -+ { \ -+ uint32_t lookup1 = t->level1[index1]; \ -+ if (lookup1 != ((uint32_t) ~0)) \ -+ { \ -+ uint32_t lookup1_shifted = lookup1 << t->q; \ -+ uint32_t index2; \ -+ for (index2 = 0; index2 < (1 << t->q); index2++) \ -+ { \ -+ uint32_t lookup2 = t->level2[index2 + lookup1_shifted]; \ -+ if (lookup2 != ((uint32_t) ~0)) \ -+ { \ -+ uint32_t lookup2_shifted = lookup2 << t->p; \ -+ uint32_t index3; \ -+ for (index3 = 0; index3 < (1 << t->p); index3++) \ -+ { \ -+ struct element_t *lookup3 \ -+ = t->level3[index3 + lookup2_shifted]; \ -+ if (lookup3 != NULL) \ -+ fn ((((index1 << t->q) + index2) << t->p) + index3, \ -+ lookup3); \ -+ } \ -+ } \ -+ } \ -+ } \ -+ } \ -+ } while (0) -+ - #endif - - #ifndef NO_FINALIZE diff --git a/glibc/patches/glibc-fedora-localedata-rh61908.patch b/glibc/patches/glibc-fedora-localedata-rh61908.patch deleted file mode 100644 index c8fee0f..0000000 --- a/glibc/patches/glibc-fedora-localedata-rh61908.patch +++ /dev/null @@ -1,38 +0,0 @@ -* Tue Mar 26 2002 Jakub Jelinek <jakub(a)redhat.com> 2.2.5-28 -- add a couple of .ISO-8859-15 locales (#61908) - -diff -Nrup a/localedata/SUPPORTED b/localedata/SUPPORTED ---- a/localedata/SUPPORTED 2012-11-25 12:59:31.000000000 -0700 -+++ b/localedata/SUPPORTED 2012-11-26 12:58:43.298223018 -0700 -@@ -89,6 +89,7 @@ cy_GB.UTF-8/UTF-8 \ - cy_GB/ISO-8859-14 \ - da_DK.UTF-8/UTF-8 \ - da_DK/ISO-8859-1 \ -+da_DK.ISO-8859-15/ISO-8859-15 \ - de_AT.UTF-8/UTF-8 \ - de_AT/ISO-8859-1 \ - de_AT@euro/ISO-8859-15 \ -@@ -121,6 +122,7 @@ en_DK.UTF-8/UTF-8 \ - en_DK/ISO-8859-1 \ - en_GB.UTF-8/UTF-8 \ - en_GB/ISO-8859-1 \ -+en_GB.ISO-8859-15/ISO-8859-15 \ - en_HK.UTF-8/UTF-8 \ - en_HK/ISO-8859-1 \ - en_IE.UTF-8/UTF-8 \ -@@ -136,6 +138,7 @@ en_SG.UTF-8/UTF-8 \ - en_SG/ISO-8859-1 \ - en_US.UTF-8/UTF-8 \ - en_US/ISO-8859-1 \ -+en_US.ISO-8859-15/ISO-8859-15 \ - en_ZA.UTF-8/UTF-8 \ - en_ZA/ISO-8859-1 \ - en_ZM/UTF-8 \ -@@ -385,6 +388,7 @@ sv_FI/ISO-8859-1 \ - sv_FI@euro/ISO-8859-15 \ - sv_SE.UTF-8/UTF-8 \ - sv_SE/ISO-8859-1 \ -+sv_SE.ISO-8859-15/ISO-8859-15 \ - sw_KE/UTF-8 \ - sw_TZ/UTF-8 \ - szl_PL/UTF-8 \ diff --git a/glibc/patches/glibc-fedora-manual-dircategory.patch b/glibc/patches/glibc-fedora-manual-dircategory.patch deleted file mode 100644 index f681620..0000000 --- a/glibc/patches/glibc-fedora-manual-dircategory.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 4820b9175535e13df79ce816106016040014916e Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek <jakub(a)redhat.com> -Date: Fri, 3 Nov 2006 16:31:21 +0000 -Subject: [PATCH] Change @dircategory. - ---- - manual/libc.texinfo | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/manual/libc.texinfo -+++ b/manual/libc.texinfo -@@ -7,7 +7,7 @@ - @include macros.texi - - @comment Tell install-info what to do. --@dircategory Software libraries -+@dircategory Libraries - @direntry - * Libc: (libc). C library. - @end direntry diff --git a/glibc/patches/glibc-fedora-ppc-unwind.patch b/glibc/patches/glibc-fedora-ppc-unwind.patch deleted file mode 100644 index 0a808ec..0000000 --- a/glibc/patches/glibc-fedora-ppc-unwind.patch +++ /dev/null @@ -1,20 +0,0 @@ -glibc-2.3.3-1478-g37582bc - -* Thu Nov 30 2006 Jakub Jelinek <jakub(a)redhat.com> 2.5.90-9 -- on ppc64 build __libc_start_main without unwind info, - as it breaks MD_FROB_UPDATE_CONTEXT (#217729, #217775; in the - future that could be fixable just by providing .cfi_undefined r2 - in __libc_start_main instead) - -diff -Nrup a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile ---- a/sysdeps/powerpc/powerpc64/Makefile 2012-06-05 07:42:49.000000000 -0600 -+++ b/sysdeps/powerpc/powerpc64/Makefile 2012-06-07 12:15:21.828318633 -0600 -@@ -35,6 +35,8 @@ CFLAGS-rtld-memmove.os = $(no-special-re - CFLAGS-rtld-memchr.os = $(no-special-regs) - CFLAGS-rtld-strnlen.os = $(no-special-regs) - -+CFLAGS-libc-start.c += -fno-asynchronous-unwind-tables -+ - ifeq ($(subdir),elf) - # help gcc inline asm code from dl-machine.h - +cflags += -finline-limit=2000 diff --git a/glibc/patches/glibc-fedora-pt_chown.patch b/glibc/patches/glibc-fedora-pt_chown.patch deleted file mode 100644 index f64f449..0000000 --- a/glibc/patches/glibc-fedora-pt_chown.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ee3d4021aaaeacff7cf2addcdaa48859fffba2aa Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab(a)redhat.com> -Date: Thu, 3 Feb 2011 15:45:02 +0100 -Subject: [PATCH] Replace setuid by file capabilities - -* login/programs/pt_chown.c (main): Check for valid file -descriptor instead of privileges. Be careful to drop all -capabilities when not needed. - ---- - ChangeLog | 6 ++++++ - login/programs/pt_chown.c | 14 +++++++++----- - 3 files changed, 16 insertions(+), 6 deletions(-) - ---- a/login/programs/pt_chown.c -+++ b/login/programs/pt_chown.c -@@ -28,6 +28,7 @@ - #include <string.h> - #include <sys/stat.h> - #include <unistd.h> -+#include <fcntl.h> - #ifdef HAVE_LIBCAP - # include <sys/capability.h> - # include <sys/prctl.h> -@@ -142,7 +143,7 @@ main (int argc, char *argv[]) - uid_t uid = getuid (); - int remaining; - -- if (argc == 1 && euid == 0) -+ if (argc == 1 && fcntl (PTY_FILENO, F_GETFD) == 0) - { - #ifdef HAVE_LIBCAP - /* Drop privileges. */ -@@ -175,6 +176,13 @@ main (int argc, char *argv[]) - - /* We aren't going to be using privileges, so drop them right now. */ - setuid (uid); -+#ifdef HAVE_LIBCAP -+ cap_t caps = cap_init (); -+ if (caps == NULL) -+ error (1, errno, "cap_init"); -+ cap_set_proc (caps); -+ cap_free (caps); -+#endif - - /* Set locale via LC_ALL. */ - setlocale (LC_ALL, ""); -@@ -194,9 +202,5 @@ main (int argc, char *argv[]) - return EXIT_FAILURE; - } - -- /* Check if we are properly installed. */ -- if (euid != 0) -- error (FAIL_EXEC, 0, gettext ("needs to be installed setuid `root'")); -- - return EXIT_SUCCESS; - } diff --git a/glibc/patches/glibc-fedora-streams-rh436349.patch b/glibc/patches/glibc-fedora-streams-rh436349.patch deleted file mode 100644 index 9334f19..0000000 --- a/glibc/patches/glibc-fedora-streams-rh436349.patch +++ /dev/null @@ -1,28 +0,0 @@ -This is part of commit glibc-2.3.3-1564-gd0b6ac6 - -* Fri Mar 14 2008 Jakub Jelinek <jakub(a)redhat.com> 2.7.90-11 -- remove <stropts.h>, define _XOPEN_STREAMS -1 (#436349) - -diff -Nrup a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ---- a/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-06-05 07:42:49.000000000 -0600 -+++ b/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-06-07 12:15:21.817318674 -0600 -@@ -188,4 +188,7 @@ - /* Typed memory objects are not available. */ - #define _POSIX_TYPED_MEMORY_OBJECTS -1 - -+/* Streams are not available. */ -+#define _XOPEN_STREAMS -1 -+ - #endif /* bits/posix_opt.h */ -diff -Nrup a/streams/Makefile b/streams/Makefile ---- a/streams/Makefile 2012-06-05 07:42:49.000000000 -0600 -+++ b/streams/Makefile 2012-06-07 12:15:21.824318649 -0600 -@@ -20,7 +20,7 @@ - - include ../Makeconfig - --headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h -+#headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h - routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach - - include ../Rules diff --git a/glibc/patches/glibc-fedora-uname-getrlimit.patch b/glibc/patches/glibc-fedora-uname-getrlimit.patch deleted file mode 100644 index dedb836..0000000 --- a/glibc/patches/glibc-fedora-uname-getrlimit.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cde99cd2b7b16a6113acb054e89d490047932a9f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab(a)redhat.com> -Date: Thu, 8 Apr 2010 11:18:26 +0200 -Subject: [PATCH] Don't call uname or getrlimit in libpthread init function - -* sysdeps/unix/sysv/linux/i386/Versions: Export __uname under -GLIBC_PRIVATE. -* nptl/Versions: Export __getrlimit under GLIBC_PRIVATE. -* sysdeps/unix/sysv/linux/i386/smp.h: Call __uname instead of uname. -* nptl/nptl-init.c: Call __getrlimit instead of getrlimit. - ---- - ChangeLog | 8 ++++++++ - nptl/Versions | 1 + - nptl/nptl-init.c | 2 +- - sysdeps/unix/sysv/linux/i386/Versions | 6 ++++++ - sysdeps/unix/sysv/linux/i386/smp.h | 2 +- - 5 files changed, 17 insertions(+), 2 deletions(-) - create mode 100644 sysdeps/unix/sysv/linux/i386/Versions - ---- a/nptl/Version -+++ b/nptl/Versions -@@ -30,6 +30,7 @@ libc { - __libc_pthread_init; - __libc_current_sigrtmin_private; __libc_current_sigrtmax_private; - __libc_allocate_rtsig_private; -+ __getrlimit; - } - } - ---- a/sysdeps/unix/sysv/linux/i386/Versions -+++ b/sysdeps/unix/sysv/linux/i386/Versions -@@ -53,5 +53,6 @@ - } - GLIBC_PRIVATE { - __modify_ldt; -+ __uname; - } - } ---- a/sysdeps/unix/sysv/linux/i386/smp.h -+++ b/sysdeps/unix/sysv/linux/i386/smp.h -@@ -36,7 +36,7 @@ is_smp_system (void) - char *cp; - - /* Try reading the number using `sysctl' first. */ -- if (uname (&u.uts) == 0) -+ if (__uname (&u.uts) == 0) - cp = u.uts.version; - else - { diff --git a/glibc/patches/glibc-rh1009145.patch b/glibc/patches/glibc-rh1009145.patch deleted file mode 100644 index c1af7fa..0000000 --- a/glibc/patches/glibc-rh1009145.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- glibc-2.18-151-g303e567.orig/elf/ldconfig.c 2013-09-25 14:01:01.522446341 -0400 -+++ glibc-2.18-151-g303e567/elf/ldconfig.c 2013-09-25 14:06:31.094218857 -0400 -@@ -959,6 +959,16 @@ - || dlib_ptr->flag == FLAG_ELF_LIBC6) - && flag == FLAG_ELF) - dlib_ptr->flag = flag; -+#ifdef __arm__ -+ /* In Fedora 20 binutils regressed temporarily and failed to -+ mark hard ABI objects with the correct flag. Therefore we -+ must accept unmarked objects that were previously marked -+ hard ABI. We can remove this check once the entire distribution -+ has been rebuilt. */ -+ else if (dlib_ptr->flag & FLAG_ARM_LIBHF && -+ (flag == FLAG_ELF_LIBC6)) -+ ; -+#endif - else - error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."), - dlib_ptr->name, direntry->d_name, diff --git a/glibc/patches/glibc-rh1013801.patch b/glibc/patches/glibc-rh1013801.patch deleted file mode 100644 index ac656b5..0000000 --- a/glibc/patches/glibc-rh1013801.patch +++ /dev/null @@ -1,90 +0,0 @@ -# -# Posted upstream: -# https://sourceware.org/ml/libc-alpha/2013-10/msg00065.html -# -# This is related to bug 1013801 in that it fixes the problem -# by modifying the runtime. In bug 1013801 we have libselinux -# using pthread_atfork which pulls in libpthread, but we don't -# want that, we want libpthread to be pulled in only when -# actually needed by the application. This patch makes it -# possible to avoid requiring libpthread and still use -# pthread_atfork. -# -# The general idea for the design is in the leading comment -# in the source code. -# -diff --git a/nptl/sysdeps/unix/sysv/linux/Makefile b/nptl/sysdeps/unix/sysv/linux/Makefile -index 6078e2d..36fd50b 100644 ---- a/nptl/Makefile -+++ b/nptl/Makefile -@@ -18,7 +18,9 @@ - - routines = alloca_cutoff forward libc-lowlevellock libc-cancellation \ - libc-cleanup libc_pthread_init libc_multiple_threads \ -- register-atfork unregister-atfork -+ register-atfork unregister-atfork libc_pthread_atfork -+ -+static-only-routines += libc_pthread_atfork - shared-only-routines = forward - - libpthread-routines = nptl-init vars events version \ -diff --git a/nptl/libc_pthread_atfork.c b/nptl/libc_pthread_atfork.c -new file mode 100644 -index 0000000..667049a ---- /dev/null -+++ b/nptl/libc_pthread_atfork.c -@@ -0,0 +1,54 @@ -+/* Copyright (C) 2013 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Ulrich Drepper <drepper(a)redhat.com>, 2002. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+/* The standard design pattern for making it optional to link against -+ libpthread is to mark the function weak, test if the function -+ address is non-zero and call the function, otherwise use a fallback. -+ The problem with pthread_atfork is that there is no viable -+ fallback. If you need to do something during fork it has to be done -+ via pthread_atfork. This makes having libpthread optional and using -+ pthread_atfork impossible. We make it possible by providing -+ pthread_atfork in libc_nonshared.a. The real work of pthread_atfork -+ is done by __register_atfork which is already provided in -+ libc_nonshared.a. It's included in libc_nonshared.a because -+ __dso_handle has to be unique to each DSO such that unloading the DSO -+ can unregister the atfork handlers. We build pthread_atfork again -+ under a different file name and include it into libc_nonshared.a and -+ libc.a. We keep pthread_atfork in libpthread_nonshared.a and -+ libpthread.a for compatibility and completeness. -+ -+ Applications that can't rely on a new glibc should use the following -+ code to optionally include libpthread and still register a function -+ via pthread_atfork i.e. use __register_atfork directly: -+ -+ extern void *__dso_handle __attribute__ ((__weak__, __visibility__ ("hidden"))); -+ extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *); -+ -+ static int __app_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void)) -+ { -+ return __register_atfork (prepare, parent, child, -+ &__dso_handle == NULL ? NULL : __dso_handle); -+ } -+ -+ This code requires glibc 2.3.2 or newer. Previous to 2.3.2 no such -+ interfaces exist and at that point is is impossible to have an -+ optional libpthread and call pthread_atfork. -+ -+ This code adds no more ABI requirements than already exist since -+ __dso_handle and __register_atfork are already part of the ABI. */ -+#include <pthread_atfork.c> diff --git a/glibc/patches/glibc-rh1124987.patch b/glibc/patches/glibc-rh1124987.patch deleted file mode 100644 index 0b0c3ab..0000000 --- a/glibc/patches/glibc-rh1124987.patch +++ /dev/null @@ -1,32 +0,0 @@ -# -# This is an experimental patch that should go into rawhide and -# Fedora 21 to fix failures where python applications fail to -# load graphics applications because of the slot usages for TLS. -# This should eventually go upstream. -# -# - Carlos O'Donell -# -diff -urN glibc-2.19-886-gdd763fd/sysdeps/generic/ldsodefs.h glibc-2.19-886-gdd763fd.mod/sysdeps/generic/ldsodefs.h ---- glibc-2.19-886-gdd763fd/sysdeps/generic/ldsodefs.h 2014-08-21 01:00:55.000000000 -0400 -+++ glibc-2.19-886-gdd763fd.mod/sysdeps/generic/ldsodefs.h 2014-09-04 19:29:42.929692810 -0400 -@@ -388,8 +388,18 @@ - have to iterate beyond the first element in the slotinfo list. */ - #define TLS_SLOTINFO_SURPLUS (62) - --/* Number of additional slots in the dtv allocated. */ --#define DTV_SURPLUS (14) -+/* Number of additional allocated dtv slots. This was initially -+ 14, but problems with python, MESA, and X11's uses of static TLS meant -+ that most distributions were very close to this limit when they loaded -+ dynamically interpreted languages that used graphics. The simplest -+ solution was to roughly double the number of slots. The actual static -+ image space usage was relatively small, for example in MESA you -+ had only two dispatch pointers for a total of 16 bytes. If we hit up -+ against this limit again we should start a campaign with the -+ distributions to coordinate the usage of static TLS. Any user of this -+ resource is effectively coordinating a global resource since this -+ surplus is allocated for each thread at startup. */ -+#define DTV_SURPLUS (32) - - /* Initial dtv of the main thread, not allocated with normal malloc. */ - EXTERN void *_dl_initial_dtv; diff --git a/glibc/patches/glibc-rh697421.patch b/glibc/patches/glibc-rh697421.patch deleted file mode 100644 index 961c805..0000000 --- a/glibc/patches/glibc-rh697421.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -rup a/iconvdata/gconv-modules b/iconvdata/gconv-modules ---- a/iconvdata/gconv-modules 2010-05-04 05:27:23.000000000 -0600 -+++ b/iconvdata/gconv-modules 2012-01-26 10:58:24.181895489 -0700 -@@ -1954,3 +1954,6 @@ alias HPGREEK8// HP-GREEK8// - alias OSF10010004// HP-GREEK8// - module HP-GREEK8// INTERNAL HP-GREEK8 1 - module INTERNAL HP-GREEK8// HP-GREEK8 1 -+ -+alias ISO-10646-UCS-2// UNICODE// -+alias ISO-10646-UCS-2// ISO-10646/UTF8/ diff --git a/glibc/patches/glibc-rh741105.patch b/glibc/patches/glibc-rh741105.patch deleted file mode 100644 index 973beb5..0000000 --- a/glibc/patches/glibc-rh741105.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -rup a/elf/dl-load.c b/elf/dl-load.c ---- a/elf/dl-load.c 2012-02-03 10:59:58.917870716 -0700 -+++ b/elf/dl-load.c 2012-02-03 11:01:01.796580644 -0700 -@@ -1130,6 +1130,16 @@ _dl_map_object_from_fd (const char *name - = N_("ELF load command address/offset not properly aligned"); - goto call_lose; - } -+ if (__glibc_unlikely (ph->p_offset + ph->p_filesz > st.st_size)) -+ { -+ /* If the segment requires zeroing of part of its last -+ page, we'll crash when accessing the unmapped page. -+ There's still a possibility of a race, if the shared -+ object is truncated between the fxstat above and the -+ memset below. */ -+ errstring = N_("ELF load command past end of file"); -+ goto call_lose; -+ } - - struct loadcmd *c = &loadcmds[nloadcmds++]; - c->mapstart = ph->p_vaddr & ~(GLRO(dl_pagesize) - 1); diff --git a/glibc/patches/glibc-rh757881.patch b/glibc/patches/glibc-rh757881.patch deleted file mode 100644 index f633dc5..0000000 --- a/glibc/patches/glibc-rh757881.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -pruN a/malloc/arena.c b/malloc/arena.c ---- a/malloc/arena.c 2014-01-07 07:07:47.000000000 +0530 -+++ b/malloc/arena.c 2014-01-07 14:11:40.093628218 +0530 -@@ -702,7 +702,7 @@ heap_trim (heap_info *heap, size_t pad) - if (!prev_inuse (p)) /* consolidate backward */ - { - p = prev_chunk (p); -- unlink (p, bck, fwd); -+ unlink (ar_ptr, p, bck, fwd); - } - assert (((unsigned long) ((char *) p + new_size) & (pagesz - 1)) == 0); - assert (((char *) p + new_size) == ((char *) heap + heap->size)); -diff -pruN a/malloc/hooks.c b/malloc/hooks.c ---- a/malloc/hooks.c 2014-01-07 07:07:47.000000000 +0530 -+++ b/malloc/hooks.c 2014-01-07 14:12:41.804625603 +0530 -@@ -237,7 +237,9 @@ top_check (void) - (char *) t + chunksize (t) == mp_.sbrk_base + main_arena.system_mem))) - return 0; - -+ mutex_unlock(&main_arena); - malloc_printerr (check_action, "malloc: top chunk is corrupt", t); -+ mutex_lock(&main_arena); - - /* Try to set up a new top chunk. */ - brk = MORECORE (0); -diff -pruN a/malloc/malloc.c b/malloc/malloc.c ---- a/malloc/malloc.c 2014-01-07 07:07:47.000000000 +0530 -+++ b/malloc/malloc.c 2014-01-07 14:29:53.370581893 +0530 -@@ -1404,11 +1404,15 @@ typedef struct malloc_chunk *mbinptr; - #define last(b) ((b)->bk) - - /* Take a chunk off a bin list */ --#define unlink(P, BK, FD) { \ -+#define unlink(AV, P, BK, FD) { \ - FD = P->fd; \ - BK = P->bk; \ - if (__builtin_expect (FD->bk != P || BK->fd != P, 0)) \ -- malloc_printerr (check_action, "corrupted double-linked list", P); \ -+ { \ -+ mutex_unlock(&(AV)->mutex); \ -+ malloc_printerr (check_action, "corrupted double-linked list", P); \ -+ mutex_lock(&(AV)->mutex); \ -+ } \ - else { \ - FD->bk = BK; \ - BK->fd = FD; \ -@@ -2524,7 +2528,9 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av - else if (contiguous (av) && old_size && brk < old_end) - { - /* Oops! Someone else killed our space.. Can't touch anything. */ -+ mutex_unlock(&av->mutex); - malloc_printerr (3, "break adjusted to free malloc space", brk); -+ mutex_lock(&av->mutex); - } - - /* -@@ -3353,7 +3359,9 @@ _int_malloc (mstate av, size_t bytes) - { - errstr = "malloc(): memory corruption (fast)"; - errout: -+ mutex_unlock(&av->mutex); - malloc_printerr (check_action, errstr, chunk2mem (victim)); -+ mutex_lock(&av->mutex); - return NULL; - } - check_remalloced_chunk (av, victim, nb); -@@ -3441,8 +3449,12 @@ _int_malloc (mstate av, size_t bytes) - bck = victim->bk; - if (__builtin_expect (victim->size <= 2 * SIZE_SZ, 0) - || __builtin_expect (victim->size > av->system_mem, 0)) -- malloc_printerr (check_action, "malloc(): memory corruption", -- chunk2mem (victim)); -+ { -+ void *p = chunk2mem(victim); -+ mutex_unlock(&av->mutex); -+ malloc_printerr (check_action, "malloc(): memory corruption", p); -+ mutex_lock(&av->mutex); -+ } - size = chunksize (victim); - - /* -@@ -3589,7 +3601,7 @@ _int_malloc (mstate av, size_t bytes) - victim = victim->fd; - - remainder_size = size - nb; -- unlink (victim, bck, fwd); -+ unlink (av, victim, bck, fwd); - - /* Exhaust */ - if (remainder_size < MINSIZE) -@@ -3694,7 +3706,7 @@ _int_malloc (mstate av, size_t bytes) - remainder_size = size - nb; - - /* unlink */ -- unlink (victim, bck, fwd); -+ unlink (av, victim, bck, fwd); - - /* Exhaust */ - if (remainder_size < MINSIZE) -@@ -3832,9 +3844,11 @@ _int_free (mstate av, mchunkptr p, int h - { - errstr = "free(): invalid pointer"; - errout: -- if (!have_lock && locked) -+ if (have_lock || locked) - (void) mutex_unlock (&av->mutex); - malloc_printerr (check_action, errstr, chunk2mem (p)); -+ if (have_lock) -+ mutex_lock(&av->mutex); - return; - } - /* We know that each chunk is at least MINSIZE bytes in size or a -@@ -3981,7 +3995,7 @@ _int_free (mstate av, mchunkptr p, int h - prevsize = p->prev_size; - size += prevsize; - p = chunk_at_offset(p, -((long) prevsize)); -- unlink(p, bck, fwd); -+ unlink(av, p, bck, fwd); - } - - if (nextchunk != av->top) { -@@ -3990,7 +4004,7 @@ _int_free (mstate av, mchunkptr p, int h - - /* consolidate forward */ - if (!nextinuse) { -- unlink(nextchunk, bck, fwd); -+ unlink(av, nextchunk, bck, fwd); - size += nextsize; - } else - clear_inuse_bit_at_offset(nextchunk, 0); -@@ -4151,7 +4165,7 @@ static void malloc_consolidate(mstate av - prevsize = p->prev_size; - size += prevsize; - p = chunk_at_offset(p, -((long) prevsize)); -- unlink(p, bck, fwd); -+ unlink(av, p, bck, fwd); - } - - if (nextchunk != av->top) { -@@ -4159,7 +4173,7 @@ static void malloc_consolidate(mstate av - - if (!nextinuse) { - size += nextsize; -- unlink(nextchunk, bck, fwd); -+ unlink(av, nextchunk, bck, fwd); - } else - clear_inuse_bit_at_offset(nextchunk, 0); - -@@ -4228,7 +4242,9 @@ _int_realloc(mstate av, mchunkptr oldp, - { - errstr = "realloc(): invalid old size"; - errout: -+ mutex_unlock(&av->mutex); - malloc_printerr (check_action, errstr, chunk2mem (oldp)); -+ mutex_lock(&av->mutex); - return NULL; - } - -@@ -4274,7 +4290,7 @@ _int_realloc(mstate av, mchunkptr oldp, - (unsigned long) (nb)) - { - newp = oldp; -- unlink (next, bck, fwd); -+ unlink (av, next, bck, fwd); - } - - /* allocate, copy, free */ diff --git a/glibc/patches/glibc-rh825061.patch b/glibc/patches/glibc-rh825061.patch deleted file mode 100644 index 54fae8b..0000000 --- a/glibc/patches/glibc-rh825061.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -rup a/manual/Makefile b/manual/Makefile ---- a/manual/Makefile 2012-05-20 19:47:38.000000000 -0600 -+++ b/manual/Makefile 2012-05-29 22:23:33.920428631 -0600 -@@ -129,7 +129,8 @@ $(objpfx)%.c.texi: examples/%.c - mv -f $@.new $@ - - $(objpfx)%.info: %.texinfo -- LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=$@ $< -+ LANGUAGE=C LC_ALL=C $(MAKEINFO) -P $(objpfx) --output=`basename $@` $< -+ mv `basename $@`* $(objpfx) - - $(objpfx)%.dvi: %.texinfo - cd $(objpfx);$(TEXI2DVI) -I $(shell cd $(<D) && pwd) --output=$@ \ diff --git a/glibc/patches/glibc-rh827510.patch b/glibc/patches/glibc-rh827510.patch deleted file mode 100644 index f5f024c..0000000 --- a/glibc/patches/glibc-rh827510.patch +++ /dev/null @@ -1,27 +0,0 @@ -2012-06-14 Jeff Law <law(a)redhat.com> - - - * locale/loadlocale.c (_nl_load_locale): Delay setting - file->decided until we have successfully loaded the file's - data. - -diff --git a/locale/loadlocale.c b/locale/loadlocale.c -index e3fa187..9fd9216 100644 ---- a/locale/loadlocale.c -+++ b/locale/loadlocale.c -@@ -169,7 +169,6 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) - int save_err; - int alloc = ld_mapped; - -- file->decided = 1; - file->data = NULL; - - fd = open_not_cancel_2 (file->filename, O_RDONLY | O_CLOEXEC); -@@ -278,6 +277,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category) - newdata->alloc = alloc; - - file->data = newdata; -+ file->decided = 1; - } - - void diff --git a/glibc/patches/glibc-rh841787.patch b/glibc/patches/glibc-rh841787.patch deleted file mode 100644 index 76f85bf..0000000 --- a/glibc/patches/glibc-rh841787.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -rup a/resolv/res_init.c b/resolv/res_init.c ---- a/resolv/res_init.c 2012-07-26 15:10:45.655638776 -0600 -+++ b/resolv/res_init.c 2012-07-26 15:11:27.731423002 -0600 -@@ -314,9 +314,9 @@ __res_vinit(res_state statp, int preinit - cp++; - if ((*cp != '\0') && (*cp != '\n') - && __inet_aton(cp, &a)) { -- statp->nsaddr_list[nservall].sin_addr = a; -- statp->nsaddr_list[nservall].sin_family = AF_INET; -- statp->nsaddr_list[nservall].sin_port = -+ statp->nsaddr_list[nserv].sin_addr = a; -+ statp->nsaddr_list[nserv].sin_family = AF_INET; -+ statp->nsaddr_list[nserv].sin_port = - htons(NAMESERVER_PORT); - nserv++; - #ifdef _LIBC -diff -rup a/resolv/res_send.c b/resolv/res_send.c ---- a/resolv/res_send.c 2010-05-04 05:27:23.000000000 -0600 -+++ b/resolv/res_send.c 2012-07-26 15:34:58.398261659 -0600 -@@ -421,10 +421,10 @@ __libc_res_nsend(res_state statp, const - EXT(statp).nsmap[n] = MAXNS; - } - } -- n = statp->nscount; -- if (statp->nscount > EXT(statp).nscount) -+ n = statp->nscount - EXT(statp).nscount6; -+ if (n > EXT(statp).nscount) - for (n = EXT(statp).nscount, ns = 0; -- n < statp->nscount; n++) { -+ n < statp->nscount - EXT(statp).nscount6; n++) { - while (ns < MAXNS - && EXT(statp).nsmap[ns] != MAXNS) - ns++; diff --git a/kmod/kmod.nm b/kmod/kmod.nm index c78575e..daba803 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -4,7 +4,7 @@ ############################################################################### name = kmod -version = 19 +version = 22 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> diff --git a/libapr/libapr.nm b/libapr/libapr.nm index eb81210..5554b2f 100644 --- a/libapr/libapr.nm +++ b/libapr/libapr.nm @@ -4,7 +4,7 @@ ############################################################################### name = libapr -version = 1.4.5 +version = 1.5.2 release = 1 thisapp = apr-%{version} diff --git a/libassuan/libassuan.nm b/libassuan/libassuan.nm index 085b6f7..7901dbd 100644 --- a/libassuan/libassuan.nm +++ b/libassuan/libassuan.nm @@ -4,7 +4,7 @@ ############################################################################### name = libassuan -version = 2.1.1 +version = 2.4.2 release = 1 groups = System/Libraries diff --git a/libcap/libcap.nm b/libcap/libcap.nm index 6941bda..145cf2f 100644 --- a/libcap/libcap.nm +++ b/libcap/libcap.nm @@ -4,11 +4,11 @@ ############################################################################### name = libcap -version = 2.22 -release = 3 +version = 2.25 +release = 1 groups = System/Libraries -url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/ +url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ license = LGPL2+ summary = Library for getting and setting POSIX.1e capabilities. hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4ffb9f95ad615e741954464e764ff4a70c38bf9b
by git＠ipfire.org 31 Mar '16

31 Mar '16

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e
by git＠ipfire.org 29 Mar '16

29 Mar '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 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e (commit) via ad77dfeac119582a53a97f9e30a8d634fdd6594a (commit) via 02fa48b12c16753c6622d8ab904c40d0db776a3a (commit) via 8d90174af53cb4631bf98e0f056be84b925d6228 (commit) via dc2f6cac63c3f336ab82235ec69e83fe32c14796 (commit) via 7657c08d587d6053d9d6318fe55be6e6232686fe (commit) via e54c37bba11859ad7707e7b3eab9dc99e06afe60 (commit) via ef1798872ba81be24df331b8646a900d01a3ce09 (commit) via a9d0172bac3a6765ca282ecec0548491ed9dbb6f (commit) via a7775d4dc4b7da68d292c64d3b65b740f731b674 (commit) from f56d44e5f20ea7093acb4f6e2280a9d52586c535 (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 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 29 21:56:05 2016 +0100 opus: Build in parallel Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ad77dfeac119582a53a97f9e30a8d634fdd6594a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 29 21:54:31 2016 +0100 opus: Don't ship development files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 02fa48b12c16753c6622d8ab904c40d0db776a3a Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Mar 29 20:57:41 2016 +0200 Enable spice support in qemu, add spice as a dependency for qemu and bump qemu version number. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8d90174af53cb4631bf98e0f056be84b925d6228 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Mar 29 20:57:40 2016 +0200 Add all new packages (opus, python-pyparsing, python-six, spice-protocol, spice) to make.sh Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit dc2f6cac63c3f336ab82235ec69e83fe32c14796 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Mar 29 20:57:39 2016 +0200 New package spice Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7657c08d587d6053d9d6318fe55be6e6232686fe Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Mar 29 20:57:38 2016 +0200 New package spice-protocol (required by spice (only for build)) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e54c37bba11859ad7707e7b3eab9dc99e06afe60 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Mar 29 20:57:37 2016 +0200 New package python-pyparsing (required by spice (only for build)) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ef1798872ba81be24df331b8646a900d01a3ce09 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Mar 29 20:57:36 2016 +0200 New package python-six (required by spice (only for build)) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a9d0172bac3a6765ca282ecec0548491ed9dbb6f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 29 21:48:23 2016 +0100 opus: Remove whitespace errors Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a7775d4dc4b7da68d292c64d3b65b740f731b674 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Tue Mar 29 20:57:35 2016 +0200 New package opus (required by spice) Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/python-pyparsing | 9 +++++++ config/rootfiles/common/python-six | 9 +++++++ config/rootfiles/common/spice-protocol | 42 ++++++++++++++++++++++++++++++++ config/rootfiles/packages/opus | 12 +++++++++ config/rootfiles/packages/spice | 17 +++++++++++++ lfs/{htop => opus} | 19 +++++++-------- lfs/{python-xattr => python-pyparsing} | 10 ++++---- lfs/{python-xattr => python-six} | 10 ++++---- lfs/qemu | 6 ++--- lfs/{cifs-utils => spice} | 18 +++++++------- lfs/{intltool => spice-protocol} | 16 ++++++------ make.sh | 5 ++++ 12 files changed, 133 insertions(+), 40 deletions(-) create mode 100644 config/rootfiles/common/python-pyparsing create mode 100644 config/rootfiles/common/python-six create mode 100644 config/rootfiles/common/spice-protocol create mode 100644 config/rootfiles/packages/opus create mode 100644 config/rootfiles/packages/spice copy lfs/{htop => opus} (93%) copy lfs/{python-xattr => python-pyparsing} (93%) copy lfs/{python-xattr => python-six} (94%) copy lfs/{cifs-utils => spice} (90%) copy lfs/{intltool => spice-protocol} (91%) Difference in files: diff --git a/config/rootfiles/common/python-pyparsing b/config/rootfiles/common/python-pyparsing new file mode 100644 index 0000000..f75b88e --- /dev/null +++ b/config/rootfiles/common/python-pyparsing @@ -0,0 +1,9 @@ +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/PKG-INFO +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/SOURCES.txt +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/dependency_links.txt +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/not-zip-safe +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/top_level.txt +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.py +#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.pyc diff --git a/config/rootfiles/common/python-six b/config/rootfiles/common/python-six new file mode 100644 index 0000000..9520c38a --- /dev/null +++ b/config/rootfiles/common/python-six @@ -0,0 +1,9 @@ +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/PKG-INFO +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/SOURCES.txt +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/dependency_links.txt +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/not-zip-safe +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/top_level.txt +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.py +#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.pyc diff --git a/config/rootfiles/common/spice-protocol b/config/rootfiles/common/spice-protocol new file mode 100644 index 0000000..0db86e0 --- /dev/null +++ b/config/rootfiles/common/spice-protocol @@ -0,0 +1,42 @@ +#usr/include/spice-1 +#usr/include/spice-1/spice +#usr/include/spice-1/spice/barrier.h +#usr/include/spice-1/spice/controller_prot.h +#usr/include/spice-1/spice/end-packed.h +#usr/include/spice-1/spice/enums.h +#usr/include/spice-1/spice/error_codes.h +#usr/include/spice-1/spice/foreign_menu_prot.h +#usr/include/spice-1/spice/ipc_ring.h +#usr/include/spice-1/spice/macros.h +#usr/include/spice-1/spice/protocol.h +#usr/include/spice-1/spice/qxl_dev.h +#usr/include/spice-1/spice/qxl_windows.h +#usr/include/spice-1/spice/start-packed.h +#usr/include/spice-1/spice/stats.h +#usr/include/spice-1/spice/types.h +#usr/include/spice-1/spice/vd_agent.h +#usr/include/spice-1/spice/vdi_dev.h +#usr/lib/spice-protocol +#usr/lib/spice-protocol/python_modules +#usr/lib/spice-protocol/python_modules/__init__.py +#usr/lib/spice-protocol/python_modules/__init__.pyc +#usr/lib/spice-protocol/python_modules/__init__.pyo +#usr/lib/spice-protocol/python_modules/codegen.py +#usr/lib/spice-protocol/python_modules/codegen.pyc +#usr/lib/spice-protocol/python_modules/codegen.pyo +#usr/lib/spice-protocol/python_modules/demarshal.py +#usr/lib/spice-protocol/python_modules/demarshal.pyc +#usr/lib/spice-protocol/python_modules/demarshal.pyo +#usr/lib/spice-protocol/python_modules/marshal.py +#usr/lib/spice-protocol/python_modules/marshal.pyc +#usr/lib/spice-protocol/python_modules/marshal.pyo +#usr/lib/spice-protocol/python_modules/ptypes.py +#usr/lib/spice-protocol/python_modules/ptypes.pyc +#usr/lib/spice-protocol/python_modules/ptypes.pyo +#usr/lib/spice-protocol/python_modules/spice_parser.py +#usr/lib/spice-protocol/python_modules/spice_parser.pyc +#usr/lib/spice-protocol/python_modules/spice_parser.pyo +#usr/lib/spice-protocol/spice.proto +#usr/lib/spice-protocol/spice1.proto +#usr/lib/spice-protocol/spice_codegen.py +#usr/share/pkgconfig/spice-protocol.pc diff --git a/config/rootfiles/packages/opus b/config/rootfiles/packages/opus new file mode 100644 index 0000000..db98a1d --- /dev/null +++ b/config/rootfiles/packages/opus @@ -0,0 +1,12 @@ +#usr/include/opus +#usr/include/opus/opus.h +#usr/include/opus/opus_defines.h +#usr/include/opus/opus_multistream.h +#usr/include/opus/opus_types.h +#usr/lib/libopus.a +#usr/lib/libopus.la +#usr/lib/libopus.so +usr/lib/libopus.so.0 +usr/lib/libopus.so.0.5.2 +#usr/lib/pkgconfig/opus.pc +#usr/share/aclocal/opus.m4 diff --git a/config/rootfiles/packages/spice b/config/rootfiles/packages/spice new file mode 100644 index 0000000..93d2e9e --- /dev/null +++ b/config/rootfiles/packages/spice @@ -0,0 +1,17 @@ +#usr/include/spice-server +#usr/include/spice-server/spice-audio.h +#usr/include/spice-server/spice-char.h +#usr/include/spice-server/spice-core.h +#usr/include/spice-server/spice-experimental.h +#usr/include/spice-server/spice-input.h +#usr/include/spice-server/spice-migration.h +#usr/include/spice-server/spice-qxl.h +#usr/include/spice-server/spice-server.h +#usr/include/spice-server/spice-version.h +#usr/include/spice-server/spice.h +#usr/lib/libspice-server.a +#usr/lib/libspice-server.la +#usr/lib/libspice-server.so +usr/lib/libspice-server.so.1 +usr/lib/libspice-server.so.1.10.0 +#usr/lib/pkgconfig/spice-server.pc diff --git a/lfs/opus b/lfs/opus new file mode 100644 index 0000000..2446edb --- /dev/null +++ b/lfs/opus @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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.1.2 + +THISAPP = opus-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = opus +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 1f08a661bc72930187893a07f3741a91 + +install : $(TARGET) +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# 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) && ./configure --prefix=/usr --libdir=/usr/lib + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/python-pyparsing b/lfs/python-pyparsing new file mode 100644 index 0000000..f84253b --- /dev/null +++ b/lfs/python-pyparsing @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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 = 2.0.7 + +THISAPP = pyparsing-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python-pyparsing +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 1c8bed7530642ca19197f3caa05fd28b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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) && python setup.py install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/python-six b/lfs/python-six new file mode 100644 index 0000000..d210e4c --- /dev/null +++ b/lfs/python-six @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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.10.0 + +THISAPP = six-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python-six +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 34eed507548117b2ab523ab14b2f8b55 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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) && python setup.py install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/qemu b/lfs/qemu index a15dccd..804ec26 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 17 +PAK_VER = 18 -DEPS = "sdl" +DEPS = "sdl spice" ############################################################################### # Top-level Rules @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --enable-kvm --disable-attr \ --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \ - --extra-cflags="$(CFLAGS)" + --extra-cflags="$(CFLAGS)" --enable-spice cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/spice b/lfs/spice new file mode 100644 index 0000000..415d5aa --- /dev/null +++ b/lfs/spice @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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 = 0.12.6 + +THISAPP = spice-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = spice +PAK_VER = 1 + +DEPS = "opus" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 605a8c8ea80bc95076c4b3539c6dd026 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + $(PAK) + +############################################################################### +# 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) + cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --disable-celt051 + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/spice-protocol b/lfs/spice-protocol new file mode 100644 index 0000000..c399fac --- /dev/null +++ b/lfs/spice-protocol @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# 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 = 0.12.10 + +THISAPP = spice-protocol-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = spice-protocol +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 1fb9d0dcdd42dce1b476ae8aa7569bcc + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# 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 jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + /usr/share/automake-*/py-compile /usr/lib/spice-protocol/python_modules/* + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index da4bf16..8784dff 100755 --- a/make.sh +++ b/make.sh @@ -696,6 +696,11 @@ buildipfire() { ipfiremake elinks ipfiremake igmpproxy ipfiremake fbset + ipfiremake opus + ipfiremake python-six + ipfiremake python-pyparsing + ipfiremake spice-protocol + ipfiremake spice ipfiremake sdl ipfiremake qemu ipfiremake sane hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM