SliTaz Repositories

     1.1 --- a/libcap-dev/receipt	Wed Jul 08 11:13:20 2009 +0000
     1.2 +++ b/libcap-dev/receipt	Wed Jul 08 11:53:24 2009 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="libcap-dev"
     1.7 -VERSION="2.10"
     1.8 +VERSION="2.16"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="Support for getting/setting POSIX.1e capabilities."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -14,5 +14,5 @@
    1.13  {
    1.14  	mkdir -p $fs/usr $fs/lib
    1.15  	cp -a $_pkg/usr/include $fs/usr
    1.16 -	cp -a $src/libcap/libcap.a $fs/lib
    1.17 +	cp -a $src/libcap/*.*a $fs/lib
    1.18  }

     2.1 --- a/libcap-pam/receipt	Wed Jul 08 11:13:20 2009 +0000
     2.2 +++ b/libcap-pam/receipt	Wed Jul 08 11:53:24 2009 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libcap-pam"
     2.7 -VERSION="2.10"
     2.8 +VERSION="2.16"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="Support for getting/setting POSIX.1e capabilities, pam module."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"

     3.1 --- a/libcap/receipt	Wed Jul 08 11:13:20 2009 +0000
     3.2 +++ b/libcap/receipt	Wed Jul 08 11:53:24 2009 +0000
     3.3 @@ -1,35 +1,63 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="libcap"
     3.7 -VERSION="2.10"
     3.8 +VERSION="2.16"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="Support for getting/setting POSIX.1e capabilities."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12 -DEPENDS="linux"
    3.13 -BUILD_DEPENDS="gperf pam-dev"
    3.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.15 +DEPENDS="linux glibc-base"
    3.16 +BUILD_DEPENDS="slitaz-toolchain gperf pam pam-dev attr-dev"
    3.17 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.18  WEB_SITE="http://www.kernel.org/pub/linux/libs/security/linux-privs/"
    3.19  WGET_URL="${WEB_SITE}libcap2/$TARBALL"
    3.20  
    3.21  # Rules to configure and make the package.
    3.22  compile_rules()
    3.23  {
    3.24 -	if [ ! -d $WOK/linux/taz ]; then
    3.25 -		tazwok cook linux
    3.26 -	fi
    3.27 +#	if [ ! -d $WOK/linux/taz ]; then
    3.28 +#		tazwok cook linux
    3.29 +#	fi
    3.30  	cd $src
    3.31 -	sed -i -e s/'\\n'/"' -e '1i"/g -e 's/| indent -kr//' libcap/Makefile
    3.32 -	mkdir libcap/include/attr
    3.33 -	ln -s $WOK/linux/$(ls $WOK/linux/taz)/include/linux/xattr.h \
    3.34 -		libcap/include/attr/
    3.35 -	make &&
    3.36 -	make FAKEROOT=$PWD/_pkg install
    3.37 +#	sed -i -e s/'\\n'/"' -e '1i"/g -e 's/| indent -kr//' libcap/Makefile
    3.38 +#	mkdir -p libcap/include/attr
    3.39 +#	ln -s $WOK/linux/$(ls $WOK/linux/taz)/include/linux/xattr.h \
    3.40 +#		libcap/include/attr/
    3.41 +
    3.42 +	# Linux headers are now sanitized properly for userspace, so patch libcap
    3.43 +	# Based on http://bugs.gentoo.org/265304 and http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg183775.html
    3.44 +	[ $(grep -c "#define __user" < libcap/include/sys/capability.h) -eq 0 ] || patch -p1 << EOP
    3.45 +--- libcap-2.16/libcap/include/sys/capability.h.orig	2009-03-05 11:19:00.000000000 -0300
    3.46 ++++ libcap-2.16/libcap/include/sys/capability.h	2009-03-05 11:19:38.000000000 -0300
    3.47 +@@ -22,18 +22,6 @@ extern "C" {
    3.48 + #include <sys/types.h>
    3.49 + #include <stdint.h>
    3.50 + 
    3.51 +-/*
    3.52 +- * Make sure we can be included from userland by preventing
    3.53 +- * capability.h from including other kernel headers
    3.54 +- */
    3.55 +-#define _LINUX_TYPES_H
    3.56 +-#define _LINUX_FS_H
    3.57 +-#define __LINUX_COMPILER_H
    3.58 +-#define __user
    3.59 +-
    3.60 +-typedef unsigned int __u32;
    3.61 +-typedef __u32 __le32;
    3.62 +-
    3.63 + #include <linux/capability.h>
    3.64 + 
    3.65 + /*
    3.66 +EOP
    3.67 +
    3.68 +	sed -i -e 's/\} __user \*cap_user_/\} \*cap_user_/g' libcap/include/linux/capability.h
    3.69 +	make DYNAMIC=yes &&
    3.70 +	make DESTDIR=$src/_pkg install
    3.71  }
    3.72  
    3.73  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.74  genpkg_rules()
    3.75  {
    3.76  	mkdir -p $fs/lib
    3.77 -	cp -a $_pkg/lib/lib* $fs/lib
    3.78 +	cp -a $_pkg/lib/*.so* $fs/lib
    3.79  	cp -a $_pkg/sbin $fs
    3.80  }