IPFire-SCM August 2015

ipfire-scm@lists.ipfire.org

1 participants
37 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cec620efdf2d0ab2c55b015ca7b8d6ca2a667e72
by git＠ipfire.org 19 Aug '15

19 Aug '15

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 cec620efdf2d0ab2c55b015ca7b8d6ca2a667e72 (commit) from a0c40b8242171a4d998c5e134173fe8a1c45e45d (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 cec620efdf2d0ab2c55b015ca7b8d6ca2a667e72 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 19 20:30:50 2015 +0100 Revert "pcre: Fix more buffer overflows" This reverts commit b62425e3e36c10acb2e99a9db5e5b73ed2a1e8fd. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/filelists/pcre | 1 - lfs/pcre | 3 - .../pcre-8.37-Fix-another-buffer-overflow.patch | 110 ------------ ...overflow-for-named-references-in-situatio.patch | 190 --------------------- ...orward-reference-to-duplicate-group-numbe.patch | 98 ----------- 5 files changed, 402 deletions(-) delete mode 120000 config/rootfiles/core/94/filelists/pcre delete mode 100644 src/patches/pcre-8.37-Fix-another-buffer-overflow.patch delete mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch delete mode 100644 src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch Difference in files: diff --git a/config/rootfiles/core/94/filelists/pcre b/config/rootfiles/core/94/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/94/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/lfs/pcre b/lfs/pcre index f9e63c6..8f207da 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -72,9 +72,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-static \ diff --git a/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch b/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch deleted file mode 100644 index 20ead09..0000000 --- a/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch +++ /dev/null @@ -1,110 +0,0 @@ -From f6efcf125123199d446c5561266c3c3846ed9f30 Mon Sep 17 00:00:00 2001 -From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> -Date: Wed, 3 Jun 2015 16:51:59 +0000 -Subject: [PATCH] Fix another buffer overflow. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Ported to 8.37: - -commit 225f0d5eb16c7a26591a1e3f286c7476907b5a6a -Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> -Date: Wed Jun 3 16:51:59 2015 +0000 - - Fix another buffer overflow. - - git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1562 2f5784b3-3f2a-0410-8824-cb99058d5e15 - -Signed-off-by: Petr Písař <ppisar(a)redhat.com> ---- - pcre_compile.c | 7 ++++++- - testdata/testinput2 | 2 ++ - testdata/testoutput11-16 | 2 +- - testdata/testoutput11-32 | 2 +- - testdata/testoutput11-8 | 2 +- - testdata/testoutput2 | 2 ++ - 6 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/pcre_compile.c b/pcre_compile.c -index 8b4aaef..f5d2384 100644 ---- a/pcre_compile.c -+++ b/pcre_compile.c -@@ -7210,7 +7210,12 @@ for (;; ptr++) - real compile this will be picked up and the reference wrapped with - OP_ONCE to make it atomic, so we must space in case this occurs. */ - -- if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE; -+ /* In fact, this can happen for a non-forward reference because -+ another group with the same number might be created later. This -+ issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance -+ only mode, we finesse the bug by allowing more memory always. */ -+ -+ /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE; - } - - /* In the real compile, search the name table. We check the name -diff --git a/testdata/testinput2 b/testdata/testinput2 -index 5cc9ce6..e12de3a 100644 ---- a/testdata/testinput2 -+++ b/testdata/testinput2 -@@ -4156,4 +4156,6 @@ backtracking verbs. --/ - - /(?=di(?<=(?1))|(?=(.))))/ - -+"(?J:(?|(?'R')(\k'R')|((?'R'))))" -+ - /-- End of testinput2 --/ -diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16 -index 422f2ad..e222e7c 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): 61 -+Memory allocation (code space): 77 - ------------------------------------------------------------------ - 0 24 Bra - 2 5 CBra 1 -diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32 -index d953ec8..9a80ec9 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): 125 -+Memory allocation (code space): 157 - ------------------------------------------------------------------ - 0 24 Bra - 2 5 CBra 1 -diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8 -index 6ec18ec..3adaca2 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): 38 -+Memory allocation (code space): 50 - ------------------------------------------------------------------ - 0 30 Bra - 3 7 CBra 1 -diff --git a/testdata/testoutput2 b/testdata/testoutput2 -index 4decb8d..5bad26c 100644 ---- a/testdata/testoutput2 -+++ b/testdata/testoutput2 -@@ -14428,4 +14428,6 @@ Failed: lookbehind assertion is not fixed length at offset 17 - /(?=di(?<=(?1))|(?=(.))))/ - Failed: unmatched parentheses at offset 23 - -+"(?J:(?|(?'R')(\k'R')|((?'R'))))" -+ - /-- End of testinput2 --/ --- -2.4.3 - diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch deleted file mode 100644 index ab1b962..0000000 --- a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch +++ /dev/null @@ -1,190 +0,0 @@ -From b3f0b0dd971314df8f865e221aa1a88e75d6d1a6 Mon Sep 17 00:00:00 2001 -From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> -Date: Wed, 5 Aug 2015 15:38:32 +0000 -Subject: [PATCH] Fix buffer overflow for named references in (?| situations. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Ported for 8.37: - -commit 7af8e8717def179fd7b69e173abd347c1a3547cb -Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> -Date: Wed Aug 5 15:38:32 2015 +0000 - - Fix buffer overflow for named references in (?| situations. - - git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1585 2f5784b3-3f2a-0410-8824-cb99058d5e15 - -Signed-off-by: Petr Písař <ppisar(a)redhat.com> ---- - pcre_compile.c | 74 ++++++++++++++++++++++++++++++---------------------- - pcre_internal.h | 1 + - testdata/testinput2 | 2 ++ - testdata/testoutput2 | 2 ++ - 4 files changed, 48 insertions(+), 31 deletions(-) - -diff --git a/pcre_compile.c b/pcre_compile.c -index f5d2384..5fe5c1d 100644 ---- a/pcre_compile.c -+++ b/pcre_compile.c -@@ -6641,6 +6641,7 @@ for (;; ptr++) - /* ------------------------------------------------------------ */ - case CHAR_VERTICAL_LINE: /* Reset capture count for each branch */ - reset_bracount = TRUE; -+ cd->dupgroups = TRUE; /* Record (?| encountered */ - /* Fall through */ - - /* ------------------------------------------------------------ */ -@@ -7151,7 +7152,8 @@ for (;; ptr++) - if (lengthptr != NULL) - { - named_group *ng; -- -+ recno = 0; -+ - if (namelen == 0) - { - *errorcodeptr = ERR62; -@@ -7168,32 +7170,6 @@ for (;; ptr++) - goto FAILED; - } - -- /* The name table does not exist in the first pass; instead we must -- scan the list of names encountered so far in order to get the -- number. If the name is not found, set the value to 0 for a forward -- reference. */ -- -- recno = 0; -- ng = cd->named_groups; -- for (i = 0; i < cd->names_found; i++, ng++) -- { -- if (namelen == ng->length && -- STRNCMP_UC_UC(name, ng->name, namelen) == 0) -- { -- open_capitem *oc; -- recno = ng->number; -- if (is_recurse) break; -- for (oc = cd->open_caps; oc != NULL; oc = oc->next) -- { -- if (oc->number == recno) -- { -- oc->flag = TRUE; -- break; -- } -- } -- } -- } -- - /* Count named back references. */ - - if (!is_recurse) cd->namedrefcount++; -@@ -7215,7 +7191,44 @@ 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. */ - -- /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE; -+ *lengthptr += 2 + 2*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 -+ recursive) but which later on is also attached to a group with the -+ current number. This can only happen if $(| has been previous -+ encountered. In that case, we allow yet more memory, just in case. -+ (Again, this is fixed "properly" in PCRE2. */ -+ -+ if (cd->dupgroups) *lengthptr += 2 + 2*LINK_SIZE; -+ -+ /* Otherwise, check for recursion here. The name table does not exist -+ in the first pass; instead we must scan the list of names encountered -+ 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 -+ { -+ ng = cd->named_groups; -+ for (i = 0; i < cd->names_found; i++, ng++) -+ { -+ if (namelen == ng->length && -+ STRNCMP_UC_UC(name, ng->name, namelen) == 0) -+ { -+ open_capitem *oc; -+ recno = ng->number; -+ if (is_recurse) break; -+ for (oc = cd->open_caps; oc != NULL; oc = oc->next) -+ { -+ if (oc->number == recno) -+ { -+ oc->flag = TRUE; -+ break; -+ } -+ } -+ } -+ } -+ } - } - - /* In the real compile, search the name table. We check the name -@@ -7262,8 +7275,6 @@ for (;; ptr++) - for (i++; i < cd->names_found; i++) - { - if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break; -- -- - count++; - cslot += cd->name_entry_size; - } -@@ -9189,6 +9200,7 @@ cd->names_found = 0; - cd->name_entry_size = 0; - cd->name_table = NULL; - cd->dupnames = FALSE; -+cd->dupgroups = FALSE; - cd->namedrefcount = 0; - cd->start_code = cworkspace; - cd->hwm = cworkspace; -@@ -9223,7 +9235,7 @@ if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN; - - DPRINTF(("end pre-compile: length=%d workspace=%d\n", length, - (int)(cd->hwm - cworkspace))); -- -+ - if (length > MAX_PATTERN_SIZE) - { - errorcode = ERR20; -diff --git a/pcre_internal.h b/pcre_internal.h -index dd0ac7f..7ca6020 100644 ---- a/pcre_internal.h -+++ b/pcre_internal.h -@@ -2446,6 +2446,7 @@ typedef struct compile_data { - BOOL had_pruneorskip; /* (*PRUNE) or (*SKIP) encountered */ - BOOL check_lookbehind; /* Lookbehinds need later checking */ - BOOL dupnames; /* Duplicate names exist */ -+ BOOL dupgroups; /* Duplicate groups exist: (?| found */ - BOOL iscondassert; /* Next assert is a condition */ - int nltype; /* Newline type */ - int nllen; /* Newline string length */ -diff --git a/testdata/testinput2 b/testdata/testinput2 -index e12de3a..8e044f8 100644 ---- a/testdata/testinput2 -+++ b/testdata/testinput2 -@@ -4158,4 +4158,6 @@ backtracking verbs. --/ - - "(?J:(?|(?'R')(\k'R')|((?'R'))))" - -+/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/ -+ - /-- End of testinput2 --/ -diff --git a/testdata/testoutput2 b/testdata/testoutput2 -index 5bad26c..6019425 100644 ---- a/testdata/testoutput2 -+++ b/testdata/testoutput2 -@@ -14430,4 +14430,6 @@ Failed: unmatched parentheses at offset 23 - - "(?J:(?|(?'R')(\k'R')|((?'R'))))" - -+/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/ -+ - /-- End of testinput2 --/ --- -2.4.3 - diff --git a/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch b/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch deleted file mode 100644 index 837e86f..0000000 --- a/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 83ed574998fe7b844b98ab7cd56291068feb9e31 Mon Sep 17 00:00:00 2001 -From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> -Date: Sat, 16 May 2015 11:05:40 +0000 -Subject: [PATCH] Fix named forward reference to duplicate group number - overflow bug. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Port to 8.37: - -commit 2fa78aa4e42bcebf2d616c4ee89c012f29dc3447 -Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> -Date: Sat May 16 11:05:40 2015 +0000 - - Fix named forward reference to duplicate group number overflow bug. - - git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1559 2f5784b3-3f2a-0410-8824-cb99058d5e15 - -Signed-off-by: Petr Písař <ppisar(a)redhat.com> ---- - pcre_compile.c | 24 ++++++++++++++++-------- - testdata/testinput1 | 3 +++ - testdata/testoutput1 | 5 +++++ - 3 files changed, 24 insertions(+), 8 deletions(-) - -diff --git a/pcre_compile.c b/pcre_compile.c -index b66b1f6..8b4aaef 100644 ---- a/pcre_compile.c -+++ b/pcre_compile.c -@@ -7183,15 +7183,15 @@ for (;; ptr++) - open_capitem *oc; - recno = ng->number; - if (is_recurse) break; -- for (oc = cd->open_caps; oc != NULL; oc = oc->next) -- { -- if (oc->number == recno) -- { -- oc->flag = TRUE; -+ for (oc = cd->open_caps; oc != NULL; oc = oc->next) -+ { -+ if (oc->number == recno) -+ { -+ oc->flag = TRUE; - break; -- } -- } -- } -+ } -+ } -+ } - } - - /* Count named back references. */ -@@ -7203,6 +7203,14 @@ for (;; ptr++) - 16-bit data item. */ - - *lengthptr += IMM2_SIZE; -+ -+ /* If this is a forward reference and we are within a (?|...) group, -+ the reference may end up as the number of a group which we are -+ currently inside, that is, it could be a recursive reference. In the -+ real compile this will be picked up and the reference wrapped with -+ OP_ONCE to make it atomic, so we must space in case this occurs. */ -+ -+ if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE; - } - - /* In the real compile, search the name table. We check the name -diff --git a/testdata/testinput1 b/testdata/testinput1 -index 73c2f4d..8379ce0 100644 ---- a/testdata/testinput1 -+++ b/testdata/testinput1 -@@ -5730,4 +5730,7 @@ AbcdCBefgBhiBqz - "(?1)(?#?'){8}(a)" - baaaaaaaaac - -+"(?|(\k'Pm')|(?'Pm'))" -+ abcd -+ - /-- End of testinput1 --/ -diff --git a/testdata/testoutput1 b/testdata/testoutput1 -index 0a53fd0..e852ab9 100644 ---- a/testdata/testoutput1 -+++ b/testdata/testoutput1 -@@ -9429,4 +9429,9 @@ No match - 0: aaaaaaaaa - 1: a - -+"(?|(\k'Pm')|(?'Pm'))" -+ abcd -+ 0: -+ 1: -+ - /-- End of testinput1 --/ --- -2.4.3 - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a0c40b8242171a4d998c5e134173fe8a1c45e45d
by git＠ipfire.org 17 Aug '15

17 Aug '15

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 a0c40b8242171a4d998c5e134173fe8a1c45e45d (commit) via b62425e3e36c10acb2e99a9db5e5b73ed2a1e8fd (commit) via af100d627a612783efb21ff8324f3adef206ade2 (commit) from 4b332b6dc92017a967696634b8c6901b3330171f (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 a0c40b8242171a4d998c5e134173fe8a1c45e45d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 17 23:37:53 2015 +0100 core94: Ship rrdtool Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b62425e3e36c10acb2e99a9db5e5b73ed2a1e8fd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 17 23:33:31 2015 +0100 pcre: Fix more buffer overflows Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit af100d627a612783efb21ff8324f3adef206ade2 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu Aug 13 19:12:46 2015 +0200 rrdtool: Update to 1.5.4 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/rrdtool | 185 ++++++++++---------- .../{oldcore/93 => core/94}/filelists/pcre | 0 .../{oldcore/92 => core/94}/filelists/rrdtool | 0 lfs/pcre | 3 + lfs/rrdtool | 4 +- .../pcre-8.37-Fix-another-buffer-overflow.patch | 110 ++++++++++++ ...overflow-for-named-references-in-situatio.patch | 190 +++++++++++++++++++++ ...orward-reference-to-duplicate-group-numbe.patch | 98 +++++++++++ 8 files changed, 496 insertions(+), 94 deletions(-) copy config/rootfiles/{oldcore/93 => core/94}/filelists/pcre (100%) copy config/rootfiles/{oldcore/92 => core/94}/filelists/rrdtool (100%) create mode 100644 src/patches/pcre-8.37-Fix-another-buffer-overflow.patch create mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch create mode 100644 src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch Difference in files: diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index 738fe37..6a79679 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -26,98 +26,98 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/lib/pkgconfig/librrd.pc -#usr/share/doc/rrdtool-1.5.3 -#usr/share/doc/rrdtool-1.5.3/html -#usr/share/doc/rrdtool-1.5.3/html/RRDp.html -#usr/share/doc/rrdtool-1.5.3/html/RRDs.html -#usr/share/doc/rrdtool-1.5.3/html/bin_dec_hex.html -#usr/share/doc/rrdtool-1.5.3/html/cdeftutorial.html -#usr/share/doc/rrdtool-1.5.3/html/index.html -#usr/share/doc/rrdtool-1.5.3/html/librrd.html -#usr/share/doc/rrdtool-1.5.3/html/rpntutorial.html -#usr/share/doc/rrdtool-1.5.3/html/rrd-beginners.html -#usr/share/doc/rrdtool-1.5.3/html/rrdbuild.html -#usr/share/doc/rrdtool-1.5.3/html/rrdcached.html -#usr/share/doc/rrdtool-1.5.3/html/rrdcgi.html -#usr/share/doc/rrdtool-1.5.3/html/rrdcreate.html -#usr/share/doc/rrdtool-1.5.3/html/rrddump.html -#usr/share/doc/rrdtool-1.5.3/html/rrdfetch.html -#usr/share/doc/rrdtool-1.5.3/html/rrdfirst.html -#usr/share/doc/rrdtool-1.5.3/html/rrdflushcached.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_data.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_examples.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_graph.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_rpn.html -#usr/share/doc/rrdtool-1.5.3/html/rrdinfo.html -#usr/share/doc/rrdtool-1.5.3/html/rrdlast.html -#usr/share/doc/rrdtool-1.5.3/html/rrdlastupdate.html -#usr/share/doc/rrdtool-1.5.3/html/rrdresize.html -#usr/share/doc/rrdtool-1.5.3/html/rrdrestore.html -#usr/share/doc/rrdtool-1.5.3/html/rrdthreads.html -#usr/share/doc/rrdtool-1.5.3/html/rrdtool.html -#usr/share/doc/rrdtool-1.5.3/html/rrdtune.html -#usr/share/doc/rrdtool-1.5.3/html/rrdtutorial.html -#usr/share/doc/rrdtool-1.5.3/html/rrdupdate.html -#usr/share/doc/rrdtool-1.5.3/html/rrdxport.html -#usr/share/doc/rrdtool-1.5.3/txt -#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.pod -#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.txt -#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.pod -#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.txt -#usr/share/doc/rrdtool-1.5.3/txt/librrd.txt -#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.pod -#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrddump.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrddump.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.txt +#usr/share/doc/rrdtool-1.5.4 +#usr/share/doc/rrdtool-1.5.4/html +#usr/share/doc/rrdtool-1.5.4/html/RRDp.html +#usr/share/doc/rrdtool-1.5.4/html/RRDs.html +#usr/share/doc/rrdtool-1.5.4/html/bin_dec_hex.html +#usr/share/doc/rrdtool-1.5.4/html/cdeftutorial.html +#usr/share/doc/rrdtool-1.5.4/html/index.html +#usr/share/doc/rrdtool-1.5.4/html/librrd.html +#usr/share/doc/rrdtool-1.5.4/html/rpntutorial.html +#usr/share/doc/rrdtool-1.5.4/html/rrd-beginners.html +#usr/share/doc/rrdtool-1.5.4/html/rrdbuild.html +#usr/share/doc/rrdtool-1.5.4/html/rrdcached.html +#usr/share/doc/rrdtool-1.5.4/html/rrdcgi.html +#usr/share/doc/rrdtool-1.5.4/html/rrdcreate.html +#usr/share/doc/rrdtool-1.5.4/html/rrddump.html +#usr/share/doc/rrdtool-1.5.4/html/rrdfetch.html +#usr/share/doc/rrdtool-1.5.4/html/rrdfirst.html +#usr/share/doc/rrdtool-1.5.4/html/rrdflushcached.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_data.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_examples.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_graph.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_rpn.html +#usr/share/doc/rrdtool-1.5.4/html/rrdinfo.html +#usr/share/doc/rrdtool-1.5.4/html/rrdlast.html +#usr/share/doc/rrdtool-1.5.4/html/rrdlastupdate.html +#usr/share/doc/rrdtool-1.5.4/html/rrdresize.html +#usr/share/doc/rrdtool-1.5.4/html/rrdrestore.html +#usr/share/doc/rrdtool-1.5.4/html/rrdthreads.html +#usr/share/doc/rrdtool-1.5.4/html/rrdtool.html +#usr/share/doc/rrdtool-1.5.4/html/rrdtune.html +#usr/share/doc/rrdtool-1.5.4/html/rrdtutorial.html +#usr/share/doc/rrdtool-1.5.4/html/rrdupdate.html +#usr/share/doc/rrdtool-1.5.4/html/rrdxport.html +#usr/share/doc/rrdtool-1.5.4/txt +#usr/share/doc/rrdtool-1.5.4/txt/bin_dec_hex.pod +#usr/share/doc/rrdtool-1.5.4/txt/bin_dec_hex.txt +#usr/share/doc/rrdtool-1.5.4/txt/cdeftutorial.pod +#usr/share/doc/rrdtool-1.5.4/txt/cdeftutorial.txt +#usr/share/doc/rrdtool-1.5.4/txt/librrd.txt +#usr/share/doc/rrdtool-1.5.4/txt/rpntutorial.pod +#usr/share/doc/rrdtool-1.5.4/txt/rpntutorial.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrd-beginners.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrd-beginners.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdbuild.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdbuild.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdcached.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdcached.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdcgi.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdcgi.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdcreate.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdcreate.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrddump.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrddump.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdfetch.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdfetch.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdfirst.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdfirst.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdflushcached.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdflushcached.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_data.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_data.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_examples.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_examples.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_graph.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_graph.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_rpn.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_rpn.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdinfo.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdinfo.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdlast.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdlast.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdlastupdate.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdlastupdate.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdresize.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdresize.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdrestore.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdrestore.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdthreads.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdthreads.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdtool.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdtool.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdtune.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdtune.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdtutorial.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdtutorial.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdupdate.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdupdate.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdxport.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdxport.txt #usr/share/man/man1/bin_dec_hex.1 #usr/share/man/man1/cdeftutorial.1 #usr/share/man/man1/rpntutorial.1 @@ -162,4 +162,5 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/share/rrdtool/examples/rrdcached/rrdcached-size.pl #usr/share/rrdtool/examples/shared-demo.pl #usr/share/rrdtool/examples/stripes.pl +#usr/share/rrdtool/examples/stripes.py var/log/rrd diff --git a/config/rootfiles/core/94/filelists/pcre b/config/rootfiles/core/94/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/94/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/94/filelists/rrdtool b/config/rootfiles/core/94/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/core/94/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/lfs/pcre b/lfs/pcre index 8f207da..f9e63c6 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -72,6 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-static \ diff --git a/lfs/rrdtool b/lfs/rrdtool index d0a1181..f156400 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -24,7 +24,7 @@ include Config -VER = 1.5.3 +VER = 1.5.4 THISAPP = rrdtool-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 868a828cc6b10654c440a85054240ae2 +$(DL_FILE)_MD5 = 4daea1e628e1c70d91800d6a06427dc1 install : $(TARGET) diff --git a/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch b/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch new file mode 100644 index 0000000..20ead09 --- /dev/null +++ b/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch @@ -0,0 +1,110 @@ +From f6efcf125123199d446c5561266c3c3846ed9f30 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Wed, 3 Jun 2015 16:51:59 +0000 +Subject: [PATCH] Fix another buffer overflow. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Ported to 8.37: + +commit 225f0d5eb16c7a26591a1e3f286c7476907b5a6a +Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Wed Jun 3 16:51:59 2015 +0000 + + Fix another buffer overflow. + + git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1562 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Signed-off-by: Petr Písař <ppisar(a)redhat.com> +--- + pcre_compile.c | 7 ++++++- + testdata/testinput2 | 2 ++ + testdata/testoutput11-16 | 2 +- + testdata/testoutput11-32 | 2 +- + testdata/testoutput11-8 | 2 +- + testdata/testoutput2 | 2 ++ + 6 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/pcre_compile.c b/pcre_compile.c +index 8b4aaef..f5d2384 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -7210,7 +7210,12 @@ for (;; ptr++) + real compile this will be picked up and the reference wrapped with + OP_ONCE to make it atomic, so we must space in case this occurs. */ + +- if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE; ++ /* In fact, this can happen for a non-forward reference because ++ another group with the same number might be created later. This ++ issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance ++ only mode, we finesse the bug by allowing more memory always. */ ++ ++ /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE; + } + + /* In the real compile, search the name table. We check the name +diff --git a/testdata/testinput2 b/testdata/testinput2 +index 5cc9ce6..e12de3a 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4156,4 +4156,6 @@ backtracking verbs. --/ + + /(?=di(?<=(?1))|(?=(.))))/ + ++"(?J:(?|(?'R')(\k'R')|((?'R'))))" ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16 +index 422f2ad..e222e7c 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): 61 ++Memory allocation (code space): 77 + ------------------------------------------------------------------ + 0 24 Bra + 2 5 CBra 1 +diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32 +index d953ec8..9a80ec9 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): 125 ++Memory allocation (code space): 157 + ------------------------------------------------------------------ + 0 24 Bra + 2 5 CBra 1 +diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8 +index 6ec18ec..3adaca2 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): 38 ++Memory allocation (code space): 50 + ------------------------------------------------------------------ + 0 30 Bra + 3 7 CBra 1 +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 4decb8d..5bad26c 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14428,4 +14428,6 @@ Failed: lookbehind assertion is not fixed length at offset 17 + /(?=di(?<=(?1))|(?=(.))))/ + Failed: unmatched parentheses at offset 23 + ++"(?J:(?|(?'R')(\k'R')|((?'R'))))" ++ + /-- End of testinput2 --/ +-- +2.4.3 + diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch new file mode 100644 index 0000000..ab1b962 --- /dev/null +++ b/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch @@ -0,0 +1,190 @@ +From b3f0b0dd971314df8f865e221aa1a88e75d6d1a6 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Wed, 5 Aug 2015 15:38:32 +0000 +Subject: [PATCH] Fix buffer overflow for named references in (?| situations. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Ported for 8.37: + +commit 7af8e8717def179fd7b69e173abd347c1a3547cb +Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Wed Aug 5 15:38:32 2015 +0000 + + Fix buffer overflow for named references in (?| situations. + + git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1585 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Signed-off-by: Petr Písař <ppisar(a)redhat.com> +--- + pcre_compile.c | 74 ++++++++++++++++++++++++++++++---------------------- + pcre_internal.h | 1 + + testdata/testinput2 | 2 ++ + testdata/testoutput2 | 2 ++ + 4 files changed, 48 insertions(+), 31 deletions(-) + +diff --git a/pcre_compile.c b/pcre_compile.c +index f5d2384..5fe5c1d 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -6641,6 +6641,7 @@ for (;; ptr++) + /* ------------------------------------------------------------ */ + case CHAR_VERTICAL_LINE: /* Reset capture count for each branch */ + reset_bracount = TRUE; ++ cd->dupgroups = TRUE; /* Record (?| encountered */ + /* Fall through */ + + /* ------------------------------------------------------------ */ +@@ -7151,7 +7152,8 @@ for (;; ptr++) + if (lengthptr != NULL) + { + named_group *ng; +- ++ recno = 0; ++ + if (namelen == 0) + { + *errorcodeptr = ERR62; +@@ -7168,32 +7170,6 @@ for (;; ptr++) + goto FAILED; + } + +- /* The name table does not exist in the first pass; instead we must +- scan the list of names encountered so far in order to get the +- number. If the name is not found, set the value to 0 for a forward +- reference. */ +- +- recno = 0; +- ng = cd->named_groups; +- for (i = 0; i < cd->names_found; i++, ng++) +- { +- if (namelen == ng->length && +- STRNCMP_UC_UC(name, ng->name, namelen) == 0) +- { +- open_capitem *oc; +- recno = ng->number; +- if (is_recurse) break; +- for (oc = cd->open_caps; oc != NULL; oc = oc->next) +- { +- if (oc->number == recno) +- { +- oc->flag = TRUE; +- break; +- } +- } +- } +- } +- + /* Count named back references. */ + + if (!is_recurse) cd->namedrefcount++; +@@ -7215,7 +7191,44 @@ 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. */ + +- /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE; ++ *lengthptr += 2 + 2*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 ++ recursive) but which later on is also attached to a group with the ++ current number. This can only happen if $(| has been previous ++ encountered. In that case, we allow yet more memory, just in case. ++ (Again, this is fixed "properly" in PCRE2. */ ++ ++ if (cd->dupgroups) *lengthptr += 2 + 2*LINK_SIZE; ++ ++ /* Otherwise, check for recursion here. The name table does not exist ++ in the first pass; instead we must scan the list of names encountered ++ 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 ++ { ++ ng = cd->named_groups; ++ for (i = 0; i < cd->names_found; i++, ng++) ++ { ++ if (namelen == ng->length && ++ STRNCMP_UC_UC(name, ng->name, namelen) == 0) ++ { ++ open_capitem *oc; ++ recno = ng->number; ++ if (is_recurse) break; ++ for (oc = cd->open_caps; oc != NULL; oc = oc->next) ++ { ++ if (oc->number == recno) ++ { ++ oc->flag = TRUE; ++ break; ++ } ++ } ++ } ++ } ++ } + } + + /* In the real compile, search the name table. We check the name +@@ -7262,8 +7275,6 @@ for (;; ptr++) + for (i++; i < cd->names_found; i++) + { + if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break; +- +- + count++; + cslot += cd->name_entry_size; + } +@@ -9189,6 +9200,7 @@ cd->names_found = 0; + cd->name_entry_size = 0; + cd->name_table = NULL; + cd->dupnames = FALSE; ++cd->dupgroups = FALSE; + cd->namedrefcount = 0; + cd->start_code = cworkspace; + cd->hwm = cworkspace; +@@ -9223,7 +9235,7 @@ if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN; + + DPRINTF(("end pre-compile: length=%d workspace=%d\n", length, + (int)(cd->hwm - cworkspace))); +- ++ + if (length > MAX_PATTERN_SIZE) + { + errorcode = ERR20; +diff --git a/pcre_internal.h b/pcre_internal.h +index dd0ac7f..7ca6020 100644 +--- a/pcre_internal.h ++++ b/pcre_internal.h +@@ -2446,6 +2446,7 @@ typedef struct compile_data { + BOOL had_pruneorskip; /* (*PRUNE) or (*SKIP) encountered */ + BOOL check_lookbehind; /* Lookbehinds need later checking */ + BOOL dupnames; /* Duplicate names exist */ ++ BOOL dupgroups; /* Duplicate groups exist: (?| found */ + BOOL iscondassert; /* Next assert is a condition */ + int nltype; /* Newline type */ + int nllen; /* Newline string length */ +diff --git a/testdata/testinput2 b/testdata/testinput2 +index e12de3a..8e044f8 100644 +--- a/testdata/testinput2 ++++ b/testdata/testinput2 +@@ -4158,4 +4158,6 @@ backtracking verbs. --/ + + "(?J:(?|(?'R')(\k'R')|((?'R'))))" + ++/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/ ++ + /-- End of testinput2 --/ +diff --git a/testdata/testoutput2 b/testdata/testoutput2 +index 5bad26c..6019425 100644 +--- a/testdata/testoutput2 ++++ b/testdata/testoutput2 +@@ -14430,4 +14430,6 @@ Failed: unmatched parentheses at offset 23 + + "(?J:(?|(?'R')(\k'R')|((?'R'))))" + ++/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/ ++ + /-- End of testinput2 --/ +-- +2.4.3 + diff --git a/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch b/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch new file mode 100644 index 0000000..837e86f --- /dev/null +++ b/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch @@ -0,0 +1,98 @@ +From 83ed574998fe7b844b98ab7cd56291068feb9e31 Mon Sep 17 00:00:00 2001 +From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat, 16 May 2015 11:05:40 +0000 +Subject: [PATCH] Fix named forward reference to duplicate group number + overflow bug. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Port to 8.37: + +commit 2fa78aa4e42bcebf2d616c4ee89c012f29dc3447 +Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> +Date: Sat May 16 11:05:40 2015 +0000 + + Fix named forward reference to duplicate group number overflow bug. + + git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1559 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Signed-off-by: Petr Písař <ppisar(a)redhat.com> +--- + pcre_compile.c | 24 ++++++++++++++++-------- + testdata/testinput1 | 3 +++ + testdata/testoutput1 | 5 +++++ + 3 files changed, 24 insertions(+), 8 deletions(-) + +diff --git a/pcre_compile.c b/pcre_compile.c +index b66b1f6..8b4aaef 100644 +--- a/pcre_compile.c ++++ b/pcre_compile.c +@@ -7183,15 +7183,15 @@ for (;; ptr++) + open_capitem *oc; + recno = ng->number; + if (is_recurse) break; +- for (oc = cd->open_caps; oc != NULL; oc = oc->next) +- { +- if (oc->number == recno) +- { +- oc->flag = TRUE; ++ for (oc = cd->open_caps; oc != NULL; oc = oc->next) ++ { ++ if (oc->number == recno) ++ { ++ oc->flag = TRUE; + break; +- } +- } +- } ++ } ++ } ++ } + } + + /* Count named back references. */ +@@ -7203,6 +7203,14 @@ for (;; ptr++) + 16-bit data item. */ + + *lengthptr += IMM2_SIZE; ++ ++ /* If this is a forward reference and we are within a (?|...) group, ++ the reference may end up as the number of a group which we are ++ currently inside, that is, it could be a recursive reference. In the ++ real compile this will be picked up and the reference wrapped with ++ OP_ONCE to make it atomic, so we must space in case this occurs. */ ++ ++ if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE; + } + + /* In the real compile, search the name table. We check the name +diff --git a/testdata/testinput1 b/testdata/testinput1 +index 73c2f4d..8379ce0 100644 +--- a/testdata/testinput1 ++++ b/testdata/testinput1 +@@ -5730,4 +5730,7 @@ AbcdCBefgBhiBqz + "(?1)(?#?'){8}(a)" + baaaaaaaaac + ++"(?|(\k'Pm')|(?'Pm'))" ++ abcd ++ + /-- End of testinput1 --/ +diff --git a/testdata/testoutput1 b/testdata/testoutput1 +index 0a53fd0..e852ab9 100644 +--- a/testdata/testoutput1 ++++ b/testdata/testoutput1 +@@ -9429,4 +9429,9 @@ No match + 0: aaaaaaaaa + 1: a + ++"(?|(\k'Pm')|(?'Pm'))" ++ abcd ++ 0: ++ 1: ++ + /-- End of testinput1 --/ +-- +2.4.3 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4b332b6dc92017a967696634b8c6901b3330171f
by git＠ipfire.org 17 Aug '15

17 Aug '15

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 4b332b6dc92017a967696634b8c6901b3330171f (commit) via f831e573d46fb830976178a6491aa1a10f548b0f (commit) via 9eb008dc92c4d679441ef736aa89ed1b21e0a372 (commit) from fb71017b7b3deab74f7811118f1dc0cba5c690d0 (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 4b332b6dc92017a967696634b8c6901b3330171f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 17 20:53:40 2015 +0100 core94: Ship dnsmasq Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f831e573d46fb830976178a6491aa1a10f548b0f Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Aug 15 09:27:44 2015 +0200 dnsmasq: latest upstream patches Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9eb008dc92c4d679441ef736aa89ed1b21e0a372 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 17 20:49:34 2015 +0100 glibc: Import security fixes from upstream Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../90 => core/94}/filelists/armv5tel/glibc | 0 .../{oldcore/93 => core/94}/filelists/dnsmasq | 0 .../{oldcore/90 => core/94}/filelists/i586/glibc | 0 config/rootfiles/core/94/update.sh | 2 + lfs/dnsmasq | 4 + lfs/glibc | 1 + ...01-include_0_0_0_0_8_in_DNS_rebind_checks.patch | 41 ++++ ...subnet_to_allow_arbitary_subnet_addresses.patch | 271 +++++++++++++++++++++ ...h_zones_locally_when_localise_queries_set.patch | 34 +++ src/patches/glibc/glibc-rh1217186.patch | 65 +++++ 10 files changed, 418 insertions(+) copy config/rootfiles/{oldcore/90 => core/94}/filelists/armv5tel/glibc (100%) copy config/rootfiles/{oldcore/93 => core/94}/filelists/dnsmasq (100%) copy config/rootfiles/{oldcore/90 => core/94}/filelists/i586/glibc (100%) create mode 100644 src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch create mode 100644 src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch create mode 100644 src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch create mode 100644 src/patches/glibc/glibc-rh1217186.patch Difference in files: diff --git a/config/rootfiles/core/94/filelists/armv5tel/glibc b/config/rootfiles/core/94/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/core/94/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/94/filelists/dnsmasq b/config/rootfiles/core/94/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/94/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/94/filelists/i586/glibc b/config/rootfiles/core/94/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/core/94/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh index 38ca331..d92ef91 100644 --- a/config/rootfiles/core/94/update.sh +++ b/config/rootfiles/core/94/update.sh @@ -33,6 +33,7 @@ done # Stop services /etc/init.d/sshd stop +/etc/init.d/dnsmasq stop # Extract files extract_files @@ -45,6 +46,7 @@ sed -i /etc/ssh/sshd_config \ -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' # Start services +/etc/init.d/dnsmasq start /etc/init.d/sshd start # This update need a reboot... diff --git a/lfs/dnsmasq b/lfs/dnsmasq index f327967..f16c761 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -73,7 +73,11 @@ $(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 -i $(DIR_SRC)/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch + cd $(DIR_APP) && sed -i src/config.h \ -e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \ -e 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' \ diff --git a/lfs/glibc b/lfs/glibc index 4ec71a7..6675065 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -285,6 +285,7 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1183533.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1207995.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1209375.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1217186.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch diff --git a/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch b/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch new file mode 100644 index 0000000..8a2557a --- /dev/null +++ b/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch @@ -0,0 +1,41 @@ +From d2aa7dfbb6d1088dcbea9fecc61b9293b320eb95 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Mon, 3 Aug 2015 21:52:12 +0100 +Subject: [PATCH] Include 0.0.0.0/8 in DNS rebind checks. + +--- + CHANGELOG | 7 +++++++ + src/rfc1035.c | 3 ++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 901da47..3f4026d 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,10 @@ ++version 2.76 ++ Include 0.0.0.0/8 in DNS rebind checks. This range ++ translates to hosts on the local network, or, at ++ least, 0.0.0.0 accesses the local host, so could ++ be targets for DNS rebinding. See RFC 5735 section 3 ++ for details. Thanks to Stephen RÃ¶ttger for the bug report. ++ + version 2.75 + Fix reversion on 2.74 which caused 100% CPU use when a + dhcp-script is configured. Thanks to Adrian Davey for +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 56647b0..29e9e65 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -728,7 +728,8 @@ int private_net(struct in_addr addr, int ban_localhost) + in_addr_t ip_addr = ntohl(addr.s_addr); + + return +- (((ip_addr & 0xFF000000) == 0x7F000000) && ban_localhost) /* 127.0.0.0/8 (loopback) */ || ++ (((ip_addr & 0xFF000000) == 0x7F000000) && ban_localhost) /* 127.0.0.0/8 (loopback) */ || ++ ((ip_addr & 0xFF000000) == 0x00000000) /* RFC 5735 section 3. "here" network */ || + ((ip_addr & 0xFFFF0000) == 0xC0A80000) /* 192.168.0.0/16 (private) */ || + ((ip_addr & 0xFF000000) == 0x0A000000) /* 10.0.0.0/8 (private) */ || + ((ip_addr & 0xFFF00000) == 0xAC100000) /* 172.16.0.0/12 (private) */ || +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch b/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch new file mode 100644 index 0000000..2d3d6e4 --- /dev/null +++ b/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch @@ -0,0 +1,271 @@ +From a7369bef8abd241c3d85633fa9c870943f091e76 Mon Sep 17 00:00:00 2001 +From: Ed Bardsley <ebardsley(a)google.com> +Date: Wed, 5 Aug 2015 21:17:18 +0100 +Subject: [PATCH] Enhance --add-subnet to allow arbitary subnet addresses. + +--- + CHANGELOG | 4 ++++ + man/dnsmasq.8 | 32 ++++++++++++++++++++----------- + src/dnsmasq.h | 13 ++++++++++--- + src/option.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- + src/rfc1035.c | 39 +++++++++++++++++++++++++++++++------- + 5 files changed, 121 insertions(+), 26 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 3f4026d..bbc2834 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -4,6 +4,10 @@ version 2.76 + least, 0.0.0.0 accesses the local host, so could + be targets for DNS rebinding. See RFC 5735 section 3 + for details. Thanks to Stephen RÃ¶ttger for the bug report. ++ ++ Enhance --add-subnet to allow arbitrary subnet addresses. ++ Thanks to Ed Barsley for the patch. ++ + + version 2.75 + Fix reversion on 2.74 which caused 100% CPU use when a +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index c8913b5..a23c898 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -604,17 +604,27 @@ experimental. Also note that exposing MAC addresses in this way may + have security and privacy implications. The warning about caching + given for --add-subnet applies to --add-mac too. + .TP +-.B --add-subnet[[=<IPv4 prefix length>],<IPv6 prefix length>] +-Add the subnet address of the requestor to the DNS queries which are +-forwarded upstream. The amount of the address forwarded depends on the +-prefix length parameter: 32 (128 for IPv6) forwards the whole address, +-zero forwards none of it but still marks the request so that no +-upstream nameserver will add client address information either. The +-default is zero for both IPv4 and IPv6. Note that upstream nameservers +-may be configured to return different results based on this +-information, but the dnsmasq cache does not take account. If a dnsmasq +-instance is configured such that different results may be encountered, +-caching should be disabled. ++.B --add-subnet[[=[<IPv4 address>/]<IPv4 prefix length>][,[<IPv6 address>/]<IPv6 prefix length>]] ++Add a subnet address to the DNS queries which are forwarded ++upstream. If an address is specified in the flag, it will be used, ++otherwise, the address of the requestor will be used. The amount of ++the address forwarded depends on the prefix length parameter: 32 (128 ++for IPv6) forwards the whole address, zero forwards none of it but ++still marks the request so that no upstream nameserver will add client ++address information either. The default is zero for both IPv4 and ++IPv6. Note that upstream nameservers may be configured to return ++different results based on this information, but the dnsmasq cache ++does not take account. If a dnsmasq instance is configured such that ++different results may be encountered, caching should be disabled. ++ ++For example, ++.B --add-subnet=24,96 ++will add the /24 and /96 subnets of the requestor for IPv4 and IPv6 requestors, respectively. ++.B --add-subnet=1.2.3.4/24 ++will add 1.2.3.0/24 for IPv4 requestors and ::/0 for IPv6 requestors. ++.B --add-subnet=1.2.3.4/24,1.2.3.4/24 ++will add 1.2.3.0/24 for both IPv4 and IPv6 requestors. ++ + .TP + .B \-c, --cache-size=<cachesize> + Set the size of dnsmasq's cache. The default is 150 names. Setting the cache size to zero disables caching. +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index cf1a782..f42acdb 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -541,6 +541,13 @@ struct iname { + struct iname *next; + }; + ++/* subnet parameters from command line */ ++struct mysubnet { ++ union mysockaddr addr; ++ int addr_used; ++ int mask; ++}; ++ + /* resolv-file parms from command-line */ + struct resolvc { + struct resolvc *next; +@@ -935,9 +942,9 @@ extern struct daemon { + struct auth_zone *auth_zones; + struct interface_name *int_names; + char *mxtarget; +- int addr4_netmask; +- int addr6_netmask; +- char *lease_file; ++ struct mysubnet *add_subnet4; ++ struct mysubnet *add_subnet6; ++ char *lease_file; + char *username, *groupname, *scriptuser; + char *luascript; + char *authserver, *hostmaster; +diff --git a/src/option.c b/src/option.c +index ecc2619..746cd11 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -445,7 +445,7 @@ static struct { + { LOPT_PXE_SERV, ARG_DUP, "<service>", gettext_noop("Boot service for PXE menu."), NULL }, + { LOPT_TEST, 0, NULL, gettext_noop("Check configuration syntax."), NULL }, + { LOPT_ADD_MAC, OPT_ADD_MAC, NULL, gettext_noop("Add requestor's MAC address to forwarded DNS queries."), NULL }, +- { LOPT_ADD_SBNET, ARG_ONE, "<v4 pref>[,<v6 pref>]", gettext_noop("Add requestor's IP subnet to forwarded DNS queries."), NULL }, ++ { LOPT_ADD_SBNET, ARG_ONE, "<v4 pref>[,<v6 pref>]", gettext_noop("Add specified IP subnet to forwarded DNS queries."), NULL }, + { LOPT_DNSSEC, OPT_DNSSEC_PROXY, NULL, gettext_noop("Proxy DNSSEC validation results from upstream nameservers."), NULL }, + { LOPT_INCR_ADDR, OPT_CONSEC_ADDR, NULL, gettext_noop("Attempt to allocate sequential IP addresses to DHCP clients."), NULL }, + { LOPT_CONNTRACK, OPT_CONNTRACK, NULL, gettext_noop("Copy connection-track mark from queries to upstream connections."), NULL }, +@@ -722,6 +722,20 @@ static void do_usage(void) + + #define ret_err(x) do { strcpy(errstr, (x)); return 0; } while (0) + ++static char *parse_mysockaddr(char *arg, union mysockaddr *addr) ++{ ++ if (inet_pton(AF_INET, arg, &addr->in.sin_addr) > 0) ++ addr->sa.sa_family = AF_INET; ++#ifdef HAVE_IPV6 ++ else if (inet_pton(AF_INET6, arg, &addr->in6.sin6_addr) > 0) ++ addr->sa.sa_family = AF_INET6; ++#endif ++ else ++ return _("bad address"); ++ ++ return NULL; ++} ++ + char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags) + { + int source_port = 0, serv_port = NAMESERVER_PORT; +@@ -1585,7 +1599,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + li = match_suffix->next; + free(match_suffix->suffix); + free(match_suffix); +- } ++ } + break; + } + +@@ -1593,10 +1607,45 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + set_option_bool(OPT_CLIENT_SUBNET); + if (arg) + { ++ char *err, *end; + comma = split(arg); +- if (!atoi_check(arg, &daemon->addr4_netmask) || +- (comma && !atoi_check(comma, &daemon->addr6_netmask))) +- ret_err(gen_err); ++ ++ struct mysubnet* new = opt_malloc(sizeof(struct mysubnet)); ++ if ((end = split_chr(arg, '/'))) ++ { ++ /* has subnet+len */ ++ err = parse_mysockaddr(arg, &new->addr); ++ if (err) ++ ret_err(err); ++ if (!atoi_check(end, &new->mask)) ++ ret_err(gen_err); ++ new->addr_used = 1; ++ } ++ else if (!atoi_check(arg, &new->mask)) ++ ret_err(gen_err); ++ ++ daemon->add_subnet4 = new; ++ ++ new = opt_malloc(sizeof(struct mysubnet)); ++ if (comma) ++ { ++ if ((end = split_chr(comma, '/'))) ++ { ++ /* has subnet+len */ ++ err = parse_mysockaddr(comma, &new->addr); ++ if (err) ++ ret_err(err); ++ if (!atoi_check(end, &new->mask)) ++ ret_err(gen_err); ++ new->addr_used = 1; ++ } ++ else ++ { ++ if (!atoi_check(comma, &new->mask)) ++ ret_err(gen_err); ++ } ++ } ++ daemon->add_subnet6 = new; + } + break; + +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 29e9e65..6a51b30 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -629,26 +629,47 @@ struct subnet_opt { + #endif + }; + ++static void *get_addrp(union mysockaddr *addr, const short family) ++{ ++#ifdef HAVE_IPV6 ++ if (family == AF_INET6) ++ return &addr->in6.sin6_addr; ++#endif ++ ++ return &addr->in.sin_addr; ++} ++ + static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source) + { + /* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */ + + int len; + void *addrp; ++ int sa_family = source->sa.sa_family; + + #ifdef HAVE_IPV6 + if (source->sa.sa_family == AF_INET6) + { +- opt->family = htons(2); +- opt->source_netmask = daemon->addr6_netmask; +- addrp = &source->in6.sin6_addr; ++ opt->source_netmask = daemon->add_subnet6->mask; ++ if (daemon->add_subnet6->addr_used) ++ { ++ sa_family = daemon->add_subnet6->addr.sa.sa_family; ++ addrp = get_addrp(&daemon->add_subnet6->addr, sa_family); ++ } ++ else ++ addrp = &source->in6.sin6_addr; + } + else + #endif + { +- opt->family = htons(1); +- opt->source_netmask = daemon->addr4_netmask; +- addrp = &source->in.sin_addr; ++ opt->source_netmask = daemon->add_subnet4->mask; ++ if (daemon->add_subnet4->addr_used) ++ { ++ sa_family = daemon->add_subnet4->addr.sa.sa_family; ++ addrp = get_addrp(&daemon->add_subnet4->addr, sa_family); ++ } ++ else ++ addrp = &source->in.sin_addr; + } + + opt->scope_netmask = 0; +@@ -656,6 +677,11 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source) + + if (opt->source_netmask != 0) + { ++#ifdef HAVE_IPV6 ++ opt->family = htons(sa_family == AF_INET6 ? 2 : 1); ++#else ++ opt->family = htons(1); ++#endif + len = ((opt->source_netmask - 1) >> 3) + 1; + memcpy(opt->addr, addrp, len); + if (opt->source_netmask & 7) +@@ -2335,4 +2361,3 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + + return len; + } +- +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch b/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch new file mode 100644 index 0000000..cfbcdfb --- /dev/null +++ b/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch @@ -0,0 +1,34 @@ +From 3a3965ac21b1b759eab8799b6edb09195b671306 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Sun, 9 Aug 2015 17:45:06 +0100 +Subject: [PATCH] Don't answer non-auth queries for auth zones locally when + --localise-queries set. + +--- + src/forward.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/forward.c b/src/forward.c +index 2731b90..b76a974 100644 +--- a/src/forward.c ++++ b/src/forward.c +@@ -1365,7 +1365,7 @@ void receive_query(struct listener *listen, time_t now) + + #ifdef HAVE_AUTH + /* find queries for zones we're authoritative for, and answer them directly */ +- if (!auth_dns) ++ if (!auth_dns && !option_bool(OPT_LOCALISE)) + for (zone = daemon->auth_zones; zone; zone = zone->next) + if (in_zone(zone, daemon->namebuff, NULL)) + { +@@ -1904,7 +1904,7 @@ unsigned char *tcp_request(int confd, time_t now, + + #ifdef HAVE_AUTH + /* find queries for zones we're authoritative for, and answer them directly */ +- if (!auth_dns) ++ if (!auth_dns && !option_bool(OPT_LOCALISE)) + for (zone = daemon->auth_zones; zone; zone = zone->next) + if (in_zone(zone, daemon->namebuff, NULL)) + { +-- +1.7.10.4 diff --git a/src/patches/glibc/glibc-rh1217186.patch b/src/patches/glibc/glibc-rh1217186.patch new file mode 100644 index 0000000..6c6c393 --- /dev/null +++ b/src/patches/glibc/glibc-rh1217186.patch @@ -0,0 +1,65 @@ +# +# Author: Carlos O'Donell +# Upstream status: Needs to go upstream (2015-05-07) +# +diff --git a/inet/rcmd.c b/inet/rcmd.c +index acacaa0..9f2443b 100644 +--- a/inet/rcmd.c ++++ b/inet/rcmd.c +@@ -803,29 +803,38 @@ __validuser2_sa(hostf, ra, ralen, luser, ruser, rhost) + *p = '\0'; /* <nul> terminate username (+host?) */ + + /* buf -> host(?) ; user -> username(?) */ ++ if (*buf == '\0') ++ break; ++ if (*user == '\0') ++ user = luser; ++ ++ /* First check the user part. This is an optimization, since ++ one should always check the host first in order to detect ++ negative host checks (which we check for later). */ ++ ucheck = __icheckuser (user, ruser); ++ ++ /* Either we found the user, or we didn't and this is a ++ negative host check. We must do the negative host lookup ++ in order to preserve the semantics of stopping on this line ++ before processing others. */ ++ if (ucheck != 0 || *buf == '-') { ++ ++ /* Next check host part */ ++ hcheck = __checkhost_sa (ra, ralen, buf, rhost); ++ ++ /* Negative '-host user(?)' match? */ ++ if (hcheck < 0) ++ break; + +- /* First check host part */ +- hcheck = __checkhost_sa (ra, ralen, buf, rhost); +- +- if (hcheck < 0) +- break; +- +- if (hcheck) { +- /* Then check user part */ +- if (! (*user)) +- user = luser; +- +- ucheck = __icheckuser (user, ruser); +- +- /* Positive 'host user' match? */ +- if (ucheck > 0) { ++ /* Positive 'host user' match? */ ++ if (hcheck > 0 && ucheck > 0) { + retval = 0; + break; + } + +- /* Negative 'host -user' match? */ +- if (ucheck < 0) +- break; ++ /* Negative 'host -user' match? */ ++ if (hcheck > 0 && ucheck < 0) ++ break; + + /* Neither, go on looking for match */ + } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fb71017b7b3deab74f7811118f1dc0cba5c690d0
by git＠ipfire.org 17 Aug '15

17 Aug '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 31847530ef1653980b134ca2fb7501ad4381c9a5
by git＠ipfire.org 13 Aug '15

13 Aug '15

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 31847530ef1653980b134ca2fb7501ad4381c9a5 (commit) from d2fc4cdb218448ead94431b2af748547b0b34254 (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 31847530ef1653980b134ca2fb7501ad4381c9a5 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Aug 13 17:51:41 2015 +0100 chkconfig: New package Only alternatives and update-alternatives is needed Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/chkconfig | 4 ++++ config/rootfiles/core/94/exclude | 2 ++ config/rootfiles/core/94/filelists/chkconfig | 1 + lfs/{acl => chkconfig} | 15 +++++++-------- make.sh | 1 + 5 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 config/rootfiles/common/chkconfig create mode 120000 config/rootfiles/core/94/filelists/chkconfig copy lfs/{acl => chkconfig} (90%) Difference in files: diff --git a/config/rootfiles/common/chkconfig b/config/rootfiles/common/chkconfig new file mode 100644 index 0000000..0468d2f --- /dev/null +++ b/config/rootfiles/common/chkconfig @@ -0,0 +1,4 @@ +#etc/alternatives +usr/sbin/alternatives +usr/sbin/update-alternatives +#var/lib/alternatives diff --git a/config/rootfiles/core/94/exclude b/config/rootfiles/core/94/exclude index 18e9b4d..4c7aa5a 100644 --- a/config/rootfiles/core/94/exclude +++ b/config/rootfiles/core/94/exclude @@ -1,4 +1,5 @@ boot/config.txt +etc/alternatives etc/collectd.custom etc/ipsec.conf etc/ipsec.secrets @@ -15,6 +16,7 @@ etc/sysconfig/rc.local etc/udev/rules.d/30-persistent-network.rules srv/web/ipfire/html/proxy.pac var/ipfire/ovpn +var/lib/alternatives var/log/cache var/state/dhcp/dhcpd.leases var/updatecache diff --git a/config/rootfiles/core/94/filelists/chkconfig b/config/rootfiles/core/94/filelists/chkconfig new file mode 120000 index 0000000..00ef4cf --- /dev/null +++ b/config/rootfiles/core/94/filelists/chkconfig @@ -0,0 +1 @@ +../../../common/chkconfig \ No newline at end of file diff --git a/lfs/chkconfig b/lfs/chkconfig new file mode 100644 index 0000000..afec454 --- /dev/null +++ b/lfs/chkconfig @@ -0,0 +1,78 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2010 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.5 + +THISAPP = chkconfig-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +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 = 0e59a43ef588a7bba5528b10bb59bef2 + +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 jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make alternatives + cd $(DIR_APP) && install -v -m 755 alternatives /usr/sbin + ln -svf alternatives /usr/sbin/update-alternatives + -mkdir -pv /etc/alternatives /var/lib/alternatives + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 1925929..3687976 100755 --- a/make.sh +++ b/make.sh @@ -633,6 +633,7 @@ buildipfire() { ipfiremake screen ipfiremake smartmontools ipfiremake htop + ipfiremake chkconfig ipfiremake postfix ipfiremake fetchmail ipfiremake cyrus-imapd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d2fc4cdb218448ead94431b2af748547b0b34254
by git＠ipfire.org 13 Aug '15

13 Aug '15

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 d2fc4cdb218448ead94431b2af748547b0b34254 (commit) from 75ec398fe93f38022eba3f64e17c86ed527317f0 (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 d2fc4cdb218448ead94431b2af748547b0b34254 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 13 15:17:24 2015 +0200 move core93 files to oldcore... ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{core => oldcore}/93/filelists/libevent2 | 0 config/rootfiles/{core => oldcore}/93/filelists/nettle | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename config/rootfiles/{core => oldcore}/93/filelists/libevent2 (100%) rename config/rootfiles/{core => oldcore}/93/filelists/nettle (100%) Difference in files: diff --git a/config/rootfiles/core/93/filelists/libevent2 b/config/rootfiles/core/93/filelists/libevent2 deleted file mode 120000 index 42edc99..0000000 --- a/config/rootfiles/core/93/filelists/libevent2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/libevent2 \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/nettle b/config/rootfiles/core/93/filelists/nettle deleted file mode 120000 index f0dba7a..0000000 --- a/config/rootfiles/core/93/filelists/nettle +++ /dev/null @@ -1 +0,0 @@ -../../../common/nettle \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/libevent2 b/config/rootfiles/oldcore/93/filelists/libevent2 new file mode 120000 index 0000000..42edc99 --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/libevent2 @@ -0,0 +1 @@ +../../../common/libevent2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/nettle b/config/rootfiles/oldcore/93/filelists/nettle new file mode 120000 index 0000000..f0dba7a --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/nettle @@ -0,0 +1 @@ +../../../common/nettle \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 75ec398fe93f38022eba3f64e17c86ed527317f0
by git＠ipfire.org 13 Aug '15

13 Aug '15

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 75ec398fe93f38022eba3f64e17c86ed527317f0 (commit) via ee732b26aafc9122d02b75604aef02c584b349c3 (commit) via edb56d84fac2a93351a2030b1485c3b4baa81e01 (commit) via a8379a53d4bcde7e72463446d7f40e92534d532e (commit) via 3ae89dd63c69c3ba2c3854e9b211fecad02717b7 (commit) via 3ba1f74eb3f3a2fafe54fa26c8cd075a39ee7cfa (commit) from 45b6ea63afc826ee0500f54f66beeb102c8445e0 (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 75ec398fe93f38022eba3f64e17c86ed527317f0 Merge: ee732b2 45b6ea6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 13 15:13:22 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libevent2 | 4 ++-- config/rootfiles/core/93/filelists/libevent2 | 1 + config/rootfiles/{oldcore/80 => core/93}/filelists/nettle | 0 config/rootfiles/oldcore/93/update.sh | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/93/filelists/libevent2 copy config/rootfiles/{oldcore/80 => core/93}/filelists/nettle (100%) Difference in files: diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libevent2 index 5beb5f8..aab354e 100644 --- a/config/rootfiles/common/libevent2 +++ b/config/rootfiles/common/libevent2 @@ -34,12 +34,12 @@ usr/lib/libevent_openssl-2.0.so.5 usr/lib/libevent_openssl-2.0.so.5.1.9 #usr/lib/libevent_openssl.a #usr/lib/libevent_openssl.la -#usr/lib/libevent_openssl.so +usr/lib/libevent_openssl.so usr/lib/libevent_pthreads-2.0.so.5 usr/lib/libevent_pthreads-2.0.so.5.1.9 #usr/lib/libevent_pthreads.a #usr/lib/libevent_pthreads.la -#usr/lib/libevent_pthreads.so +usr/lib/libevent_pthreads.so #usr/lib/pkgconfig/libevent.pc #usr/lib/pkgconfig/libevent_openssl.pc #usr/lib/pkgconfig/libevent_pthreads.pc diff --git a/config/rootfiles/core/93/filelists/libevent2 b/config/rootfiles/core/93/filelists/libevent2 new file mode 120000 index 0000000..42edc99 --- /dev/null +++ b/config/rootfiles/core/93/filelists/libevent2 @@ -0,0 +1 @@ +../../../common/libevent2 \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/nettle b/config/rootfiles/core/93/filelists/nettle new file mode 120000 index 0000000..f0dba7a --- /dev/null +++ b/config/rootfiles/core/93/filelists/nettle @@ -0,0 +1 @@ +../../../common/nettle \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/update.sh b/config/rootfiles/oldcore/93/update.sh index e4e88a3..4644543 100644 --- a/config/rootfiles/oldcore/93/update.sh +++ b/config/rootfiles/oldcore/93/update.sh @@ -32,6 +32,7 @@ do done # Stop services +/etc/init.d/dnsmasq stop /etc/init.d/squid stop # Extract files @@ -46,6 +47,7 @@ rm -f /opt/pakfire/db/rootfiles/libevent2 # Start services /etc/init.d/squid start +/etc/init.d/dnsmasq start # This update need a reboot... #touch /var/run/need_reboot @@ -55,7 +57,7 @@ rm -f /opt/pakfire/db/rootfiles/libevent2 sendprofile # Update grub config to display new core version if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig > /boot/grub/grub.cfg + grub-mkconfig -o /boot/grub/grub.cfg fi sync hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. ee732b26aafc9122d02b75604aef02c584b349c3
by git＠ipfire.org 13 Aug '15

13 Aug '15

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 ee732b26aafc9122d02b75604aef02c584b349c3 (commit) via edb56d84fac2a93351a2030b1485c3b4baa81e01 (commit) via a8379a53d4bcde7e72463446d7f40e92534d532e (commit) via 3ae89dd63c69c3ba2c3854e9b211fecad02717b7 (commit) via 3ba1f74eb3f3a2fafe54fa26c8cd075a39ee7cfa (commit) from 9b1643fc3fd64a6ea0d5d02f20ceaa48b8fc8e41 (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 ee732b26aafc9122d02b75604aef02c584b349c3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 13 14:43:33 2015 +0200 core93: add libevent2 to updater. commit edb56d84fac2a93351a2030b1485c3b4baa81e01 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 13 14:42:39 2015 +0200 libevent2: rootfile update. commit a8379a53d4bcde7e72463446d7f40e92534d532e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 11 15:31:26 2015 +0200 core93: prevent erase content of grub.conf if grub-mkconfig run into in error. commit 3ae89dd63c69c3ba2c3854e9b211fecad02717b7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 10 22:43:30 2015 +0200 core93: add nettle to update. commit 3ba1f74eb3f3a2fafe54fa26c8cd075a39ee7cfa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 10 20:09:15 2015 +0200 core93: stop/start dnsmasq at update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libevent2 | 4 ++-- config/rootfiles/core/93/filelists/libevent2 | 1 + config/rootfiles/{oldcore/80 => core/93}/filelists/nettle | 0 config/rootfiles/core/93/update.sh | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/93/filelists/libevent2 copy config/rootfiles/{oldcore/80 => core/93}/filelists/nettle (100%) Difference in files: diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libevent2 index 5beb5f8..aab354e 100644 --- a/config/rootfiles/common/libevent2 +++ b/config/rootfiles/common/libevent2 @@ -34,12 +34,12 @@ usr/lib/libevent_openssl-2.0.so.5 usr/lib/libevent_openssl-2.0.so.5.1.9 #usr/lib/libevent_openssl.a #usr/lib/libevent_openssl.la -#usr/lib/libevent_openssl.so +usr/lib/libevent_openssl.so usr/lib/libevent_pthreads-2.0.so.5 usr/lib/libevent_pthreads-2.0.so.5.1.9 #usr/lib/libevent_pthreads.a #usr/lib/libevent_pthreads.la -#usr/lib/libevent_pthreads.so +usr/lib/libevent_pthreads.so #usr/lib/pkgconfig/libevent.pc #usr/lib/pkgconfig/libevent_openssl.pc #usr/lib/pkgconfig/libevent_pthreads.pc diff --git a/config/rootfiles/core/93/filelists/libevent2 b/config/rootfiles/core/93/filelists/libevent2 new file mode 120000 index 0000000..42edc99 --- /dev/null +++ b/config/rootfiles/core/93/filelists/libevent2 @@ -0,0 +1 @@ +../../../common/libevent2 \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/nettle b/config/rootfiles/core/93/filelists/nettle new file mode 120000 index 0000000..f0dba7a --- /dev/null +++ b/config/rootfiles/core/93/filelists/nettle @@ -0,0 +1 @@ +../../../common/nettle \ No newline at end of file diff --git a/config/rootfiles/core/93/update.sh b/config/rootfiles/core/93/update.sh index e4e88a3..4644543 100644 --- a/config/rootfiles/core/93/update.sh +++ b/config/rootfiles/core/93/update.sh @@ -32,6 +32,7 @@ do done # Stop services +/etc/init.d/dnsmasq stop /etc/init.d/squid stop # Extract files @@ -46,6 +47,7 @@ rm -f /opt/pakfire/db/rootfiles/libevent2 # Start services /etc/init.d/squid start +/etc/init.d/dnsmasq start # This update need a reboot... #touch /var/run/need_reboot @@ -55,7 +57,7 @@ rm -f /opt/pakfire/db/rootfiles/libevent2 sendprofile # Update grub config to display new core version if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig > /boot/grub/grub.cfg + grub-mkconfig -o /boot/grub/grub.cfg fi sync hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core93, updated. ee732b26aafc9122d02b75604aef02c584b349c3
by git＠ipfire.org 13 Aug '15

13 Aug '15

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, core93 has been updated via ee732b26aafc9122d02b75604aef02c584b349c3 (commit) via edb56d84fac2a93351a2030b1485c3b4baa81e01 (commit) from a8379a53d4bcde7e72463446d7f40e92534d532e (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 ee732b26aafc9122d02b75604aef02c584b349c3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 13 14:43:33 2015 +0200 core93: add libevent2 to updater. commit edb56d84fac2a93351a2030b1485c3b4baa81e01 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 13 14:42:39 2015 +0200 libevent2: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libevent2 | 4 ++-- config/rootfiles/core/93/filelists/libevent2 | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 config/rootfiles/core/93/filelists/libevent2 Difference in files: diff --git a/config/rootfiles/common/libevent2 b/config/rootfiles/common/libevent2 index 5beb5f8..aab354e 100644 --- a/config/rootfiles/common/libevent2 +++ b/config/rootfiles/common/libevent2 @@ -34,12 +34,12 @@ usr/lib/libevent_openssl-2.0.so.5 usr/lib/libevent_openssl-2.0.so.5.1.9 #usr/lib/libevent_openssl.a #usr/lib/libevent_openssl.la -#usr/lib/libevent_openssl.so +usr/lib/libevent_openssl.so usr/lib/libevent_pthreads-2.0.so.5 usr/lib/libevent_pthreads-2.0.so.5.1.9 #usr/lib/libevent_pthreads.a #usr/lib/libevent_pthreads.la -#usr/lib/libevent_pthreads.so +usr/lib/libevent_pthreads.so #usr/lib/pkgconfig/libevent.pc #usr/lib/pkgconfig/libevent_openssl.pc #usr/lib/pkgconfig/libevent_pthreads.pc diff --git a/config/rootfiles/core/93/filelists/libevent2 b/config/rootfiles/core/93/filelists/libevent2 new file mode 120000 index 0000000..42edc99 --- /dev/null +++ b/config/rootfiles/core/93/filelists/libevent2 @@ -0,0 +1 @@ +../../../common/libevent2 \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 45b6ea63afc826ee0500f54f66beeb102c8445e0
by git＠ipfire.org 12 Aug '15

12 Aug '15

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 45b6ea63afc826ee0500f54f66beeb102c8445e0 (commit) via 7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1 (commit) from 9b1643fc3fd64a6ea0d5d02f20ceaa48b8fc8e41 (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 45b6ea63afc826ee0500f54f66beeb102c8445e0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 12 14:01:55 2015 +0100 openssh: Update to 7.0p1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 12 13:59:00 2015 +0100 Start Core Update 94 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{93 => 94}/exclude | 0 config/rootfiles/{oldcore/88 => core/94}/filelists/files | 1 + .../rootfiles/{oldcore/92 => core/94}/filelists/openssh | 0 config/rootfiles/core/{93 => 94}/meta | 0 config/rootfiles/core/{93 => 94}/update.sh | 16 ++++++++-------- config/rootfiles/oldcore/{92 => 93}/exclude | 0 config/rootfiles/{core => oldcore}/93/filelists/bind | 0 config/rootfiles/{core => oldcore}/93/filelists/daq | 0 config/rootfiles/{core => oldcore}/93/filelists/ddns | 0 config/rootfiles/{core => oldcore}/93/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/93/filelists/files | 0 config/rootfiles/{core => oldcore}/93/filelists/libpcap | 0 config/rootfiles/{core => oldcore}/93/filelists/pcre | 0 config/rootfiles/{core => oldcore}/93/filelists/squid | 0 config/rootfiles/oldcore/{92 => 93}/meta | 0 config/rootfiles/{core => oldcore}/93/update.sh | 0 lfs/openssh | 5 +++-- make.sh | 2 +- 18 files changed, 13 insertions(+), 11 deletions(-) rename config/rootfiles/core/{93 => 94}/exclude (100%) copy config/rootfiles/{oldcore/88 => core/94}/filelists/files (63%) copy config/rootfiles/{oldcore/92 => core/94}/filelists/openssh (100%) rename config/rootfiles/core/{93 => 94}/meta (100%) copy config/rootfiles/core/{93 => 94}/update.sh (90%) copy config/rootfiles/oldcore/{92 => 93}/exclude (100%) rename config/rootfiles/{core => oldcore}/93/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/93/filelists/daq (100%) rename config/rootfiles/{core => oldcore}/93/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/93/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/93/filelists/files (100%) rename config/rootfiles/{core => oldcore}/93/filelists/libpcap (100%) rename config/rootfiles/{core => oldcore}/93/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/93/filelists/squid (100%) copy config/rootfiles/oldcore/{92 => 93}/meta (100%) rename config/rootfiles/{core => oldcore}/93/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/93/exclude b/config/rootfiles/core/93/exclude deleted file mode 100644 index 18e9b4d..0000000 --- a/config/rootfiles/core/93/exclude +++ /dev/null @@ -1,20 +0,0 @@ -boot/config.txt -etc/collectd.custom -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/ovpn -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/93/filelists/bind b/config/rootfiles/core/93/filelists/bind deleted file mode 120000 index 48a0eba..0000000 --- a/config/rootfiles/core/93/filelists/bind +++ /dev/null @@ -1 +0,0 @@ -../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/daq b/config/rootfiles/core/93/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/93/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/ddns b/config/rootfiles/core/93/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/93/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/dnsmasq b/config/rootfiles/core/93/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/93/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/files b/config/rootfiles/core/93/filelists/files deleted file mode 100644 index bec26b8..0000000 --- a/config/rootfiles/core/93/filelists/files +++ /dev/null @@ -1,11 +0,0 @@ -etc/system-release -etc/issue -opt/pakfire/pakfire -opt/pakfire/lib/functions.pl -srv/web/ipfire/html/themes/darkdos/include/functions.pl -srv/web/ipfire/html/themes/ipfire/include/css/style.css -srv/web/ipfire/html/themes/ipfire/include/functions.pl -srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl -srv/web/ipfire/html/themes/maniac/include/functions.pl -var/ipfire/backup/include -var/ipfire/langs diff --git a/config/rootfiles/core/93/filelists/libpcap b/config/rootfiles/core/93/filelists/libpcap deleted file mode 120000 index c7f9f52..0000000 --- a/config/rootfiles/core/93/filelists/libpcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/pcre b/config/rootfiles/core/93/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/93/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/squid b/config/rootfiles/core/93/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/93/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/93/meta b/config/rootfiles/core/93/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/93/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/93/update.sh b/config/rootfiles/core/93/update.sh deleted file mode 100644 index e4e88a3..0000000 --- a/config/rootfiles/core/93/update.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Remove old core updates from pakfire cache to save space... -core=93 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# Stop services -/etc/init.d/squid stop - -# Extract files -extract_files - -# Remove libevent2 addon meta and rootfile. libevent2 is now in core. -rm -f /opt/pakfire/db/*/meta-libevent2 -rm -f /opt/pakfire/db/rootfiles/libevent2 - -# Update Language cache -/usr/local/bin/update-lang-cache - -# Start services -/etc/init.d/squid start - -# This update need a reboot... -#touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig > /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/94/exclude b/config/rootfiles/core/94/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/core/94/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files new file mode 100644 index 0000000..168c7d1 --- /dev/null +++ b/config/rootfiles/core/94/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/langs diff --git a/config/rootfiles/core/94/filelists/openssh b/config/rootfiles/core/94/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/94/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/94/meta b/config/rootfiles/core/94/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/94/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh new file mode 100644 index 0000000..38ca331 --- /dev/null +++ b/config/rootfiles/core/94/update.sh @@ -0,0 +1,63 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=94 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/sshd stop + +# Extract files +extract_files + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Update SSH configuration +sed -i /etc/ssh/sshd_config \ + -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' + +# Start services +/etc/init.d/sshd start + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/93/exclude b/config/rootfiles/oldcore/93/exclude new file mode 100644 index 0000000..18e9b4d --- /dev/null +++ b/config/rootfiles/oldcore/93/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/93/filelists/bind b/config/rootfiles/oldcore/93/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/daq b/config/rootfiles/oldcore/93/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/ddns b/config/rootfiles/oldcore/93/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/dnsmasq b/config/rootfiles/oldcore/93/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/files b/config/rootfiles/oldcore/93/filelists/files new file mode 100644 index 0000000..bec26b8 --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/files @@ -0,0 +1,11 @@ +etc/system-release +etc/issue +opt/pakfire/pakfire +opt/pakfire/lib/functions.pl +srv/web/ipfire/html/themes/darkdos/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/functions.pl +var/ipfire/backup/include +var/ipfire/langs diff --git a/config/rootfiles/oldcore/93/filelists/libpcap b/config/rootfiles/oldcore/93/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/pcre b/config/rootfiles/oldcore/93/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/filelists/squid b/config/rootfiles/oldcore/93/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/oldcore/93/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/oldcore/93/meta b/config/rootfiles/oldcore/93/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/93/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/93/update.sh b/config/rootfiles/oldcore/93/update.sh new file mode 100644 index 0000000..e4e88a3 --- /dev/null +++ b/config/rootfiles/oldcore/93/update.sh @@ -0,0 +1,63 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2015 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=93 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services +/etc/init.d/squid stop + +# Extract files +extract_files + +# Remove libevent2 addon meta and rootfile. libevent2 is now in core. +rm -f /opt/pakfire/db/*/meta-libevent2 +rm -f /opt/pakfire/db/rootfiles/libevent2 + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/squid start + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig > /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/lfs/openssh b/lfs/openssh index 7e6e376..ef70f20 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 6.8p1 +VER = 7.0p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 08f72de6751acfbd0892b5f003922701 +$(DL_FILE)_MD5 = 831883f251ac34f0ab9c812acc24ee69 install : $(TARGET) @@ -90,6 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \ -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \ -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \ + -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \ /etc/ssh/sshd_config @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4f6eedb..1925929 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="93" # Core Level (Filename) +CORE="94" # Core Level (Filename) PAKFIRE_CORE="93" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2015