IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7871 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5ac2ac488c809beafa6443e0410e573fb1be92b2
by git＠ipfire.org 24 Sep '16

24 Sep '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 5ac2ac488c809beafa6443e0410e573fb1be92b2 (commit) via b17a953bb55baa7c479b206af625fb6252c969e4 (commit) via f36a146aa67af19cb05f8d37e6b076d11e0a8713 (commit) via 93a6183b4c731aa4150f6dc721b784f67cea2e3a (commit) via 45df5c83d2ea09f0676bb445ff22a72d42dc8cdd (commit) via e3c3abe46b7364ab1f52d4a5787a8ecb729c5e9e (commit) from 95ea13fd8f26d6e217ec1658e267ea2987b7bc91 (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 5ac2ac488c809beafa6443e0410e573fb1be92b2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 12:59:51 2016 +0100 guile: Update to 2.0.11 Also fixes build error in the test stage Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b17a953bb55baa7c479b206af625fb6252c969e4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 12:02:52 2016 +0100 compat-guile: Fix FTBFS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f36a146aa67af19cb05f8d37e6b076d11e0a8713 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 11:39:21 2016 +0100 gnutls: Update to 3.5.4 The old version did not build against nettle 3 and hence required being updated. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 93a6183b4c731aa4150f6dc721b784f67cea2e3a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 11:37:43 2016 +0100 iperf: Update to 2.0.9 Project home has changed, too or project has been forked Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 45df5c83d2ea09f0676bb445ff22a72d42dc8cdd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 10:48:14 2016 +0100 iftop: Update to 1.0pre4 The old version FTBFS and is therefore updated Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e3c3abe46b7364ab1f52d4a5787a8ecb729c5e9e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Sep 24 10:16:32 2016 +0100 p11-kit: Update to 0.23.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: compat-guile/compat-guile.nm | 4 +++- gnutls/gnutls.nm | 9 +++++---- gnutls/patches/gnutls-3.1.11-nosrp.patch | 12 ------------ gnutls/patches/gnutls-3.2.7-rpath.patch | 12 ------------ guile/guile.nm | 6 ++++-- iftop/iftop.nm | 12 +++++------- iperf/iperf.nm | 6 +++--- p11-kit/p11-kit.nm | 7 +++++-- 8 files changed, 25 insertions(+), 43 deletions(-) delete mode 100644 gnutls/patches/gnutls-3.1.11-nosrp.patch delete mode 100644 gnutls/patches/gnutls-3.2.7-rpath.patch Difference in files: diff --git a/compat-guile/compat-guile.nm b/compat-guile/compat-guile.nm index 8bac023..c350897 100644 --- a/compat-guile/compat-guile.nm +++ b/compat-guile/compat-guile.nm @@ -5,7 +5,7 @@ name = compat-guile version = 1.8.8 -release = 1 +release = 2 thisapp = guile-%{version} groups = Development/Tools @@ -33,6 +33,8 @@ build readline-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/libguile/.libs + configure_options += \ --disable-static \ --disable-error-on-warning diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index f3160f6..f30c2b8 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -5,8 +5,8 @@ name = gnutls version = %{ver_maj}.%{ver_min} -ver_maj = 3.3 -ver_min = 10 +ver_maj = 3.5 +ver_min = 4 release = 1 groups = System/Libraries @@ -32,9 +32,10 @@ build libidn-devel libtasn1-devel >= 3.2 lzo-devel - nettle-devel >= 2.7 + net-tools + nettle-devel >= 3.2 perl - p11-kit-devel >= 0.14 + p11-kit-devel >= 0.23.1 readline-devel texinfo zlib-devel diff --git a/gnutls/patches/gnutls-3.1.11-nosrp.patch b/gnutls/patches/gnutls-3.1.11-nosrp.patch deleted file mode 100644 index 29227c0..0000000 --- a/gnutls/patches/gnutls-3.1.11-nosrp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c ---- gnutls-3.1.10/tests/srp/mini-srp.c.noecc 2013-03-21 21:42:28.000000000 +0100 -+++ gnutls-3.1.10/tests/srp/mini-srp.c 2013-03-25 13:42:20.753422209 +0100 -@@ -27,7 +27,7 @@ - #include <stdio.h> - #include <stdlib.h> - --#if defined(_WIN32) -+#if defined(_WIN32) || !defined(ENABLE_SRP) - - int main() - { diff --git a/gnutls/patches/gnutls-3.2.7-rpath.patch b/gnutls/patches/gnutls-3.2.7-rpath.patch deleted file mode 100644 index 4e6aed3..0000000 --- a/gnutls/patches/gnutls-3.2.7-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure ---- gnutls-3.2.7.orig/configure 2013-11-23 11:09:49.000000000 +0100 -+++ gnutls-3.2.7/configure 2013-11-25 16:53:05.559440656 +0100 -@@ -39652,7 +39652,7 @@ - shlibpath_overrides_runpath=unknown - version_type=none - dynamic_linker="$host_os ld.so" --sys_lib_dlsearch_path_spec="/lib /usr/lib" -+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64" - need_lib_prefix=unknown - hardcode_into_libs=no - diff --git a/guile/guile.nm b/guile/guile.nm index 06b7825..61e491f 100644 --- a/guile/guile.nm +++ b/guile/guile.nm @@ -4,8 +4,8 @@ ############################################################################### name = guile -version = 2.0.9 -release = 3 +version = 2.0.11 +release = 1 groups = Development/Tools url = http://www.gnu.org/software/guile/ @@ -36,6 +36,8 @@ build --disable-static \ --disable-error-on-warning + export LD_LIBRARY_PATH = %{DIR_APP}/libguile/.libs + test make check end diff --git a/iftop/iftop.nm b/iftop/iftop.nm index 0f812e6..5f77d04 100644 --- a/iftop/iftop.nm +++ b/iftop/iftop.nm @@ -4,8 +4,10 @@ ############################################################################### name = iftop -version = 0.17 -release = 2 +version = 1.0 +preversion = pre4 +release = 0.%{preversion}.1 +thisapp = %{name}-%{version}%{preversion} groups = Applications/System url = http://www.ex-parrot.com/pdw/iftop/ @@ -16,7 +18,7 @@ description iftop is an interactive text-mode traffic viewer for Linux. end -source_dl = +source_dl = http://www.ex-parrot.com/pdw/iftop/download/ sources = %{thisapp}.tar.gz build @@ -24,10 +26,6 @@ build libpcap-devel ncurses-devel end - - configure_options += \ - --sysconfdir=/etc \ - --mandir=/usr/share/man end packages diff --git a/iperf/iperf.nm b/iperf/iperf.nm index 0fa375b..be93c9a 100644 --- a/iperf/iperf.nm +++ b/iperf/iperf.nm @@ -4,11 +4,11 @@ ############################################################################### name = iperf -version = 2.0.5 +version = 2.0.9 release = 1 groups = Applications/Internet -url = http://www..sourceforge.net/projects/iperf/files/ +url = http://www.sourceforge.net/projects/iperf2/ license = GPLv3+ and LGPLv3+ summary = Measurement tool for TCP/UDP bandwidth performance @@ -18,7 +18,7 @@ description jitter, datagram loss. end -source_dl = http://sourceforge.net/projects/iperf/files +source_dl = http://sourceforge.net/projects/iperf2/files build requires diff --git a/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm index 16b754e..3b5945c 100644 --- a/p11-kit/p11-kit.nm +++ b/p11-kit/p11-kit.nm @@ -4,7 +4,7 @@ ############################################################################### name = p11-kit -version = 0.14 +version = 0.23.2 release = 1 groups = System/Libraries @@ -24,7 +24,10 @@ end source_dl = http://p11-glue.freedesktop.org/releases/ build - configure_options += --sysconfdir=/etc + requires + libffi-devel >= 3.0.0 + libtasn1-devel >= 2.3 + end end packages hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 95ea13fd8f26d6e217ec1658e267ea2987b7bc91
by git＠ipfire.org 24 Sep '16

24 Sep '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 95ea13fd8f26d6e217ec1658e267ea2987b7bc91 (commit) via 42bfdbd46605b1c5d4b27b5336d44ac4b938a7d1 (commit) from 5ef1ee8e8a1472ad83f5c29c3aa9d8df0b22e648 (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 95ea13fd8f26d6e217ec1658e267ea2987b7bc91 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon Sep 5 14:27:22 2016 +0200 libffi: Update to 3.2.1 This is an update to the latest stable version of libffi. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 42bfdbd46605b1c5d4b27b5336d44ac4b938a7d1 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Sep 23 11:03:40 2016 +0200 intltool: Update to 0.51.0 This is an update to the latest available major version. * Changed URL to project home page. * Changed download URL for the source code. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: intltool/intltool.nm | 11 ++++--- libffi/libffi.nm | 18 ++++++++++-- .../patches/libffi-3.0.13-fix-include-path.patch | 34 ---------------------- 3 files changed, 20 insertions(+), 43 deletions(-) delete mode 100644 libffi/patches/libffi-3.0.13-fix-include-path.patch Difference in files: diff --git a/intltool/intltool.nm b/intltool/intltool.nm index fde1b3a..1f0311c 100644 --- a/intltool/intltool.nm +++ b/intltool/intltool.nm @@ -4,23 +4,22 @@ ############################################################################### name = intltool -version = 0.40.6 +version = 0.51.0 release = 1 arch = noarch groups = Localization/Tools -url = http://www.gnome.org/ +url = https://launchpad.net/intltool license = GPLv2 with exceptions summary = Utility for internationalizing various kinds of data files. description - This tool automatically extracts translatable strings from oaf, glade, \ - bonobo ui, nautilus theme, .desktop, and other data files and puts \ + This tool automatically extracts translatable strings from oaf, glade, + bonobo ui, nautilus theme, .desktop, and other data files and puts them in the po files. end -source_dl = http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/ -sources = %{thisapp}.tar.bz2 +source_dl = http://edge.launchpad.net/intltool/trunk/%{version}/+download/ build requires diff --git a/libffi/libffi.nm b/libffi/libffi.nm index db6ba4f..6990611 100644 --- a/libffi/libffi.nm +++ b/libffi/libffi.nm @@ -4,7 +4,7 @@ ############################################################################### name = libffi -version = 3.0.13 +version = 3.2.1 release = 1 groups = System/Libraries @@ -13,13 +13,25 @@ license = BSD summary = A portable foreign function interface library. description - The libffi library provides a portable, high level programming \ - interface to various calling conventions. This allows a programmer to \ + The libffi library provides a portable, high level programming + interface to various calling conventions. This allows a programmer to call any function specified by a call interface description at run time. end source_dl = ftp://sourceware.org/pub/libffi/ +build + prepare_cmds + # Fix include directories. + sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \ + -i include/Makefile.in + + sed -e '/^includedir/ s/=.*$/=@includedir@/' \ + -e 's/^Cflags: -I${includedir}/Cflags:/' \ + -i libffi.pc.in + end +end + packages package %{name} diff --git a/libffi/patches/libffi-3.0.13-fix-include-path.patch b/libffi/patches/libffi-3.0.13-fix-include-path.patch deleted file mode 100644 index 4502333..0000000 --- a/libffi/patches/libffi-3.0.13-fix-include-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up libffi-3.0.13/include/Makefile.am.fixpath libffi-3.0.13/include/Makefile.am ---- libffi-3.0.13/include/Makefile.am.fixpath 2013-05-25 22:11:25.983889342 -0400 -+++ libffi-3.0.13/include/Makefile.am 2013-05-25 22:12:12.337890037 -0400 -@@ -5,5 +5,5 @@ AUTOMAKE_OPTIONS=foreign - DISTCLEANFILES=ffitarget.h - EXTRA_DIST=ffi.h.in ffi_common.h - --includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include -+includesdir = $(includedir)/ - nodist_includes_HEADERS = ffi.h ffitarget.h -diff -up libffi-3.0.13/include/Makefile.in.fixpath libffi-3.0.13/include/Makefile.in ---- libffi-3.0.13/include/Makefile.in.fixpath 2013-05-25 22:12:56.259890696 -0400 -+++ libffi-3.0.13/include/Makefile.in 2013-05-25 22:13:12.101890934 -0400 -@@ -250,7 +250,7 @@ top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign - DISTCLEANFILES = ffitarget.h - EXTRA_DIST = ffi.h.in ffi_common.h --includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include -+includesdir = $(includedir)/ - nodist_includes_HEADERS = ffi.h ffitarget.h - all: all-am - -diff -up libffi-3.0.13/libffi.pc.in.fixpath libffi-3.0.13/libffi.pc.in ---- libffi-3.0.13/libffi.pc.in.fixpath 2013-05-25 22:14:21.037891968 -0400 -+++ libffi-3.0.13/libffi.pc.in 2013-05-25 22:14:31.652892128 -0400 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include -+includedir=@includedir@ - - Name: @PACKAGE_NAME@ - Description: Library supporting Foreign Function Interfaces hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5ef1ee8e8a1472ad83f5c29c3aa9d8df0b22e648
by git＠ipfire.org 24 Sep '16

24 Sep '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 5ef1ee8e8a1472ad83f5c29c3aa9d8df0b22e648 (commit) via 81b21dc0352bb05f010de1a635a1461fe9244ac6 (commit) via 95600b77574524c3f2c788a32b128cfe68099869 (commit) from 4eec3d94d92ca122553c5ef77797227aa56ef128 (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 5ef1ee8e8a1472ad83f5c29c3aa9d8df0b22e648 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 23 23:22:13 2016 +0100 autoconf: Fix FTBFS Requires perl Data::Dumper for build and runtime Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 81b21dc0352bb05f010de1a635a1461fe9244ac6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 23 23:12:18 2016 +0100 autogen: Update to 5.18.12 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 95600b77574524c3f2c788a32b128cfe68099869 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 23 22:48:03 2016 +0100 beecrypt: Fix build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: autoconf/autoconf.nm | 3 ++- autogen/autogen.nm | 4 +++- beecrypt/beecrypt.nm | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) Difference in files: diff --git a/autoconf/autoconf.nm b/autoconf/autoconf.nm index cb08c29..a411bf9 100644 --- a/autoconf/autoconf.nm +++ b/autoconf/autoconf.nm @@ -5,7 +5,7 @@ name = autoconf version = 2.69 -release = 1 +release = 2 arch = noarch groups = Development/Tools @@ -27,6 +27,7 @@ build requires m4 perl + perl(Data::Dumper) end end diff --git a/autogen/autogen.nm b/autogen/autogen.nm index 90d9a32..a8d83ab 100644 --- a/autogen/autogen.nm +++ b/autogen/autogen.nm @@ -4,7 +4,7 @@ ############################################################################### name = autogen -version = 5.18.1 +version = 5.18.12 release = 1 groups = Development/Tools @@ -28,6 +28,8 @@ build libxml2-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/autoopts/.libs + prepare_cmds # Fix Libtool to remove rpaths. rm -vf libtool diff --git a/beecrypt/beecrypt.nm b/beecrypt/beecrypt.nm index 8f3aa15..6d53a1e 100644 --- a/beecrypt/beecrypt.nm +++ b/beecrypt/beecrypt.nm @@ -5,7 +5,7 @@ name = beecrypt version = 4.2.1 -release = 2 +release = 3 groups = System/Libraries url = http://beecrypt.sourceforge.net/ @@ -31,7 +31,7 @@ build prepare_cmds libtoolize - autoreconf + autoreconf -vfi end # Getting weird linking errors without --disable-threads. hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4eec3d94d92ca122553c5ef77797227aa56ef128
by git＠ipfire.org 23 Sep '16

23 Sep '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 4eec3d94d92ca122553c5ef77797227aa56ef128 (commit) from 78647fb02210e34f700f44534bc73b401d3416bf (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 4eec3d94d92ca122553c5ef77797227aa56ef128 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Sep 23 21:13:53 2016 +0100 glibc: Update to 2.24 Requires a patch to build on x86_64: https://sourceware.org/bugzilla/show_bug.cgi?id=20621 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: glibc/glibc.nm | 10 +- .../glibc-2.11.1-owl-alt-res_randomid.patch | 317 --------------------- ...rt-Avoid-an-extra-branch-to-PLT-for-z-now.patch | 84 ++++++ .../glibc-compile-fix-for-memcpy-ssse3.patch | 67 +++++ glibc/patches/glibc-fedora-include-bits-ldbl.patch | 30 -- 5 files changed, 155 insertions(+), 353 deletions(-) delete mode 100644 glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch create mode 100644 glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch create mode 100644 glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch delete mode 100644 glibc/patches/glibc-fedora-include-bits-ldbl.patch Difference in files: diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 0653382..943bf0e 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ############################################################################### name = glibc -version = 2.23 -release = 2 +version = 2.24 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -34,6 +34,7 @@ build audit-devel autoconf automake + binutils >= 2.27 gcc >= 4.7 gettext kernel-headers >= %{OPTIMIZED_KERNEL} @@ -44,7 +45,7 @@ build end # Build glibc with custom cflags - GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG -fPIC -DPIC + GLIBC_FLAGS = -O3 -g -fasynchronous-unwind-tables -DNDEBUG if "%{DISTRO_ARCH}" == "i686" GLIBC_FLAGS += -march=i686 -mtune=generic @@ -111,9 +112,6 @@ build ../%{thisapp}/configure \ %{configure_options} - sed -i config.make \ - -e "s/^build-pic-default=.*/build-pic-default=yes/" - # Our GCC is already passing -fPIC, and that's all we want for the libraries. # LDFLAGS.so is appended to so we don't build shared libraries with # DT_TEXTREL (and to tell us if something goes wrong). For now we only build diff --git a/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch b/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch deleted file mode 100644 index 969b8dc..0000000 --- a/glibc/patches/glibc-2.11.1-owl-alt-res_randomid.patch +++ /dev/null @@ -1,317 +0,0 @@ -# Improve res_randomid in the resolver. - ---- a/include/resolv.h -+++ b/include/resolv.h -@@ -31,6 +31,7 @@ extern struct __res_state _res; - # endif - - /* Now define the internal interfaces. */ -+extern unsigned int _shuffle_next (void); - extern int __res_vinit (res_state, int); - extern int __res_maybe_init (res_state, int); - extern void _sethtent (int); ---- a/resolv/Makefile -+++ b/resolv/Makefile -@@ -29,7 +29,7 @@ distribute := ../conf/portability.h mapv4v6addr.h mapv4v6hostent.h \ - Banner res_hconf.h res_debug.h README gai_misc.h ga_test.c - - routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \ -- res_hconf res_libc res-state -+ res_hconf res_libc res-state shuffle - - tests = tst-aton tst-leaks tst-inet_ntop - xtests = tst-leaks2 ---- a/resolv/res_init.c -+++ b/resolv/res_init.c -@@ -570,7 +570,9 @@ net_mask(in) /* XXX - should really use system's version of this */ - - u_int - res_randomid(void) { -- return 0xffff & __getpid(); -+/* We should probably randomize the port number as well, -+ * but this may be better done in the kernel */ -+ return _shuffle_next(); - } - #ifdef _LIBC - libc_hidden_def (__res_randomid) ---- a/resolv/res_mkquery.c -+++ b/resolv/res_mkquery.c -@@ -120,6 +120,7 @@ res_nmkquery(res_state statp, - return (-1); - memset(buf, 0, HFIXEDSZ); - hp = (HEADER *) buf; -+#ifdef USE_OLD_RANDOMIZE_CODE - /* We randomize the IDs every time. The old code just - incremented by one after the initial randomization which - still predictable if the application does multiple -@@ -137,6 +138,9 @@ res_nmkquery(res_state statp, - } - while ((randombits & 0xffff) == 0); - statp->id = (statp->id + randombits) & 0xffff; -+#else -+ statp->id = res_randomid (); -+#endif - hp->id = statp->id; - hp->opcode = op; - hp->rd = (statp->options & RES_RECURSE) != 0; ---- /dev/null -+++ b/resolv/shuffle.c -@@ -0,0 +1,258 @@ -+/* -+ * Written by Solar Designer and placed in the public domain. -+ */ -+ -+#include <unistd.h> -+#include <fcntl.h> -+#include <resolv.h> -+ -+#ifdef __linux__ -+#define DEVICE "/dev/urandom" -+#else -+#undef DEVICE -+#endif -+ -+#if defined(DEVICE) && defined(_LIBC) -+#define CONSERVE_KERNEL_RANDOMNESS -+#else -+#undef CONSERVE_KERNEL_RANDOMNESS -+#endif -+ -+#ifdef DEVICE -+#include <errno.h> -+#endif -+ -+#include <stdlib.h> -+#include <string.h> -+#include <sys/time.h> -+#include <sys/times.h> -+ -+#ifdef TEST -+#include <stdio.h> -+#endif -+ -+#define DIV 0x8000 -+ -+static unsigned char pool[0x100]; -+ -+static struct { -+ unsigned int base, xor; -+ unsigned char s[0x80]; -+} seed_c; -+static unsigned char seed_f[0x100]; -+ -+static struct { -+ unsigned int msb; -+ unsigned int a, b; -+ unsigned int n; -+} state; -+ -+static void pool_update(unsigned int seed) -+{ -+ int i, x; -+ -+ __srandom(seed ^ __random()); -+ for (i = 0; i < sizeof(pool); i++) { -+ x = __random(); -+ pool[i] += (x >> 16) ^ x; -+ } -+} -+ -+#ifdef DEVICE -+static int read_loop(int fd, char *buffer, int count) -+{ -+ int offset, block; -+ -+ offset = 0; -+ while (count > 0) { -+ block = __read(fd, &buffer[offset], count); -+ -+ if (block < 0) { -+ if (errno == EINTR) continue; -+ return block; -+ } -+ if (!block) return offset; -+ -+ offset += block; -+ count -= block; -+ } -+ -+ return offset; -+} -+ -+static int read_random(char *buffer, int count) -+{ -+ int fd; -+#ifdef CONSERVE_KERNEL_RANDOMNESS -+ unsigned int seed[2]; -+ -+ if (count > sizeof(pool)) -+ return -1; -+#endif -+ -+ if ((fd = __open(DEVICE, O_RDONLY)) < 0) -+ return -1; -+ -+#ifdef CONSERVE_KERNEL_RANDOMNESS -+ if (read_loop(fd, (char *)seed, sizeof(seed)) != sizeof(seed)) { -+ __close(fd); -+ return -1; -+ } -+ __close(fd); -+ -+ memset(pool, 'X', sizeof(pool)); -+ pool_update(seed[0]); -+ pool_update(seed[1]); -+ -+ memcpy(buffer, pool, count); -+#else -+ count = read_loop(fd, buffer, count); -+ __close(fd); -+#endif -+ -+ return count; -+} -+#else -+#define read_random(buffer, count) (-1) -+#endif -+ -+static void shuffle_init() -+{ -+ struct timeval tv; -+ -+ if (read_random((char *)seed_f, sizeof(seed_f)) != sizeof(seed_f)) { -+ memset(pool, 'X', sizeof(pool)); -+ pool_update(__getpid()); -+ pool_update(__getppid()); -+ if (!__gettimeofday(&tv, NULL)) { -+ pool_update(tv.tv_sec); -+ pool_update(tv.tv_usec); -+ } -+ -+ memcpy(seed_f, pool, sizeof(seed_f)); -+ } -+ -+ state.msb = 0; -+ state.n = DIV; /* force a reseed() */ -+} -+ -+static void reseed() -+{ -+ struct tms buf; -+ -+ if (read_random((char *)&seed_c, sizeof(seed_c)) != sizeof(seed_c)) { -+ pool_update(__times(&buf)); -+ pool_update(buf.tms_utime); -+ pool_update(buf.tms_stime); -+ -+ memcpy(&seed_c, pool, sizeof(seed_c)); -+ } -+ -+ seed_c.base &= 0x1fff; -+ seed_c.base <<= 3; -+ seed_c.base += DIV + 3; -+ seed_c.xor &= (DIV - 1); -+ state.msb ^= 0x8000; -+ state.a = 1; -+ state.b = 1; -+ state.n = 0; -+} -+ -+/* -+ * Now, time for a puzzle. Think of division by DIV in seed_c.base. -+ * This is not as slow as it might appear: the inner loop needs only -+ * a few iterations per call, on average. -+ */ -+static unsigned int shuffle_1_next() -+{ -+ if (state.n >= DIV - 1) -+ reseed(); -+ -+ if (state.n && state.b <= state.a) { -+ do { -+ state.b = ++state.a; -+ do { -+ state.b *= seed_c.base; -+ state.b %= DIV; -+ } while (state.b > state.a); -+ } while (state.a != state.b); -+ } -+ -+ state.b *= seed_c.base; -+ state.b %= DIV; -+ state.n++; -+ -+ return state.b ^ seed_c.xor; -+} -+ -+/* -+ * The idea behind shuffle_2 is David Wagner's (any bugs are mine, -+ * of course). -+ */ -+static unsigned int shuffle_2(unsigned int x) -+{ -+ unsigned int i, sum; -+ -+ sum = 0; -+ for (i = 0; i < 8; i++) { -+ sum += 0x79b9; -+ x ^= ((unsigned int)seed_c.s[(x ^ sum) & 0x7f]) << 7; -+ x = ((x & 0xff) << 7) | (x >> 8); -+ } -+ -+ return x; -+} -+ -+/* -+ * A full 16-bit permutation. This one can't be re-seeded, but still -+ * makes some attacks quite a bit harder. -+ */ -+static unsigned int shuffle_3(unsigned int x) -+{ -+ unsigned int i, sum; -+ -+ sum = 0; -+ for (i = 0; i < 8; i++) { -+ sum += 0x79b9; -+ x ^= ((unsigned int)seed_f[(x ^ sum) & 0xff]) << 8; -+ x = ((x & 0xff) << 8) | (x >> 8); -+ } -+ -+ return x; -+} -+ -+unsigned int _shuffle_next() -+{ -+ static int initialized = 0; -+ unsigned int pid, x; -+ -+/* This isn't MT-safe, but the resolver itself isn't safe, anyway */ -+ if (!initialized) { -+ shuffle_init(); -+ initialized = 1; -+ } -+ -+/* Make sure the sequence we generate changes after fork() */ -+ pid = __getpid(); -+ -+ x = shuffle_1_next(); -+ x ^= pid & 0x7fff; -+ x = shuffle_2(x); -+ x |= state.msb; -+ x ^= (pid >> 15) & 0xffff; -+ x = shuffle_3(x); -+ -+ return x; -+} -+ -+#ifdef TEST -+int main() -+{ -+ int i; -+ -+ for (i = 0; i < 0xfffe; i++) -+ printf("%u\n", _shuffle_next()); -+ -+ return 0; -+} -+#endif diff --git a/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch b/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch new file mode 100644 index 0000000..102d385 --- /dev/null +++ b/glibc/patches/glibc-2.24-Revert-Avoid-an-extra-branch-to-PLT-for-z-now.patch @@ -0,0 +1,84 @@ +From f160cfff59261bb661cf829fdcb5a3f391996280 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Thu, 22 Sep 2016 16:33:43 +0100 +Subject: [PATCH] Revert "Avoid an extra branch to PLT for -z now" + +This reverts commit 6901def689b5c77465d34f07822989ec67e80c1e. + +glibc won't compile on x86_64 with PIC and BIND_NOW enabled +both at the same time. + +See: https://sourceware.org/bugzilla/show_bug.cgi?id=20621 +--- + config.h.in | 3 --- + configure | 4 ---- + configure.ac | 3 --- + sysdeps/x86_64/sysdep.h | 8 ++------ + 4 files changed, 2 insertions(+), 16 deletions(-) + +diff --git a/config.h.in b/config.h.in +index 8cd08b0..f4ec748 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -94,9 +94,6 @@ + include/libc-symbols.h that avoid PLT slots in the shared objects. */ + #undef NO_HIDDEN + +-/* Define this to disable lazy relocations in DSOs. */ +-#undef BIND_NOW +- + /* AArch64 big endian ABI */ + #undef HAVE_AARCH64_BE + +diff --git a/configure b/configure +index 6ff2527..46015c9 100755 +--- a/configure ++++ b/configure +@@ -3419,10 +3419,6 @@ else + fi + + +-if test "x$bindnow" = xyes; then +- $as_echo "#define BIND_NOW 1" >>confdefs.h +- +-fi + + # Check whether --enable-static-nss was given. + if test "${enable_static_nss+set}" = set; then : +diff --git a/configure.ac b/configure.ac +index 9938ab0..d255b57 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -231,9 +231,6 @@ AC_ARG_ENABLE([bind-now], + [bindnow=$enableval], + [bindnow=no]) + AC_SUBST(bindnow) +-if test "x$bindnow" = xyes; then +- AC_DEFINE(BIND_NOW) +-fi + + dnl On some platforms we cannot use dynamic loading. We must provide + dnl static NSS modules. +diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h +index 75ac747..fbe3560 100644 +--- a/sysdeps/x86_64/sysdep.h ++++ b/sysdeps/x86_64/sysdep.h +@@ -90,13 +90,9 @@ lose: \ + + #undef JUMPTARGET + #ifdef PIC +-# ifdef BIND_NOW +-# define JUMPTARGET(name) *name##@GOTPCREL(%rip) +-# else +-# define JUMPTARGET(name) name##@PLT +-# endif ++#define JUMPTARGET(name) name##@PLT + #else +-# define JUMPTARGET(name) name ++#define JUMPTARGET(name) name + #endif + + /* Local label name for asm code. */ +-- +2.7.4 + diff --git a/glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch b/glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch new file mode 100644 index 0000000..1bc1a06 --- /dev/null +++ b/glibc/patches/glibc-compile-fix-for-memcpy-ssse3.patch @@ -0,0 +1,67 @@ +diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S +index b4890f4..4b717d9 100644 +--- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S ++++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S +@@ -48,8 +48,10 @@ + .section .text.ssse3,"ax",@progbits + #if !defined USE_AS_MEMPCPY && !defined USE_AS_MEMMOVE + ENTRY (MEMPCPY_CHK) ++#ifdef _FORTIFY_SOURCE + cmpq %rdx, %rcx + jb HIDDEN_JUMPTARGET (__chk_fail) ++#endif + END (MEMPCPY_CHK) + + ENTRY (MEMPCPY) +@@ -61,8 +63,10 @@ END (MEMPCPY) + + #if !defined USE_AS_BCOPY + ENTRY (MEMCPY_CHK) ++#ifdef _FORTIFY_SOURCE + cmpq %rdx, %rcx + jb HIDDEN_JUMPTARGET (__chk_fail) ++#endif + END (MEMCPY_CHK) + #endif + +diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/sysdeps/x86_64/multiarch/memcpy-ssse3.S +index 1ca88c0..a2f140b 100644 +--- a/sysdeps/x86_64/multiarch/memcpy-ssse3.S ++++ b/sysdeps/x86_64/multiarch/memcpy-ssse3.S +@@ -48,8 +48,10 @@ + .section .text.ssse3,"ax",@progbits + #if !defined USE_AS_MEMPCPY && !defined USE_AS_MEMMOVE + ENTRY (MEMPCPY_CHK) ++#ifdef _FORTIFY_SOURCE + cmpq %rdx, %rcx + jb HIDDEN_JUMPTARGET (__chk_fail) ++#endif + END (MEMPCPY_CHK) + + ENTRY (MEMPCPY) +@@ -61,8 +63,10 @@ END (MEMPCPY) + + #if !defined USE_AS_BCOPY + ENTRY (MEMCPY_CHK) ++#ifdef _FORTIFY_SOURCE + cmpq %rdx, %rcx + jb HIDDEN_JUMPTARGET (__chk_fail) ++#endif + END (MEMCPY_CHK) + #endif + +diff --git a/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S b/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S +index 9687df0..2d0abee 100644 +--- a/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S ++++ b/sysdeps/x86_64/multiarch/memset-avx512-no-vzeroupper.S +@@ -29,8 +29,10 @@ + .section .text.avx512,"ax",@progbits + #if defined PIC + ENTRY (MEMSET_CHK) ++#ifdef _FORTIFY_SOURCE + cmpq %rdx, %rcx + jb HIDDEN_JUMPTARGET (__chk_fail) ++#endif + END (MEMSET_CHK) + #endif + diff --git a/glibc/patches/glibc-fedora-include-bits-ldbl.patch b/glibc/patches/glibc-fedora-include-bits-ldbl.patch deleted file mode 100644 index 1e5d763..0000000 --- a/glibc/patches/glibc-fedora-include-bits-ldbl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5eb4509a6651d19c7a28c4506d6aa582c9ee095a Mon Sep 17 00:00:00 2001 -From: Jakub Jelinek <jakub(a)redhat.com> -Date: Wed, 1 Feb 2006 09:30:43 +0000 -Subject: [PATCH] 128-bit long double fixes - -* include/bits/stdlib-ldbl.h: New file. -* include/bits/wchar-ldbl.h: New file. - ---- - ChangeLog | 5 +++++ - include/bits/stdlib-ldbl.h | 1 + - include/bits/wchar-ldbl.h | 1 + - 3 files changed, 7 insertions(+), 0 deletions(-) - create mode 100644 include/bits/stdlib-ldbl.h - create mode 100644 include/bits/wchar-ldbl.h - -diff --git a/include/bits/stdlib-ldbl.h b/include/bits/stdlib-ldbl.h -new file mode 100644 -index 0000000..6250949 ---- /dev/null -+++ b/include/bits/stdlib-ldbl.h -@@ -0,0 +1 @@ -+#include <stdlib/bits/stdlib-ldbl.h> -diff --git a/include/bits/wchar-ldbl.h b/include/bits/wchar-ldbl.h -new file mode 100644 -index 0000000..29baa2f ---- /dev/null -+++ b/include/bits/wchar-ldbl.h -@@ -0,0 +1 @@ -+#include <wcsmbs/bits/wchar-ldbl.h> hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3ce76624346e0ce66a6f1fc3f6b37feeab1a25b2
by git＠ipfire.org 23 Sep '16

23 Sep '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 3ce76624346e0ce66a6f1fc3f6b37feeab1a25b2 (commit) via 2d850c7944bf0fd7bfac91436151dcecafe3f623 (commit) via e4ee7f0317547aacd36b9b5d31f9eb659ab5f455 (commit) from 8029c2a899b3b70e5e35f8461daddc288b9abe75 (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 3ce76624346e0ce66a6f1fc3f6b37feeab1a25b2 Merge: 8029c2a 2d850c7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 23 18:49:06 2016 +0200 Merge remote-tracking branch 'origin/core105' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/105/filelists/files | 2 +- config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 | 0 2 files changed, 1 insertion(+), 1 deletion(-) copy config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 (100%) Difference in files: diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files index 95f6e10..409e5fe 100644 --- a/config/rootfiles/core/105/filelists/files +++ b/config/rootfiles/core/105/filelists/files @@ -1,2 +1,2 @@ etc/system-release -etc/issue \ No newline at end of file +etc/issue diff --git a/config/rootfiles/core/105/filelists/i586/openssl-sse2 b/config/rootfiles/core/105/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/105/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ 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, core105, updated. 2d850c7944bf0fd7bfac91436151dcecafe3f623
by git＠ipfire.org 23 Sep '16

23 Sep '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, core105 has been updated via 2d850c7944bf0fd7bfac91436151dcecafe3f623 (commit) from e4ee7f0317547aacd36b9b5d31f9eb659ab5f455 (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 2d850c7944bf0fd7bfac91436151dcecafe3f623 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 23 10:30:34 2016 +0200 core105: add openssl sse2 binaries Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/99 => core/105}/filelists/i586/openssl-sse2 (100%) Difference in files: diff --git a/config/rootfiles/core/105/filelists/i586/openssl-sse2 b/config/rootfiles/core/105/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/105/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ 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, core105, updated. e4ee7f0317547aacd36b9b5d31f9eb659ab5f455
by git＠ipfire.org 22 Sep '16

22 Sep '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, core105 has been updated via e4ee7f0317547aacd36b9b5d31f9eb659ab5f455 (commit) from cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (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 e4ee7f0317547aacd36b9b5d31f9eb659ab5f455 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 22 17:44:06 2016 +0200 core105: fix rootfile. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/105/filelists/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files index 95f6e10..409e5fe 100644 --- a/config/rootfiles/core/105/filelists/files +++ b/config/rootfiles/core/105/filelists/files @@ -1,2 +1,2 @@ etc/system-release -etc/issue \ No newline at end of file +etc/issue hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 78647fb02210e34f700f44534bc73b401d3416bf
by git＠ipfire.org 22 Sep '16

22 Sep '16

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8029c2a899b3b70e5e35f8461daddc288b9abe75
by git＠ipfire.org 22 Sep '16

22 Sep '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 8029c2a899b3b70e5e35f8461daddc288b9abe75 (commit) via f5275b5930016b466e136dd6fb8ce535be618c4a (commit) via cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (commit) via 3bc177eec53248b296e13654003f278c65ddc413 (commit) via 8bbed7a5b6a878dae03d605042b48304f3900304 (commit) via db7ef87902096d8268bb348ba5821eba344e27ba (commit) via c4a1169ed975c15ee8c29c99d0667388a09c29bf (commit) via ad7e47072b4993d96749f4e8f0f106b409ed77ca (commit) via 59d8f64e50bdcc339b95f306e4cebf85c36a3a4e (commit) from bbe8e009b824aef745c9ab9718dce9a1b557f5fc (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 8029c2a899b3b70e5e35f8461daddc288b9abe75 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 14:47:47 2016 +0100 strongswan: Update to 5.5.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5275b5930016b466e136dd6fb8ce535be618c4a Merge: bbe8e00 cd805ce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 12:05:13 2016 +0100 Merge branch 'core105' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 40 +++++++++++----- config/rootfiles/core/{104 => 105}/exclude | 0 .../{oldcore/55 => core/105}/filelists/files | 2 +- .../{oldcore/94 => core/105}/filelists/libgcrypt | 0 .../{oldcore/99 => core/105}/filelists/openssl | 0 config/rootfiles/core/{104 => 105}/meta | 0 .../rootfiles/{oldcore/102 => core/105}/update.sh | 5 +- config/rootfiles/oldcore/{103 => 104}/exclude | 0 .../rootfiles/{core => oldcore}/104/filelists/acl | 0 .../104/filelists/armv5tel/linux-kirkwood | 0 .../104/filelists/armv5tel/linux-multi | 0 .../104/filelists/armv5tel/linux-rpi | 0 .../rootfiles/{core => oldcore}/104/filelists/curl | 0 .../rootfiles/{core => oldcore}/104/filelists/ddns | 0 .../{core => oldcore}/104/filelists/dnsmasq | 0 .../{core => oldcore}/104/filelists/files | 0 .../{core => oldcore}/104/filelists/i586/acpid | 0 .../{core => oldcore}/104/filelists/i586/linux | 0 .../{core => oldcore}/104/filelists/iputils | 0 .../{core => oldcore}/104/filelists/libarchive | 0 .../{core => oldcore}/104/filelists/libcap | 0 .../rootfiles/{core => oldcore}/104/filelists/ntp | 0 .../{core => oldcore}/104/filelists/openssh | 0 .../rootfiles/{core => oldcore}/104/filelists/pcre | 0 .../rootfiles/{core => oldcore}/104/filelists/popt | 0 .../{core => oldcore}/104/filelists/screen | 0 .../{core => oldcore}/104/filelists/shadow | 0 .../{core => oldcore}/104/filelists/snort | 0 .../rootfiles/{core => oldcore}/104/filelists/wget | 0 .../{core => oldcore}/104/filelists/which | 0 .../{core => oldcore}/104/filelists/x86_64/acpid | 0 .../{core => oldcore}/104/filelists/x86_64/linux | 0 config/rootfiles/oldcore/{99 => 104}/meta | 0 config/rootfiles/{core => oldcore}/104/update.sh | 0 lfs/openssl | 4 +- lfs/strongswan | 5 +- make.sh | 4 +- ...n-event-when-deleting-redundant-CHILD_SAs.patch | 56 ---------------------- 38 files changed, 36 insertions(+), 80 deletions(-) rename config/rootfiles/core/{104 => 105}/exclude (100%) copy config/rootfiles/{oldcore/55 => core/105}/filelists/files (65%) copy config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/99 => core/105}/filelists/openssl (100%) rename config/rootfiles/core/{104 => 105}/meta (100%) copy config/rootfiles/{oldcore/102 => core/105}/update.sh (99%) copy config/rootfiles/oldcore/{103 => 104}/exclude (100%) rename config/rootfiles/{core => oldcore}/104/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/104/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/104/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/104/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/104/filelists/files (100%) rename config/rootfiles/{core => oldcore}/104/filelists/i586/acpid (100%) rename config/rootfiles/{core => oldcore}/104/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/104/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/104/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/104/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/104/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/104/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/104/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/104/filelists/popt (100%) rename config/rootfiles/{core => oldcore}/104/filelists/screen (100%) rename config/rootfiles/{core => oldcore}/104/filelists/shadow (100%) rename config/rootfiles/{core => oldcore}/104/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/104/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/104/filelists/which (100%) rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid (100%) rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux (100%) copy config/rootfiles/oldcore/{99 => 104}/meta (100%) rename config/rootfiles/{core => oldcore}/104/update.sh (100%) delete mode 100644 src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index f51cc3a..f81a9c8 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -40,7 +40,6 @@ etc/strongswan.d/charon/kernel-netlink.conf etc/strongswan.d/charon/md5.conf etc/strongswan.d/charon/nonce.conf etc/strongswan.d/charon/openssl.conf -#etc/strongswan.d/charon/padlock.conf etc/strongswan.d/charon/pem.conf etc/strongswan.d/charon/pgp.conf etc/strongswan.d/charon/pkcs1.conf @@ -58,6 +57,7 @@ etc/strongswan.d/charon/socket-default.conf etc/strongswan.d/charon/sshkey.conf etc/strongswan.d/charon/stroke.conf etc/strongswan.d/charon/updown.conf +etc/strongswan.d/charon/vici.conf etc/strongswan.d/charon/x509.conf etc/strongswan.d/charon/xauth-eap.conf etc/strongswan.d/charon/xauth-generic.conf @@ -66,6 +66,21 @@ etc/strongswan.d/charon/xcbc.conf etc/strongswan.d/pki.conf etc/strongswan.d/scepclient.conf etc/strongswan.d/starter.conf +etc/strongswan.d/swanctl.conf +#etc/swanctl +etc/swanctl/bliss +etc/swanctl/ecdsa +etc/swanctl/pkcs12 +etc/swanctl/pkcs8 +etc/swanctl/pubkey +etc/swanctl/rsa +etc/swanctl/swanctl.conf +etc/swanctl/x509 +etc/swanctl/x509aa +etc/swanctl/x509ac +etc/swanctl/x509ca +etc/swanctl/x509crl +etc/swanctl/x509ocsp usr/bin/pki #usr/lib/ipsec #usr/lib/ipsec/libcharon.a @@ -73,11 +88,6 @@ usr/bin/pki usr/lib/ipsec/libcharon.so usr/lib/ipsec/libcharon.so.0 usr/lib/ipsec/libcharon.so.0.0.0 -#usr/lib/ipsec/libhydra.a -#usr/lib/ipsec/libhydra.la -usr/lib/ipsec/libhydra.so -usr/lib/ipsec/libhydra.so.0 -usr/lib/ipsec/libhydra.so.0.0.0 #usr/lib/ipsec/libradius.a #usr/lib/ipsec/libradius.la usr/lib/ipsec/libradius.so @@ -93,6 +103,11 @@ usr/lib/ipsec/libstrongswan.so.0.0.0 usr/lib/ipsec/libtls.so usr/lib/ipsec/libtls.so.0 usr/lib/ipsec/libtls.so.0.0.0 +#usr/lib/ipsec/libvici.a +#usr/lib/ipsec/libvici.la +usr/lib/ipsec/libvici.so +usr/lib/ipsec/libvici.so.0 +usr/lib/ipsec/libvici.so.0.0.0 #usr/lib/ipsec/plugins usr/lib/ipsec/plugins/libstrongswan-aes.so usr/lib/ipsec/plugins/libstrongswan-attr.so @@ -101,8 +116,8 @@ usr/lib/ipsec/plugins/libstrongswan-cmac.so usr/lib/ipsec/plugins/libstrongswan-constraints.so usr/lib/ipsec/plugins/libstrongswan-ctr.so usr/lib/ipsec/plugins/libstrongswan-curl.so -usr/lib/ipsec/plugins/libstrongswan-dhcp.so usr/lib/ipsec/plugins/libstrongswan-des.so +usr/lib/ipsec/plugins/libstrongswan-dhcp.so usr/lib/ipsec/plugins/libstrongswan-dnskey.so usr/lib/ipsec/plugins/libstrongswan-eap-identity.so usr/lib/ipsec/plugins/libstrongswan-eap-mschapv2.so @@ -120,7 +135,6 @@ usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so usr/lib/ipsec/plugins/libstrongswan-md5.so usr/lib/ipsec/plugins/libstrongswan-nonce.so usr/lib/ipsec/plugins/libstrongswan-openssl.so -#usr/lib/ipsec/plugins/libstrongswan-padlock.so usr/lib/ipsec/plugins/libstrongswan-pem.so usr/lib/ipsec/plugins/libstrongswan-pgp.so usr/lib/ipsec/plugins/libstrongswan-pkcs1.so @@ -130,7 +144,6 @@ usr/lib/ipsec/plugins/libstrongswan-pkcs8.so usr/lib/ipsec/plugins/libstrongswan-pubkey.so usr/lib/ipsec/plugins/libstrongswan-random.so usr/lib/ipsec/plugins/libstrongswan-rc2.so -#usr/lib/ipsec/plugins/libstrongswan-rdrand.so usr/lib/ipsec/plugins/libstrongswan-resolve.so usr/lib/ipsec/plugins/libstrongswan-revocation.so usr/lib/ipsec/plugins/libstrongswan-sha1.so @@ -139,6 +152,7 @@ usr/lib/ipsec/plugins/libstrongswan-socket-default.so usr/lib/ipsec/plugins/libstrongswan-sshkey.so usr/lib/ipsec/plugins/libstrongswan-stroke.so usr/lib/ipsec/plugins/libstrongswan-updown.so +usr/lib/ipsec/plugins/libstrongswan-vici.so usr/lib/ipsec/plugins/libstrongswan-x509.so usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so usr/lib/ipsec/plugins/libstrongswan-xauth-generic.so @@ -152,6 +166,7 @@ usr/libexec/ipsec/scepclient usr/libexec/ipsec/starter usr/libexec/ipsec/stroke usr/sbin/ipsec +usr/sbin/swanctl #usr/share/man/man1/pki---acert.1 #usr/share/man/man1/pki---dn.1 #usr/share/man/man1/pki---gen.1 @@ -168,10 +183,10 @@ usr/sbin/ipsec #usr/share/man/man5/ipsec.conf.5 #usr/share/man/man5/ipsec.secrets.5 #usr/share/man/man5/strongswan.conf.5 -#usr/share/man/man8/_updown.8 +#usr/share/man/man5/swanctl.conf.5 #usr/share/man/man8/ipsec.8 -#usr/share/man/man8/openac.8 #usr/share/man/man8/scepclient.8 +#usr/share/man/man8/swanctl.8 #usr/share/strongswan #usr/share/strongswan/templates #usr/share/strongswan/templates/config @@ -202,7 +217,6 @@ usr/sbin/ipsec #usr/share/strongswan/templates/config/plugins/md5.conf #usr/share/strongswan/templates/config/plugins/nonce.conf #usr/share/strongswan/templates/config/plugins/openssl.conf -#usr/share/strongswan/templates/config/plugins/padlock.conf #usr/share/strongswan/templates/config/plugins/pem.conf #usr/share/strongswan/templates/config/plugins/pgp.conf #usr/share/strongswan/templates/config/plugins/pkcs1.conf @@ -220,6 +234,7 @@ usr/sbin/ipsec #usr/share/strongswan/templates/config/plugins/sshkey.conf #usr/share/strongswan/templates/config/plugins/stroke.conf #usr/share/strongswan/templates/config/plugins/updown.conf +#usr/share/strongswan/templates/config/plugins/vici.conf #usr/share/strongswan/templates/config/plugins/x509.conf #usr/share/strongswan/templates/config/plugins/xauth-eap.conf #usr/share/strongswan/templates/config/plugins/xauth-generic.conf @@ -232,3 +247,4 @@ usr/sbin/ipsec #usr/share/strongswan/templates/config/strongswan.d/pki.conf #usr/share/strongswan/templates/config/strongswan.d/scepclient.conf #usr/share/strongswan/templates/config/strongswan.d/starter.conf +#usr/share/strongswan/templates/config/strongswan.d/swanctl.conf diff --git a/config/rootfiles/core/104/exclude b/config/rootfiles/core/104/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/104/exclude +++ /dev/null @@ -1,28 +0,0 @@ -boot/config.txt -boot/grub/grub.cfg -boot/grub/grubenv -etc/alternatives -etc/collectd.custom -etc/default/grub -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/104/filelists/acl b/config/rootfiles/core/104/filelists/acl deleted file mode 120000 index d819f9c..0000000 --- a/config/rootfiles/core/104/filelists/acl +++ /dev/null @@ -1 +0,0 @@ -../../../common/acl \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-multi b/config/rootfiles/core/104/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi b/config/rootfiles/core/104/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/curl b/config/rootfiles/core/104/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/104/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/ddns b/config/rootfiles/core/104/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/104/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/dnsmasq b/config/rootfiles/core/104/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/104/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files deleted file mode 100644 index c172c14..0000000 --- a/config/rootfiles/core/104/filelists/files +++ /dev/null @@ -1,14 +0,0 @@ -etc/system-release -etc/issue -etc/collectd.conf -etc/httpd/conf/global.conf -etc/rc.d/init.d/snort -opt/pakfire/lib/functions.sh -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/logs.cgi/log.dat -srv/web/ipfire/html/themes/ipfire/include/functions.pl -srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js -var/ipfire/langs -var/ipfire/fwhosts/customservices.default -var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/core/104/filelists/i586/acpid b/config/rootfiles/core/104/filelists/i586/acpid deleted file mode 120000 index 21d36ee..0000000 --- a/config/rootfiles/core/104/filelists/i586/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/i586/linux b/config/rootfiles/core/104/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/104/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/iputils b/config/rootfiles/core/104/filelists/iputils deleted file mode 120000 index 361c28f..0000000 --- a/config/rootfiles/core/104/filelists/iputils +++ /dev/null @@ -1 +0,0 @@ -../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/core/104/filelists/libarchive deleted file mode 120000 index 551f1f7..0000000 --- a/config/rootfiles/core/104/filelists/libarchive +++ /dev/null @@ -1 +0,0 @@ -../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/libcap b/config/rootfiles/core/104/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/104/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp deleted file mode 120000 index 7542d86..0000000 --- a/config/rootfiles/core/104/filelists/ntp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/openssh b/config/rootfiles/core/104/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/104/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/pcre b/config/rootfiles/core/104/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/104/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/popt b/config/rootfiles/core/104/filelists/popt deleted file mode 120000 index d71a9ab..0000000 --- a/config/rootfiles/core/104/filelists/popt +++ /dev/null @@ -1 +0,0 @@ -../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/screen b/config/rootfiles/core/104/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/104/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/core/104/filelists/shadow deleted file mode 120000 index c0824b7..0000000 --- a/config/rootfiles/core/104/filelists/shadow +++ /dev/null @@ -1 +0,0 @@ -../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/snort b/config/rootfiles/core/104/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/104/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/104/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/which b/config/rootfiles/core/104/filelists/which deleted file mode 120000 index 9cfc884..0000000 --- a/config/rootfiles/core/104/filelists/which +++ /dev/null @@ -1 +0,0 @@ -../../../common/which \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/x86_64/acpid b/config/rootfiles/core/104/filelists/x86_64/acpid deleted file mode 120000 index 289f8f5..0000000 --- a/config/rootfiles/core/104/filelists/x86_64/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/acpid \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/x86_64/linux b/config/rootfiles/core/104/filelists/x86_64/linux deleted file mode 120000 index 0615b5b..0000000 --- a/config/rootfiles/core/104/filelists/x86_64/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/104/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/104/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh deleted file mode 100644 index 0223923..0000000 --- a/config/rootfiles/core/104/update.sh +++ /dev/null @@ -1,254 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function find_device() { - local mountpoint="${1}" - - local root - local dev mp fs flags rest - while read -r dev mp fs flags rest; do - # Skip unwanted entries - [ "${dev}" = "rootfs" ] && continue - - if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then - root="$(basename "${dev}")" - break - fi - done < /proc/mounts - - # Get the actual device from the partition that holds / - while [ -n "${root}" ]; do - if [ -e "/sys/block/${root}" ]; then - echo "${root}" - return 0 - fi - - # Remove last character - root="${root::-1}" - done - - return 1 -} - - -core=104 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: $1" - exit $2 -} - -# Remove old core updates from pakfire cache to save space... -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire* ) - # Ok. - ;; - * ) - exit_with_error "ERROR cannot update. No IPFire Kernel." 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - exit_with_error "ERROR cannot update because not enough free space on root." 2 - exit 2 -fi - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules, dtb's ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/zImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules - -case "$(uname -m)" in - armv*) - # Backup uEnv.txt if exist - if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org - fi - - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - mkdir -pv /boot/dtb-$KVER-ipfire-multi - touch /boot/uImage-ipfire-kirkwood - touch /boot/zImage-ipfire-multi - touch /boot/uIinit-ipfire-kirkwood - touch /boot/uIinit-ipfire-multi - ;; -esac - -# Stop services -/etc/init.d/collectd stop -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/dnsmasq stop -/etc/init.d/sshd stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Remove some old files -rm -f /bin/groups /lib/libshadow.so.0* - -# update linker config -ldconfig - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /etc/init.d/apache start - exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 - ;; - esac -fi - -# Update Language cache -/usr/local/bin/update-lang-cache - -# -# Start services -# -/etc/init.d/collectd start -/etc/init.d/apache start -/etc/init.d/dnsmasq start -/etc/init.d/sshd start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# Delete old QoS enabled indicator -rm -f /var/ipfire/qos/enable - -# Upadate Kernel version uEnv.txt -if [ -e /boot/uEnv.txt ]; then - sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt -fi - -# call user update script (needed for some arm boards) -if [ -e /boot/pakfire-kernel-update ]; then - /boot/pakfire-kernel-update ${KVER} -fi - -case "$(uname -m)" in - i?86) - # Force (re)install pae kernel if pae is supported - rm -rf /opt/pakfire/db/installed/meta-linux-pae - if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - fi - fi - ;; -esac -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/105/exclude b/config/rootfiles/core/105/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/105/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files new file mode 100644 index 0000000..95f6e10 --- /dev/null +++ b/config/rootfiles/core/105/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue \ No newline at end of file diff --git a/config/rootfiles/core/105/filelists/libgcrypt b/config/rootfiles/core/105/filelists/libgcrypt new file mode 120000 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/core/105/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/105/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/105/meta b/config/rootfiles/core/105/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/105/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh new file mode 100644 index 0000000..3e9f601 --- /dev/null +++ b/config/rootfiles/core/105/update.sh @@ -0,0 +1,71 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=105 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services + +# 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/104/exclude b/config/rootfiles/oldcore/104/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/104/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/104/filelists/acl b/config/rootfiles/oldcore/104/filelists/acl new file mode 120000 index 0000000..d819f9c --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/acl @@ -0,0 +1 @@ +../../../common/acl \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/curl b/config/rootfiles/oldcore/104/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/ddns b/config/rootfiles/oldcore/104/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/dnsmasq b/config/rootfiles/oldcore/104/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/files b/config/rootfiles/oldcore/104/filelists/files new file mode 100644 index 0000000..c172c14 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/files @@ -0,0 +1,14 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/httpd/conf/global.conf +etc/rc.d/init.d/snort +opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js +var/ipfire/langs +var/ipfire/fwhosts/customservices.default +var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/oldcore/104/filelists/i586/acpid b/config/rootfiles/oldcore/104/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/i586/linux b/config/rootfiles/oldcore/104/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/iputils b/config/rootfiles/oldcore/104/filelists/iputils new file mode 120000 index 0000000..361c28f --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/libarchive b/config/rootfiles/oldcore/104/filelists/libarchive new file mode 120000 index 0000000..551f1f7 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/libcap b/config/rootfiles/oldcore/104/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/ntp b/config/rootfiles/oldcore/104/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/openssh b/config/rootfiles/oldcore/104/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/pcre b/config/rootfiles/oldcore/104/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/popt b/config/rootfiles/oldcore/104/filelists/popt new file mode 120000 index 0000000..d71a9ab --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/popt @@ -0,0 +1 @@ +../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/screen b/config/rootfiles/oldcore/104/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/shadow b/config/rootfiles/oldcore/104/filelists/shadow new file mode 120000 index 0000000..c0824b7 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/snort b/config/rootfiles/oldcore/104/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/wget b/config/rootfiles/oldcore/104/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/which b/config/rootfiles/oldcore/104/filelists/which new file mode 120000 index 0000000..9cfc884 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/which @@ -0,0 +1 @@ +../../../common/which \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/acpid b/config/rootfiles/oldcore/104/filelists/x86_64/acpid new file mode 120000 index 0000000..289f8f5 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/x86_64/acpid @@ -0,0 +1 @@ +../../../../common/x86_64/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/linux b/config/rootfiles/oldcore/104/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/meta b/config/rootfiles/oldcore/104/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/104/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/104/update.sh b/config/rootfiles/oldcore/104/update.sh new file mode 100644 index 0000000..0223923 --- /dev/null +++ b/config/rootfiles/oldcore/104/update.sh @@ -0,0 +1,254 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +core=104 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + touch /boot/uImage-ipfire-kirkwood + touch /boot/zImage-ipfire-multi + touch /boot/uIinit-ipfire-kirkwood + touch /boot/uIinit-ipfire-multi + ;; +esac + +# Stop services +/etc/init.d/collectd stop +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/dnsmasq stop +/etc/init.d/sshd stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Remove some old files +rm -f /bin/groups /lib/libshadow.so.0* + +# update linker config +ldconfig + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# Update Language cache +/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/collectd start +/etc/init.d/apache start +/etc/init.d/dnsmasq start +/etc/init.d/sshd start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Delete old QoS enabled indicator +rm -f /var/ipfire/qos/enable + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/lfs/openssl b/lfs/openssl index 0a0b2cf..d0ed4d3 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.2h +VER = 1.0.2i THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -87,7 +87,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9392e65072ce4b614c1392eefc1f23d0 +$(DL_FILE)_MD5 = 678374e63f8df456a697d3e5e5a931fb install : $(TARGET) diff --git a/lfs/strongswan b/lfs/strongswan index c6d655b..17c1a01 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.5 +VER = 5.5.0 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a2f9ea185f27e7f8413d4cd2ee61efe4 +$(DL_FILE)_MD5 = a96fa7eb6c62b40143dadb064b6bd586 install : $(TARGET) @@ -79,7 +79,6 @@ $(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/strongswan-ipfire.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch cd $(DIR_APP) && ./configure \ --prefix="/usr" \ diff --git a/make.sh b/make.sh index 951f3dc..e1a6233 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="104" # Core Level (Filename) -PAKFIRE_CORE="104" # Core Level (PAKFIRE) +CORE="105" # Core Level (Filename) +PAKFIRE_CORE="105" # 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/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch b/src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch deleted file mode 100644 index 27b6f06..0000000 --- a/src/patches/strongswan-child-rekey-Suppress-updown-event-when-deleting-redundant-CHILD_SAs.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0e32cbc0bc8fce3319491db360fb23b16561ec58 Mon Sep 17 00:00:00 2001 -From: Tobias Brunner <tobias(a)strongswan.org> -Date: Tue, 15 Dec 2015 17:15:32 +0100 -Subject: [PATCH] child-rekey: Suppress updown event when deleting redundant - CHILD_SAs - -When handling a rekey collision we might have to delete an already -installed redundant CHILD_SA (or expect the other peer to do so). We don't -want to trigger updown events for these as we don't during rekeying. - -Instead of setting the state to CHILD_REKEYING we could maybe use -CHILD_REKEYED, which we currently only use for IKEv1, and set it for -all CHILD_SAs we delete or expect the other peer to delete. Would need -a small change in child-delete too. Or we could introduce a new state. - - #853. ---- - src/libcharon/sa/ikev2/tasks/child_rekey.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/libcharon/sa/ikev2/tasks/child_rekey.c b/src/libcharon/sa/ikev2/tasks/child_rekey.c -index c7a8a13..6f0c2b2 100644 ---- a/src/libcharon/sa/ikev2/tasks/child_rekey.c -+++ b/src/libcharon/sa/ikev2/tasks/child_rekey.c -@@ -279,11 +279,15 @@ static child_sa_t *handle_collision(private_child_rekey_t *this) - /* don't touch child other created, it has already been deleted */ - if (!this->other_child_destroyed) - { -- /* disable close action for the redundand child */ -+ /* disable close action and updown event for redundant child */ - child_sa = other->child_create->get_child(other->child_create); - if (child_sa) - { - child_sa->set_close_action(child_sa, ACTION_NONE); -+ if (child_sa->get_state(child_sa) != CHILD_REKEYING) -+ { -+ child_sa->set_state(child_sa, CHILD_REKEYING); -+ } - } - } - } -@@ -372,6 +376,11 @@ METHOD(task_t, process_i, status_t, - { - return SUCCESS; - } -+ /* disable updown event for redundant CHILD_SA */ -+ if (to_delete->get_state(to_delete) != CHILD_REKEYING) -+ { -+ to_delete->set_state(to_delete, CHILD_REKEYING); -+ } - spi = to_delete->get_spi(to_delete, TRUE); - protocol = to_delete->get_protocol(to_delete); - --- -1.7.9.5 - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. cd805ced09c2e203e7e6b874b7b96fb5e86a11b5
by git＠ipfire.org 22 Sep '16

22 Sep '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 cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 (commit) via 3bc177eec53248b296e13654003f278c65ddc413 (commit) via 8bbed7a5b6a878dae03d605042b48304f3900304 (commit) via db7ef87902096d8268bb348ba5821eba344e27ba (commit) via c4a1169ed975c15ee8c29c99d0667388a09c29bf (commit) from ad7e47072b4993d96749f4e8f0f106b409ed77ca (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 cd805ced09c2e203e7e6b874b7b96fb5e86a11b5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 12:04:18 2016 +0100 Tag Core Update 105 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3bc177eec53248b296e13654003f278c65ddc413 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 12:02:32 2016 +0100 openssl: Update to 1.0.2i https://www.openssl.org/news/openssl-1.0.2-notes.html This release fixes various security flaws: * OCSP Status Request extension unbounded memory growth (CVE-2016-6304) * SWEET32 Mitigation (CVE-2016-2183) * OOB write in MDC2_Update() (CVE-2016-6303) * Malformed SHA512 ticket DoS (CVE-2016-6302) * OOB write in BN_bn2dec() (CVE-2016-2182) * OOB read in TS_OBJ_print_bio() (CVE-2016-2180) * Pointer arithmetic undefined behaviour (CVE-2016-2177) * Constant time flag not preserved in DSA signing (CVE-2016-2178) * DTLS buffered message DoS (CVE-2016-2179) * DTLS replay protection DoS (CVE-2016-2181) * Certificate message OOB reads (CVE-2016-6306) Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8bbed7a5b6a878dae03d605042b48304f3900304 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 10:30:28 2016 +0100 core105: Ship security update for libgcrypt Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit db7ef87902096d8268bb348ba5821eba344e27ba Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Aug 20 12:33:55 2016 +0200 libgcrypt: Update to 1.7.3 Fixes CVE-2016-6313 For details, see: https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html https://bugzilla.redhat.com/show_bug.cgi?id=1366105 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c4a1169ed975c15ee8c29c99d0667388a09c29bf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Sep 22 10:28:36 2016 +0100 Start Core Update 105 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/core/{104 => 105}/exclude | 0 config/rootfiles/{oldcore/55 => core/105}/filelists/files | 2 +- config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt | 0 config/rootfiles/{oldcore/99 => core/105}/filelists/openssl | 0 config/rootfiles/core/{104 => 105}/meta | 0 config/rootfiles/{oldcore/102 => core/105}/update.sh | 5 +---- config/rootfiles/oldcore/{103 => 104}/exclude | 0 config/rootfiles/{core => oldcore}/104/filelists/acl | 0 .../{core => oldcore}/104/filelists/armv5tel/linux-kirkwood | 0 .../rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi | 0 config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi | 0 config/rootfiles/{core => oldcore}/104/filelists/curl | 0 config/rootfiles/{core => oldcore}/104/filelists/ddns | 0 config/rootfiles/{core => oldcore}/104/filelists/dnsmasq | 0 config/rootfiles/{core => oldcore}/104/filelists/files | 0 config/rootfiles/{core => oldcore}/104/filelists/i586/acpid | 0 config/rootfiles/{core => oldcore}/104/filelists/i586/linux | 0 config/rootfiles/{core => oldcore}/104/filelists/iputils | 0 config/rootfiles/{core => oldcore}/104/filelists/libarchive | 0 config/rootfiles/{core => oldcore}/104/filelists/libcap | 0 config/rootfiles/{core => oldcore}/104/filelists/ntp | 0 config/rootfiles/{core => oldcore}/104/filelists/openssh | 0 config/rootfiles/{core => oldcore}/104/filelists/pcre | 0 config/rootfiles/{core => oldcore}/104/filelists/popt | 0 config/rootfiles/{core => oldcore}/104/filelists/screen | 0 config/rootfiles/{core => oldcore}/104/filelists/shadow | 0 config/rootfiles/{core => oldcore}/104/filelists/snort | 0 config/rootfiles/{core => oldcore}/104/filelists/wget | 0 config/rootfiles/{core => oldcore}/104/filelists/which | 0 config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid | 0 config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux | 0 config/rootfiles/oldcore/{99 => 104}/meta | 0 config/rootfiles/{core => oldcore}/104/update.sh | 0 lfs/libgcrypt | 6 +++--- lfs/openssl | 4 ++-- make.sh | 4 ++-- 37 files changed, 10 insertions(+), 13 deletions(-) rename config/rootfiles/core/{104 => 105}/exclude (100%) copy config/rootfiles/{oldcore/55 => core/105}/filelists/files (65%) copy config/rootfiles/{oldcore/94 => core/105}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/99 => core/105}/filelists/openssl (100%) rename config/rootfiles/core/{104 => 105}/meta (100%) copy config/rootfiles/{oldcore/102 => core/105}/update.sh (99%) copy config/rootfiles/oldcore/{103 => 104}/exclude (100%) rename config/rootfiles/{core => oldcore}/104/filelists/acl (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/104/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/104/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/104/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/104/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/104/filelists/files (100%) rename config/rootfiles/{core => oldcore}/104/filelists/i586/acpid (100%) rename config/rootfiles/{core => oldcore}/104/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/104/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/104/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/104/filelists/libcap (100%) rename config/rootfiles/{core => oldcore}/104/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/104/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/104/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/104/filelists/popt (100%) rename config/rootfiles/{core => oldcore}/104/filelists/screen (100%) rename config/rootfiles/{core => oldcore}/104/filelists/shadow (100%) rename config/rootfiles/{core => oldcore}/104/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/104/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/104/filelists/which (100%) rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/acpid (100%) rename config/rootfiles/{core => oldcore}/104/filelists/x86_64/linux (100%) copy config/rootfiles/oldcore/{99 => 104}/meta (100%) rename config/rootfiles/{core => oldcore}/104/update.sh (100%) Difference in files: diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 578e0b6..4706343 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.0.4 +usr/lib/libgcrypt.so.20.1.3 #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/man/man1/hmac256.1 diff --git a/config/rootfiles/core/104/exclude b/config/rootfiles/core/104/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/104/exclude +++ /dev/null @@ -1,28 +0,0 @@ -boot/config.txt -boot/grub/grub.cfg -boot/grub/grubenv -etc/alternatives -etc/collectd.custom -etc/default/grub -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/104/filelists/acl b/config/rootfiles/core/104/filelists/acl deleted file mode 120000 index d819f9c..0000000 --- a/config/rootfiles/core/104/filelists/acl +++ /dev/null @@ -1 +0,0 @@ -../../../common/acl \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-multi b/config/rootfiles/core/104/filelists/armv5tel/linux-multi deleted file mode 120000 index 204eb4c..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-multi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi b/config/rootfiles/core/104/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/curl b/config/rootfiles/core/104/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/104/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/ddns b/config/rootfiles/core/104/filelists/ddns deleted file mode 120000 index 7395164..0000000 --- a/config/rootfiles/core/104/filelists/ddns +++ /dev/null @@ -1 +0,0 @@ -../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/dnsmasq b/config/rootfiles/core/104/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/104/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files deleted file mode 100644 index c172c14..0000000 --- a/config/rootfiles/core/104/filelists/files +++ /dev/null @@ -1,14 +0,0 @@ -etc/system-release -etc/issue -etc/collectd.conf -etc/httpd/conf/global.conf -etc/rc.d/init.d/snort -opt/pakfire/lib/functions.sh -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/logs.cgi/log.dat -srv/web/ipfire/html/themes/ipfire/include/functions.pl -srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js -var/ipfire/langs -var/ipfire/fwhosts/customservices.default -var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/core/104/filelists/i586/acpid b/config/rootfiles/core/104/filelists/i586/acpid deleted file mode 120000 index 21d36ee..0000000 --- a/config/rootfiles/core/104/filelists/i586/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/i586/linux b/config/rootfiles/core/104/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/104/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/iputils b/config/rootfiles/core/104/filelists/iputils deleted file mode 120000 index 361c28f..0000000 --- a/config/rootfiles/core/104/filelists/iputils +++ /dev/null @@ -1 +0,0 @@ -../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/core/104/filelists/libarchive deleted file mode 120000 index 551f1f7..0000000 --- a/config/rootfiles/core/104/filelists/libarchive +++ /dev/null @@ -1 +0,0 @@ -../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/libcap b/config/rootfiles/core/104/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/104/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp deleted file mode 120000 index 7542d86..0000000 --- a/config/rootfiles/core/104/filelists/ntp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/openssh b/config/rootfiles/core/104/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/104/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/pcre b/config/rootfiles/core/104/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/104/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/popt b/config/rootfiles/core/104/filelists/popt deleted file mode 120000 index d71a9ab..0000000 --- a/config/rootfiles/core/104/filelists/popt +++ /dev/null @@ -1 +0,0 @@ -../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/screen b/config/rootfiles/core/104/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/104/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/core/104/filelists/shadow deleted file mode 120000 index c0824b7..0000000 --- a/config/rootfiles/core/104/filelists/shadow +++ /dev/null @@ -1 +0,0 @@ -../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/snort b/config/rootfiles/core/104/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/104/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/104/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/which b/config/rootfiles/core/104/filelists/which deleted file mode 120000 index 9cfc884..0000000 --- a/config/rootfiles/core/104/filelists/which +++ /dev/null @@ -1 +0,0 @@ -../../../common/which \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/x86_64/acpid b/config/rootfiles/core/104/filelists/x86_64/acpid deleted file mode 120000 index 289f8f5..0000000 --- a/config/rootfiles/core/104/filelists/x86_64/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/acpid \ No newline at end of file diff --git a/config/rootfiles/core/104/filelists/x86_64/linux b/config/rootfiles/core/104/filelists/x86_64/linux deleted file mode 120000 index 0615b5b..0000000 --- a/config/rootfiles/core/104/filelists/x86_64/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/104/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/104/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh deleted file mode 100644 index 0223923..0000000 --- a/config/rootfiles/core/104/update.sh +++ /dev/null @@ -1,254 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function find_device() { - local mountpoint="${1}" - - local root - local dev mp fs flags rest - while read -r dev mp fs flags rest; do - # Skip unwanted entries - [ "${dev}" = "rootfs" ] && continue - - if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then - root="$(basename "${dev}")" - break - fi - done < /proc/mounts - - # Get the actual device from the partition that holds / - while [ -n "${root}" ]; do - if [ -e "/sys/block/${root}" ]; then - echo "${root}" - return 0 - fi - - # Remove last character - root="${root::-1}" - done - - return 1 -} - - -core=104 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: $1" - exit $2 -} - -# Remove old core updates from pakfire cache to save space... -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -case $(uname -r) in - *-ipfire* ) - # Ok. - ;; - * ) - exit_with_error "ERROR cannot update. No IPFire Kernel." 1 - ;; -esac - - -# -# -KVER="xxxKVERxxx" - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 100000 ]; then - exit_with_error "ERROR cannot update because not enough free space on root." 2 - exit 2 -fi - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules, dtb's ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/initramfs-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/zImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /boot/dtb-*-ipfire-* -rm -rf /lib/modules - -case "$(uname -m)" in - armv*) - # Backup uEnv.txt if exist - if [ -e /boot/uEnv.txt ]; then - cp -vf /boot/uEnv.txt /boot/uEnv.txt.org - fi - - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - mkdir -pv /boot/dtb-$KVER-ipfire-multi - touch /boot/uImage-ipfire-kirkwood - touch /boot/zImage-ipfire-multi - touch /boot/uIinit-ipfire-kirkwood - touch /boot/uIinit-ipfire-multi - ;; -esac - -# Stop services -/etc/init.d/collectd stop -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/dnsmasq stop -/etc/init.d/sshd stop -/etc/init.d/ipsec stop -/etc/init.d/apache stop - -# Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Remove some old files -rm -f /bin/groups /lib/libshadow.so.0* - -# update linker config -ldconfig - -# Check diskspace on boot -BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $BOOTSPACE -lt 1000 ]; then - case $(uname -r) in - *-ipfire-kirkwood ) - # Special handling for old kirkwood images. - # (install only kirkwood kernel) - rm -rf /boot/* - # work around the u-boot folder detection bug - mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ - --numeric-owner -C / --wildcards 'boot/*-kirkwood*' - ;; - * ) - /etc/init.d/apache start - exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 - ;; - esac -fi - -# Update Language cache -/usr/local/bin/update-lang-cache - -# -# Start services -# -/etc/init.d/collectd start -/etc/init.d/apache start -/etc/init.d/dnsmasq start -/etc/init.d/sshd start -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# Delete old QoS enabled indicator -rm -f /var/ipfire/qos/enable - -# Upadate Kernel version uEnv.txt -if [ -e /boot/uEnv.txt ]; then - sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt -fi - -# call user update script (needed for some arm boards) -if [ -e /boot/pakfire-kernel-update ]; then - /boot/pakfire-kernel-update ${KVER} -fi - -case "$(uname -m)" in - i?86) - # Force (re)install pae kernel if pae is supported - rm -rf /opt/pakfire/db/installed/meta-linux-pae - if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: WARNING not enough space for pae kernel." - else - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae - fi - fi - ;; -esac -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -killall -KILL pak_update -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/105/exclude b/config/rootfiles/core/105/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/105/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files new file mode 100644 index 0000000..95f6e10 --- /dev/null +++ b/config/rootfiles/core/105/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue \ No newline at end of file diff --git a/config/rootfiles/core/105/filelists/libgcrypt b/config/rootfiles/core/105/filelists/libgcrypt new file mode 120000 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/core/105/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/105/filelists/openssl b/config/rootfiles/core/105/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/105/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/105/meta b/config/rootfiles/core/105/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/105/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh new file mode 100644 index 0000000..3e9f601 --- /dev/null +++ b/config/rootfiles/core/105/update.sh @@ -0,0 +1,71 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=105 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services + +# 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/104/exclude b/config/rootfiles/oldcore/104/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/104/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/104/filelists/acl b/config/rootfiles/oldcore/104/filelists/acl new file mode 120000 index 0000000..d819f9c --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/acl @@ -0,0 +1 @@ +../../../common/acl \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/curl b/config/rootfiles/oldcore/104/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/ddns b/config/rootfiles/oldcore/104/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/dnsmasq b/config/rootfiles/oldcore/104/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/files b/config/rootfiles/oldcore/104/filelists/files new file mode 100644 index 0000000..c172c14 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/files @@ -0,0 +1,14 @@ +etc/system-release +etc/issue +etc/collectd.conf +etc/httpd/conf/global.conf +etc/rc.d/init.d/snort +opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js +var/ipfire/langs +var/ipfire/fwhosts/customservices.default +var/ipfire/updatexlrator/bin/download diff --git a/config/rootfiles/oldcore/104/filelists/i586/acpid b/config/rootfiles/oldcore/104/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/i586/linux b/config/rootfiles/oldcore/104/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/iputils b/config/rootfiles/oldcore/104/filelists/iputils new file mode 120000 index 0000000..361c28f --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/iputils @@ -0,0 +1 @@ +../../../common/iputils \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/libarchive b/config/rootfiles/oldcore/104/filelists/libarchive new file mode 120000 index 0000000..551f1f7 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/libarchive @@ -0,0 +1 @@ +../../../common/libarchive \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/libcap b/config/rootfiles/oldcore/104/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/ntp b/config/rootfiles/oldcore/104/filelists/ntp new file mode 120000 index 0000000..7542d86 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/ntp @@ -0,0 +1 @@ +../../../common/ntp \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/openssh b/config/rootfiles/oldcore/104/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/pcre b/config/rootfiles/oldcore/104/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/popt b/config/rootfiles/oldcore/104/filelists/popt new file mode 120000 index 0000000..d71a9ab --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/popt @@ -0,0 +1 @@ +../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/screen b/config/rootfiles/oldcore/104/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/shadow b/config/rootfiles/oldcore/104/filelists/shadow new file mode 120000 index 0000000..c0824b7 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/snort b/config/rootfiles/oldcore/104/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/wget b/config/rootfiles/oldcore/104/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/which b/config/rootfiles/oldcore/104/filelists/which new file mode 120000 index 0000000..9cfc884 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/which @@ -0,0 +1 @@ +../../../common/which \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/acpid b/config/rootfiles/oldcore/104/filelists/x86_64/acpid new file mode 120000 index 0000000..289f8f5 --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/x86_64/acpid @@ -0,0 +1 @@ +../../../../common/x86_64/acpid \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/filelists/x86_64/linux b/config/rootfiles/oldcore/104/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/oldcore/104/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/104/meta b/config/rootfiles/oldcore/104/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/104/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/104/update.sh b/config/rootfiles/oldcore/104/update.sh new file mode 100644 index 0000000..0223923 --- /dev/null +++ b/config/rootfiles/oldcore/104/update.sh @@ -0,0 +1,254 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +core=104 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + touch /boot/uImage-ipfire-kirkwood + touch /boot/zImage-ipfire-multi + touch /boot/uIinit-ipfire-kirkwood + touch /boot/uIinit-ipfire-multi + ;; +esac + +# Stop services +/etc/init.d/collectd stop +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/dnsmasq stop +/etc/init.d/sshd stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Remove some old files +rm -f /bin/groups /lib/libshadow.so.0* + +# update linker config +ldconfig + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# Update Language cache +/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/collectd start +/etc/init.d/apache start +/etc/init.d/dnsmasq start +/etc/init.d/sshd start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Delete old QoS enabled indicator +rm -f /var/ipfire/qos/enable + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 98cf787..5a06032 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# 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 = 1.6.4 +VER = 1.7.3 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4c13c5fa43147866f993d73ee62af176 +$(DL_FILE)_MD5 = c869e542cc13a1c28d8055487bf7f5c4 install : $(TARGET) diff --git a/lfs/openssl b/lfs/openssl index 0a0b2cf..d0ed4d3 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -24,7 +24,7 @@ include Config -VER = 1.0.2h +VER = 1.0.2i THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -87,7 +87,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9392e65072ce4b614c1392eefc1f23d0 +$(DL_FILE)_MD5 = 678374e63f8df456a697d3e5e5a931fb install : $(TARGET) diff --git a/make.sh b/make.sh index 1c832d0..b6cb506 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="104" # Core Level (Filename) -PAKFIRE_CORE="104" # Core Level (PAKFIRE) +CORE="105" # Core Level (Filename) +PAKFIRE_CORE="105" # 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 hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM