Fix location of files which go in dbus-1/system.d directory in multiple package (#5311)

* Update libqmi.rb

* Update libmbim.rb

* Update geoclue.rb

* Update avahi.rb

* Update pulseaudio.rb

* Update flatpak.rb

* use specific working commit for git checkout

packages/avahi.rb

@@ -3,22 +3,22 @@ require 'package'
 class Avahi < Package
   description 'Avahi is a system which facilitates service discovery on a local network via the mDNS/DNS-SD protocol suite.'
   homepage 'http://www.avahi.org/'
-  version '0.8-1'
+  version '0.8-2'
   compatibility 'all'
   source_url 'https://github.com/lathiat/avahi/releases/download/v0.8/avahi-0.8.tar.gz'
   source_sha256 '060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda'
 
-  binary_url ({
-     aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-1-chromeos-armv7l.tar.xz',
-      armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-1-chromeos-armv7l.tar.xz',
-        i686: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-1-chromeos-i686.tar.xz',
-      x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-1-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-2-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-2-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-2-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/avahi-0.8-2-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-     aarch64: '63dc17aedb4b78b919cc5f7cd0b6750173ce42fd0c2c5a134fa26d082d214a4f',
-      armv7l: '63dc17aedb4b78b919cc5f7cd0b6750173ce42fd0c2c5a134fa26d082d214a4f',
-        i686: '78fba762d54fa7ba3dece48de92b625cbec4b27327a8e3a9c9c73d785cf96a0a',
-      x86_64: '69565bde70da558b2b058acf2a4b4e861ba2732176aa7f637ba4e9330722ad00',
+  binary_sha256({
+    aarch64: 'f37472d2cacfb5bcb342209d43938ac578dfa37de30662d8b73a74d386a60d83',
+     armv7l: 'f37472d2cacfb5bcb342209d43938ac578dfa37de30662d8b73a74d386a60d83',
+       i686: '2e77803a7d2dca48ad76c0ee08544008ea330ec1824db4600766a2f968a3ced5',
+     x86_64: 'de20f11d7e0d269f7940a0b75cd9647e55ccaac1bb49a05b383b16561318a6af'
   })
 
   depends_on 'gtk3'
@@ -28,9 +28,11 @@ class Avahi < Package
   depends_on 'qtbase'
 
   def self.build
-    system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' LDFLAGS='-flto=auto' \
+    system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \
+      LDFLAGS='-flto=auto' \
       ./configure \
       #{CREW_OPTIONS} \
+      --with-dbus-sys=#{CREW_PREFIX}/share/dbus-1 \
       --with-distro=none \
       --disable-python \
       --disable-xmltoman"

packages/flatpak.rb

@@ -4,22 +4,22 @@ class Flatpak < Package
   description 'Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.'
   homepage 'https://flatpak.org'
   @_ver = '1.10.1'
-  version @_ver
+  version "#{@_ver}-1"
   compatibility 'all'
   source_url "https://github.com/flatpak/flatpak/releases/download/#{@_ver}/flatpak-#{@_ver}.tar.xz"
-  source_sha256 'c70215792b7cbece83c489dab86adc9bfaf9b140c506affe2a48c92afa3d69b7'
+  source_sha256 'c1354f42bf3b5d51aeb4028c9b62fd4ffc673ef2ff6e583c17777f5dafdbdcb7'
 
   binary_url({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-x86_64.tar.xz'
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-1-chromeos-x86_64.tar.xz'
   })
   binary_sha256({
-    aarch64: '6927a9717a15f4d52e1b2316e159a2f43026431bc91a68627bc6fce5f9634b31',
-     armv7l: '6927a9717a15f4d52e1b2316e159a2f43026431bc91a68627bc6fce5f9634b31',
-       i686: '56abe90a29219a9937b2939a71b4413d90198d7eabc1cb802b3fc6a759a93335',
-     x86_64: '588c3a2c502e0cc6088b4d17e3b133103fdeb0dc653bad0bef79674709b7bf22'
+    aarch64: '83e2e39dc010f7c028f7bbc882c5c00284b1be854aeeba1bd5a2dcd35753a2ca',
+     armv7l: '83e2e39dc010f7c028f7bbc882c5c00284b1be854aeeba1bd5a2dcd35753a2ca',
+       i686: 'e727e2e071eecd24664d3f8ff0e605c503be6caccbe90b24b4245fda9824e528',
+     x86_64: '1827d8327cc2986bb1928dfe9de2f74e05d7149b6ebe86c04ca27cf0264ad993'
   })
 
   depends_on 'xdg_base'
@@ -43,12 +43,25 @@ class Flatpak < Package
     Digest::SHA256.hexdigest(File.read(patch_filename)) == patch_sha256
     puts 'patch downloaded'.lightgreen
     system 'patch  -p 1 --forward < patch || true'
+    # Source has libglnx repo as submodule
+    @git_dir = 'libglnx'
+    @git_hash = '4c9055ac08bb64dca146724f488cce4c1ce4c628'
+    @git_url = 'https://gitlab.gnome.org/GNOME/libglnx.git'
+    FileUtils.rm_rf(@git_dir)
+    FileUtils.mkdir_p(@git_dir)
+    Dir.chdir @git_dir do
+      system 'git init'
+      system "git remote add origin #{@git_url}"
+      system "git fetch --depth 1 origin #{@git_hash}"
+      system 'git checkout FETCH_HEAD'
+    end
   end
 
   def self.build
     system 'env NOCONFIGURE=1 ./autogen.sh'
     system 'filefix'
-    system "env BWRAP=#{CREW_PREFIX}/bin/bwrap CFLAGS='-flto=auto' CXXFLAGS='-flto=auto'  LDFLAGS='-flto=auto' \
+    system "env BWRAP=#{CREW_PREFIX}/bin/bwrap CFLAGS='-flto=auto' \
+      CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \
       ./configure #{CREW_OPTIONS} \
       --with-system-install-dir=#{CREW_PREFIX}/var/lib/flatpak \
       --enable-sandboxed-triggers \
@@ -89,6 +102,9 @@ class Flatpak < Package
       #{CREW_PREFIX}/bin/flatpak.elf \$FLATPAK_FLAGS  "\$@"
     FLATPAK_HEREDOC
     IO.write("#{CREW_DEST_PREFIX}/bin/flatpak", @flatpak_sh, perm: 0o755)
+    FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/dbus-1/system.d"
+    FileUtils.mv "#{CREW_DEST_PREFIX}/etc/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf",
+                 "#{CREW_DEST_PREFIX}/share/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf"
   end
 
   def self.postinstall

packages/geoclue.rb

@@ -3,22 +3,23 @@ require 'package'
 class Geoclue < Package
   description 'Modular geoinformation service built on the D-Bus messaging system'
   homepage 'https://www.freedesktop.org/wiki/Software/GeoClue/'
-  version '2.5.7'
+  @_ver = '2.5.7'
+  version "#{@_ver}-1"
   compatibility 'all'
-  source_url 'https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.5.7/geoclue-2.5.7.tar.bz2'
+  source_url "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/#{@_ver}/geoclue-#{@_ver}.tar.bz2"
   source_sha256 '6cc7dbe4177b4e7f3532f7fe42262049789a3cd6c55afe60a3564d7394119c27'
 
   binary_url({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-chromeos-x86_64.tar.xz'
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/geoclue-2.5.7-1-chromeos-x86_64.tar.xz'
   })
   binary_sha256({
-    aarch64: 'ca4c050657f094f10ccf46f4cba13d309d0757830c4be084e8190d72e3ca8949',
-     armv7l: 'ca4c050657f094f10ccf46f4cba13d309d0757830c4be084e8190d72e3ca8949',
-       i686: 'cb9adf521670add9b3d4d0e4491daa10965ab2638f0b5da89ea81a8df0870688',
-     x86_64: '85a1879573e68dea80192fade6cdd52934ea0b2c02c22e959ec3a88b029f144b'
+    aarch64: '8208222a9240c0d90afaac07a4111ad27e5b02f9ea3ba55211278440f065dad2',
+     armv7l: '8208222a9240c0d90afaac07a4111ad27e5b02f9ea3ba55211278440f065dad2',
+       i686: '17377ae86e1205882121acc6fd1beee159ff0a4d090b2081dfa6582d73248ba2',
+     x86_64: '214403eb81cd51b173365be83577e79b3f30266941f54f8ceec7659565d3cba8'
   })
 
   depends_on 'libsoup'
@@ -33,9 +34,10 @@ class Geoclue < Package
   def self.build
     system "meson #{CREW_MESON_LTO_OPTIONS} \
       -Dsystemd=disabled \
-      -D3g-source=false \
+      -Ddbus-sys-dir=#{CREW_PREFIX}/share/dbus-1 \
+      -D3g-source=true \
       -Dcdma-source=false \
-      -Dmodem-gps-source=false \
+      -Dmodem-gps-source=true \
       builddir"
     system 'meson configure builddir'
     system 'ninja -C builddir'

packages/libmbim.rb

@@ -3,35 +3,37 @@ require 'package'
 class Libmbim < Package
   description 'libmbim is a glib-based library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol.'
   homepage 'https://www.freedesktop.org/wiki/Software/libmbim/'
-  version '1.16.2'
+  @_ver = '1.24.6'
+  version @_ver
   compatibility 'all'
-  source_url 'https://www.freedesktop.org/software/libmbim/libmbim-1.16.2.tar.xz'
-  source_sha256 'eb494fee2c200daf4f5cc8a40061d24a3dfafe8c59151c95c6a826fd96dcb262'
+  source_url "https://www.freedesktop.org/software/libmbim/libmbim-#{@_ver}.tar.xz"
+  source_sha256 '760465caaa1ccd699c14290e9791da456d5300dd11ebf4c1486151033e875dfd'
 
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.16.2-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.16.2-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.16.2-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.16.2-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.24.6-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.24.6-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.24.6-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libmbim-1.24.6-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-    aarch64: '20e7289ee6494836d2ae1ae555fcd8dcdaaaf17fbd4c60036d0729b548885007',
-     armv7l: '20e7289ee6494836d2ae1ae555fcd8dcdaaaf17fbd4c60036d0729b548885007',
-       i686: 'f05206366153c334dacc0320633b8dcb2b4ef331a2ac99d710084a7a19b52f2f',
-     x86_64: '8e85d643f339222cede9361db492333709a4c5e0f135aff659c996d51020abff',
+  binary_sha256({
+    aarch64: 'ffb063051859e2696af5f44b10de9915becb1c22cc90581b3962814be7626f0c',
+     armv7l: 'ffb063051859e2696af5f44b10de9915becb1c22cc90581b3962814be7626f0c',
+       i686: '82b1a84f2226675537c939ada353ec29e962ec53000946e91c2a14a599fe98a8',
+     x86_64: '1e5b4926e3baf334425804688ee72c75e8cc9a6482102d9ef8bf727123561570'
   })
 
   depends_on 'glib'
 
   def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--disable-maintainer-mode'
+    system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \
+      LDFLAGS='-flto=auto' \
+      ./configure \
+      #{CREW_OPTIONS} \
+      --disable-maintainer-mode"
     system 'make'
   end
 
   def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
   end
 end

packages/libqmi.rb

@@ -3,35 +3,37 @@ require 'package'
 class Libqmi < Package
   description 'libqmi is a glib-based library for talking to WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol.'
   homepage 'https://www.freedesktop.org/wiki/Software/libqmi/'
-  version '1.20.2'
+  @_ver = '1.28.2'
+  version @_ver
   compatibility 'all'
-  source_url 'https://www.freedesktop.org/software/libqmi/libqmi-1.20.2.tar.xz'
-  source_sha256 'c73459ca8bfe1213f8047858d4946fc1f58e164d4f488a7a6904edee25e2ca44'
+  source_url "https://www.freedesktop.org/software/libqmi/libqmi-#{@_ver}.tar.xz"
+  source_sha256 '8c8c3ee719874d2529bce9b35b028fe435b36f003979a360d3ad0938449db783'
 
-  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.20.2-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.20.2-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.20.2-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.20.2-chromeos-x86_64.tar.xz',
+  binary_url({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.28.2-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.28.2-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.28.2-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libqmi-1.28.2-chromeos-x86_64.tar.xz'
   })
-  binary_sha256 ({
-    aarch64: '30dc112b0c02bec117a00a1a72684d34b4db6e5c60f5ffdbdcac7701b962e23d',
-     armv7l: '30dc112b0c02bec117a00a1a72684d34b4db6e5c60f5ffdbdcac7701b962e23d',
-       i686: 'a9e7760a7345e09368cfe8655923e27f8fc534179bbc003afef6eb18c5fa1533',
-     x86_64: 'e52b18b3f21c9cbe69609e0c0c351ac8e7231c6ac29792d9f360451724818019',
+  binary_sha256({
+    aarch64: '03ccdba7bf32be2b5e02951d25a664af9654acceb1eb5c71fcbf5179a46190d7',
+     armv7l: '03ccdba7bf32be2b5e02951d25a664af9654acceb1eb5c71fcbf5179a46190d7',
+       i686: '4c313be829849b7d22d803b25d165d4247d89d38451e9ec9d21bb624d52665cd',
+     x86_64: '49c2629596059768498962291481e1d0212bdb2e56b5bdf37f834aeb84fe8680'
   })
 
   depends_on 'libgudev'
 
   def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--disable-maintainer-mode'
+    system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \
+      LDFLAGS='-flto=auto' \
+      ./configure \
+      #{CREW_OPTIONS} \
+      --disable-maintainer-mode"
     system 'make'
   end
 
   def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
   end
 end

packages/pulseaudio.rb

@@ -4,22 +4,22 @@ class Pulseaudio < Package
   description 'PulseAudio is a sound system for POSIX OSes, meaning that it is a proxy for your sound applications.'
   homepage 'https://www.freedesktop.org/wiki/Software/PulseAudio/'
   @_ver = '14.2'
-  version "#{@_ver}-1"
+  version "#{@_ver}-2"
   compatibility 'all'
   source_url "https://freedesktop.org/software/pulseaudio/releases/pulseaudio-#{@_ver}.tar.xz"
   source_sha256 '75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1'
 
   binary_url({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-1-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-1-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-1-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-1-chromeos-x86_64.tar.xz'
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-2-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-2-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-2-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/pulseaudio-14.2-2-chromeos-x86_64.tar.xz'
   })
   binary_sha256({
-    aarch64: '9f10feb9805320b1c710d93a78a706d0ecc9c8a2b06e82008369b938c7fa6ea7',
-     armv7l: '9f10feb9805320b1c710d93a78a706d0ecc9c8a2b06e82008369b938c7fa6ea7',
-       i686: '816c9dae258d6c3f10fd72bbf621253891cb01915746460d8b806784fe6647c0',
-     x86_64: '89be113223767b5c7af0b6f064efbb65338aac39208018b489152e1654185a33'
+    aarch64: 'b63bb927efd3f315ebe04781e5a1173acbd01ee58bd384b43f7e97e3006e14a2',
+     armv7l: 'b63bb927efd3f315ebe04781e5a1173acbd01ee58bd384b43f7e97e3006e14a2',
+       i686: '557c79d8841fbdb52c8289e8e174a4f68a1db477a8a1ec7e1a352de8f60ecd95',
+     x86_64: 'cbb4cd934818825e7bc006a82c02e67179d17c25922a04574853374c4760a095'
   })
 
   depends_on 'gsettings_desktop_schemas'
@@ -41,6 +41,9 @@ class Pulseaudio < Package
   depends_on 'jack'
   depends_on 'avahi'
   depends_on 'gstreamer'
+  depends_on 'valgrind'
+  depends_on 'elogind'
+  depends_on 'eudev'
   depends_on 'gst_plugins_base'
   depends_on 'gst_plugins_good'
   depends_on 'gst_plugins_bad'
@@ -56,6 +59,7 @@ class Pulseaudio < Package
     -Dbluez5=false \
     -Dalsa=enabled \
     -Dgstreamer=enabled \
+    -Delogind=enabled \
     -Dtests=true \
     -Dudevrulesdir=#{CREW_PREFIX}/libexec/rules.d \
     -Dalsadatadir=#{CREW_PREFIX}/share/alsa-card-profile \
@@ -76,7 +80,7 @@ class Pulseaudio < Package
     # stderr:
     # loop-init
     # once!
-    system 'ninja -C builddir test || true'
+    # system 'ninja -C builddir test || true'
   end
 
   def self.install
@@ -124,5 +128,8 @@ class Pulseaudio < Package
       .endif
     PAUDIO_DEFAULT_PA_HEREDOC
     IO.write("#{CREW_DEST_PREFIX}/etc/pulse/default.pa", @pulseaudio_default_pa, perm: 0o666)
+    FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/share/dbus-1/system.d"
+    FileUtils.mv "#{CREW_DEST_PREFIX}/etc/dbus-1/system.d/pulseaudio-system.conf",
+                 "#{CREW_DEST_PREFIX}/share/dbus-1/system.d/pulseaudio-system.conf"
   end
 end