diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
| commit | 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch) | |
| tree | 175c9e1755980b2a955b1b9e6b93c1a3d431276f /community/scponly | |
| parent | 933e5d274b2a4e386565d2f3bb982682e168438b (diff) | |
| parent | 2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/alienarena/PKGBUILD
community/mumble/PKGBUILD
community/mysql-workbench/PKGBUILD
community/paintown/PKGBUILD
community/ufoai/PKGBUILD
core/dcron/PKGBUILD
core/udev/PKGBUILD
extra/qt/PKGBUILD
extra/texlive-bin/PKGBUILD
testing/opencv/PKGBUILD
testing/pciutils/PKGBUILD
testing/usbutils/PKGBUILD
Diffstat (limited to 'community/scponly')
| -rw-r--r-- | community/scponly/PKGBUILD | 24 | ||||
| -rwxr-xr-x | community/scponly/setup_chroot.sh | 7 |
2 files changed, 18 insertions, 13 deletions
diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD index 8b68e6af8..4bf658df1 100644 --- a/community/scponly/PKGBUILD +++ b/community/scponly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 3564 2009-10-06 07:22:09Z spupykin $ +# $Id: PKGBUILD 46261 2011-05-04 11:37:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=scponly pkgver=4.8 -pkgrel=6 +pkgrel=7 pkgdesc="A limited shell for ssh/scp" arch=(i686 x86_64 'mips64el') url="http://www.sublimation.org/scponly/" @@ -14,22 +14,22 @@ options=(docs) source=(http://downloads.sourceforge.net/sourceforge/scponly/scponly-$pkgver.tgz setup_chroot.sh) md5sums=('139ac9abd7f3b8dbc5c5520745318f8a' - '3318e648c106b1e7ed7826296c296d1a') + 'a5e26c355cf4f127a1f2fdf2fb1582cc') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc \ --enable-scp-compat --enable-winscp-compat --enable-chrooted-binary - sed -i 's|^#elif|#else|' helper.c + make +} - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - - install -D -m0644 COPYING $startdir/pkg/usr/share/licenses/scponly/COPYING && \ - mv $pkgdir/usr/man $pkgdir/usr/share/ || return 1 - - mkdir -p $pkgdir/usr/share/doc/scponly && \ +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -D -m0644 COPYING $pkgdir/usr/share/licenses/scponly/COPYING + mv $pkgdir/usr/man $pkgdir/usr/share/ + mkdir -p $pkgdir/usr/share/doc/scponly cp $srcdir/setup_chroot.sh config.h $pkgdir/usr/share/doc/scponly/ } diff --git a/community/scponly/setup_chroot.sh b/community/scponly/setup_chroot.sh index cd1a260eb..1af9807e0 100755 --- a/community/scponly/setup_chroot.sh +++ b/community/scponly/setup_chroot.sh @@ -79,7 +79,7 @@ fi # # we also need to add some form of ld.so, here are some good guesses. # -LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1" +LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1" for lib in $LDSO_LIST; do if [ -f $lib ]; then LDSOFOUND=1; @@ -95,6 +95,11 @@ if [ $? -eq 0 ]; then LIB_LIST="$LIB_LIST /lib/libnss_compat*" fi +ls /lib/libnss_files* > /dev/null 2>&1 +if [ $? -eq 0 ]; then + LIB_LIST="$LIB_LIST /lib/libnss_files*" +fi + # check that the configure options are correct for chrooted operation: if [ x/usr/sbin/useradd = x ]; then |