Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 editors/gawk/BUILD       |    6 +++++-
 editors/gawk/HISTORY     |    5 +++++
 net/net-tools/BUILD      |    1 -
 net/net-tools/CONFIGURE  |   10 ++++++++--
 net/net-tools/HISTORY    |    3 +++
 net/tcp_wrappers/BUILD   |    4 ++++
 net/tcp_wrappers/HISTORY |    4 ++++
 7 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 004da967ef38476e64defaa3f210bae731a5f435
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    gawk: reduce library usage

commit bb9a733ff1e5b4599343c580605aec4f57742b2c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    tcp_wrappers: PIC build

commit b54e7912552ec482db0817946eeccb8c2dc1094a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    net-tools: fix build by disabling obsolete hardware

diff --git a/editors/gawk/BUILD b/editors/gawk/BUILD
index faf4b96..6e4e95a 100755
--- a/editors/gawk/BUILD
+++ b/editors/gawk/BUILD
@@ -1,10 +1,14 @@
 [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
 
-
+# Disable mpfr and readline as that complicates upgrade
+# of gmp ... which fails mid-way since sorcery really relies
+# on awk to work. Proper fix would be to protect all
+# base libraries during dispel, like libc. -- ThOr
 ./configure  --build=${BUILD}              \
              --prefix=${TRACK_ROOT}/usr  \
              --bindir=${TRACK_ROOT}/bin  \
              --infodir=${TRACK_ROOT}/usr/share/info \
              --mandir=${TRACK_ROOT}/usr/share/man   \
+             --without-mpfr --without-readline \
              ${OPTS}  &&
 make DESTDIR=$INSTALL_ROOT
diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY
index e8ad2a0..2cd60a1 100644
--- a/editors/gawk/HISTORY
+++ b/editors/gawk/HISTORY
@@ -1,3 +1,8 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD: reduce usage of libraries to prevent failure of spell
+         upgrades (example: awk broken when updating gmp, sorcery cannot 
complete
+         when awk cannot run due to temporarily missing libgmp)
+
 2014-04-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.1.1
 
diff --git a/net/net-tools/BUILD b/net/net-tools/BUILD
index 1f79ca2..65e023e 100755
--- a/net/net-tools/BUILD
+++ b/net/net-tools/BUILD
@@ -16,4 +16,3 @@ sedit  '382,391s/$/\\n\\/'  mii-tool.c                      
 &&
 ./configure.sh  config.in  <  smgl_config_opts               &&
 make_single                                                  &&
 make  COPTS="-D_GNU_SOURCE -Wall $CFLAGS"  LOPTS="$LDFLAGS"
-
diff --git a/net/net-tools/CONFIGURE b/net/net-tools/CONFIGURE
index 5ef105b..772bee8 100755
--- a/net/net-tools/CONFIGURE
+++ b/net/net-tools/CONFIGURE
@@ -20,8 +20,14 @@ config_query  ARCNET     "ARCnet hardware support?"        
           y  &&
 config_query  SLIP       "SLIP (serial line) hardware support?"       y  &&
 config_query  PPP        "PPP (serial line) hardware support?"        y  &&
 config_query  IPIP       "IPIP Tunnel hardware support?"              y  &&
-config_query  STRIP      "STRIP (Metricom radio) hardware support?"   y  &&
-config_query  TOKEN      "Token ring (generic) hardware support?"     y  &&
+# Disable STRIP and Token Ring, not supported by kernel anymore, see
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=700008 .
+#config_query  STRIP      "STRIP (Metricom radio) hardware support?"   y  &&
+persistent_add STRIP &&
+STRIP=n &&
+#config_query  TOKEN      "Token ring (generic) hardware support?"     y  &&
+persistent_add TOKEN &&
+TOKEN=n &&
 config_query  HWAX25     "AX25 (packet radio) hardware support?"      y  &&
 config_query  HWROSE     "Rose (packet radio) hardware support?"      y  &&
 config_query  HWNETROM   "NET/ROM (packet radio) hardware support?"   y  &&
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index dc4db4b..4e1f3eb 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+       * CONFIGURE, BUILD: disable STRIP and Token Ring lacking kernel 
support
+
 2009-09-30 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: use INITSCRIPTS provider
 
diff --git a/net/tcp_wrappers/BUILD b/net/tcp_wrappers/BUILD
index 006f4ca..bc8814d 100755
--- a/net/tcp_wrappers/BUILD
+++ b/net/tcp_wrappers/BUILD
@@ -2,5 +2,9 @@
   sed -i "/^extern/d" scaffold.c                        &&
   patch  -p 1  <  $SCRIPT_DIRECTORY/tcp_wrappers.patch  &&
 
+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+  # There are folks who want to link libwrap into shared objects.
+  CFLAGS+=" -DPIC -fPIC"
+fi
   sedit 's/= -O/= '"$CFLAGS"'/' Makefile                &&
   make  REAL_DAEMON_DIR=${INSTALL_ROOT}/usr/sbin linux  
diff --git a/net/tcp_wrappers/HISTORY b/net/tcp_wrappers/HISTORY
index 34e996d..5b81b5e 100644
--- a/net/tcp_wrappers/HISTORY
+++ b/net/tcp_wrappers/HISTORY
@@ -1,3 +1,7 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD: enforce PIC on x86-64 to enable other spells to include
+         libwrap.a in dynamic libs, which does happen and fails otherwise
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.