Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (574f29bc998137121d54cca0e210fb73ba2f0071)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (574f29bc998137121d54cca0e210fb73ba2f0071)

Chronological Thread  
    < Chronological >       < Thread >
  • 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 (574f29bc998137121d54cca0e210fb73ba2f0071)
  • Date: Thu, 13 May 2021 20:47:20 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

graphics/imagemagick/DETAILS |
4
graphics/imagemagick/HISTORY |
3
kernels/linux/HISTORY |
5
kernels/linux/info/patches/maintenance_patches_5/patch-5.12.2 |
5
kernels/linux/info/patches/maintenance_patches_5/patch-5.12.3 |
5
kernels/linux/latest.defaults |
2
kernels/virtualbox-module/DETAILS |
2
kernels/virtualbox-module/HISTORY |
3
libs/libxml2/DETAILS |
4
libs/libxml2/HISTORY |
3
net/tor/DETAILS |
8 -
net/tor/HISTORY |
6
net/tor/PREPARE |
2
net/tor/PRE_BUILD |
7 -
net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch |
65 ----------
utils/virtualbox/DETAILS |
4
utils/virtualbox/HISTORY |
3
17 files changed, 40 insertions(+), 91 deletions(-)

New commits:
commit 574f29bc998137121d54cca0e210fb73ba2f0071
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libxml2: version 2.9.11, security update

commit 85be426ba81ada5f742bde3ddcfc0357610308dc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/imagemagick: version 7.0.11-12

commit 77e69d5c5f9a800ed855d2de7a5fd11523753a5d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/tor: version 0.4.5.8

commit 181747ad8536edf05b1065b38bb08eb9f323c720
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/linux: version 5.12.3

commit 365a6c04de9ce5ff46aa3ced02c65fd9dc01a91e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

kernels/virtualbox-module: version 6.1.20

commit 4a17704ecf57a7c4b830be003934f9efc6f2c9ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/virtualbox: version 6.1.20

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 15c752a..b84fd6a 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,7 +1,7 @@
SPELL=imagemagick
SPELLX=ImageMagick
- VERSION=7.0.11-11
-
SOURCE_HASH=sha512:2d443b81af3dffffe071fef07862cc6a83460786f2d5203f790c2db4beb7918c48e2575f79d9ea3a1b8b6cb6f948f107244b5a84dbae64c39324b318241e0a4d
+ VERSION=7.0.11-12
+
SOURCE_HASH=sha512:3d7713b354aa45edad57fbc477647e45d4802000800384964bcfcb0f18783d113dbd64a4477985d96e9c99fedae1ca9086886b0e415907726f687ef88756423e
SECURITY_PATCH=6
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 5ddbf98..d1a0695 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2021-05-13 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 7.0.11-12
+
2021-05-08 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 7.0.11-11

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index c635303..664499c 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,8 @@
+2021-05-13 Florian Franzmann <bwlf AT bandrate.org>
+ * latest.defaults: latest_maintenance_patches_5=patch-5.12.2
+ * info/patches/maintenance_patches_5/patch-5.12.3: added
+ * info/patches/maintenance_patches_5/patch-5.12.3: removed
+
2021-05-08 Florian Franzmann <bwlf AT bandrate.org>
* latest.defaults: latest_maintenance_patches_5=patch-5.12.1
* info/patches/maintenance_patches_5/patch-5.12.2: added
diff --git a/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.2
b/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.2
deleted file mode 100755
index 3a5fecf..0000000
--- a/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.2
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="5.12"
-patchversion="${appliedkernels}.2"
-source="patch-${patchversion}.xz"
-source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
-sha512sum="bf654385f6dbf05e8e53d9dfd488dd7d5cafe820c77af3c330940fc9b68ba576edabd75262ca9b8fefdbedc77683602b002432ea9cab0b6b01646f04c941e98a"
diff --git a/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.3
b/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.3
new file mode 100755
index 0000000..cfaec2e
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_5/patch-5.12.3
@@ -0,0 +1,5 @@
+appliedkernels="5.12"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
+sha512sum="37896e0f6c1f18930cb95ec0d39d514465fe46e872033613f3592f5f3d06da0aa02d796e7d43d403c16aa310d60df4a2e78b7141d9a3ed8df0448955eb1d310f"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 6422e77..0185e7a 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,2 +1,2 @@
LATEST_5=5.12
-LATEST_maintenance_patches_5=patch-5.12.2
+LATEST_maintenance_patches_5=patch-5.12.3
diff --git a/kernels/virtualbox-module/DETAILS
b/kernels/virtualbox-module/DETAILS
index dbd519c..9353db0 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
SPELL=virtualbox-module
- VERSION=6.1.4
+ VERSION=6.1.20
SOURCE=virtualbox-module-$VERSION.tar.gz
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
index 9420281..fe1a8cf 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2021-05-09 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 6.1.20
+
2020-02-22 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 6.1.4

diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index c8a0e2a..1ef543e 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,6 +1,6 @@
SPELL=libxml2
- VERSION=2.9.10
- SECURITY_PATCH=12
+ VERSION=2.9.11
+ SECURITY_PATCH=13
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 783f305..0b115cf 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2021-05-13 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 2.9.11, SECURITY_PATCH++, fixes CVE-2021-3541
+
2020-11-04 Treeve Jelbert <treeve AT sourcemage.org>
* PRE_BUILD patches/gcc,patch: added, fix for gcc-10.2

diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 78e4742..5e678fb 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -1,12 +1,6 @@
SPELL=tor
-case "$TOR_BRANCH"
-in devel)
- VERSION=0.4.5.5-rc
- SECURITY_PATCH=6
-;; stable)
- VERSION=0.4.4.7
+ VERSION=0.4.5.8
SECURITY_PATCH=16
-;; esac
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=https://www.torproject.org/dist/${SOURCE}
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index ebc5de8..2585215 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,9 @@
+2021-05-13 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 0.4.5.8
+ * DETAILS, PREPARE, PRE_BUILD: remove option for devel version 0.4.5.8
+ has been declared stable
+ * 0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch: removed
+
2021-02-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated TOR_BRANCH=stable to 0.4.4.7
fixed typo
diff --git a/net/tor/PREPARE b/net/tor/PREPARE
deleted file mode 100755
index b340e96..0000000
--- a/net/tor/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$GRIMOIRE"/FUNCTIONS &&
-prepare_select_branch stable devel
diff --git a/net/tor/PRE_BUILD b/net/tor/PRE_BUILD
index f974e5e..3357329 100755
--- a/net/tor/PRE_BUILD
+++ b/net/tor/PRE_BUILD
@@ -1,5 +1,4 @@
-default_pre_build &&
+default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-case "$TOR_BRANCH" in
- (stable) apply_patch_dir patches ;;
-esac
+
+apply_patch_dir patches
diff --git
a/net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch
b/net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch
deleted file mode 100644
index 4c8a263..0000000
---
a/net/tor/patches/0001-Rename-OpenSSL-version-num---as-defined-in-Tor.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From b22568a54506e4b79b72530f89f21032e6435414 Mon Sep 17 00:00:00 2001
-From: Nick Mathewson <nickm AT torproject.org>
-Date: Fri, 6 Nov 2020 10:29:28 -0500
-Subject: [PATCH] Rename OpenSSL_version_num() as defined in Tor
-
-This way, if we guess wrong about whether the library has it,
-we don't conflict with the library's headers.
-
-Fixes #40181; bug not in any released version.
----
- src/lib/crypt_ops/compat_openssl.h | 3 ++-
- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +-
- src/lib/tls/tortls_openssl.c | 2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/crypt_ops/compat_openssl.h
b/src/lib/crypt_ops/compat_openssl.h
-index c2e1459078..aa66e0c3fa 100644
---- a/src/lib/crypt_ops/compat_openssl.h
-+++ b/src/lib/crypt_ops/compat_openssl.h
-@@ -34,7 +34,7 @@
-
- #ifndef OPENSSL_1_1_API
- #define OpenSSL_version(v) SSLeay_version(v)
--#define OpenSSL_version_num() SSLeay()
-+#define tor_OpenSSL_version_num() SSLeay()
- #define RAND_OpenSSL() RAND_SSLeay()
- #define STATE_IS_SW_SERVER_HELLO(st) \
- (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \
-@@ -42,6 +42,7 @@
- #define OSSL_HANDSHAKE_STATE int
- #define CONST_IF_OPENSSL_1_1_API
- #else /* defined(OPENSSL_1_1_API) */
-+#define tor_OpenSSL_version_num() OpenSSL_version_num()
- #define STATE_IS_SW_SERVER_HELLO(st) \
- ((st) == TLS_ST_SW_SRVR_HELLO)
- #define CONST_IF_OPENSSL_1_1_API const
-diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c
b/src/lib/crypt_ops/crypto_openssl_mgt.c
-index 065cbca1cc..e763491a11 100644
---- a/src/lib/crypt_ops/crypto_openssl_mgt.c
-+++ b/src/lib/crypt_ops/crypto_openssl_mgt.c
-@@ -222,7 +222,7 @@ crypto_openssl_early_init(void)
-
- setup_openssl_threading();
-
-- unsigned long version_num = OpenSSL_version_num();
-+ unsigned long version_num = tor_OpenSSL_version_num();
- const char *version_str = crypto_openssl_get_version_str();
- if (version_num == OPENSSL_VERSION_NUMBER &&
- !strcmp(version_str, OPENSSL_VERSION_TEXT)) {
-diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c
-index 2269714141..ad9b49ab4f 100644
---- a/src/lib/tls/tortls_openssl.c
-+++ b/src/lib/tls/tortls_openssl.c
-@@ -342,7 +342,7 @@ tor_tls_init(void)
-
- #if (SIZEOF_VOID_P >= 8 && \
- OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1))
-- long version = OpenSSL_version_num();
-+ long version = tor_OpenSSL_version_num();
-
- /* LCOV_EXCL_START : we can't test these lines on the same machine */
- if (version >= OPENSSL_V_SERIES(1,0,1)) {
---
-GitLab
-
diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 80c032b..b33e4cc 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,9 +1,9 @@
SPELL=virtualbox
- VERSION=6.1.4
+ VERSION=6.1.20
SOURCE=VirtualBox-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION%-*}

SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/${VERSION%-*}/$SOURCE
-
SOURCE_HASH=sha512:021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167
+
SOURCE_HASH=sha512:b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
TMPFS=off
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 2544f81..3616006 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,6 @@
+2021-05-09 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 6.1.20
+
2020-03-16 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS virtualbox: tweak



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (574f29bc998137121d54cca0e210fb73ba2f0071), Florian Franzmann, 05/13/2021

Archive powered by MHonArc 2.6.24.

Top of Page