SliTaz Repositories

     1.1 --- a/lighttpd/cooker.css	Mon Jan 07 11:24:09 2019 +0200
     1.2 +++ b/lighttpd/cooker.css	Fri Jan 11 15:14:53 2019 +0200
     1.3 @@ -623,6 +623,7 @@
     1.4  	position: relative;
     1.5  	top: -1.6rem;
     1.6  }
     1.7 +#webstat .meter { display: inline; visibility: hidden; } /* forever unfinished */
     1.8  
     1.9  
    1.10  

     2.1 --- a/modules/pack	Mon Jan 07 11:24:09 2019 +0200
     2.2 +++ b/modules/pack	Fri Jan 11 15:14:53 2019 +0200
     2.3 @@ -270,12 +270,12 @@
     2.4  	save="$(mktemp)"
     2.5  	# `$(echo ...)`: normalize whitespace (space, tab, newline and their
     2.6  	# combinations and repeats)
     2.7 -	cat > $save <<EOT
     2.8 -PACKAGE="$PACKAGE"; DEPENDS="$(echo $DEPENDS)"; PROVIDE="$(echo $PROVIDE)"
     2.9 -SUGGESTED="$(echo $SUGGESTED)"; TAZPANEL_DAEMON="$TAZPANEL_DAEMON"
    2.10 -TAGS="$(echo $TAGS)"; VERSION="$VERSION"; SHORT_DESC="$SHORT_DESC"
    2.11 -WEB_SITE="$WEB_SITE"; CATEGORY="$CATEGORY"
    2.12 -EOT
    2.13 +	cat > $save <<-EOT
    2.14 +		PACKAGE="$PACKAGE"; DEPENDS="$(echo $DEPENDS)"; PROVIDE="$(echo $PROVIDE)"
    2.15 +		SUGGESTED="$(echo $SUGGESTED)"; TAZPANEL_DAEMON="$TAZPANEL_DAEMON"
    2.16 +		TAGS="$(echo $TAGS)"; VERSION="$VERSION"; SHORT_DESC="$SHORT_DESC"
    2.17 +		WEB_SITE="$WEB_SITE"; CATEGORY="$CATEGORY"
    2.18 +	EOT
    2.19  	unset_receipt
    2.20  	. "$orig_receipt"
    2.21  	MAIN_PACKAGE="$PACKAGE"

     3.1 --- a/modules/pkgdb	Mon Jan 07 11:24:09 2019 +0200
     3.2 +++ b/modules/pkgdb	Fri Jan 11 15:14:53 2019 +0200
     3.3 @@ -119,7 +119,8 @@
     3.4  _ 'Creating lists from "%s"' "$WOK" | dblog
     3.5  cd $WOK
     3.6  rsumf=$(mktemp)
     3.7 -touch $dbs/packages.desc $dbs/packages.txt $dbs/packages.info $dbs/packages.equiv
     3.8 +#touch $dbs/packages.desc $dbs/packages.txt $dbs/packages.info $dbs/packages.equiv
     3.9 +touch $dbs/packages.info $dbs/packages.equiv
    3.10  for i in *; do
    3.11  	[ -d "$WOK/$i/taz" ] || continue
    3.12  
    3.13 @@ -127,39 +128,44 @@
    3.14  		pack="$i/taz/$j"
    3.15  		[ -f "$WOK/$pack/receipt" ] || continue
    3.16  		unset_receipt
    3.17 +		unset PACKED_SIZE UNPACKED_SIZE RSUM PACKAGE VERSION EXTRAVERSION CATEGORY SHORT_DESC MAINTAINER LICENSE WEB_SITE DEPENDS TAGS PROVIDE
    3.18  		. ./$pack/receipt
    3.19  
    3.20 -		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION$arch.tazpkg" ]; then
    3.21 +		if [ -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg" -o -f "$PKGS/$PACKAGE-$VERSION$EXTRAVERSION-any.tazpkg"]; then
    3.22  
    3.23 -			# packages.desc lets us search easily in DB
    3.24 -			cat >> $dbs/packages.desc <<EOT
    3.25 -$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE
    3.26 -EOT
    3.27 -
    3.28 -			# packages.txt used by tazpkg-web also to provide
    3.29 -			# a human readable package list with version and description.
    3.30 -			cat >> $dbs/packages.txt <<EOT
    3.31 -$PACKAGE
    3.32 -$VERSION$EXTRAVERSION
    3.33 -$SHORT_DESC
    3.34 -$PACKED_SIZE ($UNPACKED_SIZE installed)
    3.35 -
    3.36 -EOT
    3.37 +#			# packages.desc lets us search easily in DB
    3.38 +#			cat >> $dbs/packages.desc <<-EOT
    3.39 +#				$PACKAGE | $VERSION$EXTRAVERSION | $SHORT_DESC | $CATEGORY | $WEB_SITE
    3.40 +#			EOT
    3.41 +#
    3.42 +#			# packages.txt used by tazpkg-web also to provide
    3.43 +#			# a human readable package list with version and description.
    3.44 +#			cat >> $dbs/packages.txt <<-EOT
    3.45 +#				$PACKAGE
    3.46 +#				$VERSION$EXTRAVERSION
    3.47 +#				$SHORT_DESC
    3.48 +#				$PACKED_SIZE ($UNPACKED_SIZE installed)
    3.49 +#
    3.50 +#			EOT
    3.51  
    3.52  			# packages.info combines TazPkg separate files
    3.53  			# and will substitute them all
    3.54  			SIZES=$(echo $PACKED_SIZE $UNPACKED_SIZE | sed 's|\.0||g')
    3.55  			DEPENDS=$(echo $DEPENDS) # remove newlines from some receipts
    3.56  
    3.57 -			#MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')"
    3.58 -			cp $pack/md5sum $rsumf
    3.59 -			md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf
    3.60 -			[ -e "$pack/description.txt" ] && md5sum $pack/description.txt | sed 's| [^ ]*/| |' >> $rsumf
    3.61 -			rsum=$(md5sum $rsumf | awk '{print $1}')
    3.62 +#			#MD5="$(fgrep " $PACKAGE-$VERSION$EXTRAVERSION.tazpkg" $PKGS/packages.md5 | awk '{print $1}')"
    3.63  
    3.64 -			cat >> $dbs/packages.info <<EOT
    3.65 -$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$rsum	$PROVIDE
    3.66 -EOT
    3.67 +			# RSUM defined in new "small" receipts, but may be absent in old
    3.68 +			if [ -z "$RSUM" ]; then
    3.69 +				cp $pack/md5sum $rsumf
    3.70 +				md5sum $pack/receipt | sed 's| [^ ]*/| |' >> $rsumf
    3.71 +				[ -e "$pack/description.txt" ] && md5sum $pack/description.txt | sed 's| [^ ]*/| |' >> $rsumf
    3.72 +				RSUM=$(md5sum $rsumf | awk '{print $1}')
    3.73 +			fi
    3.74 +
    3.75 +			cat >> $dbs/packages.info <<-EOT
    3.76 +				$PACKAGE	$VERSION$EXTRAVERSION	$CATEGORY	$SHORT_DESC	$WEB_SITE	$TAGS	$SIZES	$DEPENDS	$RSUM	$PROVIDE
    3.77 +			EOT
    3.78  
    3.79  			# packages.equiv is used by tazpkg install to check depends.
    3.80  			for k in $PROVIDE; do
    3.81 @@ -264,6 +270,7 @@
    3.82  { _ 'Packages: %s - Time: %ss' "$nb" "$time"; newline; } | dblog
    3.83  
    3.84  # "Atomic" update now
    3.85 +ls -l $dbs
    3.86  cp -f $dbs/* $PKGS
    3.87  rm -r $dbs
    3.88  

     4.1 --- a/modules/postcheck	Mon Jan 07 11:24:09 2019 +0200
     4.2 +++ b/modules/postcheck	Fri Jan 11 15:14:53 2019 +0200
     4.3 @@ -262,7 +262,7 @@
     4.4  		if [ "$result" == 'bad' ]; then
     4.5  			echo "  Problems found:"
     4.6  			for i in $bad_sl; do
     4.7 -				stat -c '  %N'
     4.8 +				stat -c '  %N' $i
     4.9  			done
    4.10  		fi
    4.11  		unset IFS