Skip to Content.
Sympa Menu

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

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 (d53f1d20fabaa70892bf502060c1bb55daa92e2a)
  • Date: Thu, 23 Jun 2022 16:05:57 +0000

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

archive-libs/zlib/0002-fix-crc32.patch | 53
+++++++++++++++++++++++++++++++++
archive-libs/zlib/DETAILS | 1
archive-libs/zlib/HISTORY | 6 +++
archive-libs/zlib/PRE_BUILD | 2 +
disk/btrfs-progs/DEPENDS | 10 ++++--
disk/btrfs-progs/HISTORY | 8 ++++
net/samba4/DETAILS | 7 +---
net/samba4/HISTORY | 6 +++
python-pypi/babel/DEPENDS | 5 ++-
python-pypi/babel/DETAILS | 3 +
python-pypi/babel/HISTORY | 5 +++
python-pypi/babel/PRE_BUILD | 5 +++
12 files changed, 104 insertions(+), 7 deletions(-)

New commits:
commit 89fd6c5ec73be3a8a220285dd6949aa8781884da
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

zlib: Fix CRC32 https://github.com/madler/zlib/issues/613

PATCHLEVEL++
Apply 0002-fix-crc32.patch
2.12 breaks CRC32 for programs like java
See https://github.com/madler/zlib/issues/613

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

samba4: Updated to 4.15.7, SECURITY_PATCH++

CVE-2021-44141
CVE-2021-44142
CVE-2022-0336

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

btrfs-progs: Depends on babel, python-sphinx,
python-sphinxcontrib-applehelp,

python-sphinxcontrib-devhelp, and python-sphinxcontrib-qthelp for
documentation

Also depends on python-sphinxcontrib-htmlhelp and
python-sphinxcontrib-serializinghtml
See https://github.com/sphinx-doc/sphinx/issues/9434

Still fails with "AttributeError: 'document' object has no attribute
'findall'"
Not building documentation works for now

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

babel: Add cldr-common-41.0.zip as SOURCE2

Copy SOURCE2 so it doesn't try to download it during build
Depends on backports_abc and pytz

diff --git a/archive-libs/zlib/0002-fix-crc32.patch
b/archive-libs/zlib/0002-fix-crc32.patch
new file mode 100644
index 0000000..9546308
--- /dev/null
+++ b/archive-libs/zlib/0002-fix-crc32.patch
@@ -0,0 +1,53 @@
+# From
https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch
+From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler AT alumni.caltech.edu>
+Date: Wed, 30 Mar 2022 11:14:53 -0700
+Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
+
+The previous releases of zlib were not sensitive to incorrect CRC
+inputs with bits set above the low 32. This commit restores that
+behavior, so that applications with such bugs will continue to
+operate as before.
+---
+ crc32.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crc32.c b/crc32.c
+index a1bdce5c2..451887bc7 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+
+ /* Pre-condition the CRC */
+- crc ^= 0xffffffff;
++ crc = (~crc) & 0xffffffff;
+
+ /* Compute the CRC up to a word boundary. */
+ while (len && ((z_size_t)buf & 7) != 0) {
+@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+
+ /* Pre-condition the CRC */
+- crc ^= 0xffffffff;
++ crc = (~crc) & 0xffffffff;
+
+ #ifdef W
+
+@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ #ifdef DYNAMIC_CRC_TABLE
+ once(&made, make_crc_table);
+ #endif /* DYNAMIC_CRC_TABLE */
+- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
++ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+ }
+
+ /*
========================================================================= */
+@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
+ uLong crc2;
+ uLong op;
+ {
+- return multmodp(op, crc1) ^ crc2;
++ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+ }
+
diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS
index ef9c242..a868393 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -6,6 +6,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.zlib.net/$SOURCE
SOURCE_URL[1]=http://prdownloads.sourceforge.net/libpng/${SOURCE}
+ PATCHLEVEL=1
WEB_SITE=http://www.zlib.net/
ENTERED=20010922
LICENSE[0]=ZLIB
diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY
index d8f3c5e..d64f8e0 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,9 @@
+2022-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Apply 0002-fix-crc32.patch
+ * 0002-fix-crc32.patch: 2.12 breaks CRC32 for programs like java
+ See https://github.com/madler/zlib/issues/613
+
2022-03-28 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.2.12, SECURITY_PAATCH++, (CVE-2018-25032)
* BUILD: modified filtering of CFLAGS to catch all possible variants
of -O
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 3756c5f..534bad3 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -2,6 +2,8 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -p1 < "$SPELL_DIRECTORY/0001-fix-zlib.pc-install-path.patch" &&
+message "${MESSAGE_COLOR}Fix CRC32 'bug'...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/0002-fix-crc32.patch &&

mk_source_dir "$SOURCE_DIRECTORY.static" &&
cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static
diff --git a/disk/btrfs-progs/DEPENDS b/disk/btrfs-progs/DEPENDS
index e4f0af5..4aff7ad 100755
--- a/disk/btrfs-progs/DEPENDS
+++ b/disk/btrfs-progs/DEPENDS
@@ -1,7 +1,6 @@
depends zlib &&
depends util-linux &&
depends lzo &&
-
depends setuptools &&

optional_depends acl \
@@ -19,7 +18,14 @@ optional_depends xmlto \
"to build documentation" &&

if is_depends_enabled $SPELL xmlto; then
- depends asciidoc
+ depends asciidoc &&
+ depends babel &&
+ depends python-sphinx &&
+ depends python-sphinxcontrib-applehelp &&
+ depends python-sphinxcontrib-devhelp &&
+ depends python-sphinxcontrib-htmlhelp && # See
https://github.com/sphinx-doc/sphinx/issues/9434
+ depends python-sphinxcontrib-qthelp &&
+ depends python-sphinxcontrib-serializinghtml # See
https://github.com/sphinx-doc/sphinx/issues/9434
fi &&

if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 99fa1fe..f859231 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,11 @@
+2022-05-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on babel, python-sphinx,
python-sphinxcontrib-applehelp,
+ python-sphinxcontrib-devhelp, and python-sphinxcontrib-qthelp for
documentation
+ Also depends on python-sphinxcontrib-htmlhelp and
python-sphinxcontrib-serializinghtml
+ See https://github.com/sphinx-doc/sphinx/issues/9434
+ Still fails with "AttributeError: 'document' object has no
attribute 'findall'"
+ Not building documentation works for now
+
2022-06-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 5.18.1

diff --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index 7de3020..fdd6c80 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -7,16 +7,15 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.samba.org/samba.git:$SPELL
SOURCE_IGNORE=volatile
else
- VERSION=4.15.4
-
SOURCE_HASH=sha512:e55473dd4971816a01880870309ca44f022625cd529511bcf386c865a2e7e79118577ee4866559f607952de47dc0d310d6426bd08dd4293db95ddbbe3982383d
- SECURITY_PATCH=5
+ VERSION=4.15.7
+
SOURCE_HASH=sha512:beffb09b5bcd62991398d39c7a8aec5fed0c51d550e2f0fb42b2e0a09094f4c6a8f29adf708c4969db12329f5c7343d2debd04315107b79bef59e99a4a7e4ce4
+ SECURITY_PATCH=6
SOURCE=${SPELL/4}-$VERSION.tar.gz
# SOURCE2=${SPELL/4}-${VERSION}.tar.asc
# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/4}-$VERSION
SOURCE_URL[0]=https://download.samba.org/pub/samba/stable/$SOURCE
fi
- PATCHLEVEL=1
LICENSE[0]=GPL
WEB_SITE=https://www.samba.org/
KEYWORDS="net"
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index 2880baa..e00f06a 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,9 @@
+2022-05-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 4.15.7, SECURITY_PATCH++
+ CVE-2021-44141
+ CVE-2021-44142
+ CVE-2022-0336
+
2022-01-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 4.15.4

diff --git a/python-pypi/babel/DEPENDS b/python-pypi/babel/DEPENDS
index 48d8ddc..7d684ec 100755
--- a/python-pypi/babel/DEPENDS
+++ b/python-pypi/babel/DEPENDS
@@ -1 +1,4 @@
-. $SECTION_DIRECTORY/PY_DEPENDS
+. $SECTION_DIRECTORY/PY_DEPENDS &&
+
+depends backports_abc &&
+depends pytz
diff --git a/python-pypi/babel/DETAILS b/python-pypi/babel/DETAILS
index abdbdd2..a91ecd0 100755
--- a/python-pypi/babel/DETAILS
+++ b/python-pypi/babel/DETAILS
@@ -2,8 +2,11 @@
SPELLX=Babel
VERSION=2.10.1

SOURCE_HASH=sha512:3dd9bad6c90a5d53f52467af1424019eed4fb05d33308a631d87a1f6e5af1fdec04539fa65126758d92eedb6a5ea4b5447a9990634203f22d27abab55bc0e7bc
+
SOURCE2_HASH=sha512:c64f3338e292962817b043dd11e9c47f533c9b70d432f83e80654e20f4937c72b37e66a60485df43f734b1ff94ebf0452547a063076917889303c9653b4d6ce5
SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE2=cldr-common-41.0.zip

SOURCE_URL[0]=https://github.com/python-babel/babel/archive/v$VERSION.tar.gz
+ SOURCE2_URL[0]=http://unicode.org/Public/cldr/41/${SOURCE2}
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://babel.pocoo.org/
LICENSE[0]=BSD
diff --git a/python-pypi/babel/HISTORY b/python-pypi/babel/HISTORY
index 17f00e2..75adfd1 100644
--- a/python-pypi/babel/HISTORY
+++ b/python-pypi/babel/HISTORY
@@ -1,3 +1,8 @@
+2022-05-28 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Add cldr-common-41.0.zip as SOURCE2
+ * DEPENDS: Depends on backports_abc and pytz
+ * PRE_BUILD Copy SOURCE2 so it doesn't try to download it during build
+
2022-05-08 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.10.1

diff --git a/python-pypi/babel/PRE_BUILD b/python-pypi/babel/PRE_BUILD
new file mode 100755
index 0000000..bd013b2
--- /dev/null
+++ b/python-pypi/babel/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+verify_file 2 &&
+mkdir -p "${SOURCE_DIRECTORY}"/cldr &&
+cd "${SOURCE_DIRECTORY}"/cldr &&
+cp ${SOURCE_CACHE}/${SOURCE2} .



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (d53f1d20fabaa70892bf502060c1bb55daa92e2a), Eric Sandall, 06/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page