diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/musl.patch new file mode 100644 index 00000000000..1d1d6c74f8c --- /dev/null +++ b/srcpkgs/schroot/patches/musl.patch @@ -0,0 +1,38 @@ +From 65ed89fedb34278d5b86777ca402f7194cf0809e Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Mon, 24 Aug 2015 02:42:40 +0200 +Subject: [PATCH] musl + +--- + lib/bin-common/run.h | 2 ++ + lib/sbuild/auth/pam.cc | 1 + + 2 files changed, 3 insertions(+) + +diff --git lib/bin-common/run.h lib/bin-common/run.h +index 2bb9762..cce630d 100644 +--- lib/bin-common/run.h ++++ lib/bin-common/run.h +@@ -29,6 +29,8 @@ + #include + #include + ++#include ++ + namespace bin_common + { + +diff --git lib/sbuild/auth/pam.cc lib/sbuild/auth/pam.cc +index 84663c2..feda6f0 100644 +--- lib/sbuild/auth/pam.cc ++++ lib/sbuild/auth/pam.cc +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + #include + +-- +2.5.0 + diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index eeb191fb71e..8b9b8610bf4 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -1,37 +1,48 @@ # Template file for 'schroot' pkgname=schroot -version=1.6.10 -revision=6 +version=1.7.2 +revision=1 build_pie=yes -build_style=gnu-configure +build_style=cmake configure_args=" - --enable-dchroot - --enable-lvm-snapshot - --enable-btrfs-snapshot - --enable-block-device - --enable-loopback - --enable-uuid - BTRFS=/usr/bin/btrfs - BTRFSCTL=/usr/bin/btrfsctl - LVCREATE=/usr/sbin/lvcreate - LVREMOVE=/usr/sbin/lvremove" + -DCMAKE_INSTALL_SYSCONFDIR=/etc + -Ddchroot=ON + -Ddchroot-dsa=ON + -Ddebug=OFF + -Dbash_completion_dir=/usr/share/bash-completion/completions + -Dlvm-snapshot=ON + -Dbtrfs-snapshot=ON" conf_files=" - /etc/schroot/minimal/nssdatabases - /etc/schroot/minimal/fstab - /etc/schroot/minimal/copyfiles - /etc/schroot/buildd/nssdatabases - /etc/schroot/buildd/fstab - /etc/schroot/buildd/copyfiles + /etc/pam.d/schroot + /etc/schroot/default/copyfiles /etc/schroot/default/nssdatabases /etc/schroot/default/fstab - /etc/schroot/default/copyfiles + /etc/schroot/setup.d/05file + /etc/schroot/setup.d/05lvm + /etc/schroot/setup.d/50chrootname + /etc/schroot/setup.d/70services + /etc/schroot/setup.d/05btrfs + /etc/schroot/setup.d/00check + /etc/schroot/setup.d/20copyfiles + /etc/schroot/setup.d/15binfmt + /etc/schroot/setup.d/20nssdatabases + /etc/schroot/setup.d/99check + /etc/schroot/setup.d/10mount + /etc/schroot/setup.d/15killprocs + /etc/schroot/setup.d/05union /etc/schroot/schroot.conf - /etc/schroot/desktop/nssdatabases - /etc/schroot/desktop/fstab - /etc/schroot/desktop/copyfiles + /etc/schroot/sbuild/copyfiles /etc/schroot/sbuild/nssdatabases /etc/schroot/sbuild/fstab - /etc/schroot/sbuild/copyfiles" + /etc/schroot/buildd/copyfiles + /etc/schroot/buildd/nssdatabases + /etc/schroot/buildd/fstab + /etc/schroot/desktop/copyfiles + /etc/schroot/desktop/nssdatabases + /etc/schroot/desktop/fstab + /etc/schroot/minimal/copyfiles + /etc/schroot/minimal/nssdatabases + /etc/schroot/minimal/fstab" make_dirs=" /var/lib/schroot/unpack 0755 root root /var/lib/schroot/union/underlay 0755 root root @@ -39,25 +50,22 @@ make_dirs=" /var/lib/schroot/session 0755 root root /var/lib/schroot/mount 0755 root root /etc/schroot/chroot.d 0755 root root" -hostmakedepends="cmake pkg-config" +hostmakedepends="cmake pkg-config groff" makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel" short_desc="Allows users to execute commands in different chroots" maintainer="Andrea Brancaleoni " license="GPL-3" homepage="https://wiki.debian.org/Schroot" distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz" -checksum="3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b" +checksum="0fabc156da95cfcd63493bf1c3a438efa4a550c4f280d8f1c6f9e67c3d424661" + +CFLAGS="-include /usr/include/libintl.h" +LDFLAGS="-lboost_regex" + +pre_configure() { + sed -i 's/warn/message/g' man/CMakeLists.txt +} post_install() { - vmkdir usr/share/bash-completion/completions - mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions -} - -schroot-devel_package() { - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove usr/lib/pkgconfig - } + rm -r $PKGDESTDIR/usr/include $PKGDESTDIR/usr/lib/pkgconfig }