deb packaging update

VERSION.sh

@@ -28,7 +28,7 @@ case $1 in
 	--help) displayHelp; exit 0;;
 esac
 
-THOR_VER="110.0.5481.178"
+THOR_VER="110.0.5481.179"
 
 export THOR_VER &&
 

src/chrome/installer/linux/common/installer.include

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Alex313031
+# Copyright (c) 2023 Alex313031
 # Shows the output of a given command only on failure, or when VERBOSE is set.
 log_cmd() {
   if [ "${VERBOSE:-}" ]; then
@@ -150,7 +150,7 @@ stage_install_common() {
   # crashpad
   strippedfile="${OUTPUTDIR}/chrome_crashpad_handler.stripped"
   install -m 755 "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/chrome_crashpad_handler"
-  
+
   # Final permissions for the chrome-management-service will be set in
   # postinst chrome_management_service_setup().
   strippedfile="${OUTPUTDIR}/chrome_management_service.stripped"
@@ -235,7 +235,7 @@ stage_install_common() {
     find "${STAGEDIR}/${INSTALLDIR}/WidevineCdm" -name libwidevinecdm.so \
       -exec chmod ${SHLIB_PERMS} '{}' \;
   fi
-  
+
   # ClearKey CDM.
   if [ -d "${OUTPUTDIR}/ClearKeyCdm" ]; then
     # No need to strip; libclearkeycdm.so starts out stripped.
@@ -450,7 +450,7 @@ stage_install_common() {
     elif [[ "${file_type}" = *"shell script"* ]]; then
       local expected_perms=755
     elif [[ "${file_type}" = ELF* ]]; then
-      if [[ "${base_name}" = *".so" ]]; then
+      if [[ "${base_name}" = *".so" || "${base_name}" = *".so."[[:digit:]]* ]]; then
         local expected_perms=${SHLIB_PERMS}
       else
         local expected_perms=755

src/chrome/installer/linux/debian/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2022 The Chromium Authors and Alex313031.
+# Copyright 2023 The Chromium Authors and Alex313031
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -21,7 +21,7 @@ gen_changelog() {
   process_template "${SCRIPTDIR}/changelog.template" "${DEB_CHANGELOG}"
   debchange -a --nomultimaint -m --changelog "${DEB_CHANGELOG}" \
     "Release Notes: ${RELEASENOTES}"
-  GZLOG="${STAGEDIR}/usr/share/doc/${PACKAGE}-${CHANNEL}/changelog.gz"
+  GZLOG="${STAGEDIR}/usr/share/doc/${PACKAGE}/changelog.gz"
   mkdir -p "$(dirname "${GZLOG}")"
   gzip -9 -c "${DEB_CHANGELOG}" > "${GZLOG}"
   chmod 644 "${GZLOG}"
@@ -30,7 +30,7 @@ gen_changelog() {
 # Create the Debian control file needed by dpkg-deb.
 gen_control() {
   dpkg-gencontrol -v"${VERSIONFULL}" -c"${DEB_CONTROL}" -l"${DEB_CHANGELOG}" \
-  -f"${DEB_FILES}" -p"${PACKAGE}-${CHANNEL}" -P"${STAGEDIR}" \
+  -f"${DEB_FILES}" -p"${PACKAGE}" -P"${STAGEDIR}" \
   -O > "${STAGEDIR}/DEBIAN/control"
   rm -f "${DEB_CONTROL}"
 }
@@ -49,18 +49,18 @@ stage_install_debian() {
   # Always use a different name for /usr/bin symlink depending on channel.
   # First, to avoid file collisions. Second, to make it possible to
   # use update-alternatives for /usr/bin/google-chrome.
-  local USR_BIN_SYMLINK_NAME="${PACKAGE}-${CHANNEL}"
+  local USR_BIN_SYMLINK_NAME="${PACKAGE}"
 
   local PACKAGE_ORIG="${PACKAGE}"
   if [ "$CHANNEL" != "stable" ]; then
     # Avoid file collisions between channels.
     local INSTALLDIR="${INSTALLDIR}"
 
-    local PACKAGE="${PACKAGE}-${CHANNEL}"
+    local PACKAGE="${PACKAGE}"
 
     # Make it possible to distinguish between menu entries
     # for different channels.
-    local MENUNAME="${MENUNAME} (${CHANNEL})"
+    local MENUNAME="${MENUNAME}"
   fi
   prep_staging_debian
   SHLIB_PERMS=644
@@ -92,7 +92,7 @@ verify_package() {
   local EXPECTED_DEPENDS="${TMPFILEDIR}/expected_deb_depends"
   local ACTUAL_DEPENDS="${TMPFILEDIR}/actual_deb_depends"
   echo ${DEPENDS} | sed 's/, /\n/g' | LANG=C sort > "${EXPECTED_DEPENDS}"
-  dpkg -I "${PACKAGE}-${CHANNEL}_${VERSIONFULL}_${ARCHITECTURE}.deb" | \
+  dpkg -I "${PACKAGE}_${VERSIONFULL}_${ARCHITECTURE}.deb" | \
       grep '^ Depends: ' | sed 's/^ Depends: //' | sed 's/, /\n/g' | \
       LANG=C sort > "${ACTUAL_DEPENDS}"
   BAD_DIFF=0
@@ -118,12 +118,17 @@ do_package() {
   if [ -f "${DEB_CONTROL}" ]; then
     gen_control
   fi
+  log_cmd fakeroot dpkg-deb -Znone -b "${STAGEDIR}" "${TMPFILEDIR}"
+  local PACKAGEFILE="${PACKAGE}_${VERSIONFULL}_${ARCHITECTURE}.deb"
   if [ ${IS_OFFICIAL_BUILD} -ne 0 ]; then
-    local COMPRESSION_OPTS="-Zxz -z9"
-  else
-    local COMPRESSION_OPTS="-Znone"
+    (cd "${TMPFILEDIR}" && ar -x "${TMPFILEDIR}/${PACKAGEFILE}")
+    xz -z9 -T0 --lzma2='dict=256MiB' "${TMPFILEDIR}/data.tar"
+    xz -z0 "${TMPFILEDIR}/control.tar"
+    ar -d "${TMPFILEDIR}/${PACKAGEFILE}" control.tar data.tar
+    ar -r "${TMPFILEDIR}/${PACKAGEFILE}" "${TMPFILEDIR}/control.tar.xz" \
+      "${TMPFILEDIR}/data.tar.xz"
   fi
-  log_cmd fakeroot dpkg-deb ${COMPRESSION_OPTS} -b "${STAGEDIR}" .
+  mv "${TMPFILEDIR}/${PACKAGEFILE}" .
   verify_package "$DEPENDS"
 }