Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Donald Johnson (a0fa8df3d2152de510d8fe516e6ee594c2efcc29)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Donald Johnson <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Donald Johnson (a0fa8df3d2152de510d8fe516e6ee594c2efcc29)
  • Date: Mon, 3 May 2010 08:44:58 -0500

GIT changes to master grimoire by Donald Johnson <minozake AT codemages.net>:

dev/null |binary
utils/schroot/DETAILS | 8
utils/schroot/HISTORY | 6
utils/schroot/INSTALL | 3
utils/schroot/PRE_BUILD | 11 -
utils/schroot/gcc43.patch | 22 --
utils/schroot/locale.patch | 91 ---------
utils/schroot/schroot-1.1.2.tar.bz2.sig | 0
utils/schroot/schroot-1.4.1-boost-validation_error.patch | 147
+++++++++++++++
utils/schroot/schroot.conf.patch | 19 -
utils/schroot/schroot_1.4.1.orig.tar.gz.sign |binary
11 files changed, 158 insertions(+), 149 deletions(-)

New commits:
commit a0fa8df3d2152de510d8fe516e6ee594c2efcc29
Author: Donald Johnson <minozake AT codemages.net>
Commit: Donald Johnson <minozake AT codemages.net>

schroot: -> 1.4.1

diff --git a/utils/schroot/DETAILS b/utils/schroot/DETAILS
index 8b9b071..e734bcc 100755
--- a/utils/schroot/DETAILS
+++ b/utils/schroot/DETAILS
@@ -1,9 +1,9 @@
SPELL=schroot
- VERSION=1.1.2
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/1972/$SOURCE
+ VERSION=1.4.1
+ SOURCE=${SPELL}_$VERSION.orig.tar.gz
+ 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.sig:WORKS_FOR_ME
+ 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 5b905a9..29f9b3b 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,9 @@
+2010-05-03 Donald Johnson <minozake AT codemages.net>
+ * DETAILS: Update -> 1.4.1
+ * PRE_BUILD: Removed uneeded patching, added others
+ * schroot-1.4.1-boost-validation_error.patch: Patches because of boost
API
+ update. See gentoo bugzilla #307975. Does not conflict with boost <
1.42.00
+
2008-07-03 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Fix pam.d/schroot for the default Linux PAM setup, not
Debian's

diff --git a/utils/schroot/INSTALL b/utils/schroot/INSTALL
deleted file mode 100755
index e4360b4..0000000
--- a/utils/schroot/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-default_install &&
-install_config_file $SOURCE_DIRECTORY/bin/schroot/schroot.conf \
- $INSTALL_ROOT/etc/schroot/schroot.conf
diff --git a/utils/schroot/PRE_BUILD b/utils/schroot/PRE_BUILD
index 730cc31..bf34206 100755
--- a/utils/schroot/PRE_BUILD
+++ b/utils/schroot/PRE_BUILD
@@ -1,13 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
-patch -p0 < $SCRIPT_DIRECTORY/locale.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/schroot.conf.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/schroot-1.4.1-boost-validation_error.patch

-sedit 's:@include:#&:g' $SOURCE_DIRECTORY/bin/schroot/pam/schroot &&
-cat << EOF >> $SOURCE_DIRECTORY/bin/schroot/pam/schroot
-auth sufficient pam_rootok.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-EOF
diff --git a/utils/schroot/gcc43.patch b/utils/schroot/gcc43.patch
deleted file mode 100644
index 6c1aa58..0000000
--- a/utils/schroot/gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur schroot-1.1.2.orig/sbuild/sbuild-dirstream.h
schroot-1.1.2/sbuild/sbuild-dirstream.h
---- schroot-1.1.2.orig/sbuild/sbuild-dirstream.h 2008-04-12
16:36:55.945090331 -0700
-+++ schroot-1.1.2/sbuild/sbuild-dirstream.h 2008-04-12 16:47:17.218315729
-0700
-@@ -25,6 +25,7 @@
- #include <iostream>
- #include <deque>
- #include <string>
-+#include <cstring>
-
- #include <sys/types.h>
- #include <dirent.h>
-diff -Naur schroot-1.1.2.orig/sbuild/sbuild-lock.cc
schroot-1.1.2/sbuild/sbuild-lock.cc
---- schroot-1.1.2.orig/sbuild/sbuild-lock.cc 2008-04-12 16:36:55.945090331
-0700
-+++ schroot-1.1.2/sbuild/sbuild-lock.cc 2008-04-12 16:49:43.798073471
-0700
-@@ -23,6 +23,7 @@
-
- #include <cerrno>
- #include <cstdlib>
-+#include <cstring>
-
- #include <unistd.h>
-
diff --git a/utils/schroot/locale.patch b/utils/schroot/locale.patch
deleted file mode 100644
index fde07a9..0000000
--- a/utils/schroot/locale.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# From
http://lists.alioth.debian.org/pipermail/buildd-tools-devel/2007-May/001625.html
-#
-Index: sbuild/sbuild-basic-keyfile.tcc
-===================================================================
---- sbuild/sbuild-basic-keyfile.tcc (revision 1173)
-+++ sbuild/sbuild-basic-keyfile.tcc (working copy)
-@@ -179,7 +179,15 @@
- key_type const& key,
- std::string&
value) const
- {
-- std::string localename = std::locale("").name();
-+ std::string localename;
-+ try
-+ {
-+ localename = std::locale("").name();
-+ }
-+ catch (std::runtime_error const& e) // Invalid locale
-+ {
-+ localename = std::locale::classic();
-+ }
- std::string::size_type pos;
- bool status = false;
-
-Index: configure.ac
-===================================================================
---- configure.ac (revision 1173)
-+++ configure.ac (working copy)
-@@ -222,20 +222,20 @@
- [AC_MSG_FAILURE([liblockdev (lockdev) is not installed, but is
required by schroot])])
- AC_SUBST([LOCKDEV_LIBS])
-
--AC_MSG_CHECKING([for boost::program_options::variables_map in
-lboost_program_options])
-+AC_MSG_CHECKING([for boost::program_options::variables_map in
-lboost_program_options-st])
- saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_program_options"
-+LDFLAGS="${LDFLAGS} -lboost_program_options-st"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
-
[boost::program_options::variables_map::variables_map dummy()])],
- [AC_MSG_RESULT([yes])
-- BOOST_LIBS="${BOOST_LIBS} -lboost_program_options"],
-+ BOOST_LIBS="${BOOST_LIBS} -lboost_program_options-st"],
- [AC_MSG_RESULT([no])
- AC_MSG_FAILURE([libboost_program_options (Boost C++
Libraries) is not installed, but is required by schroot])])
- LDFLAGS="${saved_ldflags}"
-
--AC_MSG_CHECKING([for boost::program_options::options_description::options()
in -lboost_program_options])
-+AC_MSG_CHECKING([for boost::program_options::options_description::options()
in -lboost_program_options-st])
- saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_program_options"
-+LDFLAGS="${LDFLAGS} -lboost_program_options-st"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
- [boost::program_options::options_description
testgrp("test group");
- bool notused = testgrp.options().empty();
-@@ -250,13 +250,13 @@
- AC_DEFINE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, 1)
- fi
-
--AC_MSG_CHECKING([for boost::regex in -lboost_regex])
-+AC_MSG_CHECKING([for boost::regex in -lboost_regex-st])
- saved_ldflags="${LDFLAGS}"
--LDFLAGS="${LDFLAGS} -lboost_regex"
-+LDFLAGS="${LDFLAGS} -lboost_regex-st"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/regex.hpp>],
- [boost::regex("^foo[bar]$")])],
- [AC_MSG_RESULT([yes])
-- BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
-+ BOOST_LIBS="${BOOST_LIBS} -lboost_regex-st"],
- [AC_MSG_RESULT([no])
- AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not
installed, but is required by schroot])])
- LDFLAGS="${saved_ldflags}"
-Index: bin/schroot-base/schroot-base-run.h
-===================================================================
---- bin/schroot-base/schroot-base-run.h (revision 1173)
-+++ bin/schroot-base/schroot-base-run.h (working copy)
-@@ -51,7 +51,14 @@
- try
- {
- // Set up locale.
-- std::locale::global(std::locale(""));
-+ try
-+ {
-+ std::locale::global(std::locale(""));
-+ }
-+ catch (std::runtime_error const& e) // Invalid locale
-+ {
-+ std::locale::global(std::locale::classic());
-+ }
- std::cout.imbue(std::locale());
- std::cerr.imbue(std::locale());
-
diff --git a/utils/schroot/schroot-1.1.2.tar.bz2.sig
b/utils/schroot/schroot-1.1.2.tar.bz2.sig
deleted file mode 100644
index d3317bd..0000000
Binary files a/utils/schroot/schroot-1.1.2.tar.bz2.sig and /dev/null differ
diff --git a/utils/schroot/schroot-1.4.1-boost-validation_error.patch
b/utils/schroot/schroot-1.4.1-boost-validation_error.patch
new file mode 100644
index 0000000..514df7c
--- /dev/null
+++ b/utils/schroot/schroot-1.4.1-boost-validation_error.patch
@@ -0,0 +1,147 @@
+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.conf.patch
b/utils/schroot/schroot.conf.patch
deleted file mode 100644
index 0860cd3..0000000
--- a/utils/schroot/schroot.conf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur schroot-1.1.2.orig/bin/schroot/Makefile.in
schroot-1.1.2/bin/schroot/Makefile.in
---- schroot-1.1.2.orig/bin/schroot/Makefile.in 2008-04-12 20:43:09.532220489
-0700
-+++ schroot-1.1.2/bin/schroot/Makefile.in 2008-04-12 20:47:19.966471871
-0700
-@@ -556,15 +556,6 @@
- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
- done
--install-pkgsysconfDATA: $(pkgsysconf_DATA)
-- @$(NORMAL_INSTALL)
-- test -z "$(pkgsysconfdir)" || $(mkdir_p) "$(DESTDIR)$(pkgsysconfdir)"
-- @list='$(pkgsysconf_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(pkgsysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgsysconfdir)/$$f'"; \
-- $(pkgsysconfDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(pkgsysconfdir)/$$f"; \
-- done
-
- uninstall-pkgsysconfDATA:
- @$(NORMAL_UNINSTALL)
diff --git a/utils/schroot/schroot_1.4.1.orig.tar.gz.sign
b/utils/schroot/schroot_1.4.1.orig.tar.gz.sign
new file mode 100644
index 0000000..59fcfaf
Binary files /dev/null and b/utils/schroot/schroot_1.4.1.orig.tar.gz.sign
differ



  • [SM-Commit] GIT changes to master grimoire by Donald Johnson (a0fa8df3d2152de510d8fe516e6ee594c2efcc29), Donald Johnson, 05/03/2010

Archive powered by MHonArc 2.6.24.

Top of Page