From 4eaabd9e38a80650e45957e638dd4ca86f66cd35 Mon Sep 17 00:00:00 2001 From: Anubhav Kini Date: Wed, 5 May 2021 14:27:09 +0530 Subject: [PATCH 1/2] New package: basu-0.2.0 --- common/shlibs | 1 + srcpkgs/basu-devel | 1 + srcpkgs/basu/patches/uid-nobody.patch | 39 +++++++++++++++++++++++++++ srcpkgs/basu/template | 23 ++++++++++++++++ 4 files changed, 64 insertions(+) create mode 120000 srcpkgs/basu-devel create mode 100644 srcpkgs/basu/patches/uid-nobody.patch create mode 100644 srcpkgs/basu/template diff --git a/common/shlibs b/common/shlibs index 1b284ac33ef2..c332b814a8b8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3929,3 +3929,4 @@ libgumbo.so.1 gumbo-parser-0.10.1_2 libmariadb.so.3 libmariadbclient-10.5.9_1 libmariadbd.so.19 libmariadbclient-10.5.9_1 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1 +libbasu.so.0 basu-0.2.0_1 diff --git a/srcpkgs/basu-devel b/srcpkgs/basu-devel new file mode 120000 index 000000000000..a25387954cc6 --- /dev/null +++ b/srcpkgs/basu-devel @@ -0,0 +1 @@ +basu \ No newline at end of file diff --git a/srcpkgs/basu/patches/uid-nobody.patch b/srcpkgs/basu/patches/uid-nobody.patch new file mode 100644 index 000000000000..9937bcc5bedc --- /dev/null +++ b/srcpkgs/basu/patches/uid-nobody.patch @@ -0,0 +1,39 @@ +--- meson.build ++++ meson.build +@@ -189,21 +189,21 @@ conf.set('GPERF_LEN_TYPE', gperf_len_type, + nobody_user = get_option('nobody-user') + + if not meson.is_cross_build() +- getent_result = run_command('getent', 'passwd', '65534') ++ getent_result = run_command('getent', 'passwd', '99') + if getent_result.returncode() == 0 + name = getent_result.stdout().split(':')[0] + if name != nobody_user + warning('\n' + +- 'The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) + ++ 'The local user with the UID 99 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) + + 'Your build will result in an user table setup that is incompatible with the local system.') + endif + endif + id_result = run_command('id', '-u', nobody_user) + if id_result.returncode() == 0 + id = id_result.stdout().to_int() +- if id != 65534 ++ if id != 99 + warning('\n' + +- 'The local user with the configured user name "@0@" of the nobody user does not have UID 65534 (it has @1@).\n'.format(nobody_user, id) + ++ 'The local user with the configured user name "@0@" of the nobody user does not have UID 99 (it has @1@).\n'.format(nobody_user, id) + + 'Your build will result in an user table setup that is incompatible with the local system.') + endif + endif +--- src/basic/user-util.h ++++ src/basic/user-util.h +@@ -17,7 +17,7 @@ char* uid_to_name(uid_t uid); + + #define UID_INVALID ((uid_t) -1) + +-#define UID_NOBODY ((uid_t) 65534U) ++#define UID_NOBODY ((uid_t) 99U) + + bool synthesize_nobody(void); + diff --git a/srcpkgs/basu/template b/srcpkgs/basu/template new file mode 100644 index 000000000000..1a3614b781c3 --- /dev/null +++ b/srcpkgs/basu/template @@ -0,0 +1,23 @@ +# Template file for 'basu' +pkgname=basu +version=0.2.0 +revision=1 +build_style=meson +configure_args="-Dwerror=false" +hostmakedepends="gperf" +short_desc="SD-Bus library extracted from systemd" +maintainer="Anubhav Kini " +license="LGPL-2.1-or-later" +homepage="https://github.com/emersion/basu" +distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz" +checksum=e2fda9b69fc6c4530173fcf8db94c29aa5f3ed932d948cc6a31892623cde5e4b + +basu-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 8c6fb35431472f387787ac9490cd552daa07be81 Mon Sep 17 00:00:00 2001 From: Anubhav Kini Date: Wed, 5 May 2021 14:28:07 +0530 Subject: [PATCH 2/2] mako: update to 1.5 --- srcpkgs/mako/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mako/template b/srcpkgs/mako/template index 18c18def196d..49a40cf8f9ea 100644 --- a/srcpkgs/mako/template +++ b/srcpkgs/mako/template @@ -1,24 +1,24 @@ # Template file for 'mako' pkgname=mako -version=1.4.1 +version=1.5 revision=1 build_style=meson -configure_args="-Dzsh-completions=true -Dapparmor=true -Dwerror=false" +configure_args="-Dzsh-completions=true -Dwerror=false" hostmakedepends="pkg-config scdoc wayland-devel wayland-protocols" makedepends="wayland-devel wayland-protocols pango-devel cairo-devel - elogind-devel gdk-pixbuf-devel" + basu-devel gdk-pixbuf-devel" short_desc="Lightweight Wayland notification daemon" maintainer="Emerson Ferreira " license="MIT" homepage="https://mako-project.org/" distfiles="https://github.com/emersion/${pkgname}/archive/v${version}.tar.gz" -checksum=27ab63264a74389de2119393fe64fd578a4c1d04c8409990ef7cfbb6eb9309bb +checksum=d79998aa4c68de82155080a58ad5783b40d81f50553a0a5d633553ece4f7439d conf_files="/etc/apparmor.d/local/fr.emersion.Mako" post_install() { vlicense LICENSE - + vinstall contrib/apparmor/fr.emersion.Mako 644 etc/apparmor.d vmkdir etc/apparmor.d/local touch ${DESTDIR}/etc/apparmor.d/local/fr.emersion.Mako }