# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1500462652 -10800
# Node ID f3a2b92891b464df801a497cf56a93648facf777
# Parent  bd61370c8ddc0bf906d4d467a7e141338c6dca86
Up atm-tools, audiofile, audit, avfs, c_icap, xz.

diff -r bd61370c8ddc -r f3a2b92891b4 atm-tools-dev/receipt
--- a/atm-tools-dev/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="atm-tools-dev"
-VERSION="2.5.2"
-CATEGORY="development"
-SHORT_DESC="User space tools for atm, development files."
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL2"
-SOURCE="linux-atm"
-WEB_SITE="http://$SOURCE.sourceforge.net/"
-WANTED="atm-tools"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/*a $fs/usr/lib
-}
-
diff -r bd61370c8ddc -r f3a2b92891b4 atm-tools/receipt
--- a/atm-tools/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ b/atm-tools/receipt	Wed Jul 19 14:10:52 2017 +0300
@@ -1,26 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="atm-tools"
 VERSION="2.5.2"
 CATEGORY="system-tools"
-SHORT_DESC="User space tools for atm."
+SHORT_DESC="User space tools for ATM"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://linux-atm.sourceforge.net/"
-SOURCE="linux-atm"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
-CONFIG_FILES="/etc/atmsigd.conf"
+
+TARBALL="linux-atm-$VERSION.tar.gz"
+WGET_URL="$SF_MIRROR/linux-atm/$TARBALL"
 
 BUILD_DEPENDS="perl"
+SPLIT="atm-tools-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	busybox patch -p0 < $stuff/MAX_PATH.u
-
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS &&
+	./configure \
+		--sysconfdir=/etc \
+		$CONFIGURE_ARGS &&
 	make -j1 &&
 	make -j1 DESTDIR=$DESTDIR install
 }
@@ -28,9 +27,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/etc $fs
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	case $PACKAGE in
+		atm-tools)
+			copy @std
+			DEPENDS="flex"
+			CONFIG_FILES="/etc/atmsigd.conf /etc/hosts.atm"
+			;;
+		atm-tools-dev)
+			copy @dev
+			;;
+	esac
 }
diff -r bd61370c8ddc -r f3a2b92891b4 atm-tools/stuff/MAX_PATH.u
--- a/atm-tools/stuff/MAX_PATH.u	Sat Jul 15 15:20:02 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- src/led/main.c
-+++ src/led/main.c
-@@ -46,6 +46,7 @@
- #include <atmd.h>
- 
- #include <linux/atmlec.h>
-+#include <linux/limits.h>
- 
- /* Local incs */
- #include "join.h"
diff -r bd61370c8ddc -r f3a2b92891b4 atm-tools/stuff/patches/MAX_PATH.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/atm-tools/stuff/patches/MAX_PATH.u	Wed Jul 19 14:10:52 2017 +0300
@@ -0,0 +1,10 @@
+--- a/src/led/main.c
++++ b/src/led/main.c
+@@ -46,6 +46,7 @@
+ #include <atmd.h>
+ 
+ #include <linux/atmlec.h>
++#include <linux/limits.h>
+ 
+ /* Local incs */
+ #include "join.h"
diff -r bd61370c8ddc -r f3a2b92891b4 atm-tools/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/atm-tools/stuff/patches/series	Wed Jul 19 14:10:52 2017 +0300
@@ -0,0 +1,1 @@
+MAX_PATH.u
diff -r bd61370c8ddc -r f3a2b92891b4 audiofile-dev/receipt
--- a/audiofile-dev/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="audiofile-dev"
-VERSION="0.3.4"
-CATEGORY="development"
-SHORT_DESC="provides a uniform and elegant API for accessing a variety of audio file formats, development files"
-MAINTAINER="allan316@gmail.com"
-LICENSE="GPL2"
-WEB_SITE="http://www.68k.org/~michael/audiofile/"
-WANTED="audiofile"
-HOST_ARCH="i486 arm"
-
-DEPENDS="audiofile pkg-config"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-}
-
diff -r bd61370c8ddc -r f3a2b92891b4 audiofile/receipt
--- a/audiofile/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ b/audiofile/receipt	Wed Jul 19 14:10:52 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="audiofile"
 VERSION="0.3.4"
@@ -7,17 +7,19 @@
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.68k.org/~michael/audiofile/"
+HOST_ARCH="i486 arm"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://audiofile.68k.org/$TARBALL"
-HOST_ARCH="i486 arm"
 
-DEPENDS="alsa-lib"
 BUILD_DEPENDS="alsa-lib-dev"
+SPLIT="audiofile-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	sed -i 's|-1 <<|-1U <<|' libaudiofile/modules/SimpleModule.h
+
 	./configure \
 		$CONFIGURE_ARGS &&
 	make && make DESTDIR=$DESTDIR install
@@ -26,7 +28,13 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	case $PACKAGE in
+		audiofile)
+			copy @std
+			DEPENDS="alsa-lib"
+			;;
+		*-dev)
+			copy @dev
+			;;
+	esac
 }
diff -r bd61370c8ddc -r f3a2b92891b4 audit-dev/receipt
--- a/audit-dev/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="audit-dev"
-VERSION="2.2.1"
-CATEGORY="development"
-SHORT_DESC="System call auditing development files"
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://people.redhat.com/sgrubb/audit/"
-WANTED="audit"
-
-DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/*.a $fs/usr/lib
-}
diff -r bd61370c8ddc -r f3a2b92891b4 audit/receipt
--- a/audit/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ b/audit/receipt	Wed Jul 19 14:10:52 2017 +0300
@@ -1,36 +1,60 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="audit"
 VERSION="2.2.1"
 CATEGORY="misc"
-SHORT_DESC="System call auditing."
+SHORT_DESC="System call auditing"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://people.redhat.com/sgrubb/audit/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS="openldap-dev"
+BUILD_DEPENDS="python-dev openldap-dev coreutils-file-format swig"
+SPLIT="audit-python audit-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure --prefix=/usr --sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var --sbindir=/sbin \
-	$CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sbindir=/sbin \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$DESTDIR install &&
+
+	# make files readable for the web interface; fix permissions later in post_install
+	chmod 755 $install/etc/audisp/plugins.d/
+	find $install/etc/audisp/ $install/etc/libaudit.conf \
+	$install/etc/sysconfig/auditd $install/sbin/audispd \
+	-type f -exec chmod o+r '{}' \;
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/sbin $fs/
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/etc $fs/
-	chown -R root.root $fs/etc
+	case $PACKAGE in
+		audit)
+			copy @std
+			rm -r $fs/usr/lib/python*
+			DEPENDS="libcrypto libldap libssl"
+			;;
+		audit-python)
+			copy *.py site-packages/*.so
+			CAT="misc|Python bindings"
+			DEPENDS="audit python"
+			;;
+		*-dev)
+			copy @dev
+			;;
+	esac
 }
+
+post_install_audit() {
+	chmod 750 "$1/etc/audisp/plugins.d/"
+	find "$1/etc/audisp/" "$1/etc/libaudit.conf" "$1/etc/sysconfig/auditd" \
+	"$1/sbin/audispd" -type f -exec chmod o-r '{}' \;
+}
diff -r bd61370c8ddc -r f3a2b92891b4 avfs-dev/receipt
--- a/avfs-dev/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="avfs-dev"
-VERSION="1.0.1"
-CATEGORY="development"
-SHORT_DESC="A virtual Filesystem implemented with FUSE, development files."
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://avfs.sourceforge.net/"
-WANTED="avfs"
-
-DEPENDS="avfs"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/*a $fs/usr/lib
-}
diff -r bd61370c8ddc -r f3a2b92891b4 avfs/receipt
--- a/avfs/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ b/avfs/receipt	Wed Jul 19 14:10:52 2017 +0300
@@ -1,24 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="avfs"
 VERSION="1.0.1"
 CATEGORY="system-tools"
-SHORT_DESC="A virtual Filesystem implemented with FUSE."
+SHORT_DESC="A virtual Filesystem implemented with FUSE"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://avfs.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://avfs.sourceforge.net/"
 WGET_URL="$SF_MIRROR/avf/$PACKAGE/$VERSION/$TARBALL"
 
-DEPENDS="fuse liblzma"
-BUILD_DEPENDS="fuse-dev liblzma-dev"
+BUILD_DEPENDS="gfortran fuse-dev xz-dev"
+SPLIT="avfs-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
-		--prefix=/usr \
 		--enable-fuse \
 		$CONFIGURE_ARGS &&
 	make &&
@@ -28,9 +27,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/lib/avfs $fs/usr/lib
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	case $PACKAGE in
+		avfs)
+			copy @std
+			DEPENDS="fuse liblzma"
+			;;
+		*-dev)
+			copy @dev
+			DEPENDS="avfs xz-dev"
+			;;
+	esac
 }
diff -r bd61370c8ddc -r f3a2b92891b4 c_icap-dev/receipt
--- a/c_icap-dev/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="c_icap-dev"
-VERSION="0.1.7"
-CATEGORY="development"
-SHORT_DESC="Implementation of an ICAP server."
-MAINTAINER="erjo@slitaz.org"
-LICENSE="LGPL2.1"
-WEB_SITE="http://c-icap.sourceforge.net/"
-WANTED="c_icap"
-
-DEPENDS="c_icap"
-BUILD_DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib/c_icap \
-		$fs/usr/bin
-	
-	cp -a $install/usr/bin/c-icap-config $fs/usr/bin
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-	cp -a $install/usr/lib/c_icap/*.*a $fs/usr/lib/c_icap
-	cp -a $install/usr/include $fs/usr
-}
diff -r bd61370c8ddc -r f3a2b92891b4 c_icap/receipt
--- a/c_icap/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ b/c_icap/receipt	Wed Jul 19 14:10:52 2017 +0300
@@ -1,58 +1,57 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="c_icap"
 VERSION="0.1.7"
 CATEGORY="network"
-SHORT_DESC="Implementation of an ICAP server."
+SHORT_DESC="Implementation of an ICAP server"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://c-icap.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/c-icap/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="zlib-dev"
+SPLIT="c_icap-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure  --sysconfdir=/etc/c-icap \
+	./configure \
+		--sysconfdir=/etc/c-icap \
 		--enable-large-files \
-		$CONFIGURE_ARGS && make && make install
+		$CONFIGURE_ARGS &&
+	make && make install &&
+
+	mkdir -p $install/etc/init.d/ $install/var/log/c-icap/ &&
+	install -m755 $stuff/c-icapd $install/etc/init.d &&
+
+	# Fix config file
+	sed -i -e "s|YourServerName|localhost|;
+		s|/usr/var/log|/var/log/c-icap/|;
+		s|/usr/var/run/|/var/run/c-icap|;
+		s|/usr/etc|/etc/c-icap|" $install/etc/c-icap/c-icap.conf &&
+	chmod -x $install/etc/c-icap/*
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/$PACKAGE \
-		$fs/etc/init.d \
-		$fs/var/log/c-icap
-						
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/lib/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE
-	
-	cp -pa $install/etc $fs/
-	cp -pa $stuff/c-icapd $fs/etc/init.d
-	
-	# Cleanup
-	rm -f $fs/usr/bin/c-icap-config
-	
-	# Fix config file
-	sed -i -e "s|YourServerName|localhost|" \
-		-e "s|/usr/var/log|/var/log/c-icap/|" \
-		-e "s|/usr/var/run/|/var/run/c-icap|" \
-		-e "s|/usr/etc|/etc/c-icap|" $fs/etc/c-icap/c-icap.conf
-	chmod -x $fs/etc/c-icap/*
-		
+	case $PACKAGE in
+		c_icap)
+			copy @std var/log/c-icap/
+			;;
+		*-dev)
+			copy @dev
+			;;
+	esac
 }
 
-post_install()
-{
+post_install_c_icap() {
 	[ -z "$1" -a ! -s /aufs-umount.sh ] && /etc/init.d/c-icapd start
-			
-	cat <<EOF
-	
+
+	[ -n "$quiet" ] || cat <<EOF
+
 ----
 To start $PACKAGE server you can run :
 
@@ -63,16 +62,14 @@
 EOF
 }
 
-pre_remove(){
-		
-		echo "Stopping daemon..."
-		if (ps | grep -q c-icap); then
-			chroot "$1/" /etc/init.d/c-icapd stop
-		fi
+pre_remove_c_icap() {
+	echo "Stopping daemon..."
+	if (ps | grep -q c-icap); then
+		chroot "$1/" /etc/init.d/c-icapd stop
+	fi
 }
-post_remove()
-{
+post_remove_c_icap() {
 	echo "Removing stalled files..."
-	test -d "$1/var/log/c-icap" && rm -rf "$1/var/log/c-icap"
-	test -d "$1/usr/run/c-icap" && rm -rf "$1/usr/run/c-icap"
+	[ -d "$1/var/log/c-icap" ] && rm -rf "$1/var/log/c-icap"
+	[ -d "$1/usr/run/c-icap" ] && rm -rf "$1/usr/run/c-icap"
 }
diff -r bd61370c8ddc -r f3a2b92891b4 xz/receipt
--- a/xz/receipt	Sat Jul 15 15:20:02 2017 +0300
+++ b/xz/receipt	Wed Jul 19 14:10:52 2017 +0300
@@ -14,7 +14,7 @@
 WGET_URL="$WEB_SITE$TARBALL"
 
 BUILD_DEPENDS="gettext"
-SPLIT="xz-tools xz liblzma liblzma-dev xz-dev"
+SPLIT="xz-tools xz liblzma xz-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -54,15 +54,9 @@
 			CAT="libs|library"
 			DEPENDS=" "
 			;;
-		liblzma-dev)
-			copy liblzma.la liblzma.pc
-			CAT="development|library development files"
-			DEPENDS="liblzma"
-			;;
 		xz-dev)
 			copy @dev
-			find $fs -name 'liblzma.*' -delete
-			DEPENDS="xz xz-tools liblzma liblzma-dev"
+			rm -r $fs/usr/share/
 			PROVIDE="liblzma-dev"
 			;;
 	esac