SliTaz Repositories

     1.1 --- a/libcap/receipt	Mon May 11 20:40:38 2009 +0200
     1.2 +++ b/libcap/receipt	Sun Jan 10 23:13:08 2010 +0100
     1.3 @@ -1,35 +1,63 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="libcap"
     1.7 -VERSION="2.10"
     1.8 +VERSION="2.16"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Support for getting/setting POSIX.1e capabilities."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 -DEPENDS="linux"
    1.13 -BUILD_DEPENDS="gperf pam-dev"
    1.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.15 +DEPENDS="linux glibc-base"
    1.16 +BUILD_DEPENDS="slitaz-toolchain gperf pam pam-dev attr-dev"
    1.17 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.18  WEB_SITE="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
    1.19  WGET_URL="${WEB_SITE}libcap2/$TARBALL"
    1.20  
    1.21  # Rules to configure and make the package.
    1.22  compile_rules()
    1.23  {
    1.24 -	if [ ! -d $WOK/linux/taz ]; then
    1.25 -		tazwok cook linux
    1.26 -	fi
    1.27 +#	if [ ! -d $WOK/linux/taz ]; then
    1.28 +#		tazwok cook linux
    1.29 +#	fi
    1.30  	cd $src
    1.31 -	sed -i -e s/'\\n'/"' -e '1i"/g -e 's/| indent -kr//' libcap/Makefile
    1.32 -	mkdir libcap/include/attr
    1.33 -	ln -s $WOK/linux/$(ls $WOK/linux/taz)/include/linux/xattr.h \
    1.34 -		libcap/include/attr/
    1.35 -	make &&
    1.36 -	make FAKEROOT=$PWD/_pkg install
    1.37 +#	sed -i -e s/'\\n'/"' -e '1i"/g -e 's/| indent -kr//' libcap/Makefile
    1.38 +#	mkdir -p libcap/include/attr
    1.39 +#	ln -s $WOK/linux/$(ls $WOK/linux/taz)/include/linux/xattr.h \
    1.40 +#		libcap/include/attr/
    1.41 +
    1.42 +	# Linux headers are now sanitized properly for userspace, so patch libcap
    1.43 +	# Based on http://bugs.gentoo.org/265304 and http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg183775.html
    1.44 +	[ $(grep -c "#define __user" < libcap/include/sys/capability.h) -eq 0 ] || patch -p1 << EOP
    1.45 +--- libcap-2.16/libcap/include/sys/capability.h.orig	2009-03-05 11:19:00.000000000 -0300
    1.46 ++++ libcap-2.16/libcap/include/sys/capability.h	2009-03-05 11:19:38.000000000 -0300
    1.47 +@@ -22,18 +22,6 @@ extern "C" {
    1.48 + #include <sys/types.h>
    1.49 + #include <stdint.h>
    1.50 + 
    1.51 +-/*
    1.52 +- * Make sure we can be included from userland by preventing
    1.53 +- * capability.h from including other kernel headers
    1.54 +- */
    1.55 +-#define _LINUX_TYPES_H
    1.56 +-#define _LINUX_FS_H
    1.57 +-#define __LINUX_COMPILER_H
    1.58 +-#define __user
    1.59 +-
    1.60 +-typedef unsigned int __u32;
    1.61 +-typedef __u32 __le32;
    1.62 +-
    1.63 + #include <linux/capability.h>
    1.64 + 
    1.65 + /*
    1.66 +EOP
    1.67 +
    1.68 +	sed -i -e 's/\} __user \*cap_user_/\} \*cap_user_/g' libcap/include/linux/capability.h
    1.69 +	make DYNAMIC=yes &&
    1.70 +	make DESTDIR=$src/_pkg install
    1.71  }
    1.72  
    1.73  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.74  genpkg_rules()
    1.75  {
    1.76  	mkdir -p $fs/lib
    1.77 -	cp -a $_pkg/lib/lib* $fs/lib
    1.78 +	cp -a $_pkg/lib/*.so* $fs/lib
    1.79  	cp -a $_pkg/sbin $fs
    1.80  }