sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (769d414a6541ef307e90c4ffc6b8a6120803aea8)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (769d414a6541ef307e90c4ffc6b8a6120803aea8)
- Date: Mon, 13 Aug 2012 20:22:26 -0500
GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:
ChangeLog | 5
dev/null |binary
graphics/geeqie/DETAILS | 4
graphics/geeqie/HISTORY | 3
kde4-support/phonon-backend-gstreamer/DETAILS | 4
kde4-support/phonon-backend-gstreamer/HISTORY | 3
kde4-support/phonon-backend-vlc/DETAILS | 4
kde4-support/phonon-backend-vlc/HISTORY | 3
lib/libyaml/DETAILS | 14 -
lib/libyaml/HISTORY | 3
libs/libfm/DETAILS | 6
libs/libfm/HISTORY | 3
libs/libyaml/DETAILS | 14 +
libs/libyaml/HISTORY | 3
net/tor/DETAILS | 9
net/tor/HISTORY | 4
ruby-raa/passenger/BUILD | 5
ruby-raa/passenger/DETAILS | 8
ruby-raa/passenger/HISTORY | 5
ruby-raa/passenger/INSTALL | 2
ruby-raa/passenger/PREPARE | 1
ruby-raa/ruby-1.9/DEPENDS | 1
ruby-raa/ruby-1.9/HISTORY | 3
shell-term-fm/pcmanfm/DETAILS | 6
shell-term-fm/pcmanfm/HISTORY | 3
utils/schroot/BUILD | 2
utils/schroot/DEPENDS | 17 +
utils/schroot/DETAILS | 7
utils/schroot/HISTORY | 7
utils/schroot/PRE_BUILD | 7
utils/schroot/schroot-1.4.1-boost-validation_error.patch | 147
---------------
utils/schroot/schroot_1.4.1.orig.tar.gz.sign | 0
32 files changed, 113 insertions(+), 190 deletions(-)
New commits:
commit 1a3cc5fdd9f15a3e0204edc04bfb577cc05d0259
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
geeqie 1.1
commit d195a8badfa47c980ae25a174ca5ee1ff0404c55
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
phonon-backend-vlc 0.6.0
commit 01b6937dea9338f3886cc5dd60687f726f3cfa84
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
phonon-backend-gstreamer 4.6.2
commit 137467e5e4bb31c9cefa8d2588d7ea6cef515f26
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tor: fixed typo in 2nd source_url
commit a83bcb64179119184f4e058e8452f85e7908202f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
tor: => 0.2.2.38 (security)
commit 6fd0bd46131a2f15e1449bee6ccbdbaab166db24
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pcmanfm 1.0
commit 7222381cdabeec6ad7428194f1c94de1bad56bd7
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
libfm 1.0
commit 46d251ded1fd84be8f3aeabd231e0c861b30521b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
schroot: => 1.6.3
commit 8d24a7a239f905e48e105dc0a8c391c22d64130d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
passenger: => 3.0.15
commit f86eef0f42740e9e4bd3efc67cfc0e9321c9a038
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ruby-1.9: added optional depends on libyaml
commit 32438ae3cc661be8b175a1f6e70df5da381a83cc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libyaml: moved to libs section; new spell, YAML parser and emitter
written in C
diff --git a/ChangeLog b/ChangeLog
index e6fd5c2..4cca6c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * lib/libyaml: moved to libs section; new spell, YAML parser and
emitter
+ written in C
+ * lib: dropped fake section
+
2012-08-12 Ladislav Hagara <hgr AT vabo.cz>
* e-17/evas_generic_loaders: new spell, generic loaders for evas
* libs/glm: new spell, openGL Mathematics library
diff --git a/graphics/geeqie/DETAILS b/graphics/geeqie/DETAILS
index 7c32672..fc3bdee 100755
--- a/graphics/geeqie/DETAILS
+++ b/graphics/geeqie/DETAILS
@@ -11,10 +11,10 @@ if [[ "${GEEQIE_SVN}" == "y" ]] ; then
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/geeqie-svn
FORCE_DOWNLOAD=on
else
- VERSION=1.0
+ VERSION=1.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:34ad22468e1faaad8842df8c172e305149415812a9421edc590bf1717ab8ce787e55152f9348d39b69e2c5642cba5abd4e574c0b46d06bc741994bcecaa8a18a
+
SOURCE_HASH=sha512:3949b2717c70adb4e6b2c6db002042bcd1c3e9a5345991d3cba41de1765709ccf70fadfcde9dd221b1da03ef14512c746ab424cbc0d09617c52dbf445ee0243d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
WEB_SITE="http://geeqie.sourceforge.net/";
diff --git a/graphics/geeqie/HISTORY b/graphics/geeqie/HISTORY
index 7ce1ea1..cd2b9d6 100644
--- a/graphics/geeqie/HISTORY
+++ b/graphics/geeqie/HISTORY
@@ -1,3 +1,6 @@
+2012-08-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1
+
2010-02-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0
diff --git a/kde4-support/phonon-backend-gstreamer/DETAILS
b/kde4-support/phonon-backend-gstreamer/DETAILS
index ac6cf03..7e7ce62 100755
--- a/kde4-support/phonon-backend-gstreamer/DETAILS
+++ b/kde4-support/phonon-backend-gstreamer/DETAILS
@@ -1,6 +1,6 @@
SPELL=phonon-backend-gstreamer
- VERSION=4.6.1
-
SOURCE_HASH=sha512:c67ac30601f23d6752c1b25c4285ef7db37cc2c77ef503309dd51a405662d9b6afb8ea6d55542b30b47d4fb9b719c65555b2128cdcd9bb5a9ebc4dba1142a9f7
+ VERSION=4.6.2
+
SOURCE_HASH=sha512:55701ff2a8a2bb137e2ffe42b8b95695fe96de34fd2e40438a81487619568bc23963f4cdbe2a6341cffbfdd1eeef86cd1fbb053bc9336cf176b44d250b74b071
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY
b/kde4-support/phonon-backend-gstreamer/HISTORY
index d5cdc32..1dd7e9d 100644
--- a/kde4-support/phonon-backend-gstreamer/HISTORY
+++ b/kde4-support/phonon-backend-gstreamer/HISTORY
@@ -1,3 +1,6 @@
+2012-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.6.2
+
2012-07-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.6.1
diff --git a/kde4-support/phonon-backend-vlc/DETAILS
b/kde4-support/phonon-backend-vlc/DETAILS
index 4a96e61..275acb7 100755
--- a/kde4-support/phonon-backend-vlc/DETAILS
+++ b/kde4-support/phonon-backend-vlc/DETAILS
@@ -1,6 +1,6 @@
SPELL=phonon-backend-vlc
- VERSION=0.5.0
-
SOURCE_HASH=sha512:5b324dea3c981a7244313855c2aec762dd18b31e54793ed4f629dbf4173742cba8b73ddb3085fcc83f9377d805d3ef6f1632cc9324d973facb572f642420482a
+ VERSION=0.6.0
+
SOURCE_HASH=sha512:1093a6dd963f37a04c85643001f35026de36280e7ddab61efbc6f94e9ded3efc1f3345ed77864a8308de60d26763a6488d17237519ebca4ec74acfb7a73ae1dc
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$KDE_URL/stable/phonon/$SPELL/$VERSION/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/kde4-support/phonon-backend-vlc/HISTORY
b/kde4-support/phonon-backend-vlc/HISTORY
index 78b52d3..8dea9c1 100644
--- a/kde4-support/phonon-backend-vlc/HISTORY
+++ b/kde4-support/phonon-backend-vlc/HISTORY
@@ -1,3 +1,6 @@
+2012-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.0
+
2012-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.5.0
diff --git a/lib/libyaml/DETAILS b/lib/libyaml/DETAILS
deleted file mode 100755
index 0c91b31..0000000
--- a/lib/libyaml/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
- SPELL=libyaml
- VERSION=0.1.4
- SOURCE=yaml-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/yaml-$VERSION
- SOURCE_URL[0]=http://pyyaml.org/download/libyaml/$SOURCE
-
SOURCE_HASH=sha512:5864412b462f30e36550a1dcf52f66da9035aa17ee367bd41d0ba74d6809e281ea00c0bb78f9c2c7e08d4689f8ff6220d684dbe8dcd83cc172282c58d695d784
- WEB_SITE=http://pyyaml.org/wiki/LibYAML
- ENTERED=20120417
- LICENSE[0]=MIT
- KEYWORDS="lib"
- SHORT="YAML parser and emitter written in C"
-cat << EOF
-yaml parser and emitter written in C
-EOF
diff --git a/lib/libyaml/HISTORY b/lib/libyaml/HISTORY
deleted file mode 100644
index fc80446..0000000
--- a/lib/libyaml/HISTORY
+++ /dev/null
@@ -1,3 +0,0 @@
-2012-04-17 David Kowis<dkowis AT shlrm.org>
- * DETAILS,HISTORY: created libyaml spell
-
diff --git a/libs/libfm/DETAILS b/libs/libfm/DETAILS
index abd0f52..8f3f29e 100755
--- a/libs/libfm/DETAILS
+++ b/libs/libfm/DETAILS
@@ -1,10 +1,10 @@
SPELL=libfm
- VERSION=0.1.17
+ VERSION=1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/project/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/${SPELL}%20%28required%20by%20PCManFM%29/${SOURCE}
-
SOURCE_HASH=sha512:83d62e78c68f5a212dc464774f4ac9a965f58741b9cc31bf6599c7304e0fde668edd99e33a2f9d19d2c342483d92ed36031c388c92c858c55217e47b5c8ba044
+
SOURCE_HASH=sha512:bbd0d0967dfa7eef0e5860514c1565cfa8172eed4a6be288a5887a274474898a15c3fcc5ebce24062b2990af3113ab33fc2b4740a34465cb3d74323cf7d282c6
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://pcmanfm.sourceforge.net";
+ WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
ENTERED=20101126
SHORT="core functionality for the pcmanfm file manager"
diff --git a/libs/libfm/HISTORY b/libs/libfm/HISTORY
index 7bcb34a..914c5b7 100644
--- a/libs/libfm/HISTORY
+++ b/libs/libfm/HISTORY
@@ -1,3 +1,6 @@
+2012-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0, WEB_SITE updated
+
2011-10-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: made dependency on gtk-doc optional
* PRE_BUILD: removed
diff --git a/libs/libyaml/DETAILS b/libs/libyaml/DETAILS
new file mode 100755
index 0000000..0c91b31
--- /dev/null
+++ b/libs/libyaml/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=libyaml
+ VERSION=0.1.4
+ SOURCE=yaml-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/yaml-$VERSION
+ SOURCE_URL[0]=http://pyyaml.org/download/libyaml/$SOURCE
+
SOURCE_HASH=sha512:5864412b462f30e36550a1dcf52f66da9035aa17ee367bd41d0ba74d6809e281ea00c0bb78f9c2c7e08d4689f8ff6220d684dbe8dcd83cc172282c58d695d784
+ WEB_SITE=http://pyyaml.org/wiki/LibYAML
+ ENTERED=20120417
+ LICENSE[0]=MIT
+ KEYWORDS="lib"
+ SHORT="YAML parser and emitter written in C"
+cat << EOF
+yaml parser and emitter written in C
+EOF
diff --git a/libs/libyaml/HISTORY b/libs/libyaml/HISTORY
new file mode 100644
index 0000000..fc80446
--- /dev/null
+++ b/libs/libyaml/HISTORY
@@ -0,0 +1,3 @@
+2012-04-17 David Kowis<dkowis AT shlrm.org>
+ * DETAILS,HISTORY: created libyaml spell
+
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 14a8828..ec1833c 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,14 +4,17 @@ if [ "$TOR_DEVEL" == "y" ]; then
VERSION=0.2.2.23-alpha
SECURITY_PATCH=4
else
- VERSION=0.2.2.37
- SECURITY_PATCH=7
+ VERSION=0.2.2.38
+ SECURITY_PATCH=8
fi
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
SOURCE2=$SOURCE.asc
+# SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
+ SOURCE_URL[0]=http://download.sourcemage.org/distro/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_URL[1]=http://sourcemage.ru/mirror/$SOURCE
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
SOURCE_GPG=tor.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index ed207e8..5baeb2a 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,7 @@
+2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.2.38; SECURITY_PATCH++; switched to
our
+ URL until upstream fixes its own SSL-connection
+
2012-06-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.2.37
diff --git a/ruby-raa/passenger/BUILD b/ruby-raa/passenger/BUILD
index 1d1dc92..0350e13 100755
--- a/ruby-raa/passenger/BUILD
+++ b/ruby-raa/passenger/BUILD
@@ -6,6 +6,9 @@ if is_depends_enabled $SPELL nginx; then
rake nginx
fi &&
-rm -rf old.binaries old.libraries &&
+if [[ $PASSENGER_BRANCH == 3 ]]; then
+ rm -rf ext/libev/.libs
+fi &&
+# post-build cleanup
find "$SOURCE_DIRECTORY" -name '*.[a|o]' -delete
diff --git a/ruby-raa/passenger/DETAILS b/ruby-raa/passenger/DETAILS
index d6f84e8..78b525a 100755
--- a/ruby-raa/passenger/DETAILS
+++ b/ruby-raa/passenger/DETAILS
@@ -1,11 +1,17 @@
SPELL=passenger
+if [[ $PASSENGER_BRANCH == 2 ]]; then
VERSION=2.2.15
RAAID=71376
+
SOURCE_HASH=sha512:a82f7d39d0a1053fd4b63c7d1464db54d229d0b42b326afc11dddef680938f522ba20b3bbd39ebb0241407b669dcdb7478c58420ca2f2225a9b2daa03ce8c17e
+else
+ VERSION=3.0.15
+ RAAID=76337
+
SOURCE_HASH=sha512:44fd8e7a67386143fe3ac6394c81c347cc479fa7519dc4b741adf35f7b7a3c45215d342cce3fbb9b156b4f137ef4e1aa5158d2d6435c7103e27d234c4a6bb4fa
+fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://rubyforge.org/frs/download.php/$RAAID/$SOURCE
WEB_SITE=http://www.modrails.com/
-
SOURCE_HASH=sha512:a82f7d39d0a1053fd4b63c7d1464db54d229d0b42b326afc11dddef680938f522ba20b3bbd39ebb0241407b669dcdb7478c58420ca2f2225a9b2daa03ce8c17e
LICENSE[0]=GPL
ENTERED=20080628
KEYWORDS="ruby rails apache nginx"
diff --git a/ruby-raa/passenger/HISTORY b/ruby-raa/passenger/HISTORY
index b97296e..4b18292 100644
--- a/ruby-raa/passenger/HISTORY
+++ b/ruby-raa/passenger/HISTORY
@@ -1,3 +1,8 @@
+2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added branch 3; updated spell to 3.0.15
+ * PREPARE: added, for branch selector; made 2nd branch default
+ * BUILD, INSTALL: corrected post-build cleanup procedure for all
branches
+
2010-09-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.15
diff --git a/ruby-raa/passenger/INSTALL b/ruby-raa/passenger/INSTALL
index c25773e..b214119 100755
--- a/ruby-raa/passenger/INSTALL
+++ b/ruby-raa/passenger/INSTALL
@@ -1,3 +1,5 @@
+rm -rf old.binaries old.libraries &&
+
local INSTALL_DIR="$INSTALL_ROOT/usr/lib/passenger" &&
mkdir -vp "$INSTALL_DIR" &&
diff --git a/ruby-raa/passenger/PREPARE b/ruby-raa/passenger/PREPARE
new file mode 100755
index 0000000..dadcaf9
--- /dev/null
+++ b/ruby-raa/passenger/PREPARE
@@ -0,0 +1 @@
+config_query_list PASSENGER_BRANCH "which branch?" 2 3
diff --git a/ruby-raa/ruby-1.9/DEPENDS b/ruby-raa/ruby-1.9/DEPENDS
index f42ce5e..8c5f8c3 100755
--- a/ruby-raa/ruby-1.9/DEPENDS
+++ b/ruby-raa/ruby-1.9/DEPENDS
@@ -2,4 +2,5 @@ optional_depends doxygen "" "--disable-install-doc" "install
documentation" &&
optional_depends db "" "" "for db support" &&
optional_depends gdbm "" "" "for gdbm support" &&
optional_depends tk "" "" "for tk support" &&
+optional_depends libyaml "" "" "for YAML output (recommended)" &&
optional_depends openssl "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 18a9f26..9b1b236 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2012-08-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added optional depends on libyaml
+
2012-04-20 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.9.3-p194, SECURITY_PATCH=5
diff --git a/shell-term-fm/pcmanfm/DETAILS b/shell-term-fm/pcmanfm/DETAILS
index a336ff0..5484c6f 100755
--- a/shell-term-fm/pcmanfm/DETAILS
+++ b/shell-term-fm/pcmanfm/DETAILS
@@ -1,10 +1,10 @@
SPELL=pcmanfm
- VERSION=0.9.10
+ VERSION=1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:25ee98785ebb490d2cafb3cfa4e52f1620c8ca8392e492c92e24e6fcf0baf301b456f1fbb3ec42ec460f2453bd5b29c16ce2d42d8a410573462255d581d6e694
+
SOURCE_HASH=sha512:6b95b98d7c1be162e520d8dd342143be1cfb9190924bcc3c72911936b882fb086b7243fda618fe529240a14c9808b3352262889e252ca45c0be2248853eccb5f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE=http://pcmanfm.sourceforge.net/
+ WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
ENTERED=20070108
SHORT="A fast and lightweight file manager developed with GTK+ 2."
diff --git a/shell-term-fm/pcmanfm/HISTORY b/shell-term-fm/pcmanfm/HISTORY
index effb39a..a0b2617 100644
--- a/shell-term-fm/pcmanfm/HISTORY
+++ b/shell-term-fm/pcmanfm/HISTORY
@@ -1,3 +1,6 @@
+2012-08-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0, WEB_SITE updated
+
2011-10-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9.10
diff --git a/utils/schroot/BUILD b/utils/schroot/BUILD
new file mode 100755
index 0000000..61d03a7
--- /dev/null
+++ b/utils/schroot/BUILD
@@ -0,0 +1,2 @@
+OPTS+='--enable-shared ' &&
+default_build
diff --git a/utils/schroot/DEPENDS b/utils/schroot/DEPENDS
index 698a86e..2bd75cb 100755
--- a/utils/schroot/DEPENDS
+++ b/utils/schroot/DEPENDS
@@ -1,7 +1,18 @@
depends -sub "PROGRAM_OPTIONS REGEX" boost &&
-depends -sub CXX gcc &&
-depends lockdev &&
-depends linux-pam &&
+depends -sub CXX gcc &&
+depends lockdev &&
+
+optional_depends doxygen '--enable-doxygen' \
+ '--disable-doxygen' \
+ 'build documentation' &&
+optional_depends e2fsprogs \
+ '--enable-uuid' \
+ '--disable-uuid' \
+ 'support for UUIDs' &&
+optional_depends linux-pam \
+ '--enable-pam' \
+ '--disable-pam' \
+ 'PAM support' &&
optional_depends 'gettext' \
'--enable-nls' \
diff --git a/utils/schroot/DETAILS b/utils/schroot/DETAILS
index e734bcc..76118c4 100755
--- a/utils/schroot/DETAILS
+++ b/utils/schroot/DETAILS
@@ -1,9 +1,10 @@
SPELL=schroot
- VERSION=1.4.1
- SOURCE=${SPELL}_$VERSION.orig.tar.gz
+ VERSION=1.6.3
+
SOURCE_HASH=sha512:e435715091eed17e1f073218b2cc2355ad529bb702b9f8cfeb58ed3be38b78fa61280713801ce29e5b21c93939f5898e6f6e4f493d3f7d2550a873289a6c22be
+# SOURCE_GPG=gurus.gpg:$SOURCE.sign:WORKS_FOR_ME
+ SOURCE=${SPELL}_$VERSION.orig.tar.xz
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/s/schroot/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_GPG=gurus.gpg:$SOURCE.sign:WORKS_FOR_ME
LICENSE[0]=GPL
WEB_SITE=http://alioth.debian.org/projects/buildd-tools/
ENTERED=20080412
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index 0ddccc6..c505ebc 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,10 @@
+2012-08-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.3
+ * DEPENDS: linux-pam is optional, add e2fsprogs, doxygen
+ * PRE_BUILD: disable patch
+ * schroot-1.4.1-boost-validation_error.patch: deleted
+ * BUILD: added, for shared libraries
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/utils/schroot/PRE_BUILD b/utils/schroot/PRE_BUILD
index aa926a3..81696da 100755
--- a/utils/schroot/PRE_BUILD
+++ b/utils/schroot/PRE_BUILD
@@ -1,9 +1,10 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if is_depends_enabled $SPELL linux-pam; then
PAM_SCHROOT="$SOURCE_DIRECTORY/etc/pam/schroot" &&
echo "auth required pam_unix.so" >> $PAM_SCHROOT &&
echo "account required pam_unix.so" >> $PAM_SCHROOT &&
-echo "session required pam_unix.so" >> $PAM_SCHROOT &&
-sedit "s:/usr/bin/stat:/bin/stat:" $SOURCE_DIRECTORY/etc/setup.d/20copyfiles
&&
-patch -p1 < $SCRIPT_DIRECTORY/schroot-1.4.1-boost-validation_error.patch
+echo "session required pam_unix.so" >> $PAM_SCHROOT
+fi &&
+sedit "s:/usr/bin/stat:/bin/stat:" $SOURCE_DIRECTORY/etc/setup.d/20copyfiles
diff --git a/utils/schroot/schroot-1.4.1-boost-validation_error.patch
b/utils/schroot/schroot-1.4.1-boost-validation_error.patch
deleted file mode 100644
index 514df7c..0000000
--- a/utils/schroot/schroot-1.4.1-boost-validation_error.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -Naur schroot-1.4.1.orig//bin/csbuild/csbuild-options.cc
schroot-1.4.1//bin/csbuild/csbuild-options.cc
---- schroot-1.4.1.orig//bin/csbuild/csbuild-options.cc 2010-02-21
01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/csbuild/csbuild-options.cc 2010-03-06
11:22:25.393248289 +0300
-@@ -220,9 +220,9 @@
- if (vm.count("binNMU") && vm.count("make-binNMU"))
- this->bin_nmu = true;
- else if (vm.count("binNMU"))
-- throw opt::validation_error(_("--makebinNMU missing"));
-+ throw opt::error(_("--makebinNMU missing"));
- else if (vm.count("make-binNMU"))
-- throw opt::validation_error(_("--binNMU missing"));
-+ throw opt::error(_("--binNMU missing"));
-
- if (!deb_build_options_string.empty())
- {
-diff -Naur schroot-1.4.1.orig//bin/dchroot-dsa/dchroot-dsa-options.cc
schroot-1.4.1//bin/dchroot-dsa/dchroot-dsa-options.cc
---- schroot-1.4.1.orig//bin/dchroot-dsa/dchroot-dsa-options.cc 2010-02-21
01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/dchroot-dsa/dchroot-dsa-options.cc 2010-03-06
11:23:37.476575149 +0300
-@@ -90,11 +90,11 @@
-
- // dchroot-dsa only allows one command.
- if (this->command.size() > 1)
-- throw opt::validation_error(_("Only one command may be specified"));
-+ throw opt::error(_("Only one command may be specified"));
-
- if (!this->command.empty() &&
- !sbuild::is_absname(this->command[0]))
-- throw opt::validation_error(_("Command must have an absolute path"));
-+ throw opt::error(_("Command must have an absolute path"));
-
- if (this->chroots.empty() && !all_used() &&
- (this->action != ACTION_CONFIG &&
-@@ -103,5 +103,5 @@
- this->action != ACTION_LOCATION &&
- this->action != ACTION_HELP &&
- this->action != ACTION_VERSION))
-- throw opt::validation_error(_("No chroot specified"));
-+ throw opt::error(_("No chroot specified"));
- }
-diff -Naur schroot-1.4.1.orig//bin/schroot/schroot-options-base.cc
schroot-1.4.1//bin/schroot/schroot-options-base.cc
---- schroot-1.4.1.orig//bin/schroot/schroot-options-base.cc 2010-02-21
01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/schroot/schroot-options-base.cc 2010-03-06
11:23:02.639911148 +0300
-@@ -200,7 +200,7 @@
- this->load_chroots = true;
- this->load_sessions = false;
- if (this->chroots.size() != 1 || all_used())
-- throw opt::validation_error
-+ throw opt::error
- (_("Exactly one chroot must be specified when beginning a
session"));
-
- this->all = this->all_chroots = this->all_sessions = false;
-@@ -213,7 +213,7 @@
- this->load_chroots = this->load_sessions = true;
-
- if (!this->session_name.empty())
-- throw opt::validation_error
-+ throw opt::error
- (_("--session-name is not permitted for the specified action; did
you mean to use --chroot?"));
- }
- else if (this->action == ACTION_HELP ||
-@@ -234,7 +234,7 @@
- if (this->all_sessions)
- this->load_sessions = true;
- if (!this->chroots.empty())
-- throw opt::validation_error(_("--chroot may not be used with
--list"));
-+ throw opt::error(_("--chroot may not be used with --list"));
- }
- else if (this->action == ACTION_INFO ||
- this->action == ACTION_LOCATION ||
-@@ -259,6 +259,6 @@
- // Something went wrong
- this->load_chroots = this->load_sessions = false;
- this->all = this->all_chroots = this->all_sessions = false;
-- throw opt::validation_error(_("Unknown action specified"));
-+ throw opt::error(_("Unknown action specified"));
- }
- }
-diff -Naur
schroot-1.4.1.orig//bin/schroot-base/schroot-base-option-action.cc
schroot-1.4.1//bin/schroot-base/schroot-base-option-action.cc
---- schroot-1.4.1.orig//bin/schroot-base/schroot-base-option-action.cc
2010-02-21 01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/schroot-base/schroot-base-option-action.cc
2010-03-06 11:24:09.682901202 +0300
-@@ -82,7 +82,7 @@
- if (this->current_action == "")
- this->current_action = action;
- else
-- throw opt::validation_error(_("Only one action may be specified"));
-+ throw opt::error(_("Only one action may be specified"));
- }
- else
- throw std::logic_error((format(_("%1%: invalid action")) %
action).str());
-diff -Naur schroot-1.4.1.orig//bin/schroot-base/schroot-base-options.cc
schroot-1.4.1//bin/schroot-base/schroot-base-options.cc
---- schroot-1.4.1.orig//bin/schroot-base/schroot-base-options.cc
2010-02-21 01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/schroot-base/schroot-base-options.cc 2010-03-06
11:24:04.516571747 +0300
-@@ -155,7 +155,7 @@
- else if (this->debug_level == "critical")
- sbuild::debug_log_level = sbuild::DEBUG_CRITICAL;
- else
-- throw opt::validation_error(_("Invalid debug level"));
-+ throw opt::error(_("Invalid debug level"));
- }
- else
- sbuild::debug_log_level = sbuild::DEBUG_NONE;
-diff -Naur
schroot-1.4.1.orig//bin/schroot-listmounts/schroot-listmounts-options.cc
schroot-1.4.1//bin/schroot-listmounts/schroot-listmounts-options.cc
---- schroot-1.4.1.orig//bin/schroot-listmounts/schroot-listmounts-options.cc
2010-02-21 01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/schroot-listmounts/schroot-listmounts-options.cc
2010-03-06 11:22:45.059911238 +0300
-@@ -86,5 +86,5 @@
-
- if (this->action == ACTION_LISTMOUNTS &&
- this->mountpoint.empty())
-- throw opt::validation_error(_("No mount point specified"));
-+ throw opt::error(_("No mount point specified"));
- }
-diff -Naur schroot-1.4.1.orig//bin/schroot-mount/schroot-mount-options.cc
schroot-1.4.1//bin/schroot-mount/schroot-mount-options.cc
---- schroot-1.4.1.orig//bin/schroot-mount/schroot-mount-options.cc
2010-02-21 01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/schroot-mount/schroot-mount-options.cc 2010-03-06
11:23:22.253241091 +0300
-@@ -99,5 +99,5 @@
-
- if (this->action == ACTION_MOUNT &&
- this->mountpoint.empty())
-- throw opt::validation_error(_("No mount point specified"));
-+ throw opt::error(_("No mount point specified"));
- }
-diff -Naur
schroot-1.4.1.orig//bin/schroot-releaselock/schroot-releaselock-options.cc
schroot-1.4.1//bin/schroot-releaselock/schroot-releaselock-options.cc
----
schroot-1.4.1.orig//bin/schroot-releaselock/schroot-releaselock-options.cc
2010-02-21 01:17:31.000000000 +0300
-+++ schroot-1.4.1//bin/schroot-releaselock/schroot-releaselock-options.cc
2010-03-06 11:25:02.019899016 +0300
-@@ -89,5 +89,5 @@
-
- if (this->action == ACTION_RELEASELOCK &&
- this->device.empty())
-- throw opt::validation_error(_("No device specified"));
-+ throw opt::error(_("No device specified"));
- }
-diff -Naur schroot-1.4.1.orig//test/schroot-base-option-action.cc
schroot-1.4.1//test/schroot-base-option-action.cc
---- schroot-1.4.1.orig//test/schroot-base-option-action.cc 2010-02-21
01:17:31.000000000 +0300
-+++ schroot-1.4.1//test/schroot-base-option-action.cc 2010-03-06
11:25:17.070467289 +0300
-@@ -37,10 +37,10 @@
- CPPUNIT_TEST(test_current);
- CPPUNIT_TEST_EXCEPTION(test_current_fail, std::logic_error);
- CPPUNIT_TEST_EXCEPTION(test_current_fail_multipleset,
-- opt::validation_error);
-+ opt::error);
- CPPUNIT_TEST(test_operators);
- CPPUNIT_TEST_EXCEPTION(test_operators_fail_multipleset,
-- opt::validation_error);
-+ opt::error);
- CPPUNIT_TEST_SUITE_END();
-
- protected:
diff --git a/utils/schroot/schroot_1.4.1.orig.tar.gz.sign
b/utils/schroot/schroot_1.4.1.orig.tar.gz.sign
deleted file mode 100644
index 59fcfaf..0000000
Binary files a/utils/schroot/schroot_1.4.1.orig.tar.gz.sign and /dev/null
differ
- [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (769d414a6541ef307e90c4ffc6b8a6120803aea8), Eric Sandall, 08/13/2012
Archive powered by MHonArc 2.6.24.