polkit 0.120-a2bf5c -> 124-eafbf7d (#10099)

* duktape 2.7.0 -> 2.7.0-1

* polkit 0.120-a2bf5c -> 124-eafbf7d
This commit is contained in:
Maximilian Downey Twiss
2024-07-07 23:59:21 +10:00
committed by GitHub
parent 1d0d4a19fe
commit 368829bb49
5 changed files with 49 additions and 99 deletions

View File

@@ -2,9 +2,6 @@
/usr/local/bin/pkcheck
/usr/local/bin/pkexec
/usr/local/bin/pkttyagent
/usr/local/etc/elogind/polkit.service
/usr/local/etc/pam.d/polkit-1
/usr/local/etc/polkit-1/rules.d/50-default.rules
/usr/local/include/polkit-1/polkit/polkit.h
/usr/local/include/polkit-1/polkit/polkitactiondescription.h
/usr/local/include/polkit-1/polkit/polkitauthority.h
@@ -41,6 +38,7 @@
/usr/local/lib/libpolkit-gobject-1.so
/usr/local/lib/libpolkit-gobject-1.so.0
/usr/local/lib/libpolkit-gobject-1.so.0.0.0
/usr/local/lib/pam.d/polkit-1
/usr/local/lib/pkgconfig/polkit-agent-1.pc
/usr/local/lib/pkgconfig/polkit-gobject-1.pc
/usr/local/lib/polkit-1/polkit-agent-helper-1
@@ -54,15 +52,19 @@
/usr/local/share/locale/cs/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/da/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/de/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/hi/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/hr/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/hu/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/id/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/it/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/ka/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/nl/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/nn/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/pl/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/pt/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/pt_BR/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/ro/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/ru/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/sk/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/sv/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/tr/LC_MESSAGES/polkit-1.mo
@@ -70,3 +72,5 @@
/usr/local/share/locale/zh_CN/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/zh_TW/LC_MESSAGES/polkit-1.mo
/usr/local/share/polkit-1/actions/org.freedesktop.policykit.policy
/usr/local/share/polkit-1/policyconfig-1.dtd
/usr/local/share/polkit-1/rules.d/50-default.rules

View File

@@ -1,10 +1,9 @@
/usr/local/include/duk_config.h
/usr/local/include/duktape.h
/usr/local/lib/libduktape.so
/usr/local/lib/libduktape.so.207
/usr/local/lib/libduktape.so.207.20700
/usr/local/lib/libduktaped.so
/usr/local/lib/libduktaped.so.207
/usr/local/lib/libduktaped.so.207.20700
/usr/local/lib/pkgconfig/duktape.pc
/usr/local/lib64/libduktape.so
/usr/local/lib64/libduktape.so.207
/usr/local/lib64/libduktape.so.207.20700
/usr/local/lib64/libduktaped.so
/usr/local/lib64/libduktaped.so.207
/usr/local/lib64/libduktaped.so.207.20700
/usr/local/lib64/pkgconfig/duktape.pc

View File

@@ -2,9 +2,6 @@
/usr/local/bin/pkcheck
/usr/local/bin/pkexec
/usr/local/bin/pkttyagent
/usr/local/etc/elogind/polkit.service
/usr/local/etc/pam.d/polkit-1
/usr/local/etc/polkit-1/rules.d/50-default.rules
/usr/local/include/polkit-1/polkit/polkit.h
/usr/local/include/polkit-1/polkit/polkitactiondescription.h
/usr/local/include/polkit-1/polkit/polkitauthority.h
@@ -33,6 +30,7 @@
/usr/local/include/polkit-1/polkitagent/polkitagentsession.h
/usr/local/include/polkit-1/polkitagent/polkitagenttextlistener.h
/usr/local/include/polkit-1/polkitagent/polkitagenttypes.h
/usr/local/lib/pam.d/polkit-1
/usr/local/lib/polkit-1/polkit-agent-helper-1
/usr/local/lib/polkit-1/polkitd
/usr/local/lib64/girepository-1.0/Polkit-1.0.typelib
@@ -54,15 +52,19 @@
/usr/local/share/locale/cs/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/da/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/de/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/hi/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/hr/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/hu/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/id/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/it/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/ka/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/nl/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/nn/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/pl/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/pt/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/pt_BR/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/ro/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/ru/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/sk/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/sv/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/tr/LC_MESSAGES/polkit-1.mo
@@ -70,3 +72,5 @@
/usr/local/share/locale/zh_CN/LC_MESSAGES/polkit-1.mo
/usr/local/share/locale/zh_TW/LC_MESSAGES/polkit-1.mo
/usr/local/share/polkit-1/actions/org.freedesktop.policykit.policy
/usr/local/share/polkit-1/policyconfig-1.dtd
/usr/local/share/polkit-1/rules.d/50-default.rules

View File

@@ -1,51 +1,30 @@
# Adapted from Arch Linux duktape PKGBUILD at:
# https://github.com/archlinux/svntogit-community/raw/packages/duktape/trunk/PKGBUILD
require 'package'
class Duktape < Package
description 'Embeddable Javascript engine'
homepage 'https://duktape.org/'
version '2.7.0'
version '2.7.0-1'
license 'MIT'
compatibility 'all'
source_url "https://duktape.org/duktape-#{version}.tar.xz"
source_sha256 '90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890'
source_url 'https://github.com/svaarala/duktape-releases.git'
git_hashtag 'v2.7.0'
binary_compression 'tar.zst'
binary_sha256({
aarch64: '9d20adb7b8948b3f8109de81c39ef477b3ec1d50fe7adde2ad6029d49f834bc7',
armv7l: '9d20adb7b8948b3f8109de81c39ef477b3ec1d50fe7adde2ad6029d49f834bc7',
i686: '30b287b4a28f993215998be0bfe145d134d60dac3656e19da78dd9ea76d1db7e',
x86_64: '11fa2e446783af1230ba5df5e628460a8875a35c0e542de441778fa7301d9826'
aarch64: 'f140a0f226f7d1c91bdf22b92a16bfecbebf401bfc79165a324191ea35b46a3a',
armv7l: 'f140a0f226f7d1c91bdf22b92a16bfecbebf401bfc79165a324191ea35b46a3a',
i686: '535d51c28caab852609ac4983cc4c4d25e15208e41851606d319f4f49edb0430',
x86_64: '7a39e108b1168a7ac69fe164b43a79065be5b4832ff5d4a31a6762c41a069b3c'
})
depends_on 'setconf' => :build
depends_on 'glibc' # R
depends_on 'setconf' => :build
def self.build
FileUtils.mv 'Makefile.sharedlibrary', 'Makefile'
system "sed -i 's/-Wall -Wextra/$(CFLAGS) -D DUK_USE_FASTINT -w/g' Makefile"
system "sed -i 's,$(INSTALL_PREFIX)/lib,#{CREW_DEST_LIB_PREFIX},g' Makefile"
system "setconf Makefile INSTALL_PREFIX #{CREW_DEST_PREFIX}"
@duktapepc = <<~DUKTAPEPCEOF
prefix=#{CREW_PREFIX}
exec_prefix=${prefix}
libdir=#{CREW_LIB_PREFIX}
includedir=${prefix}/include
Name: duktape
Description: Embeddable Javascript engine
Version: #{version}
Libs: -L${libdir} -lduktape
Cflags: -I${includedir}
DUKTAPEPCEOF
File.write('duktape.pc', @duktapepc)
system "INSTALL_PREFIX=#{CREW_PREFIX} LIBDIR=#{CREW_LIB_PREFIX} make -f Makefile.sharedlibrary"
end
def self.install
FileUtils.mkdir_p %W[#{CREW_DEST_LIB_PREFIX}/pkgconfig]
FileUtils.install 'duktape.pc', "#{CREW_DEST_LIB_PREFIX}/pkgconfig/duktape.pc", mode: 0o644
system 'make install'
system "INSTALL_PREFIX= LIBDIR=/#{ARCH_LIB} DESTDIR=#{CREW_DEST_PREFIX} make -f Makefile.sharedlibrary install"
end
end

View File

@@ -1,71 +1,35 @@
require 'package'
require 'buildsystems/meson'
class Polkit < Package
class Polkit < Meson
description 'Application development toolkit for controlling system-wide privileges'
homepage 'https://www.freedesktop.org/wiki/Software/polkit/'
version '0.120-a2bf5c'
homepage 'https://github.com/polkit-org/polkit'
version '124-eafbf7d'
license 'LGPL-2'
compatibility 'x86_64 aarch64 armv7l'
source_url 'https://gitlab.freedesktop.org/polkit/polkit.git'
git_hashtag 'a2bf5c9c83b6ae46cbd5c779d3055bff81ded683'
binary_compression 'tpxz'
source_url 'https://github.com/polkit-org/polkit.git'
git_hashtag 'eafbf7ded1b1b0424fb7da16c32629e43c71af27'
binary_compression 'tar.zst'
binary_sha256({
aarch64: '64f33f2ac0ab70d6aef5e1678bd83a5dbd9487ae50641402ffc5bd049409b4bf',
armv7l: '64f33f2ac0ab70d6aef5e1678bd83a5dbd9487ae50641402ffc5bd049409b4bf',
x86_64: '7b775cbb16b44bde17a539955b33e14f97146ba10237ebeb01ec2ea700acafc7'
aarch64: '619ae1856a98ffaf5aa0fa4e81b21f5b73b2e0db3f25d30d8f26c1b535b50980',
armv7l: '619ae1856a98ffaf5aa0fa4e81b21f5b73b2e0db3f25d30d8f26c1b535b50980',
x86_64: 'bdc6e6282b546beb5188347e7b5a0956367fbd85a5859bdfbed5cfbd2cc8c6e3'
})
depends_on 'duktape'
depends_on 'elogind'
depends_on 'gtk_doc' => :build
depends_on 'expat'
depends_on 'glib'
depends_on 'gobject_introspection' => :build
depends_on 'gtk_doc' => :build
depends_on 'linux_pam' # R
def self.patch
# Fix meson 0.60+ compatibility
# https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99
@polkit_meson_patch = <<~POLKIT_MESON_PATCH_HEREDOC
diff --git a/actions/meson.build b/actions/meson.build
index 2abaaf3..1e3f370 100644
--- a/actions/meson.build
+++ b/actions/meson.build
@@ -1,7 +1,6 @@
policy = 'org.freedesktop.policykit.policy'
i18n.merge_file(
- policy,
input: policy + '.in',
output: '@BASENAME@',
po_dir: po_dir,
diff --git a/src/examples/meson.build b/src/examples/meson.build
index c6305ab..8c18de5 100644
--- a/src/examples/meson.build
+++ b/src/examples/meson.build
@@ -1,7 +1,6 @@
policy = 'org.freedesktop.policykit.examples.pkexec.policy'
i18n.merge_file(
- policy,
input: policy + '.in',
output: '@BASENAME@',
po_dir: po_dir,
POLKIT_MESON_PATCH_HEREDOC
File.write('99.patch', @polkit_meson_patch)
system 'patch -F3 -Np1 -i 99.patch'
# meson: do not depend on systemd
downloader 'https://patch-diff.githubusercontent.com/raw/polkit-org/polkit/pull/471.patch', '50641d00cb837f1a97623dd0ad3d49d810ef977fcef6ef10cd88b61b64650ede'
system 'git apply 471.patch'
end
def self.build
system "meson setup #{CREW_MESON_OPTIONS} \
-Dsession_tracking=libelogind \
-Dsystemdsystemunitdir=#{CREW_PREFIX}/etc/elogind/ \
-Djs_engine=duktape \
-Dos_type=gentoo \
builddir"
system 'meson configure --no-pager builddir'
system 'ninja -C builddir'
end
def self.install
system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
end
meson_options "-Dsession_tracking=elogind -Dsystemdsystemunitdir=#{CREW_PREFIX}/etc/elogind"
run_tests
end