diff --git a/sys/apps/dbus/dbus.sysconf b/sys/apps/dbus/dbus.sysconf index 3c3ae8f3..0fa0f7e8 100644 --- a/sys/apps/dbus/dbus.sysconf +++ b/sys/apps/dbus/dbus.sysconf @@ -1,10 +1,10 @@ #!/bin/sh +set -o pipefail if [ ! -f /etc/machine-id ] ; then dbus-uuidgen --ensure=/etc/machine-id fi -if busybox ls /bin/su -la | grep "^...s" >/dev/null ; then +if busybox ls /usr/libexec/dbus-daemon-launch-helper -la | grep "^...s" >/dev/null ; then chmod 4755 /usr/libexec/dbus-daemon-launch-helper fi dbus-send --system --type=method_call --dest=org.freedesktop.DBus / \ org.freedesktop.DBUS.ReloadConfig >/dev/null 2>&1 || : - diff --git a/sys/apps/dbus/ympbuild b/sys/apps/dbus/ympbuild index 7496428c..16196767 100644 --- a/sys/apps/dbus/ympbuild +++ b/sys/apps/dbus/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='dbus' -release='1' -version='1.15.2' +release='2' +version='1.15.10' url='https://dbus.freedesktop.org/releases/dbus/' description='A message bus system, a simple way for applications to talk to each other' email='aliriza.keskin@pardus.org.tr' @@ -14,7 +14,7 @@ source=("https://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.xz" "dbus.xinit") depends=(audit expat libcap-ng elogind) makedepends=() -md5sums=('c56de960ea9031b92ee71aaa0e8e72c2' +sha256sums=('f700f2f1d0473f11e52f3f3e179f577f31b85419f9ae1972af8c3db0bcfde178' 'SKIP' 'SKIP' 'SKIP' @@ -27,24 +27,25 @@ arch=('x86_64') cd $name-$version setup(){ - ./configure --prefix=/usr \ + meson setup build --prefix=/usr \ --libdir=/usr/lib64/ \ --localstatedir=/var \ --sysconfdir=/etc \ - --disable-xml-docs \ - --with-system-pid-file=/run/dbus/dbus.pid \ - $(use_opt x11 --with-x --without-x) + -Dxml_docs=disabled \ + -Dsystem_pid_file=/run/dbus/dbus.pid \ + -Dx11_autolaunch=$(use_opt x11 enabled disabled) } build(){ - make + ninja -C build $jobs } package(){ - make $jobs install + ninja -C build install $jobs mkdir -p "$DESTDIR"/etc/{passwd,group,sysconf,init,conf}.d "$DESTDIR"/etc/X11/xinit/xinitrc.d/ - echo "messagebus:x:109:" > "$DESTDIR"/etc/group.d/dbus - echo "messagebus:x:103:109::/nonexistent:/usr/sbin/nologin" > "$DESTDIR"/etc/passwd.d/dbus + # GID: messagebus 103 + echo "messagebus:x:103:" > "$DESTDIR"/etc/group.d/dbus + echo "messagebus:x:103:103::/nonexistent:/usr/sbin/nologin" > "$DESTDIR"/etc/passwd.d/dbus install ../dbus.sysconf "$DESTDIR"/etc/sysconf.d/dbus install ../dbus.initd "$DESTDIR"/etc/init.d/dbus install ../dbus.confd "$DESTDIR"/etc/conf.d/dbus diff --git a/sys/apps/gawk/gawk b/sys/apps/gawk/gawk deleted file mode 100644 index b82e0ecb..00000000 Binary files a/sys/apps/gawk/gawk and /dev/null differ diff --git a/sys/apps/openrc/ympbuild b/sys/apps/openrc/ympbuild index f189f776..b3b9389f 100644 --- a/sys/apps/openrc/ympbuild +++ b/sys/apps/openrc/ympbuild @@ -1,7 +1,7 @@ #!/usr/bin/env bash name='openrc' -release='4' -version='0.54' +release='5' +version='0.55.1' url='https://github.com/OpenRC/openrc' description='The OpenRC init system' email='aliriza.keskin@pardus.org.tr' @@ -16,7 +16,7 @@ source=("https://github.com/OpenRC/openrc/archive/refs/tags/$version.zip" "extras/disable-secondary-gpu.sh") depends=() makedepends=() -sha256sums=('ad808516cb9b9a6e031ac2faeef88214164db3b11d5659a542501491e48b298d' +sha256sums=('62e2c72cd3b10a4db2b0cf2ef25a52fc2b269f50c934329ff5f8e973cd81d5a4' 'SKIP' 'SKIP' 'SKIP' @@ -33,7 +33,7 @@ cd $name-$version prepare(){ # hidepid=2 by default - sed -i "s/ proc \/proc/,hidepid=2,gid=31&/g" sh/init.sh.Linux.in + sed -i "s/ proc \/proc/,hidepid=2,gid=31&/g" sh/init.sh.Linux.in } setup(){ @@ -52,7 +52,6 @@ build(){ } package(){ - export DESTDIR=${DESTDIR}// ninja -C build install # disable all services rm -f ${DESTDIR}/etc/runlevels/*/* @@ -63,9 +62,11 @@ package(){ install ../openrc.sysconf ${DESTDIR}/etc/sysconf.d/openrc mkdir -p ${DESTDIR}/etc/group.d mkdir -p ${DESTDIR}/etc/passwd.d - echo "uucp:x:14:" > ${DESTDIR}/etc/group.d/uucp - echo "proc:x:31:" > ${DESTDIR}/etc/group.d/proc - echo "uucp:x:10:14:uucp:/var/spool/uucp:/bin/false" > ${DESTDIR}/etc/passwd.d/uucp + # GID: uucp 14 + # GID: proc 31 + echo "uucp:x:14:" >> ${DESTDIR}/etc/group.d/openrc + echo "proc:x:31:" >> ${DESTDIR}/etc/group.d/openrc + echo "uucp:x:14:14:uucp:/var/spool/uucp:/bin/false" > ${DESTDIR}/etc/passwd.d/uucp # move /share to /usr/share mkdir -p ${DESTDIR}/usr ${DESTDIR}/sbin mv ${DESTDIR}/{,usr}/share @@ -76,12 +77,12 @@ package(){ # install extras mkdir -p ${DESTDIR}/usr/libexec install ../disable-secondary-gpu.sh ${DESTDIR}/usr/libexec/disable-secondary-gpu - install ../disable-secondary-gpu.initd ${DESTDIR}/etc/init.d - install ../backlight-restore.initd ${DESTDIR}/etc/init.d + install ../disable-secondary-gpu.initd ${DESTDIR}/etc/init.d/disable-secondary-gpu + install ../backlight-restore.initd ${DESTDIR}/etc/init.d/backlight-restore # systemd /proc/1/comm hack # move openrc-run as systemd path and symlink mkdir -p $DESTDIR/lib/systemd/ mv $DESTDIR/sbin/openrc-init $DESTDIR/lib/systemd/systemd - ln -s ../lib/systemd/systemd $DESTDIR/sbin/openrc-init + ln -s ../lib/systemd/systemd $DESTDIR/sbin/openrc-init } diff --git a/sys/auth/polkit/polkit.groups b/sys/auth/polkit/polkit.groups deleted file mode 100644 index 3c753abf..00000000 --- a/sys/auth/polkit/polkit.groups +++ /dev/null @@ -1 +0,0 @@ -polkitd:x:102:polkitd diff --git a/sys/auth/polkit/polkit.passwd b/sys/auth/polkit/polkit.passwd deleted file mode 100644 index 7802cd3d..00000000 --- a/sys/auth/polkit/polkit.passwd +++ /dev/null @@ -1 +0,0 @@ -polkitd:x:102:102:User for polkitd:/var/empty:/sbin/nologin diff --git a/sys/auth/polkit/polkit.sysconf b/sys/auth/polkit/polkit.sysconf index 320794ad..2a1dd685 100644 --- a/sys/auth/polkit/polkit.sysconf +++ b/sys/auth/polkit/polkit.sysconf @@ -6,4 +6,12 @@ if [ ! -f /var/lib/ymp/sysconf/polkit/postinstall.done ] ; then chmod -R 700 /etc/polkit-1/rules.d chmod -R 700 /usr/share/polkit-1/rules.d date > /var/lib/ymp/sysconf/polkit/postinstall.done + usermod -aG proc polkitd fi +set -o pipefail +if ! ls -la /usr/bin/pkexec | grep "^...s" >/dev/null ; then + chmod 4755 /usr/bin/pkexec +fi +if ! ls -la /usr/lib/polkit-1/polkit-agent-helper-1 | grep "^...s" >/dev/null; then + chmod 4755 /usr/lib/polkit-1/polkit-agent-helper-1 +fi \ No newline at end of file diff --git a/sys/auth/polkit/ympbuild b/sys/auth/polkit/ympbuild index f37f566a..09b3c5c8 100644 --- a/sys/auth/polkit/ympbuild +++ b/sys/auth/polkit/ympbuild @@ -1,22 +1,18 @@ #!/usr/bin/env bash name='polkit' -release='2' -version='123' +release='3' +version='125' url='https://gitlab.freedesktop.org/polkit/polkit' description='Application development toolkit for controlling system-wide privileges' email='akarsu@protonmail.com' maintainer='akarsu' license=('GPLv3') -source=("https://gitlab.freedesktop.org/polkit/polkit/-/archive/$version/polkit-$version.tar.gz" - "polkit.groups" +source=("https://github.com/polkit-org/polkit/archive/refs/tags/$version.tar.gz" "polkit.initd" - "polkit.passwd" "polkit.sysconf") depends=(duktape expat glib pam elogind) makedepends=(gobject-introspection gtk-doc meson) -md5sums=('36540b837c588e1e77145523bb39f511' - 'SKIP' - 'SKIP' +sha256sums=('ea5cd6e6e2afa6bad938ee770bf0c2cd9317910f37956faeba2869adcf3747d1' 'SKIP' 'SKIP') group=(sys.auth) @@ -28,7 +24,10 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ --libdir=/usr/lib64/ \ - -Dsession_tracking="libelogind" \ + -Dsession_tracking="elogind" \ + -D os_type=redhat \ + -D polkitd_uid=102 \ + -D polkitd_user=polkitd \ -Dsystemdsystemunitdir=/garbage } @@ -41,8 +40,9 @@ package(){ rm -rf $DESTDIR/garbage install -d $DESTDIR/etc/{passwd,group,sysconf,init}.d install ../polkit.sysconf $DESTDIR/etc/sysconf.d/polkit - install ../polkit.groups $DESTDIR/etc/group.d/polkit - install ../polkit.passwd $DESTDIR/etc/passwd.d/polkit install ../polkit.initd $DESTDIR/etc/init.d/polkit + # GID: polkitd 102 + echo "polkitd:x:102:polkitd" > $DESTDIR/etc/group.d/polkitd + echo "polkitd:x:102:102:User for polkitd:/var/empty:/sbin/nologin" > $DESTDIR/etc/passwd.d/polkitd } diff --git a/sys/fs/eudev/eudev.groups b/sys/fs/eudev/eudev.groups index 02d26fbc..20c71aac 100644 --- a/sys/fs/eudev/eudev.groups +++ b/sys/fs/eudev/eudev.groups @@ -1,12 +1,12 @@ tty:x:5: dialout:x:20: kmem:x:15: -input:x:104: +input:x:98: video:x:44: audio:x:29: lp:x:7: disk:x:6: cdrom:x:24: tape:x:26: -kvm:x:105: +kvm:x:99: diff --git a/sys/fs/eudev/ympbuild b/sys/fs/eudev/ympbuild index b90a7037..c99d309c 100644 --- a/sys/fs/eudev/ympbuild +++ b/sys/fs/eudev/ympbuild @@ -37,10 +37,10 @@ setup(){ --with-rootprefix=/ \ --libdir=/lib64/ \ --with-rootrundir=/run \ - --with-rootlibexecdir=/lib64/udev \ - --enable-split-usr \ - --disable-selinux \ - --enable-kmod + --with-rootlibexecdir=/lib64/udev \ + --enable-split-usr \ + --disable-selinux \ + --enable-kmod } build(){ diff --git a/x11/misc/lightdm/ympbuild b/x11/misc/lightdm/ympbuild index f19b45ef..32d5ddb2 100644 --- a/x11/misc/lightdm/ympbuild +++ b/x11/misc/lightdm/ympbuild @@ -42,7 +42,8 @@ package(){ # create user and group mkdir -p $DESTDIR/etc/group.d mkdir -p $DESTDIR/etc/passwd.d - echo "lightdm:x:108:118:Lightdm Display Manager:/var/lib/lightdm-data/:/bin/false" > $DESTDIR/etc/passwd.d/lightdm + # GID: lightdm 118 + echo "lightdm:x:118:118:Lightdm Display Manager:/var/lib/lightdm-data/:/bin/sh" > $DESTDIR/etc/passwd.d/lightdm echo "lightdm:x:118:" > $DESTDIR/etc/group.d/lightdm # install service mkdir -p $DESTDIR/etc/init.d diff --git a/x11/misc/sddm/ympbuild b/x11/misc/sddm/ympbuild index b0bfb360..7571e804 100644 --- a/x11/misc/sddm/ympbuild +++ b/x11/misc/sddm/ympbuild @@ -21,6 +21,7 @@ arch=('x86_64') cd $name-$version export CXXFLAGS="$CXXFLAGS -flto=auto" +export LANG="en_US.UTF-8" setup () { cmake -B build -G Ninja \ @@ -44,13 +45,14 @@ build () { package () { ninja -C build install install -Dm755 ../sddm.initd "$DESTDIR"/etc/init.d/sddm - install -Dm644 ../sddm.confd "$DESTDIR"/etc/conf.d/sddm - # replace pam script - install -Dm644 ../sddm.pam "$DESTDIR"/etc/pam.d/sddm - mkdir -p $DESTDIR/etc/passwd.d/ $DESTDIR/etc/group.d/ - echo "sddm:x:109:119:Simple Desktop Display Manager:/var/lib/sddm/:/bin/false" > $DESTDIR/etc/passwd.d/sddm + install -Dm644 ../sddm.confd "$DESTDIR"/etc/conf.d/sddm + # replace pam script + install -Dm644 ../sddm.pam "$DESTDIR"/etc/pam.d/sddm + mkdir -p $DESTDIR/etc/passwd.d/ $DESTDIR/etc/group.d/ + # GID: sddm 119 + echo "sddm:x:119:119:Simple Desktop Display Manager:/var/lib/sddm/:/bin/sh" > $DESTDIR/etc/passwd.d/sddm echo "sddm:x:119:" > $DESTDIR/etc/group.d/sddm - + install -d "$DESTDIR"/usr/lib/sddm/sddm.conf.d "$DESTDIR"/usr/bin/sddm --example-config > "$DESTDIR"/usr/lib/sddm/sddm.conf.d/default.conf # Unset InputMethod https://github.com/sddm/sddm/issues/952