[gentoo-commits] gentoo-x86 commit in dev-util/schroot/files: schroot.initd schroot-1.2.3-pam.patch schroot.confd schroot-1.2.3-autotools.patch schroot-1.2.3-tests.patch

[Jonathan Callen (abcd)]

abcd        09/09/11 07:16:29

  Added:                schroot.initd schroot-1.2.3-pam.patch schroot.confd
                        schroot-1.2.3-autotools.patch
                        schroot-1.2.3-tests.patch
  Log:
  New ebuild. Thanks to Nick Fortino <nfortino@×××××.com> for initial ebuild and patches (bug #257334).
  (Portage version: -svn/cvs/Linux i686)

Revision  Changes    Path
1.1                  dev-util/schroot/files/schroot.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot.initd?rev=1.1&content-type=text/plain

Index: schroot.initd
===================================================================
#!/sbin/runscript

depend() {
	need localmount
	after net netmount
}

recover_sessions() {
	einfo "Recovering schroot sessions"
	eindent
	local chroot
	local chroots="$(schroot --all-sessions --list --quiet)"
	if [ -n "${chroots}" ]; then
		for chroot in ${chroots}; do
			ebegin "$chroot"
			schroot --chroot=$chroot --recover-session
			eend $?
		done
	else
		einfo "(none)"
	fi
	eoutdent
	einfo "...done"
}

end_sessions() {
	einfo "Ending schroot sessions"
	eindent
	local chroot
	local chroots="$(schroot --all-sessions --list --quiet)"
	if [ -n "${chroots}" ]; then
		for chroot in ${chroots}; do
			ebegin "$chroot"
			schroot --chroot=$chroot --recover-session
			eend $?
		done
	else
		einfo "(none)"
	fi
	eoutdent
	einfo "...done"
}

start() {
	if [ "${SESSIONS_RECOVER}" = "end" ]; then
		end_sessions
	else
		recover_sessions
	fi
}



1.1                  dev-util/schroot/files/schroot-1.2.3-pam.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot-1.2.3-pam.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot-1.2.3-pam.patch?rev=1.1&content-type=text/plain

Index: schroot-1.2.3-pam.patch
===================================================================
removes the dependency on debian specific pam files. Updates the pam
configuration to behave as it does on debian.

contributed by Nick Fortino (nfortino@×××××.com) 1/15/2009

--- schroot-1.2.1/bin/schroot/pam/schroot.old
+++ schroot-1.2.1/bin/schroot/pam/schroot
@@ -23,12 +23,32 @@
 # time restrainst on schroot usage.
 # account    requisite  pam_time.so
 
-# The standard Unix authentication modules, used with
-# NIS (man nsswitch) as well as normal /etc/passwd and
-# /etc/shadow entries.
-@include common-auth
-@include common-account
-@include common-session
+# here are the per-package modules (the "Primary" block)
+auth	[success=1 default=ignore]	pam_unix.so nullok_secure
+# here's the fallback if no module succeeds
+auth	requisite			pam_deny.so
+# prime the stack with a positive return value if there isn't one already;
+# this avoids us returning an error just because nothing sets a success code
+# since the modules above will each just jump around
+auth	required			pam_permit.so
+
+# here are the per-package modules (the "Primary" block)
+account	[success=1 new_authtok_reqd=done default=ignore]	pam_unix.so 
+# here's the fallback if no module succeeds
+account	requisite			pam_deny.so
+# prime the stack with a positive return value if there isn't one already;
+# this avoids us returning an error just because nothing sets a success code
+# since the modules above will each just jump around
+account	required			pam_permit.so
+
+# here are the per-package modules (the "Primary" block)
+session	[default=1]			pam_permit.so
+# here's the fallback if no module succeeds
+session	requisite			pam_deny.so
+# prime the stack with a positive return value if there isn't one already;
+# this avoids us returning an error just because nothing sets a success code
+# since the modules above will each just jump around
+session	required			pam_permit.so
 
 # Sets up user limits, please uncomment and read /etc/security/limits.conf
 # to enable this functionality.



1.1                  dev-util/schroot/files/schroot.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot.confd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot.confd?rev=1.1&content-type=text/plain

Index: schroot.confd
===================================================================
# This is a configuration file for /etc/init.d/schroot; it allows you
# to perform common modifications to the behavior of schroot
# initialization without editing the init script.

# What do we want to do with "orphan" sessions when starting or
# restarting?  Recover them (leave empty or set to "recover") or just
# end them (set to "end")?
SESSIONS_RECOVER="recover"




1.1                  dev-util/schroot/files/schroot-1.2.3-autotools.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot-1.2.3-autotools.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot-1.2.3-autotools.patch?rev=1.1&content-type=text/plain

Index: schroot-1.2.3-autotools.patch
===================================================================
Fixes QA issues in configure.ac
  Removes automagic dependency on cppunit, and instead only builds tests
  when --enable-test is passed in.
  uses LIBS instead of LDFLAGS for linking libraries. Needed for building
  with --as-needed

Contributed by Nick Fortino (nfortino@×××××.com) 2/2/2009

Updated by Jonathan Callen <abcd@g.o> 2009-09-11

--- schroot-1.2.3.orig/configure.ac
+++ schroot-1.2.3/configure.ac
@@ -174,6 +174,15 @@ if test "$enable_debug" = "yes"; then
   AC_DEFINE_UNQUOTED([SBUILD_DEBUG], [1], [Enable debugging])
 fi
 
+AC_ARG_ENABLE([test], [AS_HELP_STRING([--enable-test], [Build unit tests])],
+              [ case "${enableval}" in
+                yes) enable_test="yes" ;;
+                no)  enable_test="no" ;;
+                unset)  enable_test="no" ;;
+                *) AC_MSG_RESULT([unknown])
+                   AC_MSG_ERROR([bad value ${enableval} for --enable-test]) ;;
+                esac])
+
 # Checks for programs.
 AC_PROG_CXX
 AC_LANG([C++])
@@ -195,7 +204,10 @@ PKG_CHECK_MODULES([UUID], [uuid],
 		   HAVE_UUID=true],
                   [HAVE_UUID=false])
 
+AS_IF([test "$enable_test" = "yes"], [
 AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=true])
+])
+
 AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
 
 SCHROOT_CFLAGS="$UUID_CFLAGS"
@@ -240,19 +252,19 @@ AC_CHECK_LIB([lockdev], [dev_lock],
 AC_SUBST([LOCKDEV_LIBS])
 
 AC_MSG_CHECKING([for boost::program_options::variables_map in -lboost_program_options-mt])
-saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_program_options-mt"
+saved_LIBS="${LIBS}"
+LIBS="${LIBS} -lboost_program_options-mt"
 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-mt"],
                [AC_MSG_RESULT([no])
 	        AC_MSG_FAILURE([libboost_program_options (Boost C++ Libraries) is not installed, but is required by schroot])])
-LDFLAGS="${saved_ldflags}"
+LIBS="${saved_LIBS}"
 
 AC_MSG_CHECKING([for boost::program_options::options_description::options() in -lboost_program_options-mt])
-saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_program_options-mt"
+saved_LIBS="${LIBS}"
+LIBS="${LIBS} -lboost_program_options-mt"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/program_options.hpp>],
                                [boost::program_options::options_description testgrp("test group");
                                 bool notused = testgrp.options().empty();
@@ -261,33 +273,33 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([#includ
                 BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="current"],
                [AC_MSG_RESULT([no])
                 BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS="old"])
-LDFLAGS="${saved_ldflags}"
+LIBS="${saved_LIBS}"
 AH_TEMPLATE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, [Set if boost::program_options::options_description::options() is not available])
 if test "$BOOST_PROGRAM_OPTIONS_DESCRIPTION_METHODS" = "old"; then
   AC_DEFINE(BOOST_PROGRAM_OPTIONS_DESCRIPTION_OLD, 1)
 fi
 
 AC_MSG_CHECKING([for boost::regex in -lboost_regex-mt])
-saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_regex-mt"
+saved_LIBS="${LIBS}"
+LIBS="${LIBS} -lboost_regex-mt"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/regex.hpp>],
                                [boost::regex("^foo[bar]$")])],
                [AC_MSG_RESULT([yes])
 	        BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
                [AC_MSG_RESULT([no])
 	        AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])
-LDFLAGS="${saved_ldflags}"
+LIBS="${saved_LIBS}"
 
 AC_MSG_CHECKING([for boost::filesystem in -lboost_filesystem-mt])
-saved_ldflags="${LDFLAGS}"
-LDFLAGS="${LDFLAGS} -lboost_filesystem-mt"
+saved_LIBS="${LIBS}"
+LIBS="${LIBS} -lboost_filesystem-mt"
 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/filesystem.hpp>],
                                [boost::filesystem::is_directory("/")])],
                [AC_MSG_RESULT([yes])
 	        BOOST_LIBS="${BOOST_LIBS} -lboost_filesystem-mt"],
                [AC_MSG_RESULT([no])
 	        AC_MSG_FAILURE([libboost_filesystem (Boost C++ Libraries) is not installed, but is required by schroot])])
-LDFLAGS="${saved_ldflags}"
+LIBS="${saved_LIBS}"
 
 AC_SUBST([BOOST_LIBS])
 



1.1                  dev-util/schroot/files/schroot-1.2.3-tests.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot-1.2.3-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/schroot/files/schroot-1.2.3-tests.patch?rev=1.1&content-type=text/plain

Index: schroot-1.2.3-tests.patch
===================================================================
diff -ruN schroot-1.2.1-old/test/Makefile.am schroot-1.2.1/test/Makefile.am
--- schroot-1.2.1-old/test/Makefile.am
+++ schroot-1.2.1/test/Makefile.am
@@ -59,6 +59,22 @@
 	sbuild-util			\
 	schroot-base-option-action	\
 	cleanup-test-data
+
+ROOT_TESTS = $(TESTS)
+NONROOT_TESTS = setup-test-data                 \
+        sbuild-chroot                   \
+        sbuild-dirstream                \
+        sbuild-environment              \
+        sbuild-keyfile                  \
+        sbuild-log                      \
+        sbuild-nostream                 \
+        sbuild-parse-value              \
+        sbuild-personality              \
+        sbuild-run-parts                \
+        sbuild-regex                    \
+        sbuild-util                     \
+        schroot-base-option-action      \
+        cleanup-test-data
 endif
 
 libtest_la_SOURCES = 	\
@@ -132,5 +148,82 @@
 	setup-test-data		\
 	cleanup-test-data
 
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
+	srcdir=$(srcdir); export srcdir; \
+	if [[ $EUID -ne 0 ]]; then \
+	  list=' $(NONROOT_TESTS) '; \
+	else \
+	  list=' $(ROOT_TESTS) '; \
+	fi; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *$$ws$$tst$$ws*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+		echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *$$ws$$tst$$ws*) \
+		xfail=`expr $$xfail + 1`; \
+		echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      echo "SKIP: $$tst"; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    skipped="($$skip tests were not run)"; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
 clean-local:
 	$(srcdir)/cleanup-test-data
diff -ruN schroot-1.2.1-old/test/setup-test-data schroot-1.2.1/test/setup-test-data
--- schroot-1.2.1-old/test/setup-test-data
+++ schroot-1.2.1/test/setup-test-data
@@ -4,4 +4,9 @@
 rm -rf testdata
 mkdir testdata
 cp -r ${srcdir}/*.ex* testdata
-chown -R root:root testdata
+if [[ $EUID -ne 0 ]]; then
+  echo "You are not root, only performing partial setup"
+else
+  chown -R root:root testdata
+fi
+