Skip to Content.
Sympa Menu

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

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 (6ae1696c284962792bc7e267ff1bbd461b72c899)
  • Date: Thu, 13 Sep 2018 23:52:40 +0000

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

archive/gzip/HISTORY
| 5
archive/gzip/PRE_BUILD
| 4
archive/gzip/glibc-2.28.patch
| 190 ++++++++++
database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
| 53 ++
database/db/BUILD
| 3
database/db/HISTORY
| 8
database/db/PRE_BUILD
| 10
dev/null
|binary
devel/ocaml/DETAILS
| 7
devel/ocaml/HISTORY
| 4
disk/parted/HISTORY
| 5
disk/parted/PRE_BUILD
| 6
disk/parted/glibc-2.28.patch
| 31 +
libs/findlib/DETAILS
| 4
libs/findlib/HISTORY
| 3
smgl/simpleinit-msb/HISTORY
| 4
smgl/simpleinit-msb/PRE_BUILD
| 2
smgl/simpleinit-msb/glibc-2.28.patch
| 22 +
utils/metalog/DEPENDS
| 6
utils/metalog/DETAILS
| 10
utils/metalog/HISTORY
| 7
utils/metalog/PRE_BUILD
| 8
utils/supermin/DETAILS
| 2
utils/supermin/HISTORY
| 6
utils/supermin/PRE_BUILD
| 4
utils/supermin/ocaml-4.06.patch
| 57 +++
26 files changed, 438 insertions(+), 23 deletions(-)

New commits:
commit 6ae1696c284962792bc7e267ff1bbd461b72c899
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

reiserfsprogs: Remove unneeded 3.6.21 sig file

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

simpleinit-msb: Fix glibc 2.28+

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

ocaml: Updated to 4.07.0

WEB_SITE updated to ocaml.org

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

parted: Fix glibc 2.28+

See
https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/sysutils/parted/patches/parted-0002-buildfix-glibc-2.28.patch

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

supermin: Updated to 5.1.19

Fix compilation against ocaml 7.06+
See
https://github.com/libguestfs/supermin/commit/5c5eff66dfaccb212b8906e769e40633d8b8f5e4

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

findlib: Updated to 1.8.0

Now compiles again.

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

gzip: Fix compilation against glibc 2.28+

See https://patches.openembedded.org/patch/153323/

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

metalog: Updated to 2018510

Fixes compilation with glibc 2.28.
SOURCE_URL is now on github
Extracts to metalog-metalog-2018510... :shrug:
Run ./autogen.sh
Depends on autoconf and autoconf-archive

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

db: Fix compiling against GCC 8.x with Clang

See https://patchwork.ozlabs.org/patch/909328/

diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index 470352f..e997783 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,8 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.28.patch
+ * glibc-2.28.patch: Fix compilation against glibc 2.28+
+ See https://patches.openembedded.org/patch/153323/
+
2018-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9

diff --git a/archive/gzip/PRE_BUILD b/archive/gzip/PRE_BUILD
new file mode 100755
index 0000000..5b327d0
--- /dev/null
+++ b/archive/gzip/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+message "${MESSAGE_COLOR}Applying glibc 2.28 patch...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/glibc-2.28.patch
diff --git a/archive/gzip/glibc-2.28.patch b/archive/gzip/glibc-2.28.patch
new file mode 100644
index 0000000..1991fa2
--- /dev/null
+++ b/archive/gzip/glibc-2.28.patch
@@ -0,0 +1,190 @@
+# See https://patches.openembedded.org/patch/153323/
+From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <address@hidden>
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+---
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem AT gmail.com>
+
+ ChangeLog | 23 +++++++++++++++++++++++
+ lib/fbufmode.c | 2 +-
+ lib/fflush.c | 6 +++---
+ lib/fpending.c | 2 +-
+ lib/fpurge.c | 2 +-
+ lib/freadable.c | 2 +-
+ lib/freadahead.c | 2 +-
+ lib/freading.c | 2 +-
+ lib/freadptr.c | 2 +-
+ lib/freadseek.c | 2 +-
+ lib/fseeko.c | 4 ++--
+ lib/fseterr.c | 2 +-
+ lib/fwritable.c | 2 +-
+ lib/fwriting.c | 2 +-
+ lib/stdio-impl.h | 6 ++++++
+ 15 files changed, 45 insertions(+), 16 deletions(-)
+
+Index: gzip-1.9/ChangeLog
+===================================================================
+--- gzip-1.9.orig/ChangeLog
++++ gzip-1.9/ChangeLog
+@@ -1,3 +1,26 @@
++2018-03-05 Paul Eggert <address@hidden>
++
++ fflush: adjust to glibc 2.28 libio.h removal
++ Problem reported by Daniel P. Berrangé in:
++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
++ * lib/fbufmode.c (fbufmode):
++ * lib/fflush.c (clear_ungetc_buffer_preserving_position)
++ (disable_seek_optimization, rpl_fflush):
++ * lib/fpending.c (__fpending):
++ * lib/fpurge.c (fpurge):
++ * lib/freadable.c (freadable):
++ * lib/freadahead.c (freadahead):
++ * lib/freading.c (freading):
++ * lib/freadptr.c (freadptr):
++ * lib/freadseek.c (freadptrinc):
++ * lib/fseeko.c (fseeko):
++ * lib/fseterr.c (fseterr):
++ * lib/fwritable.c (fwritable):
++ * lib/fwriting.c (fwriting):
++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
++ Define if not already defined.
++
+ 2018-01-07 Jim Meyering <meyering AT fb.com>
+
+ version 1.9
+Index: gzip-1.9/lib/fflush.c
+===================================================================
+--- gzip-1.9.orig/lib/fflush.c
++++ gzip-1.9/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).
*/
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */)
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) &&
defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android
*/
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+Index: gzip-1.9/lib/fpurge.c
+===================================================================
+--- gzip-1.9.orig/lib/fpurge.c
++++ gzip-1.9/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+Index: gzip-1.9/lib/freading.c
+===================================================================
+--- gzip-1.9.orig/lib/freading.c
++++ gzip-1.9/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+Index: gzip-1.9/lib/fseeko.c
+===================================================================
+--- gzip-1.9.orig/lib/fseeko.c
++++ gzip-1.9/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+Index: gzip-1.9/lib/fseterr.c
+===================================================================
+--- gzip-1.9.orig/lib/fseterr.c
++++ gzip-1.9/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku,
Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3,
Android */
+Index: gzip-1.9/lib/stdio-impl.h
+===================================================================
+--- gzip-1.9.orig/lib/stdio-impl.h
++++ gzip-1.9/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts.
*/
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
diff --git
a/database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
b/database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
new file mode 100644
index 0000000..7b3bc04
--- /dev/null
+++
b/database/db/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
@@ -0,0 +1,53 @@
+# From https://patchwork.ozlabs.org/patch/909328/
+From 29621d637e30982489693f2e207ce6a1790e3337 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem AT gmail.com>
+Date: Wed, 22 Mar 2017 15:32:26 +0000
+Subject: [PATCH] atomic: Rename local __atomic_compare_exchange to avoid
clash
+ with builtins
+
+Helps building with clang
+
+Fixes
+
+../db-5.3.28/src/dbinc/atomic.h:179:19: error: definition of builtin
function '__atomic_compare_exchange'
+static inline int __atomic_compare_exchange(
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem AT gmail.com>
+
+Downloaded from
+http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/db/db/0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+
+Fixes gcc-8 build error.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls AT t-online.de>
+---
+ src/dbinc/atomic.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
+index 6a858f7..1b49de5 100644
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define atomic_inc(env, p) __atomic_inc(p)
+ #define atomic_dec(env, p) __atomic_dec(p)
+ #define atomic_compare_exchange(env, p, o, n) \
+- __atomic_compare_exchange((p), (o), (n))
++ __db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ int temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+ * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+ * which configure could be changed to use.
+ */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ atomic_value_t was;
+--
+1.8.3.1
+
diff --git a/database/db/BUILD b/database/db/BUILD
index caad726..9809127 100755
--- a/database/db/BUILD
+++ b/database/db/BUILD
@@ -1,6 +1,3 @@
-patch -p1 < $SCRIPT_DIRECTORY/javafix.diff &&
-sedit 's|\(docdir\w*=\w*[^/]*\)/docs|\1/share/doc/db|' dist/Makefile.in &&
-
OPTS="$OPTS $DB_JSUP $DB_TESTS" &&

if [ "$DB_JSUP" == "--enable-java" ]; then
diff --git a/database/db/HISTORY b/database/db/HISTORY
index 650f5ef..e9035a3 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,11 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Move javafix.diff to PRE_BUILD
+ * PRE_BUILD: Apply javafix.diff
+ Apply
0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
+ * 0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch: Fix
+ compiling against GCC 8.x with Clang
+ See https://patchwork.ozlabs.org/patch/909328/
+
2014-12-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 5.3.28
* BUILD: $TESTS -> $DB_TESTS
diff --git a/database/db/PRE_BUILD b/database/db/PRE_BUILD
new file mode 100755
index 0000000..4068dcc
--- /dev/null
+++ b/database/db/PRE_BUILD
@@ -0,0 +1,10 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+message "${MESSAGE_COLOR}Applying Java compiler fix...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/javafix.diff &&
+
+message "${MESSAGE_COLOR}Applying GCC 8.x Clang fix...${DEFAULT_COLOR}" &&
+patch -p1 <
"${SPELL_DIRECTORY}"/0002-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch
&&
+
+sedit 's|\(docdir\w*=\w*[^/]*\)/docs|\1/share/doc/db|' dist/Makefile.in
diff --git a/devel/ocaml/DETAILS b/devel/ocaml/DETAILS
index 4cf4b47..dfa7599 100755
--- a/devel/ocaml/DETAILS
+++ b/devel/ocaml/DETAILS
@@ -1,13 +1,12 @@
SPELL=ocaml
- VERSION=4.06.1
-
SOURCE_HASH=sha512:1a87a7d6be9b8fddbb2c1d4b665827f63f314bcedbc58583dd0489646e0150b690d28a437ec5ba8a6b3f9a9d8263b927195abd27c6a7ea36ba732640d7896d4b
+ VERSION=4.07.0
+
SOURCE_HASH=sha512:1c27c2c81919af6b51824fb69f203ebca009ab093af0dffb0dbe66d08ba980525ee14e9426edf142c527315144602ac9ef6e36d2266714b5f7ccc7c063e75ac8
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%pl*}

SOURCE_URL[0]=http://caml.inria.fr/pub/distrib/$SPELL-${VERSION:0:4}/$SOURCE
- WEB_SITE=http://caml.inria.fr
+ WEB_SITE=http://ocaml.org/
ENTERED=20040325
LICENSE[0]=GPL
-# MAKE_NJOBS=1
KEYWORDS="devel"
SHORT="Objective Caml programming language"
cat << EOF
diff --git a/devel/ocaml/HISTORY b/devel/ocaml/HISTORY
index 203dfda..ac94430 100644
--- a/devel/ocaml/HISTORY
+++ b/devel/ocaml/HISTORY
@@ -1,3 +1,7 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 4.07.0
+ WEB_SITE updated to ocaml.org
+
2018-07-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.06.1

diff --git a/disk/parted/HISTORY b/disk/parted/HISTORY
index 497d01a..4d289ed 100644
--- a/disk/parted/HISTORY
+++ b/disk/parted/HISTORY
@@ -1,3 +1,8 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.28.patch
+ * glibc-2.28.patch: Fix glibc 2.28+
+ See
https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/sysutils/parted/patches/parted-0002-buildfix-glibc-2.28.patch
+
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply patch
* no-dm.patch: added, from upstream bug #18147
diff --git a/disk/parted/PRE_BUILD b/disk/parted/PRE_BUILD
index 1a05c63..bcd6332 100755
--- a/disk/parted/PRE_BUILD
+++ b/disk/parted/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p1 < "$SPELL_DIRECTORY/no-dm.patch"
+message "${MESSAGE_COLOR}Apply No Device Manager fix...${DEFAULT_COLOR}" &&
+patch -p1 < "$SPELL_DIRECTORY/no-dm.patch" &&
+
+message "${MESSAGE_COLOR}Applying glibc 2.28 patch...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/glibc-2.28.patch
diff --git a/disk/parted/glibc-2.28.patch b/disk/parted/glibc-2.28.patch
new file mode 100644
index 0000000..a9e8187
--- /dev/null
+++ b/disk/parted/glibc-2.28.patch
@@ -0,0 +1,31 @@
+# From
https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/sysutils/parted/patches/parted-0002-buildfix-glibc-2.28.patch
+From b79bdebf285575ec2c3e8944d951655ef8c97a23 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier at gentoo.org>
+Date: Tue, 21 Jun 2016 15:01:08 -0400
+Subject: [PATCH] include sysmacros.h for major/minor/makedev
+
+Linux C libs are moving away from including this header implicitly via
+sys/types.h, so include it explicitly.
+
+Upstream-Status: Pending
+Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 0f18904..b302d63 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -37,6 +37,7 @@
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/utsname.h> /* for uname() */
+ #include <scsi/scsi.h>
+--
+2.14.1
+
+
diff --git a/disk/reiserfsprogs/reiserfsprogs-3.6.21.tar.bz2.sig
b/disk/reiserfsprogs/reiserfsprogs-3.6.21.tar.bz2.sig
deleted file mode 100644
index d7b0c7a..0000000
Binary files a/disk/reiserfsprogs/reiserfsprogs-3.6.21.tar.bz2.sig and
/dev/null differ
diff --git a/libs/findlib/DETAILS b/libs/findlib/DETAILS
index d278067..1051be7 100755
--- a/libs/findlib/DETAILS
+++ b/libs/findlib/DETAILS
@@ -1,8 +1,8 @@
SPELL=findlib
- VERSION=1.4
+ VERSION=1.8.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://www.ocaml-programming.de/packages/${SOURCE}
-
SOURCE_HASH=sha512:7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b
+
SOURCE_HASH=sha512:a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
WEB_SITE=http://projects.camlcity.org/projects/findlib.html
ENTERED=20060629
diff --git a/libs/findlib/HISTORY b/libs/findlib/HISTORY
index b245b76..11116d6 100644
--- a/libs/findlib/HISTORY
+++ b/libs/findlib/HISTORY
@@ -1,3 +1,6 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.8.0
+
2014-02-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4

diff --git a/smgl/simpleinit-msb/HISTORY b/smgl/simpleinit-msb/HISTORY
index 38307f2..97b7e38 100644
--- a/smgl/simpleinit-msb/HISTORY
+++ b/smgl/simpleinit-msb/HISTORY
@@ -1,3 +1,7 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply glibc-2.28.patch
+ * glibc-2.28.patch: Fix glibc 2.28+
+
2016-05-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated mirror to ftp.sourcemage.us

diff --git a/smgl/simpleinit-msb/PRE_BUILD b/smgl/simpleinit-msb/PRE_BUILD
index ef5f755..27c82ab 100755
--- a/smgl/simpleinit-msb/PRE_BUILD
+++ b/smgl/simpleinit-msb/PRE_BUILD
@@ -10,6 +10,8 @@ patch -p0 < "$SPELL_DIRECTORY/simpleinit-nonls.patch" &&
patch -p0 < "$SPELL_DIRECTORY/simpleinit-poweroff.patch" &&
message "${MESSAGE_COLOR}Apply linux 2.6.38+ headers
patch...${DEFAULT_COLOR}" &&
patch -p1 < "$SPELL_DIRECTORY/simpleinit-ftbfs-define-enoictlcmd.patch" &&
+message "${MESSAGE_COLOR}Applying glibc 2.28 patch...${DEFAULT_COLOR}" &&
+patch -p1 < "$SPELL_DIRECTORY"/glibc-2.28.patch &&

if [[ $SIMPLEINIT_STATIC == y ]]; then
sedit 's#shutdown: shutdown.o $(LIB)/my_reboot.o
$(LIB)/xstrncpy.o#shutdown: shutdown.o $(LIB)/my_reboot.o
$(LIB)/xstrncpy.o\n\t$(CC) $(LDFLAGS) -o $@ $^#' login-utils/Makefile &&
diff --git a/smgl/simpleinit-msb/glibc-2.28.patch
b/smgl/simpleinit-msb/glibc-2.28.patch
new file mode 100644
index 0000000..67fe1d3
--- /dev/null
+++ b/smgl/simpleinit-msb/glibc-2.28.patch
@@ -0,0 +1,22 @@
+diff -Naur simpleinit-msb-1.3.orig/sysvtools/bootlogd.c
simpleinit-msb-1.3/sysvtools/bootlogd.c
+--- simpleinit-msb-1.3.orig/sysvtools/bootlogd.c 2018-09-13
16:05:48.825572632 -0700
++++ simpleinit-msb-1.3/sysvtools/bootlogd.c 2018-09-13 16:12:00.763922763
-0700
+@@ -23,6 +23,7 @@
+ *
+ */
+
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+diff -Naur simpleinit-msb-1.3.orig/sysvtools/mountpoint.c
simpleinit-msb-1.3/sysvtools/mountpoint.c
+--- simpleinit-msb-1.3.orig/sysvtools/mountpoint.c 2018-09-13
16:05:48.825572632 -0700
++++ simpleinit-msb-1.3/sysvtools/mountpoint.c 2018-09-13 16:09:28.807822475
-0700
+@@ -14,6 +14,7 @@
+ * 2 of the License, or (at your option) any later version.
+ */
+
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/utils/metalog/DEPENDS b/utils/metalog/DEPENDS
index c0c7081..da0cd65 100755
--- a/utils/metalog/DEPENDS
+++ b/utils/metalog/DEPENDS
@@ -1,3 +1,5 @@
-depends gnupg &&
-depends pcre &&
+depends autoconf &&
+depends autoconf-archive &&
+depends gnupg &&
+depends pcre &&
depends xz-utils
diff --git a/utils/metalog/DETAILS b/utils/metalog/DETAILS
index 9ebbde8..1f4ea48 100755
--- a/utils/metalog/DETAILS
+++ b/utils/metalog/DETAILS
@@ -1,9 +1,9 @@
SPELL=metalog
- VERSION=3
- SOURCE=$SPELL-$VERSION.tar.xz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
+ VERSION=2018510
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$SPELL-$VERSION"
+
SOURCE_URL[0]=https://github.com/hvisage/${SPELL}/archive/${SPELL}-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:bff8928a53665d2b3638960e811d129c36a6fd75aef72be570922ae42c9f509f4db1ba89f75ebf8f7c1243a267eade5a6a326827aef60cd1704ea18f5e10895d
WEB_SITE=http://metalog.sourceforge.net/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/utils/metalog/HISTORY b/utils/metalog/HISTORY
index 3583fe0..254eb7a 100644
--- a/utils/metalog/HISTORY
+++ b/utils/metalog/HISTORY
@@ -1,3 +1,10 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2018510
+ SOURCE_URL is now on github
+ Extracts to metalog-metalog-2018510... :shrug:
+ * PRE_BUILD: Run ./autogen.sh
+ * DEPENDS: Depends on autoconf and autoconf-archive
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/utils/metalog/PRE_BUILD b/utils/metalog/PRE_BUILD
index 37f3c99..09814d6 100755
--- a/utils/metalog/PRE_BUILD
+++ b/utils/metalog/PRE_BUILD
@@ -1,5 +1,3 @@
-default_pre_build &&
-
-xz -dc "$SOURCE_CACHE/$SOURCE" | tar x -C "$BUILD_DIRECTORY"
-
-cd "$SOURCE_DIRECTORY"
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+./autogen.sh
diff --git a/utils/supermin/DETAILS b/utils/supermin/DETAILS
index a25a8e5..efafd6d 100755
--- a/utils/supermin/DETAILS
+++ b/utils/supermin/DETAILS
@@ -1,5 +1,5 @@
SPELL=supermin
- VERSION=5.1.11
+ VERSION=5.1.19
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE2="${SOURCE}.sig"
SOURCE_GPG="redhat.gpg:${SOURCE2}:UPSTREAM_HASH"
diff --git a/utils/supermin/HISTORY b/utils/supermin/HISTORY
index d4ccb2d..c2c9b1e 100644
--- a/utils/supermin/HISTORY
+++ b/utils/supermin/HISTORY
@@ -1,3 +1,9 @@
+2018-09-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 5.1.19
+ * PRE_BUILD: Apply ocaml-4.06.patch
+ * ocaml-4.06.patch: Fix compilation against ocaml 7.06+
+ See
https://github.com/libguestfs/supermin/commit/5c5eff66dfaccb212b8906e769e40633d8b8f5e4
+
2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 5.1.11
* PRE_BUILD: Removed, no longer needed
diff --git a/utils/supermin/PRE_BUILD b/utils/supermin/PRE_BUILD
new file mode 100755
index 0000000..413566d
--- /dev/null
+++ b/utils/supermin/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+message "${MESSAGE_COLOR}Applying ocaml 7.06 patch...${DEFAULT_COLOR}" &&
+patch -p1 < "${SPELL_DIRECTORY}"/ocaml-4.06.patch
diff --git a/utils/supermin/ocaml-4.06.patch b/utils/supermin/ocaml-4.06.patch
new file mode 100644
index 0000000..e8231ce
--- /dev/null
+++ b/utils/supermin/ocaml-4.06.patch
@@ -0,0 +1,57 @@
+# See
https://github.com/libguestfs/supermin/commit/5c5eff66dfaccb212b8906e769e40633d8b8f5e4
+From 5c5eff66dfaccb212b8906e769e40633d8b8f5e4 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones AT redhat.com>
+Date: Tue, 13 Feb 2018 08:20:52 +0000
+Subject: [PATCH] Fix Bytes/String for OCaml 4.06.
+
+---
+ src/format_ext2_kernel.ml | 4 ++--
+ src/mode_build.ml | 10 ++++++----
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml
+index d5d529d..98bff3a 100644
+--- a/src/format_ext2_kernel.ml
++++ b/src/format_ext2_kernel.ml
+@@ -290,9 +290,9 @@ and read_leshort chan offset =
+
+ and read_string chan offset len =
+ seek_in chan offset;
+- let buf = String.create len in
++ let buf = Bytes.create len in
+ really_input chan buf 0 len;
+- buf
++ Bytes.to_string buf
+
+ and copy_or_symlink_file copy_kernel src dest =
+ if not copy_kernel then
+diff --git a/src/mode_build.ml b/src/mode_build.ml
+index 95869cb..b5f5fa6 100644
+--- a/src/mode_build.ml
++++ b/src/mode_build.ml
+@@ -299,9 +299,10 @@ and update_appliance appliance lines = function
+ (* Determine the [file_type] of [file], or exit with an error. *)
+ and get_file_type file =
+ let chan = open_in file in
+- let buf = String.create 512 in
+- let len = input chan buf 0 (String.length buf) in
++ let buf = Bytes.create 512 in
++ let len = input chan buf 0 (Bytes.length buf) in
+ close_in chan;
++ let buf = Bytes.to_string buf in
+
+ if len >= 3 && buf.[0] = '\x1f' && buf.[1] = '\x8b' && buf.[2] = '\x08'
+ then (* gzip-compressed file *)
+@@ -335,8 +336,9 @@ and get_file_content file buf len =
+ and get_compressed_file_content zcat file =
+ let cmd = sprintf "%s %s" zcat (quote file) in
+ let chan_out, chan_in, chan_err = open_process_full cmd [||] in
+- let buf = String.create 512 in
+- let len = input chan_out buf 0 (String.length buf) in
++ let buf = Bytes.create 512 in
++ let len = input chan_out buf 0 (Bytes.length buf) in
++ let buf = Bytes.to_string buf in
+ (* We're expecting the subprocess to fail because we close the pipe
+ * early, so:
+ *)
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (6ae1696c284962792bc7e267ff1bbd461b72c899), Eric Sandall, 09/13/2018

Archive powered by MHonArc 2.6.24.

Top of Page