IPFire-SCM March 2016

ipfire-scm@lists.ipfire.org

1 participants
61 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 46ce813e330925e0ab5969cf3e34c9e49fb9df88
by git＠ipfire.org 10 Mar '16

10 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 46ce813e330925e0ab5969cf3e34c9e49fb9df88 (commit) from 9ef4bbf7032d6727a6debc10702e9beacd0b097d (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 46ce813e330925e0ab5969cf3e34c9e49fb9df88 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 19:22:04 2016 +0000 setup: Fix segmentation fault with more than four NICs found Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/setup/netstuff.c | 8 ++++---- src/setup/setup.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) Difference in files: diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c index f5b3849..240306e 100644 --- a/src/setup/netstuff.c +++ b/src/setup/netstuff.c @@ -601,16 +601,16 @@ int scan_network_cards(void) int nicmenu(int colour) { int rc, choise = 0, count = 0, kcount = 0, mcount = 0, i, j, nic_in_use; - int found_NIC_as_Card[4]; + int found_NIC_as_Card[MAX_NICS]; char message[STRING_SIZE]; char temp[STRING_SIZE]; char cMenuInhalt[STRING_SIZE]; - char MenuInhalt[20][180]; - char *pMenuInhalt[20]; + char MenuInhalt[MAX_NICS][STRING_SIZE]; + char *pMenuInhalt[MAX_NICS]; while (strcmp(nics[count].macaddr, "")) count++; // 2 find how many nics in system - for ( i=0 ; i<4;i++) if (strcmp(knics[i].macaddr, "")) kcount++; // loop to find all knowing nics + for (i=0; i<MAX_NICS; i++) if (strcmp(knics[i].macaddr, "")) kcount++; // loop to find all knowing nics // If new nics are found... if (count > kcount) { diff --git a/src/setup/setup.h b/src/setup/setup.h index 14fd646..a368b78 100644 --- a/src/setup/setup.h +++ b/src/setup/setup.h @@ -55,6 +55,8 @@ int handletimezone(void); #define _ORANGE_CARD_ 2 #define _BLUE_CARD_ 3 +#define MAX_NICS 20 + struct nic { char driver[80]; hooks/post-receive -- IPFire 2.x development tree

1 0

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

10 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 644af49375115e58823a8fc34c7618adbbe620b9 (commit) via c4ea4658b53feb41e58aebb9d944ca05c231455c (commit) via 493752cbc9809f082a400e0ffe1c534f383861eb (commit) via f69c1a4cd7e4c8f4c28e750f50ab24195776fec5 (commit) via 975233c63ac03e5cc0867a2404cf91e027c8326e (commit) via 682d5cbf90bc155f97f774a23ef4ddddaa48d117 (commit) from a3be192a7c02641173709b6d7ea83398c4ebb134 (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 644af49375115e58823a8fc34c7618adbbe620b9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 04:35:40 2016 +0000 ccache: Update to version 3.2.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c4ea4658b53feb41e58aebb9d944ca05c231455c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 04:32:06 2016 +0000 pciutils: Update to version 3.4.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 493752cbc9809f082a400e0ffe1c534f383861eb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 04:15:36 2016 +0000 nettle: Update to version 3.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f69c1a4cd7e4c8f4c28e750f50ab24195776fec5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 04:15:18 2016 +0000 grep: Update to version 2.23 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 975233c63ac03e5cc0867a2404cf91e027c8326e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 04:02:18 2016 +0000 libgcrypt: Update to version 1.6.5 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 682d5cbf90bc155f97f774a23ef4ddddaa48d117 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 10 03:56:28 2016 +0000 ed: Update to version 1.13 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: ccache/ccache.nm | 2 +- ed/ed.nm | 2 +- grep/grep.nm | 2 +- libgcrypt/libgcrypt.nm | 2 +- nettle/nettle.nm | 2 +- pciutils/pciutils.nm | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/ccache/ccache.nm b/ccache/ccache.nm index 8d5d36f..83a3171 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -4,7 +4,7 @@ ############################################################################### name = ccache -version = 3.2.1 +version = 3.2.4 release = 1 groups = Development/Compilers diff --git a/ed/ed.nm b/ed/ed.nm index 4697f5f..2f49c95 100644 --- a/ed/ed.nm +++ b/ed/ed.nm @@ -4,7 +4,7 @@ ############################################################################### name = ed -version = 1.12 +version = 1.13 release = 1 groups = Application/Text diff --git a/grep/grep.nm b/grep/grep.nm index c3bc0e3..c91f67e 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,7 +4,7 @@ ############################################################################### name = grep -version = 2.22 +version = 2.23 release = 1 groups = Applications/Text diff --git a/libgcrypt/libgcrypt.nm b/libgcrypt/libgcrypt.nm index 1f6e017..18f1ae3 100644 --- a/libgcrypt/libgcrypt.nm +++ b/libgcrypt/libgcrypt.nm @@ -4,7 +4,7 @@ ############################################################################### name = libgcrypt -version = 1.6.3 +version = 1.6.5 release = 1 groups = System/Libraries diff --git a/nettle/nettle.nm b/nettle/nettle.nm index 9522b64..9f2213f 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -4,7 +4,7 @@ ############################################################################### name = nettle -version = 3.1.1 +version = 3.2 release = 1 groups = System/Libraries diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm index f280520..dc6f8d5 100644 --- a/pciutils/pciutils.nm +++ b/pciutils/pciutils.nm @@ -4,7 +4,7 @@ ############################################################################### name = pciutils -version = 3.2.1 +version = 3.4.1 release = 1 groups = System/Base hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9ef4bbf7032d6727a6debc10702e9beacd0b097d
by git＠ipfire.org 08 Mar '16

08 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9ef4bbf7032d6727a6debc10702e9beacd0b097d (commit) via 8c1cf3b1f929ecd085827469ccb02ab9459de711 (commit) from cb679b1eb965e0df188b50ab0337cf1687ed70cb (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 9ef4bbf7032d6727a6debc10702e9beacd0b097d Merge: cb679b1 8c1cf3b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 8 22:45:04 2016 +0000 Merge branch 'bird' into next commit 8c1cf3b1f929ecd085827469ccb02ab9459de711 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 8 22:44:01 2016 +0000 bird: New package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/bird | 4 ++++ lfs/{dnsdist => bird} | 17 ++++++++++------- make.sh | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 config/rootfiles/packages/bird copy lfs/{dnsdist => bird} (92%) Difference in files: diff --git a/config/rootfiles/packages/bird b/config/rootfiles/packages/bird new file mode 100644 index 0000000..fd2b8ec --- /dev/null +++ b/config/rootfiles/packages/bird @@ -0,0 +1,4 @@ +etc/bird.conf +usr/sbin/bird +usr/sbin/birdc +usr/sbin/birdcl diff --git a/lfs/bird b/lfs/bird new file mode 100644 index 0000000..27f3556 --- /dev/null +++ b/lfs/bird @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 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.0 + +THISAPP = bird-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = bird +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 330bde6372afa106abfe5a9737e471c1 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index 8392e30..a612afc 100755 --- a/make.sh +++ b/make.sh @@ -848,6 +848,7 @@ buildipfire() { ipfiremake ipset ipfiremake lua ipfiremake dnsdist + ipfiremake bird } buildinstaller() { hooks/post-receive -- IPFire 2.x development tree

1 0

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

08 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via a3be192a7c02641173709b6d7ea83398c4ebb134 (commit) from 7688a412dfc8d2cfea0e4813ea2aacef091e9c04 (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 a3be192a7c02641173709b6d7ea83398c4ebb134 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 8 13:17:14 2016 +0000 mpfr: Update to version 3.1.4 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: mpfr/mpfr.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index bd16417..7f3b608 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -4,7 +4,7 @@ ############################################################################### name = mpfr -version = 3.1.3 +version = 3.1.4 release = 1 groups = System/Libraries hooks/post-receive -- IPFire 3.x development tree

1 0

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

08 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via cb679b1eb965e0df188b50ab0337cf1687ed70cb (commit) from 03022f412ef2d4cfd0bad133988f2cc3312728d1 (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 cb679b1eb965e0df188b50ab0337cf1687ed70cb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 8 21:32:29 2016 +0100 core100: add missing openssl rootfile to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/97 => core/100}/filelists/openssl | 0 1 file changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/97 => core/100}/filelists/openssl (100%) Difference in files: diff --git a/config/rootfiles/core/100/filelists/openssl b/config/rootfiles/core/100/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/100/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ 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. 03022f412ef2d4cfd0bad133988f2cc3312728d1
by git＠ipfire.org 08 Mar '16

08 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 03022f412ef2d4cfd0bad133988f2cc3312728d1 (commit) via 593e2eeb0320285c309686668b73744973d0a944 (commit) via 88cc99094805eb3133cac3eec0005844f5904721 (commit) via f83c50537bcb4b74bebcff83f86f69b60def544f (commit) from 822b4313d1029bcfa19ec6cc2f36da128001ab24 (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 03022f412ef2d4cfd0bad133988f2cc3312728d1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 8 20:29:59 2016 +0100 core100: ship openssl (build with new gcc) Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 593e2eeb0320285c309686668b73744973d0a944 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 8 20:28:12 2016 +0100 core100: ship glibc (build with new gcc) Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 88cc99094805eb3133cac3eec0005844f5904721 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 8 20:01:49 2016 +0100 core100: add kernel to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit f83c50537bcb4b74bebcff83f86f69b60def544f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Mar 8 19:31:49 2016 +0100 core100: add function to set last correct installed core on update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../98 => core/100}/filelists/armv5tel/glibc | 0 .../100}/filelists/armv5tel/linux-kirkwood | 0 .../95 => core/100}/filelists/armv5tel/linux-multi | 0 .../95 => core/100}/filelists/armv5tel/linux-rpi | 0 .../{oldcore/98 => core/100}/filelists/i586/glibc | 0 .../{oldcore/95 => core/100}/filelists/i586/linux | 0 .../95 => core/100}/filelists/i586/linux-initrd | 0 .../97 => core/100}/filelists/i586/openssl-sse2 | 0 .../98 => core/100}/filelists/x86_64/glibc | 0 .../95 => core/100}/filelists/x86_64/linux | 0 .../95 => core/100}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/100/update.sh | 195 ++++++++++++++++++++- 12 files changed, 191 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/98 => core/100}/filelists/armv5tel/glibc (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/armv5tel/linux-rpi (100%) copy config/rootfiles/{oldcore/98 => core/100}/filelists/i586/glibc (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/97 => core/100}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/98 => core/100}/filelists/x86_64/glibc (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/x86_64/linux-initrd (100%) Difference in files: diff --git a/config/rootfiles/core/100/filelists/armv5tel/glibc b/config/rootfiles/core/100/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-multi b/config/rootfiles/core/100/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-rpi b/config/rootfiles/core/100/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/glibc b/config/rootfiles/core/100/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux b/config/rootfiles/core/100/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux-initrd b/config/rootfiles/core/100/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/openssl-sse2 b/config/rootfiles/core/100/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/glibc b/config/rootfiles/core/100/filelists/x86_64/glibc new file mode 120000 index 0000000..1119099 --- /dev/null +++ b/config/rootfiles/core/100/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/linux b/config/rootfiles/core/100/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/core/100/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/linux-initrd b/config/rootfiles/core/100/filelists/x86_64/linux-initrd new file mode 120000 index 0000000..1b9fff7 --- /dev/null +++ b/config/rootfiles/core/100/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/update.sh b/config/rootfiles/core/100/update.sh index 8745ff1..a547431 100644 --- a/config/rootfiles/core/100/update.sh +++ b/config/rootfiles/core/100/update.sh @@ -24,36 +24,223 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 -# Remove old core updates from pakfire cache to save space... +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + core=100 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi +#to do add touch for arm kernel and initrd here + ;; +esac + # Stop services +/etc/init.d/snort stop /etc/init.d/squid stop /etc/init.d/dnsmasq stop +/etc/init.d/ipsec stop +/etc/init.d/ntp stop +/etc/init.d/apache stop + # Extract files -extract_files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + + + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# restart init because the glibc was updated. +telinit u # Fix hardening flags in grub paxctl -mpexs /usr/bin/grub-script-check +# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + # Update Language cache -# /usr/local/bin/update-lang-cache +/usr/local/bin/update-lang-cache +# # Start services +# +/etc/init.d/apache start +/etc/init.d/ntp start /etc/init.d/dnsmasq start /etc/init.d/sshd restart /etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # Delete old QoS enabled indicator rm -f /var/ipfire/qos/enable +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + # This update need a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot # Finish /etc/init.d/fireinfo start hooks/post-receive -- IPFire 2.x development tree

1 0

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

05 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 822b4313d1029bcfa19ec6cc2f36da128001ab24 (commit) via 4f472f86f854a5460c4fa8eb63fd1a4393d6099d (commit) from 4a6cfe51a16575c7100862e2cc6f959bc48c6628 (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 822b4313d1029bcfa19ec6cc2f36da128001ab24 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 5 17:09:32 2016 +0100 kernel: update to 3.14.63 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4f472f86f854a5460c4fa8eb63fd1a4393d6099d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Mar 5 17:07:23 2016 +0100 flash-images: copy kernel and initrd first there is a u-boot bug that not find all files if the directory entries was splittet to more sectors so copy the important files first. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/flash-images | 5 +++++ lfs/linux | 16 ++++++++-------- src/patches/arm-multi-grsec-compile-fixes.patch | 12 ++++++++++++ 3 files changed, 25 insertions(+), 8 deletions(-) Difference in files: diff --git a/lfs/flash-images b/lfs/flash-images index 0d57a2a..d10fc9b 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -121,9 +121,14 @@ ifeq "$(MACHINE_TYPE)" "arm" cp -v /boot/MLO $(MNThdd)/boot/ cp -v /boot/u-boot.img $(MNThdd)/boot/ cp -v /boot/zImage-ipfire-multi $(MNThdd)/boot/ + cp -v /boot/uInit-ipfire-multi $(MNThdd)/boot/ + cp -v /boot/uImage-ipfire-kirkwood $(MNThdd)/boot/ + cp -v /boot/uInit-ipfire-kirkwood $(MNThdd)/boot/ + cp -v /boot/uEnv.txt $(MNThdd)/boot/ # work around a u-boot bug not find the folders sometimes mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-multi mkdir -pv $(MNThdd)/boot/dtb-$(KVER)-ipfire-kirkwood + sync umount $(MNThdd)/boot mount $(PART_BOOT) $(MNThdd)/boot diff --git a/lfs/linux b/lfs/linux index 262e591..b0c2635 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.14.62 -RPI_PATCHES = 3.14.62-grsec-ipfire1 -A7M_PATCHES = 3.14.62-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1ipfire-3.14.62-v1.patch.xz +VER = 3.14.63 +RPI_PATCHES = 3.14.63-grsec-ipfire1 +A7M_PATCHES = 3.14.63-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1ipfire-3.14.63-v1.patch.xz THISAPP = linux-$(VER) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 84dd675bb2024beb18ade2fe55e7b47d -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 6f84442e9c00aab43e8118db199107c4 -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 4ed04c218c0a84a6a1954d220ad601b6 -$(GRS_PATCHES)_MD5 = 9a77776b2740084dc80846e707bca0e3 +$(DL_FILE)_MD5 = 6cf8a6b23849f47f511e0e46cfdb6392 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 0d1059c18f4810abbe9aafb6beab445b +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 589eb8703fa2ba2944b2f925b7f7ffb3 +$(GRS_PATCHES)_MD5 = e84b05c9083fa0eb6bb49facd4f841dc install : $(TARGET) diff --git a/src/patches/arm-multi-grsec-compile-fixes.patch b/src/patches/arm-multi-grsec-compile-fixes.patch index 530d69e..fb0d39b 100644 --- a/src/patches/arm-multi-grsec-compile-fixes.patch +++ b/src/patches/arm-multi-grsec-compile-fixes.patch @@ -9,3 +9,15 @@ static struct clk_ops dpll1_ck_ops_34xx __initdata = { .init = &omap2_init_clk_clkdm, +diff -Naur linux-3.14.63-org/net/ipv6/addrconf.c linux-3.14.63/net/ipv6/addrconf.c +--- linux-3.14.63-org/net/ipv6/addrconf.c 2016-03-04 22:56:07.375481749 +0100 ++++ linux-3.14.63/net/ipv6/addrconf.c 2016-03-04 23:08:34.285482105 +0100 +@@ -4818,7 +4818,7 @@ + { + struct inet6_dev *idev = ctl->extra1; + int min_mtu = IPV6_MIN_MTU; +- struct ctl_table lctl; ++ ctl_table_no_const lctl; + + lctl = *ctl; + lctl.extra1 = &min_mtu; hooks/post-receive -- IPFire 2.x development tree

1 0

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

04 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4a6cfe51a16575c7100862e2cc6f959bc48c6628 (commit) via 75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0 (commit) via 353e08cd7778f2070469842ebe0f553e648f79d4 (commit) via 5d95fd5af11e8631cbaed1e5f8c914facd0b2125 (commit) via ac385b2f17ef142101165bdd9b31206bd86998dc (commit) via d86a24928625c47d46d17daad18f159d28678ee4 (commit) via 68537369b0c9fa551bc9db31ccc2d1b116badde8 (commit) via eea5bfe4656963628c1888afe106a51875752372 (commit) via aced5a957861710fb8b5fc94aa87fc29ceb9b3ec (commit) via 7e90cf38cb0f3fcee6e3e4baf0d629233f769d51 (commit) via defc321f04783b58a1a8ad45c77560d445eed6d6 (commit) via aacab139dc272d9c1b42340100cccb15cd7a302f (commit) via 829b0ba85156fbf3514b3f5d5b13c0f3254fae49 (commit) via 8c065b268d8c04c48e76dde8109381823a601908 (commit) via 2e51e8607e3b45b41a984f95c81c257a41107cff (commit) from 64835e022c52d24432d201bd4d57f1aa962c1f90 (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 4a6cfe51a16575c7100862e2cc6f959bc48c6628 Merge: 64835e0 75ad2e4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Mar 4 07:09:02 2016 +0100 Merge remote-tracking branch 'origin/master' into next Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/include | 2 +- config/rootfiles/common/openssh | 1 - config/rootfiles/{oldcore/98 => core/99}/exclude | 0 .../rootfiles/{oldcore/88 => core/99}/filelists/files | 1 + .../97 => core/99}/filelists/i586/openssl-sse2 | 0 .../{oldcore/97 => core/99}/filelists/openssh | 0 .../{oldcore/97 => core/99}/filelists/openssl | 0 config/rootfiles/{oldcore/98 => core/99}/meta | 0 config/rootfiles/{oldcore/97 => core/99}/update.sh | 7 +++++-- config/rootfiles/oldcore/98/update.sh | 5 ++++- lfs/openssh | 6 +++--- lfs/openssl | 7 ++++--- lfs/stunnel | 2 +- make.sh | 2 +- src/patches/openssl-1.0.2g-disable-sslv2v3.patch | 18 ++++++++++++++++++ src/patches/openssl-disable-sslv2-sslv3.patch | 12 ------------ 16 files changed, 38 insertions(+), 25 deletions(-) copy config/rootfiles/{oldcore/98 => core/99}/exclude (100%) copy config/rootfiles/{oldcore/88 => core/99}/filelists/files (52%) copy config/rootfiles/{oldcore/97 => core/99}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/97 => core/99}/filelists/openssh (100%) copy config/rootfiles/{oldcore/97 => core/99}/filelists/openssl (100%) copy config/rootfiles/{oldcore/98 => core/99}/meta (100%) copy config/rootfiles/{oldcore/97 => core/99}/update.sh (95%) create mode 100644 src/patches/openssl-1.0.2g-disable-sslv2v3.patch delete mode 100644 src/patches/openssl-disable-sslv2-sslv3.patch Difference in files: diff --git a/config/backup/include b/config/backup/include index 6ecb930..eb76ebf 100644 --- a/config/backup/include +++ b/config/backup/include @@ -33,7 +33,7 @@ /var/log/ip-acct/* /var/log/rrd/* /var/log/rrd/collectd -/var/log/rrd/vnstat +/var/log/vnstat /etc/sysconfig/firewall.local /etc/sysconfig/rc.local /root/.gitconfig diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh index 1b6ded3..c33003f 100644 --- a/config/rootfiles/common/openssh +++ b/config/rootfiles/common/openssh @@ -14,7 +14,6 @@ etc/ssh/ssh_config etc/ssh/sshd_config usr/bin/scp usr/bin/sftp -usr/bin/slogin usr/bin/ssh usr/bin/ssh-add usr/bin/ssh-agent diff --git a/config/rootfiles/core/99/exclude b/config/rootfiles/core/99/exclude new file mode 100644 index 0000000..d87f175 --- /dev/null +++ b/config/rootfiles/core/99/exclude @@ -0,0 +1,25 @@ +boot/config.txt +etc/alternatives +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/99/filelists/files b/config/rootfiles/core/99/filelists/files new file mode 100644 index 0000000..76b5b4e --- /dev/null +++ b/config/rootfiles/core/99/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/backup/include diff --git a/config/rootfiles/core/99/filelists/i586/openssl-sse2 b/config/rootfiles/core/99/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/99/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssh b/config/rootfiles/core/99/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/core/99/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/99/filelists/openssl b/config/rootfiles/core/99/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/99/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/99/meta b/config/rootfiles/core/99/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/99/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/99/update.sh b/config/rootfiles/core/99/update.sh new file mode 100644 index 0000000..b57d0a7 --- /dev/null +++ b/config/rootfiles/core/99/update.sh @@ -0,0 +1,62 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=99 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# remove slogin which is not included in new OpenSSH +rm /usr/bin/slogin + +# Extract files +extract_files + +# Update Language cache +# /usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/sshd restart +/etc/init.d/apache restart + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/98/update.sh b/config/rootfiles/oldcore/98/update.sh index ec9c1aa..7e0cc2d 100644 --- a/config/rootfiles/oldcore/98/update.sh +++ b/config/rootfiles/oldcore/98/update.sh @@ -39,7 +39,10 @@ extract_files # Bugfixes for core96 updater bugs... if [ -e /boot/grub/grub.conf ]; then # legacy grub config on xen or citrix conflicts with grub2 config - rm /boot/grub/grub.cfg + # and core96 contains an empty file + if [ ! -s /boot/grub/grub.cfg ]; then + rm /boot/grub/grub.cfg + fi fi if [ -e /boot/grub/grub.cfg ]; then diff --git a/lfs/openssh b/lfs/openssh index 546bc7e..ab25d62 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 7.1p2 +VER = 7.2p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4d8547670e2a220d5ef805ad9e47acf2 +$(DL_FILE)_MD5 = b984775f0cfff1f7ff18b8797fce8a28 install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index c5b71f7..eb7352f 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.2f +VER = 1.0.2g THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -53,6 +53,7 @@ CONFIGURE_OPTIONS = \ zlib-dynamic \ enable-camellia \ enable-md2 \ + enable-ssl2 \ enable-seed \ enable-tlsext \ enable-rfc3779 \ @@ -86,7 +87,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b3bf73f507172be9292ea2a8c28b659d +$(DL_FILE)_MD5 = f3c710c045cdee5fd114feb69feba7aa install : $(TARGET) @@ -119,7 +120,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.0-beta5-enginesdir.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a-rpmbuild.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1m-weak-ciphers.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2g-disable-sslv2v3.patch # i586 specific patches ifeq "$(MACHINE)" "i586" diff --git a/lfs/stunnel b/lfs/stunnel index f6f27e0..4585151 100644 --- a/lfs/stunnel +++ b/lfs/stunnel @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = stunnel -PAK_VER = 1 +PAK_VER = 2 DEPS = "" diff --git a/make.sh b/make.sh index bed9230..8392e30 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number CORE="100" # Core Level (Filename) -PAKFIRE_CORE="98" # Core Level (PAKFIRE) +PAKFIRE_CORE="99" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/patches/openssl-1.0.2g-disable-sslv2v3.patch b/src/patches/openssl-1.0.2g-disable-sslv2v3.patch new file mode 100644 index 0000000..06f5132 --- /dev/null +++ b/src/patches/openssl-1.0.2g-disable-sslv2v3.patch @@ -0,0 +1,18 @@ +diff -up openssl-1.0.2g/ssl/ssl_lib.c.v2v3 openssl-1.0.2g/ssl/ssl_lib.c +--- openssl-1.0.2g/ssl/ssl_lib.c.v2v3 2016-03-01 16:38:26.879142021 +0100 ++++ openssl-1.0.2g/ssl/ssl_lib.c 2016-03-01 16:41:32.977353769 +0100 +@@ -2055,11 +2055,11 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m + ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; + + /* +- * Disable SSLv2 by default, callers that want to enable SSLv2 will have to +- * explicitly clear this option via either of SSL_CTX_clear_options() or ++ * Disable SSLv2 and SSLv3 by default, callers that want to enable these will have to ++ * explicitly clear these options via either of SSL_CTX_clear_options() or + * SSL_clear_options(). + */ +- ret->options |= SSL_OP_NO_SSLv2; ++ ret->options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; + + return (ret); + err: diff --git a/src/patches/openssl-disable-sslv2-sslv3.patch b/src/patches/openssl-disable-sslv2-sslv3.patch deleted file mode 100644 index e42dfac..0000000 --- a/src/patches/openssl-disable-sslv2-sslv3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- openssl-1.0.1m/ssl/ssl_lib.c.old 2015-03-19 15:56:40.966287977 +0100 -+++ openssl-1.0.1m/ssl/ssl_lib.c 2015-03-19 15:57:07.976160846 +0100 -@@ -1892,6 +1892,9 @@ - */ - ret->options |= SSL_OP_LEGACY_SERVER_CONNECT; - -+ /* Disable SSLv2 and SSLv3 by default (affects the SSLv23_method() only) */ -+ ret->options |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; -+ - return (ret); - err: - SSLerr(SSL_F_SSL_CTX_NEW, ERR_R_MALLOC_FAILURE); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0
by git＠ipfire.org 03 Mar '16

03 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0 (commit) from 353e08cd7778f2070469842ebe0f553e648f79d4 (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 75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 3 08:38:27 2016 +0100 openssl: add forgotten sslv2 compile option Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/lfs/openssl b/lfs/openssl index f45295e..eb7352f 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -53,6 +53,7 @@ CONFIGURE_OPTIONS = \ zlib-dynamic \ enable-camellia \ enable-md2 \ + enable-ssl2 \ enable-seed \ enable-tlsext \ enable-rfc3779 \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.17-core99, created. 75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0
by git＠ipfire.org 03 Mar '16

03 Mar '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.17-core99 has been created at 75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0 (commit) - Log ----------------------------------------------------------------- commit 75ad2e4e885992c9b17c2d7b722dd3ac3875a7f0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Mar 3 08:38:27 2016 +0100 openssl: add forgotten sslv2 compile option Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- 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 March 2016