Skip to Content.
Sympa Menu

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

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 (76ed6a936d6360c6b22e6e9b35c48bf0c9c45af7)
  • Date: Tue, 8 Jan 2013 20:56:05 -0600

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

collab/subversion/CONFIGURE | 3 +-
collab/subversion/DEPENDS | 12 ++++++----
collab/subversion/HISTORY | 4 +++
http/webkitgtk/DEPENDS | 1
http/webkitgtk/HISTORY | 3 ++
libs/neon/HISTORY | 3 ++
libs/neon/PRE_SUB_DEPENDS | 1
libs/neon/REPAIR^all^PRE_SUB_DEPENDS | 1
libs/neon/SUB_DEPENDS | 14 ++++++++++++
ruby-raa/ruby-1.8/HISTORY | 12 +++++++---
ruby-raa/ruby-1.8/PRE_BUILD | 4 +++
ruby-raa/ruby-1.8/stdout-rouge-fix.patch | 36
+++++++++++++++++++++++++++++++
12 files changed, 86 insertions(+), 8 deletions(-)

New commits:
commit 76ed6a936d6360c6b22e6e9b35c48bf0c9c45af7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

webkitgtk: Depends on RUBY (tested ruby-1.9 and ruby-1.8)

checking for perl... /usr/bin/perl
checking for python... configure: error: You need 'ruby' to compile
WebKit
/usr/bin/python
checking for ruby... no

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

ruby-1.8: Cleanup formatting

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

ruby-1.8: Fix glibc 2.14+ compilation
From http://bugs.ruby-lang.org/issues/5108

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

neon: Reset color to default at the end of message

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

subversion: Fix subversion SSL support

Subversion itself does not support SSL, but relies
on external software (e.g. neon/Serf)

From subversion's ./configure:
--with-ssl This option does NOT affect the Subversion build
process in any way. It enables OpenSSL
support in
the Neon HTTP client library. If and only if
you are
building Neon as an integrated part of the
Subversion build process, rather than linking
to an
already installed version of Neon, you
probably want
to pass this option so that Neon (and so
indirectly,
Subversion) will be capable of https://
access via
that library. (Note that Subversion may also
or
alternatively be configured to use the Serf
library
for http:// and https:// access; see the

Plus my svn client couldn't checkout https:// repositories.

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

neon: Allow requiring SSL support

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

webkitgtk: Depends on ruby

configure: error: You need 'ruby' to compile WebKit

diff --git a/collab/subversion/CONFIGURE b/collab/subversion/CONFIGURE
index 3969da5..af6fcf8 100755
--- a/collab/subversion/CONFIGURE
+++ b/collab/subversion/CONFIGURE
@@ -6,4 +6,5 @@ function spell_ok_yesno {
config_query SVN_PERL 'Install Subversion bindings for Perl?'
$(spell_ok_yesno perl) &&
config_query SVN_PYTHON 'Install Subversion bindings for Python?'
$(spell_ok_yesno python) &&
config_query SVN_RUBY 'Install Subversion bindings for Ruby?'
$(spell_ok_yesno ruby) &&
-config_query SVN_JAVA 'Install Subversion bindings for JAVA?'
$(spell_ok_yesno JAVA)
+config_query SVN_JAVA 'Install Subversion bindings for JAVA?'
$(spell_ok_yesno JAVA) &&
+config_query SVN_SSL 'Enable SSL support?' n
diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 07e13bc..f3d82c6 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -25,13 +25,17 @@ then
fi &&

optional_depends gettext '--enable-nls' '--disable-nls' 'for language
translations' &&
-optional_depends openssl '--with-ssl' '--without-ssl' 'for SSL/TLS support'
&&
optional_depends LIBSASL '--with-sasl' '--without-sasl' 'for Cyrus SASL
authentication' &&

message ""WARNING, disabling neon is not recommended and may break
downloading some svn spells."" &&
-optional_depends -sub DAV neon "--with-neon=${INSTALL_ROOT}/usr" \
- "--without-neon" \
- "for Subversion client to support DAV" &&
+
+if [[ "x${SVN_SSL}" == "xy" ]]; then
+ depends -sub 'DAV SSL' neon "--with-neon=${INSTALL_ROOT}/usr --with-ssl"
+else
+ optional_depends -sub DAV neon "--with-neon=${INSTALL_ROOT}/usr" \
+ "--without-neon" \
+ "for Subversion client to support DAV"
+fi &&

optional_depends db '--with-berkeley-db' '--without-berkeley-db' 'for
Berkeley DB backend' &&
optional_depends APACHE2 '--with-apxs' '--without-apxs' 'to create Apache 2
modules' &&
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 82b3140..e3a7345 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE, DEPENDS: Subversion itself does not support SSL, but
relies
+ on external software (e.g. neon/Serf)
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.8

diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 0778ba8..e36a940 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -13,6 +13,7 @@ depends sqlite &&
depends libsoup &&
depends enchant &&
depends libxt &&
+depends RUBY &&

optional_depends cairo '--enable-svg' \
'--disable-svg' \
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 1d87e7b..44ee84d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on RUBY (tested ruby-1.9 and ruby-1.8)
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFIGURE, DEPENDS: added configuration options for selecting
the acceleration backend and the unicode backend
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index c248e9d..f97f29b 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow requiring SSL support
+
2012-10-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: added, to apply the patch
diff --git a/libs/neon/PRE_SUB_DEPENDS b/libs/neon/PRE_SUB_DEPENDS
index 7723200..0a4cde4 100755
--- a/libs/neon/PRE_SUB_DEPENDS
+++ b/libs/neon/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
DAV) is_depends_enabled $SPELL expat || is_depends_enabled $SPELL libxml2;;
+ SSL) is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL gnutls
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
b/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
index 7723200..0a4cde4 100755
--- a/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
DAV) is_depends_enabled $SPELL expat || is_depends_enabled $SPELL libxml2;;
+ SSL) is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL gnutls
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/neon/SUB_DEPENDS b/libs/neon/SUB_DEPENDS
index dea3ce6..f03e46b 100755
--- a/libs/neon/SUB_DEPENDS
+++ b/libs/neon/SUB_DEPENDS
@@ -8,6 +8,20 @@ case $THIS_SUB_DEPENDS in
libxml2 &&

depends $NEON_XML "--with-${NEON_XML}";;
+ SSL) message "${MESSAGE_COLOR}SSL support requested, forcing
it${DEFAULT_COLOR}" &&
+ # Clean out old NEON_SSL settings if "none"
+ [[ "x${NEON_SSL}" == "xnone" ]] && NEON_SSL="" &&
+ persistent_remove NEON_SSL || true &&
+
+ # Re-query with only the SSL options
+ config_query_list NEON_SSL "Which SSL backend do you want for SSL
support?" \
+ openssl gnutls &&
+
+ config_query_option NEON_OPTS "Enable SSL library thread-safety using
POSIX threads?" y \
+ "--enable-threadsafe-ssl=posix" \
+ "--disable-threadsafe-ssl" &&
+ depends "${NEON_SSL}" "--with-ssl=${NEON_SSL}"
+ ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index 106030e..059a715 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,8 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply stdout-rouge-fix.patch
+ * stdout-rouge-fix.patch: Fix glibc 2.14+ compilation
+ From http://bugs.ruby-lang.org/issues/5108
+
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.7-p358; SECURITY_PATCH++; updated
mirrorlist
@@ -25,7 +30,7 @@
2010-01-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.1-p376
SECURITY_PATCH++, fixes CVE-2009-4124, fixes bug #15542
-
+
2009-08-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.7-p174; SECURITY_PATCH++

@@ -102,7 +107,7 @@

2006-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: remove -fomit-frame-pointer from CFLAGS as this causes a
- SEGFAULT #12643
+ SEGFAULT #12643

2006-11-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH
@@ -120,7 +125,7 @@
* PRE_BUILD, yaml-bignum-fix.patch: removed

2006-08-15 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed UPDATED (deprecated in favor of
+ * DETAILS: [automated] Removed UPDATED (deprecated in favor of
PATCHLEVEL).

2006-03-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
@@ -176,3 +181,4 @@

2002-10-03 Julian v. Bock <julian AT wongr.net>
* DETAILS: add LICENSE and MD5 fields.
+
diff --git a/ruby-raa/ruby-1.8/PRE_BUILD b/ruby-raa/ruby-1.8/PRE_BUILD
new file mode 100755
index 0000000..91e5271
--- /dev/null
+++ b/ruby-raa/ruby-1.8/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Applying fix for glibc 2.14+...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/lib/mkmf.rb \
+ "${SPELL_DIRECTORY}"/stdout-rouge-fix.patch
diff --git a/ruby-raa/ruby-1.8/stdout-rouge-fix.patch
b/ruby-raa/ruby-1.8/stdout-rouge-fix.patch
new file mode 100644
index 0000000..58c8583
--- /dev/null
+++ b/ruby-raa/ruby-1.8/stdout-rouge-fix.patch
@@ -0,0 +1,36 @@
+# From http://bugs.ruby-lang.org/issues/5108
+diff --git a/lib/mkmf.rb b/lib/mkmf.rb
+index c9e738a..7a8004d 100644
+--- a/lib/mkmf.rb
++++ b/lib/mkmf.rb
+@@ -201,20 +201,26 @@ end
+ module Logging
+ @log = nil
+ @logfile = 'mkmf.log'
+- @orgerr = $stderr.dup
+- @orgout = $stdout.dup
+ @postpone = 0
+ @quiet = $extmk
+
+ def self::open
+ @log ||= File::open(@logfile, 'w')
+ @log.sync = true
++ orgerr = $stderr.dup
++ orgout = $stdout.dup
+ $stderr.reopen(@log)
+ $stdout.reopen(@log)
+ yield
+ ensure
+- $stderr.reopen(@orgerr)
+- $stdout.reopen(@orgout)
++ if orgerr
++ $stderr.reopen(orgerr)
++ orgerr.close
++ end
++ if orgout
++ $stdout.reopen(orgout)
++ orgout.close
++ end
+ end
+
+ def self::message(*s)



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (76ed6a936d6360c6b22e6e9b35c48bf0c9c45af7), Eric Sandall, 01/08/2013

Archive powered by MHonArc 2.6.24.

Top of Page