# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1585822963 -7200
# Node ID a1821e12e28a2fab73bda2dd0c37f8d47e26d3e5
# Parent  2f82f2467b46824dc1364ac684420bdc9aff608d
linux-zram: autostart

diff -r 2f82f2467b46 -r a1821e12e28a cyrus-sasl-dev/receipt
--- a/cyrus-sasl-dev/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/cyrus-sasl-dev/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="SASL authentication server - development files"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://cyrusimap.org/sasl/"
+WEB_SITE="https://www.cyrusimap.org/sasl/"
 
 WANTED="cyrus-sasl"
 DEPENDS="cyrus-sasl"
diff -r 2f82f2467b46 -r a1821e12e28a cyrus-sasl-pam/receipt
--- a/cyrus-sasl-pam/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/cyrus-sasl-pam/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -6,11 +6,11 @@
 SHORT_DESC="SASL authentication server using PAM."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://cyrusimap.org/sasl"
+WEB_SITE="https://www.cyrusimap.org/sasl"
 
 SOURCE="cyrus-sasl"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="http://cyrusimap.org/releases/$SOURCE-$VERSION.tar.gz"
+WGET_URL="https://www.cyrusimap.org/releases/$SOURCE-$VERSION.tar.gz"
 
 PROVIDE="cyrus-sasl:pam"
 DEPENDS="libcomerr3 libdb libkrb5 libldap openssl pam"
diff -r 2f82f2467b46 -r a1821e12e28a cyrus-sasl/receipt
--- a/cyrus-sasl/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/cyrus-sasl/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -7,10 +7,10 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 
-WEB_SITE="https://cyrusimap.org/sasl"
+WEB_SITE="https://www.cyrusimap.org/sasl"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://cyrusimap.org/releases/$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://www.cyrusimap.org/releases/$PACKAGE-$VERSION.tar.gz"
 
 DEPENDS="libcomerr3 libdb libldap libsasl libsasl-modules openssl"
 BUILD_DEPENDS="db-dev openldap-dev openssl-dev"
diff -r 2f82f2467b46 -r a1821e12e28a libsasl-modules/receipt
--- a/libsasl-modules/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/libsasl-modules/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="SASL library modules."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://cyrusimap.org/sasl/"
+WEB_SITE="https://www.cyrusimap.org/sasl/"
 
 PROVIDE="libsasl-without-ldap"
 WANTED="cyrus-sasl"
diff -r 2f82f2467b46 -r a1821e12e28a libsasl-without-ldap/receipt
--- a/libsasl-without-ldap/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/libsasl-without-ldap/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -6,11 +6,11 @@
 SHORT_DESC="Cyrus Simple Authentication Service Layer (SASL) library."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://cyrusimap.org/sasl/"
+WEB_SITE="https://www.cyrusimap.org/sasl/"
 
 SOURCE="cyrus-sasl"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="http://cyrusimap.org/releases/$TARBALL"
+WGET_URL="https://www.cyrusimap.org/releases/$TARBALL"
 
 DEPENDS="db openssl"
 BUILD_DEPENDS="db-dev openssl-dev"
diff -r 2f82f2467b46 -r a1821e12e28a libsasl/receipt
--- a/libsasl/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/libsasl/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="SASL library."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://cyrusimap.org/sasl"
+WEB_SITE="https://www.cyrusimap.org/sasl"
 
 WANTED="cyrus-sasl"
 
diff -r 2f82f2467b46 -r a1821e12e28a linux-zram/receipt
--- a/linux-zram/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/linux-zram/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -33,15 +33,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	chroot "$root/" depmod -a $VERSION-slitaz &&
-	RAM=`cat /proc/meminfo | grep MemTotal | sed s/[^0-9]//g` &&
-	echo "SIZE_KB="$(($RAM/2)) > /etc/compcache.conf
-	cat <<EOT
-
-You can add compressed swap according /etc/compcache.conf configuration with:
-# /etc/init.d/compcache start
-Or add compcache in the RUN_DAEMONS list of /etc/rcS.conf.
-EOT
+	chroot "$root/" depmod -a $VERSION-slitaz
+	grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "compcache" || sed -i \
+	  's/RUN_DAEMONS="/RUN_DAEMONS="compcache /' "$1/etc/rcS.conf"
+	[ -z "$1" ] && /etc/init.d/compcache start
 }
 
 post_remove()
diff -r 2f82f2467b46 -r a1821e12e28a linux-zram/stuff/compcache
--- a/linux-zram/stuff/compcache	Thu Apr 02 09:19:42 2020 +0100
+++ b/linux-zram/stuff/compcache	Thu Apr 02 12:22:43 2020 +0200
@@ -16,13 +16,17 @@
       _ '%s is already running.' $NAME
       exit 1
     fi
+    if [ -z "$SIZE" -o "$SIZE" = "0%" ]; then
+      _ '%s disabled in %s.' $NAME '/etc/compcache.conf'
+      exit 1
+    fi
     action 'Loading module...'
     devices=$(awk '/cpu cores/{c=$4} /processor/{p++}
 	END { if (c>0) p=c; if (p==0) p++; print p }' /proc/cpuinfo)
     modprobe zram num_devices=$devices &&
-    [ -n "$SIZE_KB" ] && for i in $(seq 0 $(($devices-1))); do
-	awk "END { print $SIZE_KB * 1024 / $devices }" < /dev/null \
-		> /sys/block/zram$i/disksize
+    for i in $(seq 0 $(($devices-1))); do
+	awk "/MemTotal/ { print \$2 * 1024 * ${SIZE%\%} * / 100 / $devices }" \
+		< /proc/meminfo > /sys/block/zram$i/disksize
     done
     status
 
diff -r 2f82f2467b46 -r a1821e12e28a linux-zram/stuff/compcache.conf
--- a/linux-zram/stuff/compcache.conf	Thu Apr 02 09:19:42 2020 +0100
+++ b/linux-zram/stuff/compcache.conf	Thu Apr 02 12:22:43 2020 +0200
@@ -1,1 +1,1 @@
-SIZE_KB=20480
+SIZE=50%
diff -r 2f82f2467b46 -r a1821e12e28a linux64-zram/receipt
--- a/linux64-zram/receipt	Thu Apr 02 09:19:42 2020 +0100
+++ b/linux64-zram/receipt	Thu Apr 02 12:22:43 2020 +0200
@@ -21,8 +21,7 @@
 	install=$install/linux64
 	path=lib/modules/$VERSION-slitaz64/kernel
 	mkdir -p $fs/$path $fs/etc/init.d
-	export src
-	export install
+	export src install
 	$wanted_stuff/list_modules.sh drivers/block/zram | \
 	while read module; do
 		dir=$path/$(dirname $module)
@@ -37,12 +36,9 @@
 post_install()
 {
 	chroot "$root/" depmod -a $VERSION-slitaz64
-	cat <<EOT
-
-You can add compressed swap according /etc/compcache.conf configuration with:
-# /etc/init.d/compcache start
-Or add compcache in the RUN_DAEMONS list of /etc/rcS.conf.
-EOT
+	grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "compcache" || sed -i \
+	  's/RUN_DAEMONS="/RUN_DAEMONS="compcache /' "$1/etc/rcS.conf"
+	[ -z "$1" ] && /etc/init.d/compcache start
 }
 
 post_remove()
diff -r 2f82f2467b46 -r a1821e12e28a linux64-zram/stuff/compcache
--- a/linux64-zram/stuff/compcache	Thu Apr 02 09:19:42 2020 +0100
+++ b/linux64-zram/stuff/compcache	Thu Apr 02 12:22:43 2020 +0200
@@ -16,13 +16,17 @@
       _ '%s is already running.' $NAME
       exit 1
     fi
+    if [ -z "$SIZE" -o "$SIZE" = "0%" ]; then
+      _ '%s disabled in %s.' $NAME '/etc/compcache.conf'
+      exit 1
+    fi
     action 'Loading module...'
     devices=$(awk '/cpu cores/{c=$4} /processor/{p++}
 	END { if (c>0) p=c; if (p==0) p++; print p }' /proc/cpuinfo)
     modprobe zram num_devices=$devices &&
-    [ -n "$SIZE_KB" ] && for i in $(seq 0 $(($devices-1))); do
-	awk "END { print $SIZE_KB * 1024 / $devices }" < /dev/null \
-		> /sys/block/zram$i/disksize
+    for i in $(seq 0 $(($devices-1))); do
+	awk "/MemTotal/ { print \$2 * 1024 * ${SIZE%\%} * / 100 / $devices }" \
+		< /proc/meminfo > /sys/block/zram$i/disksize
     done
     status
 
diff -r 2f82f2467b46 -r a1821e12e28a linux64-zram/stuff/compcache.conf
--- a/linux64-zram/stuff/compcache.conf	Thu Apr 02 09:19:42 2020 +0100
+++ b/linux64-zram/stuff/compcache.conf	Thu Apr 02 12:22:43 2020 +0200
@@ -1,1 +1,1 @@
-SIZE_KB=20480
+SIZE=50%