You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

219 lines
9.9 KiB

  1. --- ./configure.ac-orig 2019-12-09 12:56:45.217308628 +0100
  2. +++ ./configure.ac 2019-12-09 12:57:18.667492923 +0100
  3. @@ -284,22 +284,8 @@ if test -z "$DOXYGEN"; then
  4. HAVE_DOXYGEN="no"
  5. fi
  6. HAVE_LVM="yes"
  7. -AC_PATH_PROG([LVCREATE], [lvcreate], [], [$PATH:/sbin:/usr/sbin])
  8. -AC_PATH_PROG([LVREMOVE], [lvremove], [], [$PATH:/sbin:/usr/sbin])
  9. -if test -z "$LVCREATE" || test -z "$LVREMOVE"; then
  10. - HAVE_LVM="no"
  11. -fi
  12. HAVE_BTRFS="yes"
  13. -AC_PATH_PROG([BTRFS], [btrfs], [], [$PATH:/sbin:/usr/sbin])
  14. -AC_PATH_PROG([BTRFSCTL], [btrfsctl], [], [$PATH:/sbin:/usr/sbin])
  15. -if test -z "$BTRFS" || test -z "$BTRFSCTL"; then
  16. - HAVE_BTRFS="no"
  17. -fi
  18. HAVE_LOOPBACK="yes"
  19. -AC_PATH_PROG([LOSETUP], [losetup], [], [$PATH:/sbin:/usr/sbin])
  20. -if test -z "$LOSETUP"; then
  21. - HAVE_LOOPBACK="no"
  22. -fi
  23. # Check for host platform
  24. @@ -336,7 +322,6 @@ PKG_CHECK_MODULES([UUID], [uuid],
  25. [HAVE_UUID=yes],
  26. [HAVE_UUID=no])
  27. -AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
  28. AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
  29. SCHROOT_CFLAGS="$UUID_CFLAGS"
  30. @@ -688,42 +673,25 @@ if test "$BOOST_PROGRAM_OPTIONS_VALIDATI
  31. fi
  32. dnl Note the use of quadrigraphs to quote [ and ] in regexes.
  33. -AH_TEMPLATE(HAVE_REGEX_REGEX, [Set if the <regex> header file includes std::regex])
  34. AH_TEMPLATE(HAVE_BOOST_REGEX, [Set if the <boost/regex.hpp> header file includes boost::regex])
  35. -AC_MSG_CHECKING([for std::regex])
  36. -define([testprog], [AC_LANG_PROGRAM([#include <regex>],
  37. - [std::regex foo("^foo@<:@bar@:>@$");
  38. - std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);
  39. - std::regex check("^@<:@^:/,.@:>@@<:@^:/,@:>@*$", std::regex::extended);])])
  40. -AC_RUN_IFELSE(testprog,
  41. - [AC_MSG_RESULT([yes])
  42. - AC_DEFINE(HAVE_REGEX_REGEX, 1)],
  43. - [dnl Check if std::regex is present but broken.
  44. -define([testprog], [AC_LANG_PROGRAM([#include <regex>],
  45. - [std::regex foo("^foo@<:@bar@:>@$");
  46. - std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);])])
  47. +AC_MSG_CHECKING([for boost::regex in -lboost_regex])
  48. +saved_LIBS="${LIBS}"
  49. +LIBS="${saved_LIBS} -lboost_regex"
  50. +define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
  51. + [boost::regex("^foo@<:@bar@:>@$");
  52. + boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])
  53. AC_LINK_IFELSE(testprog,
  54. - [AC_MSG_RESULT([broken])],
  55. - [AC_MSG_RESULT([no])])
  56. - AC_MSG_CHECKING([for boost::regex in -lboost_regex])
  57. - saved_LIBS="${LIBS}"
  58. - LIBS="${saved_LIBS} -lboost_regex"
  59. - define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],
  60. - [boost::regex("^foo@<:@bar@:>@$");
  61. - boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])
  62. - AC_LINK_IFELSE(testprog,
  63. - [AC_MSG_RESULT([yes])
  64. - AC_DEFINE(HAVE_BOOST_REGEX, 1)
  65. - BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
  66. - [LIBS="${saved_LIBS} -lboost_regex-mt"
  67. - AC_LINK_IFELSE(testprog,
  68. - [AC_MSG_RESULT([yes])
  69. - AC_DEFINE(HAVE_BOOST_REGEX, 1)
  70. - BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
  71. - [AC_MSG_RESULT([no])
  72. - AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])
  73. - LIBS="${saved_LIBS}"
  74. -])
  75. + [AC_MSG_RESULT([yes])
  76. + AC_DEFINE(HAVE_BOOST_REGEX, 1)
  77. + BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],
  78. + [LIBS="${saved_LIBS} -lboost_regex-mt"
  79. + AC_LINK_IFELSE(testprog,
  80. + [AC_MSG_RESULT([yes])
  81. + AC_DEFINE(HAVE_BOOST_REGEX, 1)
  82. + BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],
  83. + [AC_MSG_RESULT([no])
  84. + AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])
  85. +LIBS="${saved_LIBS}"
  86. AC_MSG_CHECKING([for boost::iostreams in -lboost_iostreams])
  87. saved_LIBS="${LIBS}"
  88. --- ./bin/schroot-base/schroot-base-run.h-orig 2019-12-09 04:23:51.881428446 +0100
  89. +++ ./bin/schroot-base/schroot-base-run.h 2019-12-09 04:24:14.934887089 +0100
  90. @@ -61,8 +61,8 @@ namespace schroot_base
  91. std::cout.imbue(std::locale());
  92. std::cerr.imbue(std::locale());
  93. - bindtextdomain (SBUILD_MESSAGE_CATALOGUE, SCHROOT_LOCALE_DIR);
  94. - textdomain (SBUILD_MESSAGE_CATALOGUE);
  95. + //bindtextdomain (SBUILD_MESSAGE_CATALOGUE, SCHROOT_LOCALE_DIR);
  96. + //textdomain (SBUILD_MESSAGE_CATALOGUE);
  97. typename options_type::ptr opts(new options_type);
  98. main_type kit(opts);
  99. --- ./sbuild/sbuild-feature.h-orig 2019-12-09 04:23:51.881428446 +0100
  100. +++ ./sbuild/sbuild-feature.h 2019-12-09 04:24:14.934887089 +0100
  101. @@ -24,6 +24,7 @@
  102. #include <string>
  103. #include <boost/format.hpp>
  104. +#include <libintl.h>
  105. namespace sbuild
  106. {
  107. --- ./etc/setup.d/20copyfiles-orig 2018-11-03 14:26:12.000000000 +0100
  108. +++ ./etc/setup.d/20copyfiles 2019-12-09 13:56:45.277145648 +0100
  109. @@ -39,9 +39,9 @@ copy_file()
  110. if [ -e "$2" ]; then
  111. # Device and inode
  112. - da=$(/usr/bin/stat --format="%d %i" "$1")
  113. + da=$(/bin/stat --format="%d %i" "$1")
  114. # This one can fail since it might not exist yet
  115. - db=$(/usr/bin/stat --format="%d %i" "$2" 2>/dev/null || :)
  116. + db=$(/bin/stat --format="%d %i" "$2" 2>/dev/null || :)
  117. if [ "$da" = "$db" ]; then
  118. COPY="false"
  119. --- ./etc/setup.d/20nssdatabases-orig 2018-11-03 14:26:12.000000000 +0100
  120. +++ ./etc/setup.d/20nssdatabases 2019-12-09 13:57:34.397419039 +0100
  121. @@ -29,7 +29,7 @@ set -e
  122. dup_nss()
  123. {
  124. info "Copying $1 database to $2"
  125. - getent "$1" > "$2"
  126. + cat "/etc/$1" > "$2"
  127. }
  128. if [ $STAGE = "setup-start" ] || [ $STAGE = "setup-recover" ]; then
  129. @@ -42,9 +42,9 @@ if [ $STAGE = "setup-start" ] || [ $STAG
  130. fi
  131. # Device and inode
  132. - dr=$(/usr/bin/stat --format="%d %i" "/etc/$db")
  133. + dr=$(/bin/stat --format="%d %i" "/etc/$db")
  134. # This one can fail since it might not exist yet
  135. - dc=$(/usr/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)
  136. + dc=$(/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)
  137. # If the database inside and outside the chroot is the
  138. # same, it's very likely that dup_nss would blank the
  139. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/all/all/nssdatabases ./etc/profile-templates/all/all/nssdatabases
  140. --- ./etc/profile-templates/all/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100
  141. +++ ./etc/profile-templates/all/all/nssdatabases 2019-12-09 14:03:12.799297723 +0100
  142. @@ -4,4 +4,4 @@
  143. passwd
  144. shadow
  145. -group
  146. -gshadow
  147. +#group
  148. +#gshadow
  149. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/buildd/all/nssdatabases ./etc/profile-templates/buildd/all/nssdatabases
  150. --- ./etc/profile-templates/buildd/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100
  151. +++ ./etc/profile-templates/buildd/all/nssdatabases 2019-12-09 14:03:12.802631074 +0100
  152. @@ -4,4 +4,4 @@
  153. passwd
  154. shadow
  155. -group
  156. -gshadow
  157. +#group
  158. +#gshadow
  159. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/all/nssdatabases ./etc/profile-templates/default/all/nssdatabases
  160. --- ./etc/profile-templates/default/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100
  161. +++ ./etc/profile-templates/default/all/nssdatabases 2019-12-09 14:03:12.809297778 +0100
  162. @@ -1,4 +1,4 @@
  163. services
  164. protocols
  165. -networks
  166. +#networks
  167. hosts
  168. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/all/nssdatabases ./etc/profile-templates/desktop/all/nssdatabases
  169. --- ./etc/profile-templates/desktop/all/nssdatabases 2018-11-03 14:26:12.000000000 +0100
  170. +++ ./etc/profile-templates/desktop/all/nssdatabases 2019-12-09 14:03:12.812631129 +0100
  171. @@ -1,4 +1,4 @@
  172. services
  173. protocols
  174. -networks
  175. +#networks
  176. hosts
  177. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/fstab ./etc/profile-templates/default/linux/fstab
  178. --- ./etc/profile-templates/default/linux/fstab 2018-11-03 14:26:12.000000000 +0100
  179. +++ ./etc/profile-templates/default/linux/fstab 2019-12-09 14:18:46.970887080 +0100
  180. @@ -7,7 +7,7 @@
  181. # to run additional services in the chroot. However, note that this
  182. # may potentially cause undesirable behaviour on upgrades, such as
  183. # killing services on the host.
  184. -#/run /run none rw,bind 0 0
  185. +/run /run none rw,bind 0 0
  186. #/run/lock /run/lock none rw,bind 0 0
  187. -#/dev/shm /dev/shm none rw,bind 0 0
  188. -#/run/shm /run/shm none rw,bind 0 0
  189. +/tmp/shm /dev/shm none rw,bind 0 0
  190. +/tmp/shm /run/shm none rw,bind 0 0
  191. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/linux/fstab ./etc/profile-templates/desktop/linux/fstab
  192. --- ./etc/profile-templates/desktop/linux/fstab 2018-11-03 14:26:12.000000000 +0100
  193. +++ ./etc/profile-templates/desktop/linux/fstab 2019-12-09 14:22:14.148555674 +0100
  194. @@ -12,7 +12,7 @@
  195. # to run additional services in the chroot. However, note that this
  196. # may potentially cause undesirable behaviour on upgrades, such as
  197. # killing services on the host.
  198. -#/run /run none rw,bind 0 0
  199. +/run /run none rw,bind 0 0
  200. #/run/lock /run/lock none rw,bind 0 0
  201. -#/dev/shm /dev/shm none rw,bind 0 0
  202. -#/run/shm /run/shm none rw,bind 0 0
  203. +/tmp/shm /dev/shm none rw,bind 0 0
  204. +/tmp/shm /run/shm none rw,bind 0 0