wok diff c_icap/receipt @ rev 23983

linld: fix strtol
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Nov 24 08:47:45 2020 +0000 (2020-11-24)
parents 0cf279b4394a
children 9af0e03b8ad0
line diff
     1.1 --- a/c_icap/receipt	Tue Feb 12 16:35:35 2019 +0100
     1.2 +++ b/c_icap/receipt	Tue Nov 24 08:47:45 2020 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="c_icap"
     1.7 -VERSION="0.5.5"
     1.8 +VERSION="0.5.6"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Implementation of an ICAP server."
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12 @@ -17,9 +17,9 @@
    1.13  # Rules to configure and make the package.
    1.14  compile_rules()
    1.15  {
    1.16 -	./configure \
    1.17 -		--sysconfdir=/etc/c-icap \
    1.18 -		--enable-large-files \
    1.19 +	./configure				\
    1.20 +		--sysconfdir=/etc/c-icap	\
    1.21 +		--enable-large-files		\
    1.22  		$CONFIGURE_ARGS &&
    1.23  	make &&
    1.24  	make install
    1.25 @@ -28,33 +28,33 @@
    1.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.27  genpkg_rules()
    1.28  {
    1.29 -	mkdir -p $fs/usr/lib/$PACKAGE \
    1.30 -		$fs/etc/init.d \
    1.31 -		$fs/var/log/c-icap
    1.32 -						
    1.33 -	cp -a $install/usr/bin $fs/usr
    1.34 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.35 -	cp -a $install/usr/lib/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE
    1.36 -	
    1.37 -	cp -pa $install/etc $fs/
    1.38 -	cp -pa $stuff/c-icapd $fs/etc/init.d
    1.39 -	
    1.40 +	mkdir -p $fs/usr/lib/$PACKAGE
    1.41 +	mkdir -p $fs/etc/init.d
    1.42 +	mkdir -p $fs/var/log/c-icap
    1.43 +
    1.44 +	cp -a $install/usr/bin			$fs/usr
    1.45 +	cp -a $install/usr/lib/*.so*		$fs/usr/lib
    1.46 +	cp -a $install/usr/lib/$PACKAGE/*.so*	$fs/usr/lib/$PACKAGE
    1.47 +	cp -pa $install/etc			$fs/
    1.48 +	cp -pa $stuff/c-icapd			$fs/etc/init.d
    1.49 +
    1.50  	# Cleanup
    1.51  	rm -f $fs/usr/bin/c-icap-config
    1.52 -	
    1.53 -	# Fix config file
    1.54 -	sed -i -e "s|YourServerName|localhost|" \
    1.55 -		-e "s|/usr/var/log|/var/log/c-icap/|" \
    1.56 -		-e "s|/usr/var/run/|/var/run/c-icap|" \
    1.57 -		-e "s|/usr/etc|/etc/c-icap|" $fs/etc/c-icap/c-icap.conf
    1.58 +
    1.59 +	# Fix configuration file
    1.60 +	sed -i	-e "s|YourServerName|localhost|"	\
    1.61 +		-e "s|/usr/var/log|/var/log/c-icap/|"	\
    1.62 +		-e "s|/usr/var/run/|/var/run/c-icap|"	\
    1.63 +		-e "s|/usr/etc|/etc/c-icap|"		\
    1.64 +		$fs/etc/c-icap/c-icap.conf
    1.65  	chmod -x $fs/etc/c-icap/*
    1.66 -		
    1.67  }
    1.68  
    1.69  post_install()
    1.70  {
    1.71 -	[ -z "$1" -a ! -s /aufs-umount.sh ] && /etc/init.d/c-icapd start
    1.72 -			
    1.73 +	[ -z "$1" -a ! -s /aufs-umount.sh ] &&
    1.74 +	/etc/init.d/c-icapd start
    1.75 +
    1.76  	cat <<EOF
    1.77  	
    1.78  ----
    1.79 @@ -67,13 +67,15 @@
    1.80  EOF
    1.81  }
    1.82  
    1.83 -pre_remove(){
    1.84 -		
    1.85 +pre_remove()
    1.86 +{
    1.87  		echo "Stopping daemon..."
    1.88 -		if (ps | grep -q c-icap); then
    1.89 +		if (ps | grep -q c-icap)
    1.90 +		  then
    1.91  			chroot "$1/" /etc/init.d/c-icapd stop
    1.92  		fi
    1.93  }
    1.94 +
    1.95  post_remove()
    1.96  {
    1.97  	echo "Removing stalled files..."