sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (d91ffeac7d9675152ce88a46358c73aeb8902468)
- From: Florian Franzmann <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d91ffeac7d9675152ce88a46358c73aeb8902468)
- Date: Sun, 9 Feb 2020 00:12:03 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:
devel/rust/BUILD | 4 +
devel/rust/HISTORY | 3 +
devel/rust/INSTALL | 2
kernels/lirc/DEPENDS | 3 +
kernels/lirc/DETAILS | 6 +-
kernels/lirc/HISTORY | 7 ++
kernels/lirc/PRE_BUILD | 7 ++
kernels/lirc/patches/lirc-0.10-build-fix.patch | 30 ++++++++++++
kernels/lirc/patches/lirc-0.10.1-unsafe-load.patch | 52
+++++++++++++++++++++
libs/crossguid/CONFIGURE | 1
libs/crossguid/DEPENDS | 6 +-
libs/crossguid/DETAILS | 13 ++---
libs/crossguid/HISTORY | 5 ++
libs/crossguid/INSTALL | 4 -
libs/crossguid/PREPARE | 2
python-pypi/mu-repo/DEPENDS | 1
python-pypi/mu-repo/HISTORY | 3 +
video/kodi/DEPENDS | 1
video/kodi/HISTORY | 4 +
video/kodi/patches/0001-Add-missing-include.patch | 38 +++++++++++++++
20 files changed, 173 insertions(+), 19 deletions(-)
New commits:
commit d91ffeac7d9675152ce88a46358c73aeb8902468
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
kernels/lirc: version 0.10.1
commit 38b9a951403d86112a1fe3f9e1d25a194168cbb7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
video/kodi: fix build
commit 7753ea0f9b55573b2abe7386b8b1677a15c9ed8d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
libs/crossguid: version 0.2.2
commit 5bdc886f815c38ee4a61958542b2df55de769293
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
python-pypi/mu-repo: add dependency on SETUPTOOLS
commit e771e43562eb882727d79077f25dc3e248d58a6c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
devel/rust: do not use /root/.cargo
diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index 3aa9e78..a44f4da 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -27,4 +27,6 @@ sed -i '/^#crt-static *= *false/s/#//' config.toml &&
sed -i "/BOOTSTRAP.*doc/d" Makefile &&
-make
+export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&
+
+default_build_make
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index c5fbfb2..d87d764 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,6 @@
+2020-02-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, INSTALL: do not use /root/.cargo
+
2020-01-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.41.0
diff --git a/devel/rust/INSTALL b/devel/rust/INSTALL
new file mode 100755
index 0000000..623ced8
--- /dev/null
+++ b/devel/rust/INSTALL
@@ -0,0 +1,2 @@
+export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&
+default_install
diff --git a/kernels/lirc/DEPENDS b/kernels/lirc/DEPENDS
index 406dcbd..0ed623a 100755
--- a/kernels/lirc/DEPENDS
+++ b/kernels/lirc/DEPENDS
@@ -5,6 +5,9 @@ depends pygobject3 &&
# you built pyyaml for python3.
depends pyyaml &&
depends which &&
+depends autoconf &&
+depends automake &&
+
optional_depends X11-LIBS --with-x --without-x "GUI tools" &&
optional_depends SYSTEM-LOGGER '--with-syslog' '--without-syslog' \
'for syslog support'
diff --git a/kernels/lirc/DETAILS b/kernels/lirc/DETAILS
index f179f53..dc2a620 100755
--- a/kernels/lirc/DETAILS
+++ b/kernels/lirc/DETAILS
@@ -1,10 +1,10 @@
SPELL=lirc
- VERSION=0.9.4d
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:fb3892e12fbe5277e04c451694f1ea4ed45cc424d66ea57b11c4ac4760afa7df4b37897f380b4ade464a82523a0cee336f216d2009ea9431333fd7ca74a8336c
+ VERSION=0.10.1
+
SOURCE_HASH=sha512:31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
+ STAGED_INSTALL=off
WEB_SITE=http://www.lirc.org
ENTERED=20020630
KEYWORDS="kernels"
diff --git a/kernels/lirc/HISTORY b/kernels/lirc/HISTORY
index 4aadf2b..4ade28e 100644
--- a/kernels/lirc/HISTORY
+++ b/kernels/lirc/HISTORY
@@ -1,3 +1,10 @@
+2020-02-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.10.1
+ * patches/lirc-0.10.1-unsafe-load.patch: fix possible security issue
(from gentoo)
+ * patches/lirc-0.10-build-fix.patch: fix build (from archlinux)
+ * PRE_BUILD: apply patches, run autoconf/automake
+ * DEPENDS: depend on autoconf/automake
+
2017-02-06 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: switch to the tar.bz2 now that upstream fixed it
(contents identical apart from a line in VERSION file)
diff --git a/kernels/lirc/PRE_BUILD b/kernels/lirc/PRE_BUILD
index 214ee08..654d65b 100755
--- a/kernels/lirc/PRE_BUILD
+++ b/kernels/lirc/PRE_BUILD
@@ -1,5 +1,11 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+
+apply_patch_dir patches &&
+
+autoreconf -fi &&
+automake &&
+
if [[ $IRDROID == y ]]; then
patch -Np1 <<EOT
--- lirc-0.9.4d/plugins/irtoy.c.orig 2017-01-23 10:23:38.000000000 +0100
@@ -24,3 +30,4 @@ if [[ $IRDROID == y ]]; then
static ssize_t
EOT
fi
+
diff --git a/kernels/lirc/patches/lirc-0.10-build-fix.patch
b/kernels/lirc/patches/lirc-0.10-build-fix.patch
new file mode 100644
index 0000000..41353db
--- /dev/null
+++ b/kernels/lirc/patches/lirc-0.10-build-fix.patch
@@ -0,0 +1,30 @@
+diff --git a/configure.ac b/configure.ac
+index 58347d8..8c7fca2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,15 +77,10 @@ AC_TYPE_UINT64_T
+
+ dnl AC_TYPE_GETGROUPS seems broken on recent MacOS, so:
+ AC_MSG_CHECKING([Figure out if getgrouplist() needs gid_t or int])
+-oldcflags="$CFLAGS"
+-export CFLAGS=-Werror
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <unistd.h>
+-#include <grp.h>
+- ]], [[
+-gid_t groups[32]; int ngroups; const char* user = "root";
+-getgrouplist(user, 1, groups, &ngroups);
+- ]])],[
++int getgroups(int gidsetsize, gid_t grouplist[]);
++ ]], [[ ]])],[
+ AC_MSG_RESULT(gid_t)
+ AC_DEFINE(GETGROUPS_T,[gid_t])
+ ],[
+@@ -93,7 +88,6 @@ getgrouplist(user, 1, groups, &ngroups);
+ AC_DEFINE(GETGROUPS_T,[int])
+ ]
+ )
+-export CFLAGS="$oldcflags"
+
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \
diff --git a/kernels/lirc/patches/lirc-0.10.1-unsafe-load.patch
b/kernels/lirc/patches/lirc-0.10.1-unsafe-load.patch
new file mode 100644
index 0000000..7758ebb
--- /dev/null
+++ b/kernels/lirc/patches/lirc-0.10.1-unsafe-load.patch
@@ -0,0 +1,52 @@
+https://sourceforge.net/p/lirc/git/merge-requests/39/
+
+commit 8fab503abb3fdababb1875fdc2373afe8534770e
+Author: Craig Andrews <candrews AT integralblue.com>
+Date: Sat May 11 11:39:44 2019 -0400
+
+ Use pyyaml safe_load instead of load
+
+ Using load on untrusted user input could lead to arbitrary code
execution.
+ Therefore, upstream has disabled load, requiring the use of either
+ safe_load or full_load
+ See https://github.com/yaml/pyyaml/issues/265
+
+diff --git a/python-pkg/lirc/database.py b/python-pkg/lirc/database.py
+index d464c2ab..bd567181 100644
+--- a/python-pkg/lirc/database.py
++++ b/python-pkg/lirc/database.py
+@@ -66,7 +66,7 @@ def _load_kerneldrivers(configdir):
+ '''
+
+ with open(os.path.join(configdir, "kernel-drivers.yaml")) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.safe_load(f.read())
+ drivers = cf['drivers'].copy()
+ for driver in cf['drivers']:
+ if driver == 'default':
+@@ -132,14 +132,14 @@ class Database(object):
+ yamlpath = configdir
+ db = {}
+ with open(os.path.join(yamlpath, "confs_by_driver.yaml")) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.safe_load(f.read())
+ db['lircd_by_driver'] = cf['lircd_by_driver'].copy()
+ db['lircmd_by_driver'] = cf['lircmd_by_driver'].copy()
+
+ db['kernel-drivers'] = _load_kerneldrivers(configdir)
+ db['drivers'] = db['kernel-drivers'].copy()
+ with open(os.path.join(yamlpath, "drivers.yaml")) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.safe_load(f.read())
+ db['drivers'].update(cf['drivers'].copy())
+ for key, d in db['drivers'].items():
+ d['id'] = key
+@@ -158,7 +158,7 @@ class Database(object):
+ configs = {}
+ for path in glob.glob(configdir + '/*.conf'):
+ with open(path) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.safe_load(f.read())
+ configs[cf['config']['id']] = cf['config']
+ db['configs'] = configs
+ self.db = db
diff --git a/libs/crossguid/CONFIGURE b/libs/crossguid/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/libs/crossguid/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/libs/crossguid/DEPENDS b/libs/crossguid/DEPENDS
index 13ea679..8bc4e23 100755
--- a/libs/crossguid/DEPENDS
+++ b/libs/crossguid/DEPENDS
@@ -1,3 +1,3 @@
-depends cmake &&
-depends -sub CXX gcc &&
-depends git
+source $GRIMOIRE/CMAKE_DEPENDS &&
+
+depends -sub CXX gcc
diff --git a/libs/crossguid/DETAILS b/libs/crossguid/DETAILS
index d0bea64..9fe8e15 100755
--- a/libs/crossguid/DETAILS
+++ b/libs/crossguid/DETAILS
@@ -1,11 +1,10 @@
-. "$GRIMOIRE/FUNCTIONS"
+source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=crossguid
- VERSION=$(get_scm_version)
- SOURCE=$SPELL-git.tar.bz2
- SOURCE_IGNORE=volatile
-
SOURCE_URL[0]=git://github.com/graeme-hill/crossguid.git:${SPELL}-git:b151b7d1aeb68c4b9e98a8a2e0a547885aa0b60c
- FORCE_DOWNLOAD=1
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+ VERSION=0.2.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=https://github.com/graeme-hill/crossguid/archive/v$VERSION.tar.gz
+
SOURCE_HASH=sha512:49a707f830b32ba136bd52e72dda191a7d29acee9795df54f225bb269853cc123390c01875dd1da7cbaebd5bb7001988d6f9758dcffa9171b5f2961f576682ca
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://github.com/graeme-hill/crossguid";
LICENSE[0]=MIT
ENTERED=20160207
diff --git a/libs/crossguid/HISTORY b/libs/crossguid/HISTORY
index 52e288a..e40ac32 100644
--- a/libs/crossguid/HISTORY
+++ b/libs/crossguid/HISTORY
@@ -1,3 +1,8 @@
+2020-02-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, INSTALL: version 0.2.2
+ * DEPENDS, DETAILS, CONFIGURE: use CMAKE_*
+ * PREPARE: removed
+
2019-02-11 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: temporary pin to working commit in the repo
diff --git a/libs/crossguid/INSTALL b/libs/crossguid/INSTALL
index 27a87b1..b928bd5 100755
--- a/libs/crossguid/INSTALL
+++ b/libs/crossguid/INSTALL
@@ -1,3 +1,3 @@
-install -m644 ${SOURCE_DIRECTORY}/build/libcrossguid.a
${INSTALL_ROOT}/usr/lib &&
-install -m644 ${SOURCE_DIRECTORY}/include/crossguid/guid.hpp
${INSTALL_ROOT}/usr/include &&
+install -m644 ${SOURCE_DIRECTORY}/build/libxg.a
${INSTALL_ROOT}/usr/lib/libcrossguid.a &&
+install -m644 ${SOURCE_DIRECTORY}/Guid.hpp
${INSTALL_ROOT}/usr/include/guid.hpp &&
ln -sf ${INSTALL_ROOT}/usr/include/guid.hpp
${INSTALL_ROOT}/usr/include/guid.h
diff --git a/libs/crossguid/PREPARE b/libs/crossguid/PREPARE
deleted file mode 100755
index a68f274..0000000
--- a/libs/crossguid/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch scm
diff --git a/python-pypi/mu-repo/DEPENDS b/python-pypi/mu-repo/DEPENDS
index 053d106..1e7ce68 100755
--- a/python-pypi/mu-repo/DEPENDS
+++ b/python-pypi/mu-repo/DEPENDS
@@ -1 +1,2 @@
+depends SETUPTOOLS &&
depends python3
diff --git a/python-pypi/mu-repo/HISTORY b/python-pypi/mu-repo/HISTORY
index 72d4018..854654f 100644
--- a/python-pypi/mu-repo/HISTORY
+++ b/python-pypi/mu-repo/HISTORY
@@ -1,3 +1,6 @@
+2020-02-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on SETUPTOOLS
+
2018-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/video/kodi/DEPENDS b/video/kodi/DEPENDS
index 92ae1f0..f88a652 100755
--- a/video/kodi/DEPENDS
+++ b/video/kodi/DEPENDS
@@ -34,7 +34,6 @@ depends SSL &&
depends dbus &&
depends fribidi &&
depends JAVA &&
-depends rtmpdump &&
depends faad2 &&
depends libmpeg2 &&
depends libass &&
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 9e2359c..47f702e 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,7 @@
+2020-02-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: remove dependency on rtmpdump
+ * patches/0001-Add-missing-include.patch: fix build
+
2019-11-16 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 18.5 Leia
diff --git a/video/kodi/patches/0001-Add-missing-include.patch
b/video/kodi/patches/0001-Add-missing-include.patch
new file mode 100644
index 0000000..ba3a564
--- /dev/null
+++ b/video/kodi/patches/0001-Add-missing-include.patch
@@ -0,0 +1,38 @@
+From 39add2ec85000c327308a89784ebdaa8d1f1e15f Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 8 Feb 2020 23:44:12 +0100
+Subject: [PATCH] Add missing include
+
+---
+ xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 1 +
+ xbmc/windowing/GraphicContext.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+index 222d1fa..a7ce8ad 100644
+--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
++++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+@@ -8,6 +8,7 @@
+
+ #include "GUIDialogProfileSettings.h"
+
++#include <cassert>
+ #include <utility>
+
+ #include "dialogs/GUIDialogFileBrowser.h"
+diff --git a/xbmc/windowing/GraphicContext.cpp
b/xbmc/windowing/GraphicContext.cpp
+index 1ced496..2491d08 100644
+--- a/xbmc/windowing/GraphicContext.cpp
++++ b/xbmc/windowing/GraphicContext.cpp
+@@ -6,6 +6,8 @@
+ * See LICENSES/README.md for more information.
+ */
+
++#include <cassert>
++
+ #include "GraphicContext.h"
+ #include "WinSystem.h"
+ #include "Application.h"
+--
+2.25.0
+
- [SM-Commit] GIT changes to master grimoire by Florian Franzmann (d91ffeac7d9675152ce88a46358c73aeb8902468), Florian Franzmann, 02/08/2020
Archive powered by MHonArc 2.6.24.