The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.
--- Begin Message ---
Otherwise tar will keep the sgid bit when running from a sgid-set
directory, resulting in a different file being generated.

Signed-off-by: Eneas U de Queiroz <cote2004-git...@yahoo.com>
---

Notes:
    This fixes an issue exposed in
    https://github.com/openwrt/packages/pull/8513
    
    Tested it by reproducing the wrong tarball with master by setting ./tmp
    sgid.  Then applied the patch and ran it again, ending up with the right
    file.

diff --git a/include/download.mk b/include/download.mk
index 33141910fc..09794e155e 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -55,7 +55,8 @@ define dl_pack
        $(if $(dl_pack/$(call ext,$(1))),$(dl_pack/$(call 
ext,$(1))),$(dl_pack/unknown))
 endef
 define dl_tar_pack
-       $(TAR) --numeric-owner --owner=0 --group=0 --sort=name 
$$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | $(call dl_pack,$(1))
+       $(TAR) --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \
+               $$$${TAR_TIMESTAMP:+--mtime="$$$$TAR_TIMESTAMP"} -c $(2) | 
$(call dl_pack,$(1))
 endef
 
 ifdef CHECK
diff --git a/include/image.mk b/include/image.mk
index 9e40a54f51..b91a3a3d7a 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -291,7 +291,7 @@ endef
 
 ifdef CONFIG_TARGET_ROOTFS_TARGZ
   define Image/Build/targz
-       $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \
+       $(TAR) -cp --numeric-owner --owner=0 --group=0 --mode=a-s --sort=name \
                $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
                -C $(TARGET_DIR)/ . | gzip -9n > $(BIN_DIR)/$(IMG_PREFIX)$(if 
$(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))-rootfs.tar.gz
   endef


--- End Message ---
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to