public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e8b3ba46af85490dee3bc9b5f406aed70d40d7d1
@ 2018-09-18 20:40 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2018-09-18 20:40 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 12398 bytes --]

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  e8b3ba46af85490dee3bc9b5f406aed70d40d7d1 (commit)
       via  72f604e8279363408f10d2561d7ba5476578f074 (commit)
       via  1ad8926ba12192c115257a8e1733730922ccdfe3 (commit)
       via  8a1a5118af72f26636ffe2f861f2f36c27d20fc2 (commit)
      from  da6dc1c016038aed387b8f1fa4fd9baf2a7eaeea (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 e8b3ba46af85490dee3bc9b5f406aed70d40d7d1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Sep 18 21:39:45 2018 +0100

    linux-firmware: Update to 20180918
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 72f604e8279363408f10d2561d7ba5476578f074
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Aug 5 11:47:24 2018 +0100

    glibc: Update to 2.28
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 1ad8926ba12192c115257a8e1733730922ccdfe3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Aug 5 11:47:08 2018 +0100

    gcc: Update to 8.2.0
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8a1a5118af72f26636ffe2f861f2f36c27d20fc2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Aug 3 13:10:55 2018 +0100

    Remove fastd and libuecc
    
    This was added to support VPN peering with Freifunk with which
    we have no afiliation any more.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 fastd/fastd.nm                         | 55 ----------------------------------
 gcc/gcc.nm                             | 42 ++++++--------------------
 gcc/patches/gcc49-no-add-needed.patch0 | 50 -------------------------------
 glibc/glibc.nm                         | 10 ++++---
 libuecc/libuecc.nm                     | 43 --------------------------
 linux-firmware/linux-firmware.nm       | 10 +++----
 6 files changed, 20 insertions(+), 190 deletions(-)
 delete mode 100644 fastd/fastd.nm
 delete mode 100644 gcc/patches/gcc49-no-add-needed.patch0
 delete mode 100644 libuecc/libuecc.nm

Difference in files:
diff --git a/fastd/fastd.nm b/fastd/fastd.nm
deleted file mode 100644
index 80bd6952d..000000000
--- a/fastd/fastd.nm
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
-###############################################################################
-
-name       = fastd
-version    = 17
-release    = 1
-
-groups     = Networking/VPN
-url        = https://projects.universe-factory.net/projects/fastd/wiki
-license    = BSD
-summary    = Fast and Secure Tunnelling Daemon
-
-description
-	fastd is a fast and secure tunneling daemon that is designed
-	to run on embedded devices.
-end
-
-source_dl  = https://projects.universe-factory.net/attachments/download/81/
-sources    = %{thisapp}.tar.xz
-
-build
-	requires
-		bison >= 2.5
-		cmake >= 3.0
-		doxygen
-		json-c-devel
-		libcap-devel
-		libsodium-devel
-		libuecc >= 5
-		libuecc-devel
-		openssl-devel
-	end
-
-	if "%{DISTRO_ARCH}" == "i686"
-		build_options = \
-			-DWITH_CIPHER_SALSA2012_XMM=OFF \
-			-DWITH_CIPHER_SALSA20_XMM=OFF \
-			-DWITH_MAC_GHASH_PCLMULQDQ=OFF
-	end
-
-	build
-		%{cmake} %{build_options} .
-		make %{PARALLELISMFLAGS}
-	end
-end
-
-packages
-	package %{name}
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index 7f1f5432b..cd3fb35a8 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -7,7 +7,7 @@
 build_graphite = 1
 
 name       = gcc
-version    = 7.3.0
+version    = 8.2.0
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -64,9 +64,6 @@ build
 	# Build libubsan
 	build_libubsan = 0
 
-	# Build libcilkrts (only x86)
-	build_libcilkrts = 0
-
 	# Build libmpx (only on x86_64)
 	build_libmpx = 0
 
@@ -83,7 +80,6 @@ build
 		build_liblsan = 1
 		build_libtsan = 1
 		build_libubsan = 1
-		build_libcilkrts = 1
 		build_libmpx = 1
 	end
 
@@ -92,7 +88,6 @@ build
 
 		build_libquadmath = 1
 		build_libubsan = 1
-		build_libcilkrts = 1
 	end
 
 	if "%{DISTRO_ARCH}" == "aarch64"
@@ -287,7 +282,7 @@ build
 		chmod 755 %{BUILDROOT}%{libdir}/libgomp.so.1.*
 
 		# libstdc++
-		ln -svf ../../../libstdc++.so.6.0.24 ${FULLPATH}/libstdc++.so
+		ln -svf ../../../libstdc++.so.6.0.25 ${FULLPATH}/libstdc++.so
 		mv -vf %{BUILDROOT}%{libdir}/lib{std,sup}c++.a ${FULLPATH}
 
 		# libquadmath
@@ -315,16 +310,10 @@ build
 
 		# libubsan
 		if [ "%{build_libubsan}" = "1" ]; then
-			ln -svf ../../../libubsan.so.0.0.0 ${FULLPATH}/libubsan.so
+			ln -svf ../../../libubsan.so.1.0.0 ${FULLPATH}/libubsan.so
 			chmod 755 %{BUILDROOT}%{libdir}/libubsan.so.*
 		fi
 
-		# libcilkrts
-		if [ "%{build_libcilkrts}" = "1" ]; then
-			ln -svf ../../../libcilkrts.so.5.0.0 ${FULLPATH}/libcilkrts.so
-			chmod 755 %{BUILDROOT}%{libdir}/libcilkrts.so.5.*
-		fi
-
 		if [ "%{build_libmpx}" = "1" ]; then
 			ln -svf ../../../libmpx.so.2.0.1 ${FULLPATH}/libmpx.so
 			ln -svf ../../../libmpxwrappers.so.2.0.1 ${FULLPATH}/libmpxwrappers.so
@@ -532,7 +521,7 @@ packages
 		end
 
 		files
-			%{libdir}/libitm.so.1*
+			%{libdir}/libitm.so.*
 		end
 	end
 
@@ -565,7 +554,7 @@ packages
 		end
 
 		files
-			%{libdir}/libatomic.so.1*
+			%{libdir}/libatomic.so.*
 		end
 	end
 
@@ -577,7 +566,7 @@ packages
 		end
 
 		files
-			%{libdir}/libasan.so.2*
+			%{libdir}/libasan.so.*
 		end
 	end
 
@@ -590,7 +579,7 @@ packages
 			end
 
 			files
-				%{libdir}/libtsan.so.0*
+				%{libdir}/libtsan.so.*
 			end
 		end
 	end
@@ -604,7 +593,7 @@ packages
 			end
 
 			files
-				%{libdir}/libubsan.so.0*
+				%{libdir}/libubsan.so.*
 			end
 		end
 	end
@@ -618,20 +607,7 @@ packages
 			end
 
 			files
-				%{libdir}/liblsan.so.0*
-			end
-		end
-	end
-
-	if "%{build_libcilkrts}" == "1"
-		package libcilkrts
-			summary = The Cilk+ runtime library
-			description
-				This package contains the Cilk+ runtime library.
-			end
-
-			files
-				%{libdir}/libcilkrts.so.5*
+				%{libdir}/liblsan.so.*
 			end
 		end
 	end
diff --git a/gcc/patches/gcc49-no-add-needed.patch0 b/gcc/patches/gcc49-no-add-needed.patch0
deleted file mode 100644
index b6ca777eb..000000000
--- a/gcc/patches/gcc49-no-add-needed.patch0
+++ /dev/null
@@ -1,50 +0,0 @@
-2010-02-08  Roland McGrath  <roland(a)redhat.com>
-
-	* config/rs6000/sysv4.h (LINK_EH_SPEC): Pass --no-add-needed to the
-	linker.
-	* config/gnu-user.h (LINK_EH_SPEC): Likewise.
-	* config/alpha/elf.h (LINK_EH_SPEC): Likewise.
-	* config/ia64/linux.h (LINK_EH_SPEC): Likewise.
-
---- gcc/config/alpha/elf.h.jj	2011-01-03 12:52:31.118056764 +0100
-+++ gcc/config/alpha/elf.h	2011-01-04 18:14:10.931874160 +0100
-@@ -165,5 +165,5 @@ extern int alpha_this_gpdisp_sequence_nu
-    I imagine that other systems will catch up.  In the meantime, it
-    doesn't harm to make sure that the data exists to be used later.  */
- #if defined(HAVE_LD_EH_FRAME_HDR)
--#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
- #endif
---- gcc/config/ia64/linux.h.jj	2011-01-03 13:02:11.462994522 +0100
-+++ gcc/config/ia64/linux.h	2011-01-04 18:14:10.931874160 +0100
-@@ -77,7 +77,7 @@ do {						\
-    Signalize that because we have fde-glibc, we don't need all C shared libs
-    linked against -lgcc_s.  */
- #undef LINK_EH_SPEC
--#define LINK_EH_SPEC ""
-+#define LINK_EH_SPEC "--no-add-needed "
- 
- /* Put all *tf routines in libgcc.  */
- #undef LIBGCC2_HAS_TF_MODE
---- gcc/config/gnu-user.h.jj	2011-01-03 12:53:03.739057299 +0100
-+++ gcc/config/gnu-user.h	2011-01-04 18:14:10.932814884 +0100
-@@ -82,7 +82,7 @@ see the files COPYING3 and COPYING.RUNTI
- #define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
- 
- #if defined(HAVE_LD_EH_FRAME_HDR)
--#define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+#define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
- #endif
- 
- #undef LINK_GCC_C_SEQUENCE_SPEC
---- gcc/config/rs6000/sysv4.h.jj	2011-01-03 13:02:18.255994215 +0100
-+++ gcc/config/rs6000/sysv4.h	2011-01-04 18:14:10.933888871 +0100
-@@ -820,7 +820,7 @@ extern int fixuplabelno;
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
- 
- #if defined(HAVE_LD_EH_FRAME_HDR)
--# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
-+# define LINK_EH_SPEC "--no-add-needed %{!static:--eh-frame-hdr} "
- #endif
- 
- #define CPP_OS_LINUX_SPEC "-D__unix__ -D__gnu_linux__ -D__linux__ \
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 2143693dd..d4ec78b6b 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = glibc
-version    = 2.27
+version    = 2.28
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -33,11 +33,12 @@ build
 	requires
 		autoconf
 		automake
-		binutils >= 2.27
+		binutils >= 2.29
 		bison
-		gcc >= 4.9
+		gcc >= 8
 		gettext
 		kernel-headers >= %{OPTIMIZED_KERNEL}
+		make >= 4.0
 		libcap-devel
 		libstdc++-static
 		texinfo
@@ -95,7 +96,8 @@ build
 		--enable-bind-now \
 		--enable-obsolete-rpc \
 		--with-bugurl=http://bugtracker.ipfire.org \
-		--enable-lock-elision
+		--enable-lock-elision \
+		--enable-cet
 
 	if "%{DISTRO_ARCH}" == "armv5tel"
 		# Disable hardware FP for ARM.
diff --git a/libuecc/libuecc.nm b/libuecc/libuecc.nm
deleted file mode 100644
index 1d4fa0590..000000000
--- a/libuecc/libuecc.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
-###############################################################################
-
-name       = libuecc
-version    = 6
-release    = 1
-
-groups     = Development/Tools
-url        = http://git.universe-factory.net/libuecc
-license    = BSD
-summary    = Very small Elliptic Curve Cryptography library
-
-description
-	%{summary}.
-end
-
-source_dl  = http://git.universe-factory.net/libuecc/snapshot/
-sources    = %{thisapp}.tar.xz
-
-build
-	requires
-		cmake >= 2.8.4-3
-	end
-
-	build
-		%{cmake} .
-		make %{PARALLELISMFLAGS}
-	end
-end
-
-packages
-	package %{name}
-
-	package %{name}-devel
-		template DEVEL
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end
diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm
index f5906f43e..7084e16f2 100644
--- a/linux-firmware/linux-firmware.nm
+++ b/linux-firmware/linux-firmware.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = linux-firmware
-version    = 20130910
-git_ver    = 3fe01af
+version    = 20180918
+git_ver    = 44d4fca
 release    = 1.git%{git_ver}
 arch       = noarch
 thisapp    = %{name}-%{git_ver}
@@ -17,9 +17,9 @@ license    = Non-GPL
 summary    = Firmware Binaries for some Devices.
 
 description
-	linux-firmware provides some firmware binaries that \
-	are loaded into the devices at startup. \
-	For detailed license info check the WHENCE and LICENSE.* texts \
+	linux-firmware provides some firmware binaries that
+	are loaded into the devices at startup.
+	For detailed license info check the WHENCE and LICENSE.* texts
 	for the specific firmware.
 end
 


hooks/post-receive
--
IPFire 3.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2018-09-18 20:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-18 20:40 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e8b3ba46af85490dee3bc9b5f406aed70d40d7d1 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox