diff & merge fixed (dirty hack to treat symlinks right)

"elinks" is purged by "harden"

cryptobox.conf.d/usr/lib/cryptobox/configure-cryptobox.sh

@@ -14,7 +14,7 @@ set -eu
 RUNTIMEDIR=/opt/dfsruntime/runtimerd
 TUNDEV=$RUNTIMEDIR/dev/net/tun
 
-SECURITY_REMOVE_PACKAGES="ssh strace telnet unzip tar zip wget ppp pppconfig nvi nano gzip curl bzip2 aptitude tasksel pppoe pppoeconf"
+SECURITY_REMOVE_PACKAGES="ssh strace telnet unzip tar zip wget ppp pppconfig nvi nano gzip curl bzip2 aptitude tasksel pppoe pppoeconf elinks"
 
 
 function configure_normal()

cryptobox.conf.d/usr/lib/cryptobox/devel-features.sh

@@ -49,7 +49,9 @@ case "$ACTION" in
 		# ignore generated reports
 		# ignore cryptobox.pl and index.html, as those are the same as
 		# /var/www/cryptobox (symbilic links)
-		diff -ruN --exclude=report --exclude=cryptobox.pl --exclude=index.html "`basename \"$MIRROR_ORIG_DIR\"`" "`basename \"$MIRROR_DIR\"`" | grep -v "^Binary files"
+		# replace the link name (/var/www/cryptobox) by its destination
+		# UGLY!
+		diff -ruN --exclude=report --exclude=cryptobox.pl --exclude=index.html "`basename \"$MIRROR_ORIG_DIR\"`" "`basename \"$MIRROR_DIR\"`" | grep -v "^Binary files" | sed 's#/var/www/cryptobox\t#/var/www/cgi-bin/cryptobox.pl\t#'
 		;;
 	stop )
 		/etc/init.d/ssh stop