You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/04/28 17:38:37 UTC

svn commit: r1900364 - /spamassassin/trunk/build/mkupdates/mkupdate-with-scores

Author: hege
Date: Thu Apr 28 17:38:37 2022
New Revision: 1900364

URL: http://svn.apache.org/viewvc?rev=1900364&view=rev
Log:
Use zopfli for better compression, clean up paths from hashfiles

Modified:
    spamassassin/trunk/build/mkupdates/mkupdate-with-scores

Modified: spamassassin/trunk/build/mkupdates/mkupdate-with-scores
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/mkupdate-with-scores?rev=1900364&r1=1900363&r2=1900364&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/mkupdate-with-scores (original)
+++ spamassassin/trunk/build/mkupdates/mkupdate-with-scores Thu Apr 28 17:38:37 2022
@@ -121,6 +121,8 @@ test_version() {
 }
 
 make_rule_update_from_trunk() {
+  cd $TMPDIR
+
   # to heck with dealing with svn update failures
   rm -rf trunk trunk-rulesrc-scores
 
@@ -168,16 +170,17 @@ make_rule_update_from_trunk() {
 
   ../spamassassin --lint -D
 
-  tar cvf - *.cf *.txt languages user_prefs.template | gzip -9 > $TMPDIR/${REVISION}.tar.gz
-
-  cd ../..
-
-  shasum  -a 1 $TMPDIR/${REVISION}.tar.gz > $TMPDIR/${REVISION}.tar.gz.sha1
-  shasum  -a 256 $TMPDIR/${REVISION}.tar.gz > $TMPDIR/${REVISION}.tar.gz.sha256
-  shasum  -a 512 $TMPDIR/${REVISION}.tar.gz > $TMPDIR/${REVISION}.tar.gz.sha512
-  gpg --batch --homedir $KEYDIR -bas $TMPDIR/${REVISION}.tar.gz || exit $?
-
-  tar -ztvf $TMPDIR/${REVISION}.tar.gz
+  tar -cvf $TMPDIR/${REVISION}.tar *.cf *.txt languages user_prefs.template
+  # 5% better compression than gzip
+  zopfli $TMPDIR/${REVISION}.tar
+
+  cd $TMPDIR
+
+  tar -ztvf ${REVISION}.tar.gz
+  shasum  -a 1    ${REVISION}.tar.gz >${REVISION}.tar.gz.sha1
+  shasum  -a 256  ${REVISION}.tar.gz >${REVISION}.tar.gz.sha256
+  shasum  -a 512  ${REVISION}.tar.gz >${REVISION}.tar.gz.sha512
+  gpg --batch --homedir $KEYDIR -bas ${REVISION}.tar.gz || exit $?
 }
 
 copy_existing_update_for_reversion_testing() {