Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (ebf9a58aa137d0fb18f779ca23f9789687c4d4ee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (ebf9a58aa137d0fb18f779ca23f9789687c4d4ee)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (ebf9a58aa137d0fb18f779ca23f9789687c4d4ee)
  • Date: Sat, 2 Sep 2023 12:50:02 +0000
GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

crypto/libxcrypt/BUILD | 13 ++++++-----
crypto/libxcrypt/CONFIGURE | 51
++++++++++++++++++++++++++++++++++++++++++++
crypto/libxcrypt/HISTORY | 4 +++
mail/mailcap/BUILD | 1
mail/mailcap/CONFLICTS | 1
mail/mailcap/DETAILS | 14 ++++++++++++
mail/mailcap/HISTORY | 2 +
smgl/mime-support/CONFLICTS | 1
smgl/mime-support/HISTORY | 4 +++
9 files changed, 85 insertions(+), 6 deletions(-)

New commits:
commit ebf9a58aa137d0fb18f779ca23f9789687c4d4ee
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

smgl/mime-support: add CONFLICTS with mailcap

Add CONFLICTS to indicate that mime-support conflicts with mailcap.

commit ebf8c3605756e8b89e3f5934ab785feb9f0bab13
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

mail/mailcap: new spell, provides MIME types

Provides definitions of standard MIME types that are maintained by
upstream, and conflicts with the SMGL-provided mime-support spell.
This spell therefore provides an upstream-maintained alternative to the
(currently unmaintained) in-house definitions we provide.

commit e0fe96f7c7a003147c8fd1bb6fd4d64563e71d48
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

crypto/libxcrypt: don't hardcode build options

For build options that are actually optional, always present the user
with a choice of how to build.

Include additional option for whether to build stub functions that
return ENOSYS to remain POSIX compliant while also supporting old
binaries using obsolete APIs.

diff --git a/crypto/libxcrypt/BUILD b/crypto/libxcrypt/BUILD
index 598541d..5078586 100755
--- a/crypto/libxcrypt/BUILD
+++ b/crypto/libxcrypt/BUILD
@@ -1,7 +1,8 @@
-OPTS+=' --disable-static' &&
-OPTS+=' --enable-obsolete-api=glibc' &&
-OPTS+=' --enable-hashes=strong,glibc' &&
-OPTS+=' --disable-werror' &&
-CFLAGS+=' -Wno-error=strict-overflow' &&
-default_build
+OPTS="$BUILD_STATIC $OPTS" &&
+OPTS="$OBSOLETE_APIS $OPTS" &&
+OPTS="$OBSOLETE_STUBS $OPTS" &&
+OPTS="$HASHES $OPTS" &&
+OPTS="--disable-werror $OPTS" &&
+CFLAGS="-Wno-error=strict-overflow" &&

+default_build
diff --git a/crypto/libxcrypt/CONFIGURE b/crypto/libxcrypt/CONFIGURE
new file mode 100755
index 0000000..1c8819a
--- /dev/null
+++ b/crypto/libxcrypt/CONFIGURE
@@ -0,0 +1,51 @@
+. "$GRIMOIRE/config_query_multi.function" &&
+
+config_query_option BUILD_STATIC \
+ "Build static libraries in addition to dynamic?" \
+ y \
+ --enable-static \
+ --disable-static \
+ &&
+
+config_query_list OBSOLETE_APIS \
+ "Which obsolete APIs to enable?" \
+ none \
+ alt \
+ glibc \
+ owl \
+ suse \
+ all \
+ &&
+
+config_query_option OBSOLETE_STUBS \
+ "Enable obsolete API stubs that return ENOSYS?" \
+ n \
+ --enable-obsolete-api-enosys=yes \
+ --enable-obsolete-api-enosys=no \
+ &&
+
+config_query_multi HASHES "Which hashes to enable?" \
+ strong \
+ alt \
+ fedora \
+ freebsd \
+ glibc \
+ netbsd \
+ openbsd \
+ osx \
+ owl \
+ solaris \
+ suse \
+ all \
+ &&
+
+case "$OBSOLETE_APIS" in
+ none) OBSOLETE_APIS=no ;;
+ all) OBSOLETE_APIS=yes ;;
+esac &&
+
+HASHES="--enable-hashes=${HASHES// /,}" &&
+OBSOLETE_APIS="--enable-obsolete-api=$OBSOLETE_APIS" &&
+
+persistent_remove HASHES OBSOLETE_APIS &&
+persistent_add HASHES OBSOLETE_APIS
diff --git a/crypto/libxcrypt/HISTORY b/crypto/libxcrypt/HISTORY
index f915933..a9a135e 100644
--- a/crypto/libxcrypt/HISTORY
+++ b/crypto/libxcrypt/HISTORY
@@ -1,3 +1,7 @@
+2023-09-02 Justin Boffemmyer <flux AT sourcemage.org>
+ * BUILD: don't hardcode non-essential build options
+ * CONFIGURE: new, user configurable build options
+
2023-08-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.4.36, added Watch line

diff --git a/mail/mailcap/BUILD b/mail/mailcap/BUILD
new file mode 100755
index 0000000..bee6666
--- /dev/null
+++ b/mail/mailcap/BUILD
@@ -0,0 +1 @@
+make all
diff --git a/mail/mailcap/CONFLICTS b/mail/mailcap/CONFLICTS
new file mode 100755
index 0000000..f574c89
--- /dev/null
+++ b/mail/mailcap/CONFLICTS
@@ -0,0 +1 @@
+conflicts mime-support
diff --git a/mail/mailcap/DETAILS b/mail/mailcap/DETAILS
new file mode 100755
index 0000000..a16d38c
--- /dev/null
+++ b/mail/mailcap/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=mailcap
+ VERSION=r2-1-54
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_HASH="sha512:6c68df26caac326ce14630e2cec582ab88cda27710155f336dbab4681e76a94d2818452ed39f2e9edd2d960603b783a6e801da6e7c400bb708b910e61ed66b6e"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://pagure.io/$SPELL";
+ SOURCE_URL[0]="$WEB_SITE/archive/${VERSION}/$SOURCE"
+ LICENSE[0]=PD
+ ENTERED=20230902
+ SHORT="standard MIME types"
+printf 'DEBUG: %s\n' "$SOURCE_URL[0]"
+cat << EOF
+Helper application and MIME type associations for file types
+EOF
diff --git a/mail/mailcap/HISTORY b/mail/mailcap/HISTORY
new file mode 100644
index 0000000..c44960f
--- /dev/null
+++ b/mail/mailcap/HISTORY
@@ -0,0 +1,2 @@
+2023-09-02 Justin Boffemmyer <flux AT sourcemage.org>
+ * BUILD, CONFLICTS, DETAILS: new, spell created
diff --git a/smgl/mime-support/CONFLICTS b/smgl/mime-support/CONFLICTS
new file mode 100755
index 0000000..684c70b
--- /dev/null
+++ b/smgl/mime-support/CONFLICTS
@@ -0,0 +1 @@
+conflicts mailcap
diff --git a/smgl/mime-support/HISTORY b/smgl/mime-support/HISTORY
index a0010e7..4824bab 100644
--- a/smgl/mime-support/HISTORY
+++ b/smgl/mime-support/HISTORY
@@ -1,3 +1,7 @@
+2023-09-02 Justin Boffemmyer <flux AT sourcemage.org>
+ * CONFLICTS: conflicts with mailcap, a new spell that provides
+ upstream-maintained MIME type definitions
+
2016-12-19 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: 3.60



  • [SM-Commit] GIT changes to master grimoire by Justin Boffemmyer (ebf9a58aa137d0fb18f779ca23f9789687c4d4ee), Justin Boffemmyer, 09/02/2023

Archive powered by MHonArc 2.6.24.

Top of Page