Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d857efbf59c9c87eab58af76e3dbca8fcf91c142)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d857efbf59c9c87eab58af76e3dbca8fcf91c142)
  • Date: Sat, 23 Jan 2021 01:56:34 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

mail/fdm/BUILD | 2 -
mail/fdm/CONFIGURE | 2 -
mail/fdm/DEPENDS | 15 +++++++++--
mail/fdm/DETAILS | 10 +++----
mail/fdm/HISTORY | 6 ++++
mail/fdm/PRE_BUILD | 7 +++++
mail/fdm/patches/0001-Fix-base64-function-prototypes.patch | 17
+++++++++++++
7 files changed, 48 insertions(+), 11 deletions(-)

New commits:
commit d857efbf59c9c87eab58af76e3dbca8fcf91c142
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fdm: Fix build against musl libc

commit 67d9764123891e89c4e2a302dda1738dac6329e4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wip fdm 2.0

diff --git a/mail/fdm/BUILD b/mail/fdm/BUILD
deleted file mode 100755
index 3a9d059..0000000
--- a/mail/fdm/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-./configure &&
-make ${FDM_PCRE}
diff --git a/mail/fdm/CONFIGURE b/mail/fdm/CONFIGURE
deleted file mode 100755
index d2fd07c..0000000
--- a/mail/fdm/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option FDM_PCRE "Enable pcre instead of posix regex?" n \
- "PCRE=0" "PCRE=1"
diff --git a/mail/fdm/DEPENDS b/mail/fdm/DEPENDS
index 92401b1..dbe1def 100755
--- a/mail/fdm/DEPENDS
+++ b/mail/fdm/DEPENDS
@@ -1,3 +1,14 @@
-depends pcre &&
depends SSL &&
-depends tdb
+depends tdb &&
+case "$HOST" in
+ (*-musl)
+ # remove when/if musl implements REG_STARTEND
+ depends pcre --enable-pcre
+ ;;
+ (*)
+ optional_depends pcre \
+ --enable-pcre \
+ --disable-pcre \
+ 'to enable PCREs in addition to POSIX regexps'
+ ;;
+esac
diff --git a/mail/fdm/DETAILS b/mail/fdm/DETAILS
index 6bea1c7..affb2d1 100755
--- a/mail/fdm/DETAILS
+++ b/mail/fdm/DETAILS
@@ -1,9 +1,9 @@
SPELL=fdm
- VERSION=1.7
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL/$SPELL-$VERSION/$SOURCE/download
-
SOURCE_HASH=sha512:d438c96b1d3bdf08d14cfbb3b78ab5180e6bbc32121b7dfdd47ac14a4f8a19d1309f7742f78cc9db2d68b64b3422ec96f8f729931168d2fc411c36d0cc3e9386
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ VERSION=2.0
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL=("https://github.com/nicm/fdm/releases/download/$VERSION/$SOURCE";)
+
SOURCE_HASH=sha512:14e923202d17083ceb3b91b3a442d7e512c37f3d29535f22d8c0c4e1d57c97acc5d5465d643ed0cf437b3945ef777a6e38da3117219c2d54dcec88ecab1e10d9
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://fdm.sourceforge.net/ "
LICENSE[0]=BSD
ENTERED=20080212
diff --git a/mail/fdm/HISTORY b/mail/fdm/HISTORY
index 9723325..2545d9f 100644
--- a/mail/fdm/HISTORY
+++ b/mail/fdm/HISTORY
@@ -1,3 +1,9 @@
+2021-01-23 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2.0
+ * PRE_BUILD, patches/0001-Fix-base64-function-prototypes.patch:
+ fixed build against musl
+
2014-09-09 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: pcre, SSL

diff --git a/mail/fdm/PRE_BUILD b/mail/fdm/PRE_BUILD
new file mode 100755
index 0000000..55be45d
--- /dev/null
+++ b/mail/fdm/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+# remove cdefs.h; not needed nor available
+sedit '\!^#include <sys/cdefs\.h>!d' fdm.h &&
+# fix duplicated entry
+sedit '/^\t\$(am__obj/s/ \$(am__objects_1)$//' Makefile.in
diff --git a/mail/fdm/patches/0001-Fix-base64-function-prototypes.patch
b/mail/fdm/patches/0001-Fix-base64-function-prototypes.patch
new file mode 100644
index 0000000..3c89a51
--- /dev/null
+++ b/mail/fdm/patches/0001-Fix-base64-function-prototypes.patch
@@ -0,0 +1,17 @@
+Fix base64 function prototypes. These are used when not provided by the
libc.
+
+diff --git a/fdm.h b/fdm.h
+index 481b7930e04f..dafc7818a711 100644
+--- a/fdm.h
++++ b/fdm.h
+@@ -724,8 +724,8 @@ size_t strlcat(char *, const char *,
size_t);
+
+ #ifndef HAVE_B64_NTOP
+ /* base64.c */
+-int b64_ntop(src, srclength, target, targsize);
+-int b64_pton(src, target, targsize);
++int b64_ntop(const u_char *, size_t, char *, size_t);
++int b64_pton(const char *, u_char *, size_t);
+ #endif
+
+ /* shm.c */



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d857efbf59c9c87eab58af76e3dbca8fcf91c142), Ismael Luceno, 01/22/2021

Archive powered by MHonArc 2.6.24.

Top of Page