Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (18abefec0e2d1f8b192ce0fb55b1f53f6d3bdf01)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (18abefec0e2d1f8b192ce0fb55b1f53f6d3bdf01)
  • Date: Sat, 21 Mar 2015 06:20:34 -0500

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

crypto/cryptsetup-luks/BUILD | 13 +++++++++++++
crypto/cryptsetup-luks/HISTORY | 5 +++++
database/virtuoso/DEPENDS | 7 ++++++-
database/virtuoso/HISTORY | 3 +++
kde4/kdepimlibs4/DEPENDS | 3 ++-
kde4/kdepimlibs4/HISTORY | 3 +++
perl-cpan/term-readline-gnu/DETAILS | 4 ++--
perl-cpan/term-readline-gnu/HISTORY | 3 +++
utils/dbus/BUILD | 5 +++++
utils/dbus/HISTORY | 3 +++
10 files changed, 45 insertions(+), 4 deletions(-)

New commits:
commit 18abefec0e2d1f8b192ce0fb55b1f53f6d3bdf01
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

cryptsetup-luks: hotfix for -lpthread

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

term-readline-gnu: update to 1.26

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

virtuoso: enforce libiodbc if python (could that be PYTHON?)

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

kdepimlibs4: more dependencies

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

dbus: reduce attack surface by not picking up glib for tests during build

diff --git a/crypto/cryptsetup-luks/BUILD b/crypto/cryptsetup-luks/BUILD
index e12c3c3..f232f95 100755
--- a/crypto/cryptsetup-luks/BUILD
+++ b/crypto/cryptsetup-luks/BUILD
@@ -1,3 +1,16 @@
# Installs both dynamic and static binaries.
OPTS="$OPTS --enable-static-cryptsetup" &&
+# Kindof a hotfix: Open question if rather libgcrypt or libgpg-error should
+# pull in libpthread. Really not sure, as it's not always needed.
+# Or is it a gcc issue?
+# /usr/src/gcc-4.9.2.bld/x86_64-pc-linux-gnu/libgcc/./gthr-default.h:778:
undefined reference to `pthread_mutex_unlock'
+#
/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.2/libgcc_eh.a(unwind-dw2-fde-dip.o):/usr/src/gcc-4.9.2.bld/x86_64-pc-linux-gnu/libgcc/./gthr-default.h:778:
more undefined references to `pthread_mutex_unlock' follow
+# /usr/lib/libgcrypt.a(libgcrypt_la-ath.o): In function
`_gcry_ath_mutex_lock':
+# /usr/src/libgcrypt-1.6.3/src/ath.c:338: undefined reference to
`pthread_mutex_lock'
+# /usr/lib/libgcrypt.a(libgcrypt_la-ath.o): In function
`_gcry_ath_mutex_unlock':
+# /usr/src/libgcrypt-1.6.3/src/ath.c:385: undefined reference to
`pthread_mutex_unlock'
+# collect2: error: ld returned 1 exit status
+# Makefile:625: recipe for target 'cryptsetup.static' failed
+# Having this essential tool build is so important that a hotfix is
justified.
+export LIBS="$LIBS -lpthread" &&
default_build
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index a32877e..ccbc819 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,8 @@
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: Ensure that libpthread is linked in. This is a dirty hotfix,
+ as I do not know yet what circumstance really triggers this. A
suspect
+ is as-needed.
+
2015-02-09 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 1.6.6, from kernel.org now
Hash is out of autosigned upstream file. Not using the upstream
diff --git a/database/virtuoso/DEPENDS b/database/virtuoso/DEPENDS
index 75d6a00..6c11765 100755
--- a/database/virtuoso/DEPENDS
+++ b/database/virtuoso/DEPENDS
@@ -10,7 +10,12 @@ optional_depends php '--enable-php5'
'--disable-php5' 'PHP
optional_depends imagemagick '--enable-imagemagick' '--disable-imagemagick'
'ImageMagick support' &&
optional_depends python '--enable-python' '--disable-python'
'Python support' &&
optional_depends RUBY '--enable-ruby' '--disable-ruby'
'Ruby support' &&
-optional_depends libiodbc '--with-iodbc=/usr' '--without-iodbc'
'IOdbc connector' &&
+if is_depends_enabled $SPELL python; then
+ message "${MESSAGE_COLOR}Enforcing libiodbc dependency due to python
dependency.${DEFAULT_COLOR}" &&
+ depends libiodbc
+else
+ optional_depends libiodbc '--with-iodbc=/usr' '--without-iodbc'
'IOdbc connector'
+fi &&
optional_depends zlib '--without-internal-zlib'
'--with-internal-zlib' 'System zlib' &&
optional_depends JDK "--with-jdk4=$INSTALL_ROOT/usr/lib/j2sdk"
'--without-jdk4' 'Java support' &&
optional_depends readline '--with-readline' '--without-readline'
'line editing' &&
diff --git a/database/virtuoso/HISTORY b/database/virtuoso/HISTORY
index 82fbb91..e708ba4 100644
--- a/database/virtuoso/HISTORY
+++ b/database/virtuoso/HISTORY
@@ -1,3 +1,6 @@
+2015-03-18 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: enforce libiodbc if python
+
2015-01-06 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: SSL and libxml2 are hard optional

diff --git a/kde4/kdepimlibs4/DEPENDS b/kde4/kdepimlibs4/DEPENDS
index 6e5f263..a9f83bc 100755
--- a/kde4/kdepimlibs4/DEPENDS
+++ b/kde4/kdepimlibs4/DEPENDS
@@ -8,5 +8,6 @@ depends shared-mime-info &&
depends shared-desktop-ontologies &&
depends soprano &&
depends libxslt &&
-
+depends nepomuk-core &&
+depends qjson &&
optional_depends openldap '' '' 'for LDAP functionality'
diff --git a/kde4/kdepimlibs4/HISTORY b/kde4/kdepimlibs4/HISTORY
index 56cd73c..92ffc9c 100644
--- a/kde4/kdepimlibs4/HISTORY
+++ b/kde4/kdepimlibs4/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: Yay, more dependencies (nepomuk-core, qjson)!
+
2013-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.10.5

diff --git a/perl-cpan/term-readline-gnu/DETAILS
b/perl-cpan/term-readline-gnu/DETAILS
index 4207b85e..5a55ff9 100755
--- a/perl-cpan/term-readline-gnu/DETAILS
+++ b/perl-cpan/term-readline-gnu/DETAILS
@@ -1,6 +1,6 @@
SPELL=term-readline-gnu
- VERSION=1.19
-
SOURCE_HASH=sha512:1cee742616d4aad21aed3b20aac46dfdf3adf77e18a30269f84074cf1394381dac1dc620347e99ee7430345597806cac4561e394a6a1ce83e89ec70cf7c99ac8
+ VERSION=1.26
+
SOURCE_HASH=sha512:80fe97f857b585d96b3a888d0a49d777a5b9865cc2101e43dd5916d09343d0964710c49d94b4533cce8a4a2b0770ebc4ce3c2e36fd0624b7d9ccf2318240dfed
SOURCE=Term-ReadLine-Gnu-$VERSION.tar.gz
# Check that on next update again!
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Term-ReadLine-Gnu-$VERSION
diff --git a/perl-cpan/term-readline-gnu/HISTORY
b/perl-cpan/term-readline-gnu/HISTORY
index dc70116..04e8ebb 100644
--- a/perl-cpan/term-readline-gnu/HISTORY
+++ b/perl-cpan/term-readline-gnu/HISTORY
@@ -1,3 +1,6 @@
+2015-02-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.26
+
2009-06-10 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.19

diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 8e356ac..5210a48 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -5,6 +5,11 @@ fi &&
if [ "$DBUS_SELINUX" == "y" ]; then
OPTS="--enable-selinux $OPTS"
fi &&
+# Glib2 is used for regression tests and can cause unnecessary build failure
+# when we're in a chain where libffi just has been updated and glib2 not yet.
+# Other solution would be to unnecessarily depend on glib2, or even
+# dbus-glib, which just smells too circular.
+OPTS="--without-dbus-glib --disable-modular-tests $OPTS" &&

create_account messagebus &&
default_build &&
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 84184fc..543f9d0 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2015-03-19 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: avoid picking up of glib2 for tests
+
2015-02-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.16, SECURITY_PATCH=15




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (18abefec0e2d1f8b192ce0fb55b1f53f6d3bdf01), Thomas Orgis, 03/21/2015

Archive powered by MHonArc 2.6.24.

Top of Page