LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
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.
19948 Commits
1 Branch
46 MiB
Tree: e480fa8b33
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'e480fa8b33'
${ noResults }
openwrt-packages-dist/admin/schroot/patches/01-openwrt.patch

219 lines
9.9 KiB
Raw Normal View History

schroot: new package to securely enter a chroot and run a command or login shell Signed-off-by: Javier Marcet <javier@marcet.info>
5 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  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.  
  24.  
  25.  # Check for host platform
  26. @@ -336,7 +322,6 @@ PKG_CHECK_MODULES([UUID], [uuid],

  27.                    [HAVE_UUID=yes],
  28.                    [HAVE_UUID=no])
  29.  
  30. -AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])

  31.  AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
  32.  
  33.  SCHROOT_CFLAGS="$UUID_CFLAGS"
  34. @@ -688,42 +673,25 @@ if test "$BOOST_PROGRAM_OPTIONS_VALIDATI

  35.  fi
  36.  
  37.  dnl Note the use of quadrigraphs to quote [ and ] in regexes.
  38. -AH_TEMPLATE(HAVE_REGEX_REGEX, [Set if the <regex> header file includes std::regex])

  39.  AH_TEMPLATE(HAVE_BOOST_REGEX, [Set if the <boost/regex.hpp> header file includes boost::regex])
  40. -AC_MSG_CHECKING([for std::regex])

  41. -define([testprog], [AC_LANG_PROGRAM([#include <regex>],

  42. -                                   [std::regex foo("^foo@<:@bar@:>@$");

  43. -                                    std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);

  44. -                                    std::regex check("^@<:@^:/,.@:>@@<:@^:/,@:>@*$", std::regex::extended);])])

  45. -AC_RUN_IFELSE(testprog,

  46. -  [AC_MSG_RESULT([yes])

  47. -   AC_DEFINE(HAVE_REGEX_REGEX, 1)],

  48. -  [dnl Check if std::regex is present but broken.

  49. -define([testprog], [AC_LANG_PROGRAM([#include <regex>],

  50. -                                   [std::regex foo("^foo@<:@bar@:>@$");

  51. -                                    std::regex bar("^foo@<:@bar@:>@$", std::regex::extended);])])

  52. +AC_MSG_CHECKING([for boost::regex in -lboost_regex])

  53. +saved_LIBS="${LIBS}"

  54. +LIBS="${saved_LIBS} -lboost_regex"

  55. +define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],

  56. +                                [boost::regex("^foo@<:@bar@:>@$");

  57. +                                 boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])

  58.  AC_LINK_IFELSE(testprog,
  59. -  [AC_MSG_RESULT([broken])],

  60. -  [AC_MSG_RESULT([no])])

  61. -   AC_MSG_CHECKING([for boost::regex in -lboost_regex])

  62. -   saved_LIBS="${LIBS}"

  63. -   LIBS="${saved_LIBS} -lboost_regex"

  64. -   define([testprog], [AC_LANG_PROGRAM([#include <boost/regex.hpp>],

  65. -                                   [boost::regex("^foo@<:@bar@:>@$");

  66. -                                    boost::regex bar("^foo@<:@bar@:>@$", boost::regex::extended);])])

  67. -   AC_LINK_IFELSE(testprog,

  68. -                  [AC_MSG_RESULT([yes])

  69. -                   AC_DEFINE(HAVE_BOOST_REGEX, 1)

  70. -                   BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],

  71. -                  [LIBS="${saved_LIBS} -lboost_regex-mt"

  72. -                   AC_LINK_IFELSE(testprog,

  73. -                          [AC_MSG_RESULT([yes])

  74. -                           AC_DEFINE(HAVE_BOOST_REGEX, 1)

  75. -                           BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],

  76. -                          [AC_MSG_RESULT([no])

  77. -                    AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])

  78. -   LIBS="${saved_LIBS}"

  79. -])

  80. +               [AC_MSG_RESULT([yes])

  81. +                AC_DEFINE(HAVE_BOOST_REGEX, 1)

  82. +                BOOST_LIBS="${BOOST_LIBS} -lboost_regex"],

  83. +               [LIBS="${saved_LIBS} -lboost_regex-mt"

  84. +                AC_LINK_IFELSE(testprog,

  85. +                       [AC_MSG_RESULT([yes])

  86. +                        AC_DEFINE(HAVE_BOOST_REGEX, 1)

  87. +                        BOOST_LIBS="${BOOST_LIBS} -lboost_regex-mt"],

  88. +                       [AC_MSG_RESULT([no])

  89. +                 AC_MSG_FAILURE([libboost_regex (Boost C++ Libraries) is not installed, but is required by schroot])])])

  90. +LIBS="${saved_LIBS}"

  91.  
  92.  AC_MSG_CHECKING([for boost::iostreams in -lboost_iostreams])
  93.  saved_LIBS="${LIBS}"
  94. --- ./bin/schroot-base/schroot-base-run.h-orig	2019-12-09 04:23:51.881428446 +0100

  95. +++ ./bin/schroot-base/schroot-base-run.h	2019-12-09 04:24:14.934887089 +0100

  96. @@ -61,8 +61,8 @@ namespace schroot_base

  97.          std::cout.imbue(std::locale());
  98.          std::cerr.imbue(std::locale());
  99.  
  100. -        bindtextdomain (SBUILD_MESSAGE_CATALOGUE, SCHROOT_LOCALE_DIR);

  101. -        textdomain (SBUILD_MESSAGE_CATALOGUE);

  102. +        //bindtextdomain (SBUILD_MESSAGE_CATALOGUE, SCHROOT_LOCALE_DIR);

  103. +        //textdomain (SBUILD_MESSAGE_CATALOGUE);

  104.  
  105.          typename options_type::ptr opts(new options_type);
  106.          main_type kit(opts);
  107. --- ./sbuild/sbuild-feature.h-orig	2019-12-09 04:23:51.881428446 +0100

  108. +++ ./sbuild/sbuild-feature.h	2019-12-09 04:24:14.934887089 +0100

  109. @@ -24,6 +24,7 @@

  110.  #include <string>
  111.  
  112.  #include <boost/format.hpp>
  113. +#include <libintl.h>

  114.  
  115.  namespace sbuild
  116.  {
  117. --- ./etc/setup.d/20copyfiles-orig	2018-11-03 14:26:12.000000000 +0100

  118. +++ ./etc/setup.d/20copyfiles	2019-12-09 13:56:45.277145648 +0100

  119. @@ -39,9 +39,9 @@ copy_file()

  120.          if [ -e "$2" ]; then
  121.  
  122.              # Device and inode
  123. -            da=$(/usr/bin/stat --format="%d %i" "$1")

  124. +            da=$(/bin/stat --format="%d %i" "$1")

  125.              # This one can fail since it might not exist yet
  126. -            db=$(/usr/bin/stat --format="%d %i" "$2" 2>/dev/null || :)

  127. +            db=$(/bin/stat --format="%d %i" "$2" 2>/dev/null || :)

  128.  
  129.              if [ "$da" = "$db" ]; then
  130.                  COPY="false"
  131. --- ./etc/setup.d/20nssdatabases-orig	2018-11-03 14:26:12.000000000 +0100

  132. +++ ./etc/setup.d/20nssdatabases	2019-12-09 13:57:34.397419039 +0100

  133. @@ -29,7 +29,7 @@ set -e

  134.  dup_nss()
  135.  {
  136.      info "Copying $1 database to $2"
  137. -    getent "$1" > "$2"

  138. +    cat "/etc/$1" > "$2"

  139.  }
  140.  
  141.  if [ $STAGE = "setup-start" ] || [ $STAGE = "setup-recover" ]; then
  142. @@ -42,9 +42,9 @@ if [ $STAGE = "setup-start" ] || [ $STAG

  143.                  fi
  144.  
  145.                  # Device and inode
  146. -                dr=$(/usr/bin/stat --format="%d %i" "/etc/$db")

  147. +                dr=$(/bin/stat --format="%d %i" "/etc/$db")

  148.                  # This one can fail since it might not exist yet
  149. -                dc=$(/usr/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)

  150. +                dc=$(/bin/stat --format="%d %i" "${CHROOT_PATH}/etc/$db" 2>/dev/null || :)

  151.  
  152.                  # If the database inside and outside the chroot is the
  153.                  # same, it's very likely that dup_nss would blank the
  154. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/all/all/nssdatabases ./etc/profile-templates/all/all/nssdatabases

  155. --- ./etc/profile-templates/all/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100

  156. +++ ./etc/profile-templates/all/all/nssdatabases	2019-12-09 14:03:12.799297723 +0100

  157. @@ -4,4 +4,4 @@

  158.  passwd
  159.  shadow
  160. -group

  161. -gshadow

  162. +#group

  163. +#gshadow

  164. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/buildd/all/nssdatabases ./etc/profile-templates/buildd/all/nssdatabases

  165. --- ./etc/profile-templates/buildd/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100

  166. +++ ./etc/profile-templates/buildd/all/nssdatabases	2019-12-09 14:03:12.802631074 +0100

  167. @@ -4,4 +4,4 @@

  168.  passwd
  169.  shadow
  170. -group

  171. -gshadow

  172. +#group

  173. +#gshadow

  174. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/all/nssdatabases ./etc/profile-templates/default/all/nssdatabases

  175. --- ./etc/profile-templates/default/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100

  176. +++ ./etc/profile-templates/default/all/nssdatabases	2019-12-09 14:03:12.809297778 +0100

  177. @@ -1,4 +1,4 @@

  178.  services
  179.  protocols
  180. -networks

  181. +#networks

  182.  hosts
  183. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/all/nssdatabases ./etc/profile-templates/desktop/all/nssdatabases

  184. --- ./etc/profile-templates/desktop/all/nssdatabases	2018-11-03 14:26:12.000000000 +0100

  185. +++ ./etc/profile-templates/desktop/all/nssdatabases	2019-12-09 14:03:12.812631129 +0100

  186. @@ -1,4 +1,4 @@

  187.  services
  188.  protocols
  189. -networks

  190. +#networks

  191.  hosts
  192. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/default/linux/fstab ./etc/profile-templates/default/linux/fstab

  193. --- ./etc/profile-templates/default/linux/fstab	2018-11-03 14:26:12.000000000 +0100

  194. +++ ./etc/profile-templates/default/linux/fstab	2019-12-09 14:18:46.970887080 +0100

  195. @@ -7,7 +7,7 @@

  196.  # to run additional services in the chroot.  However, note that this
  197.  # may potentially cause undesirable behaviour on upgrades, such as
  198.  # killing services on the host.
  199. -#/run           /run            none    rw,bind         0       0

  200. +/run           /run            none    rw,bind         0       0

  201.  #/run/lock      /run/lock       none    rw,bind         0       0
  202. -#/dev/shm       /dev/shm        none    rw,bind         0       0

  203. -#/run/shm       /run/shm        none    rw,bind         0       0

  204. +/tmp/shm       /dev/shm        none    rw,bind         0       0

  205. +/tmp/shm       /run/shm        none    rw,bind         0       0

  206. diff -X /home/jmarcet/.rsync-filter -pru ./etc/profile-templates/desktop/linux/fstab ./etc/profile-templates/desktop/linux/fstab

  207. --- ./etc/profile-templates/desktop/linux/fstab	2018-11-03 14:26:12.000000000 +0100

  208. +++ ./etc/profile-templates/desktop/linux/fstab	2019-12-09 14:22:14.148555674 +0100

  209. @@ -12,7 +12,7 @@

  210.  # to run additional services in the chroot.  However, note that this
  211.  # may potentially cause undesirable behaviour on upgrades, such as
  212.  # killing services on the host.
  213. -#/run           /run            none    rw,bind         0       0

  214. +/run           /run            none    rw,bind         0       0

  215.  #/run/lock      /run/lock       none    rw,bind         0       0
  216. -#/dev/shm       /dev/shm        none    rw,bind         0       0

  217. -#/run/shm       /run/shm        none    rw,bind         0       0

  218. +/tmp/shm       /dev/shm        none    rw,bind         0       0

  219. +/tmp/shm       /run/shm        none    rw,bind         0       0