Skip to content

work in progress: apk 3 #2137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcandre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

work in progress: apk 3 #2137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions lib/fpm/package/apk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,14 @@ def output(output_path)
# data tar.
tar_path(staging_path(""), datatar_path)

begin
# calculate/rewrite sha1 hashes for data tar
hash_datatar_sha1(datatar_path)
end

# control tar.
begin
write_pkginfo(control_path)
write_pkginfo(control_path, datatar_path)
write_control_scripts(control_path)
tar_path(control_path, controltar_path)
ensure
Expand All @@ -106,9 +111,6 @@ def output(output_path)
# cut end-of-tar record from control tar
cut_tar_record(controltar_path)

# calculate/rewrite sha1 hashes for data tar
hash_datatar(datatar_path)

# concatenate the two into the final apk
concat_zip_tars(controltar_path, datatar_path, output_path)
end
Expand All @@ -117,7 +119,7 @@ def output(output_path)
logger.warn("It's recommended that your package be installed with '--allow-untrusted'")
end

def write_pkginfo(base_path)
def write_pkginfo(base_path, datatar_path)

pkginfo = ""

Expand All @@ -134,6 +136,8 @@ def write_pkginfo(base_path)
pkginfo << "depend = #{dependency}\n"
end

pkginfo << "datahash = #{Digest::SHA256.file(datatar_path).hexdigest.downcase}\n"

File.write("#{base_path}/.PKGINFO", pkginfo)
end

Expand Down Expand Up @@ -215,7 +219,7 @@ def cut_tar_record(target_path)
# Rewrites the tar file located at the given [target_tar_path]
# to have its record headers use a simple checksum,
# and the apk sha1 hash extension.
def hash_datatar(target_path)
def hash_datatar_sha1(target_path)

header = extension_header = ""
data = extension_data = ""
Expand Down Expand Up @@ -264,7 +268,7 @@ def hash_datatar(target_path)
full_record_path = full_record_path.chop()
end
else
extension_data = hash_record(data)
extension_data = hash_record_sha1(data)
end

full_record_path = pad_string_to(full_record_path, 100)
Expand Down Expand Up @@ -365,7 +369,7 @@ def checksum_header(header)

# SHA-1 hashes the given data, then places it in the APK hash string format
# then returns.
def hash_record(data)
def hash_record_sha1(data)

# %u %s=%s\n
# len name=hash
Expand Down