Fix a few more issues with sage-uncompress-spkg

[embray]

Fixes 2 issues:

1. An outright bug following from Unpack all upstream tarballs into 'src' directory #20721: If the files in a tarball are not all under a top-level directory (shouldn't be the case, but possible), the -d flag did not work as advertised.

2. Always unset setuid and setgid flags. There's no reason they should be set in a source tarball (I don't think?) and it will mitigate issues like nauty upstream source tarball has setgid on top-level directory #20870

Component: build

Author: Erik Bray

Branch/Commit: 0c2c9d4

Reviewer: Matthias Koeppe

Issue created by migration from https://trac.sagemath.org/ticket/20871

[mkoeppe]

Reviewer: Matthias Koeppe

[mkoeppe]

comment:4

There is still an issue with zip files.

sage -i bliss gives:

[bliss-0.73] Found local metadata for bliss-0.73
[bliss-0.73] Using cached file /Users/mkoeppe/cvs/sage/upstream/bliss-0.73.zip
[bliss-0.73] bliss-0.73
[bliss-0.73] ====================================================
[bliss-0.73] Setting up build directory for bliss-0.73
[bliss-0.73] Traceback (most recent call last):
[bliss-0.73]   File "/Users/mkoeppe/cvs/sage/build/bin/sage-uncompress-spkg", line 260, in <module>
[bliss-0.73]     sys.exit(main())
[bliss-0.73]   File "/Users/mkoeppe/cvs/sage/build/bin/sage-uncompress-spkg", line 212, in main
[bliss-0.73]     archive = cls.open(filename)
[bliss-0.73] TypeError: unbound method open() must be called with SageZipFile instance as first argument (got str instance instead)
[bliss-0.73] Error: failed to extract /Users/mkoeppe/cvs/sage/upstream/bliss-0.73.zip

[embray]

comment:5

There is still an issue with zip files.

Was this reported before?

Might as well fix it as part of this ticket too while I'm fixing bugs.

It looks like the ZipFile class is inconsistent with the TarFile class, where open is a classmethod. I think I knew that but forgot this time.

[mkoeppe]

comment:6

Replying to @embray:

There is still an issue with zip files.

Was this reported before?

I didn't see a report; but zip files did work in the past. Perhaps introduced in #20721? I didn't catch it at this time.

Might as well fix it as part of this ticket too while I'm fixing bugs.

Thanks.

[vbraun]

Changed branch from u/embray/unpack-tarball-src to 30ac0a6

[vbraun]

Changed commit from 30ac0a6 to none

[vbraun]

New commits:

3ea4482	Fix bug with -d option when there is no single top-level directory in the tarball--the script was not doing what it's supposed to in this case
30ac0a6	Also unset SUID and SGID flags on extracted files, to prevent issues like https://github.com/sagemath/sage/issues/20870#

[vbraun]

Changed branch from 30ac0a6 to u/embray/unpack-tarball-src

[vbraun]

Commit: 30ac0a6

[embray]

comment:10

What just happened here?

[sagetrac-git]

Changed commit from 30ac0a6 to 40449bf

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. New commits:

40449bf

Fix zip file opening.

[vbraun]

comment:12

I merged the positively-reviewed ticket, all tests passed, and then I closed the ticket.

[embray]

comment:13

The status was needs_work though. I just pushed another commit that should have been included.

[vbraun]

comment:14

The status was positive review when I merged the ticket.

[mkoeppe]

comment:16

Branch works now, but may need merge/rebase.

[vbraun]

comment:17

Merge conflict

[sagetrac-git]

Changed commit from 40449bf to 0c2c9d4

[sagetrac-git]

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

c6ce4aa	Fix bug with -d option when there is no single top-level directory in the tarball--the script was not doing what it's supposed to in this case
66d67dc	Also unset SUID and SGID flags on extracted files, to prevent issues like https://github.com/sagemath/sage/issues/20870#
0c2c9d4	Fix zip file opening.

[embray]

comment:19

Rebased.

[vbraun]

Changed branch from u/embray/unpack-tarball-src to 0c2c9d4