February 2022 - crux-commits

ports/contrib (3.6): distcc: don't fail pre-install when user/group already exists
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit 056d462c5b79cc9c865596096be767668a8f0d9e Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 22:15:09 2022 +0100 distcc: don't fail pre-install when user/group already exists diff --git a/distcc/.signature b/distcc/.signature index 8e894c756..cf7addad8 100644 --- a/distcc/.signature +++ b/distcc/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37fFbaBNTFHRvz7S8pF7e+KPnnWHQJNKI+8GQI6DjjpflvB9f1eT2dAbdq+VcvDhiTVA7sry4zlJa9eczBqizgE= +RWSagIOpLGJF3wzAzZLb5ailHUSxw91u/FpHQLO7xAJM/Lc6XKIlBFHbTn/hICV792fE9ycXlyJ5HL+S0C+mpfMPcuE0O689dQk= SHA256 (Pkgfile) = ab600827f472d9f4e5b902da4368d778fedc80dac8c03fcebf69ffd0bd459186 SHA256 (.footprint) = ab8ff5425a11ce58468e95602eef1c51624de2cf04722471cf4694096bb22fea -SHA256 (distcc-3.4.tar.gz) = 37a34c9555498a1168fea026b292ab07e7bb394715d87d8403e0c33b16d2d008 +SHA256 (distcc-3.4.tar.gz) = 2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d SHA256 (distccd) = 5ff8d45e3e572cf0d4fb4e2e827bd77a618556c275f98d2770aff5621c4d1371 SHA256 (distccd.conf) = afd1ba97aaf23061ba4b4d1a1613eee3a709c91311260de494ce063556b463e3 diff --git a/distcc/pre-install b/distcc/pre-install index b3bd0f2bf..26604df04 100755 --- a/distcc/pre-install +++ b/distcc/pre-install @@ -1,2 +1,4 @@ -/usr/sbin/groupadd --system distcc -/usr/sbin/useradd --system --gid distcc --home-dir /var/empty --shell /bin/false distcc && passwd --lock distcc +#!/bin/sh -e + +/usr/bin/getent group distcc > /dev/null 2>&1 || /usr/sbin/groupadd --system distcc +/usr/bin/getent passwd distcc > /dev/null 2>&1 || /usr/sbin/useradd --system --gid distcc --home-dir /var/empty --shell /bin/false distcc && passwd --lock distcc

1 0

ports/core (3.7): dumb_runtime_dir: initial commit, version 1.0.3
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit d42d5cf9f753e5e224ccd606e7da698c9c231af6 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 21:44:50 2022 +0100 dumb_runtime_dir: initial commit, version 1.0.3 diff --git a/dumb_runtime_dir/.footprint b/dumb_runtime_dir/.footprint new file mode 100644 index 00000000..c2500583 --- /dev/null +++ b/dumb_runtime_dir/.footprint @@ -0,0 +1,3 @@ +drwxr-xr-x root/root lib/ +drwxr-xr-x root/root lib/security/ +-rwxr-xr-x root/root lib/security/pam_dumb_runtime_dir.so diff --git a/dumb_runtime_dir/.signature b/dumb_runtime_dir/.signature new file mode 100644 index 00000000..bb5f41c0 --- /dev/null +++ b/dumb_runtime_dir/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/core.pub +RWRJc1FUaeVequpVih5XJ8hO/YIZunnoBdbkrckC+1q0M5m2+nDNl8XJi+QU0x0S1dmBbjoiXdi5fNBFpx+YbsMkB1JCjzGV7gY= +SHA256 (Pkgfile) = 9238a170d7a1cd1d376d1ecd3c3985f66e372724379ef5f4ee8bf18021eedcd6 +SHA256 (.footprint) = 4392d10298740d1d3c5b10a137acbaa43311c59039de31dacd7215dc55509fda +SHA256 (dumb_runtime_dir-1.0.3.tar.gz) = 92fe5c4b6a69eb9e1845b067aa7f71303a6faabea3be8110776b6072c1652718 diff --git a/dumb_runtime_dir/Pkgfile b/dumb_runtime_dir/Pkgfile new file mode 100644 index 00000000..c7b91b06 --- /dev/null +++ b/dumb_runtime_dir/Pkgfile @@ -0,0 +1,13 @@ +# Description: Creates an XDG_RUNTIME_DIR on login and never removes it +# URL: https://github.com/ifreund/dumb_runtime_dir +# Maintainer: Tim Biermann, tbier at posteo dot de + +name=dumb_runtime_dir +version=1.0.3 +release=1 +source=(https://github.com/ifreund/dumb_runtime_dir/releases/download/v$version/$name-$version.tar.gz) + +build() { + make -C $name-$version + make -C $name-$version DESTDIR=$PKG PREFIX="" install +}

1 0

ports/core (3.7): shadow: added dumb_runtime_dir module to login
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit 7f26550f60f5e20f64e0a23fd0f7c433e750f226 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 21:44:09 2022 +0100 shadow: added dumb_runtime_dir module to login diff --git a/shadow/.signature b/shadow/.signature index 110a6e09..1d72daa5 100644 --- a/shadow/.signature +++ b/shadow/.signature @@ -1,13 +1,13 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqjDQBRL8Inafb8HnEq/gJUZzIRuJp4+c2jCe3Ta6bBsiRPEJsG6O1ZMMjHHpuebx33BCgu/4gWXq22NC2GqDGQY= -SHA256 (Pkgfile) = f2236f9f7dc4e1f4cf50d0142946a5290a918fa3156fd8bb4fbbda984324281d +RWRJc1FUaeVeqgG9tIlg/WHaovBVlynzfY2qIPoRa1d9tB2UdPWSizRX833pdQM9zewY5GiNXXbbYOOiUUq4MP0NP2fZzK3YsQ8= +SHA256 (Pkgfile) = 266aea430afdd4b4ab8cd4c8d3fcf3b355547da6bda971ca250af3b72ce2747a SHA256 (.footprint) = 64614a7fcc7b8c2330824675ccbe9a7601cff4f12fe6d87ac9d9a10d11471d3e SHA256 (shadow-4.11.1.tar.xz) = 41f093ce58b2ae5f389a1c5553e0c18bc73e6fe27f66273891991198a7707c95 SHA256 (pwck) = c62f1bf5785c2bb93bb269156bfa02b06728a01ff5d6c2e09cf6285701a1fda0 SHA256 (login.defs) = def991c4bc012834d726a4010783634a930558b91650bc4cba5fe822064c3535 SHA256 (chfn) = b31ef7a14f747e114c970027a57acb5dcefffee439ce0b4a7d55cc2f6b632fcf SHA256 (chsh) = 20e39e9c738599272a10f46a11338d62d755df32a26db27ce0b5c04a71d66460 -SHA256 (login) = ae3f6b4ddfc86f30f864e3e9cb514964bb323a9e59840624672f412005c64285 +SHA256 (login) = 9dde8742fe21d78dbfa3e6f5a9b64c60c496023553bc241bec4fe3b4b6343a61 SHA256 (groupadd) = c7b90c655b974d396328ddf5d028ef682c2115b6646433f430d8d4a5f9f21bc5 SHA256 (groupdel) = c84a5e8751ca237eddaf2ac3a3bb7ef63f6535a83df6a8c52511eed65a981314 SHA256 (groupmems) = 1bb62dc2a199118900c6c690888342e1c80d38aae89e7f29138edbfd1d8b1194 diff --git a/shadow/Pkgfile b/shadow/Pkgfile index 88bb4fe5..a4a90f67 100644 --- a/shadow/Pkgfile +++ b/shadow/Pkgfile @@ -5,7 +5,7 @@ name=shadow version=4.11.1 -release=1 +release=2 source=(https://github.com/shadow-maint/$name/releases/download/v$version/$… \ pwck login.defs chfn chsh login groupadd groupdel \ groupmems groupmod passwd su useradd userdel usermod) diff --git a/shadow/login b/shadow/login index de1a8e65..d0970448 100644 --- a/shadow/login +++ b/shadow/login @@ -13,5 +13,6 @@ password include common-password session include common-session +session optional pam_dumb_runtime_dir.so session optional pam_lastlog.so session optional pam_motd.so

1 0

ports/core (3.7): rc: 2.31 -> 2.32
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit 3baf11c2650862e375f2b514fc74b0d9fe6d03cc Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 21:42:18 2022 +0100 rc: 2.31 -> 2.32 diff --git a/rc/.signature b/rc/.signature index 9fd7f87b..7b3475a4 100644 --- a/rc/.signature +++ b/rc/.signature @@ -1,13 +1,13 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqqbXBz4D0qn3M0vqrUc1uDN3tJkXy1Dl+W4mfD3HIiKciZUXVRRg8+tSxXZvIbFHZKQaHnyZnDihqUTy0O0uogg= -SHA256 (Pkgfile) = 48a3a61190846f6b835ceb0869ac6b9c04997f1b23c7a7766a8da755ff955cf7 +RWRJc1FUaeVeqlAdmqX2UJ3d59ZGtePm+u2Bkv0z1UfXQ8ZLBYfZmndXieRI3eC5Epn5F/UthU0eeVOAQTvIaYRARC68oxeawAY= +SHA256 (Pkgfile) = 879d4fefc0a9a43e691e5c3a13ad33c9ae2dedfecb611c08351e55a7e6553d08 SHA256 (.footprint) = 83ecef9b904362368a7a581a43b3ea9b658bdbe8265ffae433068ee5beba15e4 SHA256 (inittab) = 7914281a73ee7746c7c16fe63d1631f3714f63467f2655c550c5f8b7c2f1fee7 -SHA256 (rc) = 3a82a4a94829efdc3f890e4dc18513e857ef00b4b205bdc4f217556330a87f30 +SHA256 (rc) = 972b371297572fb70297f7c5c12ad8b70742ab89d0bc585d18601f3381ec3b74 SHA256 (rc.modules) = 74d94558fe68f2a4b7b0f3dc2215c291300bc416d27e6d79d95f303cfc918788 SHA256 (rc.single) = 14a7487258f3b5f2406a860c34666abacf23eb37962d80fce66e496dd111061a -SHA256 (rc.multi) = 2cd2c4dbf2ac86243f775a0020efac08f631b658800c00f8a1c0a3d31855f29a +SHA256 (rc.multi) = a8115a0c3ddd98a5ac1f6dc9d1f23e7d1c0d2db65f709f59deadac312ed6a618 SHA256 (rc.local) = e39147ee4d402b2fea96639185d6055b361b1a44090653acf5790b51db6acdd1 -SHA256 (rc.fix) = 6bc2e28e42d470e16d7d408bbd6b50164ae67388325702962c07a9a9228b91bd +SHA256 (rc.fix) = 0d2eef2326f8660e70e047192c82a0cb865bc8c933e12ffe5b817e8cd536f5b0 SHA256 (rc.shutdown) = 284122ae86248cf93e9806b6e1d3ffca9ad2ee3978434581b491e39887b14ec9 SHA256 (rc.conf) = 37c3b0dd2a76fe6fbdec9ec90bfbfa2e8e7db9cece2fceec1f4899aa1e3e14a5 diff --git a/rc/Pkgfile b/rc/Pkgfile index 4e88b113..bd640293 100644 --- a/rc/Pkgfile +++ b/rc/Pkgfile @@ -3,8 +3,8 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=rc -version=2.31 -release=3 +version=2.32 +release=1 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf) build() { diff --git a/rc/rc b/rc/rc index 26b8ca08..36979e2c 100755 --- a/rc/rc +++ b/rc/rc @@ -52,16 +52,19 @@ fi /bin/mount -o remount,rw / /bin/mount -a -O no_netdev +# Create user dir in /run +/bin/mkdir /run/user +/bin/chmod 0755 /run/user + # Activate swap /sbin/swapon -a # Clean up misc files -: > /var/run/utmp +: > /run/utmp /bin/rm -rf /forcefsck /fastboot /etc/nologin /etc/shutdownpid -(cd /var/run && /usr/bin/find . -name "*.pid" -delete) (cd /var/lock && /usr/bin/find . ! -type d -delete) (cd /tmp && /usr/bin/find . ! -name . -delete) -/bin/mkdir -m 1777 /tmp/.ICE-unix +/bin/mkdir -m 1777 /tmp/.ICE-unix /tmp/.X11-unix # Set kernel variables /sbin/sysctl -p > /dev/null @@ -72,7 +75,7 @@ fi # Configure host name if [ "$HOSTNAME" ]; then echo "hostname: $HOSTNAME" - /bin/hostname $HOSTNAME + /bin/hostname "$HOSTNAME" fi # Load random seed @@ -80,20 +83,20 @@ fi # Configure system clock if [ "$TIMEZONE" ]; then - /bin/ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime + /bin/ln -snf /usr/share/zoneinfo/"$TIMEZONE" /etc/localtime fi /sbin/hwclock --hctosys # Load console font if [ "$FONT" ]; then echo "font: $FONT" - /usr/bin/setfont $FONT + /usr/bin/setfont "$FONT" fi # Load console keymap if [ "$KEYMAP" ]; then echo "keyboard: $KEYMAP" - /usr/bin/loadkeys -q $KEYMAP + /usr/bin/loadkeys -q "$KEYMAP" fi # Screen blanks after 15 minutes idle time diff --git a/rc/rc.fix b/rc/rc.fix index cf0dafbe..a23b0935 100755 --- a/rc/rc.fix +++ b/rc/rc.fix @@ -3,22 +3,20 @@ # /etc/rc.fix: adjustements startup file (multi-user) # - ####################################################################### # X11 font-related checks ####################################################################### if [ -d /usr/share/fonts/X11 ]; then - for i in `/bin/ls -d /usr/share/fonts/X11/*`; do - if [ ! -f $i/fonts.dir ]; then - mkfontdir $i &> /dev/null - mkfontscale $i &> /dev/null - fi - done + for i in `/bin/ls -d /usr/share/fonts/X11/*`; do + if [ ! -f $i/fonts.dir ]; then + mkfontdir $i &> /dev/null + mkfontscale $i &> /dev/null + fi + done fi if [ -d /var/cache/fontconfig ] && [ -z "`/bin/ls /var/cache/fontconfig/`" ]; then - fc-cache --system-only &> /dev/null + fc-cache --system-only &> /dev/null fi - # End of file diff --git a/rc/rc.multi b/rc/rc.multi index 465332fe..966f833b 100755 --- a/rc/rc.multi +++ b/rc/rc.multi @@ -8,7 +8,7 @@ # Run fixes startup file if [ -x /etc/rc.fix ]; then - /etc/rc.fix + /etc/rc.fix fi # Start services @@ -20,8 +20,8 @@ if [ "$SYSLOG" -o "${SERVICES[*]}" ]; then fi for service in ${SERVICES[@]}; do echo -n " $service" - /etc/rc.d/$service start &> /tmp/rc.$$ || echo -n "[ERROR]" - /usr/bin/logger -t $service -f /tmp/rc.$$ + /etc/rc.d/"$service" start &> /tmp/rc.$$ || echo -n "[ERROR]" + /usr/bin/logger -t "$service" -f /tmp/rc.$$ /bin/rm -f /tmp/rc.$$ done echo

1 0

ports/core (3.7): nftables: fixed wrong variable in nftables.init
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit 884b1fc1125da435081723970ddb3f4f85b89cac Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 21:36:08 2022 +0100 nftables: fixed wrong variable in nftables.init diff --git a/nftables/.signature b/nftables/.signature index 98af9d6c..ba500df8 100644 --- a/nftables/.signature +++ b/nftables/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVequyrayFxmb4qEYfhFnVANxKLcwo54FiDZkShnwtpttwwQmLmKtKxVcmOvCRzmEN2ntoiELusRLdzj3QHVDQZ3QY= +RWRJc1FUaeVeqvcJrRrzC99tYVg/N1R+0y0BqhNMdPiT3AxccWWDl55JHGppbn1AvsjuwlUbcfkvvpFPtNNd2VYs72aAv88kfAk= SHA256 (Pkgfile) = d9fc665e5b361b5d758e305b703683d39614c1038105e898e573efeb0339922a SHA256 (.footprint) = 3af190e6dd19a2b16968ea5375f46752c0920b9c5711a62f8dd0fdad6dc95480 SHA256 (nftables-1.0.2.tar.bz2) = 0b28a36ffcf4567b841de7bd3f37918b1fed27859eb48bdec51e1f7a83954c02 SHA256 (nftables.conf) = bdbf69d9a32d7821e000b25ef115490c4efe03ae8ef08efa2b63a4dc239a2424 -SHA256 (nftables.init) = 919dbe340e40ea8b3a79e4270a7ada2d4125af46b5e4c73fb3cb231a8f06a5de +SHA256 (nftables.init) = ba1a2aa9a7faea15b2f10145593d643d496cca917c7858ceabd345062892ee7e diff --git a/nftables/nftables.init b/nftables/nftables.init index 48f66036..05000163 100644 --- a/nftables/nftables.init +++ b/nftables/nftables.init @@ -11,7 +11,7 @@ RESETRULES="flush ruleset" _store() { umask 022 - NFTABLES_STORE=${2:-'/etc/nftables'} + NFTABLES_STORE=${1:-$CONF} tmp_save="${NFTABLES_STORE}.tmp" $PROG $SHOWOPTS > "$tmp_save" retval=$?

1 0

ports/core (3.7): filesystem: readded console
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit 30b3ec64ce3dd6f1f481dff04e6c9337b5c1da88 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 21:02:59 2022 +0100 filesystem: readded console diff --git a/filesystem/.signature b/filesystem/.signature index 7003db35..bde72901 100644 --- a/filesystem/.signature +++ b/filesystem/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVequMipnkvX/Ym6dxkyCW9f7qJwbng9avIO1M7ACJ9BaOTpXEdw84yXkkZ9i1C4h/3D9oGaiobbGng49WIjjGsEgA= -SHA256 (Pkgfile) = c5b7cba5f90a2cf843f5c697ef01906a28ec209f3d9ee5dfeb88a092a67872ad +RWRJc1FUaeVeqs55UE2mXGUvqdZ2ueLY0+YFjB8NMSJJYoxLUCQqw3PUv20M9QVINLjafFbEwkReqPbICQoyFwShhzP08JVdwg8= +SHA256 (Pkgfile) = e7b8e1579b6c53f2a67c761363e3f3f92f1443f286ea6e9a0cfd276b702c7001 SHA256 (.footprint) = a0b8a7ceee392c736b0c3847e7dea5ff429d95a1d61fa6f53ffad7d05ad9d29e SHA256 (issue) = e8f3a830102f902bf869c946634215f419ff76f4e03f627d84b8809ed85e65c2 SHA256 (motd) = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 diff --git a/filesystem/Pkgfile b/filesystem/Pkgfile index a20c86e6..644f438c 100644 --- a/filesystem/Pkgfile +++ b/filesystem/Pkgfile @@ -54,8 +54,8 @@ build() { install -d -m 1777 $PKG/dev/shm # /dev - #mknod $PKG/dev/console c 5 1 - #chmod 0600 $PKG/dev/console + mknod $PKG/dev/console c 5 1 + chmod 0600 $PKG/dev/console # /etc install -m 0644 issue $PKG/etc

1 0

ports/core (3.7): mlocate: added /media and /run to PRUNEPATHS
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit 62a42ea75630daffbcd9b7722878a7b01fc215b3 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 20:58:59 2022 +0100 mlocate: added /media and /run to PRUNEPATHS diff --git a/mlocate/.signature b/mlocate/.signature index c4634ba4..613e9b7c 100644 --- a/mlocate/.signature +++ b/mlocate/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqrKvDvDMBRy4wlRzM4aOrdsklhTuVHkGBJ8lK63xrMSFwow+0lHk07ifLUh1sj3mdhRTOP3Ealp8kQ2IgyBzqwY= -SHA256 (Pkgfile) = 8102addba9631d44b8db4718258004c51dbcc8d24d5289aedf35d70bf9a4ede0 +RWRJc1FUaeVeqs68YSTs38AN7g82PYzEORdXeh+ziElVqHp24AZ67Qh8+4nLd5DmPqVN2WSOODAmpaLcMDDVVV5qS2W/jz2hhQc= +SHA256 (Pkgfile) = 6080703408904dac7c9be6fe3fe549a934186ad0140bf1a808128a2b927144ff SHA256 (.footprint) = bba6afc106f6bb2d4b38c82dd83599abd594b6683feaa1d220d5bf9b6c3f726f SHA256 (mlocate-0.26.tar.xz) = 3063df79fe198fb9618e180c54baf3105b33d88fe602ff2d8570aaf944f1263e SHA256 (mlocate) = def6b64ba85946c724192e282459b12ebcbd37fc4fd19cab7493b5bb25a86885 -SHA256 (updatedb.conf) = c67228476e641e502df39382d37488a617fdd088db70627868a2e5b3145b55a4 +SHA256 (updatedb.conf) = 54a70f4f4a625dfeb596f9dc893ca27b71e0bb5ddf52dcb9e6bbe9bd0e05775e diff --git a/mlocate/Pkgfile b/mlocate/Pkgfile index 4efc387a..d81b4847 100644 --- a/mlocate/Pkgfile +++ b/mlocate/Pkgfile @@ -4,7 +4,7 @@ name=mlocate version=0.26 -release=2 +release=3 source=(https://releases.pagure.org/$name/$name-$version.tar.xz mlocate updatedb.conf) diff --git a/mlocate/updatedb.conf b/mlocate/updatedb.conf index 0b2ab924..651c83c6 100644 --- a/mlocate/updatedb.conf +++ b/mlocate/updatedb.conf @@ -5,6 +5,6 @@ PRUNEFS="nfs nfs4 afs proc smbfs cifs autofs auto iso9660 sshfs sysfs usbfs tmpfs" PRUNENAMES=".git .svn .hg .bzr _darcs CVS RCS" -PRUNEPATHS="/tmp /mnt /var/cache /var/lock /var/run /var/spool /var/tmp" +PRUNEPATHS="/tmp /mnt /media /run /var/cache /var/lock /var/run /var/spool /var/tmp" # End of file

1 0

ports/core (3.7): rsync: move rundir to /run
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit 8348e09444355151bec6dfce5e37eeb40c2d7215 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 20:55:47 2022 +0100 rsync: move rundir to /run diff --git a/rsync/.signature b/rsync/.signature index 4fc9d290..573a13b4 100644 --- a/rsync/.signature +++ b/rsync/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqlzqO04w21qNV2qI91JVAmpFuk4F/sB3oZxwzmRjMVconh0k8cehe8RDVJYceNqokCsfVb8ctMHmMTqAdwM5wwk= -SHA256 (Pkgfile) = 19f542fbfe12605da4d4e821e3d24d9512fa0de593680c1d01e4c344564483c2 +RWRJc1FUaeVeqrs4/p/FsMBM5IxZXG1mh/O5e+ZYb8hLUVj6lJGO4vKSoMDf/YXZ032CTr/QhpEcdiGum/3hAPTwGuA33rtO+wo= +SHA256 (Pkgfile) = 7b317178a47e65f88fc61046ccb18ab3e394a5c610af1141ea976aeee6ebf005 SHA256 (.footprint) = bf468272af3c29c8b4b4d150730c23071cf0093dc06172548b7dbddaeee6c3c3 SHA256 (rsync-3.2.3.tar.gz) = becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e -SHA256 (rsyncd.conf) = 095447801d8ba0101809c18acfb5a492c65323bed9ef5dd3739b3af5e9f7c56d -SHA256 (rsyncd) = e8dc013ff31ee7b1f249fcfbde579ec76fe3103f61d26d098d45290727060c85 +SHA256 (rsyncd.conf) = ada548bd0ff96a02dea1fc58dd3d0821027526c4f3cd1a35dcaf30b22dc02c7e +SHA256 (rsyncd) = 424dbf7cbe8d4f60a1868984084d107445a3dd33c77a82eb36598f012204946a SHA256 (rsync.driver) = 5e0f94a972cf7e47f153ccd0ac454ec2bd3056a834b69e82d3f3984d44308ef7 diff --git a/rsync/Pkgfile b/rsync/Pkgfile index c5a4ea4d..7a4f6905 100644 --- a/rsync/Pkgfile +++ b/rsync/Pkgfile @@ -13,6 +13,7 @@ build () { cd $name-$version ./configure --prefix=/usr \ + --runstatedir=/run \ --with-rsh=ssh \ --with-included-zlib=no \ --with-included-popt=yes \ diff --git a/rsync/rsyncd b/rsync/rsyncd index bd2e8b23..d08d9129 100644 --- a/rsync/rsyncd +++ b/rsync/rsyncd @@ -5,7 +5,7 @@ SSD=/sbin/start-stop-daemon PROG=/usr/bin/rsync -PID=/var/run/rsyncd.pid +PID=/run/rsyncd.pid OPTS="--daemon" case $1 in diff --git a/rsync/rsyncd.conf b/rsync/rsyncd.conf index 02bbdc6c..d1897eb6 100644 --- a/rsync/rsyncd.conf +++ b/rsync/rsyncd.conf @@ -2,14 +2,14 @@ # /etc/rsyncd.conf # -pid file = /var/run/rsyncd.pid +pid file = /run/rsyncd.pid log file = /var/log/rsyncd.log [test] - path = /tmp - comment = test share for rsyncd - hosts allow = 192.168.0.0/24 - read only = true - use chroot = true + path = /tmp + comment = test share for rsyncd + hosts allow = 192.168.0.0/24 + read only = true + use chroot = true # End of file

1 0

ports/contrib (3.6): gcr: fixed build with gobject-introspection
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit df7bd8fc13917b94c59fb67568d7a466fb5248d8 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 20:53:32 2022 +0100 gcr: fixed build with gobject-introspection diff --git a/gcr/.footprint b/gcr/.footprint index 02f30d90e..8fb17ca1c 100644 --- a/gcr/.footprint +++ b/gcr/.footprint @@ -74,10 +74,6 @@ drwxr-xr-x root/root usr/include/gcr-3/ui/ drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/gcr-prompter -rwxr-xr-x root/root usr/lib/gcr-ssh-askpass -drwxr-xr-x root/root usr/lib/girepository-1.0/ --rw-r--r-- root/root usr/lib/girepository-1.0/Gck-1.typelib --rw-r--r-- root/root usr/lib/girepository-1.0/Gcr-3.typelib --rw-r--r-- root/root usr/lib/girepository-1.0/GcrUi-3.typelib lrwxrwxrwx root/root usr/lib/libgck-1.so -> libgck-1.so.0 lrwxrwxrwx root/root usr/lib/libgck-1.so.0 -> libgck-1.so.0.0.0 -rwxr-xr-x root/root usr/lib/libgck-1.so.0.0.0 @@ -104,10 +100,6 @@ drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/services/ -rw-r--r-- root/root usr/share/dbus-1/services/org.gnome.keyring.PrivatePrompter.service -rw-r--r-- root/root usr/share/dbus-1/services/org.gnome.keyring.SystemPrompter.service -drwxr-xr-x root/root usr/share/gir-1.0/ --rw-r--r-- root/root usr/share/gir-1.0/Gck-1.gir --rw-r--r-- root/root usr/share/gir-1.0/Gcr-3.gir --rw-r--r-- root/root usr/share/gir-1.0/GcrUi-3.gir drwxr-xr-x root/root usr/share/glib-2.0/ drwxr-xr-x root/root usr/share/glib-2.0/schemas/ -rw-r--r-- root/root usr/share/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml @@ -156,12 +148,3 @@ drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/ drwxr-xr-x root/root usr/share/mime/ drwxr-xr-x root/root usr/share/mime/packages/ -rw-r--r-- root/root usr/share/mime/packages/gcr-crypto-types.xml -drwxr-xr-x root/root usr/share/vala/ -drwxr-xr-x root/root usr/share/vala/vapi/ --rw-r--r-- root/root usr/share/vala/vapi/gck-1.deps --rw-r--r-- root/root usr/share/vala/vapi/gck-1.vapi --rw-r--r-- root/root usr/share/vala/vapi/gcr-3.deps --rw-r--r-- root/root usr/share/vala/vapi/gcr-3.vapi --rw-r--r-- root/root usr/share/vala/vapi/gcr-ui-3.deps --rw-r--r-- root/root usr/share/vala/vapi/gcr-ui-3.vapi --rw-r--r-- root/root usr/share/vala/vapi/pkcs11.vapi diff --git a/gcr/.signature b/gcr/.signature index 0b468c9a2..67dce0774 100644 --- a/gcr/.signature +++ b/gcr/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zihsNfzfhF7Sfh9TL8cKSZnSFGoUuUokLvefRc6/8GLuosSUahMnqAxAI09UX/EFyUrSXjslEs7rjFvGbEOGg4= -SHA256 (Pkgfile) = 549311731da89694c87df4791e8ed0df65cd8738b4c92934406deb0864725b7a -SHA256 (.footprint) = b04d74c567e09f65d3a53dc094e083fa9b428632457a644e9019bdffe8a3fa27 +RWSagIOpLGJF377PW5d8d1kUC74vMTpoHly2oc4w+LeX6OqE+hDrwM4ygpgmTinmE7w0X8leu4Y+Fjz66aaRDYSCUyLCOYyrYAI= +SHA256 (Pkgfile) = 774b7cec85f1fa479ed348cc57f8827032fabe4ad5b4f324d3be44ad18fe383d +SHA256 (.footprint) = 18e743378f7b515bea6ec8d9b3098f496f54d56bfc8c55079d3923d3da845ff0 SHA256 (gcr-3.40.0.tar.xz) = b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 +SHA256 (fix-meson-invalid-kw-argument.patch) = 7f0d47b09170f988b226600c46241dcbd5bf3349f5ac6415a0030e401612a675 diff --git a/gcr/Pkgfile b/gcr/Pkgfile index 53bbe13ea..2da0f2b2d 100644 --- a/gcr/Pkgfile +++ b/gcr/Pkgfile @@ -5,10 +5,13 @@ name=gcr version=3.40.0 -release=1 -source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz) +release=2 +source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz + fix-meson-invalid-kw-argument.patch) build() { + patch -Np1 -d $name-$version -i $SRC/fix-meson-invalid-kw-argument.patch + meson setup build $name-$version \ --prefix=/usr \ --libexecdir=/usr/lib \ diff --git a/gcr/fix-meson-invalid-kw-argument.patch b/gcr/fix-meson-invalid-kw-argument.patch new file mode 100644 index 000000000..9c097deeb --- /dev/null +++ b/gcr/fix-meson-invalid-kw-argument.patch @@ -0,0 +1,61 @@ +Patch-Source: https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 + +From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka <jakub(a)jirutka.cz> +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck-@0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 2233a44..c83641b 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -190,7 +190,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base-@0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui-@0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +GitLab +

1 0

ports/core (3.7): Merge remote-tracking branch 'origin/3.6' into 3.7
by crux＠crux.nu 27 Feb '22

27 Feb '22

commit f3cee01c3ee120334070b5cb3a4f0f27e36d7e8e Merge: 98cb12a4 fb125db8 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Feb 27 20:28:50 2022 +0100 Merge remote-tracking branch 'origin/3.6' into 3.7

1 0