Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c266d2abdacc54ce765798c6dfa939bfbf2f82a3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c266d2abdacc54ce765798c6dfa939bfbf2f82a3)
  • Date: Mon, 10 Aug 2020 21:43:30 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-libs/resid/HISTORY | 3 +
audio-libs/resid/PRE_BUILD | 3 +
dev/null |binary
devel/fpc/DETAILS | 9 ++--
devel/fpc/HISTORY | 3 +
devel/fpc/PRE_BUILD | 2 -
libs/libcgroup/BUILD | 2 +
libs/libcgroup/DEPENDS | 3 +
libs/libcgroup/DETAILS | 1
libs/libcgroup/HISTORY | 9 ++++
libs/libcgroup/PRE_BUILD | 3 +
libs/libcgroup/patches/CVE-2018-14348.patch | 12 ++++++
libs/libcgroup/patches/api.c-fix-infinite-loop.patch | 38
+++++++++++++++++++
libs/libcgroup/patches/musl-decls.patch | 22 +++++++++++
libs/libcgroup/patches/musl-strerror_r.patch | 22 +++++++++++
x11/tint2/DEPENDS | 1
x11/tint2/DETAILS | 7 +--
x11/tint2/HISTORY | 3 +
18 files changed, 133 insertions(+), 10 deletions(-)

New commits:
commit c266d2abdacc54ce765798c6dfa939bfbf2f82a3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

resid: Fix build against musl

commit 97f1cc6044b8cc3b92bbba3c069bec604319077e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fpc 3.2.0

commit 7b8b394d390ebb2eb5d0db33a9bb57c6ce5e7232
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tint2 16.7

commit 1a1bafa3e6a439683f9eb922ae517a5399147778
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libcgroup: Add libfts for musl

commit 662f9cfd94de5f4f92d611eeb1fa36b9c0b5f145
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libcgroup: Add musl fixes taken from Void Linux

commit 357649252c9ce318ff9bdb4896ba8158dc623bb4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libcgroup: Add security fixes taken from Void Linux

commit c615fc0083cff6776da60de9c521e4bc445ca358
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libcgroup: Disable tests

diff --git a/audio-libs/resid/HISTORY b/audio-libs/resid/HISTORY
index 39148fa..5d50233 100644
--- a/audio-libs/resid/HISTORY
+++ b/audio-libs/resid/HISTORY
@@ -1,3 +1,6 @@
+2020-08-10 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/audio-libs/resid/PRE_BUILD b/audio-libs/resid/PRE_BUILD
new file mode 100755
index 0000000..3c8cac2
--- /dev/null
+++ b/audio-libs/resid/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/devel/fpc/DETAILS b/devel/fpc/DETAILS
index 6b038d6..c4a5282 100755
--- a/devel/fpc/DETAILS
+++ b/devel/fpc/DETAILS
@@ -1,6 +1,6 @@
SPELL=fpc
- VERSION=3.0.0
-
SOURCE_HASH=sha512:18b91a10320b0c52d0486aa241dbfeb5777eebe040f393f9b3661e8ab27a338b5a8d84c9461d40c6d11b362af2deb014f7c3fc273fc11fee1fc9badf19e18b88
+ VERSION=3.2.0
+
SOURCE_HASH=sha512:e692ab6fd3a07f347a395e167a32e4833840258f44bec226ce2ca870e96fb49721ef02dd42fa7b72439e6d6cc25a472081efdd6f7e1a64f83e67eceb85056e8f
SOURCE=$SPELL-$VERSION.source.tar.gz

SOURCE_URL[0]=http://downloads.sourceforge.net/project/freepascal/Source/$VERSION/$SOURCE
SOURCE_URL[1]=ftp://ftp.freepascal.org/fpc/dist/$VERSION/source/$SOURCE
@@ -10,12 +10,13 @@ if ! spell_ok fpc ; then
case "${SMGL_COMPAT_ARCHS[1]}" in
ia32) B_ARCH=i386-linux ARCH=386

SOURCE2_HASH=sha512:6d409aaa3827018f27813d7965f2d820e36b725ad8ec3257b89688b0bbf722b41e44ab99495050422b91db71323a081bd60c68f3919d04f17b1922264ec10e13
+# FIXME Upstream dropped support for ia32
;;
*) B_ARCH=${SMGL_COMPAT_ARCHS[1]}-linux ARCH=x64
-
SOURCE2_HASH=sha512:26502cf1dfd2bb83fe860e41cb064ccc5b971d112bf05f95e92089ea71bf0e3aafe659ef4cfc4967dd62271b5ecd3468fedf63dc351944b9e8cb52d662d4a3bb
+
SOURCE2_HASH=sha512:83e7b0489ac532701111684f2e20a67531d445ac009f0f0a1687c2d009d3a9631d4d932b4519345d64750601df877031109f80e7466280289f270422e7f620e5
;;
esac
- SOURCE2=$SPELL-$VERSION.$B_ARCH.tar
+ SOURCE2=$SPELL-$VERSION-$B_ARCH.tar
SOURCE2_URL[0]=ftp://ftp.freepascal.org/fpc/dist/$VERSION/$B_ARCH/$SOURCE2
fi
LICENSE[0]=GPL
diff --git a/devel/fpc/HISTORY b/devel/fpc/HISTORY
index 596d9ba..2160167 100644
--- a/devel/fpc/HISTORY
+++ b/devel/fpc/HISTORY
@@ -1,3 +1,6 @@
+2020-08-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.0
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/devel/fpc/PRE_BUILD b/devel/fpc/PRE_BUILD
index efe28d4..d93b431 100755
--- a/devel/fpc/PRE_BUILD
+++ b/devel/fpc/PRE_BUILD
@@ -8,7 +8,7 @@ if ! spell_ok fpc ; then
mkdir bootstrap &&
cd bootstrap &&
unpack_file 2 &&
-tar -xf fpc-$VERSION.$B_ARCH/binary.$B_ARCH.tar &&
+tar -xf fpc-$VERSION-$B_ARCH/binary.$B_ARCH.tar &&
tar -xzf base.$B_ARCH.tar.gz
fi &&

diff --git a/libs/libcgroup/BUILD b/libs/libcgroup/BUILD
new file mode 100755
index 0000000..6376346
--- /dev/null
+++ b/libs/libcgroup/BUILD
@@ -0,0 +1,2 @@
+LDFLAGS+=" -lfts" &&
+default_build
diff --git a/libs/libcgroup/DEPENDS b/libs/libcgroup/DEPENDS
index 1758494..ce3abd3 100755
--- a/libs/libcgroup/DEPENDS
+++ b/libs/libcgroup/DEPENDS
@@ -1,2 +1,5 @@
+case "$HOST" in *-musl)
+ depends musl-fts ;;
+esac &&
depends -sub CXX gcc &&
optional_depends linux-pam "--enable-pam" "--disable-pam" "to include the
PAM module"
diff --git a/libs/libcgroup/DETAILS b/libs/libcgroup/DETAILS
index 1ae8f01..69be038 100755
--- a/libs/libcgroup/DETAILS
+++ b/libs/libcgroup/DETAILS
@@ -1,5 +1,6 @@
SPELL=libcgroup
VERSION=0.41
+ SECURITY_PATCH=1
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
diff --git a/libs/libcgroup/HISTORY b/libs/libcgroup/HISTORY
index 05c24a5..1258897 100644
--- a/libs/libcgroup/HISTORY
+++ b/libs/libcgroup/HISTORY
@@ -1,3 +1,12 @@
+2020-08-10 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Disabled tests
+ * PRE_BUILD, patches/CVE-2018-14348.patch,
+ patches/api.c-fix-infinite-loop.patch: Added security fixes
+ * DETAILS: SECURITY_PATCH++
+ * patches/musl-decls.patch, patches/musl-strerror_r.patch:
+ Added musl fixes
+ * DEPENDS, BUILD: Added libfts for musl
+
2019-06-01 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Fixed build against musl

diff --git a/libs/libcgroup/PRE_BUILD b/libs/libcgroup/PRE_BUILD
index 3c8cac2..a5682f9 100755
--- a/libs/libcgroup/PRE_BUILD
+++ b/libs/libcgroup/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+# Disable tests
+sedit '/^SUBDIRS =/s/ tests//' Makefile.in &&
sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/libs/libcgroup/patches/CVE-2018-14348.patch
b/libs/libcgroup/patches/CVE-2018-14348.patch
new file mode 100644
index 0000000..bd083c2
--- /dev/null
+++ b/libs/libcgroup/patches/CVE-2018-14348.patch
@@ -0,0 +1,12 @@
+--- a/src/daemon/cgrulesengd.c
++++ b/src/daemon/cgrulesengd.c
+@@ -889,9 +889,6 @@
+ } else if (pid > 0) {
+ exit(EXIT_SUCCESS);
+ }
+-
+- /* Change the file mode mask. */
+- umask(0);
+ } else {
+ flog(LOG_DEBUG, "Not using daemon mode\n");
+ pid = getpid();<Paste>
diff --git a/libs/libcgroup/patches/api.c-fix-infinite-loop.patch
b/libs/libcgroup/patches/api.c-fix-infinite-loop.patch
new file mode 100644
index 0000000..12ee0ee
--- /dev/null
+++ b/libs/libcgroup/patches/api.c-fix-infinite-loop.patch
@@ -0,0 +1,38 @@
+Date: Tue, 8 Dec 2015 16:53:41 +0100
+Subject: [PATCH] api.c: fix infinite loop
+
+If getgrnam or getpwuid functions failed, the program entered
+an infinite loop, because the rule pointer was never advanced.
+This is now fixed by updating the pointer before continuing
+to the next iteration.
+---
+ src/api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/api.c b/src/api.c
+index d6c9d3a..ef796ac 100644
+--- a/src/api.c
++++ b/src/api.c
+@@ -2775,13 +2775,17 @@ static struct cgroup_rule
*cgroup_find_matching_rule_uid_gid(uid_t uid,
+ /* Get the group data. */
+ sp = &(rule->username[1]);
+ grp = getgrnam(sp);
+- if (!grp)
++ if (!grp) {
++ rule = rule->next;
+ continue;
++ }
+
+ /* Get the data for UID. */
+ usr = getpwuid(uid);
+- if (!usr)
++ if (!usr) {
++ rule = rule->next;
+ continue;
++ }
+
+ /* If UID is a member of group, we matched. */
+ for (i = 0; grp->gr_mem[i]; i++) {
+--
+2.10.2
+
diff --git a/libs/libcgroup/patches/musl-decls.patch
b/libs/libcgroup/patches/musl-decls.patch
new file mode 100644
index 0000000..eacf4e6
--- /dev/null
+++ b/libs/libcgroup/patches/musl-decls.patch
@@ -0,0 +1,22 @@
+In musl libc these macros are defined in the deprecated
+include file sys/cdefs.h
+
+--- a/include/libcgroup.h 2014-01-13 15:05:56.000000000 +0100
++++ b/include/libcgroup.h 2015-10-25 14:03:32.921207668 +0100
+@@ -16,6 +16,16 @@
+ #ifndef _LIBCGROUP_H
+ #define _LIBCGROUP_H
+
++#if !defined(__GLIBC__)
++#ifdef __cplusplus
++# define __BEGIN_DECLS extern "C" {
++# define __END_DECLS }
++#else
++# define __BEGIN_DECLS
++# define __END_DECLS
++#endif
++#endif /* !defined(__GLIBC__) */
++
+ #define _LIBCGROUP_H_INSIDE
+
+ #include <libcgroup/error.h>
diff --git a/libs/libcgroup/patches/musl-strerror_r.patch
b/libs/libcgroup/patches/musl-strerror_r.patch
new file mode 100644
index 0000000..0f54e12
--- /dev/null
+++ b/libs/libcgroup/patches/musl-strerror_r.patch
@@ -0,0 +1,22 @@
+The musl libc strerror_r(3) semantics are different from
+GNU libc's if _GNU_SOURCE is defined.
+
+--- a/src/api.c 2014-01-13 15:05:56.000000000 +0100
++++ b/src/api.c 2015-10-25 14:09:18.690232596 +0100
+@@ -3332,8 +3332,16 @@
+
+ const char *cgroup_strerror(int code)
+ {
++#if defined(__GLIBC__)
+ if (code == ECGOTHER)
+ return strerror_r(cgroup_get_last_errno(), errtext, MAXLEN);
++#else
++ if (code == ECGOTHER) {
++ if (0 == strerror_r(cgroup_get_last_errno(), errtext, MAXLEN))
++ return errtext;
++ return "strerror_r() failed";
++ }
++#endif
+
+ return cgroup_strerror_codes[code % ECGROUPNOTCOMPILED];
+ }
diff --git a/x11/tint2/DEPENDS b/x11/tint2/DEPENDS
index 8ff5c5a..6c1027d 100755
--- a/x11/tint2/DEPENDS
+++ b/x11/tint2/DEPENDS
@@ -17,7 +17,6 @@ depends libxrender &&
depends imlib2 &&
depends pixman &&
depends zlib &&
-depends pygtk2 &&
depends libxrandr &&

optional_depends 'gtk+2' \
diff --git a/x11/tint2/DETAILS b/x11/tint2/DETAILS
index 24c782d..a794772 100755
--- a/x11/tint2/DETAILS
+++ b/x11/tint2/DETAILS
@@ -1,11 +1,10 @@
SPELL=tint2
- VERSION=0.11
+ VERSION=16.7
SOURCE=$SPELL-$VERSION.tar.bz2
-#
SOURCE_HASH=sha512:e9e26c92391fc7037b522c966368baf5700492f0b4a2adad84aa036a6bcc3c43916cbadb2ad6e9ef844253ce9bbb040fc4c8eb350e467166fa768705a0c1b51e
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+
SOURCE_HASH=sha512:8edf357f4f0eebcfe18af956b9063fef5e42011c6bcfb68ae7c598c10f47153053b77b6839f4a8c32f66e8c7aad6271051f027181c386bc1f16ca70409785162
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/tint2/
- SOURCE_URL[0]=http://tint2.googlecode.com/files/$SOURCE
+ SOURCE_URL[0]=https://gitlab.com/o9000/tint2/-/archive/$VERSION/$SOURCE
LICENSE[0]=GPL
ENTERED=20090830
KEYWORDS="tint2 taskbar panel"
diff --git a/x11/tint2/HISTORY b/x11/tint2/HISTORY
index 82d55ec..ef80a17b 100644
--- a/x11/tint2/HISTORY
+++ b/x11/tint2/HISTORY
@@ -1,3 +1,6 @@
+2020-08-10 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 16.7
+
2010-07-08 Donald Johnson <minozake AT codemages.net>
* CONFIGURE, DEPENDS: Replaced colons with percents. (bug #15756)
* BUILD: Added prepare_cmake_flags() call in preperation for
integration.
diff --git a/x11/tint2/tint2-0.11.tar.bz2.sig
b/x11/tint2/tint2-0.11.tar.bz2.sig
deleted file mode 100644
index eef367f..0000000
Binary files a/x11/tint2/tint2-0.11.tar.bz2.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c266d2abdacc54ce765798c6dfa939bfbf2f82a3), Ismael Luceno, 08/10/2020

Archive powered by MHonArc 2.6.24.

Top of Page