Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (74f300f697c8514ec7779d536f38b0225d9d358c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (74f300f697c8514ec7779d536f38b0225d9d358c)
  • Date: Fri, 14 Sep 2018 05:25:58 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

http/squid/DETAILS | 10 +++++-----
http/squid/HISTORY | 5 +++++
libs/gavl/BUILD | 2 +-
libs/gavl/HISTORY | 3 +++
utils/atop/HISTORY | 4 ++++
utils/atop/PRE_BUILD | 4 ++++
utils/atop/gcc-8.patch | 11 +++++++++++
7 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit 74f300f697c8514ec7779d536f38b0225d9d358c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

atop: Fix compilation with GCC 8.x

commit f62cc4feec1725fd7581923ba95e8a46e1c51ea7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

squid: Updated stable to 4.2

Fixes compilation with GCC 8.x
Make SQUID_BETA at least as current as stable. ;)

commit f15ba2cacd95aea5951a60768fab1432d21e2084
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gavl: Needs to link against liblm for sin() with glibc 2.22+

diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index 59a6003..7dfcc6b 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,14 +1,14 @@
SPELL=squid
if [[ $SQUID_BETA == "y" ]]; then
- VERSION=4.0.21
+ VERSION=4.2
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_HASH=sha512:eb0cf99c4a2abb48a2edfbfbd18c963816da28c0cb050a5825d8fea1ce4f4d932ba2c737b47dc34bfbb62bf83ba1e9589b67c3bac1fd8413de81e074fe5d7b7e
+
SOURCE_HASH=sha512:bd22e0ed646e14f3bf776b84fa8e78066a889216a5afa1f0a854070aeca67ffa88b25712d4ab3b147ab59343d3dc12a0e5d78c592d509134e05f8e301e0a95a9
SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/$SOURCE
else
- VERSION=3.5.27
+ VERSION=4.2
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_HASH=sha512:4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817
-
SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE
+
SOURCE_HASH=sha512:bd22e0ed646e14f3bf776b84fa8e78066a889216a5afa1f0a854070aeca67ffa88b25712d4ab3b147ab59343d3dc12a0e5d78c592d509134e05f8e301e0a95a9
+ SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/$SOURCE
fi
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.squid-cache.org/
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 1fa93f9..e3b2975 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,8 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable to 4.2
+ Fixes compilation with GCC 8.x
+ Make SQUID_BETA at least as current as stable. ;)
+
2017-10-23 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 3.5.27
* BUILD, CONFIGURE: Allow building addtional storage filesystems
(rock, diskd, aufs)
diff --git a/libs/gavl/BUILD b/libs/gavl/BUILD
index 5db0da8..6b8d5ac 100755
--- a/libs/gavl/BUILD
+++ b/libs/gavl/BUILD
@@ -1,2 +1,2 @@
OPTS="$GAVL_OPTS $OPTS" &&
-default_build
+LIBS='-lm' default_build
diff --git a/libs/gavl/HISTORY b/libs/gavl/HISTORY
index 8f27bbf..8d70e89 100644
--- a/libs/gavl/HISTORY
+++ b/libs/gavl/HISTORY
@@ -1,3 +1,6 @@
+2018-09-13 Eric Sandall <sandalle AT sourecemage.org>
+ * BUILD: Needs to link against liblm for sin() with glibc 2.22+
+
2012-06-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.0

diff --git a/utils/atop/HISTORY b/utils/atop/HISTORY
index f2584d6..0b60ae1 100644
--- a/utils/atop/HISTORY
+++ b/utils/atop/HISTORY
@@ -1,3 +1,7 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc-8.patch
+ * gcc-8.patch: Fix compilation with GCC 8.x
+
2018-04-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.3.0; updated source URL & website
* DEPENDS: added netatop suggest dependency
diff --git a/utils/atop/PRE_BUILD b/utils/atop/PRE_BUILD
new file mode 100755
index 0000000..0f02b4f
--- /dev/null
+++ b/utils/atop/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+message "${MESSAGE_COLOR}Applying GCC 8.x patch...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/gcc-8.patch
diff --git a/utils/atop/gcc-8.patch b/utils/atop/gcc-8.patch
new file mode 100644
index 0000000..faf86307
--- /dev/null
+++ b/utils/atop/gcc-8.patch
@@ -0,0 +1,11 @@
+diff -Naur atop-2.3.0.orig/photosyst.c atop-2.3.0/photosyst.c
+--- atop-2.3.0.orig/photosyst.c 2018-09-13 22:20:39.955394816 -0700
++++ atop-2.3.0/photosyst.c 2018-09-13 22:21:11.137004992 -0700
+@@ -151,6 +151,7 @@
+
+ static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40
gerlof Exp $";
+
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <string.h>



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (74f300f697c8514ec7779d536f38b0225d9d358c), Eric Sandall, 09/14/2018

Archive powered by MHonArc 2.6.24.

Top of Page